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

merge tpl

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:42:25 +01:00
parent b3648ac1e6
commit 7663e7ea4c
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
5 changed files with 36 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
asm/tpl/TPL_800a1e00.s → asm/tpl/TPL.s
View file

@ -153,3 +153,37 @@ TPLGetGXTexObjFromPalette:
/* 800A2014 0009DE54 7C 08 03 A6 */ mtlr r0 /* 800A2014 0009DE54 7C 08 03 A6 */ mtlr r0
/* 800A2018 0009DE58 38 21 00 30 */ addi r1, r1, 0x30 /* 800A2018 0009DE58 38 21 00 30 */ addi r1, r1, 0x30
/* 800A201C 0009DE5C 4E 80 00 20 */ blr /* 800A201C 0009DE5C 4E 80 00 20 */ blr
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@773"
"@773":
.4byte 0x696E7661
.4byte 0x6C696420
.4byte 0x76657273
.4byte 0x696F6E20
.4byte 0x6E756D62
.4byte 0x65722066
.4byte 0x6F722074
.4byte 0x65787475
.4byte 0x72652070
.4byte 0x616C6574
.4byte 0x74650000
.4byte 0
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@772"
"@772":
.4byte 0x54504C2E
.4byte 0x63000000
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@795_8055E960"
"@795_8055E960":
.4byte 0x43300000
.4byte 0

18
asm/tpl/TPL_80440030.s
View file

@ -1,18 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@773"
"@773":
.4byte 0x696E7661
.4byte 0x6C696420
.4byte 0x76657273
.4byte 0x696F6E20
.4byte 0x6E756D62
.4byte 0x65722066
.4byte 0x6F722074
.4byte 0x65787475
.4byte 0x72652070
.4byte 0x616C6574
.4byte 0x74650000
.4byte 0

8
asm/tpl/TPL_80556940.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@772"
"@772":
.4byte 0x54504C2E
.4byte 0x63000000

8
asm/tpl/TPL_8055e960.s
View file

@ -1,8 +0,0 @@
.include "macros.inc"
.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440
.global "@795_8055E960"
"@795_8055E960":
.4byte 0x43300000
.4byte 0

6
obj_files.mk
View file

@ -326,9 +326,10 @@ $(BUILD_DIR)/asm/bte/sdp_main.o \
$(BUILD_DIR)/asm/bte/sdp_server.o \ $(BUILD_DIR)/asm/bte/sdp_server.o \
$(BUILD_DIR)/asm/bte/sdp_utils.o \ $(BUILD_DIR)/asm/bte/sdp_utils.o \
\ \
$(BUILD_DIR)/asm/tpl/TPL.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/tpl/TPL_800a1e00.o \
$(BUILD_DIR)/asm/esp/esp_800a2020.o \ $(BUILD_DIR)/asm/esp/esp_800a2020.o \
$(BUILD_DIR)/asm/mem/mem_heapCommon_800a2640.o \ $(BUILD_DIR)/asm/mem/mem_heapCommon_800a2640.o \
$(BUILD_DIR)/asm/mem/mem_expHeap_800a2ab0.o \ $(BUILD_DIR)/asm/mem/mem_expHeap_800a2ab0.o \
@ -3226,7 +3227,6 @@ $(BUILD_DIR)/asm/src/BgManager_80420bf0.o \
$(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \ $(BUILD_DIR)/asm/src/StaffRoll_80420d08.o \
$(BUILD_DIR)/asm/src/SoundManager_80420f28.o \ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \ $(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o \
$(BUILD_DIR)/asm/tpl/TPL_80440030.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_draworder_80440060.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_draworder_80440060.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_80440078.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effect_80440078.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80440098.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80440098.o \
@ -5062,7 +5062,6 @@ $(BUILD_DIR)/asm/src/ScoreCoin_80554888.o \
$(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \ $(BUILD_DIR)/asm/src/EffectLocatorModelDesc_805549b8.o \
$(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o \ $(BUILD_DIR)/asm/src/Table_80556398.o \
$(BUILD_DIR)/asm/tpl/TPL_80556940.o \
$(BUILD_DIR)/asm/esp/esp_80556948.o \ $(BUILD_DIR)/asm/esp/esp_80556948.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80556958.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_80556958.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_util_80556960.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_util_80556960.o \
@ -5656,7 +5655,6 @@ $(BUILD_DIR)/asm/src/SequenceProductRoot_8055df48.o \
$(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \ $(BUILD_DIR)/asm/src/MintSERequestor_8055df58.o \
$(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \ $(BUILD_DIR)/asm/src/SoundSystem_8055df60.o \
$(BUILD_DIR)/asm/src/Alarm_8055df68.o \ $(BUILD_DIR)/asm/src/Alarm_8055df68.o \
$(BUILD_DIR)/asm/tpl/TPL_8055e960.o \
$(BUILD_DIR)/asm/mem/mem_allocator_8055e968.o \ $(BUILD_DIR)/asm/mem/mem_allocator_8055e968.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effect_8055e970.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effect_8055e970.o \
$(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055e978.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_effectsystem_8055e978.o \