darkkirb/donut-decomp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge namespace scn::challengefileselect::effect

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-22 12:19:31 +01:00
parent a6de0a37e2
commit 0e97cd7b59
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
6 changed files with 58 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
asm/src/Table_8045e968.s
View file

@ -1,26 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48738_8045E968"
"@48738_8045E968":
.4byte 0x46696C65
.4byte 0x44656C65
.4byte 0x74650000
.global "@48739_8045E974"
"@48739_8045E974":
.4byte 0x73746570
.4byte 0x2F6F626A
.4byte 0x2F507446
.4byte 0x696C6544
.4byte 0x656C6574
.4byte 0x65000000
.global "@48839_8045E98C"
"@48839_8045E98C":
.4byte 0x46696C65
.4byte 0x44656C65
.4byte 0x74650000

6
asm/src/Table_80545ee0.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"
"@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS":
.skip 0x40

6
asm/src/Table_8055d300.s
View file

@ -1,6 +0,0 @@
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "@GUARD@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"
"@GUARD@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS":
.skip 0x8

18
asm/src/Table_8055fd90.s
View file

@ -1,18 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "T_PTCL_INFOS__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@"
"T_PTCL_INFOS__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@":
.4byte "@48738_8045E968"
.4byte "@48739_8045E974"
.global "@48833_8055FD98"
"@48833_8055FD98":
.4byte 0x00000001
.global lbl_8055FD9C
lbl_8055FD9C:
.4byte "@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"

56
asm/src/Table_801ea0d0.s → asm/src/scn/challengefileselect/effect/Table.s
View file

@ -47,3 +47,59 @@ PtclResPath__Q43scn19challengefileselect6effect5TableFQ43scn19challengefileselec
/* 801EA15C 001E5F9C 7C 64 02 14 */ add r3, r4, r0 /* 801EA15C 001E5F9C 7C 64 02 14 */ add r3, r4, r0
/* 801EA160 001E5FA0 80 63 00 04 */ lwz r3, 0x4(r3) /* 801EA160 001E5FA0 80 63 00 04 */ lwz r3, 0x4(r3)
/* 801EA164 001E5FA4 4E 80 00 20 */ blr /* 801EA164 001E5FA4 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@48738_8045E968"
"@48738_8045E968":
.4byte 0x46696C65
.4byte 0x44656C65
.4byte 0x74650000
.global "@48739_8045E974"
"@48739_8045E974":
.4byte 0x73746570
.4byte 0x2F6F626A
.4byte 0x2F507446
.4byte 0x696C6544
.4byte 0x656C6574
.4byte 0x65000000
.global "@48839_8045E98C"
"@48839_8045E98C":
.4byte 0x46696C65
.4byte 0x44656C65
.4byte 0x74650000
.include "macros.inc"
.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20
.global "@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"
"@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS":
.skip 0x40
.include "macros.inc"
.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0
.global "@GUARD@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"
"@GUARD@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS":
.skip 0x8
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "T_PTCL_INFOS__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@"
"T_PTCL_INFOS__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@":
.4byte "@48738_8045E968"
.4byte "@48739_8045E974"
.global "@48833_8055FD98"
"@48833_8055FD98":
.4byte 0x00000001
.global lbl_8055FD9C
lbl_8055FD9C:
.4byte "@LOCAL@t_genContextHeader__Q43scn19challengefileselect6effect19@unnamed@Table_cpp@Fv@CONTEXTS"

7
obj_files.mk
View file

@ -1051,9 +1051,10 @@ $(BUILD_DIR)/asm/src/scn/challengefileselect/SceneChallengeFileSelect.o \
$(BUILD_DIR)/asm/src/scn/challengefileselect/StaffCredit.o \ $(BUILD_DIR)/asm/src/scn/challengefileselect/StaffCredit.o \
$(BUILD_DIR)/asm/src/scn/challengefileselect/Trophy.o \ $(BUILD_DIR)/asm/src/scn/challengefileselect/Trophy.o \
\ \
$(BUILD_DIR)/asm/src/scn/challengefileselect/effect/Table.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Table_801ea0d0.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_801ea168.o \ $(BUILD_DIR)/asm/src/AbilityKindUtil_801ea168.o \
$(BUILD_DIR)/asm/src/BGModel_801ea59c.o \ $(BUILD_DIR)/asm/src/BGModel_801ea59c.o \
$(BUILD_DIR)/asm/src/Chara_801ea674.o \ $(BUILD_DIR)/asm/src/Chara_801ea674.o \
@ -3136,7 +3137,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data # .data
O_FILES += \ O_FILES += \
$(BUILD_DIR)/asm/src/Table_8045e968.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_8045e998.o \ $(BUILD_DIR)/asm/src/AbilityKindUtil_8045e998.o \
$(BUILD_DIR)/asm/src/BGModel_8045eab0.o \ $(BUILD_DIR)/asm/src/BGModel_8045eab0.o \
$(BUILD_DIR)/asm/src/Chara_8045ead0.o \ $(BUILD_DIR)/asm/src/Chara_8045ead0.o \
@ -4580,7 +4580,6 @@ $(BUILD_DIR)/asm/src/Alarm_804966e0.o \
$(BUILD_DIR)/asm/src/StateChanger_804966f0.o $(BUILD_DIR)/asm/src/StateChanger_804966f0.o
# .bss # .bss
O_FILES += \ O_FILES += \
$(BUILD_DIR)/asm/src/Table_80545ee0.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_80545f20.o \ $(BUILD_DIR)/asm/src/AbilityKindUtil_80545f20.o \
$(BUILD_DIR)/asm/src/Table_805461d0.o \ $(BUILD_DIR)/asm/src/Table_805461d0.o \
$(BUILD_DIR)/asm/src/BG_80546780.o \ $(BUILD_DIR)/asm/src/BG_80546780.o \
@ -4897,7 +4896,6 @@ $(BUILD_DIR)/asm/src/FullScreenModel_8055c6b8.o \
$(BUILD_DIR)/asm/src/Wipe_8055c6c0.o $(BUILD_DIR)/asm/src/Wipe_8055c6c0.o
# .sbss # .sbss
O_FILES += \ O_FILES += \
$(BUILD_DIR)/asm/src/Table_8055d300.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_8055d308.o \ $(BUILD_DIR)/asm/src/AbilityKindUtil_8055d308.o \
$(BUILD_DIR)/asm/src/Commander_8055d318.o \ $(BUILD_DIR)/asm/src/Commander_8055d318.o \
$(BUILD_DIR)/asm/src/SceneChallengeTitle_8055d320.o \ $(BUILD_DIR)/asm/src/SceneChallengeTitle_8055d320.o \
@ -4995,7 +4993,6 @@ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o $(BUILD_DIR)/asm/src/Alarm_8055df68.o
# .sdata2 # .sdata2
O_FILES += \ O_FILES += \
$(BUILD_DIR)/asm/src/Table_8055fd90.o \
$(BUILD_DIR)/asm/src/AbilityKindUtil_8055fda0.o \ $(BUILD_DIR)/asm/src/AbilityKindUtil_8055fda0.o \
$(BUILD_DIR)/asm/src/Chara_8055fda8.o \ $(BUILD_DIR)/asm/src/Chara_8055fda8.o \
$(BUILD_DIR)/asm/src/CharaManager_8055fdb8.o \ $(BUILD_DIR)/asm/src/CharaManager_8055fdb8.o \