From 47be8178881e569dca0b05653d3f5a61a82e5ee4 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Mon, 11 Apr 2022 22:19:33 -0700 Subject: [PATCH] Move ctors/dtors to end of link order, migrate bss_sinit.s into ctors.s Former-commit-id: 0388956e1e3bf3849e17b053c8a77d68150c81f4 --- Makefile | 9 +- asm/Kyoto_CWD/CCameraManager.s | 473 +++++++++++++++++++++++++ asm/Kyoto_CWD/main.s | 12 + asm/Kyoto_CWD/text_80008894_80009144.s | 13 + asm/bss.s | 9 - asm/bss_sinit.s | 444 ----------------------- asm/ctors.s | 442 +++++++++++++++++++++++ asm/rodata.s | 3 - asm/sdata.s | 36 -- asm/sdata2.s | 75 ---- asm/text.s.REMOVED.git-id | 2 +- obj_files.mk | 6 +- 12 files changed, 947 insertions(+), 577 deletions(-) delete mode 100644 asm/bss_sinit.s diff --git a/Makefile b/Makefile index 2378b0b3..f069da28 100644 --- a/Makefile +++ b/Makefile @@ -53,13 +53,12 @@ include e_files.mk endif O_FILES := $(INIT_O_FILES) $(EXTAB_O_FILES) $(EXTABINDEX_O_FILES) $(METROTRK_FILES) \ - $(KYOTO_CWD) $(CTORS_O_FILES) $(DTORS_O_FILES) $(RODATA_O_FILES) \ - $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) $(SBSS_O_FILES) \ - $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(TEXT_O_FILES) $(AI_FILES) $(AR_FILES) \ - $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \ + $(KYOTO_CWD) $(RODATA_O_FILES) $(DATA_O_FILES) $(BSS_O_FILES) $(SDATA_O_FILES) \ + $(SBSS_O_FILES) $(SDATA2_O_FILES) $(SBSS2_O_FILES) $(TEXT_O_FILES) $(AI_FILES) \ + $(AR_FILES) $(BASE_FILES) $(DB_FILES) $(DSP_FILES) $(DVD_FILES) $(GX_FILES) $(MTX_FILES) \ $(OS_FILES) $(PAD_FILES) $(VI_FILES) $(MSL_PPCEABI_BARE_H) $(MUSYX_FILES) \ $(DTK_FILES) $(CARD_FILES) $(SI_FILES) $(EXI_FILES) $(THP_FILES) \ - $(GBA_FILES) $(BSS_SINIT_O_FILES) + $(GBA_FILES) $(CTORS_O_FILES) $(DTORS_O_FILES) ifeq ($(EPILOGUE_PROCESS),1) E_FILES := $(EPILOGUE_UNSCHEDULED) diff --git a/asm/Kyoto_CWD/CCameraManager.s b/asm/Kyoto_CWD/CCameraManager.s index eaa33d8a..c291e0e1 100644 --- a/asm/Kyoto_CWD/CCameraManager.s +++ b/asm/Kyoto_CWD/CCameraManager.s @@ -1,5 +1,112 @@ .include "macros.inc" +.section .sdata2 +.global lbl_805A9D88 +lbl_805A9D88: + # ROM: 0x3F6628 + .4byte 0x3FF00000 + .4byte 0 + +.global lbl_805A9D90 +lbl_805A9D90: + # ROM: 0x3F6630 + .4byte 0xBF800000 + +.global lbl_805A9D94 +lbl_805A9D94: + # ROM: 0x3F6634 + .4byte 0x3F800000 + +.global lbl_805A9D98 +lbl_805A9D98: + # ROM: 0x3F6638 + .4byte 0x3FE0C152 + .4byte 0x40000000 + +.global lbl_805A9DA0 +lbl_805A9DA0: + # ROM: 0x3F6640 + .4byte 0 + +.global lbl_805A9DA4 +lbl_805A9DA4: + # ROM: 0x3F6644 + .4byte 0x3F000000 + +.global lbl_805A9DA8 +lbl_805A9DA8: + # ROM: 0x3F6648 + .4byte 0x42C80000 + +.global lbl_805A9DAC +lbl_805A9DAC: + # ROM: 0x3F664C + .4byte 0x41100000 + +.global lbl_805A9DB0 +lbl_805A9DB0: + # ROM: 0x3F6650 + .4byte 0x40800000 + +.global lbl_805A9DB4 +lbl_805A9DB4: + # ROM: 0x3F6654 + .4byte 0x42480000 + +.global lbl_805A9DB8 +lbl_805A9DB8: + # ROM: 0x3F6658 + .4byte 0x447A0000 + .4byte 0 + +.global lbl_805A9DC0 +lbl_805A9DC0: + # ROM: 0x3F6660 + .4byte 0x43300000 + .4byte 0x80000000 + +.section .sdata +.global lbl_805A6BD0 +lbl_805A6BD0: + # ROM: 0x3F4570 + .4byte 0x425C0000 + +.global lbl_805A6BD4 +lbl_805A6BD4: + # ROM: 0x3F4574 + .4byte 0x42700000 + +.global lbl_805A6BD8 +lbl_805A6BD8: + # ROM: 0x3F4578 + .4byte 0x3E4CCCCD + +.global lbl_805A6BDC +lbl_805A6BDC: + # ROM: 0x3F457C + .4byte 0x443B8000 + +.global lbl_805A6BE0 +lbl_805A6BE0: + # ROM: 0x3F4580 + .4byte 0x3FB5C28F + +.global lbl_805A6BE4 +lbl_805A6BE4: + # ROM: 0x3F4584 + .4byte 0x42C80000 + +.global lbl_805A6BE8 +lbl_805A6BE8: + # ROM: 0x3F4588 + .4byte 0x42FE0000 + .4byte 0 + +.section .rodata +.global lbl_803CC028 +lbl_803CC028: + .incbin "baserom.dol", 0x3C9028, 0x8 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 @@ -3559,3 +3666,369 @@ __ct__14CCameraManagerF9TUniqueId: /* 8000C2A8 00009208 7C 08 03 A6 */ mtlr r0 /* 8000C2AC 0000920C 38 21 00 40 */ addi r1, r1, 0x40 /* 8000C2B0 00009210 4E 80 00 20 */ blr + +.global "Clamp__5CMathFRCfRCfRCf" +"Clamp__5CMathFRCfRCfRCf": +/* 8000C2B4 00009214 C0 03 00 00 */ lfs f0, 0(r3) +/* 8000C2B8 00009218 C0 24 00 00 */ lfs f1, 0(r4) +/* 8000C2BC 0000921C FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8000C2C0 00009220 4D 81 00 20 */ bgtlr +/* 8000C2C4 00009224 C0 05 00 00 */ lfs f0, 0(r5) +/* 8000C2C8 00009228 FC 00 08 40 */ fcmpo cr0, f0, f1 +/* 8000C2CC 0000922C 40 80 00 0C */ bge lbl_8000C2D8 +/* 8000C2D0 00009230 7C A3 2B 78 */ mr r3, r5 +/* 8000C2D4 00009234 4E 80 00 20 */ blr +lbl_8000C2D8: +/* 8000C2D8 00009238 7C 83 23 78 */ mr r3, r4 +/* 8000C2DC 0000923C 4E 80 00 20 */ blr + +.global sub_8000c2e0 +sub_8000c2e0: +/* 8000C2E0 00009240 94 21 FF C0 */ stwu r1, -0x40(r1) +/* 8000C2E4 00009244 7C 08 02 A6 */ mflr r0 +/* 8000C2E8 00009248 90 01 00 44 */ stw r0, 0x44(r1) +/* 8000C2EC 0000924C BF 61 00 2C */ stmw r27, 0x2c(r1) +/* 8000C2F0 00009250 7C 7D 1B 78 */ mr r29, r3 +/* 8000C2F4 00009254 7C 9E 23 78 */ mr r30, r4 +/* 8000C2F8 00009258 7C BF 2B 78 */ mr r31, r5 +/* 8000C2FC 0000925C 7C 1D F0 50 */ subf r0, r29, r30 +/* 8000C300 00009260 7C 00 1E 70 */ srawi r0, r0, 3 +/* 8000C304 00009264 7C A0 01 94 */ addze r5, r0 +/* 8000C308 00009268 2C 05 00 01 */ cmpwi r5, 1 +/* 8000C30C 0000926C 40 81 00 E8 */ ble lbl_8000C3F4 +/* 8000C310 00009270 2C 05 00 14 */ cmpwi r5, 0x14 +/* 8000C314 00009274 41 81 00 18 */ bgt lbl_8000C32C +/* 8000C318 00009278 88 1F 00 00 */ lbz r0, 0(r31) +/* 8000C31C 0000927C 38 A1 00 14 */ addi r5, r1, 0x14 +/* 8000C320 00009280 98 01 00 14 */ stb r0, 0x14(r1) +/* 8000C324 00009284 48 00 03 51 */ bl sub_8000c674 +/* 8000C328 00009288 48 00 00 CC */ b lbl_8000C3F4 +lbl_8000C32C: +/* 8000C32C 0000928C 54 A4 0F FE */ srwi r4, r5, 0x1f +/* 8000C330 00009290 88 1F 00 00 */ lbz r0, 0(r31) +/* 8000C334 00009294 7C 84 2A 14 */ add r4, r4, r5 +/* 8000C338 00009298 3B 7E FF F8 */ addi r27, r30, -8 +/* 8000C33C 0000929C 7C 84 0E 70 */ srawi r4, r4, 1 +/* 8000C340 000092A0 98 01 00 10 */ stb r0, 0x10(r1) +/* 8000C344 000092A4 54 80 18 38 */ slwi r0, r4, 3 +/* 8000C348 000092A8 7F 65 DB 78 */ mr r5, r27 +/* 8000C34C 000092AC 7F 9D 02 14 */ add r28, r29, r0 +/* 8000C350 000092B0 38 C1 00 10 */ addi r6, r1, 0x10 +/* 8000C354 000092B4 7F 84 E3 78 */ mr r4, r28 +/* 8000C358 000092B8 48 00 03 A1 */ bl sub_8000c6f8 +/* 8000C35C 000092BC 80 9C 00 00 */ lwz r4, 0(r28) +/* 8000C360 000092C0 3B 9D 00 08 */ addi r28, r29, 8 +/* 8000C364 000092C4 3B 7B FF F8 */ addi r27, r27, -8 +/* 8000C368 000092C8 48 00 00 08 */ b lbl_8000C370 +lbl_8000C36C: +/* 8000C36C 000092CC 3B 9C 00 08 */ addi r28, r28, 8 +lbl_8000C370: +/* 8000C370 000092D0 80 BC 00 00 */ lwz r5, 0(r28) +/* 8000C374 000092D4 7C 05 20 00 */ cmpw r5, r4 +/* 8000C378 000092D8 41 80 FF F4 */ blt lbl_8000C36C +/* 8000C37C 000092DC 48 00 00 08 */ b lbl_8000C384 +lbl_8000C380: +/* 8000C380 000092E0 3B 7B FF F8 */ addi r27, r27, -8 +lbl_8000C384: +/* 8000C384 000092E4 80 1B 00 00 */ lwz r0, 0(r27) +/* 8000C388 000092E8 7C 04 00 00 */ cmpw r4, r0 +/* 8000C38C 000092EC 41 80 FF F4 */ blt lbl_8000C380 +/* 8000C390 000092F0 7C 1C D8 40 */ cmplw r28, r27 +/* 8000C394 000092F4 40 80 00 30 */ bge lbl_8000C3C4 +/* 8000C398 000092F8 A0 7C 00 04 */ lhz r3, 4(r28) +/* 8000C39C 000092FC 90 A1 00 18 */ stw r5, 0x18(r1) +/* 8000C3A0 00009300 90 1C 00 00 */ stw r0, 0(r28) +/* 8000C3A4 00009304 A0 1B 00 04 */ lhz r0, 4(r27) +/* 8000C3A8 00009308 B0 61 00 1C */ sth r3, 0x1c(r1) +/* 8000C3AC 0000930C B0 1C 00 04 */ sth r0, 4(r28) +/* 8000C3B0 00009310 3B 9C 00 08 */ addi r28, r28, 8 +/* 8000C3B4 00009314 90 BB 00 00 */ stw r5, 0(r27) +/* 8000C3B8 00009318 B0 7B 00 04 */ sth r3, 4(r27) +/* 8000C3BC 0000931C 3B 7B FF F8 */ addi r27, r27, -8 +/* 8000C3C0 00009320 4B FF FF B0 */ b lbl_8000C370 +lbl_8000C3C4: +/* 8000C3C4 00009324 88 1F 00 00 */ lbz r0, 0(r31) +/* 8000C3C8 00009328 7F A3 EB 78 */ mr r3, r29 +/* 8000C3CC 0000932C 7F 84 E3 78 */ mr r4, r28 +/* 8000C3D0 00009330 38 A1 00 0C */ addi r5, r1, 0xc +/* 8000C3D4 00009334 98 01 00 0C */ stb r0, 0xc(r1) +/* 8000C3D8 00009338 4B FF FF 09 */ bl sub_8000c2e0 +/* 8000C3DC 0000933C 88 1F 00 00 */ lbz r0, 0(r31) +/* 8000C3E0 00009340 7F 83 E3 78 */ mr r3, r28 +/* 8000C3E4 00009344 7F C4 F3 78 */ mr r4, r30 +/* 8000C3E8 00009348 38 A1 00 08 */ addi r5, r1, 8 +/* 8000C3EC 0000934C 98 01 00 08 */ stb r0, 8(r1) +/* 8000C3F0 00009350 4B FF FE F1 */ bl sub_8000c2e0 +lbl_8000C3F4: +/* 8000C3F4 00009354 BB 61 00 2C */ lmw r27, 0x2c(r1) +/* 8000C3F8 00009358 80 01 00 44 */ lwz r0, 0x44(r1) +/* 8000C3FC 0000935C 7C 08 03 A6 */ mtlr r0 +/* 8000C400 00009360 38 21 00 40 */ addi r1, r1, 0x40 +/* 8000C404 00009364 4E 80 00 20 */ blr + +.global "reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi" +"reserve__Q24rstl45vector<9TUniqueId,Q24rstl17rmemory_allocator>Fi": +/* 8000C408 00009368 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 8000C40C 0000936C 7C 08 02 A6 */ mflr r0 +/* 8000C410 00009370 90 01 00 34 */ stw r0, 0x34(r1) +/* 8000C414 00009374 93 E1 00 2C */ stw r31, 0x2c(r1) +/* 8000C418 00009378 7C 9F 23 78 */ mr r31, r4 +/* 8000C41C 0000937C 93 C1 00 28 */ stw r30, 0x28(r1) +/* 8000C420 00009380 7C 7E 1B 78 */ mr r30, r3 +/* 8000C424 00009384 93 A1 00 24 */ stw r29, 0x24(r1) +/* 8000C428 00009388 80 03 00 08 */ lwz r0, 8(r3) +/* 8000C42C 0000938C 7C 1F 00 00 */ cmpw r31, r0 +/* 8000C430 00009390 40 81 00 A8 */ ble lbl_8000C4D8 +/* 8000C434 00009394 57 E3 08 3D */ rlwinm. r3, r31, 1, 0, 0x1e +/* 8000C438 00009398 40 82 00 0C */ bne lbl_8000C444 +/* 8000C43C 0000939C 3B A0 00 00 */ li r29, 0 +/* 8000C440 000093A0 48 00 00 18 */ b lbl_8000C458 +lbl_8000C444: +/* 8000C444 000093A4 3C 80 80 3D */ lis r4, lbl_803CC028@ha +/* 8000C448 000093A8 38 A0 00 00 */ li r5, 0 +/* 8000C44C 000093AC 38 84 C0 28 */ addi r4, r4, lbl_803CC028@l +/* 8000C450 000093B0 48 30 93 C9 */ bl __nwa__FUlPCcPCc +/* 8000C454 000093B4 7C 7D 1B 78 */ mr r29, r3 +lbl_8000C458: +/* 8000C458 000093B8 80 1E 00 04 */ lwz r0, 4(r30) +/* 8000C45C 000093BC 7F A4 EB 78 */ mr r4, r29 +/* 8000C460 000093C0 80 BE 00 0C */ lwz r5, 0xc(r30) +/* 8000C464 000093C4 54 00 08 3C */ slwi r0, r0, 1 +/* 8000C468 000093C8 7C 65 02 14 */ add r3, r5, r0 +/* 8000C46C 000093CC 90 A1 00 10 */ stw r5, 0x10(r1) +/* 8000C470 000093D0 90 61 00 08 */ stw r3, 8(r1) +/* 8000C474 000093D4 90 61 00 0C */ stw r3, 0xc(r1) +/* 8000C478 000093D8 90 A1 00 14 */ stw r5, 0x14(r1) +/* 8000C47C 000093DC 48 00 00 1C */ b lbl_8000C498 +lbl_8000C480: +/* 8000C480 000093E0 28 04 00 00 */ cmplwi r4, 0 +/* 8000C484 000093E4 41 82 00 0C */ beq lbl_8000C490 +/* 8000C488 000093E8 A0 05 00 00 */ lhz r0, 0(r5) +/* 8000C48C 000093EC B0 04 00 00 */ sth r0, 0(r4) +lbl_8000C490: +/* 8000C490 000093F0 38 84 00 02 */ addi r4, r4, 2 +/* 8000C494 000093F4 38 A5 00 02 */ addi r5, r5, 2 +lbl_8000C498: +/* 8000C498 000093F8 7C 05 18 40 */ cmplw r5, r3 +/* 8000C49C 000093FC 40 82 FF E4 */ bne lbl_8000C480 +/* 8000C4A0 00009400 80 1E 00 04 */ lwz r0, 4(r30) +/* 8000C4A4 00009404 80 7E 00 0C */ lwz r3, 0xc(r30) +/* 8000C4A8 00009408 54 00 08 3C */ slwi r0, r0, 1 +/* 8000C4AC 0000940C 7C 64 1B 78 */ mr r4, r3 +/* 8000C4B0 00009410 7C 03 02 14 */ add r0, r3, r0 +/* 8000C4B4 00009414 48 00 00 08 */ b lbl_8000C4BC +lbl_8000C4B8: +/* 8000C4B8 00009418 38 84 00 02 */ addi r4, r4, 2 +lbl_8000C4BC: +/* 8000C4BC 0000941C 7C 04 00 40 */ cmplw r4, r0 +/* 8000C4C0 00009420 40 82 FF F8 */ bne lbl_8000C4B8 +/* 8000C4C4 00009424 28 03 00 00 */ cmplwi r3, 0 +/* 8000C4C8 00009428 41 82 00 08 */ beq lbl_8000C4D0 +/* 8000C4CC 0000942C 48 30 94 65 */ bl Free__7CMemoryFPCv +lbl_8000C4D0: +/* 8000C4D0 00009430 93 BE 00 0C */ stw r29, 0xc(r30) +/* 8000C4D4 00009434 93 FE 00 08 */ stw r31, 8(r30) +lbl_8000C4D8: +/* 8000C4D8 00009438 80 01 00 34 */ lwz r0, 0x34(r1) +/* 8000C4DC 0000943C 83 E1 00 2C */ lwz r31, 0x2c(r1) +/* 8000C4E0 00009440 83 C1 00 28 */ lwz r30, 0x28(r1) +/* 8000C4E4 00009444 83 A1 00 24 */ lwz r29, 0x24(r1) +/* 8000C4E8 00009448 7C 08 03 A6 */ mtlr r0 +/* 8000C4EC 0000944C 38 21 00 30 */ addi r1, r1, 0x30 +/* 8000C4F0 00009450 4E 80 00 20 */ blr + +.global sub_8000c4f4 +sub_8000c4f4: +/* 8000C4F4 00009454 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8000C4F8 00009458 7C 08 02 A6 */ mflr r0 +/* 8000C4FC 0000945C 90 01 00 14 */ stw r0, 0x14(r1) +/* 8000C500 00009460 93 E1 00 0C */ stw r31, 0xc(r1) +/* 8000C504 00009464 93 C1 00 08 */ stw r30, 8(r1) +/* 8000C508 00009468 7C 7E 1B 78 */ mr r30, r3 +/* 8000C50C 0000946C 80 03 00 04 */ lwz r0, 4(r3) +/* 8000C510 00009470 83 E4 00 04 */ lwz r31, 4(r4) +/* 8000C514 00009474 7C 04 00 40 */ cmplw r4, r0 +/* 8000C518 00009478 40 82 00 08 */ bne lbl_8000C520 +/* 8000C51C 0000947C 93 FE 00 04 */ stw r31, 4(r30) +lbl_8000C520: +/* 8000C520 00009480 80 04 00 04 */ lwz r0, 4(r4) +/* 8000C524 00009484 34 A4 00 08 */ addic. r5, r4, 8 +/* 8000C528 00009488 80 64 00 00 */ lwz r3, 0(r4) +/* 8000C52C 0000948C 90 03 00 04 */ stw r0, 4(r3) +/* 8000C530 00009490 80 04 00 00 */ lwz r0, 0(r4) +/* 8000C534 00009494 80 64 00 04 */ lwz r3, 4(r4) +/* 8000C538 00009498 90 03 00 00 */ stw r0, 0(r3) +/* 8000C53C 0000949C 41 82 00 40 */ beq lbl_8000C57C +/* 8000C540 000094A0 34 05 00 80 */ addic. r0, r5, 0x80 +/* 8000C544 000094A4 41 82 00 10 */ beq lbl_8000C554 +/* 8000C548 000094A8 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha +/* 8000C54C 000094AC 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C550 000094B0 90 05 00 80 */ stw r0, 0x80(r5) +lbl_8000C554: +/* 8000C554 000094B4 34 05 00 44 */ addic. r0, r5, 0x44 +/* 8000C558 000094B8 41 82 00 10 */ beq lbl_8000C568 +/* 8000C55C 000094BC 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha +/* 8000C560 000094C0 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C564 000094C4 90 05 00 44 */ stw r0, 0x44(r5) +lbl_8000C568: +/* 8000C568 000094C8 34 05 00 08 */ addic. r0, r5, 8 +/* 8000C56C 000094CC 41 82 00 10 */ beq lbl_8000C57C +/* 8000C570 000094D0 3C 60 80 3E */ lis r3, lbl_803D8EA8@ha +/* 8000C574 000094D4 38 03 8E A8 */ addi r0, r3, lbl_803D8EA8@l +/* 8000C578 000094D8 90 05 00 08 */ stw r0, 8(r5) +lbl_8000C57C: +/* 8000C57C 000094DC 28 04 00 00 */ cmplwi r4, 0 +/* 8000C580 000094E0 41 82 00 0C */ beq lbl_8000C58C +/* 8000C584 000094E4 7C 83 23 78 */ mr r3, r4 +/* 8000C588 000094E8 48 30 93 A9 */ bl Free__7CMemoryFPCv +lbl_8000C58C: +/* 8000C58C 000094EC 80 9E 00 14 */ lwz r4, 0x14(r30) +/* 8000C590 000094F0 7F E3 FB 78 */ mr r3, r31 +/* 8000C594 000094F4 38 04 FF FF */ addi r0, r4, -1 +/* 8000C598 000094F8 90 1E 00 14 */ stw r0, 0x14(r30) +/* 8000C59C 000094FC 83 E1 00 0C */ lwz r31, 0xc(r1) +/* 8000C5A0 00009500 83 C1 00 08 */ lwz r30, 8(r1) +/* 8000C5A4 00009504 80 01 00 14 */ lwz r0, 0x14(r1) +/* 8000C5A8 00009508 7C 08 03 A6 */ mtlr r0 +/* 8000C5AC 0000950C 38 21 00 10 */ addi r1, r1, 0x10 +/* 8000C5B0 00009510 4E 80 00 20 */ blr + +.global sub_8000c5b4 +sub_8000c5b4: +/* 8000C5B4 00009514 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8000C5B8 00009518 7C 08 02 A6 */ mflr r0 +/* 8000C5BC 0000951C 90 01 00 24 */ stw r0, 0x24(r1) +/* 8000C5C0 00009520 93 E1 00 1C */ stw r31, 0x1c(r1) +/* 8000C5C4 00009524 93 C1 00 18 */ stw r30, 0x18(r1) +/* 8000C5C8 00009528 7C 9E 23 78 */ mr r30, r4 +/* 8000C5CC 0000952C 93 A1 00 14 */ stw r29, 0x14(r1) +/* 8000C5D0 00009530 7C 7D 1B 79 */ or. r29, r3, r3 +/* 8000C5D4 00009534 41 82 00 80 */ beq lbl_8000C654 +/* 8000C5D8 00009538 83 FD 00 04 */ lwz r31, 4(r29) +/* 8000C5DC 0000953C 48 00 00 5C */ b lbl_8000C638 +lbl_8000C5E0: +/* 8000C5E0 00009540 7F E3 FB 78 */ mr r3, r31 +/* 8000C5E4 00009544 83 FF 00 04 */ lwz r31, 4(r31) +/* 8000C5E8 00009548 34 A3 00 08 */ addic. r5, r3, 8 +/* 8000C5EC 0000954C 41 82 00 40 */ beq lbl_8000C62C +/* 8000C5F0 00009550 34 05 00 80 */ addic. r0, r5, 0x80 +/* 8000C5F4 00009554 41 82 00 10 */ beq lbl_8000C604 +/* 8000C5F8 00009558 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha +/* 8000C5FC 0000955C 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C600 00009560 90 05 00 80 */ stw r0, 0x80(r5) +lbl_8000C604: +/* 8000C604 00009564 34 05 00 44 */ addic. r0, r5, 0x44 +/* 8000C608 00009568 41 82 00 10 */ beq lbl_8000C618 +/* 8000C60C 0000956C 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha +/* 8000C610 00009570 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C614 00009574 90 05 00 44 */ stw r0, 0x44(r5) +lbl_8000C618: +/* 8000C618 00009578 34 05 00 08 */ addic. r0, r5, 8 +/* 8000C61C 0000957C 41 82 00 10 */ beq lbl_8000C62C +/* 8000C620 00009580 3C 80 80 3E */ lis r4, lbl_803D8EA8@ha +/* 8000C624 00009584 38 04 8E A8 */ addi r0, r4, lbl_803D8EA8@l +/* 8000C628 00009588 90 05 00 08 */ stw r0, 8(r5) +lbl_8000C62C: +/* 8000C62C 0000958C 28 03 00 00 */ cmplwi r3, 0 +/* 8000C630 00009590 41 82 00 08 */ beq lbl_8000C638 +/* 8000C634 00009594 48 30 92 FD */ bl Free__7CMemoryFPCv +lbl_8000C638: +/* 8000C638 00009598 80 1D 00 08 */ lwz r0, 8(r29) +/* 8000C63C 0000959C 7C 1F 00 40 */ cmplw r31, r0 +/* 8000C640 000095A0 40 82 FF A0 */ bne lbl_8000C5E0 +/* 8000C644 000095A4 7F C0 07 35 */ extsh. r0, r30 +/* 8000C648 000095A8 40 81 00 0C */ ble lbl_8000C654 +/* 8000C64C 000095AC 7F A3 EB 78 */ mr r3, r29 +/* 8000C650 000095B0 48 30 92 E1 */ bl Free__7CMemoryFPCv +lbl_8000C654: +/* 8000C654 000095B4 80 01 00 24 */ lwz r0, 0x24(r1) +/* 8000C658 000095B8 7F A3 EB 78 */ mr r3, r29 +/* 8000C65C 000095BC 83 E1 00 1C */ lwz r31, 0x1c(r1) +/* 8000C660 000095C0 83 C1 00 18 */ lwz r30, 0x18(r1) +/* 8000C664 000095C4 83 A1 00 14 */ lwz r29, 0x14(r1) +/* 8000C668 000095C8 7C 08 03 A6 */ mtlr r0 +/* 8000C66C 000095CC 38 21 00 20 */ addi r1, r1, 0x20 +/* 8000C670 000095D0 4E 80 00 20 */ blr + +.global sub_8000c674 +sub_8000c674: +/* 8000C674 000095D4 38 A3 00 08 */ addi r5, r3, 8 +/* 8000C678 000095D8 38 04 00 07 */ addi r0, r4, 7 +/* 8000C67C 000095DC 7C 05 00 50 */ subf r0, r5, r0 +/* 8000C680 000095E0 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 8000C684 000095E4 54 00 E8 FE */ srwi r0, r0, 3 +/* 8000C688 000095E8 7C 09 03 A6 */ mtctr r0 +/* 8000C68C 000095EC 7C 05 20 40 */ cmplw r5, r4 +/* 8000C690 000095F0 40 80 00 60 */ bge lbl_8000C6F0 +lbl_8000C694: +/* 8000C694 000095F4 80 85 00 00 */ lwz r4, 0(r5) +/* 8000C698 000095F8 7C A7 2B 78 */ mr r7, r5 +/* 8000C69C 000095FC A0 05 00 04 */ lhz r0, 4(r5) +/* 8000C6A0 00009600 38 C5 FF F8 */ addi r6, r5, -8 +/* 8000C6A4 00009604 90 81 00 08 */ stw r4, 8(r1) +/* 8000C6A8 00009608 B0 01 00 0C */ sth r0, 0xc(r1) +/* 8000C6AC 0000960C 48 00 00 18 */ b lbl_8000C6C4 +lbl_8000C6B0: +/* 8000C6B0 00009610 90 07 00 00 */ stw r0, 0(r7) +/* 8000C6B4 00009614 A0 06 00 04 */ lhz r0, 4(r6) +/* 8000C6B8 00009618 38 C6 FF F8 */ addi r6, r6, -8 +/* 8000C6BC 0000961C B0 07 00 04 */ sth r0, 4(r7) +/* 8000C6C0 00009620 38 E7 FF F8 */ addi r7, r7, -8 +lbl_8000C6C4: +/* 8000C6C4 00009624 7C 03 38 40 */ cmplw r3, r7 +/* 8000C6C8 00009628 40 80 00 10 */ bge lbl_8000C6D8 +/* 8000C6CC 0000962C 80 06 00 00 */ lwz r0, 0(r6) +/* 8000C6D0 00009630 7C 04 00 00 */ cmpw r4, r0 +/* 8000C6D4 00009634 41 80 FF DC */ blt lbl_8000C6B0 +lbl_8000C6D8: +/* 8000C6D8 00009638 80 81 00 08 */ lwz r4, 8(r1) +/* 8000C6DC 0000963C 38 A5 00 08 */ addi r5, r5, 8 +/* 8000C6E0 00009640 A0 01 00 0C */ lhz r0, 0xc(r1) +/* 8000C6E4 00009644 90 87 00 00 */ stw r4, 0(r7) +/* 8000C6E8 00009648 B0 07 00 04 */ sth r0, 4(r7) +/* 8000C6EC 0000964C 42 00 FF A8 */ bdnz lbl_8000C694 +lbl_8000C6F0: +/* 8000C6F0 00009650 38 21 00 10 */ addi r1, r1, 0x10 +/* 8000C6F4 00009654 4E 80 00 20 */ blr + +.global sub_8000c6f8 +sub_8000c6f8: +/* 8000C6F8 00009658 94 21 FF E0 */ stwu r1, -0x20(r1) +/* 8000C6FC 0000965C 80 04 00 00 */ lwz r0, 0(r4) +/* 8000C700 00009660 80 E3 00 00 */ lwz r7, 0(r3) +/* 8000C704 00009664 7C 00 38 00 */ cmpw r0, r7 +/* 8000C708 00009668 40 80 00 24 */ bge lbl_8000C72C +/* 8000C70C 0000966C A0 C3 00 04 */ lhz r6, 4(r3) +/* 8000C710 00009670 90 E1 00 08 */ stw r7, 8(r1) +/* 8000C714 00009674 90 03 00 00 */ stw r0, 0(r3) +/* 8000C718 00009678 A0 04 00 04 */ lhz r0, 4(r4) +/* 8000C71C 0000967C B0 C1 00 0C */ sth r6, 0xc(r1) +/* 8000C720 00009680 B0 03 00 04 */ sth r0, 4(r3) +/* 8000C724 00009684 90 E4 00 00 */ stw r7, 0(r4) +/* 8000C728 00009688 B0 C4 00 04 */ sth r6, 4(r4) +lbl_8000C72C: +/* 8000C72C 0000968C 80 E5 00 00 */ lwz r7, 0(r5) +/* 8000C730 00009690 80 04 00 00 */ lwz r0, 0(r4) +/* 8000C734 00009694 7C 07 00 00 */ cmpw r7, r0 +/* 8000C738 00009698 40 80 00 48 */ bge lbl_8000C780 +/* 8000C73C 0000969C A0 C5 00 04 */ lhz r6, 4(r5) +/* 8000C740 000096A0 90 E1 00 10 */ stw r7, 0x10(r1) +/* 8000C744 000096A4 90 05 00 00 */ stw r0, 0(r5) +/* 8000C748 000096A8 A0 04 00 04 */ lhz r0, 4(r4) +/* 8000C74C 000096AC B0 C1 00 14 */ sth r6, 0x14(r1) +/* 8000C750 000096B0 B0 05 00 04 */ sth r0, 4(r5) +/* 8000C754 000096B4 80 03 00 00 */ lwz r0, 0(r3) +/* 8000C758 000096B8 7C 07 00 00 */ cmpw r7, r0 +/* 8000C75C 000096BC 40 80 00 1C */ bge lbl_8000C778 +/* 8000C760 000096C0 90 04 00 00 */ stw r0, 0(r4) +/* 8000C764 000096C4 A0 03 00 04 */ lhz r0, 4(r3) +/* 8000C768 000096C8 B0 04 00 04 */ sth r0, 4(r4) +/* 8000C76C 000096CC 90 E3 00 00 */ stw r7, 0(r3) +/* 8000C770 000096D0 B0 C3 00 04 */ sth r6, 4(r3) +/* 8000C774 000096D4 48 00 00 0C */ b lbl_8000C780 +lbl_8000C778: +/* 8000C778 000096D8 90 E4 00 00 */ stw r7, 0(r4) +/* 8000C77C 000096DC B0 C4 00 04 */ sth r6, 4(r4) +lbl_8000C780: +/* 8000C780 000096E0 38 21 00 20 */ addi r1, r1, 0x20 +/* 8000C784 000096E4 4E 80 00 20 */ blr diff --git a/asm/Kyoto_CWD/main.s b/asm/Kyoto_CWD/main.s index 702537bc..e47b2557 100644 --- a/asm/Kyoto_CWD/main.s +++ b/asm/Kyoto_CWD/main.s @@ -1,5 +1,17 @@ .include "macros.inc" +.section .bss + +.global lbl_803F7560 +lbl_803F7560: + .skip 0x60168 +.global lbl_804576C8 +lbl_804576C8: + .skip 0xD0 +.global lbl_80457798 +lbl_80457798: + .skip 0x160 + .section .data, "wa" .global lbl_803D8D60 lbl_803D8D60: diff --git a/asm/Kyoto_CWD/text_80008894_80009144.s b/asm/Kyoto_CWD/text_80008894_80009144.s index 9f0212fd..bfb9f119 100644 --- a/asm/Kyoto_CWD/text_80008894_80009144.s +++ b/asm/Kyoto_CWD/text_80008894_80009144.s @@ -1,5 +1,18 @@ .include "macros.inc" +.section .sdata2 + +.global lbl_805A9D7C +lbl_805A9D7C: + # ROM: 0x3F661C + .4byte 0x3F800000 + +.global lbl_805A9D80 +lbl_805A9D80: + # ROM: 0x3F6620 + .4byte 0x43300000 + .4byte 0x80000000 + .section .text, "ax" # 0x80003640 - 0x803CB1C0 diff --git a/asm/bss.s b/asm/bss.s index a0234a73..acc3008a 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -1,15 +1,6 @@ .include "macros.inc" .section .bss, "wa" # 0x803F7560 - 0x805A6BBF -.global lbl_803F7560 -lbl_803F7560: - .skip 0x60168 -.global lbl_804576C8 -lbl_804576C8: - .skip 0xD0 -.global lbl_80457798 -lbl_80457798: - .skip 0x160 .global lbl_804578F8 lbl_804578F8: .skip 0x10 diff --git a/asm/bss_sinit.s b/asm/bss_sinit.s deleted file mode 100644 index 5d478d77..00000000 --- a/asm/bss_sinit.s +++ /dev/null @@ -1,444 +0,0 @@ -.include "macros.inc" - -# Data used by the __sinit_* functions - -.section .bss, "wa" -.global lbl_8056A5A0 -lbl_8056A5A0: - .skip 0x48 -.global lbl_8056A5E8 -lbl_8056A5E8: - .skip 0xC -.global lbl_8056A5F4 -lbl_8056A5F4: - .skip 0xC -.global lbl_8056A600 -lbl_8056A600: - .skip 0x17F4 -.global lbl_8056BDF4 -lbl_8056BDF4: - .skip 0x4C4 -.global lbl_8056C2B8 -lbl_8056C2B8: - .skip 0x734 -.global lbl_8056C9EC -lbl_8056C9EC: - .skip 0x554 -.global lbl_8056CF40 -lbl_8056CF40: - .skip 0x4C4 -.global lbl_8056D404 -lbl_8056D404: - .skip 0xC -.global lbl_8056D410 -lbl_8056D410: - .skip 0x10 -.global lbl_8056D420 -lbl_8056D420: - .skip 0xD4 -.global lbl_8056D4F4 -lbl_8056D4F4: - .skip 0x84 -.global lbl_8056D578 -lbl_8056D578: - .skip 0x1A0 -.global lbl_8056D718 -lbl_8056D718: - .skip 0x68 -.global lbl_8056D780 -lbl_8056D780: - .skip 0x68 -.global lbl_8056D7E8 -lbl_8056D7E8: - .skip 0x68 -.global lbl_8056D850 -lbl_8056D850: - .skip 0x1F08 -.global lbl_8056F758 -lbl_8056F758: - .skip 0x104 -.global lbl_8056F85C -lbl_8056F85C: - .skip 0x38 -.global lbl_8056F894 -lbl_8056F894: - .skip 0x10 -.global lbl_8056F8A4 -lbl_8056F8A4: - .skip 0x10 -.global lbl_8056F8B4 -lbl_8056F8B4: - .skip 0x750 -.global lbl_80570004 -lbl_80570004: - .skip 0x948 -.global lbl_8057094C -lbl_8057094C: - .skip 0x1000 -.global lbl_8057194C -lbl_8057194C: - .skip 0x40 -.global lbl_8057198C -lbl_8057198C: - .skip 0x40 -.global lbl_805719CC -lbl_805719CC: - .skip 0x10 -.global lbl_805719DC -lbl_805719DC: - .skip 0xC -.global lbl_805719E8 -lbl_805719E8: - .skip 0x1A8 -.global lbl_80571B90 -lbl_80571B90: - .skip 0xD4 -.global lbl_80571C64 -lbl_80571C64: - .skip 0x208 -.global lbl_80571E6C -lbl_80571E6C: - .skip 0x68 -.global lbl_80571ED4 -lbl_80571ED4: - .skip 0x68 -.global lbl_80571F3C -lbl_80571F3C: - .skip 0x68 -.global lbl_80571FA4 -lbl_80571FA4: - .skip 0x68 -.global lbl_8057200C -lbl_8057200C: - .skip 0xC -.global lbl_80572018 -lbl_80572018: - .skip 0xC -.global lbl_80572024 -lbl_80572024: - .skip 0x18 -.global lbl_8057203C -lbl_8057203C: - .skip 0xC -.global lbl_80572048 -lbl_80572048: - .skip 0x18 -.global lbl_80572060 -lbl_80572060: - .skip 0xC -.global lbl_8057206C -lbl_8057206C: - .skip 0xC -.global lbl_80572078 -lbl_80572078: - .skip 0x60 -.global lbl_805720D8 -lbl_805720D8: - .skip 0x10 -.global lbl_805720E8 -lbl_805720E8: - .skip 0x10 -.global lbl_805720F8 -lbl_805720F8: - .skip 0x10 -.global lbl_80572108 -lbl_80572108: - .skip 0x10 -.global lbl_80572118 -lbl_80572118: - .skip 0x10 -.global lbl_80572128 -lbl_80572128: - .skip 0xC -.global lbl_80572134 -lbl_80572134: - .skip 0xC -.global lbl_80572140 -lbl_80572140: - .skip 0x2A0 -.global lbl_805723E0 -lbl_805723E0: - .skip 0x18 -.global lbl_805723F8 -lbl_805723F8: - .skip 0xC -.global lbl_80572404 -lbl_80572404: - .skip 0x110 -.global lbl_80572514 -lbl_80572514: - .skip 0x10 -.global lbl_80572524 -lbl_80572524: - .skip 0x10 -.global lbl_80572534 -lbl_80572534: - .skip 0x10 -.global lbl_80572544 -lbl_80572544: - .skip 0x68 -.global lbl_805725AC -lbl_805725AC: - .skip 0x68 -.global lbl_80572614 -lbl_80572614: - .skip 0x74 -.global lbl_80572688 -lbl_80572688: - .skip 0xC -.global lbl_80572694 -lbl_80572694: - .skip 0x68 -.global lbl_805726FC -lbl_805726FC: - .skip 0x4B0 -.global lbl_80572BAC -lbl_80572BAC: - .skip 0x19000 -.global lbl_8058BBAC -lbl_8058BBAC: - .skip 0xC000 -.global lbl_80597BAC -lbl_80597BAC: - .skip 0x8000 -.global lbl_8059FBAC -lbl_8059FBAC: - .skip 0x18 -.global lbl_8059FBC4 -lbl_8059FBC4: - .skip 0xC -.global lbl_8059FBD0 -lbl_8059FBD0: - .skip 0xA8 -.global lbl_8059FC78 -lbl_8059FC78: - .skip 0x18 -.global lbl_8059FC90 -lbl_8059FC90: - .skip 0x18 -.global lbl_8059FCA8 -lbl_8059FCA8: - .skip 0x18 -.global lbl_8059FCC0 -lbl_8059FCC0: - .skip 0x18 -.global lbl_8059FCD8 -lbl_8059FCD8: - .skip 0x18 -.global lbl_8059FCF0 -lbl_8059FCF0: - .skip 0x18 -.global lbl_8059FD08 -lbl_8059FD08: - .skip 0x10 -.global lbl_8059FD18 -lbl_8059FD18: - .skip 0x18 -.global mData__10CStopwatch -mData__10CStopwatch: - .skip 0x18 -.global lbl_8059FD48 -lbl_8059FD48: - .skip 0x2BC -.global lbl_805A0004 -lbl_805A0004: - .skip 0x2B5C -.global lbl_805A2B60 -lbl_805A2B60: - .skip 0x1604 -.global lbl_805A4164 -lbl_805A4164: - .skip 0xA04 -.global lbl_805A4B68 -lbl_805A4B68: - .skip 0x1E0 -.global lbl_805A4D48 -lbl_805A4D48: - .skip 0x9C -.global lbl_805A4DE4 -lbl_805A4DE4: - .skip 0x154 -.global lbl_805A4F38 -lbl_805A4F38: - .skip 0x60 -.global lbl_805A4F98 -lbl_805A4F98: - .skip 0x1E0 -.global lbl_805A5178 -lbl_805A5178: - .skip 0x9C -.global lbl_805A5214 -lbl_805A5214: - .skip 0x154 -.global lbl_805A5368 -lbl_805A5368: - .skip 0x60 -.global lbl_805A53C8 -lbl_805A53C8: - .skip 0x18 -.global lbl_805A53E0 -lbl_805A53E0: - .skip 0xC -.global lbl_805A53EC -lbl_805A53EC: - .skip 0x260 -.global lbl_805A564C -lbl_805A564C: - .skip 0x4C -.global lbl_805A5698 -lbl_805A5698: - .skip 0x7D8 -.global lbl_805A5E70 -lbl_805A5E70: - .skip 0x4C -.global lbl_805A5EBC -lbl_805A5EBC: - .skip 0x4C -.global lbl_805A5F08 -lbl_805A5F08: - .skip 0x4C -.global lbl_805A5F54 -lbl_805A5F54: - .skip 0x4C -.global lbl_805A5FA0 -lbl_805A5FA0: - .skip 0x4C -.global lbl_805A5FEC -lbl_805A5FEC: - .skip 0x4C -.global lbl_805A6038 -lbl_805A6038: - .skip 0x4C -.global lbl_805A6084 -lbl_805A6084: - .skip 0x4C -.global lbl_805A60D0 -lbl_805A60D0: - .skip 0xA0 -.global lbl_805A6170 -lbl_805A6170: - .skip 0x30 -.global lbl_805A61A0 -lbl_805A61A0: - .skip 0xC -.global lbl_805A61AC -lbl_805A61AC: - .skip 0xC -.global lbl_805A61B8 -lbl_805A61B8: - .skip 0x1C -.global lbl_805A61D4 -lbl_805A61D4: - .skip 0x30 -.global lbl_805A6204 -lbl_805A6204: - .skip 0x30 -.global lbl_805A6234 -lbl_805A6234: - .skip 0xC -.global lbl_805A6240 -lbl_805A6240: - .skip 0x200 -.global lbl_805A6440 -lbl_805A6440: - .skip 0x80 -.global lbl_805A64C0 -lbl_805A64C0: - .skip 0x40 -.global lbl_805A6500 -lbl_805A6500: - .skip 0x3C -.global lbl_805A653C -lbl_805A653C: - .skip 0x30 -.global lbl_805A656C -lbl_805A656C: - .skip 0x30 -.global lbl_805A659C -lbl_805A659C: - .skip 0x30 -.global lbl_805A65CC -lbl_805A65CC: - .skip 0x30 -.global lbl_805A65FC -lbl_805A65FC: - .skip 0x24 -.global lbl_805A6620 -lbl_805A6620: - .skip 0x40 -.global lbl_805A6660 -lbl_805A6660: - .skip 0x10 -.global skIdentity4f -skIdentity4f: - .skip 0x30 -.global skZero3f -skZero3f: - .skip 0xC -.skip 0x48 -.global lbl_805A66F4 -lbl_805A66F4: - .skip 0xC -.global lbl_805A6700 -lbl_805A6700: - .skip 0xC -.global lbl_805A670C -lbl_805A670C: - .skip 0xC -.global lbl_805A6718 -lbl_805A6718: - .skip 0xC -.global lbl_805A6724 -lbl_805A6724: - .skip 0xC -.global lbl_805A6730 -lbl_805A6730: - .skip 0xC -.global lbl_805A673C -lbl_805A673C: - .skip 0x18 -.global lbl_805A6754 -lbl_805A6754: - .skip 0x30 -.global lbl_805A6784 -lbl_805A6784: - .skip 0x18 -.global lbl_805A679C -lbl_805A679C: - .skip 0x18 -.global lbl_805A67B4 -lbl_805A67B4: - .skip 0xC -.global lbl_805A67C0 -lbl_805A67C0: - .skip 0xC -.global lbl_805A67CC -lbl_805A67CC: - .skip 0x10 -.global lbl_805A67DC -lbl_805A67DC: - .skip 0x20 -.global lbl_805A67FC -lbl_805A67FC: - .skip 0x10 -.global lbl_805A680C -lbl_805A680C: - .skip 0x1C -.global lbl_805A6828 -lbl_805A6828: - .skip 0x38 -.global lbl_805A6860 -lbl_805A6860: - .skip 0x300 -.global lbl_805A6B60 -lbl_805A6B60: - .skip 0x30 -.global lbl_805A6B90 -lbl_805A6B90: - .skip 0x10 -.global lbl_805A6BA0 -lbl_805A6BA0: - .skip 0x4 -.global lbl_805A6BA8 -lbl_805A6BA8: - .skip 0xC diff --git a/asm/ctors.s b/asm/ctors.s index 85473dd2..b753b067 100644 --- a/asm/ctors.s +++ b/asm/ctors.s @@ -1,5 +1,447 @@ .include "macros.inc" +.section .bss, "wa" + +.global lbl_8056A5A0 +lbl_8056A5A0: + .skip 0x48 +.global lbl_8056A5E8 +lbl_8056A5E8: + .skip 0xC +.global lbl_8056A5F4 +lbl_8056A5F4: + .skip 0xC +.global lbl_8056A600 +lbl_8056A600: + .skip 0x17F4 +.global lbl_8056BDF4 +lbl_8056BDF4: + .skip 0x4C4 +.global lbl_8056C2B8 +lbl_8056C2B8: + .skip 0x734 +.global lbl_8056C9EC +lbl_8056C9EC: + .skip 0x554 +.global lbl_8056CF40 +lbl_8056CF40: + .skip 0x4C4 +.global lbl_8056D404 +lbl_8056D404: + .skip 0xC +.global lbl_8056D410 +lbl_8056D410: + .skip 0x10 +.global lbl_8056D420 +lbl_8056D420: + .skip 0xD4 +.global lbl_8056D4F4 +lbl_8056D4F4: + .skip 0x84 +.global lbl_8056D578 +lbl_8056D578: + .skip 0x1A0 +.global lbl_8056D718 +lbl_8056D718: + .skip 0x68 +.global lbl_8056D780 +lbl_8056D780: + .skip 0x68 +.global lbl_8056D7E8 +lbl_8056D7E8: + .skip 0x68 +.global lbl_8056D850 +lbl_8056D850: + .skip 0x1F08 +.global lbl_8056F758 +lbl_8056F758: + .skip 0x104 +.global lbl_8056F85C +lbl_8056F85C: + .skip 0x38 +.global lbl_8056F894 +lbl_8056F894: + .skip 0x10 +.global lbl_8056F8A4 +lbl_8056F8A4: + .skip 0x10 +.global lbl_8056F8B4 +lbl_8056F8B4: + .skip 0x750 +.global lbl_80570004 +lbl_80570004: + .skip 0x948 +.global lbl_8057094C +lbl_8057094C: + .skip 0x1000 +.global lbl_8057194C +lbl_8057194C: + .skip 0x40 +.global lbl_8057198C +lbl_8057198C: + .skip 0x40 +.global lbl_805719CC +lbl_805719CC: + .skip 0x10 +.global lbl_805719DC +lbl_805719DC: + .skip 0xC +.global lbl_805719E8 +lbl_805719E8: + .skip 0x1A8 +.global lbl_80571B90 +lbl_80571B90: + .skip 0xD4 +.global lbl_80571C64 +lbl_80571C64: + .skip 0x208 +.global lbl_80571E6C +lbl_80571E6C: + .skip 0x68 +.global lbl_80571ED4 +lbl_80571ED4: + .skip 0x68 +.global lbl_80571F3C +lbl_80571F3C: + .skip 0x68 +.global lbl_80571FA4 +lbl_80571FA4: + .skip 0x68 +.global lbl_8057200C +lbl_8057200C: + .skip 0xC +.global lbl_80572018 +lbl_80572018: + .skip 0xC +.global lbl_80572024 +lbl_80572024: + .skip 0x18 +.global lbl_8057203C +lbl_8057203C: + .skip 0xC +.global lbl_80572048 +lbl_80572048: + .skip 0x18 +.global lbl_80572060 +lbl_80572060: + .skip 0xC +.global lbl_8057206C +lbl_8057206C: + .skip 0xC +.global lbl_80572078 +lbl_80572078: + .skip 0x60 +.global lbl_805720D8 +lbl_805720D8: + .skip 0x10 +.global lbl_805720E8 +lbl_805720E8: + .skip 0x10 +.global lbl_805720F8 +lbl_805720F8: + .skip 0x10 +.global lbl_80572108 +lbl_80572108: + .skip 0x10 +.global lbl_80572118 +lbl_80572118: + .skip 0x10 +.global lbl_80572128 +lbl_80572128: + .skip 0xC +.global lbl_80572134 +lbl_80572134: + .skip 0xC +.global lbl_80572140 +lbl_80572140: + .skip 0x2A0 +.global lbl_805723E0 +lbl_805723E0: + .skip 0x18 +.global lbl_805723F8 +lbl_805723F8: + .skip 0xC +.global lbl_80572404 +lbl_80572404: + .skip 0x110 +.global lbl_80572514 +lbl_80572514: + .skip 0x10 +.global lbl_80572524 +lbl_80572524: + .skip 0x10 +.global lbl_80572534 +lbl_80572534: + .skip 0x10 +.global lbl_80572544 +lbl_80572544: + .skip 0x68 +.global lbl_805725AC +lbl_805725AC: + .skip 0x68 +.global lbl_80572614 +lbl_80572614: + .skip 0x74 +.global lbl_80572688 +lbl_80572688: + .skip 0xC +.global lbl_80572694 +lbl_80572694: + .skip 0x68 +.global lbl_805726FC +lbl_805726FC: + .skip 0x4B0 +.global lbl_80572BAC +lbl_80572BAC: + .skip 0x19000 +.global lbl_8058BBAC +lbl_8058BBAC: + .skip 0xC000 +.global lbl_80597BAC +lbl_80597BAC: + .skip 0x8000 +.global lbl_8059FBAC +lbl_8059FBAC: + .skip 0x18 +.global lbl_8059FBC4 +lbl_8059FBC4: + .skip 0xC +.global lbl_8059FBD0 +lbl_8059FBD0: + .skip 0xA8 +.global lbl_8059FC78 +lbl_8059FC78: + .skip 0x18 +.global lbl_8059FC90 +lbl_8059FC90: + .skip 0x18 +.global lbl_8059FCA8 +lbl_8059FCA8: + .skip 0x18 +.global lbl_8059FCC0 +lbl_8059FCC0: + .skip 0x18 +.global lbl_8059FCD8 +lbl_8059FCD8: + .skip 0x18 +.global lbl_8059FCF0 +lbl_8059FCF0: + .skip 0x18 +.global lbl_8059FD08 +lbl_8059FD08: + .skip 0x10 +.global lbl_8059FD18 +lbl_8059FD18: + .skip 0x18 +.global mData__10CStopwatch +mData__10CStopwatch: + .skip 0x18 +.global lbl_8059FD48 +lbl_8059FD48: + .skip 0x2BC +.global lbl_805A0004 +lbl_805A0004: + .skip 0x2B5C +.global lbl_805A2B60 +lbl_805A2B60: + .skip 0x1604 +.global lbl_805A4164 +lbl_805A4164: + .skip 0xA04 +.global lbl_805A4B68 +lbl_805A4B68: + .skip 0x1E0 +.global lbl_805A4D48 +lbl_805A4D48: + .skip 0x9C +.global lbl_805A4DE4 +lbl_805A4DE4: + .skip 0x154 +.global lbl_805A4F38 +lbl_805A4F38: + .skip 0x60 +.global lbl_805A4F98 +lbl_805A4F98: + .skip 0x1E0 +.global lbl_805A5178 +lbl_805A5178: + .skip 0x9C +.global lbl_805A5214 +lbl_805A5214: + .skip 0x154 +.global lbl_805A5368 +lbl_805A5368: + .skip 0x60 +.global lbl_805A53C8 +lbl_805A53C8: + .skip 0x18 +.global lbl_805A53E0 +lbl_805A53E0: + .skip 0xC +.global lbl_805A53EC +lbl_805A53EC: + .skip 0x260 +.global lbl_805A564C +lbl_805A564C: + .skip 0x4C +.global lbl_805A5698 +lbl_805A5698: + .skip 0x7D8 +.global lbl_805A5E70 +lbl_805A5E70: + .skip 0x4C +.global lbl_805A5EBC +lbl_805A5EBC: + .skip 0x4C +.global lbl_805A5F08 +lbl_805A5F08: + .skip 0x4C +.global lbl_805A5F54 +lbl_805A5F54: + .skip 0x4C +.global lbl_805A5FA0 +lbl_805A5FA0: + .skip 0x4C +.global lbl_805A5FEC +lbl_805A5FEC: + .skip 0x4C +.global lbl_805A6038 +lbl_805A6038: + .skip 0x4C +.global lbl_805A6084 +lbl_805A6084: + .skip 0x4C +.global lbl_805A60D0 +lbl_805A60D0: + .skip 0xA0 +.global lbl_805A6170 +lbl_805A6170: + .skip 0x30 +.global lbl_805A61A0 +lbl_805A61A0: + .skip 0xC +.global lbl_805A61AC +lbl_805A61AC: + .skip 0xC +.global lbl_805A61B8 +lbl_805A61B8: + .skip 0x1C +.global lbl_805A61D4 +lbl_805A61D4: + .skip 0x30 +.global lbl_805A6204 +lbl_805A6204: + .skip 0x30 +.global lbl_805A6234 +lbl_805A6234: + .skip 0xC +.global lbl_805A6240 +lbl_805A6240: + .skip 0x200 +.global lbl_805A6440 +lbl_805A6440: + .skip 0x80 +.global lbl_805A64C0 +lbl_805A64C0: + .skip 0x40 +.global lbl_805A6500 +lbl_805A6500: + .skip 0x3C +.global lbl_805A653C +lbl_805A653C: + .skip 0x30 +.global lbl_805A656C +lbl_805A656C: + .skip 0x30 +.global lbl_805A659C +lbl_805A659C: + .skip 0x30 +.global lbl_805A65CC +lbl_805A65CC: + .skip 0x30 +.global lbl_805A65FC +lbl_805A65FC: + .skip 0x24 +.global lbl_805A6620 +lbl_805A6620: + .skip 0x40 +.global lbl_805A6660 +lbl_805A6660: + .skip 0x10 +.global skIdentity4f +skIdentity4f: + .skip 0x30 +.global skZero3f +skZero3f: + .skip 0xC +.skip 0x48 +.global lbl_805A66F4 +lbl_805A66F4: + .skip 0xC +.global lbl_805A6700 +lbl_805A6700: + .skip 0xC +.global lbl_805A670C +lbl_805A670C: + .skip 0xC +.global lbl_805A6718 +lbl_805A6718: + .skip 0xC +.global lbl_805A6724 +lbl_805A6724: + .skip 0xC +.global lbl_805A6730 +lbl_805A6730: + .skip 0xC +.global lbl_805A673C +lbl_805A673C: + .skip 0x18 +.global lbl_805A6754 +lbl_805A6754: + .skip 0x30 +.global lbl_805A6784 +lbl_805A6784: + .skip 0x18 +.global lbl_805A679C +lbl_805A679C: + .skip 0x18 +.global lbl_805A67B4 +lbl_805A67B4: + .skip 0xC +.global lbl_805A67C0 +lbl_805A67C0: + .skip 0xC +.global lbl_805A67CC +lbl_805A67CC: + .skip 0x10 +.global lbl_805A67DC +lbl_805A67DC: + .skip 0x20 +.global lbl_805A67FC +lbl_805A67FC: + .skip 0x10 +.global lbl_805A680C +lbl_805A680C: + .skip 0x1C +.global lbl_805A6828 +lbl_805A6828: + .skip 0x38 +.global lbl_805A6860 +lbl_805A6860: + .skip 0x300 +.global lbl_805A6B60 +lbl_805A6B60: + .skip 0x30 +.global lbl_805A6B90 +lbl_805A6B90: + .skip 0x10 +.global lbl_805A6BA0 +lbl_805A6BA0: + .skip 0x4 +.global lbl_805A6BA8 +lbl_805A6BA8: + .skip 0xC + .section .ctors, "wa" # 0x803CB1C0 - 0x803CB380 .global __init_cpp_exceptions_reference __init_cpp_exceptions_reference: diff --git a/asm/rodata.s b/asm/rodata.s index bc61ae3f..5eedeb86 100644 --- a/asm/rodata.s +++ b/asm/rodata.s @@ -2,9 +2,6 @@ .section .rodata, "a" # 0x803CB3A0 - 0x803D8D60 -.global lbl_803CC028 -lbl_803CC028: - .incbin "baserom.dol", 0x3C9028, 0x8 .global lbl_803CC030 lbl_803CC030: .incbin "baserom.dol", 0x3C9030, 0x3F0 diff --git a/asm/sdata.s b/asm/sdata.s index 472f8a3e..a6791112 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -2,42 +2,6 @@ .section .sdata, "wa" # 0x805A6BC0 - 0x805A8C1C -.global lbl_805A6BD0 -lbl_805A6BD0: - # ROM: 0x3F4570 - .4byte 0x425C0000 - -.global lbl_805A6BD4 -lbl_805A6BD4: - # ROM: 0x3F4574 - .4byte 0x42700000 - -.global lbl_805A6BD8 -lbl_805A6BD8: - # ROM: 0x3F4578 - .4byte 0x3E4CCCCD - -.global lbl_805A6BDC -lbl_805A6BDC: - # ROM: 0x3F457C - .4byte 0x443B8000 - -.global lbl_805A6BE0 -lbl_805A6BE0: - # ROM: 0x3F4580 - .4byte 0x3FB5C28F - -.global lbl_805A6BE4 -lbl_805A6BE4: - # ROM: 0x3F4584 - .4byte 0x42C80000 - -.global lbl_805A6BE8 -lbl_805A6BE8: - # ROM: 0x3F4588 - .4byte 0x42FE0000 - .4byte 0 - .global lbl_805A6BF0 lbl_805A6BF0: # ROM: 0x3F4590 diff --git a/asm/sdata2.s b/asm/sdata2.s index 6896aea7..eede63c0 100644 --- a/asm/sdata2.s +++ b/asm/sdata2.s @@ -2,81 +2,6 @@ .section .sdata2, "a" # 0x805A9D20 - 0x805AF45C -.global lbl_805A9D7C -lbl_805A9D7C: - # ROM: 0x3F661C - .4byte 0x3F800000 - -.global lbl_805A9D80 -lbl_805A9D80: - # ROM: 0x3F6620 - .4byte 0x43300000 - .4byte 0x80000000 - -.global lbl_805A9D88 -lbl_805A9D88: - # ROM: 0x3F6628 - .4byte 0x3FF00000 - .4byte 0 - -.global lbl_805A9D90 -lbl_805A9D90: - # ROM: 0x3F6630 - .4byte 0xBF800000 - -.global lbl_805A9D94 -lbl_805A9D94: - # ROM: 0x3F6634 - .4byte 0x3F800000 - -.global lbl_805A9D98 -lbl_805A9D98: - # ROM: 0x3F6638 - .4byte 0x3FE0C152 - .4byte 0x40000000 - -.global lbl_805A9DA0 -lbl_805A9DA0: - # ROM: 0x3F6640 - .4byte 0 - -.global lbl_805A9DA4 -lbl_805A9DA4: - # ROM: 0x3F6644 - .4byte 0x3F000000 - -.global lbl_805A9DA8 -lbl_805A9DA8: - # ROM: 0x3F6648 - .4byte 0x42C80000 - -.global lbl_805A9DAC -lbl_805A9DAC: - # ROM: 0x3F664C - .4byte 0x41100000 - -.global lbl_805A9DB0 -lbl_805A9DB0: - # ROM: 0x3F6650 - .4byte 0x40800000 - -.global lbl_805A9DB4 -lbl_805A9DB4: - # ROM: 0x3F6654 - .4byte 0x42480000 - -.global lbl_805A9DB8 -lbl_805A9DB8: - # ROM: 0x3F6658 - .4byte 0x447A0000 - .4byte 0 - -.global lbl_805A9DC0 -lbl_805A9DC0: - # ROM: 0x3F6660 - .4byte 0x43300000 - .4byte 0x80000000 - .global lbl_805A9DC8 lbl_805A9DC8: # ROM: 0x3F6668 diff --git a/asm/text.s.REMOVED.git-id b/asm/text.s.REMOVED.git-id index 2ed12b9e..f5b4f457 100644 --- a/asm/text.s.REMOVED.git-id +++ b/asm/text.s.REMOVED.git-id @@ -1 +1 @@ -0d472a34f7bd15b1f539eb655c78d83232a46d08 \ No newline at end of file +c5524d39555012d305c4c880bc34c4bbb8fc732d \ No newline at end of file diff --git a/obj_files.mk b/obj_files.mk index 48eb3f2a..15e203f4 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -9,7 +9,8 @@ METROTRK_FILES :=\ KYOTO_CWD :=\ $(BUILD_DIR)/asm/Kyoto_CWD/main.o\ $(BUILD_DIR)/asm/Kyoto_CWD/text_80008894_80009144.o\ - $(BUILD_DIR)/asm/Kyoto_CWD/CCameraManager.o + $(BUILD_DIR)/asm/Kyoto_CWD/CCameraManager.o\ + $(BUILD_DIR)/asm/Kyoto_CWD/CControlMapper.o AI_FILES :=\ $(BUILD_DIR)/asm/Dolphin/ai.o @@ -267,6 +268,3 @@ SDATA2_O_FILES :=\ SBSS2_O_FILES :=\ $(BUILD_DIR)/asm/sbss2.o - -BSS_SINIT_O_FILES :=\ - $(BUILD_DIR)/asm/bss_sinit.o