merge arc

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-17 09:27:13 +01:00
parent 8c263812a5
commit 18affcc085
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
4 changed files with 48 additions and 49 deletions

View file

@ -827,3 +827,49 @@ lbl_8004E720:
/* 8004E724 0004A564 38 60 00 01 */ li r3, 0x1 /* 8004E724 0004A564 38 60 00 01 */ li r3, 0x1
/* 8004E728 0004A568 4E 80 00 20 */ blr /* 8004E728 0004A568 4E 80 00 20 */ blr
/* 8004E72C 0004A56C 00 00 00 00 */ .4byte 0x00000000 /* 8004E72C 0004A56C 00 00 00 00 */ .4byte 0x00000000
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@1127"
"@1127":
.4byte 0x41524349
.4byte 0x6E697448
.4byte 0x616E646C
.4byte 0x653A2062
.4byte 0x61642061
.4byte 0x72636869
.4byte 0x76652066
.4byte 0x6F726D61
.4byte 0x74000000
.global "@1189"
"@1189":
.4byte 0x5761726E
.4byte 0x696E673A
.4byte 0x20415243
.4byte 0x4F70656E
.4byte 0x28293A20
.4byte 0x66696C65
.4byte 0x20272573
.4byte 0x27207761
.4byte 0x73206E6F
.4byte 0x7420666F
.4byte 0x756E6420
.4byte 0x756E6465
.4byte 0x72202573
.4byte 0x20696E20
.4byte 0x74686520
.4byte 0x61726368
.4byte 0x6976652E
.4byte 0x0A000000
.4byte 0
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@1126"
"@1126":
.4byte 0x6172632E
.4byte 0x63000000

View file

@ -1,38 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@1127"
"@1127":
.4byte 0x41524349
.4byte 0x6E697448
.4byte 0x616E646C
.4byte 0x653A2062
.4byte 0x61642061
.4byte 0x72636869
.4byte 0x76652066
.4byte 0x6F726D61
.4byte 0x74000000
.global "@1189"
"@1189":
.4byte 0x5761726E
.4byte 0x696E673A
.4byte 0x20415243
.4byte 0x4F70656E
.4byte 0x28293A20
.4byte 0x66696C65
.4byte 0x20272573
.4byte 0x27207761
.4byte 0x73206E6F
.4byte 0x7420666F
.4byte 0x756E6420
.4byte 0x756E6465
.4byte 0x72202573
.4byte 0x20696E20
.4byte 0x74686520
.4byte 0x61726368
.4byte 0x6976652E
.4byte 0x0A000000
.4byte 0

View file

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

View file

@ -229,9 +229,10 @@ $(BUILD_DIR)/asm/wenc/wenc.o \
$(BUILD_DIR)/asm/enc/encutility.o \ $(BUILD_DIR)/asm/enc/encutility.o \
$(BUILD_DIR)/asm/enc/encunicode.o \ $(BUILD_DIR)/asm/enc/encunicode.o \
\ \
$(BUILD_DIR)/asm/arc/arc.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/arc/arc_8004dd70.o \
$(BUILD_DIR)/asm/ipc/ipcMain_8004e730.o \ $(BUILD_DIR)/asm/ipc/ipcMain_8004e730.o \
$(BUILD_DIR)/asm/ipc/ipcclt_8004e820.o \ $(BUILD_DIR)/asm/ipc/ipcclt_8004e820.o \
$(BUILD_DIR)/asm/ipc/memory_80050280.o \ $(BUILD_DIR)/asm/ipc/memory_80050280.o \
@ -3228,7 +3229,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/arc/arc_80438498.o \
$(BUILD_DIR)/asm/fs/fs_80438508.o \ $(BUILD_DIR)/asm/fs/fs_80438508.o \
$(BUILD_DIR)/asm/pad/Pad_80438530.o \ $(BUILD_DIR)/asm/pad/Pad_80438530.o \
$(BUILD_DIR)/asm/wpad/WPAD_80438588.o \ $(BUILD_DIR)/asm/wpad/WPAD_80438588.o \
@ -5142,7 +5142,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/arc/arc_805567a0.o \
$(BUILD_DIR)/asm/ipc/ipcclt_805567a8.o \ $(BUILD_DIR)/asm/ipc/ipcclt_805567a8.o \
$(BUILD_DIR)/asm/fs/fs_805567b0.o \ $(BUILD_DIR)/asm/fs/fs_805567b0.o \
$(BUILD_DIR)/asm/pad/Pad_805567c0.o \ $(BUILD_DIR)/asm/pad/Pad_805567c0.o \