merge namespace param

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-22 08:02:20 +01:00
parent d189feb67d
commit b7baf55492
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
5 changed files with 23 additions and 24 deletions

View file

@ -1,12 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49124"
"@49124":
.4byte 0x70617261
.4byte 0x6D2F4172
.4byte 0x63686976
.4byte 0x652E6269
.4byte 0x6E2E636D
.4byte 0x70000000

View file

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

View file

@ -119,3 +119,23 @@ lbl_801DA554:
str__Q25param13ParamAccessorCFUi:
/* 801DA56C 001D63AC 38 63 00 04 */ addi r3, r3, 0x4
/* 801DA570 001D63B0 4B FA CD E4 */ b labelAddressWithReference__Q25xdata5XDataCFUi
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@49124"
"@49124":
.4byte 0x70617261
.4byte 0x6D2F4172
.4byte 0x63686976
.4byte 0x652E6269
.4byte 0x6E2E636D
.4byte 0x70000000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@49125"
"@49125":
.4byte 0x25732E62
.4byte 0x696E0000

View file

@ -1009,10 +1009,11 @@ $(BUILD_DIR)/asm/src/ostop/Actor.o \
$(BUILD_DIR)/asm/src/ostop/Manager.o \
$(BUILD_DIR)/asm/src/ostop/ReqHandle.o \
\
$(BUILD_DIR)/asm/src/param/JITParam.o \
$(BUILD_DIR)/asm/src/param/ParamAccessor.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/JITParam_801da2fc.o \
$(BUILD_DIR)/asm/src/ParamAccessor_801da3fc.o \
$(BUILD_DIR)/asm/src/ButtonPanel_801da574.o \
$(BUILD_DIR)/asm/src/ClosePanel_801da754.o \
$(BUILD_DIR)/asm/src/Component_801da8d0.o \
@ -3141,7 +3142,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/ParamAccessor_8045d408.o \
$(BUILD_DIR)/asm/src/ButtonPanel_8045d420.o \
$(BUILD_DIR)/asm/src/ClosePanel_8045d460.o \
$(BUILD_DIR)/asm/src/Constant_8045d470.o \
@ -4654,7 +4654,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/ParamAccessor_80557658.o \
$(BUILD_DIR)/asm/src/ButtonPanel_80557660.o \
$(BUILD_DIR)/asm/src/Component_80557670.o \
$(BUILD_DIR)/asm/src/CursorPanel_80557688.o \