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

merge esp

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:43:11 +01:00
parent 7663e7ea4c
commit 805640ca5d
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
asm/esp/esp_800a2020.s → asm/esp/esp.s
View file

@ -483,3 +483,17 @@ lbl_800A2628:
/* 800A2634 0009E474 7C 08 03 A6 */ mtlr r0 /* 800A2634 0009E474 7C 08 03 A6 */ mtlr r0
/* 800A2638 0009E478 7D 41 53 78 */ mr r1, r10 /* 800A2638 0009E478 7D 41 53 78 */ mr r1, r10
/* 800A263C 0009E47C 4E 80 00 20 */ blr /* 800A263C 0009E47C 4E 80 00 20 */ blr
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global __esFd
__esFd:
.4byte 0xFFFFFFFF
.4byte 0
.global "@1766_80556950"
"@1766_80556950":
.4byte 0x2F646576
.4byte 0x2F657300

14
asm/esp/esp_80556948.s
View file

@ -1,14 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global __esFd
__esFd:
.4byte 0xFFFFFFFF
.4byte 0
.global "@1766_80556950"
"@1766_80556950":
.4byte 0x2F646576
.4byte 0x2F657300

4
obj_files.mk
View file

@ -328,9 +328,10 @@ $(BUILD_DIR)/asm/bte/sdp_utils.o \
\ \
$(BUILD_DIR)/asm/tpl/TPL.o \ $(BUILD_DIR)/asm/tpl/TPL.o \
\ \
$(BUILD_DIR)/asm/esp/esp.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/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 \
$(BUILD_DIR)/asm/mem/mem_frameHeap_800a32e0.o \ $(BUILD_DIR)/asm/mem/mem_frameHeap_800a32e0.o \
@ -5062,7 +5063,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/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 \
$(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.o \ $(BUILD_DIR)/asm/libnw4r_ef/ef_drawbillboardstrategy_80556980.o \