diff --git a/Makefile b/Makefile index 6cd5cb2ec9..31dca5c1bc 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ ASFLAGS := -mgekko -I include LDFLAGS := -map $(MAP) -fp hard -nodefaults -w off # Compiler flags -CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -maxerrors 5 -enum int $(INCLUDES) +CFLAGS += -Cpp_exceptions off -proc gekko -fp hard -O3 -nodefaults -msgstyle gcc -str pool,readonly,reuse -RTTI off -maxerrors 5 -enum int $(INCLUDES) # elf2dol needs to know these in order to calculate sbss correctly. SDATA_PDHR := 9 diff --git a/asm/JGadget/binary.s b/asm/JGadget/binary.s deleted file mode 100644 index 2cf6e6907e..0000000000 --- a/asm/JGadget/binary.s +++ /dev/null @@ -1,137 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 802dc864 - - -.global JGadget_NS_binary_NS_parseVariableUInt_16_32_following -JGadget_NS_binary_NS_parseVariableUInt_16_32_following: -/* 802DC864 002D97A4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DC868 002D97A8 28 06 00 00 */ cmplwi r6, 0 -/* 802DC86C 002D97AC 40 82 00 08 */ bne lbl_802DC874 -/* 802DC870 002D97B0 38 C1 00 08 */ addi r6, r1, 8 -lbl_802DC874: -/* 802DC874 002D97B4 A0 E3 00 00 */ lhz r7, 0(r3) -/* 802DC878 002D97B8 54 E0 04 21 */ rlwinm. r0, r7, 0, 0x10, 0x10 -/* 802DC87C 002D97BC 40 82 00 20 */ bne lbl_802DC89C -/* 802DC880 002D97C0 38 00 00 10 */ li r0, 0x10 -/* 802DC884 002D97C4 90 06 00 00 */ stw r0, 0(r6) -/* 802DC888 002D97C8 90 E4 00 00 */ stw r7, 0(r4) -/* 802DC88C 002D97CC A0 03 00 02 */ lhz r0, 2(r3) -/* 802DC890 002D97D0 90 05 00 00 */ stw r0, 0(r5) -/* 802DC894 002D97D4 38 63 00 04 */ addi r3, r3, 4 -/* 802DC898 002D97D8 48 00 00 28 */ b lbl_802DC8C0 -lbl_802DC89C: -/* 802DC89C 002D97DC 38 00 00 20 */ li r0, 0x20 -/* 802DC8A0 002D97E0 90 06 00 00 */ stw r0, 0(r6) -/* 802DC8A4 002D97E4 54 E7 80 5E */ rlwinm r7, r7, 0x10, 1, 0xf -/* 802DC8A8 002D97E8 A0 03 00 02 */ lhz r0, 2(r3) -/* 802DC8AC 002D97EC 7C E7 03 78 */ or r7, r7, r0 -/* 802DC8B0 002D97F0 90 E4 00 00 */ stw r7, 0(r4) -/* 802DC8B4 002D97F4 80 03 00 04 */ lwz r0, 4(r3) -/* 802DC8B8 002D97F8 90 05 00 00 */ stw r0, 0(r5) -/* 802DC8BC 002D97FC 38 63 00 08 */ addi r3, r3, 8 -lbl_802DC8C0: -/* 802DC8C0 002D9800 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DC8C4 002D9804 4E 80 00 20 */ blr - -.global __dt__Q37JGadget6binary19TParse_header_blockFv -__dt__Q37JGadget6binary19TParse_header_blockFv: -/* 802DC8C8 002D9808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802DC8CC 002D980C 7C 08 02 A6 */ mflr r0 -/* 802DC8D0 002D9810 90 01 00 14 */ stw r0, 0x14(r1) -/* 802DC8D4 002D9814 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802DC8D8 002D9818 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802DC8DC 002D981C 41 82 00 1C */ beq lbl_802DC8F8 -/* 802DC8E0 002D9820 3C A0 80 3C */ lis r5, lbl_803C488C@ha -/* 802DC8E4 002D9824 38 05 48 8C */ addi r0, r5, lbl_803C488C@l -/* 802DC8E8 002D9828 90 1F 00 00 */ stw r0, 0(r31) -/* 802DC8EC 002D982C 7C 80 07 35 */ extsh. r0, r4 -/* 802DC8F0 002D9830 40 81 00 08 */ ble lbl_802DC8F8 -/* 802DC8F4 002D9834 4B FF 24 49 */ bl __dl__FPv -lbl_802DC8F8: -/* 802DC8F8 002D9838 7F E3 FB 78 */ mr r3, r31 -/* 802DC8FC 002D983C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802DC900 002D9840 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802DC904 002D9844 7C 08 03 A6 */ mtlr r0 -/* 802DC908 002D9848 38 21 00 10 */ addi r1, r1, 0x10 -/* 802DC90C 002D984C 4E 80 00 20 */ blr - -.global JGadget_NS_binary_NS_TParse_header_block_NS_parse_next -JGadget_NS_binary_NS_TParse_header_block_NS_parse_next: -/* 802DC910 002D9850 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802DC914 002D9854 7C 08 02 A6 */ mflr r0 -/* 802DC918 002D9858 90 01 00 34 */ stw r0, 0x34(r1) -/* 802DC91C 002D985C 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DC920 002D9860 48 08 58 B1 */ bl _savegpr_26 -/* 802DC924 002D9864 7C 7A 1B 78 */ mr r26, r3 -/* 802DC928 002D9868 7C 9B 23 79 */ or. r27, r4, r4 -/* 802DC92C 002D986C 7C BC 2B 78 */ mr r28, r5 -/* 802DC930 002D9870 41 82 00 10 */ beq lbl_802DC940 -/* 802DC934 002D9874 80 1B 00 00 */ lwz r0, 0(r27) -/* 802DC938 002D9878 28 00 00 00 */ cmplwi r0, 0 -/* 802DC93C 002D987C 40 82 00 0C */ bne lbl_802DC948 -lbl_802DC940: -/* 802DC940 002D9880 38 60 00 00 */ li r3, 0 -/* 802DC944 002D9884 48 00 00 C0 */ b lbl_802DCA04 -lbl_802DC948: -/* 802DC948 002D9888 3B E0 00 00 */ li r31, 0 -/* 802DC94C 002D988C 38 A1 00 0C */ addi r5, r1, 0xc -/* 802DC950 002D9890 7F 86 E3 78 */ mr r6, r28 -/* 802DC954 002D9894 81 83 00 00 */ lwz r12, 0(r3) -/* 802DC958 002D9898 81 8C 00 0C */ lwz r12, 0xc(r12) -/* 802DC95C 002D989C 7D 89 03 A6 */ mtctr r12 -/* 802DC960 002D98A0 4E 80 04 21 */ bctrl -/* 802DC964 002D98A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802DC968 002D98A8 41 82 00 08 */ beq lbl_802DC970 -/* 802DC96C 002D98AC 3B E0 00 01 */ li r31, 1 -lbl_802DC970: -/* 802DC970 002D98B0 7F FD FB 78 */ mr r29, r31 -/* 802DC974 002D98B4 57 80 07 FF */ clrlwi. r0, r28, 0x1f -/* 802DC978 002D98B8 40 82 00 14 */ bne lbl_802DC98C -/* 802DC97C 002D98BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DC980 002D98C0 40 82 00 0C */ bne lbl_802DC98C -/* 802DC984 002D98C4 7F E3 FB 78 */ mr r3, r31 -/* 802DC988 002D98C8 48 00 00 7C */ b lbl_802DCA04 -lbl_802DC98C: -/* 802DC98C 002D98CC 57 9E 07 BC */ rlwinm r30, r28, 0, 0x1e, 0x1e -/* 802DC990 002D98D0 48 00 00 64 */ b lbl_802DC9F4 -lbl_802DC994: -/* 802DC994 002D98D4 3B E0 00 00 */ li r31, 0 -/* 802DC998 002D98D8 7F 43 D3 78 */ mr r3, r26 -/* 802DC99C 002D98DC 7F 64 DB 78 */ mr r4, r27 -/* 802DC9A0 002D98E0 38 A1 00 08 */ addi r5, r1, 8 -/* 802DC9A4 002D98E4 7F 86 E3 78 */ mr r6, r28 -/* 802DC9A8 002D98E8 81 9A 00 00 */ lwz r12, 0(r26) -/* 802DC9AC 002D98EC 81 8C 00 10 */ lwz r12, 0x10(r12) -/* 802DC9B0 002D98F0 7D 89 03 A6 */ mtctr r12 -/* 802DC9B4 002D98F4 4E 80 04 21 */ bctrl -/* 802DC9B8 002D98F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 802DC9BC 002D98FC 41 82 00 10 */ beq lbl_802DC9CC -/* 802DC9C0 002D9900 57 A0 06 3F */ clrlwi. r0, r29, 0x18 -/* 802DC9C4 002D9904 41 82 00 08 */ beq lbl_802DC9CC -/* 802DC9C8 002D9908 3B E0 00 01 */ li r31, 1 -lbl_802DC9CC: -/* 802DC9CC 002D990C 7F FD FB 78 */ mr r29, r31 -/* 802DC9D0 002D9910 28 1E 00 00 */ cmplwi r30, 0 -/* 802DC9D4 002D9914 40 82 00 14 */ bne lbl_802DC9E8 -/* 802DC9D8 002D9918 57 E0 06 3F */ clrlwi. r0, r31, 0x18 -/* 802DC9DC 002D991C 40 82 00 0C */ bne lbl_802DC9E8 -/* 802DC9E0 002D9920 7F E3 FB 78 */ mr r3, r31 -/* 802DC9E4 002D9924 48 00 00 20 */ b lbl_802DCA04 -lbl_802DC9E8: -/* 802DC9E8 002D9928 80 61 00 0C */ lwz r3, 0xc(r1) -/* 802DC9EC 002D992C 38 03 FF FF */ addi r0, r3, -1 -/* 802DC9F0 002D9930 90 01 00 0C */ stw r0, 0xc(r1) -lbl_802DC9F4: -/* 802DC9F4 002D9934 80 01 00 0C */ lwz r0, 0xc(r1) -/* 802DC9F8 002D9938 28 00 00 00 */ cmplwi r0, 0 -/* 802DC9FC 002D993C 40 82 FF 98 */ bne lbl_802DC994 -/* 802DCA00 002D9940 7F A3 EB 78 */ mr r3, r29 -lbl_802DCA04: -/* 802DCA04 002D9944 39 61 00 30 */ addi r11, r1, 0x30 -/* 802DCA08 002D9948 48 08 58 15 */ bl _restgpr_26 -/* 802DCA0C 002D994C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802DCA10 002D9950 7C 08 03 A6 */ mtlr r0 -/* 802DCA14 002D9954 38 21 00 30 */ addi r1, r1, 0x30 -/* 802DCA18 002D9958 4E 80 00 20 */ blr - diff --git a/asm/JStudio/fvb-data-parse.s b/asm/JStudio/fvb-data-parse.s index 872f0f5b6a..a862b17e48 100644 --- a/asm/JStudio/fvb-data-parse.s +++ b/asm/JStudio/fvb-data-parse.s @@ -13,7 +13,7 @@ JStudio_NS_fvb_NS_data_NS_TParse_TParagraph_NS_getData: /* 802850C0 00282000 80 63 00 00 */ lwz r3, 0(r3) /* 802850C4 00282004 38 BF 00 04 */ addi r5, r31, 4 /* 802850C8 00282008 38 C0 00 00 */ li r6, 0 -/* 802850CC 0028200C 48 05 77 99 */ bl JGadget_NS_binary_NS_parseVariableUInt_16_32_following +/* 802850CC 0028200C 48 05 77 99 */ bl parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit /* 802850D0 00282010 80 9F 00 00 */ lwz r4, 0(r31) /* 802850D4 00282014 28 04 00 00 */ cmplwi r4, 0 /* 802850D8 00282018 40 82 00 14 */ bne lbl_802850EC diff --git a/asm/JStudio/jstudio-control.s b/asm/JStudio/jstudio-control.s index 7eacd99d87..36775b2b0c 100644 --- a/asm/JStudio/jstudio-control.s +++ b/asm/JStudio/jstudio-control.s @@ -547,7 +547,7 @@ lbl_8028588C: /* 8028589C 002827DC 38 61 00 0C */ addi r3, r1, 0xc /* 802858A0 002827E0 38 81 00 08 */ addi r4, r1, 8 /* 802858A4 002827E4 7F C5 F3 78 */ mr r5, r30 -/* 802858A8 002827E8 48 05 70 69 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 802858A8 002827E8 48 05 70 69 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 802858AC 002827EC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 802858B0 002827F0 40 82 00 18 */ bne lbl_802858C8 /* 802858B4 002827F4 38 61 00 0C */ addi r3, r1, 0xc @@ -599,7 +599,7 @@ lbl_8028593C: /* 8028594C 0028288C 38 61 00 0C */ addi r3, r1, 0xc /* 80285950 00282890 38 81 00 08 */ addi r4, r1, 8 /* 80285954 00282894 7F A5 EB 78 */ mr r5, r29 -/* 80285958 00282898 48 05 6F B9 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80285958 00282898 48 05 6F B9 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 8028595C 0028289C 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80285960 002828A0 40 82 00 18 */ bne lbl_80285978 /* 80285964 002828A4 38 61 00 0C */ addi r3, r1, 0xc diff --git a/asm/JStudio/stb-data-parse.s b/asm/JStudio/stb-data-parse.s index 07f3165868..8ee4b78975 100644 --- a/asm/JStudio/stb-data-parse.s +++ b/asm/JStudio/stb-data-parse.s @@ -37,7 +37,7 @@ JStudio_NS_stb_NS_data_NS_TParse_TParagraph_NS_getData: /* 80289A20 00286960 38 81 00 08 */ addi r4, r1, 8 /* 80289A24 00286964 7F E5 FB 78 */ mr r5, r31 /* 80289A28 00286968 38 C0 00 00 */ li r6, 0 -/* 80289A2C 0028696C 48 05 2E 39 */ bl JGadget_NS_binary_NS_parseVariableUInt_16_32_following +/* 80289A2C 0028696C 48 05 2E 39 */ bl parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit /* 80289A30 00286970 80 01 00 08 */ lwz r0, 8(r1) /* 80289A34 00286974 90 1F 00 04 */ stw r0, 4(r31) /* 80289A38 00286978 80 01 00 08 */ lwz r0, 8(r1) diff --git a/asm/SStandard/s/s_basic.s b/asm/SStandard/s/s_basic.s deleted file mode 100644 index 395468a09f..0000000000 --- a/asm/SStandard/s/s_basic.s +++ /dev/null @@ -1,29 +0,0 @@ -.include "macros.inc" - -.section .text, "ax" # 80271c8c - - -.global sBs_FillArea_s -sBs_FillArea_s: -/* 80271C8C 0026EBCC 54 80 F8 7E */ srwi r0, r4, 1 -/* 80271C90 0026EBD0 7C 09 03 A6 */ mtctr r0 -/* 80271C94 0026EBD4 28 00 00 00 */ cmplwi r0, 0 -/* 80271C98 0026EBD8 4C 81 00 20 */ blelr -lbl_80271C9C: -/* 80271C9C 0026EBDC B0 A3 00 00 */ sth r5, 0(r3) -/* 80271CA0 0026EBE0 38 63 00 02 */ addi r3, r3, 2 -/* 80271CA4 0026EBE4 42 00 FF F8 */ bdnz lbl_80271C9C -/* 80271CA8 0026EBE8 4E 80 00 20 */ blr - -.global sBs_ClearArea -sBs_ClearArea: -/* 80271CAC 0026EBEC 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80271CB0 0026EBF0 7C 08 02 A6 */ mflr r0 -/* 80271CB4 0026EBF4 90 01 00 14 */ stw r0, 0x14(r1) -/* 80271CB8 0026EBF8 38 A0 00 00 */ li r5, 0 -/* 80271CBC 0026EBFC 4B FF FF D1 */ bl sBs_FillArea_s -/* 80271CC0 0026EC00 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80271CC4 0026EC04 7C 08 03 A6 */ mtlr r0 -/* 80271CC8 0026EC08 38 21 00 10 */ addi r1, r1, 0x10 -/* 80271CCC 0026EC0C 4E 80 00 20 */ blr - diff --git a/asm/d/d_demo.s b/asm/d/d_demo.s index 38a1d36d60..4f629dd7cf 100644 --- a/asm/d/d_demo.s +++ b/asm/d/d_demo.s @@ -2135,7 +2135,7 @@ dDemo_c_NS_start: /* 80039BAC 00036AEC 38 61 00 0C */ addi r3, r1, 0xc /* 80039BB0 00036AF0 38 81 00 08 */ addi r4, r1, 8 /* 80039BB4 00036AF4 38 A0 00 00 */ li r5, 0 -/* 80039BB8 00036AF8 48 2A 2D 59 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80039BB8 00036AF8 48 2A 2D 59 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 80039BBC 00036AFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 /* 80039BC0 00036B00 40 82 00 2C */ bne lbl_80039BEC /* 80039BC4 00036B04 3C 60 80 38 */ lis r3, lbl_803797F8@ha diff --git a/asm/d/ev/d_ev_camera.s b/asm/d/ev/d_ev_camera.s index 2bf11db07f..fe5f254e86 100644 --- a/asm/d/ev/d_ev_camera.s +++ b/asm/d/ev/d_ev_camera.s @@ -10296,7 +10296,7 @@ lbl_800920B8: /* 800920BC 0008EFFC 90 1E 03 E8 */ stw r0, 0x3e8(r30) /* 800920C0 0008F000 38 61 04 54 */ addi r3, r1, 0x454 /* 800920C4 0008F004 38 80 FF FF */ li r4, -1 -/* 800920C8 0008F008 4B FA 49 95 */ bl cM3dGLin_NS_dtor +/* 800920C8 0008F008 4B FA 49 95 */ bl __dt__8cM3dGLinFv /* 800920CC 0008F00C 48 00 02 5C */ b lbl_80092328 lbl_800920D0: /* 800920D0 0008F010 38 61 01 18 */ addi r3, r1, 0x118 diff --git a/asm/d/jnt/d_jnt_col.s b/asm/d/jnt/d_jnt_col.s index 91ccd0e9dd..8c6c410c64 100644 --- a/asm/d/jnt/d_jnt_col.s +++ b/asm/d/jnt/d_jnt_col.s @@ -958,8 +958,8 @@ lbl_800369E8: /* 80036A54 00033994 38 21 02 B0 */ addi r1, r1, 0x2b0 /* 80036A58 00033998 4E 80 00 20 */ blr -.global cM3dGLin_NS_dtor -cM3dGLin_NS_dtor: +.global __dt__8cM3dGLinFv +__dt__8cM3dGLinFv: /* 80036A5C 0003399C 94 21 FF F0 */ stwu r1, -0x10(r1) /* 80036A60 000339A0 7C 08 02 A6 */ mflr r0 /* 80036A64 000339A4 90 01 00 14 */ stw r0, 0x14(r1) diff --git a/asm/d/msg/d_msg_object.s b/asm/d/msg/d_msg_object.s index 1324cff500..2768c56155 100644 --- a/asm/d/msg/d_msg_object.s +++ b/asm/d/msg/d_msg_object.s @@ -689,7 +689,7 @@ lbl_8023346C: /* 80233478 002303B8 80 7E 01 24 */ lwz r3, 0x124(r30) /* 8023347C 002303BC 38 81 00 08 */ addi r4, r1, 8 /* 80233480 002303C0 38 A0 00 00 */ li r5, 0 -/* 80233484 002303C4 48 0A 94 8D */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80233484 002303C4 48 0A 94 8D */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 80233488 002303C8 80 7E 01 14 */ lwz r3, 0x114(r30) /* 8023348C 002303CC 48 07 41 49 */ bl JMessage_NS_TControl_NS_reset /* 80233490 002303D0 80 7E 01 14 */ lwz r3, 0x114(r30) @@ -4713,7 +4713,7 @@ lbl_80236D9C: /* 80236DB0 00233CF0 80 7E 01 24 */ lwz r3, 0x124(r30) /* 80236DB4 00233CF4 38 81 00 08 */ addi r4, r1, 8 /* 80236DB8 00233CF8 38 A0 00 80 */ li r5, 0x80 -/* 80236DBC 00233CFC 48 0A 5B 55 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80236DBC 00233CFC 48 0A 5B 55 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl lbl_80236DC0: /* 80236DC0 00233D00 B3 FE 01 6C */ sth r31, 0x16c(r30) lbl_80236DC4: diff --git a/asm/d/msg/string/d_msg_string_base.s b/asm/d/msg/string/d_msg_string_base.s index 7324fe5dc0..c465975af7 100644 --- a/asm/d/msg/string/d_msg_string_base.s +++ b/asm/d/msg/string/d_msg_string_base.s @@ -82,7 +82,7 @@ lbl_80249494: /* 802494C4 00246404 80 7F 00 18 */ lwz r3, 0x18(r31) /* 802494C8 00246408 38 81 00 08 */ addi r4, r1, 8 /* 802494CC 0024640C 38 A0 00 00 */ li r5, 0 -/* 802494D0 00246410 48 09 34 41 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 802494D0 00246410 48 09 34 41 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 802494D4 00246414 80 7F 00 08 */ lwz r3, 8(r31) /* 802494D8 00246418 48 05 E0 FD */ bl JMessage_NS_TControl_NS_reset /* 802494DC 0024641C 80 7F 00 08 */ lwz r3, 8(r31) @@ -300,7 +300,7 @@ dMsgStringBase_c_NS_getStringLocal: /* 802497D4 00246714 80 7E 00 18 */ lwz r3, 0x18(r30) /* 802497D8 00246718 38 81 00 0C */ addi r4, r1, 0xc /* 802497DC 0024671C 38 A0 00 80 */ li r5, 0x80 -/* 802497E0 00246720 48 09 31 31 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 802497E0 00246720 48 09 31 31 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 802497E4 00246724 48 00 00 2C */ b lbl_80249810 lbl_802497E8: /* 802497E8 00246728 80 1E 00 1C */ lwz r0, 0x1c(r30) @@ -312,7 +312,7 @@ lbl_802497E8: /* 80249800 00246740 80 7E 00 18 */ lwz r3, 0x18(r30) /* 80249804 00246744 38 81 00 08 */ addi r4, r1, 8 /* 80249808 00246748 38 A0 00 80 */ li r5, 0x80 -/* 8024980C 0024674C 48 09 31 05 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 8024980C 0024674C 48 09 31 05 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl lbl_80249810: /* 80249810 00246750 80 7E 00 0C */ lwz r3, 0xc(r30) /* 80249814 00246754 7F 24 CB 78 */ mr r4, r25 @@ -400,7 +400,7 @@ dMsgStringBase_c_NS_getStringPageLocal: /* 80249948 00246888 80 78 00 18 */ lwz r3, 0x18(r24) /* 8024994C 0024688C 38 81 00 0C */ addi r4, r1, 0xc /* 80249950 00246890 38 A0 00 80 */ li r5, 0x80 -/* 80249954 00246894 48 09 2F BD */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80249954 00246894 48 09 2F BD */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 80249958 00246898 48 00 00 2C */ b lbl_80249984 lbl_8024995C: /* 8024995C 0024689C 80 18 00 1C */ lwz r0, 0x1c(r24) @@ -412,7 +412,7 @@ lbl_8024995C: /* 80249974 002468B4 80 78 00 18 */ lwz r3, 0x18(r24) /* 80249978 002468B8 38 81 00 08 */ addi r4, r1, 8 /* 8024997C 002468BC 38 A0 00 80 */ li r5, 0x80 -/* 80249980 002468C0 48 09 2F 91 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80249980 002468C0 48 09 2F 91 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl lbl_80249984: /* 80249984 002468C4 80 78 00 0C */ lwz r3, 0xc(r24) /* 80249988 002468C8 7F 84 E3 78 */ mr r4, r28 @@ -506,7 +506,7 @@ dMsgStringBase_c_NS_getMessageLocal: /* 80249AC8 00246A08 80 7D 00 18 */ lwz r3, 0x18(r29) /* 80249ACC 00246A0C 38 81 00 0C */ addi r4, r1, 0xc /* 80249AD0 00246A10 38 A0 00 80 */ li r5, 0x80 -/* 80249AD4 00246A14 48 09 2E 3D */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80249AD4 00246A14 48 09 2E 3D */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl /* 80249AD8 00246A18 48 00 00 2C */ b lbl_80249B04 lbl_80249ADC: /* 80249ADC 00246A1C 80 1D 00 1C */ lwz r0, 0x1c(r29) @@ -518,7 +518,7 @@ lbl_80249ADC: /* 80249AF4 00246A34 80 7D 00 18 */ lwz r3, 0x18(r29) /* 80249AF8 00246A38 38 81 00 08 */ addi r4, r1, 8 /* 80249AFC 00246A3C 38 A0 00 80 */ li r5, 0x80 -/* 80249B00 00246A40 48 09 2E 11 */ bl JGadget_NS_binary_NS_TParse_header_block_NS_parse_next +/* 80249B00 00246A40 48 09 2E 11 */ bl parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl lbl_80249B04: /* 80249B04 00246A44 80 7D 00 0C */ lwz r3, 0xc(r29) /* 80249B08 00246A48 38 80 00 00 */ li r4, 0 diff --git a/asm/rodata/rodata_DynamicLink.s b/asm/rodata/rodata_DynamicLink.s new file mode 100644 index 0000000000..e0dd9f9629 --- /dev/null +++ b/asm/rodata/rodata_DynamicLink.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a4a0 - 0x8039a7e8 + +.global lbl_8039A4A0 +lbl_8039A4A0: +.incbin "baserom.dol", 0x3974A0, 0x348 + diff --git a/asm/rodata/rodata_GCN_mem_alloc.s b/asm/rodata/rodata_GCN_mem_alloc.s new file mode 100644 index 0000000000..66f10253dc --- /dev/null +++ b/asm/rodata/rodata_GCN_mem_alloc.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a21a8 - 0x803a2220 + +.global lbl_803A21A8 +lbl_803A21A8: +.incbin "baserom.dol", 0x39F1A8, 0x38 + +.global lbl_803A21E0 +lbl_803A21E0: +.incbin "baserom.dol", 0x39F1E0, 0x40 + diff --git a/asm/rodata/rodata_J2DMatBlock.s b/asm/rodata/rodata_J2DMatBlock.s new file mode 100644 index 0000000000..51e9023a16 --- /dev/null +++ b/asm/rodata/rodata_J2DMatBlock.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1c00 - 0x803a1c10 + +.global lbl_803A1C00 +lbl_803A1C00: +.incbin "baserom.dol", 0x39EC00, 0x10 + diff --git a/asm/rodata/rodata_J2DPictureEx.s b/asm/rodata/rodata_J2DPictureEx.s new file mode 100644 index 0000000000..161f72b256 --- /dev/null +++ b/asm/rodata/rodata_J2DPictureEx.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1d50 - 0x803a1db8 + +.global lbl_803A1D50 +lbl_803A1D50: +.incbin "baserom.dol", 0x39ED50, 0x20 + +.global lbl_803A1D70 +lbl_803A1D70: +.incbin "baserom.dol", 0x39ED70, 0x20 + +.global lbl_803A1D90 +lbl_803A1D90: +.incbin "baserom.dol", 0x39ED90, 0x28 + diff --git a/asm/rodata/rodata_J2DTevs.s b/asm/rodata/rodata_J2DTevs.s new file mode 100644 index 0000000000..9693f45237 --- /dev/null +++ b/asm/rodata/rodata_J2DTevs.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1b80 - 0x803a1c00 + +.global lbl_803A1B80 +lbl_803A1B80: +.incbin "baserom.dol", 0x39EB80, 0x20 + +.global lbl_803A1BA0 +lbl_803A1BA0: +.incbin "baserom.dol", 0x39EBA0, 0x24 + +.global lbl_803A1BC4 +lbl_803A1BC4: +.incbin "baserom.dol", 0x39EBC4, 0x1C + +.global lbl_803A1BE0 +lbl_803A1BE0: +.incbin "baserom.dol", 0x39EBE0, 0x14 + +.global lbl_803A1BF4 +lbl_803A1BF4: +.incbin "baserom.dol", 0x39EBF4, 0xC + diff --git a/asm/rodata/rodata_J2DTextBox.s b/asm/rodata/rodata_J2DTextBox.s new file mode 100644 index 0000000000..830ff36dd4 --- /dev/null +++ b/asm/rodata/rodata_J2DTextBox.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1c58 - 0x803a1c60 + +.global lbl_803A1C58 +lbl_803A1C58: +.incbin "baserom.dol", 0x39EC58, 0x8 + diff --git a/asm/rodata/rodata_J2DTextBoxEx.s b/asm/rodata/rodata_J2DTextBoxEx.s new file mode 100644 index 0000000000..ecdd0f1e5e --- /dev/null +++ b/asm/rodata/rodata_J2DTextBoxEx.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1db8 - 0x803a1df8 + +.global lbl_803A1DB8 +lbl_803A1DB8: +.incbin "baserom.dol", 0x39EDB8, 0xC + +.global lbl_803A1DC4 +lbl_803A1DC4: +.incbin "baserom.dol", 0x39EDC4, 0xC + +.global lbl_803A1DD0 +lbl_803A1DD0: +.incbin "baserom.dol", 0x39EDD0, 0x10 + +.global lbl_803A1DE0 +lbl_803A1DE0: +.incbin "baserom.dol", 0x39EDE0, 0x10 + +.global lbl_803A1DF0 +lbl_803A1DF0: +.incbin "baserom.dol", 0x39EDF0, 0x8 + diff --git a/asm/rodata/rodata_J2DWindow.s b/asm/rodata/rodata_J2DWindow.s new file mode 100644 index 0000000000..0ef1b44b76 --- /dev/null +++ b/asm/rodata/rodata_J2DWindow.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1c10 - 0x803a1c58 + +.global lbl_803A1C10 +lbl_803A1C10: +.incbin "baserom.dol", 0x39EC10, 0x10 + +.global lbl_803A1C20 +lbl_803A1C20: +.incbin "baserom.dol", 0x39EC20, 0x10 + +.global lbl_803A1C30 +lbl_803A1C30: +.incbin "baserom.dol", 0x39EC30, 0x10 + +.global lbl_803A1C40 +lbl_803A1C40: +.incbin "baserom.dol", 0x39EC40, 0x18 + diff --git a/asm/rodata/rodata_J2DWindowEx.s b/asm/rodata/rodata_J2DWindowEx.s new file mode 100644 index 0000000000..a1e8835499 --- /dev/null +++ b/asm/rodata/rodata_J2DWindowEx.s @@ -0,0 +1,55 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1c60 - 0x803a1d50 + +.global lbl_803A1C60 +lbl_803A1C60: +.incbin "baserom.dol", 0x39EC60, 0x10 + +.global lbl_803A1C70 +lbl_803A1C70: +.incbin "baserom.dol", 0x39EC70, 0x10 + +.global lbl_803A1C80 +lbl_803A1C80: +.incbin "baserom.dol", 0x39EC80, 0x10 + +.global lbl_803A1C90 +lbl_803A1C90: +.incbin "baserom.dol", 0x39EC90, 0x10 + +.global lbl_803A1CA0 +lbl_803A1CA0: +.incbin "baserom.dol", 0x39ECA0, 0x10 + +.global lbl_803A1CB0 +lbl_803A1CB0: +.incbin "baserom.dol", 0x39ECB0, 0x10 + +.global lbl_803A1CC0 +lbl_803A1CC0: +.incbin "baserom.dol", 0x39ECC0, 0x10 + +.global lbl_803A1CD0 +lbl_803A1CD0: +.incbin "baserom.dol", 0x39ECD0, 0x10 + +.global lbl_803A1CE0 +lbl_803A1CE0: +.incbin "baserom.dol", 0x39ECE0, 0x10 + +.global lbl_803A1CF0 +lbl_803A1CF0: +.incbin "baserom.dol", 0x39ECF0, 0x18 + +.global lbl_803A1D08 +lbl_803A1D08: +.incbin "baserom.dol", 0x39ED08, 0x18 + +.global lbl_803A1D20 +lbl_803A1D20: +.incbin "baserom.dol", 0x39ED20, 0x20 + +.global lbl_803A1D40 +lbl_803A1D40: +.incbin "baserom.dol", 0x39ED40, 0x10 + diff --git a/asm/rodata/rodata_J3DAnmLoader.s b/asm/rodata/rodata_J3DAnmLoader.s new file mode 100644 index 0000000000..4cda4eb637 --- /dev/null +++ b/asm/rodata/rodata_J3DAnmLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2130 - 0x803a2170 + +.global lbl_803A2130 +lbl_803A2130: +.incbin "baserom.dol", 0x39F130, 0x40 + diff --git a/asm/rodata/rodata_J3DClusterLoader.s b/asm/rodata/rodata_J3DClusterLoader.s new file mode 100644 index 0000000000..9b71527c79 --- /dev/null +++ b/asm/rodata/rodata_J3DClusterLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2098 - 0x803a20b0 + +.global lbl_803A2098 +lbl_803A2098: +.incbin "baserom.dol", 0x39F098, 0x18 + diff --git a/asm/rodata/rodata_J3DJoint.s b/asm/rodata/rodata_J3DJoint.s new file mode 100644 index 0000000000..9c0cb1ed8f --- /dev/null +++ b/asm/rodata/rodata_J3DJoint.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2068 - 0x803a2098 + +.global lbl_803A2068 +lbl_803A2068: +.incbin "baserom.dol", 0x39F068, 0xC + +.global lbl_803A2074 +lbl_803A2074: +.incbin "baserom.dol", 0x39F074, 0xC + +.global lbl_803A2080 +lbl_803A2080: +.incbin "baserom.dol", 0x39F080, 0xC + +.global lbl_803A208C +lbl_803A208C: +.incbin "baserom.dol", 0x39F08C, 0xC + diff --git a/asm/rodata/rodata_J3DMatBlock.s b/asm/rodata/rodata_J3DMatBlock.s new file mode 100644 index 0000000000..aafe6818a0 --- /dev/null +++ b/asm/rodata/rodata_J3DMatBlock.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1ea8 - 0x803a1ec8 + +.global lbl_803A1EA8 +lbl_803A1EA8: +.incbin "baserom.dol", 0x39EEA8, 0x20 + diff --git a/asm/rodata/rodata_J3DModelLoader.s b/asm/rodata/rodata_J3DModelLoader.s new file mode 100644 index 0000000000..5ae88ae116 --- /dev/null +++ b/asm/rodata/rodata_J3DModelLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a20b0 - 0x803a20e8 + +.global lbl_803A20B0 +lbl_803A20B0: +.incbin "baserom.dol", 0x39F0B0, 0x38 + diff --git a/asm/rodata/rodata_J3DModelLoaderCalcSize.s b/asm/rodata/rodata_J3DModelLoaderCalcSize.s new file mode 100644 index 0000000000..a1279cb3fb --- /dev/null +++ b/asm/rodata/rodata_J3DModelLoaderCalcSize.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a20e8 - 0x803a2100 + +.global lbl_803A20E8 +lbl_803A20E8: +.incbin "baserom.dol", 0x39F0E8, 0x18 + diff --git a/asm/rodata/rodata_J3DShape.s b/asm/rodata/rodata_J3DShape.s new file mode 100644 index 0000000000..5e18140bda --- /dev/null +++ b/asm/rodata/rodata_J3DShape.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1e98 - 0x803a1ea8 + +.global lbl_803A1E98 +lbl_803A1E98: +.incbin "baserom.dol", 0x39EE98, 0x10 + diff --git a/asm/rodata/rodata_J3DShapeFactory.s b/asm/rodata/rodata_J3DShapeFactory.s new file mode 100644 index 0000000000..a8080da64b --- /dev/null +++ b/asm/rodata/rodata_J3DShapeFactory.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2100 - 0x803a2130 + +.global lbl_803A2100 +lbl_803A2100: +.incbin "baserom.dol", 0x39F100, 0x30 + diff --git a/asm/rodata/rodata_J3DSkinDeform.s b/asm/rodata/rodata_J3DSkinDeform.s new file mode 100644 index 0000000000..fa9089256c --- /dev/null +++ b/asm/rodata/rodata_J3DSkinDeform.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2008 - 0x803a2068 + +.global lbl_803A2008 +lbl_803A2008: +.incbin "baserom.dol", 0x39F008, 0x10 + +.global lbl_803A2018 +lbl_803A2018: +.incbin "baserom.dol", 0x39F018, 0x10 + +.global lbl_803A2028 +lbl_803A2028: +.incbin "baserom.dol", 0x39F028, 0x40 + diff --git a/asm/rodata/rodata_J3DSys.s b/asm/rodata/rodata_J3DSys.s new file mode 100644 index 0000000000..b79a9c2c73 --- /dev/null +++ b/asm/rodata/rodata_J3DSys.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1df8 - 0x803a1e30 + +.global lbl_803A1DF8 +lbl_803A1DF8: +.incbin "baserom.dol", 0x39EDF8, 0x10 + +.global lbl_803A1E08 +lbl_803A1E08: +.incbin "baserom.dol", 0x39EE08, 0x10 + +.global lbl_803A1E18 +lbl_803A1E18: +.incbin "baserom.dol", 0x39EE18, 0x18 + diff --git a/asm/rodata/rodata_J3DTevs.s b/asm/rodata/rodata_J3DTevs.s new file mode 100644 index 0000000000..f0d6f88fe3 --- /dev/null +++ b/asm/rodata/rodata_J3DTevs.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1ec8 - 0x803a2008 + +.global lbl_803A1EC8 +lbl_803A1EC8: +.incbin "baserom.dol", 0x39EEC8, 0x34 + +.global lbl_803A1EFC +lbl_803A1EFC: +.incbin "baserom.dol", 0x39EEFC, 0x20 + +.global lbl_803A1F1C +lbl_803A1F1C: +.incbin "baserom.dol", 0x39EF1C, 0x64 + +.global lbl_803A1F80 +lbl_803A1F80: +.incbin "baserom.dol", 0x39EF80, 0x1C + +.global lbl_803A1F9C +lbl_803A1F9C: +.incbin "baserom.dol", 0x39EF9C, 0x14 + +.global lbl_803A1FB0 +lbl_803A1FB0: +.incbin "baserom.dol", 0x39EFB0, 0xC + +.global lbl_803A1FBC +lbl_803A1FBC: +.incbin "baserom.dol", 0x39EFBC, 0x2C + +.global lbl_803A1FE8 +lbl_803A1FE8: +.incbin "baserom.dol", 0x39EFE8, 0x10 + +.global lbl_803A1FF8 +lbl_803A1FF8: +.incbin "baserom.dol", 0x39EFF8, 0x10 + diff --git a/asm/rodata/rodata_J3DTransform.s b/asm/rodata/rodata_J3DTransform.s new file mode 100644 index 0000000000..ce6d77445a --- /dev/null +++ b/asm/rodata/rodata_J3DTransform.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a1e30 - 0x803a1e98 + +.global lbl_803A1E30 +lbl_803A1E30: +.incbin "baserom.dol", 0x39EE30, 0x20 + +.global lbl_803A1E50 +lbl_803A1E50: +.incbin "baserom.dol", 0x39EE50, 0xC + +.global lbl_803A1E5C +lbl_803A1E5C: +.incbin "baserom.dol", 0x39EE5C, 0x30 + +.global lbl_803A1E8C +lbl_803A1E8C: +.incbin "baserom.dol", 0x39EE8C, 0xC + diff --git a/asm/rodata/rodata_J3DUClipper.s b/asm/rodata/rodata_J3DUClipper.s new file mode 100644 index 0000000000..b582fbbc23 --- /dev/null +++ b/asm/rodata/rodata_J3DUClipper.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a948 - 0x8039a9f0 + +.global lbl_8039A948 +lbl_8039A948: +.incbin "baserom.dol", 0x397948, 0xC + +.global lbl_8039A954 +lbl_8039A954: +.incbin "baserom.dol", 0x397954, 0xC + +.global lbl_8039A960 +lbl_8039A960: +.incbin "baserom.dol", 0x397960, 0xC + +.global lbl_8039A96C +lbl_8039A96C: +.incbin "baserom.dol", 0x39796C, 0xC + +.global lbl_8039A978 +lbl_8039A978: +.incbin "baserom.dol", 0x397978, 0xC + +.global lbl_8039A984 +lbl_8039A984: +.incbin "baserom.dol", 0x397984, 0x6C + diff --git a/asm/rodata/rodata_JAISeMgr.s b/asm/rodata/rodata_JAISeMgr.s new file mode 100644 index 0000000000..61efcb25c8 --- /dev/null +++ b/asm/rodata/rodata_JAISeMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b8f8 - 0x8039b910 + +.global lbl_8039B8F8 +lbl_8039B8F8: +.incbin "baserom.dol", 0x3988F8, 0x18 + diff --git a/asm/rodata/rodata_JAISound.s b/asm/rodata/rodata_JAISound.s new file mode 100644 index 0000000000..43a807347b --- /dev/null +++ b/asm/rodata/rodata_JAISound.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b910 - 0x8039b950 + +.global lbl_8039B910 +lbl_8039B910: +.incbin "baserom.dol", 0x398910, 0x40 + diff --git a/asm/rodata/rodata_JASAiCtrl.s b/asm/rodata/rodata_JASAiCtrl.s new file mode 100644 index 0000000000..cf48d18f80 --- /dev/null +++ b/asm/rodata/rodata_JASAiCtrl.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b2e0 - 0x8039b338 + +.global lbl_8039B2E0 +lbl_8039B2E0: +.incbin "baserom.dol", 0x3982E0, 0x10 + +.global lbl_8039B2F0 +lbl_8039B2F0: +.incbin "baserom.dol", 0x3982F0, 0x48 + diff --git a/asm/rodata/rodata_JASAramStream.s b/asm/rodata/rodata_JASAramStream.s new file mode 100644 index 0000000000..6b8b4885dd --- /dev/null +++ b/asm/rodata/rodata_JASAramStream.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b168 - 0x8039b190 + +.global lbl_8039B168 +lbl_8039B168: +.incbin "baserom.dol", 0x398168, 0xC + +.global lbl_8039B174 +lbl_8039B174: +.incbin "baserom.dol", 0x398174, 0x1C + diff --git a/asm/rodata/rodata_JASAudioThread.s b/asm/rodata/rodata_JASAudioThread.s new file mode 100644 index 0000000000..ef77181df2 --- /dev/null +++ b/asm/rodata/rodata_JASAudioThread.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b338 - 0x8039b360 + +.global lbl_8039B338 +lbl_8039B338: +.incbin "baserom.dol", 0x398338, 0x28 + diff --git a/asm/rodata/rodata_JASBank.s b/asm/rodata/rodata_JASBank.s new file mode 100644 index 0000000000..5d8e41dcb0 --- /dev/null +++ b/asm/rodata/rodata_JASBank.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b190 - 0x8039b1b8 + +.global lbl_8039B190 +lbl_8039B190: +.incbin "baserom.dol", 0x398190, 0xC + +.global lbl_8039B19C +lbl_8039B19C: +.incbin "baserom.dol", 0x39819C, 0x1C + diff --git a/asm/rodata/rodata_JASCalc.s b/asm/rodata/rodata_JASCalc.s new file mode 100644 index 0000000000..0a33ca76f6 --- /dev/null +++ b/asm/rodata/rodata_JASCalc.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039abb8 - 0x8039afd0 + +.global lbl_8039ABB8 +lbl_8039ABB8: +.incbin "baserom.dol", 0x397BB8, 0x400 + +.global lbl_8039AFB8 +lbl_8039AFB8: +.incbin "baserom.dol", 0x397FB8, 0x18 + diff --git a/asm/rodata/rodata_JASDSPInterface.s b/asm/rodata/rodata_JASDSPInterface.s new file mode 100644 index 0000000000..1cfa8418a4 --- /dev/null +++ b/asm/rodata/rodata_JASDSPInterface.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b360 - 0x8039b8b8 + +.global lbl_8039B360 +lbl_8039B360: +.incbin "baserom.dol", 0x398360, 0x40 + +.global lbl_8039B3A0 +lbl_8039B3A0: +.incbin "baserom.dol", 0x3983A0, 0x500 + +.global lbl_8039B8A0 +lbl_8039B8A0: +.incbin "baserom.dol", 0x3988A0, 0x18 + diff --git a/asm/rodata/rodata_JASOscillator.s b/asm/rodata/rodata_JASOscillator.s new file mode 100644 index 0000000000..9eae0a7730 --- /dev/null +++ b/asm/rodata/rodata_JASOscillator.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b1d0 - 0x8039b2e0 + +.global lbl_8039B1D0 +lbl_8039B1D0: +.incbin "baserom.dol", 0x3981D0, 0x44 + +.global lbl_8039B214 +lbl_8039B214: +.incbin "baserom.dol", 0x398214, 0x44 + +.global lbl_8039B258 +lbl_8039B258: +.incbin "baserom.dol", 0x398258, 0x44 + +.global lbl_8039B29C +lbl_8039B29C: +.incbin "baserom.dol", 0x39829C, 0x44 + diff --git a/asm/rodata/rodata_JASSeqParser.s b/asm/rodata/rodata_JASSeqParser.s new file mode 100644 index 0000000000..ee550f7412 --- /dev/null +++ b/asm/rodata/rodata_JASSeqParser.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b018 - 0x8039b168 + +.global lbl_8039B018 +lbl_8039B018: +.incbin "baserom.dol", 0x398018, 0x150 + diff --git a/asm/rodata/rodata_JASTrack.s b/asm/rodata/rodata_JASTrack.s new file mode 100644 index 0000000000..cb6857db22 --- /dev/null +++ b/asm/rodata/rodata_JASTrack.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039afd0 - 0x8039b018 + +.global lbl_8039AFD0 +lbl_8039AFD0: +.incbin "baserom.dol", 0x397FD0, 0x18 + +.global lbl_8039AFE8 +lbl_8039AFE8: +.incbin "baserom.dol", 0x397FE8, 0x18 + +.global lbl_8039B000 +lbl_8039B000: +.incbin "baserom.dol", 0x398000, 0x18 + diff --git a/asm/rodata/rodata_JASVoiceBank.s b/asm/rodata/rodata_JASVoiceBank.s new file mode 100644 index 0000000000..580aa58e4f --- /dev/null +++ b/asm/rodata/rodata_JASVoiceBank.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b1b8 - 0x8039b1d0 + +.global lbl_8039B1B8 +lbl_8039B1B8: +.incbin "baserom.dol", 0x3981B8, 0x18 + diff --git a/asm/rodata/rodata_JAUSectionHeap.s b/asm/rodata/rodata_JAUSectionHeap.s new file mode 100644 index 0000000000..7f98246f27 --- /dev/null +++ b/asm/rodata/rodata_JAUSectionHeap.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b950 - 0x8039b9c0 + +.global lbl_8039B950 +lbl_8039B950: +.incbin "baserom.dol", 0x398950, 0x70 + diff --git a/asm/rodata/rodata_JFWDisplay.s b/asm/rodata/rodata_JFWDisplay.s new file mode 100644 index 0000000000..3e1ff6e10d --- /dev/null +++ b/asm/rodata/rodata_JFWDisplay.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a878 - 0x8039a948 + +.global lbl_8039A878 +lbl_8039A878: +.incbin "baserom.dol", 0x397878, 0xD0 + diff --git a/asm/rodata/rodata_JKRAram.s b/asm/rodata/rodata_JKRAram.s new file mode 100644 index 0000000000..c2e0f87ee1 --- /dev/null +++ b/asm/rodata/rodata_JKRAram.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d078 - 0x8039d0b8 + +.global lbl_8039D078 +lbl_8039D078: +.incbin "baserom.dol", 0x39A078, 0x40 + diff --git a/asm/rodata/rodata_JKRAramArchive.s b/asm/rodata/rodata_JKRAramArchive.s new file mode 100644 index 0000000000..b632b8e852 --- /dev/null +++ b/asm/rodata/rodata_JKRAramArchive.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d188 - 0x8039d1b0 + +.global lbl_8039D188 +lbl_8039D188: +.incbin "baserom.dol", 0x39A188, 0x28 + diff --git a/asm/rodata/rodata_JKRAramPiece.s b/asm/rodata/rodata_JKRAramPiece.s new file mode 100644 index 0000000000..02eeb2d4c4 --- /dev/null +++ b/asm/rodata/rodata_JKRAramPiece.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d0b8 - 0x8039d120 + +.global lbl_8039D0B8 +lbl_8039D0B8: +.incbin "baserom.dol", 0x39A0B8, 0x68 + diff --git a/asm/rodata/rodata_JKRAramStream.s b/asm/rodata/rodata_JKRAramStream.s new file mode 100644 index 0000000000..0fa923178c --- /dev/null +++ b/asm/rodata/rodata_JKRAramStream.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d120 - 0x8039d150 + +.global lbl_8039D120 +lbl_8039D120: +.incbin "baserom.dol", 0x39A120, 0x30 + diff --git a/asm/rodata/rodata_JKRCompArchive.s b/asm/rodata/rodata_JKRCompArchive.s new file mode 100644 index 0000000000..a82dc011cf --- /dev/null +++ b/asm/rodata/rodata_JKRCompArchive.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d220 - 0x8039d260 + +.global lbl_8039D220 +lbl_8039D220: +.incbin "baserom.dol", 0x39A220, 0x40 + diff --git a/asm/rodata/rodata_JKRDvdArchive.s b/asm/rodata/rodata_JKRDvdArchive.s new file mode 100644 index 0000000000..55dca4766c --- /dev/null +++ b/asm/rodata/rodata_JKRDvdArchive.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d1b0 - 0x8039d220 + +.global lbl_8039D1B0 +lbl_8039D1B0: +.incbin "baserom.dol", 0x39A1B0, 0x70 + diff --git a/asm/rodata/rodata_JKRDvdFile.s b/asm/rodata/rodata_JKRDvdFile.s new file mode 100644 index 0000000000..e9aa544dd7 --- /dev/null +++ b/asm/rodata/rodata_JKRDvdFile.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d260 - 0x8039d290 + +.global lbl_8039D260 +lbl_8039D260: +.incbin "baserom.dol", 0x39A260, 0x30 + diff --git a/asm/rodata/rodata_JKRDvdRipper.s b/asm/rodata/rodata_JKRDvdRipper.s new file mode 100644 index 0000000000..df1c6251a9 --- /dev/null +++ b/asm/rodata/rodata_JKRDvdRipper.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d290 - 0x8039d2f0 + +.global lbl_8039D290 +lbl_8039D290: +.incbin "baserom.dol", 0x39A290, 0x60 + diff --git a/asm/rodata/rodata_JKRExpHeap.s b/asm/rodata/rodata_JKRExpHeap.s new file mode 100644 index 0000000000..da4f46d5be --- /dev/null +++ b/asm/rodata/rodata_JKRExpHeap.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039caf0 - 0x8039ce50 + +.global lbl_8039CAF0 +lbl_8039CAF0: +.incbin "baserom.dol", 0x399AF0, 0x360 + diff --git a/asm/rodata/rodata_JKRFileCache.s b/asm/rodata/rodata_JKRFileCache.s new file mode 100644 index 0000000000..db68214035 --- /dev/null +++ b/asm/rodata/rodata_JKRFileCache.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d158 - 0x8039d160 + +.global lbl_8039D158 +lbl_8039D158: +.incbin "baserom.dol", 0x39A158, 0x8 + diff --git a/asm/rodata/rodata_JKRFileLoader.s b/asm/rodata/rodata_JKRFileLoader.s new file mode 100644 index 0000000000..bad6e17301 --- /dev/null +++ b/asm/rodata/rodata_JKRFileLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d150 - 0x8039d158 + +.global lbl_8039D150 +lbl_8039D150: +.incbin "baserom.dol", 0x39A150, 0x8 + diff --git a/asm/rodata/rodata_JKRHeap.s b/asm/rodata/rodata_JKRHeap.s new file mode 100644 index 0000000000..e3085bf333 --- /dev/null +++ b/asm/rodata/rodata_JKRHeap.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039cad8 - 0x8039caf0 + +.global lbl_8039CAD8 +lbl_8039CAD8: +.incbin "baserom.dol", 0x399AD8, 0x18 + diff --git a/asm/rodata/rodata_JKRMemArchive.s b/asm/rodata/rodata_JKRMemArchive.s new file mode 100644 index 0000000000..bb12fe8ba4 --- /dev/null +++ b/asm/rodata/rodata_JKRMemArchive.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d160 - 0x8039d188 + +.global lbl_8039D160 +lbl_8039D160: +.incbin "baserom.dol", 0x39A160, 0x28 + diff --git a/asm/rodata/rodata_JKRSolidHeap.s b/asm/rodata/rodata_JKRSolidHeap.s new file mode 100644 index 0000000000..d5cb72ca13 --- /dev/null +++ b/asm/rodata/rodata_JKRSolidHeap.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039ce50 - 0x8039cfa8 + +.global lbl_8039CE50 +lbl_8039CE50: +.incbin "baserom.dol", 0x399E50, 0x158 + diff --git a/asm/rodata/rodata_JKRSolidHeap_padding.s b/asm/rodata/rodata_JKRSolidHeap_padding.s new file mode 100644 index 0000000000..e601e604c2 --- /dev/null +++ b/asm/rodata/rodata_JKRSolidHeap_padding.s @@ -0,0 +1,5 @@ +.include "macros.inc" +.section .rodata, "a" + +.byte 0x0 + diff --git a/asm/rodata/rodata_JKRThread.s b/asm/rodata/rodata_JKRThread.s new file mode 100644 index 0000000000..8c84a7cb4b --- /dev/null +++ b/asm/rodata/rodata_JKRThread.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039cfa8 - 0x8039d078 + +.global lbl_8039CFA8 +lbl_8039CFA8: +.incbin "baserom.dol", 0x399FA8, 0xD0 + diff --git a/asm/rodata/rodata_JUTCacheFont.s b/asm/rodata/rodata_JUTCacheFont.s new file mode 100644 index 0000000000..91e9a2a688 --- /dev/null +++ b/asm/rodata/rodata_JUTCacheFont.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d2f0 - 0x8039d360 + +.global lbl_8039D2F0 +lbl_8039D2F0: +.incbin "baserom.dol", 0x39A2F0, 0x70 + diff --git a/asm/rodata/rodata_JUTConsole.s b/asm/rodata/rodata_JUTConsole.s new file mode 100644 index 0000000000..d0e10548f7 --- /dev/null +++ b/asm/rodata/rodata_JUTConsole.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d9a8 - 0x803a1b80 + +.global lbl_8039D9A8 +lbl_8039D9A8: +.incbin "baserom.dol", 0x39A9A8, 0x265C + +.global lbl_803A0004 +lbl_803A0004: +.incbin "baserom.dol", 0x39D004, 0x1B7C + diff --git a/asm/rodata/rodata_JUTDirectPrint.s b/asm/rodata/rodata_JUTDirectPrint.s new file mode 100644 index 0000000000..197a7d5ae7 --- /dev/null +++ b/asm/rodata/rodata_JUTDirectPrint.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d9a0 - 0x8039d9a8 + +.global lbl_8039D9A0 +lbl_8039D9A0: +.incbin "baserom.dol", 0x39A9A0, 0x8 + diff --git a/asm/rodata/rodata_JUTException.s b/asm/rodata/rodata_JUTException.s new file mode 100644 index 0000000000..f1606309ee --- /dev/null +++ b/asm/rodata/rodata_JUTException.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d490 - 0x8039d9a0 + +.global lbl_8039D490 +lbl_8039D490: +.incbin "baserom.dol", 0x39A490, 0x510 + diff --git a/asm/rodata/rodata_JUTFontData_Ascfont_fix12.s b/asm/rodata/rodata_JUTFontData_Ascfont_fix12.s new file mode 100644 index 0000000000..7bfa517247 --- /dev/null +++ b/asm/rodata/rodata_JUTFontData_Ascfont_fix12.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039da20 - 0x803a1b80 + +.global lbl_8039DA20 +lbl_8039DA20: +.incbin "baserom.dol", 0x39DA20, 0x25E4 + +.global lbl_803A0004 +lbl_803A0004: +.incbin "baserom.dol", 0x3A0004, 0x1B7C + diff --git a/asm/rodata/rodata_JUTPalette.s b/asm/rodata/rodata_JUTPalette.s new file mode 100644 index 0000000000..7869e91e8f --- /dev/null +++ b/asm/rodata/rodata_JUTPalette.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d360 - 0x8039d390 + +.global lbl_8039D360 +lbl_8039D360: +.incbin "baserom.dol", 0x39A360, 0x30 + diff --git a/asm/rodata/rodata_JUTResFont.s b/asm/rodata/rodata_JUTResFont.s new file mode 100644 index 0000000000..ee6a94f74a --- /dev/null +++ b/asm/rodata/rodata_JUTResFont.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039d390 - 0x8039d490 + +.global lbl_8039D390 +lbl_8039D390: +.incbin "baserom.dol", 0x39A390, 0xC + +.global lbl_8039D39C +lbl_8039D39C: +.incbin "baserom.dol", 0x39A39C, 0xC0 + +.global lbl_8039D45C +lbl_8039D45C: +.incbin "baserom.dol", 0x39A45C, 0x34 + diff --git a/asm/rodata/rodata_Padclamp.s b/asm/rodata/rodata_Padclamp.s new file mode 100644 index 0000000000..cbb334c2c4 --- /dev/null +++ b/asm/rodata/rodata_Padclamp.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2170 - 0x803a2180 + +.global lbl_803A2170 +lbl_803A2170: +.incbin "baserom.dol", 0x39F170, 0x10 + diff --git a/asm/rodata/rodata_Z2Audience.s b/asm/rodata/rodata_Z2Audience.s new file mode 100644 index 0000000000..500c3dd09d --- /dev/null +++ b/asm/rodata/rodata_Z2Audience.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039c220 - 0x8039c230 + +.global lbl_8039C220 +lbl_8039C220: +.incbin "baserom.dol", 0x399220, 0x10 + diff --git a/asm/rodata/rodata_Z2AudioMgr.s b/asm/rodata/rodata_Z2AudioMgr.s new file mode 100644 index 0000000000..4ac6081d0c --- /dev/null +++ b/asm/rodata/rodata_Z2AudioMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039ca58 - 0x8039cad8 + +.global lbl_8039CA58 +lbl_8039CA58: +.incbin "baserom.dol", 0x399A58, 0x80 + diff --git a/asm/rodata/rodata_Z2EnvSeMgr.s b/asm/rodata/rodata_Z2EnvSeMgr.s new file mode 100644 index 0000000000..4401667810 --- /dev/null +++ b/asm/rodata/rodata_Z2EnvSeMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039c250 - 0x8039c260 + +.global lbl_8039C250 +lbl_8039C250: +.incbin "baserom.dol", 0x399250, 0x10 + diff --git a/asm/rodata/rodata_Z2SceneMgr.s b/asm/rodata/rodata_Z2SceneMgr.s new file mode 100644 index 0000000000..3957adff2e --- /dev/null +++ b/asm/rodata/rodata_Z2SceneMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039bfa8 - 0x8039c220 + +.global lbl_8039BFA8 +lbl_8039BFA8: +.incbin "baserom.dol", 0x398FA8, 0x278 + diff --git a/asm/rodata/rodata_Z2SeMgr.s b/asm/rodata/rodata_Z2SeMgr.s new file mode 100644 index 0000000000..bb9aa11db1 --- /dev/null +++ b/asm/rodata/rodata_Z2SeMgr.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b9f0 - 0x8039ba08 + +.global lbl_8039B9F0 +lbl_8039B9F0: +.incbin "baserom.dol", 0x3989F0, 0xC + +.global lbl_8039B9FC +lbl_8039B9FC: +.incbin "baserom.dol", 0x3989FC, 0xC + diff --git a/asm/rodata/rodata_Z2SeqMgr.s b/asm/rodata/rodata_Z2SeqMgr.s new file mode 100644 index 0000000000..e389963877 --- /dev/null +++ b/asm/rodata/rodata_Z2SeqMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039ba08 - 0x8039bc88 + +.global lbl_8039BA08 +lbl_8039BA08: +.incbin "baserom.dol", 0x398A08, 0x280 + diff --git a/asm/rodata/rodata_Z2SoundMgr.s b/asm/rodata/rodata_Z2SoundMgr.s new file mode 100644 index 0000000000..37d0460143 --- /dev/null +++ b/asm/rodata/rodata_Z2SoundMgr.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b9c0 - 0x8039b9f0 + +.global lbl_8039B9C0 +lbl_8039B9C0: +.incbin "baserom.dol", 0x3989C0, 0x10 + +.global lbl_8039B9D0 +lbl_8039B9D0: +.incbin "baserom.dol", 0x3989D0, 0x20 + diff --git a/asm/rodata/rodata_Z2SoundObjMgr.s b/asm/rodata/rodata_Z2SoundObjMgr.s new file mode 100644 index 0000000000..fa995db0b3 --- /dev/null +++ b/asm/rodata/rodata_Z2SoundObjMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039c240 - 0x8039c250 + +.global lbl_8039C240 +lbl_8039C240: +.incbin "baserom.dol", 0x399240, 0x10 + diff --git a/asm/rodata/rodata_Z2SoundObject.s b/asm/rodata/rodata_Z2SoundObject.s new file mode 100644 index 0000000000..90281c72f4 --- /dev/null +++ b/asm/rodata/rodata_Z2SoundObject.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039c230 - 0x8039c240 + +.global lbl_8039C230 +lbl_8039C230: +.incbin "baserom.dol", 0x399230, 0x10 + diff --git a/asm/rodata/rodata_Z2SpeechMgr2.s b/asm/rodata/rodata_Z2SpeechMgr2.s new file mode 100644 index 0000000000..723bc31945 --- /dev/null +++ b/asm/rodata/rodata_Z2SpeechMgr2.s @@ -0,0 +1,103 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039c260 - 0x8039ca58 + +.global lbl_8039C260 +lbl_8039C260: +.incbin "baserom.dol", 0x399260, 0x64 + +.global lbl_8039C2C4 +lbl_8039C2C4: +.incbin "baserom.dol", 0x3992C4, 0xC + +.global lbl_8039C2D0 +lbl_8039C2D0: +.incbin "baserom.dol", 0x3992D0, 0x64 + +.global lbl_8039C334 +lbl_8039C334: +.incbin "baserom.dol", 0x399334, 0xC + +.global lbl_8039C340 +lbl_8039C340: +.incbin "baserom.dol", 0x399340, 0x64 + +.global lbl_8039C3A4 +lbl_8039C3A4: +.incbin "baserom.dol", 0x3993A4, 0xC + +.global lbl_8039C3B0 +lbl_8039C3B0: +.incbin "baserom.dol", 0x3993B0, 0x64 + +.global lbl_8039C414 +lbl_8039C414: +.incbin "baserom.dol", 0x399414, 0xC + +.global lbl_8039C420 +lbl_8039C420: +.incbin "baserom.dol", 0x399420, 0x6C + +.global lbl_8039C48C +lbl_8039C48C: +.incbin "baserom.dol", 0x39948C, 0x60 + +.global lbl_8039C4EC +lbl_8039C4EC: +.incbin "baserom.dol", 0x3994EC, 0xC + +.global lbl_8039C4F8 +lbl_8039C4F8: +.incbin "baserom.dol", 0x3994F8, 0x74 + +.global lbl_8039C56C +lbl_8039C56C: +.incbin "baserom.dol", 0x39956C, 0x6C + +.global lbl_8039C5D8 +lbl_8039C5D8: +.incbin "baserom.dol", 0x3995D8, 0x6C + +.global lbl_8039C644 +lbl_8039C644: +.incbin "baserom.dol", 0x399644, 0x6C + +.global lbl_8039C6B0 +lbl_8039C6B0: +.incbin "baserom.dol", 0x3996B0, 0x68 + +.global lbl_8039C718 +lbl_8039C718: +.incbin "baserom.dol", 0x399718, 0x6C + +.global lbl_8039C784 +lbl_8039C784: +.incbin "baserom.dol", 0x399784, 0x6C + +.global lbl_8039C7F0 +lbl_8039C7F0: +.incbin "baserom.dol", 0x3997F0, 0x54 + +.global lbl_8039C844 +lbl_8039C844: +.incbin "baserom.dol", 0x399844, 0x64 + +.global lbl_8039C8A8 +lbl_8039C8A8: +.incbin "baserom.dol", 0x3998A8, 0xC + +.global lbl_8039C8B4 +lbl_8039C8B4: +.incbin "baserom.dol", 0x3998B4, 0x64 + +.global lbl_8039C918 +lbl_8039C918: +.incbin "baserom.dol", 0x399918, 0x68 + +.global lbl_8039C980 +lbl_8039C980: +.incbin "baserom.dol", 0x399980, 0xC + +.global lbl_8039C98C +lbl_8039C98C: +.incbin "baserom.dol", 0x39998C, 0xCC + diff --git a/asm/rodata/rodata_Z2StatusMgr.s b/asm/rodata/rodata_Z2StatusMgr.s new file mode 100644 index 0000000000..5dd99afabb --- /dev/null +++ b/asm/rodata/rodata_Z2StatusMgr.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039bc88 - 0x8039bfa8 + +.global lbl_8039BC88 +lbl_8039BC88: +.incbin "baserom.dol", 0x398C88, 0x320 + diff --git a/asm/rodata/rodata_alloc.s b/asm/rodata/rodata_alloc.s new file mode 100644 index 0000000000..a3301e6fb5 --- /dev/null +++ b/asm/rodata/rodata_alloc.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2220 - 0x803a2238 + +.global lbl_803A2220 +lbl_803A2220: +.incbin "baserom.dol", 0x39F220, 0x18 + diff --git a/asm/rodata/rodata_ansi_fp.s b/asm/rodata/rodata_ansi_fp.s new file mode 100644 index 0000000000..e99445fe8d --- /dev/null +++ b/asm/rodata/rodata_ansi_fp.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2238 - 0x803a2318 + +.global lbl_803A2238 +lbl_803A2238: +.incbin "baserom.dol", 0x39F238, 0xE0 + diff --git a/asm/rodata/rodata_c_cc_d.s b/asm/rodata/rodata_c_cc_d.s new file mode 100644 index 0000000000..0161586cba --- /dev/null +++ b/asm/rodata/rodata_c_cc_d.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a7e8 - 0x8039a868 + +.global lbl_8039A7E8 +lbl_8039A7E8: +.incbin "baserom.dol", 0x3977E8, 0x80 + diff --git a/asm/rodata/rodata_c_dylink.s b/asm/rodata/rodata_c_dylink.s new file mode 100644 index 0000000000..ce8f80b96d --- /dev/null +++ b/asm/rodata/rodata_c_dylink.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80374640 - 0x80378878 + +.global lbl_80374640 +lbl_80374640: +.incbin "baserom.dol", 0x371640, 0x17A8 + +.global lbl_80375DE8 +lbl_80375DE8: +.incbin "baserom.dol", 0x372DE8, 0x2A90 + diff --git a/asm/rodata/rodata_c_xyz.s b/asm/rodata/rodata_c_xyz.s new file mode 100644 index 0000000000..117987e103 --- /dev/null +++ b/asm/rodata/rodata_c_xyz.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a868 - 0x8039a878 + +.global lbl_8039A868 +lbl_8039A868: +.incbin "baserom.dol", 0x397868, 0x10 + diff --git a/asm/rodata/rodata_control.s b/asm/rodata/rodata_control.s new file mode 100644 index 0000000000..4f4fdfa3a6 --- /dev/null +++ b/asm/rodata/rodata_control.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039aba8 - 0x8039abb8 + +.global lbl_8039ABA8 +lbl_8039ABA8: +.incbin "baserom.dol", 0x397BA8, 0x10 + diff --git a/asm/rodata/rodata_d_a_alink.s b/asm/rodata/rodata_d_a_alink.s new file mode 100644 index 0000000000..99cc5d015c --- /dev/null +++ b/asm/rodata/rodata_d_a_alink.s @@ -0,0 +1,1115 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8038d658 - 0x80392640 + +.global lbl_8038D658 +lbl_8038D658: +.incbin "baserom.dol", 0x38A658, 0xC + +.global lbl_8038D664 +lbl_8038D664: +.incbin "baserom.dol", 0x38A664, 0x58 + +.global lbl_8038D6BC +lbl_8038D6BC: +.incbin "baserom.dol", 0x38A6BC, 0x58 + +.global lbl_8038D714 +lbl_8038D714: +.incbin "baserom.dol", 0x38A714, 0x54 + +.global lbl_8038D768 +lbl_8038D768: +.incbin "baserom.dol", 0x38A768, 0x54 + +.global lbl_8038D7BC +lbl_8038D7BC: +.incbin "baserom.dol", 0x38A7BC, 0x70 + +.global lbl_8038D82C +lbl_8038D82C: +.incbin "baserom.dol", 0x38A82C, 0x38 + +.global lbl_8038D864 +lbl_8038D864: +.incbin "baserom.dol", 0x38A864, 0x68 + +.global lbl_8038D8CC +lbl_8038D8CC: +.incbin "baserom.dol", 0x38A8CC, 0x78 + +.global lbl_8038D944 +lbl_8038D944: +.incbin "baserom.dol", 0x38A944, 0x20 + +.global lbl_8038D964 +lbl_8038D964: +.incbin "baserom.dol", 0x38A964, 0x20 + +.global lbl_8038D984 +lbl_8038D984: +.incbin "baserom.dol", 0x38A984, 0x20 + +.global lbl_8038D9A4 +lbl_8038D9A4: +.incbin "baserom.dol", 0x38A9A4, 0x20 + +.global lbl_8038D9C4 +lbl_8038D9C4: +.incbin "baserom.dol", 0x38A9C4, 0x20 + +.global lbl_8038D9E4 +lbl_8038D9E4: +.incbin "baserom.dol", 0x38A9E4, 0x2C + +.global lbl_8038DA10 +lbl_8038DA10: +.incbin "baserom.dol", 0x38AA10, 0x2C + +.global lbl_8038DA3C +lbl_8038DA3C: +.incbin "baserom.dol", 0x38AA3C, 0x2C + +.global lbl_8038DA68 +lbl_8038DA68: +.incbin "baserom.dol", 0x38AA68, 0x2C + +.global lbl_8038DA94 +lbl_8038DA94: +.incbin "baserom.dol", 0x38AA94, 0x2C + +.global lbl_8038DAC0 +lbl_8038DAC0: +.incbin "baserom.dol", 0x38AAC0, 0x2C + +.global lbl_8038DAEC +lbl_8038DAEC: +.incbin "baserom.dol", 0x38AAEC, 0x54 + +.global lbl_8038DB40 +lbl_8038DB40: +.incbin "baserom.dol", 0x38AB40, 0x44 + +.global lbl_8038DB84 +lbl_8038DB84: +.incbin "baserom.dol", 0x38AB84, 0x98 + +.global lbl_8038DC1C +lbl_8038DC1C: +.incbin "baserom.dol", 0x38AC1C, 0x20 + +.global lbl_8038DC3C +lbl_8038DC3C: +.incbin "baserom.dol", 0x38AC3C, 0x20 + +.global lbl_8038DC5C +lbl_8038DC5C: +.incbin "baserom.dol", 0x38AC5C, 0x20 + +.global lbl_8038DC7C +lbl_8038DC7C: +.incbin "baserom.dol", 0x38AC7C, 0x20 + +.global lbl_8038DC9C +lbl_8038DC9C: +.incbin "baserom.dol", 0x38AC9C, 0x54 + +.global lbl_8038DCF0 +lbl_8038DCF0: +.incbin "baserom.dol", 0x38ACF0, 0x1C + +.global lbl_8038DD0C +lbl_8038DD0C: +.incbin "baserom.dol", 0x38AD0C, 0x1C + +.global lbl_8038DD28 +lbl_8038DD28: +.incbin "baserom.dol", 0x38AD28, 0x1C + +.global lbl_8038DD44 +lbl_8038DD44: +.incbin "baserom.dol", 0x38AD44, 0x74 + +.global lbl_8038DDB8 +lbl_8038DDB8: +.incbin "baserom.dol", 0x38ADB8, 0x60 + +.global lbl_8038DE18 +lbl_8038DE18: +.incbin "baserom.dol", 0x38AE18, 0x74 + +.global lbl_8038DE8C +lbl_8038DE8C: +.incbin "baserom.dol", 0x38AE8C, 0x9C + +.global lbl_8038DF28 +lbl_8038DF28: +.incbin "baserom.dol", 0x38AF28, 0x24 + +.global lbl_8038DF4C +lbl_8038DF4C: +.incbin "baserom.dol", 0x38AF4C, 0x24 + +.global lbl_8038DF70 +lbl_8038DF70: +.incbin "baserom.dol", 0x38AF70, 0x2C + +.global lbl_8038DF9C +lbl_8038DF9C: +.incbin "baserom.dol", 0x38AF9C, 0x80 + +.global lbl_8038E01C +lbl_8038E01C: +.incbin "baserom.dol", 0x38B01C, 0x4C + +.global lbl_8038E068 +lbl_8038E068: +.incbin "baserom.dol", 0x38B068, 0xB4 + +.global lbl_8038E11C +lbl_8038E11C: +.incbin "baserom.dol", 0x38B11C, 0x48 + +.global lbl_8038E164 +lbl_8038E164: +.incbin "baserom.dol", 0x38B164, 0x54 + +.global lbl_8038E1B8 +lbl_8038E1B8: +.incbin "baserom.dol", 0x38B1B8, 0x28 + +.global lbl_8038E1E0 +lbl_8038E1E0: +.incbin "baserom.dol", 0x38B1E0, 0x14 + +.global lbl_8038E1F4 +lbl_8038E1F4: +.incbin "baserom.dol", 0x38B1F4, 0x1C + +.global lbl_8038E210 +lbl_8038E210: +.incbin "baserom.dol", 0x38B210, 0x3C + +.global lbl_8038E24C +lbl_8038E24C: +.incbin "baserom.dol", 0x38B24C, 0x64 + +.global lbl_8038E2B0 +lbl_8038E2B0: +.incbin "baserom.dol", 0x38B2B0, 0xBC + +.global lbl_8038E36C +lbl_8038E36C: +.incbin "baserom.dol", 0x38B36C, 0xBC + +.global lbl_8038E428 +lbl_8038E428: +.incbin "baserom.dol", 0x38B428, 0x2C + +.global lbl_8038E454 +lbl_8038E454: +.incbin "baserom.dol", 0x38B454, 0x48 + +.global lbl_8038E49C +lbl_8038E49C: +.incbin "baserom.dol", 0x38B49C, 0x24 + +.global lbl_8038E4C0 +lbl_8038E4C0: +.incbin "baserom.dol", 0x38B4C0, 0x8C + +.global lbl_8038E54C +lbl_8038E54C: +.incbin "baserom.dol", 0x38B54C, 0x58 + +.global lbl_8038E5A4 +lbl_8038E5A4: +.incbin "baserom.dol", 0x38B5A4, 0x6C + +.global lbl_8038E610 +lbl_8038E610: +.incbin "baserom.dol", 0x38B610, 0x48 + +.global lbl_8038E658 +lbl_8038E658: +.incbin "baserom.dol", 0x38B658, 0x70 + +.global lbl_8038E6C8 +lbl_8038E6C8: +.incbin "baserom.dol", 0x38B6C8, 0x4C + +.global lbl_8038E714 +lbl_8038E714: +.incbin "baserom.dol", 0x38B714, 0x4C + +.global lbl_8038E760 +lbl_8038E760: +.incbin "baserom.dol", 0x38B760, 0x1C + +.global lbl_8038E77C +lbl_8038E77C: +.incbin "baserom.dol", 0x38B77C, 0x50 + +.global lbl_8038E7CC +lbl_8038E7CC: +.incbin "baserom.dol", 0x38B7CC, 0x28 + +.global lbl_8038E7F4 +lbl_8038E7F4: +.incbin "baserom.dol", 0x38B7F4, 0x4C + +.global lbl_8038E840 +lbl_8038E840: +.incbin "baserom.dol", 0x38B840, 0x30 + +.global lbl_8038E870 +lbl_8038E870: +.incbin "baserom.dol", 0x38B870, 0x9C + +.global lbl_8038E90C +lbl_8038E90C: +.incbin "baserom.dol", 0x38B90C, 0xB4 + +.global lbl_8038E9C0 +lbl_8038E9C0: +.incbin "baserom.dol", 0x38B9C0, 0x70 + +.global lbl_8038EA30 +lbl_8038EA30: +.incbin "baserom.dol", 0x38BA30, 0x40 + +.global lbl_8038EA70 +lbl_8038EA70: +.incbin "baserom.dol", 0x38BA70, 0x8C + +.global lbl_8038EAFC +lbl_8038EAFC: +.incbin "baserom.dol", 0x38BAFC, 0x38 + +.global lbl_8038EB34 +lbl_8038EB34: +.incbin "baserom.dol", 0x38BB34, 0x1C + +.global lbl_8038EB50 +lbl_8038EB50: +.incbin "baserom.dol", 0x38BB50, 0x3C + +.global lbl_8038EB8C +lbl_8038EB8C: +.incbin "baserom.dol", 0x38BB8C, 0x70 + +.global lbl_8038EBFC +lbl_8038EBFC: +.incbin "baserom.dol", 0x38BBFC, 0x4C + +.global lbl_8038EC48 +lbl_8038EC48: +.incbin "baserom.dol", 0x38BC48, 0xE4 + +.global lbl_8038ED2C +lbl_8038ED2C: +.incbin "baserom.dol", 0x38BD2C, 0xFC + +.global lbl_8038EE28 +lbl_8038EE28: +.incbin "baserom.dol", 0x38BE28, 0x100 + +.global lbl_8038EF28 +lbl_8038EF28: +.incbin "baserom.dol", 0x38BF28, 0x48 + +.global lbl_8038EF70 +lbl_8038EF70: +.incbin "baserom.dol", 0x38BF70, 0x38 + +.global lbl_8038EFA8 +lbl_8038EFA8: +.incbin "baserom.dol", 0x38BFA8, 0x68 + +.global lbl_8038F010 +lbl_8038F010: +.incbin "baserom.dol", 0x38C010, 0x38 + +.global lbl_8038F048 +lbl_8038F048: +.incbin "baserom.dol", 0x38C048, 0x60 + +.global lbl_8038F0A8 +lbl_8038F0A8: +.incbin "baserom.dol", 0x38C0A8, 0x7C + +.global lbl_8038F124 +lbl_8038F124: +.incbin "baserom.dol", 0x38C124, 0x14 + +.global lbl_8038F138 +lbl_8038F138: +.incbin "baserom.dol", 0x38C138, 0x4C + +.global lbl_8038F184 +lbl_8038F184: +.incbin "baserom.dol", 0x38C184, 0x1C + +.global lbl_8038F1A0 +lbl_8038F1A0: +.incbin "baserom.dol", 0x38C1A0, 0x9C + +.global lbl_8038F23C +lbl_8038F23C: +.incbin "baserom.dol", 0x38C23C, 0x60 + +.global lbl_8038F29C +lbl_8038F29C: +.incbin "baserom.dol", 0x38C29C, 0x6C + +.global lbl_8038F308 +lbl_8038F308: +.incbin "baserom.dol", 0x38C308, 0x6C + +.global lbl_8038F374 +lbl_8038F374: +.incbin "baserom.dol", 0x38C374, 0x40 + +.global lbl_8038F3B4 +lbl_8038F3B4: +.incbin "baserom.dol", 0x38C3B4, 0x10 + +.global lbl_8038F3C4 +lbl_8038F3C4: +.incbin "baserom.dol", 0x38C3C4, 0x2C + +.global lbl_8038F3F0 +lbl_8038F3F0: +.incbin "baserom.dol", 0x38C3F0, 0x7C + +.global lbl_8038F46C +lbl_8038F46C: +.incbin "baserom.dol", 0x38C46C, 0x38 + +.global lbl_8038F4A4 +lbl_8038F4A4: +.incbin "baserom.dol", 0x38C4A4, 0x3C + +.global lbl_8038F4E0 +lbl_8038F4E0: +.incbin "baserom.dol", 0x38C4E0, 0x3C + +.global lbl_8038F51C +lbl_8038F51C: +.incbin "baserom.dol", 0x38C51C, 0x3C + +.global lbl_8038F558 +lbl_8038F558: +.incbin "baserom.dol", 0x38C558, 0x20 + +.global lbl_8038F578 +lbl_8038F578: +.incbin "baserom.dol", 0x38C578, 0x3C + +.global lbl_8038F5B4 +lbl_8038F5B4: +.incbin "baserom.dol", 0x38C5B4, 0x64 + +.global lbl_8038F618 +lbl_8038F618: +.incbin "baserom.dol", 0x38C618, 0x40 + +.global lbl_8038F658 +lbl_8038F658: +.incbin "baserom.dol", 0x38C658, 0x9C + +.global lbl_8038F6F4 +lbl_8038F6F4: +.incbin "baserom.dol", 0x38C6F4, 0x54 + +.global lbl_8038F748 +lbl_8038F748: +.incbin "baserom.dol", 0x38C748, 0x5C + +.global lbl_8038F7A4 +lbl_8038F7A4: +.incbin "baserom.dol", 0x38C7A4, 0x38 + +.global lbl_8038F7DC +lbl_8038F7DC: +.incbin "baserom.dol", 0x38C7DC, 0x7C + +.global lbl_8038F858 +lbl_8038F858: +.incbin "baserom.dol", 0x38C858, 0x5C + +.global lbl_8038F8B4 +lbl_8038F8B4: +.incbin "baserom.dol", 0x38C8B4, 0xA8 + +.global lbl_8038F95C +lbl_8038F95C: +.incbin "baserom.dol", 0x38C95C, 0x64 + +.global lbl_8038F9C0 +lbl_8038F9C0: +.incbin "baserom.dol", 0x38C9C0, 0x38 + +.global lbl_8038F9F8 +lbl_8038F9F8: +.incbin "baserom.dol", 0x38C9F8, 0x18 + +.global lbl_8038FA10 +lbl_8038FA10: +.incbin "baserom.dol", 0x38CA10, 0x10 + +.global lbl_8038FA20 +lbl_8038FA20: +.incbin "baserom.dol", 0x38CA20, 0x18 + +.global lbl_8038FA38 +lbl_8038FA38: +.incbin "baserom.dol", 0x38CA38, 0x10 + +.global lbl_8038FA48 +lbl_8038FA48: +.incbin "baserom.dol", 0x38CA48, 0xC + +.global lbl_8038FA54 +lbl_8038FA54: +.incbin "baserom.dol", 0x38CA54, 0xC + +.global lbl_8038FA60 +lbl_8038FA60: +.incbin "baserom.dol", 0x38CA60, 0xC + +.global lbl_8038FA6C +lbl_8038FA6C: +.incbin "baserom.dol", 0x38CA6C, 0xC + +.global lbl_8038FA78 +lbl_8038FA78: +.incbin "baserom.dol", 0x38CA78, 0xC + +.global lbl_8038FA84 +lbl_8038FA84: +.incbin "baserom.dol", 0x38CA84, 0xC + +.global lbl_8038FA90 +lbl_8038FA90: +.incbin "baserom.dol", 0x38CA90, 0xC + +.global lbl_8038FA9C +lbl_8038FA9C: +.incbin "baserom.dol", 0x38CA9C, 0xC + +.global lbl_8038FAA8 +lbl_8038FAA8: +.incbin "baserom.dol", 0x38CAA8, 0xC + +.global lbl_8038FAB4 +lbl_8038FAB4: +.incbin "baserom.dol", 0x38CAB4, 0xC + +.global lbl_8038FAC0 +lbl_8038FAC0: +.incbin "baserom.dol", 0x38CAC0, 0xC + +.global lbl_8038FACC +lbl_8038FACC: +.incbin "baserom.dol", 0x38CACC, 0xC + +.global lbl_8038FAD8 +lbl_8038FAD8: +.incbin "baserom.dol", 0x38CAD8, 0xC + +.global lbl_8038FAE4 +lbl_8038FAE4: +.incbin "baserom.dol", 0x38CAE4, 0xC + +.global lbl_8038FAF0 +lbl_8038FAF0: +.incbin "baserom.dol", 0x38CAF0, 0xC + +.global lbl_8038FAFC +lbl_8038FAFC: +.incbin "baserom.dol", 0x38CAFC, 0xC + +.global lbl_8038FB08 +lbl_8038FB08: +.incbin "baserom.dol", 0x38CB08, 0xC + +.global lbl_8038FB14 +lbl_8038FB14: +.incbin "baserom.dol", 0x38CB14, 0xC + +.global lbl_8038FB20 +lbl_8038FB20: +.incbin "baserom.dol", 0x38CB20, 0xC + +.global lbl_8038FB2C +lbl_8038FB2C: +.incbin "baserom.dol", 0x38CB2C, 0xC + +.global lbl_8038FB38 +lbl_8038FB38: +.incbin "baserom.dol", 0x38CB38, 0xC + +.global lbl_8038FB44 +lbl_8038FB44: +.incbin "baserom.dol", 0x38CB44, 0xC + +.global lbl_8038FB50 +lbl_8038FB50: +.incbin "baserom.dol", 0x38CB50, 0xC + +.global lbl_8038FB5C +lbl_8038FB5C: +.incbin "baserom.dol", 0x38CB5C, 0x60 + +.global lbl_8038FBBC +lbl_8038FBBC: +.incbin "baserom.dol", 0x38CBBC, 0x18 + +.global lbl_8038FBD4 +lbl_8038FBD4: +.incbin "baserom.dol", 0x38CBD4, 0x50 + +.global lbl_8038FC24 +lbl_8038FC24: +.incbin "baserom.dol", 0x38CC24, 0x14 + +.global lbl_8038FC38 +lbl_8038FC38: +.incbin "baserom.dol", 0x38CC38, 0x70 + +.global lbl_8038FCA8 +lbl_8038FCA8: +.incbin "baserom.dol", 0x38CCA8, 0x1368 + +.global lbl_80391010 +lbl_80391010: +.incbin "baserom.dol", 0x38E010, 0x498 + +.global lbl_803914A8 +lbl_803914A8: +.incbin "baserom.dol", 0x38E4A8, 0x28C + +.global lbl_80391734 +lbl_80391734: +.incbin "baserom.dol", 0x38E734, 0xC + +.global lbl_80391740 +lbl_80391740: +.incbin "baserom.dol", 0x38E740, 0x14 + +.global lbl_80391754 +lbl_80391754: +.incbin "baserom.dol", 0x38E754, 0x14 + +.global lbl_80391768 +lbl_80391768: +.incbin "baserom.dol", 0x38E768, 0x14 + +.global lbl_8039177C +lbl_8039177C: +.incbin "baserom.dol", 0x38E77C, 0x14 + +.global lbl_80391790 +lbl_80391790: +.incbin "baserom.dol", 0x38E790, 0x14 + +.global lbl_803917A4 +lbl_803917A4: +.incbin "baserom.dol", 0x38E7A4, 0x14 + +.global lbl_803917B8 +lbl_803917B8: +.incbin "baserom.dol", 0x38E7B8, 0x14 + +.global lbl_803917CC +lbl_803917CC: +.incbin "baserom.dol", 0x38E7CC, 0x14 + +.global lbl_803917E0 +lbl_803917E0: +.incbin "baserom.dol", 0x38E7E0, 0x14 + +.global lbl_803917F4 +lbl_803917F4: +.incbin "baserom.dol", 0x38E7F4, 0x14 + +.global lbl_80391808 +lbl_80391808: +.incbin "baserom.dol", 0x38E808, 0x50 + +.global lbl_80391858 +lbl_80391858: +.incbin "baserom.dol", 0x38E858, 0x60 + +.global lbl_803918B8 +lbl_803918B8: +.incbin "baserom.dol", 0x38E8B8, 0xC + +.global lbl_803918C4 +lbl_803918C4: +.incbin "baserom.dol", 0x38E8C4, 0xC + +.global lbl_803918D0 +lbl_803918D0: +.incbin "baserom.dol", 0x38E8D0, 0xC + +.global lbl_803918DC +lbl_803918DC: +.incbin "baserom.dol", 0x38E8DC, 0xC + +.global lbl_803918E8 +lbl_803918E8: +.incbin "baserom.dol", 0x38E8E8, 0xC + +.global lbl_803918F4 +lbl_803918F4: +.incbin "baserom.dol", 0x38E8F4, 0xC + +.global lbl_80391900 +lbl_80391900: +.incbin "baserom.dol", 0x38E900, 0xC + +.global lbl_8039190C +lbl_8039190C: +.incbin "baserom.dol", 0x38E90C, 0xC + +.global lbl_80391918 +lbl_80391918: +.incbin "baserom.dol", 0x38E918, 0xC + +.global lbl_80391924 +lbl_80391924: +.incbin "baserom.dol", 0x38E924, 0xC + +.global lbl_80391930 +lbl_80391930: +.incbin "baserom.dol", 0x38E930, 0xC + +.global lbl_8039193C +lbl_8039193C: +.incbin "baserom.dol", 0x38E93C, 0xC + +.global lbl_80391948 +lbl_80391948: +.incbin "baserom.dol", 0x38E948, 0xC + +.global lbl_80391954 +lbl_80391954: +.incbin "baserom.dol", 0x38E954, 0xC + +.global lbl_80391960 +lbl_80391960: +.incbin "baserom.dol", 0x38E960, 0xC + +.global lbl_8039196C +lbl_8039196C: +.incbin "baserom.dol", 0x38E96C, 0xC + +.global lbl_80391978 +lbl_80391978: +.incbin "baserom.dol", 0x38E978, 0xC + +.global lbl_80391984 +lbl_80391984: +.incbin "baserom.dol", 0x38E984, 0xC + +.global lbl_80391990 +lbl_80391990: +.incbin "baserom.dol", 0x38E990, 0xC + +.global lbl_8039199C +lbl_8039199C: +.incbin "baserom.dol", 0x38E99C, 0xC + +.global lbl_803919A8 +lbl_803919A8: +.incbin "baserom.dol", 0x38E9A8, 0x30 + +.global lbl_803919D8 +lbl_803919D8: +.incbin "baserom.dol", 0x38E9D8, 0xC + +.global lbl_803919E4 +lbl_803919E4: +.incbin "baserom.dol", 0x38E9E4, 0xC + +.global lbl_803919F0 +lbl_803919F0: +.incbin "baserom.dol", 0x38E9F0, 0xC + +.global lbl_803919FC +lbl_803919FC: +.incbin "baserom.dol", 0x38E9FC, 0xC + +.global lbl_80391A08 +lbl_80391A08: +.incbin "baserom.dol", 0x38EA08, 0xC + +.global lbl_80391A14 +lbl_80391A14: +.incbin "baserom.dol", 0x38EA14, 0xC + +.global lbl_80391A20 +lbl_80391A20: +.incbin "baserom.dol", 0x38EA20, 0xC + +.global lbl_80391A2C +lbl_80391A2C: +.incbin "baserom.dol", 0x38EA2C, 0xC + +.global lbl_80391A38 +lbl_80391A38: +.incbin "baserom.dol", 0x38EA38, 0xC + +.global lbl_80391A44 +lbl_80391A44: +.incbin "baserom.dol", 0x38EA44, 0xC + +.global lbl_80391A50 +lbl_80391A50: +.incbin "baserom.dol", 0x38EA50, 0xC + +.global lbl_80391A5C +lbl_80391A5C: +.incbin "baserom.dol", 0x38EA5C, 0x100 + +.global lbl_80391B5C +lbl_80391B5C: +.incbin "baserom.dol", 0x38EB5C, 0x20 + +.global lbl_80391B7C +lbl_80391B7C: +.incbin "baserom.dol", 0x38EB7C, 0x10 + +.global lbl_80391B8C +lbl_80391B8C: +.incbin "baserom.dol", 0x38EB8C, 0x14 + +.global lbl_80391BA0 +lbl_80391BA0: +.incbin "baserom.dol", 0x38EBA0, 0xC + +.global lbl_80391BAC +lbl_80391BAC: +.incbin "baserom.dol", 0x38EBAC, 0xC + +.global lbl_80391BB8 +lbl_80391BB8: +.incbin "baserom.dol", 0x38EBB8, 0xC + +.global lbl_80391BC4 +lbl_80391BC4: +.incbin "baserom.dol", 0x38EBC4, 0xC + +.global lbl_80391BD0 +lbl_80391BD0: +.incbin "baserom.dol", 0x38EBD0, 0xC + +.global lbl_80391BDC +lbl_80391BDC: +.incbin "baserom.dol", 0x38EBDC, 0xC + +.global lbl_80391BE8 +lbl_80391BE8: +.incbin "baserom.dol", 0x38EBE8, 0xC + +.global lbl_80391BF4 +lbl_80391BF4: +.incbin "baserom.dol", 0x38EBF4, 0xC + +.global lbl_80391C00 +lbl_80391C00: +.incbin "baserom.dol", 0x38EC00, 0xC + +.global lbl_80391C0C +lbl_80391C0C: +.incbin "baserom.dol", 0x38EC0C, 0xC + +.global lbl_80391C18 +lbl_80391C18: +.incbin "baserom.dol", 0x38EC18, 0xC + +.global lbl_80391C24 +lbl_80391C24: +.incbin "baserom.dol", 0x38EC24, 0xC + +.global lbl_80391C30 +lbl_80391C30: +.incbin "baserom.dol", 0x38EC30, 0xC + +.global lbl_80391C3C +lbl_80391C3C: +.incbin "baserom.dol", 0x38EC3C, 0xC + +.global lbl_80391C48 +lbl_80391C48: +.incbin "baserom.dol", 0x38EC48, 0xC + +.global lbl_80391C54 +lbl_80391C54: +.incbin "baserom.dol", 0x38EC54, 0xC + +.global lbl_80391C60 +lbl_80391C60: +.incbin "baserom.dol", 0x38EC60, 0xC + +.global lbl_80391C6C +lbl_80391C6C: +.incbin "baserom.dol", 0x38EC6C, 0xC + +.global lbl_80391C78 +lbl_80391C78: +.incbin "baserom.dol", 0x38EC78, 0xC + +.global lbl_80391C84 +lbl_80391C84: +.incbin "baserom.dol", 0x38EC84, 0x18 + +.global lbl_80391C9C +lbl_80391C9C: +.incbin "baserom.dol", 0x38EC9C, 0x30 + +.global lbl_80391CCC +lbl_80391CCC: +.incbin "baserom.dol", 0x38ECCC, 0xC + +.global lbl_80391CD8 +lbl_80391CD8: +.incbin "baserom.dol", 0x38ECD8, 0x48 + +.global lbl_80391D20 +lbl_80391D20: +.incbin "baserom.dol", 0x38ED20, 0x18 + +.global lbl_80391D38 +lbl_80391D38: +.incbin "baserom.dol", 0x38ED38, 0xC + +.global lbl_80391D44 +lbl_80391D44: +.incbin "baserom.dol", 0x38ED44, 0x10 + +.global lbl_80391D54 +lbl_80391D54: +.incbin "baserom.dol", 0x38ED54, 0xC + +.global lbl_80391D60 +lbl_80391D60: +.incbin "baserom.dol", 0x38ED60, 0xC + +.global lbl_80391D6C +lbl_80391D6C: +.incbin "baserom.dol", 0x38ED6C, 0xC + +.global lbl_80391D78 +lbl_80391D78: +.incbin "baserom.dol", 0x38ED78, 0xC + +.global lbl_80391D84 +lbl_80391D84: +.incbin "baserom.dol", 0x38ED84, 0x10 + +.global lbl_80391D94 +lbl_80391D94: +.incbin "baserom.dol", 0x38ED94, 0x60 + +.global lbl_80391DF4 +lbl_80391DF4: +.incbin "baserom.dol", 0x38EDF4, 0xC + +.global lbl_80391E00 +lbl_80391E00: +.incbin "baserom.dol", 0x38EE00, 0xC + +.global lbl_80391E0C +lbl_80391E0C: +.incbin "baserom.dol", 0x38EE0C, 0xC + +.global lbl_80391E18 +lbl_80391E18: +.incbin "baserom.dol", 0x38EE18, 0xC + +.global lbl_80391E24 +lbl_80391E24: +.incbin "baserom.dol", 0x38EE24, 0xC + +.global lbl_80391E30 +lbl_80391E30: +.incbin "baserom.dol", 0x38EE30, 0xC + +.global lbl_80391E3C +lbl_80391E3C: +.incbin "baserom.dol", 0x38EE3C, 0xC + +.global lbl_80391E48 +lbl_80391E48: +.incbin "baserom.dol", 0x38EE48, 0x30 + +.global lbl_80391E78 +lbl_80391E78: +.incbin "baserom.dol", 0x38EE78, 0x14 + +.global lbl_80391E8C +lbl_80391E8C: +.incbin "baserom.dol", 0x38EE8C, 0x14 + +.global lbl_80391EA0 +lbl_80391EA0: +.incbin "baserom.dol", 0x38EEA0, 0x20 + +.global lbl_80391EC0 +lbl_80391EC0: +.incbin "baserom.dol", 0x38EEC0, 0xC + +.global lbl_80391ECC +lbl_80391ECC: +.incbin "baserom.dol", 0x38EECC, 0xC + +.global lbl_80391ED8 +lbl_80391ED8: +.incbin "baserom.dol", 0x38EED8, 0xC + +.global lbl_80391EE4 +lbl_80391EE4: +.incbin "baserom.dol", 0x38EEE4, 0xC + +.global lbl_80391EF0 +lbl_80391EF0: +.incbin "baserom.dol", 0x38EEF0, 0xC + +.global lbl_80391EFC +lbl_80391EFC: +.incbin "baserom.dol", 0x38EEFC, 0xC + +.global lbl_80391F08 +lbl_80391F08: +.incbin "baserom.dol", 0x38EF08, 0xC + +.global lbl_80391F14 +lbl_80391F14: +.incbin "baserom.dol", 0x38EF14, 0xC + +.global lbl_80391F20 +lbl_80391F20: +.incbin "baserom.dol", 0x38EF20, 0xC + +.global lbl_80391F2C +lbl_80391F2C: +.incbin "baserom.dol", 0x38EF2C, 0x18 + +.global lbl_80391F44 +lbl_80391F44: +.incbin "baserom.dol", 0x38EF44, 0xC + +.global lbl_80391F50 +lbl_80391F50: +.incbin "baserom.dol", 0x38EF50, 0xC + +.global lbl_80391F5C +lbl_80391F5C: +.incbin "baserom.dol", 0x38EF5C, 0xC + +.global lbl_80391F68 +lbl_80391F68: +.incbin "baserom.dol", 0x38EF68, 0xC + +.global lbl_80391F74 +lbl_80391F74: +.incbin "baserom.dol", 0x38EF74, 0xC + +.global lbl_80391F80 +lbl_80391F80: +.incbin "baserom.dol", 0x38EF80, 0xC + +.global lbl_80391F8C +lbl_80391F8C: +.incbin "baserom.dol", 0x38EF8C, 0xC + +.global lbl_80391F98 +lbl_80391F98: +.incbin "baserom.dol", 0x38EF98, 0xC + +.global lbl_80391FA4 +lbl_80391FA4: +.incbin "baserom.dol", 0x38EFA4, 0xC + +.global lbl_80391FB0 +lbl_80391FB0: +.incbin "baserom.dol", 0x38EFB0, 0xC + +.global lbl_80391FBC +lbl_80391FBC: +.incbin "baserom.dol", 0x38EFBC, 0xC + +.global lbl_80391FC8 +lbl_80391FC8: +.incbin "baserom.dol", 0x38EFC8, 0xC + +.global lbl_80391FD4 +lbl_80391FD4: +.incbin "baserom.dol", 0x38EFD4, 0xC + +.global lbl_80391FE0 +lbl_80391FE0: +.incbin "baserom.dol", 0x38EFE0, 0xC + +.global lbl_80391FEC +lbl_80391FEC: +.incbin "baserom.dol", 0x38EFEC, 0xC + +.global lbl_80391FF8 +lbl_80391FF8: +.incbin "baserom.dol", 0x38EFF8, 0xC + +.global lbl_80392004 +lbl_80392004: +.incbin "baserom.dol", 0x38F004, 0xC + +.global lbl_80392010 +lbl_80392010: +.incbin "baserom.dol", 0x38F010, 0xC + +.global lbl_8039201C +lbl_8039201C: +.incbin "baserom.dol", 0x38F01C, 0xC + +.global lbl_80392028 +lbl_80392028: +.incbin "baserom.dol", 0x38F028, 0xC + +.global lbl_80392034 +lbl_80392034: +.incbin "baserom.dol", 0x38F034, 0xC + +.global lbl_80392040 +lbl_80392040: +.incbin "baserom.dol", 0x38F040, 0xC + +.global lbl_8039204C +lbl_8039204C: +.incbin "baserom.dol", 0x38F04C, 0xC + +.global lbl_80392058 +lbl_80392058: +.incbin "baserom.dol", 0x38F058, 0xC + +.global lbl_80392064 +lbl_80392064: +.incbin "baserom.dol", 0x38F064, 0xC + +.global lbl_80392070 +lbl_80392070: +.incbin "baserom.dol", 0x38F070, 0xC + +.global lbl_8039207C +lbl_8039207C: +.incbin "baserom.dol", 0x38F07C, 0xC + +.global lbl_80392088 +lbl_80392088: +.incbin "baserom.dol", 0x38F088, 0xC + +.global lbl_80392094 +lbl_80392094: +.incbin "baserom.dol", 0x38F094, 0x5AC + diff --git a/asm/rodata/rodata_d_a_itembase_static.s b/asm/rodata/rodata_d_a_itembase_static.s new file mode 100644 index 0000000000..0bbc7be828 --- /dev/null +++ b/asm/rodata/rodata_d_a_itembase_static.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803792b0 - 0x803792e8 + +.global lbl_803792B0 +lbl_803792B0: +.incbin "baserom.dol", 0x3762B0, 0x38 + diff --git a/asm/rodata/rodata_d_a_no_chg_room.s b/asm/rodata/rodata_d_a_no_chg_room.s new file mode 100644 index 0000000000..91ba84206c --- /dev/null +++ b/asm/rodata/rodata_d_a_no_chg_room.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80392640 - 0x80392680 + +.global lbl_80392640 +lbl_80392640: +.incbin "baserom.dol", 0x38F640, 0x40 + diff --git a/asm/rodata/rodata_d_a_npc.s b/asm/rodata/rodata_d_a_npc.s new file mode 100644 index 0000000000..9e1bb31e65 --- /dev/null +++ b/asm/rodata/rodata_d_a_npc.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80392680 - 0x80392a18 + +.global lbl_80392680 +lbl_80392680: +.incbin "baserom.dol", 0x38F680, 0x30 + +.global lbl_803926B0 +lbl_803926B0: +.incbin "baserom.dol", 0x38F6B0, 0x30 + +.global lbl_803926E0 +lbl_803926E0: +.incbin "baserom.dol", 0x38F6E0, 0x30 + +.global lbl_80392710 +lbl_80392710: +.incbin "baserom.dol", 0x38F710, 0x308 + diff --git a/asm/rodata/rodata_d_a_npc_cd.s b/asm/rodata/rodata_d_a_npc_cd.s new file mode 100644 index 0000000000..bcaf04c80f --- /dev/null +++ b/asm/rodata/rodata_d_a_npc_cd.s @@ -0,0 +1,155 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80392a18 - 0x80393250 + +.global lbl_80392A18 +lbl_80392A18: +.incbin "baserom.dol", 0x38FA18, 0x18 + +.global lbl_80392A30 +lbl_80392A30: +.incbin "baserom.dol", 0x38FA30, 0x18 + +.global lbl_80392A48 +lbl_80392A48: +.incbin "baserom.dol", 0x38FA48, 0x18 + +.global lbl_80392A60 +lbl_80392A60: +.incbin "baserom.dol", 0x38FA60, 0x18 + +.global lbl_80392A78 +lbl_80392A78: +.incbin "baserom.dol", 0x38FA78, 0x18 + +.global lbl_80392A90 +lbl_80392A90: +.incbin "baserom.dol", 0x38FA90, 0x18 + +.global lbl_80392AA8 +lbl_80392AA8: +.incbin "baserom.dol", 0x38FAA8, 0x18 + +.global lbl_80392AC0 +lbl_80392AC0: +.incbin "baserom.dol", 0x38FAC0, 0x18 + +.global lbl_80392AD8 +lbl_80392AD8: +.incbin "baserom.dol", 0x38FAD8, 0x18 + +.global lbl_80392AF0 +lbl_80392AF0: +.incbin "baserom.dol", 0x38FAF0, 0x18 + +.global lbl_80392B08 +lbl_80392B08: +.incbin "baserom.dol", 0x38FB08, 0x18 + +.global lbl_80392B20 +lbl_80392B20: +.incbin "baserom.dol", 0x38FB20, 0x18 + +.global lbl_80392B38 +lbl_80392B38: +.incbin "baserom.dol", 0x38FB38, 0x18 + +.global lbl_80392B50 +lbl_80392B50: +.incbin "baserom.dol", 0x38FB50, 0x18 + +.global lbl_80392B68 +lbl_80392B68: +.incbin "baserom.dol", 0x38FB68, 0x18 + +.global lbl_80392B80 +lbl_80392B80: +.incbin "baserom.dol", 0x38FB80, 0x18 + +.global lbl_80392B98 +lbl_80392B98: +.incbin "baserom.dol", 0x38FB98, 0x18 + +.global lbl_80392BB0 +lbl_80392BB0: +.incbin "baserom.dol", 0x38FBB0, 0x18 + +.global lbl_80392BC8 +lbl_80392BC8: +.incbin "baserom.dol", 0x38FBC8, 0x18 + +.global lbl_80392BE0 +lbl_80392BE0: +.incbin "baserom.dol", 0x38FBE0, 0x18 + +.global lbl_80392BF8 +lbl_80392BF8: +.incbin "baserom.dol", 0x38FBF8, 0x18 + +.global lbl_80392C10 +lbl_80392C10: +.incbin "baserom.dol", 0x38FC10, 0x18 + +.global lbl_80392C28 +lbl_80392C28: +.incbin "baserom.dol", 0x38FC28, 0x18 + +.global lbl_80392C40 +lbl_80392C40: +.incbin "baserom.dol", 0x38FC40, 0x18 + +.global lbl_80392C58 +lbl_80392C58: +.incbin "baserom.dol", 0x38FC58, 0x18 + +.global lbl_80392C70 +lbl_80392C70: +.incbin "baserom.dol", 0x38FC70, 0x18 + +.global lbl_80392C88 +lbl_80392C88: +.incbin "baserom.dol", 0x38FC88, 0x18 + +.global lbl_80392CA0 +lbl_80392CA0: +.incbin "baserom.dol", 0x38FCA0, 0x18 + +.global lbl_80392CB8 +lbl_80392CB8: +.incbin "baserom.dol", 0x38FCB8, 0x18 + +.global lbl_80392CD0 +lbl_80392CD0: +.incbin "baserom.dol", 0x38FCD0, 0x18 + +.global lbl_80392CE8 +lbl_80392CE8: +.incbin "baserom.dol", 0x38FCE8, 0x48 + +.global lbl_80392D30 +lbl_80392D30: +.incbin "baserom.dol", 0x38FD30, 0x48 + +.global lbl_80392D78 +lbl_80392D78: +.incbin "baserom.dol", 0x38FD78, 0x50 + +.global lbl_80392DC8 +lbl_80392DC8: +.incbin "baserom.dol", 0x38FDC8, 0x50 + +.global lbl_80392E18 +lbl_80392E18: +.incbin "baserom.dol", 0x38FE18, 0x44 + +.global lbl_80392E5C +lbl_80392E5C: +.incbin "baserom.dol", 0x38FE5C, 0x168 + +.global lbl_80392FC4 +lbl_80392FC4: +.incbin "baserom.dol", 0x38FFC4, 0x24 + +.global lbl_80392FE8 +lbl_80392FE8: +.incbin "baserom.dol", 0x38FFE8, 0x268 + diff --git a/asm/rodata/rodata_d_a_npc_cd2.s b/asm/rodata/rodata_d_a_npc_cd2.s new file mode 100644 index 0000000000..15c0afc7b3 --- /dev/null +++ b/asm/rodata/rodata_d_a_npc_cd2.s @@ -0,0 +1,159 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80393250 - 0x80393d88 + +.global lbl_80393250 +lbl_80393250: +.incbin "baserom.dol", 0x390250, 0x18 + +.global lbl_80393268 +lbl_80393268: +.incbin "baserom.dol", 0x390268, 0x18 + +.global lbl_80393280 +lbl_80393280: +.incbin "baserom.dol", 0x390280, 0x18 + +.global lbl_80393298 +lbl_80393298: +.incbin "baserom.dol", 0x390298, 0x18 + +.global lbl_803932B0 +lbl_803932B0: +.incbin "baserom.dol", 0x3902B0, 0x18 + +.global lbl_803932C8 +lbl_803932C8: +.incbin "baserom.dol", 0x3902C8, 0x18 + +.global lbl_803932E0 +lbl_803932E0: +.incbin "baserom.dol", 0x3902E0, 0x18 + +.global lbl_803932F8 +lbl_803932F8: +.incbin "baserom.dol", 0x3902F8, 0x18 + +.global lbl_80393310 +lbl_80393310: +.incbin "baserom.dol", 0x390310, 0x18 + +.global lbl_80393328 +lbl_80393328: +.incbin "baserom.dol", 0x390328, 0x18 + +.global lbl_80393340 +lbl_80393340: +.incbin "baserom.dol", 0x390340, 0x18 + +.global lbl_80393358 +lbl_80393358: +.incbin "baserom.dol", 0x390358, 0x18 + +.global lbl_80393370 +lbl_80393370: +.incbin "baserom.dol", 0x390370, 0x18 + +.global lbl_80393388 +lbl_80393388: +.incbin "baserom.dol", 0x390388, 0x18 + +.global lbl_803933A0 +lbl_803933A0: +.incbin "baserom.dol", 0x3903A0, 0x18 + +.global lbl_803933B8 +lbl_803933B8: +.incbin "baserom.dol", 0x3903B8, 0x18 + +.global lbl_803933D0 +lbl_803933D0: +.incbin "baserom.dol", 0x3903D0, 0x18 + +.global lbl_803933E8 +lbl_803933E8: +.incbin "baserom.dol", 0x3903E8, 0x18 + +.global lbl_80393400 +lbl_80393400: +.incbin "baserom.dol", 0x390400, 0x18 + +.global lbl_80393418 +lbl_80393418: +.incbin "baserom.dol", 0x390418, 0x18 + +.global lbl_80393430 +lbl_80393430: +.incbin "baserom.dol", 0x390430, 0x18 + +.global lbl_80393448 +lbl_80393448: +.incbin "baserom.dol", 0x390448, 0x18 + +.global lbl_80393460 +lbl_80393460: +.incbin "baserom.dol", 0x390460, 0x18 + +.global lbl_80393478 +lbl_80393478: +.incbin "baserom.dol", 0x390478, 0x18 + +.global lbl_80393490 +lbl_80393490: +.incbin "baserom.dol", 0x390490, 0x18 + +.global lbl_803934A8 +lbl_803934A8: +.incbin "baserom.dol", 0x3904A8, 0x18 + +.global lbl_803934C0 +lbl_803934C0: +.incbin "baserom.dol", 0x3904C0, 0x18 + +.global lbl_803934D8 +lbl_803934D8: +.incbin "baserom.dol", 0x3904D8, 0x18 + +.global lbl_803934F0 +lbl_803934F0: +.incbin "baserom.dol", 0x3904F0, 0x18 + +.global lbl_80393508 +lbl_80393508: +.incbin "baserom.dol", 0x390508, 0x18 + +.global lbl_80393520 +lbl_80393520: +.incbin "baserom.dol", 0x390520, 0x68 + +.global lbl_80393588 +lbl_80393588: +.incbin "baserom.dol", 0x390588, 0x68 + +.global lbl_803935F0 +lbl_803935F0: +.incbin "baserom.dol", 0x3905F0, 0x1B0 + +.global lbl_803937A0 +lbl_803937A0: +.incbin "baserom.dol", 0x3907A0, 0x1B0 + +.global lbl_80393950 +lbl_80393950: +.incbin "baserom.dol", 0x390950, 0x44 + +.global lbl_80393994 +lbl_80393994: +.incbin "baserom.dol", 0x390994, 0x168 + +.global lbl_80393AFC +lbl_80393AFC: +.incbin "baserom.dol", 0x390AFC, 0xC + +.global lbl_80393B08 +lbl_80393B08: +.incbin "baserom.dol", 0x390B08, 0x68 + +.global lbl_80393B70 +lbl_80393B70: +.incbin "baserom.dol", 0x390B70, 0x218 + diff --git a/asm/rodata/rodata_d_a_obj.s b/asm/rodata/rodata_d_a_obj.s new file mode 100644 index 0000000000..765cc54ba8 --- /dev/null +++ b/asm/rodata/rodata_d_a_obj.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379298 - 0x803792b0 + +.global lbl_80379298 +lbl_80379298: +.incbin "baserom.dol", 0x376298, 0x10 + +.global lbl_803792A8 +lbl_803792A8: +.incbin "baserom.dol", 0x3762A8, 0x8 + diff --git a/asm/rodata/rodata_d_a_obj_item.s b/asm/rodata/rodata_d_a_obj_item.s new file mode 100644 index 0000000000..38c891b01e --- /dev/null +++ b/asm/rodata/rodata_d_a_obj_item.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80393d88 - 0x80393d98 + +.global lbl_80393D88 +lbl_80393D88: +.incbin "baserom.dol", 0x390D88, 0x10 + diff --git a/asm/rodata/rodata_d_a_player.s b/asm/rodata/rodata_d_a_player.s new file mode 100644 index 0000000000..8260755d39 --- /dev/null +++ b/asm/rodata/rodata_d_a_player.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80393da8 - 0x80393dc0 + +.global lbl_80393DA8 +lbl_80393DA8: +.incbin "baserom.dol", 0x390DA8, 0xC + +.global lbl_80393DB4 +lbl_80393DB4: +.incbin "baserom.dol", 0x390DB4, 0xC + diff --git a/asm/rodata/rodata_d_a_shop_item_static.s b/asm/rodata/rodata_d_a_shop_item_static.s new file mode 100644 index 0000000000..51325f84aa --- /dev/null +++ b/asm/rodata/rodata_d_a_shop_item_static.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803792e8 - 0x803797f8 + +.global lbl_803792E8 +lbl_803792E8: +.incbin "baserom.dol", 0x3762E8, 0x450 + +.global lbl_80379738 +lbl_80379738: +.incbin "baserom.dol", 0x376738, 0xC0 + diff --git a/asm/rodata/rodata_d_attention.s b/asm/rodata/rodata_d_attention.s new file mode 100644 index 0000000000..620970949c --- /dev/null +++ b/asm/rodata/rodata_d_attention.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a770 - 0x8037a780 + +.global lbl_8037A770 +lbl_8037A770: +.incbin "baserom.dol", 0x377770, 0x10 + diff --git a/asm/rodata/rodata_d_bright_check.s b/asm/rodata/rodata_d_bright_check.s new file mode 100644 index 0000000000..ccac3f8e81 --- /dev/null +++ b/asm/rodata/rodata_d_bright_check.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394910 - 0x803949f0 + +.global lbl_80394910 +lbl_80394910: +.incbin "baserom.dol", 0x391910, 0x28 + +.global lbl_80394938 +lbl_80394938: +.incbin "baserom.dol", 0x391938, 0x28 + +.global lbl_80394960 +lbl_80394960: +.incbin "baserom.dol", 0x391960, 0x50 + +.global lbl_803949B0 +lbl_803949B0: +.incbin "baserom.dol", 0x3919B0, 0x28 + +.global lbl_803949D8 +lbl_803949D8: +.incbin "baserom.dol", 0x3919D8, 0x18 + diff --git a/asm/rodata/rodata_d_cam_param.s b/asm/rodata/rodata_d_cam_param.s new file mode 100644 index 0000000000..90502f4b6b --- /dev/null +++ b/asm/rodata/rodata_d_cam_param.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a7e0 - 0x8037a7f0 + +.global lbl_8037A7E0 +lbl_8037A7E0: +.incbin "baserom.dol", 0x3777E0, 0x10 + diff --git a/asm/rodata/rodata_d_camera.s b/asm/rodata/rodata_d_camera.s new file mode 100644 index 0000000000..9b158f2d88 --- /dev/null +++ b/asm/rodata/rodata_d_camera.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80393dc0 - 0x80394308 + +.global lbl_80393DC0 +lbl_80393DC0: +.incbin "baserom.dol", 0x390DC0, 0x198 + +.global lbl_80393F58 +lbl_80393F58: +.incbin "baserom.dol", 0x390F58, 0x10 + +.global lbl_80393F68 +lbl_80393F68: +.incbin "baserom.dol", 0x390F68, 0x3A0 + diff --git a/asm/rodata/rodata_d_cc_d.s b/asm/rodata/rodata_d_cc_d.s new file mode 100644 index 0000000000..033a25e00a --- /dev/null +++ b/asm/rodata/rodata_d_cc_d.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a780 - 0x8037a7e0 + +.global lbl_8037A780 +lbl_8037A780: +.incbin "baserom.dol", 0x377780, 0x60 + diff --git a/asm/rodata/rodata_d_com_inf_game.s b/asm/rodata/rodata_d_com_inf_game.s new file mode 100644 index 0000000000..cc3c7acc57 --- /dev/null +++ b/asm/rodata/rodata_d_com_inf_game.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80378f38 - 0x803790b0 + +.global lbl_80378F38 +lbl_80378F38: +.incbin "baserom.dol", 0x375F38, 0x178 + diff --git a/asm/rodata/rodata_d_com_static.s b/asm/rodata/rodata_d_com_static.s new file mode 100644 index 0000000000..427ee79ee7 --- /dev/null +++ b/asm/rodata/rodata_d_com_static.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803790b0 - 0x803790c0 + +.global lbl_803790B0 +lbl_803790B0: +.incbin "baserom.dol", 0x3760B0, 0x10 + diff --git a/asm/rodata/rodata_d_demo.s b/asm/rodata/rodata_d_demo.s new file mode 100644 index 0000000000..4cc38f9e4b --- /dev/null +++ b/asm/rodata/rodata_d_demo.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803797f8 - 0x80379840 + +.global lbl_803797F8 +lbl_803797F8: +.incbin "baserom.dol", 0x3767F8, 0x48 + diff --git a/asm/rodata/rodata_d_drawlist.s b/asm/rodata/rodata_d_drawlist.s new file mode 100644 index 0000000000..13c00b2cac --- /dev/null +++ b/asm/rodata/rodata_d_drawlist.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a178 - 0x8037a1c0 + +.global lbl_8037A178 +lbl_8037A178: +.incbin "baserom.dol", 0x377178, 0x2C + +.global lbl_8037A1A4 +lbl_8037A1A4: +.incbin "baserom.dol", 0x3771A4, 0xC + +.global lbl_8037A1B0 +lbl_8037A1B0: +.incbin "baserom.dol", 0x3771B0, 0x10 + diff --git a/asm/rodata/rodata_d_envse.s b/asm/rodata/rodata_d_envse.s new file mode 100644 index 0000000000..328da3a814 --- /dev/null +++ b/asm/rodata/rodata_d_envse.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394308 - 0x80394310 + +.global lbl_80394308 +lbl_80394308: +.incbin "baserom.dol", 0x391308, 0x8 + diff --git a/asm/rodata/rodata_d_error_msg.s b/asm/rodata/rodata_d_error_msg.s new file mode 100644 index 0000000000..51edc2b420 --- /dev/null +++ b/asm/rodata/rodata_d_error_msg.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037b140 - 0x8038d658 + +.global lbl_8037B140 +lbl_8037B140: +.incbin "baserom.dol", 0x378140, 0x40 + +.global lbl_8037B180 +lbl_8037B180: +.incbin "baserom.dol", 0x378180, 0x260 + +.global lbl_8037B3E0 +lbl_8037B3E0: +.incbin "baserom.dol", 0x3783E0, 0x12260 + +.global lbl_8038D640 +lbl_8038D640: +.incbin "baserom.dol", 0x38A640, 0x18 + diff --git a/asm/rodata/rodata_d_ev_camera.s b/asm/rodata/rodata_d_ev_camera.s new file mode 100644 index 0000000000..38e21d670f --- /dev/null +++ b/asm/rodata/rodata_d_ev_camera.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a7f0 - 0x8037ad68 + +.global lbl_8037A7F0 +lbl_8037A7F0: +.incbin "baserom.dol", 0x3777F0, 0xC + +.global lbl_8037A7FC +lbl_8037A7FC: +.incbin "baserom.dol", 0x3777FC, 0x10 + +.global lbl_8037A80C +lbl_8037A80C: +.incbin "baserom.dol", 0x37780C, 0x1C + +.global lbl_8037A828 +lbl_8037A828: +.incbin "baserom.dol", 0x377828, 0x1C + +.global lbl_8037A844 +lbl_8037A844: +.incbin "baserom.dol", 0x377844, 0x14 + +.global lbl_8037A858 +lbl_8037A858: +.incbin "baserom.dol", 0x377858, 0x14 + +.global lbl_8037A86C +lbl_8037A86C: +.incbin "baserom.dol", 0x37786C, 0x18 + +.global lbl_8037A884 +lbl_8037A884: +.incbin "baserom.dol", 0x377884, 0x18 + +.global lbl_8037A89C +lbl_8037A89C: +.incbin "baserom.dol", 0x37789C, 0x16C + +.global lbl_8037AA08 +lbl_8037AA08: +.incbin "baserom.dol", 0x377A08, 0x38 + +.global lbl_8037AA40 +lbl_8037AA40: +.incbin "baserom.dol", 0x377A40, 0x64 + +.global lbl_8037AAA4 +lbl_8037AAA4: +.incbin "baserom.dol", 0x377AA4, 0x18 + +.global lbl_8037AABC +lbl_8037AABC: +.incbin "baserom.dol", 0x377ABC, 0x28 + +.global lbl_8037AAE4 +lbl_8037AAE4: +.incbin "baserom.dol", 0x377AE4, 0x10 + +.global lbl_8037AAF4 +lbl_8037AAF4: +.incbin "baserom.dol", 0x377AF4, 0x274 + diff --git a/asm/rodata/rodata_d_event.s b/asm/rodata/rodata_d_event.s new file mode 100644 index 0000000000..f0ba081828 --- /dev/null +++ b/asm/rodata/rodata_d_event.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379d80 - 0x80379dd0 + +.global lbl_80379D80 +lbl_80379D80: +.incbin "baserom.dol", 0x376D80, 0x50 + diff --git a/asm/rodata/rodata_d_event_data.s b/asm/rodata/rodata_d_event_data.s new file mode 100644 index 0000000000..d8cd537775 --- /dev/null +++ b/asm/rodata/rodata_d_event_data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379dd0 - 0x80379f50 + +.global lbl_80379DD0 +lbl_80379DD0: +.incbin "baserom.dol", 0x376DD0, 0x180 + diff --git a/asm/rodata/rodata_d_event_manager.s b/asm/rodata/rodata_d_event_manager.s new file mode 100644 index 0000000000..cf29a77372 --- /dev/null +++ b/asm/rodata/rodata_d_event_manager.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379f50 - 0x8037a108 + +.global lbl_80379F50 +lbl_80379F50: +.incbin "baserom.dol", 0x376F50, 0x10 + +.global lbl_80379F60 +lbl_80379F60: +.incbin "baserom.dol", 0x376F60, 0x1A8 + diff --git a/asm/rodata/rodata_d_eye_hl.s b/asm/rodata/rodata_d_eye_hl.s new file mode 100644 index 0000000000..45a2f3984e --- /dev/null +++ b/asm/rodata/rodata_d_eye_hl.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037b100 - 0x8037b140 + +.global lbl_8037B100 +lbl_8037B100: +.incbin "baserom.dol", 0x378100, 0x40 + diff --git a/asm/rodata/rodata_d_file_sel_info.s b/asm/rodata/rodata_d_file_sel_info.s new file mode 100644 index 0000000000..25d6691592 --- /dev/null +++ b/asm/rodata/rodata_d_file_sel_info.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803948b8 - 0x80394910 + +.global lbl_803948B8 +lbl_803948B8: +.incbin "baserom.dol", 0x3918B8, 0x58 + diff --git a/asm/rodata/rodata_d_file_sel_warning.s b/asm/rodata/rodata_d_file_sel_warning.s new file mode 100644 index 0000000000..ab068bf9d5 --- /dev/null +++ b/asm/rodata/rodata_d_file_sel_warning.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394828 - 0x803948b8 + +.global lbl_80394828 +lbl_80394828: +.incbin "baserom.dol", 0x391828, 0x90 + diff --git a/asm/rodata/rodata_d_file_select.s b/asm/rodata/rodata_d_file_select.s new file mode 100644 index 0000000000..02b667b985 --- /dev/null +++ b/asm/rodata/rodata_d_file_select.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394310 - 0x80394828 + +.global lbl_80394310 +lbl_80394310: +.incbin "baserom.dol", 0x391310, 0x14 + +.global lbl_80394324 +lbl_80394324: +.incbin "baserom.dol", 0x391324, 0x14 + +.global lbl_80394338 +lbl_80394338: +.incbin "baserom.dol", 0x391338, 0x14 + +.global lbl_8039434C +lbl_8039434C: +.incbin "baserom.dol", 0x39134C, 0x14 + +.global lbl_80394360 +lbl_80394360: +.incbin "baserom.dol", 0x391360, 0x14 + +.global lbl_80394374 +lbl_80394374: +.incbin "baserom.dol", 0x391374, 0x14 + +.global lbl_80394388 +lbl_80394388: +.incbin "baserom.dol", 0x391388, 0x4A0 + diff --git a/asm/rodata/rodata_d_gameover.s b/asm/rodata/rodata_d_gameover.s new file mode 100644 index 0000000000..7683c8d9cc --- /dev/null +++ b/asm/rodata/rodata_d_gameover.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394c28 - 0x80394c60 + +.global lbl_80394C28 +lbl_80394C28: +.incbin "baserom.dol", 0x391C28, 0x38 + diff --git a/asm/rodata/rodata_d_insect.s b/asm/rodata/rodata_d_insect.s new file mode 100644 index 0000000000..28170647c6 --- /dev/null +++ b/asm/rodata/rodata_d_insect.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80393d98 - 0x80393da8 + +.global lbl_80393D98 +lbl_80393D98: +.incbin "baserom.dol", 0x390D98, 0x10 + diff --git a/asm/rodata/rodata_d_item.s b/asm/rodata/rodata_d_item.s new file mode 100644 index 0000000000..0d6899d4be --- /dev/null +++ b/asm/rodata/rodata_d_item.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037b0d0 - 0x8037b0d8 + +.global lbl_8037B0D0 +lbl_8037B0D0: +.incbin "baserom.dol", 0x3780D0, 0x8 + diff --git a/asm/rodata/rodata_d_item_data.s b/asm/rodata/rodata_d_item_data.s new file mode 100644 index 0000000000..656cf30010 --- /dev/null +++ b/asm/rodata/rodata_d_item_data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037ad68 - 0x8037b0d0 + +.global lbl_8037AD68 +lbl_8037AD68: +.incbin "baserom.dol", 0x377D68, 0x368 + diff --git a/asm/rodata/rodata_d_k_wmark.s b/asm/rodata/rodata_d_k_wmark.s new file mode 100644 index 0000000000..27fa468344 --- /dev/null +++ b/asm/rodata/rodata_d_k_wmark.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a488 - 0x8039a4a0 + +.global lbl_8039A488 +lbl_8039A488: +.incbin "baserom.dol", 0x397488, 0xC + +.global lbl_8039A494 +lbl_8039A494: +.incbin "baserom.dol", 0x397494, 0xC + diff --git a/asm/rodata/rodata_d_kankyo.s b/asm/rodata/rodata_d_kankyo.s new file mode 100644 index 0000000000..6c4a62b71b --- /dev/null +++ b/asm/rodata/rodata_d_kankyo.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394c60 - 0x80394f38 + +.global lbl_80394C60 +lbl_80394C60: +.incbin "baserom.dol", 0x391C60, 0xC + +.global lbl_80394C6C +lbl_80394C6C: +.incbin "baserom.dol", 0x391C6C, 0x2CC + diff --git a/asm/rodata/rodata_d_kankyo_data.s b/asm/rodata/rodata_d_kankyo_data.s new file mode 100644 index 0000000000..89b52c4981 --- /dev/null +++ b/asm/rodata/rodata_d_kankyo_data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a1c0 - 0x8037a368 + +.global lbl_8037A1C0 +lbl_8037A1C0: +.incbin "baserom.dol", 0x3771C0, 0x1A8 + diff --git a/asm/rodata/rodata_d_kankyo_rain.s b/asm/rodata/rodata_d_kankyo_rain.s new file mode 100644 index 0000000000..b4137ea579 --- /dev/null +++ b/asm/rodata/rodata_d_kankyo_rain.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a4c0 - 0x8037a620 + +.global lbl_8037A4C0 +lbl_8037A4C0: +.incbin "baserom.dol", 0x3774C0, 0x28 + +.global lbl_8037A4E8 +lbl_8037A4E8: +.incbin "baserom.dol", 0x3774E8, 0x20 + +.global lbl_8037A508 +lbl_8037A508: +.incbin "baserom.dol", 0x377508, 0x20 + +.global lbl_8037A528 +lbl_8037A528: +.incbin "baserom.dol", 0x377528, 0x20 + +.global lbl_8037A548 +lbl_8037A548: +.incbin "baserom.dol", 0x377548, 0x20 + +.global lbl_8037A568 +lbl_8037A568: +.incbin "baserom.dol", 0x377568, 0x10 + +.global lbl_8037A578 +lbl_8037A578: +.incbin "baserom.dol", 0x377578, 0xA8 + diff --git a/asm/rodata/rodata_d_kankyo_wether.s b/asm/rodata/rodata_d_kankyo_wether.s new file mode 100644 index 0000000000..97e25d92d9 --- /dev/null +++ b/asm/rodata/rodata_d_kankyo_wether.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a368 - 0x8037a4c0 + +.global lbl_8037A368 +lbl_8037A368: +.incbin "baserom.dol", 0x377368, 0x158 + diff --git a/asm/rodata/rodata_d_kantera_icon_meter.s b/asm/rodata/rodata_d_kantera_icon_meter.s new file mode 100644 index 0000000000..ef5df0f10f --- /dev/null +++ b/asm/rodata/rodata_d_kantera_icon_meter.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394f50 - 0x80394f70 + +.global lbl_80394F50 +lbl_80394F50: +.incbin "baserom.dol", 0x391F50, 0x20 + diff --git a/asm/rodata/rodata_d_ky_thunder.s b/asm/rodata/rodata_d_ky_thunder.s new file mode 100644 index 0000000000..5661e529a9 --- /dev/null +++ b/asm/rodata/rodata_d_ky_thunder.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394f40 - 0x80394f50 + +.global lbl_80394F40 +lbl_80394F40: +.incbin "baserom.dol", 0x391F40, 0x10 + diff --git a/asm/rodata/rodata_d_kyeff.s b/asm/rodata/rodata_d_kyeff.s new file mode 100644 index 0000000000..807c8e3c09 --- /dev/null +++ b/asm/rodata/rodata_d_kyeff.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394f38 - 0x80394f40 + +.global lbl_80394F38 +lbl_80394F38: +.incbin "baserom.dol", 0x391F38, 0x8 + diff --git a/asm/rodata/rodata_d_map.s b/asm/rodata/rodata_d_map.s new file mode 100644 index 0000000000..c6827732e3 --- /dev/null +++ b/asm/rodata/rodata_d_map.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80378e48 - 0x80378f38 + +.global lbl_80378E48 +lbl_80378E48: +.incbin "baserom.dol", 0x375E48, 0x44 + +.global lbl_80378E8C +lbl_80378E8C: +.incbin "baserom.dol", 0x375E8C, 0x24 + +.global lbl_80378EB0 +lbl_80378EB0: +.incbin "baserom.dol", 0x375EB0, 0x24 + +.global lbl_80378ED4 +lbl_80378ED4: +.incbin "baserom.dol", 0x375ED4, 0x24 + +.global lbl_80378EF8 +lbl_80378EF8: +.incbin "baserom.dol", 0x375EF8, 0x10 + +.global lbl_80378F08 +lbl_80378F08: +.incbin "baserom.dol", 0x375F08, 0x1C + +.global lbl_80378F24 +lbl_80378F24: +.incbin "baserom.dol", 0x375F24, 0x14 + diff --git a/asm/rodata/rodata_d_map_path.s b/asm/rodata/rodata_d_map_path.s new file mode 100644 index 0000000000..d14c11cdae --- /dev/null +++ b/asm/rodata/rodata_d_map_path.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379c30 - 0x80379c58 + +.global lbl_80379C30 +lbl_80379C30: +.incbin "baserom.dol", 0x376C30, 0x1C + +.global lbl_80379C4C +lbl_80379C4C: +.incbin "baserom.dol", 0x376C4C, 0xC + diff --git a/asm/rodata/rodata_d_map_path_dmap.s b/asm/rodata/rodata_d_map_path_dmap.s new file mode 100644 index 0000000000..2b5ceeeae4 --- /dev/null +++ b/asm/rodata/rodata_d_map_path_dmap.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379c58 - 0x80379d80 + +.global lbl_80379C58 +lbl_80379C58: +.incbin "baserom.dol", 0x376C58, 0x30 + +.global lbl_80379C88 +lbl_80379C88: +.incbin "baserom.dol", 0x376C88, 0x30 + +.global lbl_80379CB8 +lbl_80379CB8: +.incbin "baserom.dol", 0x376CB8, 0x84 + +.global lbl_80379D3C +lbl_80379D3C: +.incbin "baserom.dol", 0x376D3C, 0x20 + +.global lbl_80379D5C +lbl_80379D5C: +.incbin "baserom.dol", 0x376D5C, 0x24 + diff --git a/asm/rodata/rodata_d_menu_calibration.s b/asm/rodata/rodata_d_menu_calibration.s new file mode 100644 index 0000000000..1c68fc29cd --- /dev/null +++ b/asm/rodata/rodata_d_menu_calibration.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394f70 - 0x80394f78 + +.global lbl_80394F70 +lbl_80394F70: +.incbin "baserom.dol", 0x391F70, 0x8 + diff --git a/asm/rodata/rodata_d_menu_collect.s b/asm/rodata/rodata_d_menu_collect.s new file mode 100644 index 0000000000..89a324afef --- /dev/null +++ b/asm/rodata/rodata_d_menu_collect.s @@ -0,0 +1,103 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394f78 - 0x80395518 + +.global lbl_80394F78 +lbl_80394F78: +.incbin "baserom.dol", 0x391F78, 0x10 + +.global lbl_80394F88 +lbl_80394F88: +.incbin "baserom.dol", 0x391F88, 0x18 + +.global lbl_80394FA0 +lbl_80394FA0: +.incbin "baserom.dol", 0x391FA0, 0x18 + +.global lbl_80394FB8 +lbl_80394FB8: +.incbin "baserom.dol", 0x391FB8, 0x18 + +.global lbl_80394FD0 +lbl_80394FD0: +.incbin "baserom.dol", 0x391FD0, 0x18 + +.global lbl_80394FE8 +lbl_80394FE8: +.incbin "baserom.dol", 0x391FE8, 0x28 + +.global lbl_80395010 +lbl_80395010: +.incbin "baserom.dol", 0x392010, 0x28 + +.global lbl_80395038 +lbl_80395038: +.incbin "baserom.dol", 0x392038, 0xC + +.global lbl_80395044 +lbl_80395044: +.incbin "baserom.dol", 0x392044, 0xC + +.global lbl_80395050 +lbl_80395050: +.incbin "baserom.dol", 0x392050, 0x28 + +.global lbl_80395078 +lbl_80395078: +.incbin "baserom.dol", 0x392078, 0x20 + +.global lbl_80395098 +lbl_80395098: +.incbin "baserom.dol", 0x392098, 0x10 + +.global lbl_803950A8 +lbl_803950A8: +.incbin "baserom.dol", 0x3920A8, 0x10 + +.global lbl_803950B8 +lbl_803950B8: +.incbin "baserom.dol", 0x3920B8, 0x18 + +.global lbl_803950D0 +lbl_803950D0: +.incbin "baserom.dol", 0x3920D0, 0x48 + +.global lbl_80395118 +lbl_80395118: +.incbin "baserom.dol", 0x392118, 0x150 + +.global lbl_80395268 +lbl_80395268: +.incbin "baserom.dol", 0x392268, 0x28 + +.global lbl_80395290 +lbl_80395290: +.incbin "baserom.dol", 0x392290, 0x28 + +.global lbl_803952B8 +lbl_803952B8: +.incbin "baserom.dol", 0x3922B8, 0x14 + +.global lbl_803952CC +lbl_803952CC: +.incbin "baserom.dol", 0x3922CC, 0x14 + +.global lbl_803952E0 +lbl_803952E0: +.incbin "baserom.dol", 0x3922E0, 0x14 + +.global lbl_803952F4 +lbl_803952F4: +.incbin "baserom.dol", 0x3922F4, 0x14 + +.global lbl_80395308 +lbl_80395308: +.incbin "baserom.dol", 0x392308, 0x14 + +.global lbl_8039531C +lbl_8039531C: +.incbin "baserom.dol", 0x39231C, 0x14 + +.global lbl_80395330 +lbl_80395330: +.incbin "baserom.dol", 0x392330, 0x1E8 + diff --git a/asm/rodata/rodata_d_menu_dmap.s b/asm/rodata/rodata_d_menu_dmap.s new file mode 100644 index 0000000000..61a0d687fd --- /dev/null +++ b/asm/rodata/rodata_d_menu_dmap.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80395518 - 0x80395860 + +.global lbl_80395518 +lbl_80395518: +.incbin "baserom.dol", 0x392518, 0x28 + +.global lbl_80395540 +lbl_80395540: +.incbin "baserom.dol", 0x392540, 0x28 + +.global lbl_80395568 +lbl_80395568: +.incbin "baserom.dol", 0x392568, 0x28 + +.global lbl_80395590 +lbl_80395590: +.incbin "baserom.dol", 0x392590, 0x28 + +.global lbl_803955B8 +lbl_803955B8: +.incbin "baserom.dol", 0x3925B8, 0x10 + +.global lbl_803955C8 +lbl_803955C8: +.incbin "baserom.dol", 0x3925C8, 0x28 + +.global lbl_803955F0 +lbl_803955F0: +.incbin "baserom.dol", 0x3925F0, 0x28 + +.global lbl_80395618 +lbl_80395618: +.incbin "baserom.dol", 0x392618, 0x10 + +.global lbl_80395628 +lbl_80395628: +.incbin "baserom.dol", 0x392628, 0x20 + +.global lbl_80395648 +lbl_80395648: +.incbin "baserom.dol", 0x392648, 0x40 + +.global lbl_80395688 +lbl_80395688: +.incbin "baserom.dol", 0x392688, 0x40 + +.global lbl_803956C8 +lbl_803956C8: +.incbin "baserom.dol", 0x3926C8, 0x40 + +.global lbl_80395708 +lbl_80395708: +.incbin "baserom.dol", 0x392708, 0x10 + +.global lbl_80395718 +lbl_80395718: +.incbin "baserom.dol", 0x392718, 0x18 + +.global lbl_80395730 +lbl_80395730: +.incbin "baserom.dol", 0x392730, 0x18 + +.global lbl_80395748 +lbl_80395748: +.incbin "baserom.dol", 0x392748, 0x18 + +.global lbl_80395760 +lbl_80395760: +.incbin "baserom.dol", 0x392760, 0x100 + diff --git a/asm/rodata/rodata_d_menu_dmap_map.s b/asm/rodata/rodata_d_menu_dmap_map.s new file mode 100644 index 0000000000..7c07535c33 --- /dev/null +++ b/asm/rodata/rodata_d_menu_dmap_map.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80395860 - 0x803959c0 + +.global lbl_80395860 +lbl_80395860: +.incbin "baserom.dol", 0x392860, 0xF0 + +.global lbl_80395950 +lbl_80395950: +.incbin "baserom.dol", 0x392950, 0x24 + +.global lbl_80395974 +lbl_80395974: +.incbin "baserom.dol", 0x392974, 0x24 + +.global lbl_80395998 +lbl_80395998: +.incbin "baserom.dol", 0x392998, 0x28 + diff --git a/asm/rodata/rodata_d_menu_fishing.s b/asm/rodata/rodata_d_menu_fishing.s new file mode 100644 index 0000000000..d4d719d80a --- /dev/null +++ b/asm/rodata/rodata_d_menu_fishing.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80395d90 - 0x803960d0 + +.global lbl_80395D90 +lbl_80395D90: +.incbin "baserom.dol", 0x392D90, 0x30 + +.global lbl_80395DC0 +lbl_80395DC0: +.incbin "baserom.dol", 0x392DC0, 0x30 + +.global lbl_80395DF0 +lbl_80395DF0: +.incbin "baserom.dol", 0x392DF0, 0x30 + +.global lbl_80395E20 +lbl_80395E20: +.incbin "baserom.dol", 0x392E20, 0x30 + +.global lbl_80395E50 +lbl_80395E50: +.incbin "baserom.dol", 0x392E50, 0x30 + +.global lbl_80395E80 +lbl_80395E80: +.incbin "baserom.dol", 0x392E80, 0x30 + +.global lbl_80395EB0 +lbl_80395EB0: +.incbin "baserom.dol", 0x392EB0, 0x30 + +.global lbl_80395EE0 +lbl_80395EE0: +.incbin "baserom.dol", 0x392EE0, 0x30 + +.global lbl_80395F10 +lbl_80395F10: +.incbin "baserom.dol", 0x392F10, 0x30 + +.global lbl_80395F40 +lbl_80395F40: +.incbin "baserom.dol", 0x392F40, 0x30 + +.global lbl_80395F70 +lbl_80395F70: +.incbin "baserom.dol", 0x392F70, 0x30 + +.global lbl_80395FA0 +lbl_80395FA0: +.incbin "baserom.dol", 0x392FA0, 0x30 + +.global lbl_80395FD0 +lbl_80395FD0: +.incbin "baserom.dol", 0x392FD0, 0x30 + +.global lbl_80396000 +lbl_80396000: +.incbin "baserom.dol", 0x393000, 0x18 + +.global lbl_80396018 +lbl_80396018: +.incbin "baserom.dol", 0x393018, 0x28 + +.global lbl_80396040 +lbl_80396040: +.incbin "baserom.dol", 0x393040, 0x28 + +.global lbl_80396068 +lbl_80396068: +.incbin "baserom.dol", 0x393068, 0x68 + diff --git a/asm/rodata/rodata_d_menu_fmap.s b/asm/rodata/rodata_d_menu_fmap.s new file mode 100644 index 0000000000..af3ee30ea6 --- /dev/null +++ b/asm/rodata/rodata_d_menu_fmap.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803960d0 - 0x803961b0 + +.global lbl_803960D0 +lbl_803960D0: +.incbin "baserom.dol", 0x3930D0, 0x18 + +.global lbl_803960E8 +lbl_803960E8: +.incbin "baserom.dol", 0x3930E8, 0xC8 + diff --git a/asm/rodata/rodata_d_menu_fmap2D.s b/asm/rodata/rodata_d_menu_fmap2D.s new file mode 100644 index 0000000000..603002f990 --- /dev/null +++ b/asm/rodata/rodata_d_menu_fmap2D.s @@ -0,0 +1,99 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80396248 - 0x80396690 + +.global lbl_80396248 +lbl_80396248: +.incbin "baserom.dol", 0x393248, 0x20 + +.global lbl_80396268 +lbl_80396268: +.incbin "baserom.dol", 0x393268, 0x20 + +.global lbl_80396288 +lbl_80396288: +.incbin "baserom.dol", 0x393288, 0x18 + +.global lbl_803962A0 +lbl_803962A0: +.incbin "baserom.dol", 0x3932A0, 0x18 + +.global lbl_803962B8 +lbl_803962B8: +.incbin "baserom.dol", 0x3932B8, 0x38 + +.global lbl_803962F0 +lbl_803962F0: +.incbin "baserom.dol", 0x3932F0, 0x38 + +.global lbl_80396328 +lbl_80396328: +.incbin "baserom.dol", 0x393328, 0x28 + +.global lbl_80396350 +lbl_80396350: +.incbin "baserom.dol", 0x393350, 0x28 + +.global lbl_80396378 +lbl_80396378: +.incbin "baserom.dol", 0x393378, 0x28 + +.global lbl_803963A0 +lbl_803963A0: +.incbin "baserom.dol", 0x3933A0, 0x28 + +.global lbl_803963C8 +lbl_803963C8: +.incbin "baserom.dol", 0x3933C8, 0x28 + +.global lbl_803963F0 +lbl_803963F0: +.incbin "baserom.dol", 0x3933F0, 0x28 + +.global lbl_80396418 +lbl_80396418: +.incbin "baserom.dol", 0x393418, 0x28 + +.global lbl_80396440 +lbl_80396440: +.incbin "baserom.dol", 0x393440, 0x28 + +.global lbl_80396468 +lbl_80396468: +.incbin "baserom.dol", 0x393468, 0x28 + +.global lbl_80396490 +lbl_80396490: +.incbin "baserom.dol", 0x393490, 0x28 + +.global lbl_803964B8 +lbl_803964B8: +.incbin "baserom.dol", 0x3934B8, 0x38 + +.global lbl_803964F0 +lbl_803964F0: +.incbin "baserom.dol", 0x3934F0, 0x18 + +.global lbl_80396508 +lbl_80396508: +.incbin "baserom.dol", 0x393508, 0x28 + +.global lbl_80396530 +lbl_80396530: +.incbin "baserom.dol", 0x393530, 0x28 + +.global lbl_80396558 +lbl_80396558: +.incbin "baserom.dol", 0x393558, 0x28 + +.global lbl_80396580 +lbl_80396580: +.incbin "baserom.dol", 0x393580, 0x28 + +.global lbl_803965A8 +lbl_803965A8: +.incbin "baserom.dol", 0x3935A8, 0x28 + +.global lbl_803965D0 +lbl_803965D0: +.incbin "baserom.dol", 0x3935D0, 0xC0 + diff --git a/asm/rodata/rodata_d_menu_fmap_map.s b/asm/rodata/rodata_d_menu_fmap_map.s new file mode 100644 index 0000000000..7bc884524c --- /dev/null +++ b/asm/rodata/rodata_d_menu_fmap_map.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803961b0 - 0x80396248 + +.global lbl_803961B0 +lbl_803961B0: +.incbin "baserom.dol", 0x3931B0, 0x20 + +.global lbl_803961D0 +lbl_803961D0: +.incbin "baserom.dol", 0x3931D0, 0x24 + +.global lbl_803961F4 +lbl_803961F4: +.incbin "baserom.dol", 0x3931F4, 0x24 + +.global lbl_80396218 +lbl_80396218: +.incbin "baserom.dol", 0x393218, 0x24 + +.global lbl_8039623C +lbl_8039623C: +.incbin "baserom.dol", 0x39323C, 0xC + diff --git a/asm/rodata/rodata_d_menu_insect.s b/asm/rodata/rodata_d_menu_insect.s new file mode 100644 index 0000000000..feed34a4b8 --- /dev/null +++ b/asm/rodata/rodata_d_menu_insect.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80396690 - 0x80396950 + +.global lbl_80396690 +lbl_80396690: +.incbin "baserom.dol", 0x393690, 0xC0 + +.global lbl_80396750 +lbl_80396750: +.incbin "baserom.dol", 0x393750, 0xC0 + +.global lbl_80396810 +lbl_80396810: +.incbin "baserom.dol", 0x393810, 0x28 + +.global lbl_80396838 +lbl_80396838: +.incbin "baserom.dol", 0x393838, 0x28 + +.global lbl_80396860 +lbl_80396860: +.incbin "baserom.dol", 0x393860, 0x60 + +.global lbl_803968C0 +lbl_803968C0: +.incbin "baserom.dol", 0x3938C0, 0x90 + diff --git a/asm/rodata/rodata_d_menu_item_explain.s b/asm/rodata/rodata_d_menu_item_explain.s new file mode 100644 index 0000000000..c860abe782 --- /dev/null +++ b/asm/rodata/rodata_d_menu_item_explain.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80396950 - 0x803969c8 + +.global lbl_80396950 +lbl_80396950: +.incbin "baserom.dol", 0x393950, 0x20 + +.global lbl_80396970 +lbl_80396970: +.incbin "baserom.dol", 0x393970, 0x20 + +.global lbl_80396990 +lbl_80396990: +.incbin "baserom.dol", 0x393990, 0x38 + diff --git a/asm/rodata/rodata_d_menu_letter.s b/asm/rodata/rodata_d_menu_letter.s new file mode 100644 index 0000000000..b074d2851c --- /dev/null +++ b/asm/rodata/rodata_d_menu_letter.s @@ -0,0 +1,83 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803969c8 - 0x80396ea8 + +.global lbl_803969C8 +lbl_803969C8: +.incbin "baserom.dol", 0x3939C8, 0x30 + +.global lbl_803969F8 +lbl_803969F8: +.incbin "baserom.dol", 0x3939F8, 0x30 + +.global lbl_80396A28 +lbl_80396A28: +.incbin "baserom.dol", 0x393A28, 0x30 + +.global lbl_80396A58 +lbl_80396A58: +.incbin "baserom.dol", 0x393A58, 0x30 + +.global lbl_80396A88 +lbl_80396A88: +.incbin "baserom.dol", 0x393A88, 0x30 + +.global lbl_80396AB8 +lbl_80396AB8: +.incbin "baserom.dol", 0x393AB8, 0x30 + +.global lbl_80396AE8 +lbl_80396AE8: +.incbin "baserom.dol", 0x393AE8, 0x30 + +.global lbl_80396B18 +lbl_80396B18: +.incbin "baserom.dol", 0x393B18, 0x30 + +.global lbl_80396B48 +lbl_80396B48: +.incbin "baserom.dol", 0x393B48, 0x30 + +.global lbl_80396B78 +lbl_80396B78: +.incbin "baserom.dol", 0x393B78, 0x30 + +.global lbl_80396BA8 +lbl_80396BA8: +.incbin "baserom.dol", 0x393BA8, 0x30 + +.global lbl_80396BD8 +lbl_80396BD8: +.incbin "baserom.dol", 0x393BD8, 0x30 + +.global lbl_80396C08 +lbl_80396C08: +.incbin "baserom.dol", 0x393C08, 0x30 + +.global lbl_80396C38 +lbl_80396C38: +.incbin "baserom.dol", 0x393C38, 0x48 + +.global lbl_80396C80 +lbl_80396C80: +.incbin "baserom.dol", 0x393C80, 0x48 + +.global lbl_80396CC8 +lbl_80396CC8: +.incbin "baserom.dol", 0x393CC8, 0x48 + +.global lbl_80396D10 +lbl_80396D10: +.incbin "baserom.dol", 0x393D10, 0x60 + +.global lbl_80396D70 +lbl_80396D70: +.incbin "baserom.dol", 0x393D70, 0x28 + +.global lbl_80396D98 +lbl_80396D98: +.incbin "baserom.dol", 0x393D98, 0x28 + +.global lbl_80396DC0 +lbl_80396DC0: +.incbin "baserom.dol", 0x393DC0, 0xE8 + diff --git a/asm/rodata/rodata_d_menu_map_common.s b/asm/rodata/rodata_d_menu_map_common.s new file mode 100644 index 0000000000..e64922c4f8 --- /dev/null +++ b/asm/rodata/rodata_d_menu_map_common.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803959c0 - 0x80395d90 + +.global lbl_803959C0 +lbl_803959C0: +.incbin "baserom.dol", 0x3929C0, 0x3D0 + diff --git a/asm/rodata/rodata_d_menu_option.s b/asm/rodata/rodata_d_menu_option.s new file mode 100644 index 0000000000..7318d8ff67 --- /dev/null +++ b/asm/rodata/rodata_d_menu_option.s @@ -0,0 +1,215 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80396ea8 - 0x80397738 + +.global lbl_80396EA8 +lbl_80396EA8: +.incbin "baserom.dol", 0x393EA8, 0x10 + +.global lbl_80396EB8 +lbl_80396EB8: +.incbin "baserom.dol", 0x393EB8, 0x28 + +.global lbl_80396EE0 +lbl_80396EE0: +.incbin "baserom.dol", 0x393EE0, 0x28 + +.global lbl_80396F08 +lbl_80396F08: +.incbin "baserom.dol", 0x393F08, 0x10 + +.global lbl_80396F18 +lbl_80396F18: +.incbin "baserom.dol", 0x393F18, 0x10 + +.global lbl_80396F28 +lbl_80396F28: +.incbin "baserom.dol", 0x393F28, 0x10 + +.global lbl_80396F38 +lbl_80396F38: +.incbin "baserom.dol", 0x393F38, 0x10 + +.global lbl_80396F48 +lbl_80396F48: +.incbin "baserom.dol", 0x393F48, 0x10 + +.global lbl_80396F58 +lbl_80396F58: +.incbin "baserom.dol", 0x393F58, 0x30 + +.global lbl_80396F88 +lbl_80396F88: +.incbin "baserom.dol", 0x393F88, 0x30 + +.global lbl_80396FB8 +lbl_80396FB8: +.incbin "baserom.dol", 0x393FB8, 0x30 + +.global lbl_80396FE8 +lbl_80396FE8: +.incbin "baserom.dol", 0x393FE8, 0x30 + +.global lbl_80397018 +lbl_80397018: +.incbin "baserom.dol", 0x394018, 0x30 + +.global lbl_80397048 +lbl_80397048: +.incbin "baserom.dol", 0x394048, 0x30 + +.global lbl_80397078 +lbl_80397078: +.incbin "baserom.dol", 0x394078, 0x30 + +.global lbl_803970A8 +lbl_803970A8: +.incbin "baserom.dol", 0x3940A8, 0x30 + +.global lbl_803970D8 +lbl_803970D8: +.incbin "baserom.dol", 0x3940D8, 0x30 + +.global lbl_80397108 +lbl_80397108: +.incbin "baserom.dol", 0x394108, 0x30 + +.global lbl_80397138 +lbl_80397138: +.incbin "baserom.dol", 0x394138, 0x28 + +.global lbl_80397160 +lbl_80397160: +.incbin "baserom.dol", 0x394160, 0x28 + +.global lbl_80397188 +lbl_80397188: +.incbin "baserom.dol", 0x394188, 0x30 + +.global lbl_803971B8 +lbl_803971B8: +.incbin "baserom.dol", 0x3941B8, 0x28 + +.global lbl_803971E0 +lbl_803971E0: +.incbin "baserom.dol", 0x3941E0, 0x28 + +.global lbl_80397208 +lbl_80397208: +.incbin "baserom.dol", 0x394208, 0x10 + +.global lbl_80397218 +lbl_80397218: +.incbin "baserom.dol", 0x394218, 0x10 + +.global lbl_80397228 +lbl_80397228: +.incbin "baserom.dol", 0x394228, 0x10 + +.global lbl_80397238 +lbl_80397238: +.incbin "baserom.dol", 0x394238, 0x10 + +.global lbl_80397248 +lbl_80397248: +.incbin "baserom.dol", 0x394248, 0x10 + +.global lbl_80397258 +lbl_80397258: +.incbin "baserom.dol", 0x394258, 0x10 + +.global lbl_80397268 +lbl_80397268: +.incbin "baserom.dol", 0x394268, 0x10 + +.global lbl_80397278 +lbl_80397278: +.incbin "baserom.dol", 0x394278, 0x10 + +.global lbl_80397288 +lbl_80397288: +.incbin "baserom.dol", 0x394288, 0x10 + +.global lbl_80397298 +lbl_80397298: +.incbin "baserom.dol", 0x394298, 0x10 + +.global lbl_803972A8 +lbl_803972A8: +.incbin "baserom.dol", 0x3942A8, 0x10 + +.global lbl_803972B8 +lbl_803972B8: +.incbin "baserom.dol", 0x3942B8, 0x10 + +.global lbl_803972C8 +lbl_803972C8: +.incbin "baserom.dol", 0x3942C8, 0x30 + +.global lbl_803972F8 +lbl_803972F8: +.incbin "baserom.dol", 0x3942F8, 0x30 + +.global lbl_80397328 +lbl_80397328: +.incbin "baserom.dol", 0x394328, 0x30 + +.global lbl_80397358 +lbl_80397358: +.incbin "baserom.dol", 0x394358, 0x30 + +.global lbl_80397388 +lbl_80397388: +.incbin "baserom.dol", 0x394388, 0x30 + +.global lbl_803973B8 +lbl_803973B8: +.incbin "baserom.dol", 0x3943B8, 0x30 + +.global lbl_803973E8 +lbl_803973E8: +.incbin "baserom.dol", 0x3943E8, 0x30 + +.global lbl_80397418 +lbl_80397418: +.incbin "baserom.dol", 0x394418, 0x30 + +.global lbl_80397448 +lbl_80397448: +.incbin "baserom.dol", 0x394448, 0x30 + +.global lbl_80397478 +lbl_80397478: +.incbin "baserom.dol", 0x394478, 0x30 + +.global lbl_803974A8 +lbl_803974A8: +.incbin "baserom.dol", 0x3944A8, 0x30 + +.global lbl_803974D8 +lbl_803974D8: +.incbin "baserom.dol", 0x3944D8, 0x20 + +.global lbl_803974F8 +lbl_803974F8: +.incbin "baserom.dol", 0x3944F8, 0x18 + +.global lbl_80397510 +lbl_80397510: +.incbin "baserom.dol", 0x394510, 0x50 + +.global lbl_80397560 +lbl_80397560: +.incbin "baserom.dol", 0x394560, 0x28 + +.global lbl_80397588 +lbl_80397588: +.incbin "baserom.dol", 0x394588, 0x28 + +.global lbl_803975B0 +lbl_803975B0: +.incbin "baserom.dol", 0x3945B0, 0x28 + +.global lbl_803975D8 +lbl_803975D8: +.incbin "baserom.dol", 0x3945D8, 0x160 + diff --git a/asm/rodata/rodata_d_menu_ring.s b/asm/rodata/rodata_d_menu_ring.s new file mode 100644 index 0000000000..c14481ae79 --- /dev/null +++ b/asm/rodata/rodata_d_menu_ring.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80397738 - 0x80397960 + +.global lbl_80397738 +lbl_80397738: +.incbin "baserom.dol", 0x394738, 0x28 + +.global lbl_80397760 +lbl_80397760: +.incbin "baserom.dol", 0x394760, 0x28 + +.global lbl_80397788 +lbl_80397788: +.incbin "baserom.dol", 0x394788, 0x28 + +.global lbl_803977B0 +lbl_803977B0: +.incbin "baserom.dol", 0x3947B0, 0x28 + +.global lbl_803977D8 +lbl_803977D8: +.incbin "baserom.dol", 0x3947D8, 0x28 + +.global lbl_80397800 +lbl_80397800: +.incbin "baserom.dol", 0x394800, 0x28 + +.global lbl_80397828 +lbl_80397828: +.incbin "baserom.dol", 0x394828, 0x28 + +.global lbl_80397850 +lbl_80397850: +.incbin "baserom.dol", 0x394850, 0x28 + +.global lbl_80397878 +lbl_80397878: +.incbin "baserom.dol", 0x394878, 0x28 + +.global lbl_803978A0 +lbl_803978A0: +.incbin "baserom.dol", 0x3948A0, 0x28 + +.global lbl_803978C8 +lbl_803978C8: +.incbin "baserom.dol", 0x3948C8, 0x98 + diff --git a/asm/rodata/rodata_d_menu_save.s b/asm/rodata/rodata_d_menu_save.s new file mode 100644 index 0000000000..4dd71d4bc3 --- /dev/null +++ b/asm/rodata/rodata_d_menu_save.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80397960 - 0x80397a18 + +.global lbl_80397960 +lbl_80397960: +.incbin "baserom.dol", 0x394960, 0xB8 + diff --git a/asm/rodata/rodata_d_menu_skill.s b/asm/rodata/rodata_d_menu_skill.s new file mode 100644 index 0000000000..6d4d425a4b --- /dev/null +++ b/asm/rodata/rodata_d_menu_skill.s @@ -0,0 +1,87 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80397a18 - 0x80397e38 + +.global lbl_80397A18 +lbl_80397A18: +.incbin "baserom.dol", 0x394A18, 0x1C + +.global lbl_80397A34 +lbl_80397A34: +.incbin "baserom.dol", 0x394A34, 0x1C + +.global lbl_80397A50 +lbl_80397A50: +.incbin "baserom.dol", 0x394A50, 0x38 + +.global lbl_80397A88 +lbl_80397A88: +.incbin "baserom.dol", 0x394A88, 0x38 + +.global lbl_80397AC0 +lbl_80397AC0: +.incbin "baserom.dol", 0x394AC0, 0x38 + +.global lbl_80397AF8 +lbl_80397AF8: +.incbin "baserom.dol", 0x394AF8, 0x38 + +.global lbl_80397B30 +lbl_80397B30: +.incbin "baserom.dol", 0x394B30, 0x38 + +.global lbl_80397B68 +lbl_80397B68: +.incbin "baserom.dol", 0x394B68, 0x38 + +.global lbl_80397BA0 +lbl_80397BA0: +.incbin "baserom.dol", 0x394BA0, 0x38 + +.global lbl_80397BD8 +lbl_80397BD8: +.incbin "baserom.dol", 0x394BD8, 0x38 + +.global lbl_80397C10 +lbl_80397C10: +.incbin "baserom.dol", 0x394C10, 0x38 + +.global lbl_80397C48 +lbl_80397C48: +.incbin "baserom.dol", 0x394C48, 0x38 + +.global lbl_80397C80 +lbl_80397C80: +.incbin "baserom.dol", 0x394C80, 0x38 + +.global lbl_80397CB8 +lbl_80397CB8: +.incbin "baserom.dol", 0x394CB8, 0x38 + +.global lbl_80397CF0 +lbl_80397CF0: +.incbin "baserom.dol", 0x394CF0, 0x20 + +.global lbl_80397D10 +lbl_80397D10: +.incbin "baserom.dol", 0x394D10, 0x20 + +.global lbl_80397D30 +lbl_80397D30: +.incbin "baserom.dol", 0x394D30, 0x28 + +.global lbl_80397D58 +lbl_80397D58: +.incbin "baserom.dol", 0x394D58, 0x28 + +.global lbl_80397D80 +lbl_80397D80: +.incbin "baserom.dol", 0x394D80, 0x1C + +.global lbl_80397D9C +lbl_80397D9C: +.incbin "baserom.dol", 0x394D9C, 0x1C + +.global lbl_80397DB8 +lbl_80397DB8: +.incbin "baserom.dol", 0x394DB8, 0x80 + diff --git a/asm/rodata/rodata_d_menu_window.s b/asm/rodata/rodata_d_menu_window.s new file mode 100644 index 0000000000..dc6998fd42 --- /dev/null +++ b/asm/rodata/rodata_d_menu_window.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80397e38 - 0x80397e50 + +.global lbl_80397E38 +lbl_80397E38: +.incbin "baserom.dol", 0x394E38, 0x18 + diff --git a/asm/rodata/rodata_d_meter2.s b/asm/rodata/rodata_d_meter2.s new file mode 100644 index 0000000000..381c65b980 --- /dev/null +++ b/asm/rodata/rodata_d_meter2.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399338 - 0x80399350 + +.global lbl_80399338 +lbl_80399338: +.incbin "baserom.dol", 0x396338, 0x18 + diff --git a/asm/rodata/rodata_d_meter2_draw.s b/asm/rodata/rodata_d_meter2_draw.s new file mode 100644 index 0000000000..279c1bef92 --- /dev/null +++ b/asm/rodata/rodata_d_meter2_draw.s @@ -0,0 +1,95 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398258 - 0x80398a78 + +.global lbl_80398258 +lbl_80398258: +.incbin "baserom.dol", 0x395258, 0x28 + +.global lbl_80398280 +lbl_80398280: +.incbin "baserom.dol", 0x395280, 0x28 + +.global lbl_803982A8 +lbl_803982A8: +.incbin "baserom.dol", 0x3952A8, 0x28 + +.global lbl_803982D0 +lbl_803982D0: +.incbin "baserom.dol", 0x3952D0, 0x28 + +.global lbl_803982F8 +lbl_803982F8: +.incbin "baserom.dol", 0x3952F8, 0x28 + +.global lbl_80398320 +lbl_80398320: +.incbin "baserom.dol", 0x395320, 0xA0 + +.global lbl_803983C0 +lbl_803983C0: +.incbin "baserom.dol", 0x3953C0, 0xA0 + +.global lbl_80398460 +lbl_80398460: +.incbin "baserom.dol", 0x395460, 0xA0 + +.global lbl_80398500 +lbl_80398500: +.incbin "baserom.dol", 0x395500, 0xA0 + +.global lbl_803985A0 +lbl_803985A0: +.incbin "baserom.dol", 0x3955A0, 0xA0 + +.global lbl_80398640 +lbl_80398640: +.incbin "baserom.dol", 0x395640, 0x80 + +.global lbl_803986C0 +lbl_803986C0: +.incbin "baserom.dol", 0x3956C0, 0x80 + +.global lbl_80398740 +lbl_80398740: +.incbin "baserom.dol", 0x395740, 0x80 + +.global lbl_803987C0 +lbl_803987C0: +.incbin "baserom.dol", 0x3957C0, 0x20 + +.global lbl_803987E0 +lbl_803987E0: +.incbin "baserom.dol", 0x3957E0, 0x20 + +.global lbl_80398800 +lbl_80398800: +.incbin "baserom.dol", 0x395800, 0x28 + +.global lbl_80398828 +lbl_80398828: +.incbin "baserom.dol", 0x395828, 0x28 + +.global lbl_80398850 +lbl_80398850: +.incbin "baserom.dol", 0x395850, 0x28 + +.global lbl_80398878 +lbl_80398878: +.incbin "baserom.dol", 0x395878, 0x20 + +.global lbl_80398898 +lbl_80398898: +.incbin "baserom.dol", 0x395898, 0x10 + +.global lbl_803988A8 +lbl_803988A8: +.incbin "baserom.dol", 0x3958A8, 0x10 + +.global lbl_803988B8 +lbl_803988B8: +.incbin "baserom.dol", 0x3958B8, 0x18 + +.global lbl_803988D0 +lbl_803988D0: +.incbin "baserom.dol", 0x3958D0, 0x1A8 + diff --git a/asm/rodata/rodata_d_meter2_info.s b/asm/rodata/rodata_d_meter2_info.s new file mode 100644 index 0000000000..b06835e3fd --- /dev/null +++ b/asm/rodata/rodata_d_meter2_info.s @@ -0,0 +1,55 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398a78 - 0x80399338 + +.global lbl_80398A78 +lbl_80398A78: +.incbin "baserom.dol", 0x395A78, 0x94 + +.global lbl_80398B0C +lbl_80398B0C: +.incbin "baserom.dol", 0x395B0C, 0x94 + +.global lbl_80398BA0 +lbl_80398BA0: +.incbin "baserom.dol", 0x395BA0, 0x94 + +.global lbl_80398C34 +lbl_80398C34: +.incbin "baserom.dol", 0x395C34, 0x94 + +.global lbl_80398CC8 +lbl_80398CC8: +.incbin "baserom.dol", 0x395CC8, 0x94 + +.global lbl_80398D5C +lbl_80398D5C: +.incbin "baserom.dol", 0x395D5C, 0x94 + +.global lbl_80398DF0 +lbl_80398DF0: +.incbin "baserom.dol", 0x395DF0, 0x94 + +.global lbl_80398E84 +lbl_80398E84: +.incbin "baserom.dol", 0x395E84, 0x94 + +.global lbl_80398F18 +lbl_80398F18: +.incbin "baserom.dol", 0x395F18, 0x94 + +.global lbl_80398FAC +lbl_80398FAC: +.incbin "baserom.dol", 0x395FAC, 0x94 + +.global lbl_80399040 +lbl_80399040: +.incbin "baserom.dol", 0x396040, 0x94 + +.global lbl_803990D4 +lbl_803990D4: +.incbin "baserom.dol", 0x3960D4, 0x94 + +.global lbl_80399168 +lbl_80399168: +.incbin "baserom.dol", 0x396168, 0x1D0 + diff --git a/asm/rodata/rodata_d_meter_HIO.s b/asm/rodata/rodata_d_meter_HIO.s new file mode 100644 index 0000000000..0421c731a0 --- /dev/null +++ b/asm/rodata/rodata_d_meter_HIO.s @@ -0,0 +1,87 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80397e50 - 0x80398048 + +.global lbl_80397E50 +lbl_80397E50: +.incbin "baserom.dol", 0x394E50, 0x18 + +.global lbl_80397E68 +lbl_80397E68: +.incbin "baserom.dol", 0x394E68, 0x18 + +.global lbl_80397E80 +lbl_80397E80: +.incbin "baserom.dol", 0x394E80, 0x18 + +.global lbl_80397E98 +lbl_80397E98: +.incbin "baserom.dol", 0x394E98, 0x18 + +.global lbl_80397EB0 +lbl_80397EB0: +.incbin "baserom.dol", 0x394EB0, 0x18 + +.global lbl_80397EC8 +lbl_80397EC8: +.incbin "baserom.dol", 0x394EC8, 0x18 + +.global lbl_80397EE0 +lbl_80397EE0: +.incbin "baserom.dol", 0x394EE0, 0x18 + +.global lbl_80397EF8 +lbl_80397EF8: +.incbin "baserom.dol", 0x394EF8, 0x18 + +.global lbl_80397F10 +lbl_80397F10: +.incbin "baserom.dol", 0x394F10, 0x18 + +.global lbl_80397F28 +lbl_80397F28: +.incbin "baserom.dol", 0x394F28, 0x18 + +.global lbl_80397F40 +lbl_80397F40: +.incbin "baserom.dol", 0x394F40, 0x18 + +.global lbl_80397F58 +lbl_80397F58: +.incbin "baserom.dol", 0x394F58, 0x18 + +.global lbl_80397F70 +lbl_80397F70: +.incbin "baserom.dol", 0x394F70, 0x18 + +.global lbl_80397F88 +lbl_80397F88: +.incbin "baserom.dol", 0x394F88, 0x18 + +.global lbl_80397FA0 +lbl_80397FA0: +.incbin "baserom.dol", 0x394FA0, 0x18 + +.global lbl_80397FB8 +lbl_80397FB8: +.incbin "baserom.dol", 0x394FB8, 0x18 + +.global lbl_80397FD0 +lbl_80397FD0: +.incbin "baserom.dol", 0x394FD0, 0x18 + +.global lbl_80397FE8 +lbl_80397FE8: +.incbin "baserom.dol", 0x394FE8, 0x18 + +.global lbl_80398000 +lbl_80398000: +.incbin "baserom.dol", 0x395000, 0x18 + +.global lbl_80398018 +lbl_80398018: +.incbin "baserom.dol", 0x395018, 0x18 + +.global lbl_80398030 +lbl_80398030: +.incbin "baserom.dol", 0x395030, 0x18 + diff --git a/asm/rodata/rodata_d_meter_button.s b/asm/rodata/rodata_d_meter_button.s new file mode 100644 index 0000000000..fe1b5191d2 --- /dev/null +++ b/asm/rodata/rodata_d_meter_button.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398048 - 0x80398158 + +.global lbl_80398048 +lbl_80398048: +.incbin "baserom.dol", 0x395048, 0x50 + +.global lbl_80398098 +lbl_80398098: +.incbin "baserom.dol", 0x395098, 0x50 + +.global lbl_803980E8 +lbl_803980E8: +.incbin "baserom.dol", 0x3950E8, 0x70 + diff --git a/asm/rodata/rodata_d_meter_haihai.s b/asm/rodata/rodata_d_meter_haihai.s new file mode 100644 index 0000000000..d54c078f08 --- /dev/null +++ b/asm/rodata/rodata_d_meter_haihai.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398158 - 0x803981b0 + +.global lbl_80398158 +lbl_80398158: +.incbin "baserom.dol", 0x395158, 0x58 + diff --git a/asm/rodata/rodata_d_meter_hakusha.s b/asm/rodata/rodata_d_meter_hakusha.s new file mode 100644 index 0000000000..56e2f68455 --- /dev/null +++ b/asm/rodata/rodata_d_meter_hakusha.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803981b0 - 0x80398208 + +.global lbl_803981B0 +lbl_803981B0: +.incbin "baserom.dol", 0x3951B0, 0x58 + diff --git a/asm/rodata/rodata_d_meter_map.s b/asm/rodata/rodata_d_meter_map.s new file mode 100644 index 0000000000..72cf360632 --- /dev/null +++ b/asm/rodata/rodata_d_meter_map.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398208 - 0x80398210 + +.global lbl_80398208 +lbl_80398208: +.incbin "baserom.dol", 0x395208, 0x8 + diff --git a/asm/rodata/rodata_d_meter_string.s b/asm/rodata/rodata_d_meter_string.s new file mode 100644 index 0000000000..b00c3fd85a --- /dev/null +++ b/asm/rodata/rodata_d_meter_string.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80398210 - 0x80398258 + +.global lbl_80398210 +lbl_80398210: +.incbin "baserom.dol", 0x395210, 0x48 + diff --git a/asm/rodata/rodata_d_msg_class.s b/asm/rodata/rodata_d_msg_class.s new file mode 100644 index 0000000000..6d1f94e0c9 --- /dev/null +++ b/asm/rodata/rodata_d_msg_class.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803995c8 - 0x80399660 + +.global lbl_803995C8 +lbl_803995C8: +.incbin "baserom.dol", 0x3965C8, 0x24 + +.global lbl_803995EC +lbl_803995EC: +.incbin "baserom.dol", 0x3965EC, 0x24 + +.global lbl_80399610 +lbl_80399610: +.incbin "baserom.dol", 0x396610, 0x50 + diff --git a/asm/rodata/rodata_d_msg_flow.s b/asm/rodata/rodata_d_msg_flow.s new file mode 100644 index 0000000000..544074c0b8 --- /dev/null +++ b/asm/rodata/rodata_d_msg_flow.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399cb0 - 0x80399cc8 + +.global lbl_80399CB0 +lbl_80399CB0: +.incbin "baserom.dol", 0x396CB0, 0x18 + diff --git a/asm/rodata/rodata_d_msg_object.s b/asm/rodata/rodata_d_msg_object.s new file mode 100644 index 0000000000..1e14f9df05 --- /dev/null +++ b/asm/rodata/rodata_d_msg_object.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399660 - 0x803996e8 + +.global lbl_80399660 +lbl_80399660: +.incbin "baserom.dol", 0x396660, 0x88 + diff --git a/asm/rodata/rodata_d_msg_out_font.s b/asm/rodata/rodata_d_msg_out_font.s new file mode 100644 index 0000000000..f95cc4d6b7 --- /dev/null +++ b/asm/rodata/rodata_d_msg_out_font.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399350 - 0x803995c8 + +.global lbl_80399350 +lbl_80399350: +.incbin "baserom.dol", 0x396350, 0x278 + diff --git a/asm/rodata/rodata_d_msg_scrn_3select.s b/asm/rodata/rodata_d_msg_scrn_3select.s new file mode 100644 index 0000000000..77436e348b --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_3select.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399708 - 0x803998a0 + +.global lbl_80399708 +lbl_80399708: +.incbin "baserom.dol", 0x396708, 0x120 + +.global lbl_80399828 +lbl_80399828: +.incbin "baserom.dol", 0x396828, 0xC + +.global lbl_80399834 +lbl_80399834: +.incbin "baserom.dol", 0x396834, 0xC + +.global lbl_80399840 +lbl_80399840: +.incbin "baserom.dol", 0x396840, 0x60 + diff --git a/asm/rodata/rodata_d_msg_scrn_arrow.s b/asm/rodata/rodata_d_msg_scrn_arrow.s new file mode 100644 index 0000000000..6f1e2d9495 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_arrow.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803998a0 - 0x803998f8 + +.global lbl_803998A0 +lbl_803998A0: +.incbin "baserom.dol", 0x3968A0, 0x58 + diff --git a/asm/rodata/rodata_d_msg_scrn_boss.s b/asm/rodata/rodata_d_msg_scrn_boss.s new file mode 100644 index 0000000000..28fdf75f1d --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_boss.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803998f8 - 0x80399910 + +.global lbl_803998F8 +lbl_803998F8: +.incbin "baserom.dol", 0x3968F8, 0x18 + diff --git a/asm/rodata/rodata_d_msg_scrn_explain.s b/asm/rodata/rodata_d_msg_scrn_explain.s new file mode 100644 index 0000000000..d5b2f47ba7 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_explain.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399910 - 0x80399990 + +.global lbl_80399910 +lbl_80399910: +.incbin "baserom.dol", 0x396910, 0x80 + diff --git a/asm/rodata/rodata_d_msg_scrn_howl.s b/asm/rodata/rodata_d_msg_scrn_howl.s new file mode 100644 index 0000000000..8620d9b00a --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_howl.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399a20 - 0x80399a80 + +.global lbl_80399A20 +lbl_80399A20: +.incbin "baserom.dol", 0x396A20, 0x60 + diff --git a/asm/rodata/rodata_d_msg_scrn_item.s b/asm/rodata/rodata_d_msg_scrn_item.s new file mode 100644 index 0000000000..fc42eaf950 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_item.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399990 - 0x80399a20 + +.global lbl_80399990 +lbl_80399990: +.incbin "baserom.dol", 0x396990, 0x90 + diff --git a/asm/rodata/rodata_d_msg_scrn_jimaku.s b/asm/rodata/rodata_d_msg_scrn_jimaku.s new file mode 100644 index 0000000000..9dc0d9e375 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_jimaku.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399a80 - 0x80399aa0 + +.global lbl_80399A80 +lbl_80399A80: +.incbin "baserom.dol", 0x396A80, 0x20 + diff --git a/asm/rodata/rodata_d_msg_scrn_kanban.s b/asm/rodata/rodata_d_msg_scrn_kanban.s new file mode 100644 index 0000000000..c30f89923a --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_kanban.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399aa0 - 0x80399b08 + +.global lbl_80399AA0 +lbl_80399AA0: +.incbin "baserom.dol", 0x396AA0, 0x18 + +.global lbl_80399AB8 +lbl_80399AB8: +.incbin "baserom.dol", 0x396AB8, 0x50 + diff --git a/asm/rodata/rodata_d_msg_scrn_light.s b/asm/rodata/rodata_d_msg_scrn_light.s new file mode 100644 index 0000000000..47f721fa37 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_light.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399b08 - 0x80399b78 + +.global lbl_80399B08 +lbl_80399B08: +.incbin "baserom.dol", 0x396B08, 0x70 + diff --git a/asm/rodata/rodata_d_msg_scrn_place.s b/asm/rodata/rodata_d_msg_scrn_place.s new file mode 100644 index 0000000000..e509a81ac8 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_place.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399b78 - 0x80399b98 + +.global lbl_80399B78 +lbl_80399B78: +.incbin "baserom.dol", 0x396B78, 0x20 + diff --git a/asm/rodata/rodata_d_msg_scrn_staff.s b/asm/rodata/rodata_d_msg_scrn_staff.s new file mode 100644 index 0000000000..ffc27e6431 --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_staff.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399b98 - 0x80399bb0 + +.global lbl_80399B98 +lbl_80399B98: +.incbin "baserom.dol", 0x396B98, 0x18 + diff --git a/asm/rodata/rodata_d_msg_scrn_talk.s b/asm/rodata/rodata_d_msg_scrn_talk.s new file mode 100644 index 0000000000..e6e03fea2f --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_talk.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399bb0 - 0x80399c18 + +.global lbl_80399BB0 +lbl_80399BB0: +.incbin "baserom.dol", 0x396BB0, 0x68 + diff --git a/asm/rodata/rodata_d_msg_scrn_tree.s b/asm/rodata/rodata_d_msg_scrn_tree.s new file mode 100644 index 0000000000..ed9c66ad0e --- /dev/null +++ b/asm/rodata/rodata_d_msg_scrn_tree.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399c18 - 0x80399c98 + +.global lbl_80399C18 +lbl_80399C18: +.incbin "baserom.dol", 0x396C18, 0x18 + +.global lbl_80399C30 +lbl_80399C30: +.incbin "baserom.dol", 0x396C30, 0x68 + diff --git a/asm/rodata/rodata_d_msg_string_base.s b/asm/rodata/rodata_d_msg_string_base.s new file mode 100644 index 0000000000..f975734abb --- /dev/null +++ b/asm/rodata/rodata_d_msg_string_base.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399c98 - 0x80399cb0 + +.global lbl_80399C98 +lbl_80399C98: +.incbin "baserom.dol", 0x396C98, 0x18 + diff --git a/asm/rodata/rodata_d_msg_unit.s b/asm/rodata/rodata_d_msg_unit.s new file mode 100644 index 0000000000..efe0a1ac0f --- /dev/null +++ b/asm/rodata/rodata_d_msg_unit.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803996e8 - 0x80399708 + +.global lbl_803996E8 +lbl_803996E8: +.incbin "baserom.dol", 0x3966E8, 0x20 + diff --git a/asm/rodata/rodata_d_name.s b/asm/rodata/rodata_d_name.s new file mode 100644 index 0000000000..06d6a7e831 --- /dev/null +++ b/asm/rodata/rodata_d_name.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399cc8 - 0x80399fe0 + +.global lbl_80399CC8 +lbl_80399CC8: +.incbin "baserom.dol", 0x396CC8, 0x318 + diff --git a/asm/rodata/rodata_d_particle.s b/asm/rodata/rodata_d_particle.s new file mode 100644 index 0000000000..60729866af --- /dev/null +++ b/asm/rodata/rodata_d_particle.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a108 - 0x8037a178 + +.global lbl_8037A108 +lbl_8037A108: +.incbin "baserom.dol", 0x377108, 0xC + +.global lbl_8037A114 +lbl_8037A114: +.incbin "baserom.dol", 0x377114, 0xC + +.global lbl_8037A120 +lbl_8037A120: +.incbin "baserom.dol", 0x377120, 0xC + +.global lbl_8037A12C +lbl_8037A12C: +.incbin "baserom.dol", 0x37712C, 0x4C + diff --git a/asm/rodata/rodata_d_resorce.s b/asm/rodata/rodata_d_resorce.s new file mode 100644 index 0000000000..d2deb7f117 --- /dev/null +++ b/asm/rodata/rodata_d_resorce.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80379840 - 0x80379c30 + +.global lbl_80379840 +lbl_80379840: +.incbin "baserom.dol", 0x376840, 0x64 + +.global lbl_803798A4 +lbl_803798A4: +.incbin "baserom.dol", 0x3768A4, 0x14 + +.global lbl_803798B8 +lbl_803798B8: +.incbin "baserom.dol", 0x3768B8, 0x378 + diff --git a/asm/rodata/rodata_d_s_logo.s b/asm/rodata/rodata_d_s_logo.s new file mode 100644 index 0000000000..0447fb38cf --- /dev/null +++ b/asm/rodata/rodata_d_s_logo.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80399fe0 - 0x8039a2a8 + +.global lbl_80399FE0 +lbl_80399FE0: +.incbin "baserom.dol", 0x396FE0, 0x1C + +.global lbl_80399FFC +lbl_80399FFC: +.incbin "baserom.dol", 0x396FFC, 0x2AC + diff --git a/asm/rodata/rodata_d_s_name.s b/asm/rodata/rodata_d_s_name.s new file mode 100644 index 0000000000..339a510151 --- /dev/null +++ b/asm/rodata/rodata_d_s_name.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a2a8 - 0x8039a2c8 + +.global lbl_8039A2A8 +lbl_8039A2A8: +.incbin "baserom.dol", 0x3972A8, 0x20 + diff --git a/asm/rodata/rodata_d_s_play.s b/asm/rodata/rodata_d_s_play.s new file mode 100644 index 0000000000..3351475578 --- /dev/null +++ b/asm/rodata/rodata_d_s_play.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a2c8 - 0x8039a388 + +.global lbl_8039A2C8 +lbl_8039A2C8: +.incbin "baserom.dol", 0x3972C8, 0x10 + +.global lbl_8039A2D8 +lbl_8039A2D8: +.incbin "baserom.dol", 0x3972D8, 0xB0 + diff --git a/asm/rodata/rodata_d_s_room.s b/asm/rodata/rodata_d_s_room.s new file mode 100644 index 0000000000..ceb4610924 --- /dev/null +++ b/asm/rodata/rodata_d_s_room.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a388 - 0x8039a3d8 + +.global lbl_8039A388 +lbl_8039A388: +.incbin "baserom.dol", 0x397388, 0x50 + diff --git a/asm/rodata/rodata_d_save.s b/asm/rodata/rodata_d_save.s new file mode 100644 index 0000000000..227a44bbea --- /dev/null +++ b/asm/rodata/rodata_d_save.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803790c0 - 0x80379298 + +.global lbl_803790C0 +lbl_803790C0: +.incbin "baserom.dol", 0x3760C0, 0x174 + +.global lbl_80379234 +lbl_80379234: +.incbin "baserom.dol", 0x376234, 0x64 + diff --git a/asm/rodata/rodata_d_scope.s b/asm/rodata/rodata_d_scope.s new file mode 100644 index 0000000000..daea5e6b28 --- /dev/null +++ b/asm/rodata/rodata_d_scope.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803949f0 - 0x80394a10 + +.global lbl_803949F0 +lbl_803949F0: +.incbin "baserom.dol", 0x3919F0, 0x20 + diff --git a/asm/rodata/rodata_d_select_cursor.s b/asm/rodata/rodata_d_select_cursor.s new file mode 100644 index 0000000000..11afe836b5 --- /dev/null +++ b/asm/rodata/rodata_d_select_cursor.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394a10 - 0x80394c10 + +.global lbl_80394A10 +lbl_80394A10: +.incbin "baserom.dol", 0x391A10, 0x20 + +.global lbl_80394A30 +lbl_80394A30: +.incbin "baserom.dol", 0x391A30, 0x20 + +.global lbl_80394A50 +lbl_80394A50: +.incbin "baserom.dol", 0x391A50, 0x40 + +.global lbl_80394A90 +lbl_80394A90: +.incbin "baserom.dol", 0x391A90, 0x10 + +.global lbl_80394AA0 +lbl_80394AA0: +.incbin "baserom.dol", 0x391AA0, 0x170 + diff --git a/asm/rodata/rodata_d_shop_system.s b/asm/rodata/rodata_d_shop_system.s new file mode 100644 index 0000000000..543c037d75 --- /dev/null +++ b/asm/rodata/rodata_d_shop_system.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80394c10 - 0x80394c28 + +.global lbl_80394C10 +lbl_80394C10: +.incbin "baserom.dol", 0x391C10, 0x18 + diff --git a/asm/rodata/rodata_d_stage.s b/asm/rodata/rodata_d_stage.s new file mode 100644 index 0000000000..b3a770aa26 --- /dev/null +++ b/asm/rodata/rodata_d_stage.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80378a50 - 0x80378e48 + +.global lbl_80378A50 +lbl_80378A50: +.incbin "baserom.dol", 0x375A50, 0x3F8 + diff --git a/asm/rodata/rodata_d_timer.s b/asm/rodata/rodata_d_timer.s new file mode 100644 index 0000000000..485b2f9205 --- /dev/null +++ b/asm/rodata/rodata_d_timer.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a3d8 - 0x8039a488 + +.global lbl_8039A3D8 +lbl_8039A3D8: +.incbin "baserom.dol", 0x3973D8, 0xB0 + diff --git a/asm/rodata/rodata_d_tresure.s b/asm/rodata/rodata_d_tresure.s new file mode 100644 index 0000000000..b309cbd960 --- /dev/null +++ b/asm/rodata/rodata_d_tresure.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037b0d8 - 0x8037b100 + +.global lbl_8037B0D8 +lbl_8037B0D8: +.incbin "baserom.dol", 0x3780D8, 0x28 + diff --git a/asm/rodata/rodata_d_vib_pattern.s b/asm/rodata/rodata_d_vib_pattern.s new file mode 100644 index 0000000000..7f6ab16799 --- /dev/null +++ b/asm/rodata/rodata_d_vib_pattern.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8037a620 - 0x8037a770 + +.global lbl_8037A620 +lbl_8037A620: +.incbin "baserom.dol", 0x377620, 0x58 + +.global lbl_8037A678 +lbl_8037A678: +.incbin "baserom.dol", 0x377678, 0x58 + +.global lbl_8037A6D0 +lbl_8037A6D0: +.incbin "baserom.dol", 0x3776D0, 0x50 + +.global lbl_8037A720 +lbl_8037A720: +.incbin "baserom.dol", 0x377720, 0x50 + diff --git a/asm/rodata/rodata_dispatch.s b/asm/rodata/rodata_dispatch.s new file mode 100644 index 0000000000..6b6851a574 --- /dev/null +++ b/asm/rodata/rodata_dispatch.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2890 - 0x803a28d0 + +.global lbl_803A2890 +lbl_803A2890: +.incbin "baserom.dol", 0x39F890, 0x1C + +.global lbl_803A28AC +lbl_803A28AC: +.incbin "baserom.dol", 0x39F8AC, 0x24 + diff --git a/asm/rodata/rodata_dolphin_trk_glue.s b/asm/rodata/rodata_dolphin_trk_glue.s new file mode 100644 index 0000000000..67a572ad9c --- /dev/null +++ b/asm/rodata/rodata_dolphin_trk_glue.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2c08 - 0x803a2d10 + +.global lbl_803A2C08 +lbl_803A2C08: +.incbin "baserom.dol", 0x39FC08, 0x4 + +.global lbl_803A2C0C +lbl_803A2C0C: +.incbin "baserom.dol", 0x39FC0C, 0x4 + +.global lbl_803A2C10 +lbl_803A2C10: +.incbin "baserom.dol", 0x39FC10, 0x18 + +.global lbl_803A2C28 +lbl_803A2C28: +.incbin "baserom.dol", 0x39FC28, 0x18 + +.global lbl_803A2C40 +lbl_803A2C40: +.incbin "baserom.dol", 0x39FC40, 0x24 + +.global lbl_803A2C64 +lbl_803A2C64: +.incbin "baserom.dol", 0x39FC64, 0x24 + +.global lbl_803A2C88 +lbl_803A2C88: +.incbin "baserom.dol", 0x39FC88, 0x2C + +.global lbl_803A2CB4 +lbl_803A2CB4: +.incbin "baserom.dol", 0x39FCB4, 0x30 + +.global lbl_803A2CE4 +lbl_803A2CE4: +.incbin "baserom.dol", 0x39FCE4, 0x2C + diff --git a/asm/rodata/rodata_e_exp.s b/asm/rodata/rodata_e_exp.s new file mode 100644 index 0000000000..d1e5734c75 --- /dev/null +++ b/asm/rodata/rodata_e_exp.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2340 - 0x803a2370 + +.global lbl_803A2340 +lbl_803A2340: +.incbin "baserom.dol", 0x39F340, 0x10 + +.global lbl_803A2350 +lbl_803A2350: +.incbin "baserom.dol", 0x39F350, 0x10 + +.global lbl_803A2360 +lbl_803A2360: +.incbin "baserom.dol", 0x39F360, 0x10 + diff --git a/asm/rodata/rodata_e_fmod.s b/asm/rodata/rodata_e_fmod.s new file mode 100644 index 0000000000..1e51683eab --- /dev/null +++ b/asm/rodata/rodata_e_fmod.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2370 - 0x803a2380 + +.global lbl_803A2370 +lbl_803A2370: +.incbin "baserom.dol", 0x39F370, 0x10 + diff --git a/asm/rodata/rodata_e_pow.s b/asm/rodata/rodata_e_pow.s new file mode 100644 index 0000000000..950530c175 --- /dev/null +++ b/asm/rodata/rodata_e_pow.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2380 - 0x803a23b0 + +.global lbl_803A2380 +lbl_803A2380: +.incbin "baserom.dol", 0x39F380, 0x10 + +.global lbl_803A2390 +lbl_803A2390: +.incbin "baserom.dol", 0x39F390, 0x10 + +.global lbl_803A23A0 +lbl_803A23A0: +.incbin "baserom.dol", 0x39F3A0, 0x10 + diff --git a/asm/rodata/rodata_e_rem_pio2.s b/asm/rodata/rodata_e_rem_pio2.s new file mode 100644 index 0000000000..5d654e10ef --- /dev/null +++ b/asm/rodata/rodata_e_rem_pio2.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a23b0 - 0x803a2538 + +.global lbl_803A23B0 +lbl_803A23B0: +.incbin "baserom.dol", 0x39F3B0, 0x108 + +.global lbl_803A24B8 +lbl_803A24B8: +.incbin "baserom.dol", 0x39F4B8, 0x80 + diff --git a/asm/rodata/rodata_f_op_actor.s b/asm/rodata/rodata_f_op_actor.s new file mode 100644 index 0000000000..26b3bc0890 --- /dev/null +++ b/asm/rodata/rodata_f_op_actor.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80378878 - 0x80378880 + +.global lbl_80378878 +lbl_80378878: +.incbin "baserom.dol", 0x375878, 0x8 + diff --git a/asm/rodata/rodata_f_op_actor_mng.s b/asm/rodata/rodata_f_op_actor_mng.s new file mode 100644 index 0000000000..b91b94de08 --- /dev/null +++ b/asm/rodata/rodata_f_op_actor_mng.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80378880 - 0x80378a50 + +.global lbl_80378880 +lbl_80378880: +.incbin "baserom.dol", 0x375880, 0xC + +.global lbl_8037888C +lbl_8037888C: +.incbin "baserom.dol", 0x37588C, 0xC + +.global lbl_80378898 +lbl_80378898: +.incbin "baserom.dol", 0x375898, 0x30 + +.global lbl_803788C8 +lbl_803788C8: +.incbin "baserom.dol", 0x3758C8, 0x188 + diff --git a/asm/rodata/rodata_functionvalue.s b/asm/rodata/rodata_functionvalue.s new file mode 100644 index 0000000000..ed7b1f2de9 --- /dev/null +++ b/asm/rodata/rodata_functionvalue.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039a9f0 - 0x8039aa00 + +.global lbl_8039A9F0 +lbl_8039A9F0: +.incbin "baserom.dol", 0x3979F0, 0x10 + diff --git a/asm/rodata/rodata_fvb.s b/asm/rodata/rodata_fvb.s new file mode 100644 index 0000000000..edca455c23 --- /dev/null +++ b/asm/rodata/rodata_fvb.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039aa00 - 0x8039aa40 + +.global lbl_8039AA00 +lbl_8039AA00: +.incbin "baserom.dol", 0x397A00, 0x40 + diff --git a/asm/rodata/rodata_jstudio-control.s b/asm/rodata/rodata_jstudio-control.s new file mode 100644 index 0000000000..7e9437f48d --- /dev/null +++ b/asm/rodata/rodata_jstudio-control.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039aa40 - 0x8039aa68 + +.global lbl_8039AA40 +lbl_8039AA40: +.incbin "baserom.dol", 0x397A40, 0xC + +.global lbl_8039AA4C +lbl_8039AA4C: +.incbin "baserom.dol", 0x397A4C, 0xC + +.global lbl_8039AA58 +lbl_8039AA58: +.incbin "baserom.dol", 0x397A58, 0x10 + diff --git a/asm/rodata/rodata_jstudio-object.s b/asm/rodata/rodata_jstudio-object.s new file mode 100644 index 0000000000..7069f02e79 --- /dev/null +++ b/asm/rodata/rodata_jstudio-object.s @@ -0,0 +1,91 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039aa68 - 0x8039ab88 + +.global lbl_8039AA68 +lbl_8039AA68: +.incbin "baserom.dol", 0x397A68, 0xC + +.global lbl_8039AA74 +lbl_8039AA74: +.incbin "baserom.dol", 0x397A74, 0xC + +.global lbl_8039AA80 +lbl_8039AA80: +.incbin "baserom.dol", 0x397A80, 0xC + +.global lbl_8039AA8C +lbl_8039AA8C: +.incbin "baserom.dol", 0x397A8C, 0xC + +.global lbl_8039AA98 +lbl_8039AA98: +.incbin "baserom.dol", 0x397A98, 0x10 + +.global lbl_8039AAA8 +lbl_8039AAA8: +.incbin "baserom.dol", 0x397AA8, 0xC + +.global lbl_8039AAB4 +lbl_8039AAB4: +.incbin "baserom.dol", 0x397AB4, 0xC + +.global lbl_8039AAC0 +lbl_8039AAC0: +.incbin "baserom.dol", 0x397AC0, 0xC + +.global lbl_8039AACC +lbl_8039AACC: +.incbin "baserom.dol", 0x397ACC, 0x10 + +.global lbl_8039AADC +lbl_8039AADC: +.incbin "baserom.dol", 0x397ADC, 0xC + +.global lbl_8039AAE8 +lbl_8039AAE8: +.incbin "baserom.dol", 0x397AE8, 0x10 + +.global lbl_8039AAF8 +lbl_8039AAF8: +.incbin "baserom.dol", 0x397AF8, 0xC + +.global lbl_8039AB04 +lbl_8039AB04: +.incbin "baserom.dol", 0x397B04, 0xC + +.global lbl_8039AB10 +lbl_8039AB10: +.incbin "baserom.dol", 0x397B10, 0xC + +.global lbl_8039AB1C +lbl_8039AB1C: +.incbin "baserom.dol", 0x397B1C, 0xC + +.global lbl_8039AB28 +lbl_8039AB28: +.incbin "baserom.dol", 0x397B28, 0xC + +.global lbl_8039AB34 +lbl_8039AB34: +.incbin "baserom.dol", 0x397B34, 0xC + +.global lbl_8039AB40 +lbl_8039AB40: +.incbin "baserom.dol", 0x397B40, 0x10 + +.global lbl_8039AB50 +lbl_8039AB50: +.incbin "baserom.dol", 0x397B50, 0xC + +.global lbl_8039AB5C +lbl_8039AB5C: +.incbin "baserom.dol", 0x397B5C, 0x10 + +.global lbl_8039AB6C +lbl_8039AB6C: +.incbin "baserom.dol", 0x397B6C, 0xC + +.global lbl_8039AB78 +lbl_8039AB78: +.incbin "baserom.dol", 0x397B78, 0x10 + diff --git a/asm/rodata/rodata_k_rem_pio2.s b/asm/rodata/rodata_k_rem_pio2.s new file mode 100644 index 0000000000..7205015e37 --- /dev/null +++ b/asm/rodata/rodata_k_rem_pio2.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2538 - 0x803a2588 + +.global lbl_803A2538 +lbl_803A2538: +.incbin "baserom.dol", 0x39F538, 0x10 + +.global lbl_803A2548 +lbl_803A2548: +.incbin "baserom.dol", 0x39F548, 0x40 + diff --git a/asm/rodata/rodata_k_tan.s b/asm/rodata/rodata_k_tan.s new file mode 100644 index 0000000000..7cccebc66e --- /dev/null +++ b/asm/rodata/rodata_k_tan.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2588 - 0x803a25f0 + +.global lbl_803A2588 +lbl_803A2588: +.incbin "baserom.dol", 0x39F588, 0x68 + diff --git a/asm/rodata/rodata_m_Do_MemCard.s b/asm/rodata/rodata_m_Do_MemCard.s new file mode 100644 index 0000000000..7b009f8c94 --- /dev/null +++ b/asm/rodata/rodata_m_Do_MemCard.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803743f8 - 0x80374408 + +.global lbl_803743F8 +lbl_803743F8: +.incbin "baserom.dol", 0x3713F8, 0x10 + diff --git a/asm/rodata/rodata_m_Do_MemCardRWmng.s b/asm/rodata/rodata_m_Do_MemCardRWmng.s new file mode 100644 index 0000000000..1625eb4ab1 --- /dev/null +++ b/asm/rodata/rodata_m_Do_MemCardRWmng.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80374408 - 0x80374460 + +.global lbl_80374408 +lbl_80374408: +.incbin "baserom.dol", 0x371408, 0x58 + diff --git a/asm/rodata/rodata_m_Do_Reset.s b/asm/rodata/rodata_m_Do_Reset.s new file mode 100644 index 0000000000..bb4541789a --- /dev/null +++ b/asm/rodata/rodata_m_Do_Reset.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80374198 - 0x803741a8 + +.global lbl_80374198 +lbl_80374198: +.incbin "baserom.dol", 0x371198, 0x10 + diff --git a/asm/rodata/rodata_m_Do_audio.s b/asm/rodata/rodata_m_Do_audio.s new file mode 100644 index 0000000000..bdb2015501 --- /dev/null +++ b/asm/rodata/rodata_m_Do_audio.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80373d68 - 0x80373dd0 + +.global lbl_80373D68 +lbl_80373D68: +.incbin "baserom.dol", 0x370D68, 0x68 + diff --git a/asm/rodata/rodata_m_Do_dvd_thread.s b/asm/rodata/rodata_m_Do_dvd_thread.s new file mode 100644 index 0000000000..d35d5aa43d --- /dev/null +++ b/asm/rodata/rodata_m_Do_dvd_thread.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803741a8 - 0x803743f8 + +.global lbl_803741A8 +lbl_803741A8: +.incbin "baserom.dol", 0x3711A8, 0x250 + diff --git a/asm/rodata/rodata_m_Do_ext.s b/asm/rodata/rodata_m_Do_ext.s new file mode 100644 index 0000000000..e9059c57de --- /dev/null +++ b/asm/rodata/rodata_m_Do_ext.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803740c0 - 0x80374198 + +.global lbl_803740C0 +lbl_803740C0: +.incbin "baserom.dol", 0x3710C0, 0x14 + +.global lbl_803740D4 +lbl_803740D4: +.incbin "baserom.dol", 0x3710D4, 0x14 + +.global lbl_803740E8 +lbl_803740E8: +.incbin "baserom.dol", 0x3710E8, 0x14 + +.global lbl_803740FC +lbl_803740FC: +.incbin "baserom.dol", 0x3710FC, 0x9C + diff --git a/asm/rodata/rodata_m_Do_graphic.s b/asm/rodata/rodata_m_Do_graphic.s new file mode 100644 index 0000000000..f550466a7f --- /dev/null +++ b/asm/rodata/rodata_m_Do_graphic.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80373dd0 - 0x80373de8 + +.global lbl_80373DD0 +lbl_80373DD0: +.incbin "baserom.dol", 0x370DD0, 0x18 + diff --git a/asm/rodata/rodata_m_Do_machine.s b/asm/rodata/rodata_m_Do_machine.s new file mode 100644 index 0000000000..08a1ce7412 --- /dev/null +++ b/asm/rodata/rodata_m_Do_machine.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80373de8 - 0x803740c0 + +.global lbl_80373DE8 +lbl_80373DE8: +.incbin "baserom.dol", 0x370DE8, 0x2D8 + diff --git a/asm/rodata/rodata_m_Do_machine_exception.s b/asm/rodata/rodata_m_Do_machine_exception.s new file mode 100644 index 0000000000..def05803ba --- /dev/null +++ b/asm/rodata/rodata_m_Do_machine_exception.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80374460 - 0x80374640 + +.global lbl_80374460 +lbl_80374460: +.incbin "baserom.dol", 0x371460, 0x1E0 + diff --git a/asm/rodata/rodata_m_Do_main.s b/asm/rodata/rodata_m_Do_main.s new file mode 100644 index 0000000000..bf19fb7bd5 --- /dev/null +++ b/asm/rodata/rodata_m_Do_main.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803739a0 - 0x80373cb0 + +.global lbl_803739A0 +lbl_803739A0: +.incbin "baserom.dol", 0x3709A0, 0x310 + diff --git a/asm/rodata/rodata_m_Do_printf.s b/asm/rodata/rodata_m_Do_printf.s new file mode 100644 index 0000000000..07b24eefae --- /dev/null +++ b/asm/rodata/rodata_m_Do_printf.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x80373cb0 - 0x80373d68 + +.global lbl_80373CB0 +lbl_80373CB0: +.incbin "baserom.dol", 0x370CB0, 0xB8 + diff --git a/asm/rodata/rodata_main.s b/asm/rodata/rodata_main.s new file mode 100644 index 0000000000..62a230d888 --- /dev/null +++ b/asm/rodata/rodata_main.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2d10 - 0x0 + +.global lbl_803A2D10 +lbl_803A2D10: +.incbin "baserom.dol", 0x39FD10, 0x14 + +.global lbl_803A2D24 +lbl_803A2D24: +.incbin "baserom.dol", 0x39FD24, 0x2C + +.global lbl_803A2D50 +lbl_803A2D50: +.incbin "baserom.dol", 0x39FD50, 0x1C + +.global lbl_803A2D6C +lbl_803A2D6C: +.incbin "baserom.dol", 0x39FD6C, 0x28 + +.global lbl_803A2D94 +lbl_803A2D94: +.incbin "baserom.dol", 0x39FD94, 0x30 + +.global lbl_803A2DC4 +lbl_803A2DC4: +.incbin "baserom.dol", 0x39FDC4, 0x14 + +.global lbl_803A2DD8 +lbl_803A2DD8: +.incbin "baserom.dol", 0x39FDD8, 0x18 + +.global lbl_803A2DF0 +lbl_803A2DF0: +.incbin "baserom.dol", 0x39FDF0, 0x14 + +.global lbl_803A2E04 +lbl_803A2E04: +.incbin "baserom.dol", 0x39FE04, 0x2C + +.global lbl_803A2E30 +lbl_803A2E30: +.incbin "baserom.dol", 0x39FE30, 0x1C + +.global lbl_803A2E4C +lbl_803A2E4C: +.incbin "baserom.dol", 0x39FE4C, 0x28 + +.global lbl_803A2E74 +lbl_803A2E74: +.incbin "baserom.dol", 0x39FE74, 0x30 + +.global lbl_803A2EA4 +lbl_803A2EA4: +.incbin "baserom.dol", 0x39FEA4, 0x14 + +.global lbl_803A2EB8 +lbl_803A2EB8: +.incbin "baserom.dol", 0x39FEB8, 0x28 + diff --git a/asm/rodata/rodata_main_TRK.s b/asm/rodata/rodata_main_TRK.s new file mode 100644 index 0000000000..9047159e1e --- /dev/null +++ b/asm/rodata/rodata_main_TRK.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2bf8 - 0x803a2c08 + +.global lbl_803A2BF8 +lbl_803A2BF8: +.incbin "baserom.dol", 0x39FBF8, 0x10 + diff --git a/asm/rodata/rodata_msg.s b/asm/rodata/rodata_msg.s new file mode 100644 index 0000000000..67bc338215 --- /dev/null +++ b/asm/rodata/rodata_msg.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a26b8 - 0x803a26e0 + +.global lbl_803A26B8 +lbl_803A26B8: +.incbin "baserom.dol", 0x39F6B8, 0x28 + diff --git a/asm/rodata/rodata_msgbuf.s b/asm/rodata/rodata_msgbuf.s new file mode 100644 index 0000000000..11ee4ede28 --- /dev/null +++ b/asm/rodata/rodata_msgbuf.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a26e0 - 0x803a2700 + +.global lbl_803A26E0 +lbl_803A26E0: +.incbin "baserom.dol", 0x39F6E0, 0x20 + diff --git a/asm/rodata/rodata_msghndlr.s b/asm/rodata/rodata_msghndlr.s new file mode 100644 index 0000000000..96955d9a77 --- /dev/null +++ b/asm/rodata/rodata_msghndlr.s @@ -0,0 +1,67 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a28d0 - 0x803a2ab8 + +.global lbl_803A28D0 +lbl_803A28D0: +.incbin "baserom.dol", 0x39F8D0, 0x20 + +.global lbl_803A28F0 +lbl_803A28F0: +.incbin "baserom.dol", 0x39F8F0, 0x8 + +.global lbl_803A28F8 +lbl_803A28F8: +.incbin "baserom.dol", 0x39F8F8, 0xC + +.global lbl_803A2904 +lbl_803A2904: +.incbin "baserom.dol", 0x39F904, 0xC + +.global lbl_803A2910 +lbl_803A2910: +.incbin "baserom.dol", 0x39F910, 0x20 + +.global lbl_803A2930 +lbl_803A2930: +.incbin "baserom.dol", 0x39F930, 0x20 + +.global lbl_803A2950 +lbl_803A2950: +.incbin "baserom.dol", 0x39F950, 0x18 + +.global lbl_803A2968 +lbl_803A2968: +.incbin "baserom.dol", 0x39F968, 0x28 + +.global lbl_803A2990 +lbl_803A2990: +.incbin "baserom.dol", 0x39F990, 0x38 + +.global lbl_803A29C8 +lbl_803A29C8: +.incbin "baserom.dol", 0x39F9C8, 0x28 + +.global lbl_803A29F0 +lbl_803A29F0: +.incbin "baserom.dol", 0x39F9F0, 0x30 + +.global lbl_803A2A20 +lbl_803A2A20: +.incbin "baserom.dol", 0x39FA20, 0x30 + +.global lbl_803A2A50 +lbl_803A2A50: +.incbin "baserom.dol", 0x39FA50, 0x30 + +.global lbl_803A2A80 +lbl_803A2A80: +.incbin "baserom.dol", 0x39FA80, 0x2C + +.global lbl_803A2AAC +lbl_803A2AAC: +.incbin "baserom.dol", 0x39FAAC, 0x8 + +.global lbl_803A2AB4 +lbl_803A2AB4: +.incbin "baserom.dol", 0x39FAB4, 0x4 + diff --git a/asm/rodata/rodata_nubinit.s b/asm/rodata/rodata_nubinit.s new file mode 100644 index 0000000000..9a89eb0aff --- /dev/null +++ b/asm/rodata/rodata_nubinit.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2688 - 0x803a26b8 + +.global lbl_803A2688 +lbl_803A2688: +.incbin "baserom.dol", 0x39F688, 0x1C + +.global lbl_803A26A4 +lbl_803A26A4: +.incbin "baserom.dol", 0x39F6A4, 0x14 + diff --git a/asm/rodata/rodata_osdsp.s b/asm/rodata/rodata_osdsp.s new file mode 100644 index 0000000000..f641e48539 --- /dev/null +++ b/asm/rodata/rodata_osdsp.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039b8b8 - 0x8039b8f8 + +.global lbl_8039B8B8 +lbl_8039B8B8: +.incbin "baserom.dol", 0x3988B8, 0x1C + +.global lbl_8039B8D4 +lbl_8039B8D4: +.incbin "baserom.dol", 0x3988D4, 0x24 + diff --git a/asm/rodata/rodata_printf.s b/asm/rodata/rodata_printf.s new file mode 100644 index 0000000000..c64f52ec26 --- /dev/null +++ b/asm/rodata/rodata_printf.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2318 - 0x803a2340 + +.global lbl_803A2318 +lbl_803A2318: +.incbin "baserom.dol", 0x39F318, 0x28 + diff --git a/asm/rodata/rodata_ptmf.s b/asm/rodata/rodata_ptmf.s new file mode 100644 index 0000000000..9a0b752c70 --- /dev/null +++ b/asm/rodata/rodata_ptmf.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2180 - 0x803a2190 + +.global lbl_803A2180 +lbl_803A2180: +.incbin "baserom.dol", 0x39F180, 0x10 + diff --git a/asm/rodata/rodata_runtime.s b/asm/rodata/rodata_runtime.s new file mode 100644 index 0000000000..7a43d47ce5 --- /dev/null +++ b/asm/rodata/rodata_runtime.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2190 - 0x803a21a8 + +.global lbl_803A2190 +lbl_803A2190: +.incbin "baserom.dol", 0x39F190, 0x18 + diff --git a/asm/rodata/rodata_s_atan.s b/asm/rodata/rodata_s_atan.s new file mode 100644 index 0000000000..90152bc74f --- /dev/null +++ b/asm/rodata/rodata_s_atan.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a25f0 - 0x803a2688 + +.global lbl_803A25F0 +lbl_803A25F0: +.incbin "baserom.dol", 0x39F5F0, 0x20 + +.global lbl_803A2610 +lbl_803A2610: +.incbin "baserom.dol", 0x39F610, 0x20 + +.global lbl_803A2630 +lbl_803A2630: +.incbin "baserom.dol", 0x39F630, 0x58 + diff --git a/asm/rodata/rodata_serpoll.s b/asm/rodata/rodata_serpoll.s new file mode 100644 index 0000000000..e87f156b44 --- /dev/null +++ b/asm/rodata/rodata_serpoll.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2700 - 0x803a2890 + +.global lbl_803A2700 +lbl_803A2700: +.incbin "baserom.dol", 0x39F700, 0x24 + +.global lbl_803A2724 +lbl_803A2724: +.incbin "baserom.dol", 0x39F724, 0x24 + +.global lbl_803A2748 +lbl_803A2748: +.incbin "baserom.dol", 0x39F748, 0x24 + +.global lbl_803A276C +lbl_803A276C: +.incbin "baserom.dol", 0x39F76C, 0x20 + +.global lbl_803A278C +lbl_803A278C: +.incbin "baserom.dol", 0x39F78C, 0x20 + +.global lbl_803A27AC +lbl_803A27AC: +.incbin "baserom.dol", 0x39F7AC, 0x24 + +.global lbl_803A27D0 +lbl_803A27D0: +.incbin "baserom.dol", 0x39F7D0, 0x24 + +.global lbl_803A27F4 +lbl_803A27F4: +.incbin "baserom.dol", 0x39F7F4, 0x1C + +.global lbl_803A2810 +lbl_803A2810: +.incbin "baserom.dol", 0x39F810, 0x34 + +.global lbl_803A2844 +lbl_803A2844: +.incbin "baserom.dol", 0x39F844, 0x28 + +.global lbl_803A286C +lbl_803A286C: +.incbin "baserom.dol", 0x39F86C, 0x24 + diff --git a/asm/rodata/rodata_stb-data.s b/asm/rodata/rodata_stb-data.s new file mode 100644 index 0000000000..171b9b817b --- /dev/null +++ b/asm/rodata/rodata_stb-data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .rodata, "a" # 0x8039ab88 - 0x8039aba8 + +.global lbl_8039AB88 +lbl_8039AB88: +.incbin "baserom.dol", 0x397B88, 0x20 + diff --git a/asm/rodata/rodata_support.s b/asm/rodata/rodata_support.s new file mode 100644 index 0000000000..91b881599c --- /dev/null +++ b/asm/rodata/rodata_support.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2ab8 - 0x803a2b60 + +.global lbl_803A2AB8 +lbl_803A2AB8: +.incbin "baserom.dol", 0x39FAB8, 0x18 + +.global lbl_803A2AD0 +lbl_803A2AD0: +.incbin "baserom.dol", 0x39FAD0, 0x28 + +.global lbl_803A2AF8 +lbl_803A2AF8: +.incbin "baserom.dol", 0x39FAF8, 0x14 + +.global lbl_803A2B0C +lbl_803A2B0C: +.incbin "baserom.dol", 0x39FB0C, 0x54 + diff --git a/asm/rodata/rodata_targimpl.s b/asm/rodata/rodata_targimpl.s new file mode 100644 index 0000000000..a5bca0275f --- /dev/null +++ b/asm/rodata/rodata_targimpl.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .rodata, "a" # 0x803a2b60 - 0x803a2bf8 + +.global lbl_803A2B60 +lbl_803A2B60: +.incbin "baserom.dol", 0x39FB60, 0x10 + +.global lbl_803A2B70 +lbl_803A2B70: +.incbin "baserom.dol", 0x39FB70, 0x28 + +.global lbl_803A2B98 +lbl_803A2B98: +.incbin "baserom.dol", 0x39FB98, 0x28 + +.global lbl_803A2BC0 +lbl_803A2BC0: +.incbin "baserom.dol", 0x39FBC0, 0x28 + +.global lbl_803A2BE8 +lbl_803A2BE8: +.incbin "baserom.dol", 0x39FBE8, 0x10 + diff --git a/asm/sdata2/DynamicLink.s b/asm/sdata2/DynamicLink.s new file mode 100644 index 0000000000..99de3c0992 --- /dev/null +++ b/asm/sdata2/DynamicLink.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455008 - 0x80455018 + +.global lbl_80455008 +lbl_80455008: +.incbin "baserom.dol", 0x3D3E68, 0x8 + +.global lbl_80455010 +lbl_80455010: +.incbin "baserom.dol", 0x3D3E70, 0x8 + diff --git a/asm/sdata2/GFPixel.s b/asm/sdata2/GFPixel.s new file mode 100644 index 0000000000..3adca48bd8 --- /dev/null +++ b/asm/sdata2/GFPixel.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455f68 - 0x80455f98 + +.global lbl_80455F68 +lbl_80455F68: +.incbin "baserom.dol", 0x3D4DC8, 0x4 + +.global lbl_80455F6C +lbl_80455F6C: +.incbin "baserom.dol", 0x3D4DCC, 0x4 + +.global lbl_80455F70 +lbl_80455F70: +.incbin "baserom.dol", 0x3D4DD0, 0x8 + +.global lbl_80455F78 +lbl_80455F78: +.incbin "baserom.dol", 0x3D4DD8, 0x8 + +.global lbl_80455F80 +lbl_80455F80: +.incbin "baserom.dol", 0x3D4DE0, 0x8 + +.global lbl_80455F88 +lbl_80455F88: +.incbin "baserom.dol", 0x3D4DE8, 0x8 + +.global lbl_80455F90 +lbl_80455F90: +.incbin "baserom.dol", 0x3D4DF0, 0x8 + diff --git a/asm/sdata2/GXBump.s b/asm/sdata2/GXBump.s new file mode 100644 index 0000000000..4a3bf60261 --- /dev/null +++ b/asm/sdata2/GXBump.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456610 - 0x80456618 + +.global lbl_80456610 +lbl_80456610: +.incbin "baserom.dol", 0x3D5470, 0x8 + diff --git a/asm/sdata2/GXFrameBuf.s b/asm/sdata2/GXFrameBuf.s new file mode 100644 index 0000000000..6db74735a0 --- /dev/null +++ b/asm/sdata2/GXFrameBuf.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804565a8 - 0x804565b8 + +.global lbl_804565A8 +lbl_804565A8: +.incbin "baserom.dol", 0x3D5408, 0x8 + +.global lbl_804565B0 +lbl_804565B0: +.incbin "baserom.dol", 0x3D5410, 0x8 + diff --git a/asm/sdata2/GXInit.s b/asm/sdata2/GXInit.s new file mode 100644 index 0000000000..884eb7cde9 --- /dev/null +++ b/asm/sdata2/GXInit.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456580 - 0x804565a8 + +.global lbl_80456580 +lbl_80456580: +.incbin "baserom.dol", 0x3D53E0, 0x4 + +.global lbl_80456584 +lbl_80456584: +.incbin "baserom.dol", 0x3D53E4, 0x4 + +.global lbl_80456588 +lbl_80456588: +.incbin "baserom.dol", 0x3D53E8, 0x4 + +.global lbl_8045658C +lbl_8045658C: +.incbin "baserom.dol", 0x3D53EC, 0x4 + +.global lbl_80456590 +lbl_80456590: +.incbin "baserom.dol", 0x3D53F0, 0x4 + +.global lbl_80456594 +lbl_80456594: +.incbin "baserom.dol", 0x3D53F4, 0x4 + +.global lbl_80456598 +lbl_80456598: +.incbin "baserom.dol", 0x3D53F8, 0x4 + +.global lbl_8045659C +lbl_8045659C: +.incbin "baserom.dol", 0x3D53FC, 0x4 + +.global lbl_804565A0 +lbl_804565A0: +.incbin "baserom.dol", 0x3D5400, 0x8 + diff --git a/asm/sdata2/GXLight.s b/asm/sdata2/GXLight.s new file mode 100644 index 0000000000..02f32a21da --- /dev/null +++ b/asm/sdata2/GXLight.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804565b8 - 0x804565e8 + +.global lbl_804565B8 +lbl_804565B8: +.incbin "baserom.dol", 0x3D5418, 0x4 + +.global lbl_804565BC +lbl_804565BC: +.incbin "baserom.dol", 0x3D541C, 0x4 + +.global lbl_804565C0 +lbl_804565C0: +.incbin "baserom.dol", 0x3D5420, 0x4 + +.global lbl_804565C4 +lbl_804565C4: +.incbin "baserom.dol", 0x3D5424, 0x4 + +.global lbl_804565C8 +lbl_804565C8: +.incbin "baserom.dol", 0x3D5428, 0x4 + +.global lbl_804565CC +lbl_804565CC: +.incbin "baserom.dol", 0x3D542C, 0x4 + +.global lbl_804565D0 +lbl_804565D0: +.incbin "baserom.dol", 0x3D5430, 0x4 + +.global lbl_804565D4 +lbl_804565D4: +.incbin "baserom.dol", 0x3D5434, 0x4 + +.global lbl_804565D8 +lbl_804565D8: +.incbin "baserom.dol", 0x3D5438, 0x4 + +.global lbl_804565DC +lbl_804565DC: +.incbin "baserom.dol", 0x3D543C, 0x4 + +.global lbl_804565E0 +lbl_804565E0: +.incbin "baserom.dol", 0x3D5440, 0x4 + +.global lbl_804565E4 +lbl_804565E4: +.incbin "baserom.dol", 0x3D5444, 0x4 + diff --git a/asm/sdata2/GXPixel.s b/asm/sdata2/GXPixel.s new file mode 100644 index 0000000000..bde4736b88 --- /dev/null +++ b/asm/sdata2/GXPixel.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456618 - 0x80456650 + +.global lbl_80456618 +lbl_80456618: +.incbin "baserom.dol", 0x3D5478, 0x4 + +.global lbl_8045661C +lbl_8045661C: +.incbin "baserom.dol", 0x3D547C, 0x4 + +.global lbl_80456620 +lbl_80456620: +.incbin "baserom.dol", 0x3D5480, 0x8 + +.global lbl_80456628 +lbl_80456628: +.incbin "baserom.dol", 0x3D5488, 0x8 + +.global lbl_80456630 +lbl_80456630: +.incbin "baserom.dol", 0x3D5490, 0x8 + +.global lbl_80456638 +lbl_80456638: +.incbin "baserom.dol", 0x3D5498, 0x8 + +.global lbl_80456640 +lbl_80456640: +.incbin "baserom.dol", 0x3D54A0, 0x8 + +.global lbl_80456648 +lbl_80456648: +.incbin "baserom.dol", 0x3D54A8, 0x8 + diff --git a/asm/sdata2/GXTexture.s b/asm/sdata2/GXTexture.s new file mode 100644 index 0000000000..40aa6e22b1 --- /dev/null +++ b/asm/sdata2/GXTexture.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804565e8 - 0x80456610 + +.global lbl_804565E8 +lbl_804565E8: +.incbin "baserom.dol", 0x3D5448, 0x8 + +.global lbl_804565F0 +lbl_804565F0: +.incbin "baserom.dol", 0x3D5450, 0x8 + +.global lbl_804565F8 +lbl_804565F8: +.incbin "baserom.dol", 0x3D5458, 0x4 + +.global lbl_804565FC +lbl_804565FC: +.incbin "baserom.dol", 0x3D545C, 0x4 + +.global lbl_80456600 +lbl_80456600: +.incbin "baserom.dol", 0x3D5460, 0x4 + +.global lbl_80456604 +lbl_80456604: +.incbin "baserom.dol", 0x3D5464, 0x4 + +.global lbl_80456608 +lbl_80456608: +.incbin "baserom.dol", 0x3D5468, 0x4 + +.global lbl_8045660C +lbl_8045660C: +.incbin "baserom.dol", 0x3D546C, 0x4 + diff --git a/asm/sdata2/GXTransform.s b/asm/sdata2/GXTransform.s new file mode 100644 index 0000000000..05bcc0f1e1 --- /dev/null +++ b/asm/sdata2/GXTransform.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456650 - 0x80456660 + +.global lbl_80456650 +lbl_80456650: +.incbin "baserom.dol", 0x3D54B0, 0x4 + +.global lbl_80456654 +lbl_80456654: +.incbin "baserom.dol", 0x3D54B4, 0x4 + +.global lbl_80456658 +lbl_80456658: +.incbin "baserom.dol", 0x3D54B8, 0x4 + +.global lbl_8045665C +lbl_8045665C: +.incbin "baserom.dol", 0x3D54BC, 0x4 + diff --git a/asm/sdata2/J2DAnimation.s b/asm/sdata2/J2DAnimation.s new file mode 100644 index 0000000000..0925558c87 --- /dev/null +++ b/asm/sdata2/J2DAnimation.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456300 - 0x80456328 + +.global lbl_80456300 +lbl_80456300: +.incbin "baserom.dol", 0x3D5160, 0x8 + +.global lbl_80456308 +lbl_80456308: +.incbin "baserom.dol", 0x3D5168, 0x8 + +.global lbl_80456310 +lbl_80456310: +.incbin "baserom.dol", 0x3D5170, 0x4 + +.global lbl_80456314 +lbl_80456314: +.incbin "baserom.dol", 0x3D5174, 0x4 + +.global lbl_80456318 +lbl_80456318: +.incbin "baserom.dol", 0x3D5178, 0x4 + +.global lbl_8045631C +lbl_8045631C: +.incbin "baserom.dol", 0x3D517C, 0x4 + +.global lbl_80456320 +lbl_80456320: +.incbin "baserom.dol", 0x3D5180, 0x8 + diff --git a/asm/sdata2/J2DAnmLoader.s b/asm/sdata2/J2DAnmLoader.s new file mode 100644 index 0000000000..a9bb2f7605 --- /dev/null +++ b/asm/sdata2/J2DAnmLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804562f8 - 0x80456300 + +.global lbl_804562F8 +lbl_804562F8: +.incbin "baserom.dol", 0x3D5158, 0x8 + diff --git a/asm/sdata2/J2DGrafContext.s b/asm/sdata2/J2DGrafContext.s new file mode 100644 index 0000000000..f33058e0da --- /dev/null +++ b/asm/sdata2/J2DGrafContext.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456148 - 0x80456160 + +.global lbl_80456148 +lbl_80456148: +.incbin "baserom.dol", 0x3D4FA8, 0x4 + +.global lbl_8045614C +lbl_8045614C: +.incbin "baserom.dol", 0x3D4FAC, 0x4 + +.global lbl_80456150 +lbl_80456150: +.incbin "baserom.dol", 0x3D4FB0, 0x8 + +.global lbl_80456158 +lbl_80456158: +.incbin "baserom.dol", 0x3D4FB8, 0x8 + diff --git a/asm/sdata2/J2DMaterial.s b/asm/sdata2/J2DMaterial.s new file mode 100644 index 0000000000..d3bf82df32 --- /dev/null +++ b/asm/sdata2/J2DMaterial.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804561b0 - 0x804561c0 + +.global lbl_804561B0 +lbl_804561B0: +.incbin "baserom.dol", 0x3D5010, 0x4 + +.global lbl_804561B4 +lbl_804561B4: +.incbin "baserom.dol", 0x3D5014, 0x4 + +.global lbl_804561B8 +lbl_804561B8: +.incbin "baserom.dol", 0x3D5018, 0x8 + diff --git a/asm/sdata2/J2DMaterialFactory.s b/asm/sdata2/J2DMaterialFactory.s new file mode 100644 index 0000000000..1ef9bdd516 --- /dev/null +++ b/asm/sdata2/J2DMaterialFactory.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804561c0 - 0x804561c8 + +.global lbl_804561C0 +lbl_804561C0: +.incbin "baserom.dol", 0x3D5020, 0x4 + +.global lbl_804561C4 +lbl_804561C4: +.incbin "baserom.dol", 0x3D5024, 0x4 + diff --git a/asm/sdata2/J2DOrthoGraph.s b/asm/sdata2/J2DOrthoGraph.s new file mode 100644 index 0000000000..d5840d3edb --- /dev/null +++ b/asm/sdata2/J2DOrthoGraph.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456160 - 0x80456168 + +.global lbl_80456160 +lbl_80456160: +.incbin "baserom.dol", 0x3D4FC0, 0x8 + diff --git a/asm/sdata2/J2DPane.s b/asm/sdata2/J2DPane.s new file mode 100644 index 0000000000..0bfb529f16 --- /dev/null +++ b/asm/sdata2/J2DPane.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804561f0 - 0x80456220 + +.global lbl_804561F0 +lbl_804561F0: +.incbin "baserom.dol", 0x3D5050, 0x4 + +.global lbl_804561F4 +lbl_804561F4: +.incbin "baserom.dol", 0x3D5054, 0x4 + +.global lbl_804561F8 +lbl_804561F8: +.incbin "baserom.dol", 0x3D5058, 0x8 + +.global lbl_80456200 +lbl_80456200: +.incbin "baserom.dol", 0x3D5060, 0x8 + +.global lbl_80456208 +lbl_80456208: +.incbin "baserom.dol", 0x3D5068, 0x4 + +.global lbl_8045620C +lbl_8045620C: +.incbin "baserom.dol", 0x3D506C, 0x4 + +.global lbl_80456210 +lbl_80456210: +.incbin "baserom.dol", 0x3D5070, 0x4 + +.global lbl_80456214 +lbl_80456214: +.incbin "baserom.dol", 0x3D5074, 0x4 + +.global lbl_80456218 +lbl_80456218: +.incbin "baserom.dol", 0x3D5078, 0x8 + diff --git a/asm/sdata2/J2DPicture.s b/asm/sdata2/J2DPicture.s new file mode 100644 index 0000000000..72f92fc991 --- /dev/null +++ b/asm/sdata2/J2DPicture.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456260 - 0x80456280 + +.global lbl_80456260 +lbl_80456260: +.incbin "baserom.dol", 0x3D50C0, 0x8 + +.global lbl_80456268 +lbl_80456268: +.incbin "baserom.dol", 0x3D50C8, 0x4 + +.global lbl_8045626C +lbl_8045626C: +.incbin "baserom.dol", 0x3D50CC, 0x4 + +.global lbl_80456270 +lbl_80456270: +.incbin "baserom.dol", 0x3D50D0, 0x8 + +.global lbl_80456278 +lbl_80456278: +.incbin "baserom.dol", 0x3D50D8, 0x4 + +.global lbl_8045627C +lbl_8045627C: +.incbin "baserom.dol", 0x3D50DC, 0x4 + diff --git a/asm/sdata2/J2DPictureEx.s b/asm/sdata2/J2DPictureEx.s new file mode 100644 index 0000000000..1a67aa0389 --- /dev/null +++ b/asm/sdata2/J2DPictureEx.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804562c0 - 0x804562d8 + +.global lbl_804562C0 +lbl_804562C0: +.incbin "baserom.dol", 0x3D5120, 0x4 + +.global lbl_804562C4 +lbl_804562C4: +.incbin "baserom.dol", 0x3D5124, 0x4 + +.global lbl_804562C8 +lbl_804562C8: +.incbin "baserom.dol", 0x3D5128, 0x8 + +.global lbl_804562D0 +lbl_804562D0: +.incbin "baserom.dol", 0x3D5130, 0x8 + diff --git a/asm/sdata2/J2DPrint.s b/asm/sdata2/J2DPrint.s new file mode 100644 index 0000000000..212ebd481b --- /dev/null +++ b/asm/sdata2/J2DPrint.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804561c8 - 0x804561f0 + +.global lbl_804561C8 +lbl_804561C8: +.incbin "baserom.dol", 0x3D5028, 0x4 + +.global lbl_804561CC +lbl_804561CC: +.incbin "baserom.dol", 0x3D502C, 0x4 + +.global lbl_804561D0 +lbl_804561D0: +.incbin "baserom.dol", 0x3D5030, 0x8 + +.global lbl_804561D8 +lbl_804561D8: +.incbin "baserom.dol", 0x3D5038, 0x8 + +.global lbl_804561E0 +lbl_804561E0: +.incbin "baserom.dol", 0x3D5040, 0x8 + +.global lbl_804561E8 +lbl_804561E8: +.incbin "baserom.dol", 0x3D5048, 0x4 + +.global lbl_804561EC +lbl_804561EC: +.incbin "baserom.dol", 0x3D504C, 0x4 + diff --git a/asm/sdata2/J2DScreen.s b/asm/sdata2/J2DScreen.s new file mode 100644 index 0000000000..5a4a06d0d9 --- /dev/null +++ b/asm/sdata2/J2DScreen.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456220 - 0x80456240 + +.global lbl_80456220 +lbl_80456220: +.incbin "baserom.dol", 0x3D5080, 0x4 + +.global lbl_80456224 +lbl_80456224: +.incbin "baserom.dol", 0x3D5084, 0x4 + +.global lbl_80456228 +lbl_80456228: +.incbin "baserom.dol", 0x3D5088, 0x8 + +.global lbl_80456230 +lbl_80456230: +.incbin "baserom.dol", 0x3D5090, 0x8 + +.global lbl_80456238 +lbl_80456238: +.incbin "baserom.dol", 0x3D5098, 0x4 + +.global lbl_8045623C +lbl_8045623C: +.incbin "baserom.dol", 0x3D509C, 0x4 + diff --git a/asm/sdata2/J2DTevs.s b/asm/sdata2/J2DTevs.s new file mode 100644 index 0000000000..98829b28bd --- /dev/null +++ b/asm/sdata2/J2DTevs.s @@ -0,0 +1,75 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456168 - 0x804561b0 + +.global lbl_80456168 +lbl_80456168: +.incbin "baserom.dol", 0x3D4FC8, 0x4 + +.global lbl_8045616C +lbl_8045616C: +.incbin "baserom.dol", 0x3D4FCC, 0x4 + +.global lbl_80456170 +lbl_80456170: +.incbin "baserom.dol", 0x3D4FD0, 0x4 + +.global lbl_80456174 +lbl_80456174: +.incbin "baserom.dol", 0x3D4FD4, 0x4 + +.global lbl_80456178 +lbl_80456178: +.incbin "baserom.dol", 0x3D4FD8, 0x4 + +.global lbl_8045617C +lbl_8045617C: +.incbin "baserom.dol", 0x3D4FDC, 0x4 + +.global lbl_80456180 +lbl_80456180: +.incbin "baserom.dol", 0x3D4FE0, 0x4 + +.global lbl_80456184 +lbl_80456184: +.incbin "baserom.dol", 0x3D4FE4, 0x4 + +.global lbl_80456188 +lbl_80456188: +.incbin "baserom.dol", 0x3D4FE8, 0x8 + +.global lbl_80456190 +lbl_80456190: +.incbin "baserom.dol", 0x3D4FF0, 0x4 + +.global lbl_80456194 +lbl_80456194: +.incbin "baserom.dol", 0x3D4FF4, 0x4 + +.global lbl_80456198 +lbl_80456198: +.incbin "baserom.dol", 0x3D4FF8, 0x4 + +.global lbl_8045619C +lbl_8045619C: +.incbin "baserom.dol", 0x3D4FFC, 0x4 + +.global lbl_804561A0 +lbl_804561A0: +.incbin "baserom.dol", 0x3D5000, 0x4 + +.global lbl_804561A4 +lbl_804561A4: +.incbin "baserom.dol", 0x3D5004, 0x4 + +.global lbl_804561A8 +lbl_804561A8: +.incbin "baserom.dol", 0x3D5008, 0x4 + +.global lbl_804561AC +lbl_804561AC: +.incbin "baserom.dol", 0x3D500C, 0x2 + +.global lbl_804561AE +lbl_804561AE: +.incbin "baserom.dol", 0x3D500E, 0x2 + diff --git a/asm/sdata2/J2DTextBox.s b/asm/sdata2/J2DTextBox.s new file mode 100644 index 0000000000..b3d0baafc2 --- /dev/null +++ b/asm/sdata2/J2DTextBox.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456280 - 0x804562a0 + +.global lbl_80456280 +lbl_80456280: +.incbin "baserom.dol", 0x3D50E0, 0x8 + +.global lbl_80456288 +lbl_80456288: +.incbin "baserom.dol", 0x3D50E8, 0x8 + +.global lbl_80456290 +lbl_80456290: +.incbin "baserom.dol", 0x3D50F0, 0x8 + +.global lbl_80456298 +lbl_80456298: +.incbin "baserom.dol", 0x3D50F8, 0x8 + diff --git a/asm/sdata2/J2DTextBoxEx.s b/asm/sdata2/J2DTextBoxEx.s new file mode 100644 index 0000000000..8816944825 --- /dev/null +++ b/asm/sdata2/J2DTextBoxEx.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804562d8 - 0x804562f8 + +.global lbl_804562D8 +lbl_804562D8: +.incbin "baserom.dol", 0x3D5138, 0x8 + +.global lbl_804562E0 +lbl_804562E0: +.incbin "baserom.dol", 0x3D5140, 0x8 + +.global lbl_804562E8 +lbl_804562E8: +.incbin "baserom.dol", 0x3D5148, 0x8 + +.global lbl_804562F0 +lbl_804562F0: +.incbin "baserom.dol", 0x3D5150, 0x8 + diff --git a/asm/sdata2/J2DWindow.s b/asm/sdata2/J2DWindow.s new file mode 100644 index 0000000000..2d51b83b38 --- /dev/null +++ b/asm/sdata2/J2DWindow.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456240 - 0x80456260 + +.global lbl_80456240 +lbl_80456240: +.incbin "baserom.dol", 0x3D50A0, 0x8 + +.global lbl_80456248 +lbl_80456248: +.incbin "baserom.dol", 0x3D50A8, 0x8 + +.global lbl_80456250 +lbl_80456250: +.incbin "baserom.dol", 0x3D50B0, 0x4 + +.global lbl_80456254 +lbl_80456254: +.incbin "baserom.dol", 0x3D50B4, 0x4 + +.global lbl_80456258 +lbl_80456258: +.incbin "baserom.dol", 0x3D50B8, 0x8 + diff --git a/asm/sdata2/J2DWindowEx.s b/asm/sdata2/J2DWindowEx.s new file mode 100644 index 0000000000..a8f815ecae --- /dev/null +++ b/asm/sdata2/J2DWindowEx.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804562a0 - 0x804562c0 + +.global lbl_804562A0 +lbl_804562A0: +.incbin "baserom.dol", 0x3D5100, 0x8 + +.global lbl_804562A8 +lbl_804562A8: +.incbin "baserom.dol", 0x3D5108, 0x8 + +.global lbl_804562B0 +lbl_804562B0: +.incbin "baserom.dol", 0x3D5110, 0x4 + +.global lbl_804562B4 +lbl_804562B4: +.incbin "baserom.dol", 0x3D5114, 0x4 + +.global lbl_804562B8 +lbl_804562B8: +.incbin "baserom.dol", 0x3D5118, 0x8 + diff --git a/asm/sdata2/J3DAnimation.s b/asm/sdata2/J3DAnimation.s new file mode 100644 index 0000000000..29d4d2d90e --- /dev/null +++ b/asm/sdata2/J3DAnimation.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456430 - 0x80456468 + +.global lbl_80456430 +lbl_80456430: +.incbin "baserom.dol", 0x3D5290, 0x4 + +.global lbl_80456434 +lbl_80456434: +.incbin "baserom.dol", 0x3D5294, 0x4 + +.global lbl_80456438 +lbl_80456438: +.incbin "baserom.dol", 0x3D5298, 0x8 + +.global lbl_80456440 +lbl_80456440: +.incbin "baserom.dol", 0x3D52A0, 0x8 + +.global lbl_80456448 +lbl_80456448: +.incbin "baserom.dol", 0x3D52A8, 0x8 + +.global lbl_80456450 +lbl_80456450: +.incbin "baserom.dol", 0x3D52B0, 0x8 + +.global lbl_80456458 +lbl_80456458: +.incbin "baserom.dol", 0x3D52B8, 0x4 + +.global lbl_8045645C +lbl_8045645C: +.incbin "baserom.dol", 0x3D52BC, 0x4 + +.global lbl_80456460 +lbl_80456460: +.incbin "baserom.dol", 0x3D52C0, 0x8 + diff --git a/asm/sdata2/J3DAnmLoader.s b/asm/sdata2/J3DAnmLoader.s new file mode 100644 index 0000000000..b1138d9f65 --- /dev/null +++ b/asm/sdata2/J3DAnmLoader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564c0 - 0x804564c8 + +.global lbl_804564C0 +lbl_804564C0: +.incbin "baserom.dol", 0x3D5320, 0x8 + diff --git a/asm/sdata2/J3DCluster.s b/asm/sdata2/J3DCluster.s new file mode 100644 index 0000000000..bdf237d6ce --- /dev/null +++ b/asm/sdata2/J3DCluster.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456470 - 0x804564a0 + +.global lbl_80456470 +lbl_80456470: +.incbin "baserom.dol", 0x3D52D0, 0x4 + +.global lbl_80456474 +lbl_80456474: +.incbin "baserom.dol", 0x3D52D4, 0x4 + +.global lbl_80456478 +lbl_80456478: +.incbin "baserom.dol", 0x3D52D8, 0x4 + +.global lbl_8045647C +lbl_8045647C: +.incbin "baserom.dol", 0x3D52DC, 0x4 + +.global lbl_80456480 +lbl_80456480: +.incbin "baserom.dol", 0x3D52E0, 0x4 + +.global lbl_80456484 +lbl_80456484: +.incbin "baserom.dol", 0x3D52E4, 0x4 + +.global lbl_80456488 +lbl_80456488: +.incbin "baserom.dol", 0x3D52E8, 0x4 + +.global lbl_8045648C +lbl_8045648C: +.incbin "baserom.dol", 0x3D52EC, 0x4 + +.global lbl_80456490 +lbl_80456490: +.incbin "baserom.dol", 0x3D52F0, 0x4 + +.global lbl_80456494 +lbl_80456494: +.incbin "baserom.dol", 0x3D52F4, 0x4 + +.global lbl_80456498 +lbl_80456498: +.incbin "baserom.dol", 0x3D52F8, 0x8 + diff --git a/asm/sdata2/J3DDrawBuffer.s b/asm/sdata2/J3DDrawBuffer.s new file mode 100644 index 0000000000..f13a4598cf --- /dev/null +++ b/asm/sdata2/J3DDrawBuffer.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456400 - 0x80456410 + +.global lbl_80456400 +lbl_80456400: +.incbin "baserom.dol", 0x3D5260, 0x4 + +.global lbl_80456404 +lbl_80456404: +.incbin "baserom.dol", 0x3D5264, 0x4 + +.global lbl_80456408 +lbl_80456408: +.incbin "baserom.dol", 0x3D5268, 0x8 + diff --git a/asm/sdata2/J3DGD.s b/asm/sdata2/J3DGD.s new file mode 100644 index 0000000000..b8cb227102 --- /dev/null +++ b/asm/sdata2/J3DGD.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456328 - 0x80456368 + +.global lbl_80456328 +lbl_80456328: +.incbin "baserom.dol", 0x3D5188, 0x4 + +.global lbl_8045632C +lbl_8045632C: +.incbin "baserom.dol", 0x3D518C, 0x4 + +.global lbl_80456330 +lbl_80456330: +.incbin "baserom.dol", 0x3D5190, 0x4 + +.global lbl_80456334 +lbl_80456334: +.incbin "baserom.dol", 0x3D5194, 0x4 + +.global lbl_80456338 +lbl_80456338: +.incbin "baserom.dol", 0x3D5198, 0x8 + +.global lbl_80456340 +lbl_80456340: +.incbin "baserom.dol", 0x3D51A0, 0x8 + +.global lbl_80456348 +lbl_80456348: +.incbin "baserom.dol", 0x3D51A8, 0x8 + +.global lbl_80456350 +lbl_80456350: +.incbin "baserom.dol", 0x3D51B0, 0x8 + +.global lbl_80456358 +lbl_80456358: +.incbin "baserom.dol", 0x3D51B8, 0x8 + +.global lbl_80456360 +lbl_80456360: +.incbin "baserom.dol", 0x3D51C0, 0x8 + diff --git a/asm/sdata2/J3DJoint.s b/asm/sdata2/J3DJoint.s new file mode 100644 index 0000000000..0eafed563c --- /dev/null +++ b/asm/sdata2/J3DJoint.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564a0 - 0x804564a8 + +.global lbl_804564A0 +lbl_804564A0: +.incbin "baserom.dol", 0x3D5300, 0x4 + +.global lbl_804564A4 +lbl_804564A4: +.incbin "baserom.dol", 0x3D5304, 0x4 + diff --git a/asm/sdata2/J3DJointTree.s b/asm/sdata2/J3DJointTree.s new file mode 100644 index 0000000000..caf17f9f2c --- /dev/null +++ b/asm/sdata2/J3DJointTree.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456418 - 0x80456420 + +.global lbl_80456418 +lbl_80456418: +.incbin "baserom.dol", 0x3D5278, 0x8 + diff --git a/asm/sdata2/J3DMatBlock.s b/asm/sdata2/J3DMatBlock.s new file mode 100644 index 0000000000..8656ffa67d --- /dev/null +++ b/asm/sdata2/J3DMatBlock.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804563a8 - 0x804563b0 + +.global lbl_804563A8 +lbl_804563A8: +.incbin "baserom.dol", 0x3D5208, 0x4 + +.global lbl_804563AC +lbl_804563AC: +.incbin "baserom.dol", 0x3D520C, 0x4 + diff --git a/asm/sdata2/J3DMaterialFactory.s b/asm/sdata2/J3DMaterialFactory.s new file mode 100644 index 0000000000..1acc3ded2a --- /dev/null +++ b/asm/sdata2/J3DMaterialFactory.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564a8 - 0x804564b8 + +.global lbl_804564A8 +lbl_804564A8: +.incbin "baserom.dol", 0x3D5308, 0x4 + +.global lbl_804564AC +lbl_804564AC: +.incbin "baserom.dol", 0x3D530C, 0x4 + +.global lbl_804564B0 +lbl_804564B0: +.incbin "baserom.dol", 0x3D5310, 0x8 + diff --git a/asm/sdata2/J3DMaterialFactory_v21.s b/asm/sdata2/J3DMaterialFactory_v21.s new file mode 100644 index 0000000000..03b3d0d2de --- /dev/null +++ b/asm/sdata2/J3DMaterialFactory_v21.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564b8 - 0x804564c0 + +.global lbl_804564B8 +lbl_804564B8: +.incbin "baserom.dol", 0x3D5318, 0x4 + +.global lbl_804564BC +lbl_804564BC: +.incbin "baserom.dol", 0x3D531C, 0x4 + diff --git a/asm/sdata2/J3DModel.s b/asm/sdata2/J3DModel.s new file mode 100644 index 0000000000..ab7eae9638 --- /dev/null +++ b/asm/sdata2/J3DModel.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456428 - 0x80456430 + +.global lbl_80456428 +lbl_80456428: +.incbin "baserom.dol", 0x3D5288, 0x8 + diff --git a/asm/sdata2/J3DMtxBuffer.s b/asm/sdata2/J3DMtxBuffer.s new file mode 100644 index 0000000000..fe0516da28 --- /dev/null +++ b/asm/sdata2/J3DMtxBuffer.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456420 - 0x80456428 + +.global lbl_80456420 +lbl_80456420: +.incbin "baserom.dol", 0x3D5280, 0x4 + +.global lbl_80456424 +lbl_80456424: +.incbin "baserom.dol", 0x3D5284, 0x4 + diff --git a/asm/sdata2/J3DShape.s b/asm/sdata2/J3DShape.s new file mode 100644 index 0000000000..162906ee65 --- /dev/null +++ b/asm/sdata2/J3DShape.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804563a0 - 0x804563a8 + +.global lbl_804563A0 +lbl_804563A0: +.incbin "baserom.dol", 0x3D5200, 0x8 + diff --git a/asm/sdata2/J3DShapeMtx.s b/asm/sdata2/J3DShapeMtx.s new file mode 100644 index 0000000000..9fc6cc9b17 --- /dev/null +++ b/asm/sdata2/J3DShapeMtx.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456398 - 0x804563a0 + +.global lbl_80456398 +lbl_80456398: +.incbin "baserom.dol", 0x3D51F8, 0x4 + +.global lbl_8045639C +lbl_8045639C: +.incbin "baserom.dol", 0x3D51FC, 0x4 + diff --git a/asm/sdata2/J3DSkinDeform.s b/asm/sdata2/J3DSkinDeform.s new file mode 100644 index 0000000000..ddcf63d9f4 --- /dev/null +++ b/asm/sdata2/J3DSkinDeform.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456468 - 0x80456470 + +.global lbl_80456468 +lbl_80456468: +.incbin "baserom.dol", 0x3D52C8, 0x4 + +.global lbl_8045646C +lbl_8045646C: +.incbin "baserom.dol", 0x3D52CC, 0x4 + diff --git a/asm/sdata2/J3DStruct.s b/asm/sdata2/J3DStruct.s new file mode 100644 index 0000000000..deff626983 --- /dev/null +++ b/asm/sdata2/J3DStruct.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456410 - 0x80456418 + +.global lbl_80456410 +lbl_80456410: +.incbin "baserom.dol", 0x3D5270, 0x4 + +.global lbl_80456414 +lbl_80456414: +.incbin "baserom.dol", 0x3D5274, 0x4 + diff --git a/asm/sdata2/J3DSys.s b/asm/sdata2/J3DSys.s new file mode 100644 index 0000000000..c272b1e28c --- /dev/null +++ b/asm/sdata2/J3DSys.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456368 - 0x80456378 + +.global lbl_80456368 +lbl_80456368: +.incbin "baserom.dol", 0x3D51C8, 0x4 + +.global lbl_8045636C +lbl_8045636C: +.incbin "baserom.dol", 0x3D51CC, 0x4 + +.global lbl_80456370 +lbl_80456370: +.incbin "baserom.dol", 0x3D51D0, 0x8 + diff --git a/asm/sdata2/J3DTevs.s b/asm/sdata2/J3DTevs.s new file mode 100644 index 0000000000..0feecf565e --- /dev/null +++ b/asm/sdata2/J3DTevs.s @@ -0,0 +1,79 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804563b0 - 0x80456400 + +.global lbl_804563B0 +lbl_804563B0: +.incbin "baserom.dol", 0x3D5210, 0x4 + +.global lbl_804563B4 +lbl_804563B4: +.incbin "baserom.dol", 0x3D5214, 0x4 + +.global lbl_804563B8 +lbl_804563B8: +.incbin "baserom.dol", 0x3D5218, 0x8 + +.global lbl_804563C0 +lbl_804563C0: +.incbin "baserom.dol", 0x3D5220, 0x4 + +.global lbl_804563C4 +lbl_804563C4: +.incbin "baserom.dol", 0x3D5224, 0x4 + +.global lbl_804563C8 +lbl_804563C8: +.incbin "baserom.dol", 0x3D5228, 0x4 + +.global lbl_804563CC +lbl_804563CC: +.incbin "baserom.dol", 0x3D522C, 0x4 + +.global lbl_804563D0 +lbl_804563D0: +.incbin "baserom.dol", 0x3D5230, 0x4 + +.global lbl_804563D4 +lbl_804563D4: +.incbin "baserom.dol", 0x3D5234, 0x4 + +.global lbl_804563D8 +lbl_804563D8: +.incbin "baserom.dol", 0x3D5238, 0x4 + +.global lbl_804563DC +lbl_804563DC: +.incbin "baserom.dol", 0x3D523C, 0x4 + +.global lbl_804563E0 +lbl_804563E0: +.incbin "baserom.dol", 0x3D5240, 0x4 + +.global lbl_804563E4 +lbl_804563E4: +.incbin "baserom.dol", 0x3D5244, 0x4 + +.global lbl_804563E8 +lbl_804563E8: +.incbin "baserom.dol", 0x3D5248, 0x4 + +.global lbl_804563EC +lbl_804563EC: +.incbin "baserom.dol", 0x3D524C, 0x4 + +.global lbl_804563F0 +lbl_804563F0: +.incbin "baserom.dol", 0x3D5250, 0x8 + +.global lbl_804563F8 +lbl_804563F8: +.incbin "baserom.dol", 0x3D5258, 0x2 + +.global lbl_804563FA +lbl_804563FA: +.incbin "baserom.dol", 0x3D525A, 0x2 + +.global lbl_804563FC +lbl_804563FC: +.incbin "baserom.dol", 0x3D525C, 0x4 + diff --git a/asm/sdata2/J3DTexture.s b/asm/sdata2/J3DTexture.s new file mode 100644 index 0000000000..4efb8009ff --- /dev/null +++ b/asm/sdata2/J3DTexture.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456388 - 0x80456398 + +.global lbl_80456388 +lbl_80456388: +.incbin "baserom.dol", 0x3D51E8, 0x4 + +.global lbl_8045638C +lbl_8045638C: +.incbin "baserom.dol", 0x3D51EC, 0x4 + +.global lbl_80456390 +lbl_80456390: +.incbin "baserom.dol", 0x3D51F0, 0x8 + diff --git a/asm/sdata2/J3DTransform.s b/asm/sdata2/J3DTransform.s new file mode 100644 index 0000000000..1fbf3f5ada --- /dev/null +++ b/asm/sdata2/J3DTransform.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456378 - 0x80456388 + +.global lbl_80456378 +lbl_80456378: +.incbin "baserom.dol", 0x3D51D8, 0x4 + +.global lbl_8045637C +lbl_8045637C: +.incbin "baserom.dol", 0x3D51DC, 0x4 + +.global lbl_80456380 +lbl_80456380: +.incbin "baserom.dol", 0x3D51E0, 0x8 + diff --git a/asm/sdata2/J3DUClipper.s b/asm/sdata2/J3DUClipper.s new file mode 100644 index 0000000000..bbdbf4a1a9 --- /dev/null +++ b/asm/sdata2/J3DUClipper.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455278 - 0x80455290 + +.global lbl_80455278 +lbl_80455278: +.incbin "baserom.dol", 0x3D40D8, 0x4 + +.global lbl_8045527C +lbl_8045527C: +.incbin "baserom.dol", 0x3D40DC, 0x4 + +.global lbl_80455280 +lbl_80455280: +.incbin "baserom.dol", 0x3D40E0, 0x4 + +.global lbl_80455284 +lbl_80455284: +.incbin "baserom.dol", 0x3D40E4, 0x4 + +.global lbl_80455288 +lbl_80455288: +.incbin "baserom.dol", 0x3D40E8, 0x8 + diff --git a/asm/sdata2/JAISe.s b/asm/sdata2/JAISe.s new file mode 100644 index 0000000000..5c96294e0e --- /dev/null +++ b/asm/sdata2/JAISe.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455778 - 0x80455788 + +.global lbl_80455778 +lbl_80455778: +.incbin "baserom.dol", 0x3D45D8, 0x4 + +.global lbl_8045577C +lbl_8045577C: +.incbin "baserom.dol", 0x3D45DC, 0x4 + +.global lbl_80455780 +lbl_80455780: +.incbin "baserom.dol", 0x3D45E0, 0x4 + +.global lbl_80455784 +lbl_80455784: +.incbin "baserom.dol", 0x3D45E4, 0x4 + diff --git a/asm/sdata2/JAISeMgr.s b/asm/sdata2/JAISeMgr.s new file mode 100644 index 0000000000..8bc7e6b99a --- /dev/null +++ b/asm/sdata2/JAISeMgr.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455788 - 0x80455798 + +.global lbl_80455788 +lbl_80455788: +.incbin "baserom.dol", 0x3D45E8, 0x4 + +.global lbl_8045578C +lbl_8045578C: +.incbin "baserom.dol", 0x3D45EC, 0x4 + +.global lbl_80455790 +lbl_80455790: +.incbin "baserom.dol", 0x3D45F0, 0x4 + +.global lbl_80455794 +lbl_80455794: +.incbin "baserom.dol", 0x3D45F4, 0x4 + diff --git a/asm/sdata2/JAISeq.s b/asm/sdata2/JAISeq.s new file mode 100644 index 0000000000..5ef56bf085 --- /dev/null +++ b/asm/sdata2/JAISeq.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455798 - 0x804557a8 + +.global lbl_80455798 +lbl_80455798: +.incbin "baserom.dol", 0x3D45F8, 0x4 + +.global lbl_8045579C +lbl_8045579C: +.incbin "baserom.dol", 0x3D45FC, 0x4 + +.global lbl_804557A0 +lbl_804557A0: +.incbin "baserom.dol", 0x3D4600, 0x8 + diff --git a/asm/sdata2/JAISeqMgr.s b/asm/sdata2/JAISeqMgr.s new file mode 100644 index 0000000000..28316fe2d7 --- /dev/null +++ b/asm/sdata2/JAISeqMgr.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804557a8 - 0x804557b8 + +.global lbl_804557A8 +lbl_804557A8: +.incbin "baserom.dol", 0x3D4608, 0x4 + +.global lbl_804557AC +lbl_804557AC: +.incbin "baserom.dol", 0x3D460C, 0x4 + +.global lbl_804557B0 +lbl_804557B0: +.incbin "baserom.dol", 0x3D4610, 0x8 + diff --git a/asm/sdata2/JAISound.s b/asm/sdata2/JAISound.s new file mode 100644 index 0000000000..e5fcdcf099 --- /dev/null +++ b/asm/sdata2/JAISound.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804557b8 - 0x804557d8 + +.global lbl_804557B8 +lbl_804557B8: +.incbin "baserom.dol", 0x3D4618, 0x4 + +.global lbl_804557BC +lbl_804557BC: +.incbin "baserom.dol", 0x3D461C, 0x4 + +.global lbl_804557C0 +lbl_804557C0: +.incbin "baserom.dol", 0x3D4620, 0x8 + +.global lbl_804557C8 +lbl_804557C8: +.incbin "baserom.dol", 0x3D4628, 0x8 + +.global lbl_804557D0 +lbl_804557D0: +.incbin "baserom.dol", 0x3D4630, 0x8 + diff --git a/asm/sdata2/JAISoundChild.s b/asm/sdata2/JAISoundChild.s new file mode 100644 index 0000000000..25fc3d31c7 --- /dev/null +++ b/asm/sdata2/JAISoundChild.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804557d8 - 0x804557e8 + +.global lbl_804557D8 +lbl_804557D8: +.incbin "baserom.dol", 0x3D4638, 0x4 + +.global lbl_804557DC +lbl_804557DC: +.incbin "baserom.dol", 0x3D463C, 0x4 + +.global lbl_804557E0 +lbl_804557E0: +.incbin "baserom.dol", 0x3D4640, 0x8 + diff --git a/asm/sdata2/JAISoundParams.s b/asm/sdata2/JAISoundParams.s new file mode 100644 index 0000000000..7714011251 --- /dev/null +++ b/asm/sdata2/JAISoundParams.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804557e8 - 0x804557f0 + +.global lbl_804557E8 +lbl_804557E8: +.incbin "baserom.dol", 0x3D4648, 0x8 + diff --git a/asm/sdata2/JAIStream.s b/asm/sdata2/JAIStream.s new file mode 100644 index 0000000000..c4bf460050 --- /dev/null +++ b/asm/sdata2/JAIStream.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804557f0 - 0x80455800 + +.global lbl_804557F0 +lbl_804557F0: +.incbin "baserom.dol", 0x3D4650, 0x4 + +.global lbl_804557F4 +lbl_804557F4: +.incbin "baserom.dol", 0x3D4654, 0x4 + +.global lbl_804557F8 +lbl_804557F8: +.incbin "baserom.dol", 0x3D4658, 0x8 + diff --git a/asm/sdata2/JAIStreamMgr.s b/asm/sdata2/JAIStreamMgr.s new file mode 100644 index 0000000000..3d37c0be56 --- /dev/null +++ b/asm/sdata2/JAIStreamMgr.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455800 - 0x80455810 + +.global lbl_80455800 +lbl_80455800: +.incbin "baserom.dol", 0x3D4660, 0x4 + +.global lbl_80455804 +lbl_80455804: +.incbin "baserom.dol", 0x3D4664, 0x4 + +.global lbl_80455808 +lbl_80455808: +.incbin "baserom.dol", 0x3D4668, 0x8 + diff --git a/asm/sdata2/JASAiCtrl.s b/asm/sdata2/JASAiCtrl.s new file mode 100644 index 0000000000..9746add6e3 --- /dev/null +++ b/asm/sdata2/JASAiCtrl.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455720 - 0x80455740 + +.global lbl_80455720 +lbl_80455720: +.incbin "baserom.dol", 0x3D4580, 0x4 + +.global lbl_80455724 +lbl_80455724: +.incbin "baserom.dol", 0x3D4584, 0x4 + +.global lbl_80455728 +lbl_80455728: +.incbin "baserom.dol", 0x3D4588, 0x4 + +.global lbl_8045572C +lbl_8045572C: +.incbin "baserom.dol", 0x3D458C, 0x4 + +.global lbl_80455730 +lbl_80455730: +.incbin "baserom.dol", 0x3D4590, 0x8 + +.global lbl_80455738 +lbl_80455738: +.incbin "baserom.dol", 0x3D4598, 0x8 + diff --git a/asm/sdata2/JASAramStream.s b/asm/sdata2/JASAramStream.s new file mode 100644 index 0000000000..eb68f0295d --- /dev/null +++ b/asm/sdata2/JASAramStream.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455610 - 0x80455630 + +.global lbl_80455610 +lbl_80455610: +.incbin "baserom.dol", 0x3D4470, 0x4 + +.global lbl_80455614 +lbl_80455614: +.incbin "baserom.dol", 0x3D4474, 0x4 + +.global lbl_80455618 +lbl_80455618: +.incbin "baserom.dol", 0x3D4478, 0x4 + +.global lbl_8045561C +lbl_8045561C: +.incbin "baserom.dol", 0x3D447C, 0x4 + +.global lbl_80455620 +lbl_80455620: +.incbin "baserom.dol", 0x3D4480, 0x8 + +.global lbl_80455628 +lbl_80455628: +.incbin "baserom.dol", 0x3D4488, 0x8 + diff --git a/asm/sdata2/JASAudioReseter.s b/asm/sdata2/JASAudioReseter.s new file mode 100644 index 0000000000..9f97b2aba6 --- /dev/null +++ b/asm/sdata2/JASAudioReseter.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455740 - 0x80455748 + +.global lbl_80455740 +lbl_80455740: +.incbin "baserom.dol", 0x3D45A0, 0x8 + diff --git a/asm/sdata2/JASBNKParser.s b/asm/sdata2/JASBNKParser.s new file mode 100644 index 0000000000..cda16ce59c --- /dev/null +++ b/asm/sdata2/JASBNKParser.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455658 - 0x80455680 + +.global lbl_80455658 +lbl_80455658: +.incbin "baserom.dol", 0x3D44B8, 0x8 + +.global lbl_80455660 +lbl_80455660: +.incbin "baserom.dol", 0x3D44C0, 0x8 + +.global lbl_80455668 +lbl_80455668: +.incbin "baserom.dol", 0x3D44C8, 0x8 + +.global lbl_80455670 +lbl_80455670: +.incbin "baserom.dol", 0x3D44D0, 0x4 + +.global lbl_80455674 +lbl_80455674: +.incbin "baserom.dol", 0x3D44D4, 0x4 + +.global lbl_80455678 +lbl_80455678: +.incbin "baserom.dol", 0x3D44D8, 0x8 + diff --git a/asm/sdata2/JASBank.s b/asm/sdata2/JASBank.s new file mode 100644 index 0000000000..fb30956026 --- /dev/null +++ b/asm/sdata2/JASBank.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455630 - 0x80455640 + +.global lbl_80455630 +lbl_80455630: +.incbin "baserom.dol", 0x3D4490, 0x4 + +.global lbl_80455634 +lbl_80455634: +.incbin "baserom.dol", 0x3D4494, 0x4 + +.global lbl_80455638 +lbl_80455638: +.incbin "baserom.dol", 0x3D4498, 0x4 + +.global lbl_8045563C +lbl_8045563C: +.incbin "baserom.dol", 0x3D449C, 0x4 + diff --git a/asm/sdata2/JASBasicInst.s b/asm/sdata2/JASBasicInst.s new file mode 100644 index 0000000000..1b759c9878 --- /dev/null +++ b/asm/sdata2/JASBasicInst.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455640 - 0x80455648 + +.global lbl_80455640 +lbl_80455640: +.incbin "baserom.dol", 0x3D44A0, 0x8 + diff --git a/asm/sdata2/JASCalc.s b/asm/sdata2/JASCalc.s new file mode 100644 index 0000000000..1fac3dbd8d --- /dev/null +++ b/asm/sdata2/JASCalc.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455558 - 0x80455588 + +.global lbl_80455558 +lbl_80455558: +.incbin "baserom.dol", 0x3D43B8, 0x8 + +.global lbl_80455560 +lbl_80455560: +.incbin "baserom.dol", 0x3D43C0, 0x8 + +.global lbl_80455568 +lbl_80455568: +.incbin "baserom.dol", 0x3D43C8, 0x4 + +.global lbl_8045556C +lbl_8045556C: +.incbin "baserom.dol", 0x3D43CC, 0x8 + +.global lbl_80455574 +lbl_80455574: +.incbin "baserom.dol", 0x3D43D4, 0x8 + +.global lbl_8045557C +lbl_8045557C: +.incbin "baserom.dol", 0x3D43DC, 0x4 + +.global lbl_80455580 +lbl_80455580: +.incbin "baserom.dol", 0x3D43E0, 0x8 + diff --git a/asm/sdata2/JASChannel.s b/asm/sdata2/JASChannel.s new file mode 100644 index 0000000000..ae639a22df --- /dev/null +++ b/asm/sdata2/JASChannel.s @@ -0,0 +1,75 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455680 - 0x804556e0 + +.global lbl_80455680 +lbl_80455680: +.incbin "baserom.dol", 0x3D44E0, 0x4 + +.global lbl_80455684 +lbl_80455684: +.incbin "baserom.dol", 0x3D44E4, 0x4 + +.global lbl_80455688 +lbl_80455688: +.incbin "baserom.dol", 0x3D44E8, 0x8 + +.global lbl_80455690 +lbl_80455690: +.incbin "baserom.dol", 0x3D44F0, 0x8 + +.global lbl_80455698 +lbl_80455698: +.incbin "baserom.dol", 0x3D44F8, 0x8 + +.global lbl_804556A0 +lbl_804556A0: +.incbin "baserom.dol", 0x3D4500, 0x8 + +.global lbl_804556A8 +lbl_804556A8: +.incbin "baserom.dol", 0x3D4508, 0x8 + +.global lbl_804556B0 +lbl_804556B0: +.incbin "baserom.dol", 0x3D4510, 0x4 + +.global lbl_804556B4 +lbl_804556B4: +.incbin "baserom.dol", 0x3D4514, 0x4 + +.global lbl_804556B8 +lbl_804556B8: +.incbin "baserom.dol", 0x3D4518, 0x4 + +.global lbl_804556BC +lbl_804556BC: +.incbin "baserom.dol", 0x3D451C, 0x4 + +.global lbl_804556C0 +lbl_804556C0: +.incbin "baserom.dol", 0x3D4520, 0x4 + +.global lbl_804556C4 +lbl_804556C4: +.incbin "baserom.dol", 0x3D4524, 0x4 + +.global lbl_804556C8 +lbl_804556C8: +.incbin "baserom.dol", 0x3D4528, 0x4 + +.global lbl_804556CC +lbl_804556CC: +.incbin "baserom.dol", 0x3D452C, 0x4 + +.global lbl_804556D0 +lbl_804556D0: +.incbin "baserom.dol", 0x3D4530, 0x4 + +.global lbl_804556D4 +lbl_804556D4: +.incbin "baserom.dol", 0x3D4534, 0x4 + +.global lbl_804556D8 +lbl_804556D8: +.incbin "baserom.dol", 0x3D4538, 0x8 + diff --git a/asm/sdata2/JASDSPInterface.s b/asm/sdata2/JASDSPInterface.s new file mode 100644 index 0000000000..82a540e999 --- /dev/null +++ b/asm/sdata2/JASDSPInterface.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455748 - 0x80455760 + +.global lbl_80455748 +lbl_80455748: +.incbin "baserom.dol", 0x3D45A8, 0x4 + +.global lbl_8045574C +lbl_8045574C: +.incbin "baserom.dol", 0x3D45AC, 0x8 + +.global lbl_80455754 +lbl_80455754: +.incbin "baserom.dol", 0x3D45B4, 0xC + diff --git a/asm/sdata2/JASDrumSet.s b/asm/sdata2/JASDrumSet.s new file mode 100644 index 0000000000..fcd3c3f7c6 --- /dev/null +++ b/asm/sdata2/JASDrumSet.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455648 - 0x80455658 + +.global lbl_80455648 +lbl_80455648: +.incbin "baserom.dol", 0x3D44A8, 0x4 + +.global lbl_8045564C +lbl_8045564C: +.incbin "baserom.dol", 0x3D44AC, 0x4 + +.global lbl_80455650 +lbl_80455650: +.incbin "baserom.dol", 0x3D44B0, 0x8 + diff --git a/asm/sdata2/JASLfo.s b/asm/sdata2/JASLfo.s new file mode 100644 index 0000000000..e038319dbe --- /dev/null +++ b/asm/sdata2/JASLfo.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804556e0 - 0x804556f8 + +.global lbl_804556E0 +lbl_804556E0: +.incbin "baserom.dol", 0x3D4540, 0x4 + +.global lbl_804556E4 +lbl_804556E4: +.incbin "baserom.dol", 0x3D4544, 0x4 + +.global lbl_804556E8 +lbl_804556E8: +.incbin "baserom.dol", 0x3D4548, 0x4 + +.global lbl_804556EC +lbl_804556EC: +.incbin "baserom.dol", 0x3D454C, 0x4 + +.global lbl_804556F0 +lbl_804556F0: +.incbin "baserom.dol", 0x3D4550, 0x8 + diff --git a/asm/sdata2/JASOscillator.s b/asm/sdata2/JASOscillator.s new file mode 100644 index 0000000000..748e51c3c3 --- /dev/null +++ b/asm/sdata2/JASOscillator.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804556f8 - 0x80455720 + +.global lbl_804556F8 +lbl_804556F8: +.incbin "baserom.dol", 0x3D4558, 0x4 + +.global lbl_804556FC +lbl_804556FC: +.incbin "baserom.dol", 0x3D455C, 0x4 + +.global lbl_80455700 +lbl_80455700: +.incbin "baserom.dol", 0x3D4560, 0x8 + +.global lbl_80455708 +lbl_80455708: +.incbin "baserom.dol", 0x3D4568, 0x8 + +.global lbl_80455710 +lbl_80455710: +.incbin "baserom.dol", 0x3D4570, 0x8 + +.global lbl_80455718 +lbl_80455718: +.incbin "baserom.dol", 0x3D4578, 0x8 + diff --git a/asm/sdata2/JASProbe.s b/asm/sdata2/JASProbe.s new file mode 100644 index 0000000000..e7feaa1cec --- /dev/null +++ b/asm/sdata2/JASProbe.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455588 - 0x804555a0 + +.global lbl_80455588 +lbl_80455588: +.incbin "baserom.dol", 0x3D43E8, 0x4 + +.global lbl_8045558C +lbl_8045558C: +.incbin "baserom.dol", 0x3D43EC, 0x4 + +.global lbl_80455590 +lbl_80455590: +.incbin "baserom.dol", 0x3D43F0, 0x8 + +.global lbl_80455598 +lbl_80455598: +.incbin "baserom.dol", 0x3D43F8, 0x8 + diff --git a/asm/sdata2/JASSeqParser.s b/asm/sdata2/JASSeqParser.s new file mode 100644 index 0000000000..40648e315b --- /dev/null +++ b/asm/sdata2/JASSeqParser.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804555d8 - 0x80455610 + +.global lbl_804555D8 +lbl_804555D8: +.incbin "baserom.dol", 0x3D4438, 0x4 + +.global lbl_804555DC +lbl_804555DC: +.incbin "baserom.dol", 0x3D443C, 0x4 + +.global lbl_804555E0 +lbl_804555E0: +.incbin "baserom.dol", 0x3D4440, 0x4 + +.global lbl_804555E4 +lbl_804555E4: +.incbin "baserom.dol", 0x3D4444, 0x4 + +.global lbl_804555E8 +lbl_804555E8: +.incbin "baserom.dol", 0x3D4448, 0x8 + +.global lbl_804555F0 +lbl_804555F0: +.incbin "baserom.dol", 0x3D4450, 0x8 + +.global lbl_804555F8 +lbl_804555F8: +.incbin "baserom.dol", 0x3D4458, 0x4 + +.global lbl_804555FC +lbl_804555FC: +.incbin "baserom.dol", 0x3D445C, 0x4 + +.global lbl_80455600 +lbl_80455600: +.incbin "baserom.dol", 0x3D4460, 0x8 + +.global lbl_80455608 +lbl_80455608: +.incbin "baserom.dol", 0x3D4468, 0x8 + diff --git a/asm/sdata2/JASSoundParams.s b/asm/sdata2/JASSoundParams.s new file mode 100644 index 0000000000..d1897f23d6 --- /dev/null +++ b/asm/sdata2/JASSoundParams.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455760 - 0x80455770 + +.global lbl_80455760 +lbl_80455760: +.incbin "baserom.dol", 0x3D45C0, 0x4 + +.global lbl_80455764 +lbl_80455764: +.incbin "baserom.dol", 0x3D45C4, 0x4 + +.global lbl_80455768 +lbl_80455768: +.incbin "baserom.dol", 0x3D45C8, 0x4 + +.global lbl_8045576C +lbl_8045576C: +.incbin "baserom.dol", 0x3D45CC, 0x4 + diff --git a/asm/sdata2/JASTrack.s b/asm/sdata2/JASTrack.s new file mode 100644 index 0000000000..eebe27cfba --- /dev/null +++ b/asm/sdata2/JASTrack.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804555a0 - 0x804555d8 + +.global lbl_804555A0 +lbl_804555A0: +.incbin "baserom.dol", 0x3D4400, 0x4 + +.global lbl_804555A4 +lbl_804555A4: +.incbin "baserom.dol", 0x3D4404, 0x4 + +.global lbl_804555A8 +lbl_804555A8: +.incbin "baserom.dol", 0x3D4408, 0x4 + +.global lbl_804555AC +lbl_804555AC: +.incbin "baserom.dol", 0x3D440C, 0x4 + +.global lbl_804555B0 +lbl_804555B0: +.incbin "baserom.dol", 0x3D4410, 0x8 + +.global lbl_804555B8 +lbl_804555B8: +.incbin "baserom.dol", 0x3D4418, 0x4 + +.global lbl_804555BC +lbl_804555BC: +.incbin "baserom.dol", 0x3D441C, 0x4 + +.global lbl_804555C0 +lbl_804555C0: +.incbin "baserom.dol", 0x3D4420, 0x8 + +.global lbl_804555C8 +lbl_804555C8: +.incbin "baserom.dol", 0x3D4428, 0x4 + +.global lbl_804555CC +lbl_804555CC: +.incbin "baserom.dol", 0x3D442C, 0x4 + +.global lbl_804555D0 +lbl_804555D0: +.incbin "baserom.dol", 0x3D4430, 0x4 + +.global lbl_804555D4 +lbl_804555D4: +.incbin "baserom.dol", 0x3D4434, 0x4 + diff --git a/asm/sdata2/JAUInitializer.s b/asm/sdata2/JAUInitializer.s new file mode 100644 index 0000000000..354e9b8be9 --- /dev/null +++ b/asm/sdata2/JAUInitializer.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455810 - 0x80455818 + +.global lbl_80455810 +lbl_80455810: +.incbin "baserom.dol", 0x3D4670, 0x8 + diff --git a/asm/sdata2/JFWDisplay.s b/asm/sdata2/JFWDisplay.s new file mode 100644 index 0000000000..d73d121198 --- /dev/null +++ b/asm/sdata2/JFWDisplay.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455250 - 0x80455278 + +.global lbl_80455250 +lbl_80455250: +.incbin "baserom.dol", 0x3D40B0, 0x4 + +.global lbl_80455254 +lbl_80455254: +.incbin "baserom.dol", 0x3D40B4, 0x4 + +.global lbl_80455258 +lbl_80455258: +.incbin "baserom.dol", 0x3D40B8, 0x8 + +.global lbl_80455260 +lbl_80455260: +.incbin "baserom.dol", 0x3D40C0, 0x8 + +.global lbl_80455268 +lbl_80455268: +.incbin "baserom.dol", 0x3D40C8, 0x8 + +.global lbl_80455270 +lbl_80455270: +.incbin "baserom.dol", 0x3D40D0, 0x8 + diff --git a/asm/sdata2/JFWSystem.s b/asm/sdata2/JFWSystem.s new file mode 100644 index 0000000000..958d60c4a0 --- /dev/null +++ b/asm/sdata2/JFWSystem.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455240 - 0x80455250 + +.global lbl_80455240 +lbl_80455240: +.incbin "baserom.dol", 0x3D40A0, 0x4 + +.global lbl_80455244 +lbl_80455244: +.incbin "baserom.dol", 0x3D40A4, 0x4 + +.global lbl_80455248 +lbl_80455248: +.incbin "baserom.dol", 0x3D40A8, 0x8 + diff --git a/asm/sdata2/JKRExpHeap.s b/asm/sdata2/JKRExpHeap.s new file mode 100644 index 0000000000..6bba50254f --- /dev/null +++ b/asm/sdata2/JKRExpHeap.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455f98 - 0x80455fa8 + +.global lbl_80455F98 +lbl_80455F98: +.incbin "baserom.dol", 0x3D4DF8, 0x8 + +.global lbl_80455FA0 +lbl_80455FA0: +.incbin "baserom.dol", 0x3D4E00, 0x8 + diff --git a/asm/sdata2/JKRSolidHeap.s b/asm/sdata2/JKRSolidHeap.s new file mode 100644 index 0000000000..cefe65354a --- /dev/null +++ b/asm/sdata2/JKRSolidHeap.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455fa8 - 0x80455fc0 + +.global lbl_80455FA8 +lbl_80455FA8: +.incbin "baserom.dol", 0x3D4E08, 0x8 + +.global lbl_80455FB0 +lbl_80455FB0: +.incbin "baserom.dol", 0x3D4E10, 0x8 + +.global lbl_80455FB8 +lbl_80455FB8: +.incbin "baserom.dol", 0x3D4E18, 0x8 + diff --git a/asm/sdata2/JKRThread.s b/asm/sdata2/JKRThread.s new file mode 100644 index 0000000000..fb54b0b3c5 --- /dev/null +++ b/asm/sdata2/JKRThread.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455fc0 - 0x80455fd0 + +.global lbl_80455FC0 +lbl_80455FC0: +.incbin "baserom.dol", 0x3D4E20, 0x4 + +.global lbl_80455FC4 +lbl_80455FC4: +.incbin "baserom.dol", 0x3D4E24, 0x4 + +.global lbl_80455FC8 +lbl_80455FC8: +.incbin "baserom.dol", 0x3D4E28, 0x8 + diff --git a/asm/sdata2/JMATrigonometric.s b/asm/sdata2/JMATrigonometric.s new file mode 100644 index 0000000000..18e7e63769 --- /dev/null +++ b/asm/sdata2/JMATrigonometric.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564d8 - 0x80456508 + +.global lbl_804564D8 +lbl_804564D8: +.incbin "baserom.dol", 0x3D5338, 0x8 + +.global lbl_804564E0 +lbl_804564E0: +.incbin "baserom.dol", 0x3D5340, 0x8 + +.global lbl_804564E8 +lbl_804564E8: +.incbin "baserom.dol", 0x3D5348, 0x8 + +.global lbl_804564F0 +lbl_804564F0: +.incbin "baserom.dol", 0x3D5350, 0x8 + +.global lbl_804564F8 +lbl_804564F8: +.incbin "baserom.dol", 0x3D5358, 0x8 + +.global lbl_80456500 +lbl_80456500: +.incbin "baserom.dol", 0x3D5360, 0x8 + diff --git a/asm/sdata2/JMath.s b/asm/sdata2/JMath.s new file mode 100644 index 0000000000..d06d299450 --- /dev/null +++ b/asm/sdata2/JMath.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804564c8 - 0x804564d8 + +.global lbl_804564C8 +lbl_804564C8: +.incbin "baserom.dol", 0x3D5328, 0x8 + +.global lbl_804564D0 +lbl_804564D0: +.incbin "baserom.dol", 0x3D5330, 0x8 + diff --git a/asm/sdata2/JPABaseShape.s b/asm/sdata2/JPABaseShape.s new file mode 100644 index 0000000000..dbedccdc8c --- /dev/null +++ b/asm/sdata2/JPABaseShape.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804552a8 - 0x804552e0 + +.global lbl_804552A8 +lbl_804552A8: +.incbin "baserom.dol", 0x3D4108, 0x8 + +.global lbl_804552B0 +lbl_804552B0: +.incbin "baserom.dol", 0x3D4110, 0x8 + +.global lbl_804552B8 +lbl_804552B8: +.incbin "baserom.dol", 0x3D4118, 0x4 + +.global lbl_804552BC +lbl_804552BC: +.incbin "baserom.dol", 0x3D411C, 0x4 + +.global lbl_804552C0 +lbl_804552C0: +.incbin "baserom.dol", 0x3D4120, 0x8 + +.global lbl_804552C8 +lbl_804552C8: +.incbin "baserom.dol", 0x3D4128, 0x8 + +.global lbl_804552D0 +lbl_804552D0: +.incbin "baserom.dol", 0x3D4130, 0x4 + +.global lbl_804552D4 +lbl_804552D4: +.incbin "baserom.dol", 0x3D4134, 0x4 + +.global lbl_804552D8 +lbl_804552D8: +.incbin "baserom.dol", 0x3D4138, 0x4 + +.global lbl_804552DC +lbl_804552DC: +.incbin "baserom.dol", 0x3D413C, 0x4 + diff --git a/asm/sdata2/JPAChildShape.s b/asm/sdata2/JPAChildShape.s new file mode 100644 index 0000000000..d1eab47e4f --- /dev/null +++ b/asm/sdata2/JPAChildShape.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455308 - 0x80455310 + +.global lbl_80455308 +lbl_80455308: +.incbin "baserom.dol", 0x3D4168, 0x4 + +.global lbl_8045530C +lbl_8045530C: +.incbin "baserom.dol", 0x3D416C, 0x4 + diff --git a/asm/sdata2/JPADynamicsBlock.s b/asm/sdata2/JPADynamicsBlock.s new file mode 100644 index 0000000000..0de2807776 --- /dev/null +++ b/asm/sdata2/JPADynamicsBlock.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455310 - 0x80455338 + +.global lbl_80455310 +lbl_80455310: +.incbin "baserom.dol", 0x3D4170, 0x4 + +.global lbl_80455314 +lbl_80455314: +.incbin "baserom.dol", 0x3D4174, 0x4 + +.global lbl_80455318 +lbl_80455318: +.incbin "baserom.dol", 0x3D4178, 0x8 + +.global lbl_80455320 +lbl_80455320: +.incbin "baserom.dol", 0x3D4180, 0x8 + +.global lbl_80455328 +lbl_80455328: +.incbin "baserom.dol", 0x3D4188, 0x8 + +.global lbl_80455330 +lbl_80455330: +.incbin "baserom.dol", 0x3D4190, 0x8 + diff --git a/asm/sdata2/JPAEmitter.s b/asm/sdata2/JPAEmitter.s new file mode 100644 index 0000000000..4c318e37be --- /dev/null +++ b/asm/sdata2/JPAEmitter.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455370 - 0x80455388 + +.global lbl_80455370 +lbl_80455370: +.incbin "baserom.dol", 0x3D41D0, 0x4 + +.global lbl_80455374 +lbl_80455374: +.incbin "baserom.dol", 0x3D41D4, 0x4 + +.global lbl_80455378 +lbl_80455378: +.incbin "baserom.dol", 0x3D41D8, 0x4 + +.global lbl_8045537C +lbl_8045537C: +.incbin "baserom.dol", 0x3D41DC, 0x4 + +.global lbl_80455380 +lbl_80455380: +.incbin "baserom.dol", 0x3D41E0, 0x8 + diff --git a/asm/sdata2/JPAEmitterManager.s b/asm/sdata2/JPAEmitterManager.s new file mode 100644 index 0000000000..770c7d250a --- /dev/null +++ b/asm/sdata2/JPAEmitterManager.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455358 - 0x80455370 + +.global lbl_80455358 +lbl_80455358: +.incbin "baserom.dol", 0x3D41B8, 0x4 + +.global lbl_8045535C +lbl_8045535C: +.incbin "baserom.dol", 0x3D41BC, 0x4 + +.global lbl_80455360 +lbl_80455360: +.incbin "baserom.dol", 0x3D41C0, 0x4 + +.global lbl_80455364 +lbl_80455364: +.incbin "baserom.dol", 0x3D41C4, 0x4 + +.global lbl_80455368 +lbl_80455368: +.incbin "baserom.dol", 0x3D41C8, 0x8 + diff --git a/asm/sdata2/JPAExtraShape.s b/asm/sdata2/JPAExtraShape.s new file mode 100644 index 0000000000..6b609d8c43 --- /dev/null +++ b/asm/sdata2/JPAExtraShape.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804552e0 - 0x80455308 + +.global lbl_804552E0 +lbl_804552E0: +.incbin "baserom.dol", 0x3D4140, 0x8 + +.global lbl_804552E8 +lbl_804552E8: +.incbin "baserom.dol", 0x3D4148, 0x8 + +.global lbl_804552F0 +lbl_804552F0: +.incbin "baserom.dol", 0x3D4150, 0x4 + +.global lbl_804552F4 +lbl_804552F4: +.incbin "baserom.dol", 0x3D4154, 0x4 + +.global lbl_804552F8 +lbl_804552F8: +.incbin "baserom.dol", 0x3D4158, 0x4 + +.global lbl_804552FC +lbl_804552FC: +.incbin "baserom.dol", 0x3D415C, 0x4 + +.global lbl_80455300 +lbl_80455300: +.incbin "baserom.dol", 0x3D4160, 0x8 + diff --git a/asm/sdata2/JPAFieldBlock.s b/asm/sdata2/JPAFieldBlock.s new file mode 100644 index 0000000000..39d76c4b65 --- /dev/null +++ b/asm/sdata2/JPAFieldBlock.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455338 - 0x80455350 + +.global lbl_80455338 +lbl_80455338: +.incbin "baserom.dol", 0x3D4198, 0x4 + +.global lbl_8045533C +lbl_8045533C: +.incbin "baserom.dol", 0x3D419C, 0x4 + +.global lbl_80455340 +lbl_80455340: +.incbin "baserom.dol", 0x3D41A0, 0x4 + +.global lbl_80455344 +lbl_80455344: +.incbin "baserom.dol", 0x3D41A4, 0x4 + +.global lbl_80455348 +lbl_80455348: +.incbin "baserom.dol", 0x3D41A8, 0x4 + +.global lbl_8045534C +lbl_8045534C: +.incbin "baserom.dol", 0x3D41AC, 0x4 + diff --git a/asm/sdata2/JPAKeyBlock.s b/asm/sdata2/JPAKeyBlock.s new file mode 100644 index 0000000000..5034d45c6e --- /dev/null +++ b/asm/sdata2/JPAKeyBlock.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455350 - 0x80455358 + +.global lbl_80455350 +lbl_80455350: +.incbin "baserom.dol", 0x3D41B0, 0x8 + diff --git a/asm/sdata2/JPAMath.s b/asm/sdata2/JPAMath.s new file mode 100644 index 0000000000..a1b4388981 --- /dev/null +++ b/asm/sdata2/JPAMath.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553b8 - 0x804553c8 + +.global lbl_804553B8 +lbl_804553B8: +.incbin "baserom.dol", 0x3D4218, 0x4 + +.global lbl_804553BC +lbl_804553BC: +.incbin "baserom.dol", 0x3D421C, 0x4 + +.global lbl_804553C0 +lbl_804553C0: +.incbin "baserom.dol", 0x3D4220, 0x8 + diff --git a/asm/sdata2/JPAParticle.s b/asm/sdata2/JPAParticle.s new file mode 100644 index 0000000000..156f93dada --- /dev/null +++ b/asm/sdata2/JPAParticle.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455388 - 0x804553b8 + +.global lbl_80455388 +lbl_80455388: +.incbin "baserom.dol", 0x3D41E8, 0x4 + +.global lbl_8045538C +lbl_8045538C: +.incbin "baserom.dol", 0x3D41EC, 0x4 + +.global lbl_80455390 +lbl_80455390: +.incbin "baserom.dol", 0x3D41F0, 0x4 + +.global lbl_80455394 +lbl_80455394: +.incbin "baserom.dol", 0x3D41F4, 0x4 + +.global lbl_80455398 +lbl_80455398: +.incbin "baserom.dol", 0x3D41F8, 0x4 + +.global lbl_8045539C +lbl_8045539C: +.incbin "baserom.dol", 0x3D41FC, 0x4 + +.global lbl_804553A0 +lbl_804553A0: +.incbin "baserom.dol", 0x3D4200, 0x8 + +.global lbl_804553A8 +lbl_804553A8: +.incbin "baserom.dol", 0x3D4208, 0x8 + +.global lbl_804553B0 +lbl_804553B0: +.incbin "baserom.dol", 0x3D4210, 0x8 + diff --git a/asm/sdata2/JPAResource.s b/asm/sdata2/JPAResource.s new file mode 100644 index 0000000000..0cf96e2934 --- /dev/null +++ b/asm/sdata2/JPAResource.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455290 - 0x804552a8 + +.global lbl_80455290 +lbl_80455290: +.incbin "baserom.dol", 0x3D40F0, 0x4 + +.global lbl_80455294 +lbl_80455294: +.incbin "baserom.dol", 0x3D40F4, 0x4 + +.global lbl_80455298 +lbl_80455298: +.incbin "baserom.dol", 0x3D40F8, 0x4 + +.global lbl_8045529C +lbl_8045529C: +.incbin "baserom.dol", 0x3D40FC, 0x4 + +.global lbl_804552A0 +lbl_804552A0: +.incbin "baserom.dol", 0x3D4100, 0x8 + diff --git a/asm/sdata2/JSGActor.s b/asm/sdata2/JSGActor.s new file mode 100644 index 0000000000..9fe195af2d --- /dev/null +++ b/asm/sdata2/JSGActor.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553c8 - 0x804553d0 + +.global lbl_804553C8 +lbl_804553C8: +.incbin "baserom.dol", 0x3D4228, 0x8 + diff --git a/asm/sdata2/JSGAmbientLight.s b/asm/sdata2/JSGAmbientLight.s new file mode 100644 index 0000000000..d8d0826c18 --- /dev/null +++ b/asm/sdata2/JSGAmbientLight.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553d0 - 0x804553d8 + +.global lbl_804553D0 +lbl_804553D0: +.incbin "baserom.dol", 0x3D4230, 0x8 + diff --git a/asm/sdata2/JSGCamera.s b/asm/sdata2/JSGCamera.s new file mode 100644 index 0000000000..59a15dc6d4 --- /dev/null +++ b/asm/sdata2/JSGCamera.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553d8 - 0x804553e0 + +.global lbl_804553D8 +lbl_804553D8: +.incbin "baserom.dol", 0x3D4238, 0x8 + diff --git a/asm/sdata2/JSGFog.s b/asm/sdata2/JSGFog.s new file mode 100644 index 0000000000..27b0ac7092 --- /dev/null +++ b/asm/sdata2/JSGFog.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553e0 - 0x804553e8 + +.global lbl_804553E0 +lbl_804553E0: +.incbin "baserom.dol", 0x3D4240, 0x4 + +.global lbl_804553E4 +lbl_804553E4: +.incbin "baserom.dol", 0x3D4244, 0x4 + diff --git a/asm/sdata2/JSGLight.s b/asm/sdata2/JSGLight.s new file mode 100644 index 0000000000..541313e2c5 --- /dev/null +++ b/asm/sdata2/JSGLight.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553e8 - 0x804553f0 + +.global lbl_804553E8 +lbl_804553E8: +.incbin "baserom.dol", 0x3D4248, 0x8 + diff --git a/asm/sdata2/JSGObject.s b/asm/sdata2/JSGObject.s new file mode 100644 index 0000000000..c79e7de873 --- /dev/null +++ b/asm/sdata2/JSGObject.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553f0 - 0x804553f8 + +.global lbl_804553F0 +lbl_804553F0: +.incbin "baserom.dol", 0x3D4250, 0x8 + diff --git a/asm/sdata2/JUTAssert.s b/asm/sdata2/JUTAssert.s new file mode 100644 index 0000000000..77c4990e0d --- /dev/null +++ b/asm/sdata2/JUTAssert.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804560b8 - 0x804560d0 + +.global lbl_804560B8 +lbl_804560B8: +.incbin "baserom.dol", 0x3D4F18, 0x4 + +.global lbl_804560BC +lbl_804560BC: +.incbin "baserom.dol", 0x3D4F1C, 0x4 + +.global lbl_804560C0 +lbl_804560C0: +.incbin "baserom.dol", 0x3D4F20, 0x8 + +.global lbl_804560C8 +lbl_804560C8: +.incbin "baserom.dol", 0x3D4F28, 0x8 + diff --git a/asm/sdata2/JUTCacheFont.s b/asm/sdata2/JUTCacheFont.s new file mode 100644 index 0000000000..99870e1306 --- /dev/null +++ b/asm/sdata2/JUTCacheFont.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455fd0 - 0x80455fd8 + +.global lbl_80455FD0 +lbl_80455FD0: +.incbin "baserom.dol", 0x3D4E30, 0x8 + diff --git a/asm/sdata2/JUTConsole.s b/asm/sdata2/JUTConsole.s new file mode 100644 index 0000000000..961bbcc793 --- /dev/null +++ b/asm/sdata2/JUTConsole.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456118 - 0x80456148 + +.global lbl_80456118 +lbl_80456118: +.incbin "baserom.dol", 0x3D4F78, 0x4 + +.global lbl_8045611C +lbl_8045611C: +.incbin "baserom.dol", 0x3D4F7C, 0x4 + +.global lbl_80456120 +lbl_80456120: +.incbin "baserom.dol", 0x3D4F80, 0x4 + +.global lbl_80456124 +lbl_80456124: +.incbin "baserom.dol", 0x3D4F84, 0x4 + +.global lbl_80456128 +lbl_80456128: +.incbin "baserom.dol", 0x3D4F88, 0x4 + +.global lbl_8045612C +lbl_8045612C: +.incbin "baserom.dol", 0x3D4F8C, 0x4 + +.global lbl_80456130 +lbl_80456130: +.incbin "baserom.dol", 0x3D4F90, 0x8 + +.global lbl_80456138 +lbl_80456138: +.incbin "baserom.dol", 0x3D4F98, 0x8 + +.global lbl_80456140 +lbl_80456140: +.incbin "baserom.dol", 0x3D4FA0, 0x8 + diff --git a/asm/sdata2/JUTDbPrint.s b/asm/sdata2/JUTDbPrint.s new file mode 100644 index 0000000000..cf9bd826d7 --- /dev/null +++ b/asm/sdata2/JUTDbPrint.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456008 - 0x80456018 + +.global lbl_80456008 +lbl_80456008: +.incbin "baserom.dol", 0x3D4E68, 0x4 + +.global lbl_8045600C +lbl_8045600C: +.incbin "baserom.dol", 0x3D4E6C, 0x4 + +.global lbl_80456010 +lbl_80456010: +.incbin "baserom.dol", 0x3D4E70, 0x8 + diff --git a/asm/sdata2/JUTDirectPrint.s b/asm/sdata2/JUTDirectPrint.s new file mode 100644 index 0000000000..baad0b847e --- /dev/null +++ b/asm/sdata2/JUTDirectPrint.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456060 - 0x804560b8 + +.global lbl_80456060 +lbl_80456060: +.incbin "baserom.dol", 0x3D4EC0, 0x8 + +.global lbl_80456068 +lbl_80456068: +.incbin "baserom.dol", 0x3D4EC8, 0x8 + +.global lbl_80456070 +lbl_80456070: +.incbin "baserom.dol", 0x3D4ED0, 0x8 + +.global lbl_80456078 +lbl_80456078: +.incbin "baserom.dol", 0x3D4ED8, 0x8 + +.global lbl_80456080 +lbl_80456080: +.incbin "baserom.dol", 0x3D4EE0, 0x8 + +.global lbl_80456088 +lbl_80456088: +.incbin "baserom.dol", 0x3D4EE8, 0x8 + +.global lbl_80456090 +lbl_80456090: +.incbin "baserom.dol", 0x3D4EF0, 0x8 + +.global lbl_80456098 +lbl_80456098: +.incbin "baserom.dol", 0x3D4EF8, 0x8 + +.global lbl_804560A0 +lbl_804560A0: +.incbin "baserom.dol", 0x3D4F00, 0x8 + +.global lbl_804560A8 +lbl_804560A8: +.incbin "baserom.dol", 0x3D4F08, 0x8 + +.global lbl_804560B0 +lbl_804560B0: +.incbin "baserom.dol", 0x3D4F10, 0x8 + diff --git a/asm/sdata2/JUTException.s b/asm/sdata2/JUTException.s new file mode 100644 index 0000000000..eb4006a116 --- /dev/null +++ b/asm/sdata2/JUTException.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456050 - 0x80456060 + +.global lbl_80456050 +lbl_80456050: +.incbin "baserom.dol", 0x3D4EB0, 0x4 + +.global lbl_80456054 +lbl_80456054: +.incbin "baserom.dol", 0x3D4EB4, 0x4 + +.global lbl_80456058 +lbl_80456058: +.incbin "baserom.dol", 0x3D4EB8, 0x8 + diff --git a/asm/sdata2/JUTFader.s b/asm/sdata2/JUTFader.s new file mode 100644 index 0000000000..70cf62bf0c --- /dev/null +++ b/asm/sdata2/JUTFader.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804560d0 - 0x804560d8 + +.global lbl_804560D0 +lbl_804560D0: +.incbin "baserom.dol", 0x3D4F30, 0x8 + diff --git a/asm/sdata2/JUTGamePad.s b/asm/sdata2/JUTGamePad.s new file mode 100644 index 0000000000..9f398a3bf2 --- /dev/null +++ b/asm/sdata2/JUTGamePad.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456018 - 0x80456050 + +.global lbl_80456018 +lbl_80456018: +.incbin "baserom.dol", 0x3D4E78, 0x8 + +.global lbl_80456020 +lbl_80456020: +.incbin "baserom.dol", 0x3D4E80, 0x8 + +.global lbl_80456028 +lbl_80456028: +.incbin "baserom.dol", 0x3D4E88, 0x8 + +.global lbl_80456030 +lbl_80456030: +.incbin "baserom.dol", 0x3D4E90, 0x8 + +.global lbl_80456038 +lbl_80456038: +.incbin "baserom.dol", 0x3D4E98, 0x8 + +.global lbl_80456040 +lbl_80456040: +.incbin "baserom.dol", 0x3D4EA0, 0x8 + +.global lbl_80456048 +lbl_80456048: +.incbin "baserom.dol", 0x3D4EA8, 0x4 + +.global lbl_8045604C +lbl_8045604C: +.incbin "baserom.dol", 0x3D4EAC, 0x4 + diff --git a/asm/sdata2/JUTProcBar.s b/asm/sdata2/JUTProcBar.s new file mode 100644 index 0000000000..20c0564465 --- /dev/null +++ b/asm/sdata2/JUTProcBar.s @@ -0,0 +1,55 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804560d8 - 0x80456118 + +.global lbl_804560D8 +lbl_804560D8: +.incbin "baserom.dol", 0x3D4F38, 0x4 + +.global lbl_804560DC +lbl_804560DC: +.incbin "baserom.dol", 0x3D4F3C, 0x4 + +.global lbl_804560E0 +lbl_804560E0: +.incbin "baserom.dol", 0x3D4F40, 0x8 + +.global lbl_804560E8 +lbl_804560E8: +.incbin "baserom.dol", 0x3D4F48, 0x8 + +.global lbl_804560F0 +lbl_804560F0: +.incbin "baserom.dol", 0x3D4F50, 0x4 + +.global lbl_804560F4 +lbl_804560F4: +.incbin "baserom.dol", 0x3D4F54, 0x4 + +.global lbl_804560F8 +lbl_804560F8: +.incbin "baserom.dol", 0x3D4F58, 0x4 + +.global lbl_804560FC +lbl_804560FC: +.incbin "baserom.dol", 0x3D4F5C, 0x4 + +.global lbl_80456100 +lbl_80456100: +.incbin "baserom.dol", 0x3D4F60, 0x4 + +.global lbl_80456104 +lbl_80456104: +.incbin "baserom.dol", 0x3D4F64, 0x4 + +.global lbl_80456108 +lbl_80456108: +.incbin "baserom.dol", 0x3D4F68, 0x8 + +.global lbl_80456110 +lbl_80456110: +.incbin "baserom.dol", 0x3D4F70, 0x4 + +.global lbl_80456114 +lbl_80456114: +.incbin "baserom.dol", 0x3D4F74, 0x4 + diff --git a/asm/sdata2/JUTResFont.s b/asm/sdata2/JUTResFont.s new file mode 100644 index 0000000000..ea442d1bb2 --- /dev/null +++ b/asm/sdata2/JUTResFont.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455ff0 - 0x80456008 + +.global lbl_80455FF0 +lbl_80455FF0: +.incbin "baserom.dol", 0x3D4E50, 0x8 + +.global lbl_80455FF8 +lbl_80455FF8: +.incbin "baserom.dol", 0x3D4E58, 0x8 + +.global lbl_80456000 +lbl_80456000: +.incbin "baserom.dol", 0x3D4E60, 0x8 + diff --git a/asm/sdata2/JUTTexture.s b/asm/sdata2/JUTTexture.s new file mode 100644 index 0000000000..0af3766478 --- /dev/null +++ b/asm/sdata2/JUTTexture.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455fd8 - 0x80455ff0 + +.global lbl_80455FD8 +lbl_80455FD8: +.incbin "baserom.dol", 0x3D4E38, 0x4 + +.global lbl_80455FDC +lbl_80455FDC: +.incbin "baserom.dol", 0x3D4E3C, 0x4 + +.global lbl_80455FE0 +lbl_80455FE0: +.incbin "baserom.dol", 0x3D4E40, 0x8 + +.global lbl_80455FE8 +lbl_80455FE8: +.incbin "baserom.dol", 0x3D4E48, 0x8 + diff --git a/asm/sdata2/Padclamp.s b/asm/sdata2/Padclamp.s new file mode 100644 index 0000000000..d70b33505f --- /dev/null +++ b/asm/sdata2/Padclamp.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456560 - 0x80456580 + +.global lbl_80456560 +lbl_80456560: +.incbin "baserom.dol", 0x3D53C0, 0x8 + +.global lbl_80456568 +lbl_80456568: +.incbin "baserom.dol", 0x3D53C8, 0x8 + +.global lbl_80456570 +lbl_80456570: +.incbin "baserom.dol", 0x3D53D0, 0x8 + +.global lbl_80456578 +lbl_80456578: +.incbin "baserom.dol", 0x3D53D8, 0x8 + diff --git a/asm/sdata2/Z2Audience.s b/asm/sdata2/Z2Audience.s new file mode 100644 index 0000000000..a5cf3567b7 --- /dev/null +++ b/asm/sdata2/Z2Audience.s @@ -0,0 +1,147 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455aa0 - 0x80455b38 + +.global lbl_80455AA0 +lbl_80455AA0: +.incbin "baserom.dol", 0x3D4900, 0x4 + +.global lbl_80455AA4 +lbl_80455AA4: +.incbin "baserom.dol", 0x3D4904, 0x4 + +.global lbl_80455AA8 +lbl_80455AA8: +.incbin "baserom.dol", 0x3D4908, 0x4 + +.global lbl_80455AAC +lbl_80455AAC: +.incbin "baserom.dol", 0x3D490C, 0x4 + +.global lbl_80455AB0 +lbl_80455AB0: +.incbin "baserom.dol", 0x3D4910, 0x4 + +.global lbl_80455AB4 +lbl_80455AB4: +.incbin "baserom.dol", 0x3D4914, 0x4 + +.global lbl_80455AB8 +lbl_80455AB8: +.incbin "baserom.dol", 0x3D4918, 0x4 + +.global lbl_80455ABC +lbl_80455ABC: +.incbin "baserom.dol", 0x3D491C, 0x4 + +.global lbl_80455AC0 +lbl_80455AC0: +.incbin "baserom.dol", 0x3D4920, 0x4 + +.global lbl_80455AC4 +lbl_80455AC4: +.incbin "baserom.dol", 0x3D4924, 0x4 + +.global lbl_80455AC8 +lbl_80455AC8: +.incbin "baserom.dol", 0x3D4928, 0x8 + +.global lbl_80455AD0 +lbl_80455AD0: +.incbin "baserom.dol", 0x3D4930, 0x8 + +.global lbl_80455AD8 +lbl_80455AD8: +.incbin "baserom.dol", 0x3D4938, 0x4 + +.global lbl_80455ADC +lbl_80455ADC: +.incbin "baserom.dol", 0x3D493C, 0x4 + +.global lbl_80455AE0 +lbl_80455AE0: +.incbin "baserom.dol", 0x3D4940, 0x4 + +.global lbl_80455AE4 +lbl_80455AE4: +.incbin "baserom.dol", 0x3D4944, 0x4 + +.global lbl_80455AE8 +lbl_80455AE8: +.incbin "baserom.dol", 0x3D4948, 0x4 + +.global lbl_80455AEC +lbl_80455AEC: +.incbin "baserom.dol", 0x3D494C, 0x4 + +.global lbl_80455AF0 +lbl_80455AF0: +.incbin "baserom.dol", 0x3D4950, 0x4 + +.global lbl_80455AF4 +lbl_80455AF4: +.incbin "baserom.dol", 0x3D4954, 0x4 + +.global lbl_80455AF8 +lbl_80455AF8: +.incbin "baserom.dol", 0x3D4958, 0x4 + +.global lbl_80455AFC +lbl_80455AFC: +.incbin "baserom.dol", 0x3D495C, 0x4 + +.global lbl_80455B00 +lbl_80455B00: +.incbin "baserom.dol", 0x3D4960, 0x4 + +.global lbl_80455B04 +lbl_80455B04: +.incbin "baserom.dol", 0x3D4964, 0x4 + +.global lbl_80455B08 +lbl_80455B08: +.incbin "baserom.dol", 0x3D4968, 0x4 + +.global lbl_80455B0C +lbl_80455B0C: +.incbin "baserom.dol", 0x3D496C, 0x4 + +.global lbl_80455B10 +lbl_80455B10: +.incbin "baserom.dol", 0x3D4970, 0x4 + +.global lbl_80455B14 +lbl_80455B14: +.incbin "baserom.dol", 0x3D4974, 0x4 + +.global lbl_80455B18 +lbl_80455B18: +.incbin "baserom.dol", 0x3D4978, 0x4 + +.global lbl_80455B1C +lbl_80455B1C: +.incbin "baserom.dol", 0x3D497C, 0x4 + +.global lbl_80455B20 +lbl_80455B20: +.incbin "baserom.dol", 0x3D4980, 0x4 + +.global lbl_80455B24 +lbl_80455B24: +.incbin "baserom.dol", 0x3D4984, 0x4 + +.global lbl_80455B28 +lbl_80455B28: +.incbin "baserom.dol", 0x3D4988, 0x4 + +.global lbl_80455B2C +lbl_80455B2C: +.incbin "baserom.dol", 0x3D498C, 0x4 + +.global lbl_80455B30 +lbl_80455B30: +.incbin "baserom.dol", 0x3D4990, 0x4 + +.global lbl_80455B34 +lbl_80455B34: +.incbin "baserom.dol", 0x3D4994, 0x4 + diff --git a/asm/sdata2/Z2AudioMgr.s b/asm/sdata2/Z2AudioMgr.s new file mode 100644 index 0000000000..809009d722 --- /dev/null +++ b/asm/sdata2/Z2AudioMgr.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455f58 - 0x80455f68 + +.global lbl_80455F58 +lbl_80455F58: +.incbin "baserom.dol", 0x3D4DB8, 0x4 + +.global lbl_80455F5C +lbl_80455F5C: +.incbin "baserom.dol", 0x3D4DBC, 0x4 + +.global lbl_80455F60 +lbl_80455F60: +.incbin "baserom.dol", 0x3D4DC0, 0x8 + diff --git a/asm/sdata2/Z2Calc.s b/asm/sdata2/Z2Calc.s new file mode 100644 index 0000000000..1a3d5ed461 --- /dev/null +++ b/asm/sdata2/Z2Calc.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455820 - 0x80455838 + +.global lbl_80455820 +lbl_80455820: +.incbin "baserom.dol", 0x3D4680, 0x4 + +.global lbl_80455824 +lbl_80455824: +.incbin "baserom.dol", 0x3D4684, 0x4 + +.global lbl_80455828 +lbl_80455828: +.incbin "baserom.dol", 0x3D4688, 0x4 + +.global lbl_8045582C +lbl_8045582C: +.incbin "baserom.dol", 0x3D468C, 0x4 + +.global lbl_80455830 +lbl_80455830: +.incbin "baserom.dol", 0x3D4690, 0x4 + +.global lbl_80455834 +lbl_80455834: +.incbin "baserom.dol", 0x3D4694, 0x4 + diff --git a/asm/sdata2/Z2Creature.s b/asm/sdata2/Z2Creature.s new file mode 100644 index 0000000000..9ee174bbf6 --- /dev/null +++ b/asm/sdata2/Z2Creature.s @@ -0,0 +1,187 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455bd8 - 0x80455c98 + +.global lbl_80455BD8 +lbl_80455BD8: +.incbin "baserom.dol", 0x3D4A38, 0x4 + +.global lbl_80455BDC +lbl_80455BDC: +.incbin "baserom.dol", 0x3D4A3C, 0x4 + +.global lbl_80455BE0 +lbl_80455BE0: +.incbin "baserom.dol", 0x3D4A40, 0x4 + +.global lbl_80455BE4 +lbl_80455BE4: +.incbin "baserom.dol", 0x3D4A44, 0x4 + +.global lbl_80455BE8 +lbl_80455BE8: +.incbin "baserom.dol", 0x3D4A48, 0x4 + +.global lbl_80455BEC +lbl_80455BEC: +.incbin "baserom.dol", 0x3D4A4C, 0x4 + +.global lbl_80455BF0 +lbl_80455BF0: +.incbin "baserom.dol", 0x3D4A50, 0x4 + +.global lbl_80455BF4 +lbl_80455BF4: +.incbin "baserom.dol", 0x3D4A54, 0x4 + +.global lbl_80455BF8 +lbl_80455BF8: +.incbin "baserom.dol", 0x3D4A58, 0x4 + +.global lbl_80455BFC +lbl_80455BFC: +.incbin "baserom.dol", 0x3D4A5C, 0x4 + +.global lbl_80455C00 +lbl_80455C00: +.incbin "baserom.dol", 0x3D4A60, 0x4 + +.global lbl_80455C04 +lbl_80455C04: +.incbin "baserom.dol", 0x3D4A64, 0x4 + +.global lbl_80455C08 +lbl_80455C08: +.incbin "baserom.dol", 0x3D4A68, 0x4 + +.global lbl_80455C0C +lbl_80455C0C: +.incbin "baserom.dol", 0x3D4A6C, 0x4 + +.global lbl_80455C10 +lbl_80455C10: +.incbin "baserom.dol", 0x3D4A70, 0x4 + +.global lbl_80455C14 +lbl_80455C14: +.incbin "baserom.dol", 0x3D4A74, 0x4 + +.global lbl_80455C18 +lbl_80455C18: +.incbin "baserom.dol", 0x3D4A78, 0x4 + +.global lbl_80455C1C +lbl_80455C1C: +.incbin "baserom.dol", 0x3D4A7C, 0x4 + +.global lbl_80455C20 +lbl_80455C20: +.incbin "baserom.dol", 0x3D4A80, 0x8 + +.global lbl_80455C28 +lbl_80455C28: +.incbin "baserom.dol", 0x3D4A88, 0x8 + +.global lbl_80455C30 +lbl_80455C30: +.incbin "baserom.dol", 0x3D4A90, 0x4 + +.global lbl_80455C34 +lbl_80455C34: +.incbin "baserom.dol", 0x3D4A94, 0x4 + +.global lbl_80455C38 +lbl_80455C38: +.incbin "baserom.dol", 0x3D4A98, 0x4 + +.global lbl_80455C3C +lbl_80455C3C: +.incbin "baserom.dol", 0x3D4A9C, 0x4 + +.global lbl_80455C40 +lbl_80455C40: +.incbin "baserom.dol", 0x3D4AA0, 0x4 + +.global lbl_80455C44 +lbl_80455C44: +.incbin "baserom.dol", 0x3D4AA4, 0x4 + +.global lbl_80455C48 +lbl_80455C48: +.incbin "baserom.dol", 0x3D4AA8, 0x4 + +.global lbl_80455C4C +lbl_80455C4C: +.incbin "baserom.dol", 0x3D4AAC, 0x4 + +.global lbl_80455C50 +lbl_80455C50: +.incbin "baserom.dol", 0x3D4AB0, 0x4 + +.global lbl_80455C54 +lbl_80455C54: +.incbin "baserom.dol", 0x3D4AB4, 0x4 + +.global lbl_80455C58 +lbl_80455C58: +.incbin "baserom.dol", 0x3D4AB8, 0x4 + +.global lbl_80455C5C +lbl_80455C5C: +.incbin "baserom.dol", 0x3D4ABC, 0x4 + +.global lbl_80455C60 +lbl_80455C60: +.incbin "baserom.dol", 0x3D4AC0, 0x4 + +.global lbl_80455C64 +lbl_80455C64: +.incbin "baserom.dol", 0x3D4AC4, 0x4 + +.global lbl_80455C68 +lbl_80455C68: +.incbin "baserom.dol", 0x3D4AC8, 0x4 + +.global lbl_80455C6C +lbl_80455C6C: +.incbin "baserom.dol", 0x3D4ACC, 0x4 + +.global lbl_80455C70 +lbl_80455C70: +.incbin "baserom.dol", 0x3D4AD0, 0x4 + +.global lbl_80455C74 +lbl_80455C74: +.incbin "baserom.dol", 0x3D4AD4, 0x4 + +.global lbl_80455C78 +lbl_80455C78: +.incbin "baserom.dol", 0x3D4AD8, 0x4 + +.global lbl_80455C7C +lbl_80455C7C: +.incbin "baserom.dol", 0x3D4ADC, 0x4 + +.global lbl_80455C80 +lbl_80455C80: +.incbin "baserom.dol", 0x3D4AE0, 0x4 + +.global lbl_80455C84 +lbl_80455C84: +.incbin "baserom.dol", 0x3D4AE4, 0x4 + +.global lbl_80455C88 +lbl_80455C88: +.incbin "baserom.dol", 0x3D4AE8, 0x4 + +.global lbl_80455C8C +lbl_80455C8C: +.incbin "baserom.dol", 0x3D4AEC, 0x4 + +.global lbl_80455C90 +lbl_80455C90: +.incbin "baserom.dol", 0x3D4AF0, 0x4 + +.global lbl_80455C94 +lbl_80455C94: +.incbin "baserom.dol", 0x3D4AF4, 0x4 + diff --git a/asm/sdata2/Z2EnvSeMgr.s b/asm/sdata2/Z2EnvSeMgr.s new file mode 100644 index 0000000000..3996a31b21 --- /dev/null +++ b/asm/sdata2/Z2EnvSeMgr.s @@ -0,0 +1,275 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455d40 - 0x80455e60 + +.global lbl_80455D40 +lbl_80455D40: +.incbin "baserom.dol", 0x3D4BA0, 0x4 + +.global lbl_80455D44 +lbl_80455D44: +.incbin "baserom.dol", 0x3D4BA4, 0x4 + +.global lbl_80455D48 +lbl_80455D48: +.incbin "baserom.dol", 0x3D4BA8, 0x4 + +.global lbl_80455D4C +lbl_80455D4C: +.incbin "baserom.dol", 0x3D4BAC, 0x4 + +.global lbl_80455D50 +lbl_80455D50: +.incbin "baserom.dol", 0x3D4BB0, 0x8 + +.global lbl_80455D58 +lbl_80455D58: +.incbin "baserom.dol", 0x3D4BB8, 0x8 + +.global lbl_80455D60 +lbl_80455D60: +.incbin "baserom.dol", 0x3D4BC0, 0x4 + +.global lbl_80455D64 +lbl_80455D64: +.incbin "baserom.dol", 0x3D4BC4, 0x4 + +.global lbl_80455D68 +lbl_80455D68: +.incbin "baserom.dol", 0x3D4BC8, 0x4 + +.global lbl_80455D6C +lbl_80455D6C: +.incbin "baserom.dol", 0x3D4BCC, 0x4 + +.global lbl_80455D70 +lbl_80455D70: +.incbin "baserom.dol", 0x3D4BD0, 0x4 + +.global lbl_80455D74 +lbl_80455D74: +.incbin "baserom.dol", 0x3D4BD4, 0x4 + +.global lbl_80455D78 +lbl_80455D78: +.incbin "baserom.dol", 0x3D4BD8, 0x4 + +.global lbl_80455D7C +lbl_80455D7C: +.incbin "baserom.dol", 0x3D4BDC, 0x4 + +.global lbl_80455D80 +lbl_80455D80: +.incbin "baserom.dol", 0x3D4BE0, 0x4 + +.global lbl_80455D84 +lbl_80455D84: +.incbin "baserom.dol", 0x3D4BE4, 0x4 + +.global lbl_80455D88 +lbl_80455D88: +.incbin "baserom.dol", 0x3D4BE8, 0x4 + +.global lbl_80455D8C +lbl_80455D8C: +.incbin "baserom.dol", 0x3D4BEC, 0x4 + +.global lbl_80455D90 +lbl_80455D90: +.incbin "baserom.dol", 0x3D4BF0, 0x4 + +.global lbl_80455D94 +lbl_80455D94: +.incbin "baserom.dol", 0x3D4BF4, 0x4 + +.global lbl_80455D98 +lbl_80455D98: +.incbin "baserom.dol", 0x3D4BF8, 0x4 + +.global lbl_80455D9C +lbl_80455D9C: +.incbin "baserom.dol", 0x3D4BFC, 0x4 + +.global lbl_80455DA0 +lbl_80455DA0: +.incbin "baserom.dol", 0x3D4C00, 0x4 + +.global lbl_80455DA4 +lbl_80455DA4: +.incbin "baserom.dol", 0x3D4C04, 0x4 + +.global lbl_80455DA8 +lbl_80455DA8: +.incbin "baserom.dol", 0x3D4C08, 0x4 + +.global lbl_80455DAC +lbl_80455DAC: +.incbin "baserom.dol", 0x3D4C0C, 0x4 + +.global lbl_80455DB0 +lbl_80455DB0: +.incbin "baserom.dol", 0x3D4C10, 0x4 + +.global lbl_80455DB4 +lbl_80455DB4: +.incbin "baserom.dol", 0x3D4C14, 0x4 + +.global lbl_80455DB8 +lbl_80455DB8: +.incbin "baserom.dol", 0x3D4C18, 0x4 + +.global lbl_80455DBC +lbl_80455DBC: +.incbin "baserom.dol", 0x3D4C1C, 0x4 + +.global lbl_80455DC0 +lbl_80455DC0: +.incbin "baserom.dol", 0x3D4C20, 0x4 + +.global lbl_80455DC4 +lbl_80455DC4: +.incbin "baserom.dol", 0x3D4C24, 0x4 + +.global lbl_80455DC8 +lbl_80455DC8: +.incbin "baserom.dol", 0x3D4C28, 0x4 + +.global lbl_80455DCC +lbl_80455DCC: +.incbin "baserom.dol", 0x3D4C2C, 0x4 + +.global lbl_80455DD0 +lbl_80455DD0: +.incbin "baserom.dol", 0x3D4C30, 0x4 + +.global lbl_80455DD4 +lbl_80455DD4: +.incbin "baserom.dol", 0x3D4C34, 0x4 + +.global lbl_80455DD8 +lbl_80455DD8: +.incbin "baserom.dol", 0x3D4C38, 0x4 + +.global lbl_80455DDC +lbl_80455DDC: +.incbin "baserom.dol", 0x3D4C3C, 0x4 + +.global lbl_80455DE0 +lbl_80455DE0: +.incbin "baserom.dol", 0x3D4C40, 0x4 + +.global lbl_80455DE4 +lbl_80455DE4: +.incbin "baserom.dol", 0x3D4C44, 0x4 + +.global lbl_80455DE8 +lbl_80455DE8: +.incbin "baserom.dol", 0x3D4C48, 0x4 + +.global lbl_80455DEC +lbl_80455DEC: +.incbin "baserom.dol", 0x3D4C4C, 0x4 + +.global lbl_80455DF0 +lbl_80455DF0: +.incbin "baserom.dol", 0x3D4C50, 0x4 + +.global lbl_80455DF4 +lbl_80455DF4: +.incbin "baserom.dol", 0x3D4C54, 0x4 + +.global lbl_80455DF8 +lbl_80455DF8: +.incbin "baserom.dol", 0x3D4C58, 0x4 + +.global lbl_80455DFC +lbl_80455DFC: +.incbin "baserom.dol", 0x3D4C5C, 0x4 + +.global lbl_80455E00 +lbl_80455E00: +.incbin "baserom.dol", 0x3D4C60, 0x4 + +.global lbl_80455E04 +lbl_80455E04: +.incbin "baserom.dol", 0x3D4C64, 0x4 + +.global lbl_80455E08 +lbl_80455E08: +.incbin "baserom.dol", 0x3D4C68, 0x4 + +.global lbl_80455E0C +lbl_80455E0C: +.incbin "baserom.dol", 0x3D4C6C, 0x4 + +.global lbl_80455E10 +lbl_80455E10: +.incbin "baserom.dol", 0x3D4C70, 0x4 + +.global lbl_80455E14 +lbl_80455E14: +.incbin "baserom.dol", 0x3D4C74, 0x4 + +.global lbl_80455E18 +lbl_80455E18: +.incbin "baserom.dol", 0x3D4C78, 0x8 + +.global lbl_80455E20 +lbl_80455E20: +.incbin "baserom.dol", 0x3D4C80, 0x8 + +.global lbl_80455E28 +lbl_80455E28: +.incbin "baserom.dol", 0x3D4C88, 0x4 + +.global lbl_80455E2C +lbl_80455E2C: +.incbin "baserom.dol", 0x3D4C8C, 0x4 + +.global lbl_80455E30 +lbl_80455E30: +.incbin "baserom.dol", 0x3D4C90, 0x4 + +.global lbl_80455E34 +lbl_80455E34: +.incbin "baserom.dol", 0x3D4C94, 0x4 + +.global lbl_80455E38 +lbl_80455E38: +.incbin "baserom.dol", 0x3D4C98, 0x4 + +.global lbl_80455E3C +lbl_80455E3C: +.incbin "baserom.dol", 0x3D4C9C, 0x4 + +.global lbl_80455E40 +lbl_80455E40: +.incbin "baserom.dol", 0x3D4CA0, 0x4 + +.global lbl_80455E44 +lbl_80455E44: +.incbin "baserom.dol", 0x3D4CA4, 0x4 + +.global lbl_80455E48 +lbl_80455E48: +.incbin "baserom.dol", 0x3D4CA8, 0x4 + +.global lbl_80455E4C +lbl_80455E4C: +.incbin "baserom.dol", 0x3D4CAC, 0x4 + +.global lbl_80455E50 +lbl_80455E50: +.incbin "baserom.dol", 0x3D4CB0, 0x4 + +.global lbl_80455E54 +lbl_80455E54: +.incbin "baserom.dol", 0x3D4CB4, 0x4 + +.global lbl_80455E58 +lbl_80455E58: +.incbin "baserom.dol", 0x3D4CB8, 0x4 + +.global lbl_80455E5C +lbl_80455E5C: +.incbin "baserom.dol", 0x3D4CBC, 0x4 + diff --git a/asm/sdata2/Z2LinkMgr.s b/asm/sdata2/Z2LinkMgr.s new file mode 100644 index 0000000000..0f0168e277 --- /dev/null +++ b/asm/sdata2/Z2LinkMgr.s @@ -0,0 +1,143 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455c98 - 0x80455d40 + +.global lbl_80455C98 +lbl_80455C98: +.incbin "baserom.dol", 0x3D4AF8, 0x4 + +.global lbl_80455C9C +lbl_80455C9C: +.incbin "baserom.dol", 0x3D4AFC, 0x4 + +.global lbl_80455CA0 +lbl_80455CA0: +.incbin "baserom.dol", 0x3D4B00, 0x8 + +.global lbl_80455CA8 +lbl_80455CA8: +.incbin "baserom.dol", 0x3D4B08, 0x8 + +.global lbl_80455CB0 +lbl_80455CB0: +.incbin "baserom.dol", 0x3D4B10, 0x8 + +.global lbl_80455CB8 +lbl_80455CB8: +.incbin "baserom.dol", 0x3D4B18, 0x8 + +.global lbl_80455CC0 +lbl_80455CC0: +.incbin "baserom.dol", 0x3D4B20, 0x4 + +.global lbl_80455CC4 +lbl_80455CC4: +.incbin "baserom.dol", 0x3D4B24, 0x4 + +.global lbl_80455CC8 +lbl_80455CC8: +.incbin "baserom.dol", 0x3D4B28, 0x4 + +.global lbl_80455CCC +lbl_80455CCC: +.incbin "baserom.dol", 0x3D4B2C, 0x4 + +.global lbl_80455CD0 +lbl_80455CD0: +.incbin "baserom.dol", 0x3D4B30, 0x4 + +.global lbl_80455CD4 +lbl_80455CD4: +.incbin "baserom.dol", 0x3D4B34, 0x4 + +.global lbl_80455CD8 +lbl_80455CD8: +.incbin "baserom.dol", 0x3D4B38, 0x8 + +.global lbl_80455CE0 +lbl_80455CE0: +.incbin "baserom.dol", 0x3D4B40, 0x8 + +.global lbl_80455CE8 +lbl_80455CE8: +.incbin "baserom.dol", 0x3D4B48, 0x4 + +.global lbl_80455CEC +lbl_80455CEC: +.incbin "baserom.dol", 0x3D4B4C, 0x4 + +.global lbl_80455CF0 +lbl_80455CF0: +.incbin "baserom.dol", 0x3D4B50, 0x4 + +.global lbl_80455CF4 +lbl_80455CF4: +.incbin "baserom.dol", 0x3D4B54, 0x4 + +.global lbl_80455CF8 +lbl_80455CF8: +.incbin "baserom.dol", 0x3D4B58, 0x4 + +.global lbl_80455CFC +lbl_80455CFC: +.incbin "baserom.dol", 0x3D4B5C, 0x4 + +.global lbl_80455D00 +lbl_80455D00: +.incbin "baserom.dol", 0x3D4B60, 0x4 + +.global lbl_80455D04 +lbl_80455D04: +.incbin "baserom.dol", 0x3D4B64, 0x4 + +.global lbl_80455D08 +lbl_80455D08: +.incbin "baserom.dol", 0x3D4B68, 0x4 + +.global lbl_80455D0C +lbl_80455D0C: +.incbin "baserom.dol", 0x3D4B6C, 0x4 + +.global lbl_80455D10 +lbl_80455D10: +.incbin "baserom.dol", 0x3D4B70, 0x8 + +.global lbl_80455D18 +lbl_80455D18: +.incbin "baserom.dol", 0x3D4B78, 0x4 + +.global lbl_80455D1C +lbl_80455D1C: +.incbin "baserom.dol", 0x3D4B7C, 0x4 + +.global lbl_80455D20 +lbl_80455D20: +.incbin "baserom.dol", 0x3D4B80, 0x4 + +.global lbl_80455D24 +lbl_80455D24: +.incbin "baserom.dol", 0x3D4B84, 0x4 + +.global lbl_80455D28 +lbl_80455D28: +.incbin "baserom.dol", 0x3D4B88, 0x4 + +.global lbl_80455D2C +lbl_80455D2C: +.incbin "baserom.dol", 0x3D4B8C, 0x4 + +.global lbl_80455D30 +lbl_80455D30: +.incbin "baserom.dol", 0x3D4B90, 0x4 + +.global lbl_80455D34 +lbl_80455D34: +.incbin "baserom.dol", 0x3D4B94, 0x4 + +.global lbl_80455D38 +lbl_80455D38: +.incbin "baserom.dol", 0x3D4B98, 0x4 + +.global lbl_80455D3C +lbl_80455D3C: +.incbin "baserom.dol", 0x3D4B9C, 0x4 + diff --git a/asm/sdata2/Z2SceneMgr.s b/asm/sdata2/Z2SceneMgr.s new file mode 100644 index 0000000000..3dd5c8bf14 --- /dev/null +++ b/asm/sdata2/Z2SceneMgr.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455a38 - 0x80455a68 + +.global lbl_80455A38 +lbl_80455A38: +.incbin "baserom.dol", 0x3D4898, 0x4 + +.global lbl_80455A3C +lbl_80455A3C: +.incbin "baserom.dol", 0x3D489C, 0x4 + +.global lbl_80455A40 +lbl_80455A40: +.incbin "baserom.dol", 0x3D48A0, 0x8 + +.global lbl_80455A48 +lbl_80455A48: +.incbin "baserom.dol", 0x3D48A8, 0x8 + +.global lbl_80455A50 +lbl_80455A50: +.incbin "baserom.dol", 0x3D48B0, 0x4 + +.global lbl_80455A54 +lbl_80455A54: +.incbin "baserom.dol", 0x3D48B4, 0x4 + +.global lbl_80455A58 +lbl_80455A58: +.incbin "baserom.dol", 0x3D48B8, 0x4 + +.global lbl_80455A5C +lbl_80455A5C: +.incbin "baserom.dol", 0x3D48BC, 0x4 + +.global lbl_80455A60 +lbl_80455A60: +.incbin "baserom.dol", 0x3D48C0, 0x4 + +.global lbl_80455A64 +lbl_80455A64: +.incbin "baserom.dol", 0x3D48C4, 0x4 + diff --git a/asm/sdata2/Z2SeMgr.s b/asm/sdata2/Z2SeMgr.s new file mode 100644 index 0000000000..659c1f2aa9 --- /dev/null +++ b/asm/sdata2/Z2SeMgr.s @@ -0,0 +1,243 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455870 - 0x80455998 + +.global lbl_80455870 +lbl_80455870: +.incbin "baserom.dol", 0x3D46D0, 0x4 + +.global lbl_80455874 +lbl_80455874: +.incbin "baserom.dol", 0x3D46D4, 0x4 + +.global lbl_80455878 +lbl_80455878: +.incbin "baserom.dol", 0x3D46D8, 0x4 + +.global lbl_8045587C +lbl_8045587C: +.incbin "baserom.dol", 0x3D46DC, 0x4 + +.global lbl_80455880 +lbl_80455880: +.incbin "baserom.dol", 0x3D46E0, 0x4 + +.global lbl_80455884 +lbl_80455884: +.incbin "baserom.dol", 0x3D46E4, 0x4 + +.global lbl_80455888 +lbl_80455888: +.incbin "baserom.dol", 0x3D46E8, 0x4 + +.global lbl_8045588C +lbl_8045588C: +.incbin "baserom.dol", 0x3D46EC, 0x4 + +.global lbl_80455890 +lbl_80455890: +.incbin "baserom.dol", 0x3D46F0, 0x4 + +.global lbl_80455894 +lbl_80455894: +.incbin "baserom.dol", 0x3D46F4, 0x4 + +.global lbl_80455898 +lbl_80455898: +.incbin "baserom.dol", 0x3D46F8, 0x4 + +.global lbl_8045589C +lbl_8045589C: +.incbin "baserom.dol", 0x3D46FC, 0x4 + +.global lbl_804558A0 +lbl_804558A0: +.incbin "baserom.dol", 0x3D4700, 0x4 + +.global lbl_804558A4 +lbl_804558A4: +.incbin "baserom.dol", 0x3D4704, 0x4 + +.global lbl_804558A8 +lbl_804558A8: +.incbin "baserom.dol", 0x3D4708, 0x4 + +.global lbl_804558AC +lbl_804558AC: +.incbin "baserom.dol", 0x3D470C, 0x4 + +.global lbl_804558B0 +lbl_804558B0: +.incbin "baserom.dol", 0x3D4710, 0x4 + +.global lbl_804558B4 +lbl_804558B4: +.incbin "baserom.dol", 0x3D4714, 0x4 + +.global lbl_804558B8 +lbl_804558B8: +.incbin "baserom.dol", 0x3D4718, 0x4 + +.global lbl_804558BC +lbl_804558BC: +.incbin "baserom.dol", 0x3D471C, 0x4 + +.global lbl_804558C0 +lbl_804558C0: +.incbin "baserom.dol", 0x3D4720, 0x4 + +.global lbl_804558C4 +lbl_804558C4: +.incbin "baserom.dol", 0x3D4724, 0x4 + +.global lbl_804558C8 +lbl_804558C8: +.incbin "baserom.dol", 0x3D4728, 0x4 + +.global lbl_804558CC +lbl_804558CC: +.incbin "baserom.dol", 0x3D472C, 0x4 + +.global lbl_804558D0 +lbl_804558D0: +.incbin "baserom.dol", 0x3D4730, 0x4 + +.global lbl_804558D4 +lbl_804558D4: +.incbin "baserom.dol", 0x3D4734, 0x4 + +.global lbl_804558D8 +lbl_804558D8: +.incbin "baserom.dol", 0x3D4738, 0x8 + +.global lbl_804558E0 +lbl_804558E0: +.incbin "baserom.dol", 0x3D4740, 0x8 + +.global lbl_804558E8 +lbl_804558E8: +.incbin "baserom.dol", 0x3D4748, 0x4 + +.global lbl_804558EC +lbl_804558EC: +.incbin "baserom.dol", 0x3D474C, 0x4 + +.global lbl_804558F0 +lbl_804558F0: +.incbin "baserom.dol", 0x3D4750, 0x4 + +.global lbl_804558F4 +lbl_804558F4: +.incbin "baserom.dol", 0x3D4754, 0x4 + +.global lbl_804558F8 +lbl_804558F8: +.incbin "baserom.dol", 0x3D4758, 0x8 + +.global lbl_80455900 +lbl_80455900: +.incbin "baserom.dol", 0x3D4760, 0x8 + +.global lbl_80455908 +lbl_80455908: +.incbin "baserom.dol", 0x3D4768, 0x8 + +.global lbl_80455910 +lbl_80455910: +.incbin "baserom.dol", 0x3D4770, 0x8 + +.global lbl_80455918 +lbl_80455918: +.incbin "baserom.dol", 0x3D4778, 0x8 + +.global lbl_80455920 +lbl_80455920: +.incbin "baserom.dol", 0x3D4780, 0x8 + +.global lbl_80455928 +lbl_80455928: +.incbin "baserom.dol", 0x3D4788, 0x8 + +.global lbl_80455930 +lbl_80455930: +.incbin "baserom.dol", 0x3D4790, 0x8 + +.global lbl_80455938 +lbl_80455938: +.incbin "baserom.dol", 0x3D4798, 0x4 + +.global lbl_8045593C +lbl_8045593C: +.incbin "baserom.dol", 0x3D479C, 0x4 + +.global lbl_80455940 +lbl_80455940: +.incbin "baserom.dol", 0x3D47A0, 0x4 + +.global lbl_80455944 +lbl_80455944: +.incbin "baserom.dol", 0x3D47A4, 0x4 + +.global lbl_80455948 +lbl_80455948: +.incbin "baserom.dol", 0x3D47A8, 0x4 + +.global lbl_8045594C +lbl_8045594C: +.incbin "baserom.dol", 0x3D47AC, 0x4 + +.global lbl_80455950 +lbl_80455950: +.incbin "baserom.dol", 0x3D47B0, 0x4 + +.global lbl_80455954 +lbl_80455954: +.incbin "baserom.dol", 0x3D47B4, 0x4 + +.global lbl_80455958 +lbl_80455958: +.incbin "baserom.dol", 0x3D47B8, 0x8 + +.global lbl_80455960 +lbl_80455960: +.incbin "baserom.dol", 0x3D47C0, 0x8 + +.global lbl_80455968 +lbl_80455968: +.incbin "baserom.dol", 0x3D47C8, 0x8 + +.global lbl_80455970 +lbl_80455970: +.incbin "baserom.dol", 0x3D47D0, 0x8 + +.global lbl_80455978 +lbl_80455978: +.incbin "baserom.dol", 0x3D47D8, 0x4 + +.global lbl_8045597C +lbl_8045597C: +.incbin "baserom.dol", 0x3D47DC, 0x4 + +.global lbl_80455980 +lbl_80455980: +.incbin "baserom.dol", 0x3D47E0, 0x4 + +.global lbl_80455984 +lbl_80455984: +.incbin "baserom.dol", 0x3D47E4, 0x4 + +.global lbl_80455988 +lbl_80455988: +.incbin "baserom.dol", 0x3D47E8, 0x4 + +.global lbl_8045598C +lbl_8045598C: +.incbin "baserom.dol", 0x3D47EC, 0x4 + +.global lbl_80455990 +lbl_80455990: +.incbin "baserom.dol", 0x3D47F0, 0x4 + +.global lbl_80455994 +lbl_80455994: +.incbin "baserom.dol", 0x3D47F4, 0x4 + diff --git a/asm/sdata2/Z2SeqMgr.s b/asm/sdata2/Z2SeqMgr.s new file mode 100644 index 0000000000..6678848a16 --- /dev/null +++ b/asm/sdata2/Z2SeqMgr.s @@ -0,0 +1,115 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455998 - 0x80455a18 + +.global lbl_80455998 +lbl_80455998: +.incbin "baserom.dol", 0x3D47F8, 0x4 + +.global lbl_8045599C +lbl_8045599C: +.incbin "baserom.dol", 0x3D47FC, 0x4 + +.global lbl_804559A0 +lbl_804559A0: +.incbin "baserom.dol", 0x3D4800, 0x8 + +.global lbl_804559A8 +lbl_804559A8: +.incbin "baserom.dol", 0x3D4808, 0x8 + +.global lbl_804559B0 +lbl_804559B0: +.incbin "baserom.dol", 0x3D4810, 0x4 + +.global lbl_804559B4 +lbl_804559B4: +.incbin "baserom.dol", 0x3D4814, 0x4 + +.global lbl_804559B8 +lbl_804559B8: +.incbin "baserom.dol", 0x3D4818, 0x4 + +.global lbl_804559BC +lbl_804559BC: +.incbin "baserom.dol", 0x3D481C, 0x4 + +.global lbl_804559C0 +lbl_804559C0: +.incbin "baserom.dol", 0x3D4820, 0x4 + +.global lbl_804559C4 +lbl_804559C4: +.incbin "baserom.dol", 0x3D4824, 0x4 + +.global lbl_804559C8 +lbl_804559C8: +.incbin "baserom.dol", 0x3D4828, 0x4 + +.global lbl_804559CC +lbl_804559CC: +.incbin "baserom.dol", 0x3D482C, 0x4 + +.global lbl_804559D0 +lbl_804559D0: +.incbin "baserom.dol", 0x3D4830, 0x4 + +.global lbl_804559D4 +lbl_804559D4: +.incbin "baserom.dol", 0x3D4834, 0x4 + +.global lbl_804559D8 +lbl_804559D8: +.incbin "baserom.dol", 0x3D4838, 0x4 + +.global lbl_804559DC +lbl_804559DC: +.incbin "baserom.dol", 0x3D483C, 0x4 + +.global lbl_804559E0 +lbl_804559E0: +.incbin "baserom.dol", 0x3D4840, 0x8 + +.global lbl_804559E8 +lbl_804559E8: +.incbin "baserom.dol", 0x3D4848, 0x8 + +.global lbl_804559F0 +lbl_804559F0: +.incbin "baserom.dol", 0x3D4850, 0x4 + +.global lbl_804559F4 +lbl_804559F4: +.incbin "baserom.dol", 0x3D4854, 0x4 + +.global lbl_804559F8 +lbl_804559F8: +.incbin "baserom.dol", 0x3D4858, 0x4 + +.global lbl_804559FC +lbl_804559FC: +.incbin "baserom.dol", 0x3D485C, 0x4 + +.global lbl_80455A00 +lbl_80455A00: +.incbin "baserom.dol", 0x3D4860, 0x4 + +.global lbl_80455A04 +lbl_80455A04: +.incbin "baserom.dol", 0x3D4864, 0x4 + +.global lbl_80455A08 +lbl_80455A08: +.incbin "baserom.dol", 0x3D4868, 0x4 + +.global lbl_80455A0C +lbl_80455A0C: +.incbin "baserom.dol", 0x3D486C, 0x4 + +.global lbl_80455A10 +lbl_80455A10: +.incbin "baserom.dol", 0x3D4870, 0x4 + +.global lbl_80455A14 +lbl_80455A14: +.incbin "baserom.dol", 0x3D4874, 0x4 + diff --git a/asm/sdata2/Z2SoundInfo.s b/asm/sdata2/Z2SoundInfo.s new file mode 100644 index 0000000000..4c0517a461 --- /dev/null +++ b/asm/sdata2/Z2SoundInfo.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455a68 - 0x80455aa0 + +.global lbl_80455A68 +lbl_80455A68: +.incbin "baserom.dol", 0x3D48C8, 0x4 + +.global lbl_80455A6C +lbl_80455A6C: +.incbin "baserom.dol", 0x3D48CC, 0x4 + +.global lbl_80455A70 +lbl_80455A70: +.incbin "baserom.dol", 0x3D48D0, 0x4 + +.global lbl_80455A74 +lbl_80455A74: +.incbin "baserom.dol", 0x3D48D4, 0x4 + +.global lbl_80455A78 +lbl_80455A78: +.incbin "baserom.dol", 0x3D48D8, 0x4 + +.global lbl_80455A7C +lbl_80455A7C: +.incbin "baserom.dol", 0x3D48DC, 0x4 + +.global lbl_80455A80 +lbl_80455A80: +.incbin "baserom.dol", 0x3D48E0, 0x8 + +.global lbl_80455A88 +lbl_80455A88: +.incbin "baserom.dol", 0x3D48E8, 0x8 + +.global lbl_80455A90 +lbl_80455A90: +.incbin "baserom.dol", 0x3D48F0, 0x4 + +.global lbl_80455A94 +lbl_80455A94: +.incbin "baserom.dol", 0x3D48F4, 0x4 + +.global lbl_80455A98 +lbl_80455A98: +.incbin "baserom.dol", 0x3D48F8, 0x8 + diff --git a/asm/sdata2/Z2SoundMgr.s b/asm/sdata2/Z2SoundMgr.s new file mode 100644 index 0000000000..a4b9614af0 --- /dev/null +++ b/asm/sdata2/Z2SoundMgr.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455838 - 0x80455858 + +.global lbl_80455838 +lbl_80455838: +.incbin "baserom.dol", 0x3D4698, 0x4 + +.global lbl_8045583C +lbl_8045583C: +.incbin "baserom.dol", 0x3D469C, 0x4 + +.global lbl_80455840 +lbl_80455840: +.incbin "baserom.dol", 0x3D46A0, 0x4 + +.global lbl_80455844 +lbl_80455844: +.incbin "baserom.dol", 0x3D46A4, 0x4 + +.global lbl_80455848 +lbl_80455848: +.incbin "baserom.dol", 0x3D46A8, 0x8 + +.global lbl_80455850 +lbl_80455850: +.incbin "baserom.dol", 0x3D46B0, 0x8 + diff --git a/asm/sdata2/Z2SoundObjMgr.s b/asm/sdata2/Z2SoundObjMgr.s new file mode 100644 index 0000000000..e2a176dd82 --- /dev/null +++ b/asm/sdata2/Z2SoundObjMgr.s @@ -0,0 +1,87 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455b80 - 0x80455bd8 + +.global lbl_80455B80 +lbl_80455B80: +.incbin "baserom.dol", 0x3D49E0, 0x4 + +.global lbl_80455B84 +lbl_80455B84: +.incbin "baserom.dol", 0x3D49E4, 0x4 + +.global lbl_80455B88 +lbl_80455B88: +.incbin "baserom.dol", 0x3D49E8, 0x4 + +.global lbl_80455B8C +lbl_80455B8C: +.incbin "baserom.dol", 0x3D49EC, 0x4 + +.global lbl_80455B90 +lbl_80455B90: +.incbin "baserom.dol", 0x3D49F0, 0x4 + +.global lbl_80455B94 +lbl_80455B94: +.incbin "baserom.dol", 0x3D49F4, 0x4 + +.global lbl_80455B98 +lbl_80455B98: +.incbin "baserom.dol", 0x3D49F8, 0x4 + +.global lbl_80455B9C +lbl_80455B9C: +.incbin "baserom.dol", 0x3D49FC, 0x4 + +.global lbl_80455BA0 +lbl_80455BA0: +.incbin "baserom.dol", 0x3D4A00, 0x4 + +.global lbl_80455BA4 +lbl_80455BA4: +.incbin "baserom.dol", 0x3D4A04, 0x4 + +.global lbl_80455BA8 +lbl_80455BA8: +.incbin "baserom.dol", 0x3D4A08, 0x4 + +.global lbl_80455BAC +lbl_80455BAC: +.incbin "baserom.dol", 0x3D4A0C, 0x4 + +.global lbl_80455BB0 +lbl_80455BB0: +.incbin "baserom.dol", 0x3D4A10, 0x4 + +.global lbl_80455BB4 +lbl_80455BB4: +.incbin "baserom.dol", 0x3D4A14, 0x4 + +.global lbl_80455BB8 +lbl_80455BB8: +.incbin "baserom.dol", 0x3D4A18, 0x4 + +.global lbl_80455BBC +lbl_80455BBC: +.incbin "baserom.dol", 0x3D4A1C, 0x4 + +.global lbl_80455BC0 +lbl_80455BC0: +.incbin "baserom.dol", 0x3D4A20, 0x4 + +.global lbl_80455BC4 +lbl_80455BC4: +.incbin "baserom.dol", 0x3D4A24, 0x4 + +.global lbl_80455BC8 +lbl_80455BC8: +.incbin "baserom.dol", 0x3D4A28, 0x4 + +.global lbl_80455BCC +lbl_80455BCC: +.incbin "baserom.dol", 0x3D4A2C, 0x4 + +.global lbl_80455BD0 +lbl_80455BD0: +.incbin "baserom.dol", 0x3D4A30, 0x8 + diff --git a/asm/sdata2/Z2SoundObject.s b/asm/sdata2/Z2SoundObject.s new file mode 100644 index 0000000000..eb78fe0ffd --- /dev/null +++ b/asm/sdata2/Z2SoundObject.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455b38 - 0x80455b80 + +.global lbl_80455B38 +lbl_80455B38: +.incbin "baserom.dol", 0x3D4998, 0x4 + +.global lbl_80455B3C +lbl_80455B3C: +.incbin "baserom.dol", 0x3D499C, 0x4 + +.global lbl_80455B40 +lbl_80455B40: +.incbin "baserom.dol", 0x3D49A0, 0x8 + +.global lbl_80455B48 +lbl_80455B48: +.incbin "baserom.dol", 0x3D49A8, 0x8 + +.global lbl_80455B50 +lbl_80455B50: +.incbin "baserom.dol", 0x3D49B0, 0x4 + +.global lbl_80455B54 +lbl_80455B54: +.incbin "baserom.dol", 0x3D49B4, 0x4 + +.global lbl_80455B58 +lbl_80455B58: +.incbin "baserom.dol", 0x3D49B8, 0x4 + +.global lbl_80455B5C +lbl_80455B5C: +.incbin "baserom.dol", 0x3D49BC, 0x4 + +.global lbl_80455B60 +lbl_80455B60: +.incbin "baserom.dol", 0x3D49C0, 0x8 + +.global lbl_80455B68 +lbl_80455B68: +.incbin "baserom.dol", 0x3D49C8, 0x8 + +.global lbl_80455B70 +lbl_80455B70: +.incbin "baserom.dol", 0x3D49D0, 0x4 + +.global lbl_80455B74 +lbl_80455B74: +.incbin "baserom.dol", 0x3D49D4, 0x4 + +.global lbl_80455B78 +lbl_80455B78: +.incbin "baserom.dol", 0x3D49D8, 0x4 + +.global lbl_80455B7C +lbl_80455B7C: +.incbin "baserom.dol", 0x3D49DC, 0x4 + diff --git a/asm/sdata2/Z2SoundStarter.s b/asm/sdata2/Z2SoundStarter.s new file mode 100644 index 0000000000..14713f7f76 --- /dev/null +++ b/asm/sdata2/Z2SoundStarter.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455858 - 0x80455870 + +.global lbl_80455858 +lbl_80455858: +.incbin "baserom.dol", 0x3D46B8, 0x4 + +.global lbl_8045585C +lbl_8045585C: +.incbin "baserom.dol", 0x3D46BC, 0x4 + +.global lbl_80455860 +lbl_80455860: +.incbin "baserom.dol", 0x3D46C0, 0x4 + +.global lbl_80455864 +lbl_80455864: +.incbin "baserom.dol", 0x3D46C4, 0x4 + +.global lbl_80455868 +lbl_80455868: +.incbin "baserom.dol", 0x3D46C8, 0x8 + diff --git a/asm/sdata2/Z2SpeechMgr2.s b/asm/sdata2/Z2SpeechMgr2.s new file mode 100644 index 0000000000..5c8093ef10 --- /dev/null +++ b/asm/sdata2/Z2SpeechMgr2.s @@ -0,0 +1,75 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455ee0 - 0x80455f58 + +.global lbl_80455EE0 +lbl_80455EE0: +.incbin "baserom.dol", 0x3D4D40, 0x8 + +.global lbl_80455EE8 +lbl_80455EE8: +.incbin "baserom.dol", 0x3D4D48, 0x8 + +.global lbl_80455EF0 +lbl_80455EF0: +.incbin "baserom.dol", 0x3D4D50, 0x8 + +.global lbl_80455EF8 +lbl_80455EF8: +.incbin "baserom.dol", 0x3D4D58, 0x8 + +.global lbl_80455F00 +lbl_80455F00: +.incbin "baserom.dol", 0x3D4D60, 0x8 + +.global lbl_80455F08 +lbl_80455F08: +.incbin "baserom.dol", 0x3D4D68, 0x8 + +.global lbl_80455F10 +lbl_80455F10: +.incbin "baserom.dol", 0x3D4D70, 0x8 + +.global lbl_80455F18 +lbl_80455F18: +.incbin "baserom.dol", 0x3D4D78, 0x8 + +.global lbl_80455F20 +lbl_80455F20: +.incbin "baserom.dol", 0x3D4D80, 0x8 + +.global lbl_80455F28 +lbl_80455F28: +.incbin "baserom.dol", 0x3D4D88, 0x8 + +.global lbl_80455F30 +lbl_80455F30: +.incbin "baserom.dol", 0x3D4D90, 0x4 + +.global lbl_80455F34 +lbl_80455F34: +.incbin "baserom.dol", 0x3D4D94, 0x4 + +.global lbl_80455F38 +lbl_80455F38: +.incbin "baserom.dol", 0x3D4D98, 0x4 + +.global lbl_80455F3C +lbl_80455F3C: +.incbin "baserom.dol", 0x3D4D9C, 0x4 + +.global lbl_80455F40 +lbl_80455F40: +.incbin "baserom.dol", 0x3D4DA0, 0x8 + +.global lbl_80455F48 +lbl_80455F48: +.incbin "baserom.dol", 0x3D4DA8, 0x8 + +.global lbl_80455F50 +lbl_80455F50: +.incbin "baserom.dol", 0x3D4DB0, 0x4 + +.global lbl_80455F54 +lbl_80455F54: +.incbin "baserom.dol", 0x3D4DB4, 0x4 + diff --git a/asm/sdata2/Z2StatusMgr.s b/asm/sdata2/Z2StatusMgr.s new file mode 100644 index 0000000000..d1ba98f1b6 --- /dev/null +++ b/asm/sdata2/Z2StatusMgr.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455a18 - 0x80455a38 + +.global lbl_80455A18 +lbl_80455A18: +.incbin "baserom.dol", 0x3D4878, 0x4 + +.global lbl_80455A1C +lbl_80455A1C: +.incbin "baserom.dol", 0x3D487C, 0x4 + +.global lbl_80455A20 +lbl_80455A20: +.incbin "baserom.dol", 0x3D4880, 0x4 + +.global lbl_80455A24 +lbl_80455A24: +.incbin "baserom.dol", 0x3D4884, 0x4 + +.global lbl_80455A28 +lbl_80455A28: +.incbin "baserom.dol", 0x3D4888, 0x8 + +.global lbl_80455A30 +lbl_80455A30: +.incbin "baserom.dol", 0x3D4890, 0x4 + +.global lbl_80455A34 +lbl_80455A34: +.incbin "baserom.dol", 0x3D4894, 0x4 + diff --git a/asm/sdata2/Z2WolfHowlMgr.s b/asm/sdata2/Z2WolfHowlMgr.s new file mode 100644 index 0000000000..869adc9dc1 --- /dev/null +++ b/asm/sdata2/Z2WolfHowlMgr.s @@ -0,0 +1,111 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455e60 - 0x80455ee0 + +.global lbl_80455E60 +lbl_80455E60: +.incbin "baserom.dol", 0x3D4CC0, 0x4 + +.global lbl_80455E64 +lbl_80455E64: +.incbin "baserom.dol", 0x3D4CC4, 0x4 + +.global lbl_80455E68 +lbl_80455E68: +.incbin "baserom.dol", 0x3D4CC8, 0x4 + +.global lbl_80455E6C +lbl_80455E6C: +.incbin "baserom.dol", 0x3D4CCC, 0x4 + +.global lbl_80455E70 +lbl_80455E70: +.incbin "baserom.dol", 0x3D4CD0, 0x8 + +.global lbl_80455E78 +lbl_80455E78: +.incbin "baserom.dol", 0x3D4CD8, 0x4 + +.global lbl_80455E7C +lbl_80455E7C: +.incbin "baserom.dol", 0x3D4CDC, 0x4 + +.global lbl_80455E80 +lbl_80455E80: +.incbin "baserom.dol", 0x3D4CE0, 0x4 + +.global lbl_80455E84 +lbl_80455E84: +.incbin "baserom.dol", 0x3D4CE4, 0x4 + +.global lbl_80455E88 +lbl_80455E88: +.incbin "baserom.dol", 0x3D4CE8, 0x4 + +.global lbl_80455E8C +lbl_80455E8C: +.incbin "baserom.dol", 0x3D4CEC, 0x4 + +.global lbl_80455E90 +lbl_80455E90: +.incbin "baserom.dol", 0x3D4CF0, 0x4 + +.global lbl_80455E94 +lbl_80455E94: +.incbin "baserom.dol", 0x3D4CF4, 0x4 + +.global lbl_80455E98 +lbl_80455E98: +.incbin "baserom.dol", 0x3D4CF8, 0x4 + +.global lbl_80455E9C +lbl_80455E9C: +.incbin "baserom.dol", 0x3D4CFC, 0x4 + +.global lbl_80455EA0 +lbl_80455EA0: +.incbin "baserom.dol", 0x3D4D00, 0x4 + +.global lbl_80455EA4 +lbl_80455EA4: +.incbin "baserom.dol", 0x3D4D04, 0x4 + +.global lbl_80455EA8 +lbl_80455EA8: +.incbin "baserom.dol", 0x3D4D08, 0x8 + +.global lbl_80455EB0 +lbl_80455EB0: +.incbin "baserom.dol", 0x3D4D10, 0x8 + +.global lbl_80455EB8 +lbl_80455EB8: +.incbin "baserom.dol", 0x3D4D18, 0x8 + +.global lbl_80455EC0 +lbl_80455EC0: +.incbin "baserom.dol", 0x3D4D20, 0x4 + +.global lbl_80455EC4 +lbl_80455EC4: +.incbin "baserom.dol", 0x3D4D24, 0x4 + +.global lbl_80455EC8 +lbl_80455EC8: +.incbin "baserom.dol", 0x3D4D28, 0x4 + +.global lbl_80455ECC +lbl_80455ECC: +.incbin "baserom.dol", 0x3D4D2C, 0x4 + +.global lbl_80455ED0 +lbl_80455ED0: +.incbin "baserom.dol", 0x3D4D30, 0x4 + +.global lbl_80455ED4 +lbl_80455ED4: +.incbin "baserom.dol", 0x3D4D34, 0x4 + +.global lbl_80455ED8 +lbl_80455ED8: +.incbin "baserom.dol", 0x3D4D38, 0x8 + diff --git a/asm/sdata2/ansi_fp.s b/asm/sdata2/ansi_fp.s new file mode 100644 index 0000000000..c1842bde79 --- /dev/null +++ b/asm/sdata2/ansi_fp.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456660 - 0x80456668 + +.global lbl_80456660 +lbl_80456660: +.incbin "baserom.dol", 0x3D54C0, 0x8 + diff --git a/asm/sdata2/c_angle.s b/asm/sdata2/c_angle.s new file mode 100644 index 0000000000..2302623766 --- /dev/null +++ b/asm/sdata2/c_angle.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455208 - 0x80455240 + +.global lbl_80455208 +lbl_80455208: +.incbin "baserom.dol", 0x3D4068, 0x4 + +.global lbl_8045520C +lbl_8045520C: +.incbin "baserom.dol", 0x3D406C, 0x4 + +.global lbl_80455210 +lbl_80455210: +.incbin "baserom.dol", 0x3D4070, 0x8 + +.global lbl_80455218 +lbl_80455218: +.incbin "baserom.dol", 0x3D4078, 0x4 + +.global lbl_8045521C +lbl_8045521C: +.incbin "baserom.dol", 0x3D407C, 0x4 + +.global lbl_80455220 +lbl_80455220: +.incbin "baserom.dol", 0x3D4080, 0x4 + +.global lbl_80455224 +lbl_80455224: +.incbin "baserom.dol", 0x3D4084, 0x4 + +.global lbl_80455228 +lbl_80455228: +.incbin "baserom.dol", 0x3D4088, 0x4 + +.global lbl_8045522C +lbl_8045522C: +.incbin "baserom.dol", 0x3D408C, 0x4 + +.global lbl_80455230 +lbl_80455230: +.incbin "baserom.dol", 0x3D4090, 0x8 + +.global lbl_80455238 +lbl_80455238: +.incbin "baserom.dol", 0x3D4098, 0x4 + +.global lbl_8045523C +lbl_8045523C: +.incbin "baserom.dol", 0x3D409C, 0x4 + diff --git a/asm/sdata2/c_bg_w.s b/asm/sdata2/c_bg_w.s new file mode 100644 index 0000000000..b743e455d5 --- /dev/null +++ b/asm/sdata2/c_bg_w.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804550e8 - 0x804550f0 + +.global lbl_804550E8 +lbl_804550E8: +.incbin "baserom.dol", 0x3D3F48, 0x4 + +.global lbl_804550EC +lbl_804550EC: +.incbin "baserom.dol", 0x3D3F4C, 0x4 + diff --git a/asm/sdata2/c_cc_d.s b/asm/sdata2/c_cc_d.s new file mode 100644 index 0000000000..4e4d2f0faa --- /dev/null +++ b/asm/sdata2/c_cc_d.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455018 - 0x80455038 + +.global lbl_80455018 +lbl_80455018: +.incbin "baserom.dol", 0x3D3E78, 0x4 + +.global lbl_8045501C +lbl_8045501C: +.incbin "baserom.dol", 0x3D3E7C, 0x4 + +.global lbl_80455020 +lbl_80455020: +.incbin "baserom.dol", 0x3D3E80, 0x8 + +.global lbl_80455028 +lbl_80455028: +.incbin "baserom.dol", 0x3D3E88, 0x8 + +.global lbl_80455030 +lbl_80455030: +.incbin "baserom.dol", 0x3D3E90, 0x8 + diff --git a/asm/sdata2/c_cc_s.s b/asm/sdata2/c_cc_s.s new file mode 100644 index 0000000000..93f440373d --- /dev/null +++ b/asm/sdata2/c_cc_s.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455038 - 0x80455070 + +.global lbl_80455038 +lbl_80455038: +.incbin "baserom.dol", 0x3D3E98, 0x4 + +.global lbl_8045503C +lbl_8045503C: +.incbin "baserom.dol", 0x3D3E9C, 0x4 + +.global lbl_80455040 +lbl_80455040: +.incbin "baserom.dol", 0x3D3EA0, 0x4 + +.global lbl_80455044 +lbl_80455044: +.incbin "baserom.dol", 0x3D3EA4, 0x4 + +.global lbl_80455048 +lbl_80455048: +.incbin "baserom.dol", 0x3D3EA8, 0x8 + +.global lbl_80455050 +lbl_80455050: +.incbin "baserom.dol", 0x3D3EB0, 0x8 + +.global lbl_80455058 +lbl_80455058: +.incbin "baserom.dol", 0x3D3EB8, 0x8 + +.global lbl_80455060 +lbl_80455060: +.incbin "baserom.dol", 0x3D3EC0, 0x8 + +.global lbl_80455068 +lbl_80455068: +.incbin "baserom.dol", 0x3D3EC8, 0x8 + diff --git a/asm/sdata2/c_damagereaction.s b/asm/sdata2/c_damagereaction.s new file mode 100644 index 0000000000..21d8f2e2e1 --- /dev/null +++ b/asm/sdata2/c_damagereaction.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451ba8 - 0x80451bc0 + +.global lbl_80451BA8 +lbl_80451BA8: +.incbin "baserom.dol", 0x3D0A08, 0x4 + +.global lbl_80451BAC +lbl_80451BAC: +.incbin "baserom.dol", 0x3D0A0C, 0x4 + +.global lbl_80451BB0 +lbl_80451BB0: +.incbin "baserom.dol", 0x3D0A10, 0x4 + +.global lbl_80451BB4 +lbl_80451BB4: +.incbin "baserom.dol", 0x3D0A14, 0x4 + +.global lbl_80451BB8 +lbl_80451BB8: +.incbin "baserom.dol", 0x3D0A18, 0x8 + diff --git a/asm/sdata2/c_lib.s b/asm/sdata2/c_lib.s new file mode 100644 index 0000000000..96878f7f6f --- /dev/null +++ b/asm/sdata2/c_lib.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804551e0 - 0x80455208 + +.global lbl_804551E0 +lbl_804551E0: +.incbin "baserom.dol", 0x3D4040, 0x8 + +.global lbl_804551E8 +lbl_804551E8: +.incbin "baserom.dol", 0x3D4048, 0x8 + +.global lbl_804551F0 +lbl_804551F0: +.incbin "baserom.dol", 0x3D4050, 0x8 + +.global lbl_804551F8 +lbl_804551F8: +.incbin "baserom.dol", 0x3D4058, 0x8 + +.global lbl_80455200 +lbl_80455200: +.incbin "baserom.dol", 0x3D4060, 0x8 + diff --git a/asm/sdata2/c_m2d.s b/asm/sdata2/c_m2d.s new file mode 100644 index 0000000000..30ff4c6207 --- /dev/null +++ b/asm/sdata2/c_m2d.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804550f0 - 0x80455118 + +.global lbl_804550F0 +lbl_804550F0: +.incbin "baserom.dol", 0x3D3F50, 0x4 + +.global lbl_804550F4 +lbl_804550F4: +.incbin "baserom.dol", 0x3D3F54, 0x4 + +.global lbl_804550F8 +lbl_804550F8: +.incbin "baserom.dol", 0x3D3F58, 0x4 + +.global lbl_804550FC +lbl_804550FC: +.incbin "baserom.dol", 0x3D3F5C, 0x4 + +.global lbl_80455100 +lbl_80455100: +.incbin "baserom.dol", 0x3D3F60, 0x8 + +.global lbl_80455108 +lbl_80455108: +.incbin "baserom.dol", 0x3D3F68, 0x8 + +.global lbl_80455110 +lbl_80455110: +.incbin "baserom.dol", 0x3D3F70, 0x8 + diff --git a/asm/sdata2/c_m3d.s b/asm/sdata2/c_m3d.s new file mode 100644 index 0000000000..8d9b2a6280 --- /dev/null +++ b/asm/sdata2/c_m3d.s @@ -0,0 +1,171 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455118 - 0x804551d0 + +.global lbl_80455118 +lbl_80455118: +.incbin "baserom.dol", 0x3D3F78, 0x8 + +.global lbl_80455120 +lbl_80455120: +.incbin "baserom.dol", 0x3D3F80, 0x8 + +.global lbl_80455128 +lbl_80455128: +.incbin "baserom.dol", 0x3D3F88, 0x8 + +.global lbl_80455130 +lbl_80455130: +.incbin "baserom.dol", 0x3D3F90, 0x8 + +.global lbl_80455138 +lbl_80455138: +.incbin "baserom.dol", 0x3D3F98, 0x4 + +.global lbl_8045513C +lbl_8045513C: +.incbin "baserom.dol", 0x3D3F9C, 0x4 + +.global lbl_80455140 +lbl_80455140: +.incbin "baserom.dol", 0x3D3FA0, 0x4 + +.global lbl_80455144 +lbl_80455144: +.incbin "baserom.dol", 0x3D3FA4, 0x4 + +.global lbl_80455148 +lbl_80455148: +.incbin "baserom.dol", 0x3D3FA8, 0x4 + +.global lbl_8045514C +lbl_8045514C: +.incbin "baserom.dol", 0x3D3FAC, 0x4 + +.global lbl_80455150 +lbl_80455150: +.incbin "baserom.dol", 0x3D3FB0, 0x4 + +.global lbl_80455154 +lbl_80455154: +.incbin "baserom.dol", 0x3D3FB4, 0x4 + +.global lbl_80455158 +lbl_80455158: +.incbin "baserom.dol", 0x3D3FB8, 0x4 + +.global lbl_8045515C +lbl_8045515C: +.incbin "baserom.dol", 0x3D3FBC, 0x4 + +.global lbl_80455160 +lbl_80455160: +.incbin "baserom.dol", 0x3D3FC0, 0x4 + +.global lbl_80455164 +lbl_80455164: +.incbin "baserom.dol", 0x3D3FC4, 0x4 + +.global lbl_80455168 +lbl_80455168: +.incbin "baserom.dol", 0x3D3FC8, 0x4 + +.global lbl_8045516C +lbl_8045516C: +.incbin "baserom.dol", 0x3D3FCC, 0x4 + +.global lbl_80455170 +lbl_80455170: +.incbin "baserom.dol", 0x3D3FD0, 0x4 + +.global lbl_80455174 +lbl_80455174: +.incbin "baserom.dol", 0x3D3FD4, 0x4 + +.global lbl_80455178 +lbl_80455178: +.incbin "baserom.dol", 0x3D3FD8, 0x4 + +.global lbl_8045517C +lbl_8045517C: +.incbin "baserom.dol", 0x3D3FDC, 0x4 + +.global lbl_80455180 +lbl_80455180: +.incbin "baserom.dol", 0x3D3FE0, 0x4 + +.global lbl_80455184 +lbl_80455184: +.incbin "baserom.dol", 0x3D3FE4, 0x4 + +.global lbl_80455188 +lbl_80455188: +.incbin "baserom.dol", 0x3D3FE8, 0x4 + +.global lbl_8045518C +lbl_8045518C: +.incbin "baserom.dol", 0x3D3FEC, 0x4 + +.global lbl_80455190 +lbl_80455190: +.incbin "baserom.dol", 0x3D3FF0, 0x4 + +.global lbl_80455194 +lbl_80455194: +.incbin "baserom.dol", 0x3D3FF4, 0x4 + +.global lbl_80455198 +lbl_80455198: +.incbin "baserom.dol", 0x3D3FF8, 0x4 + +.global lbl_8045519C +lbl_8045519C: +.incbin "baserom.dol", 0x3D3FFC, 0x4 + +.global lbl_804551A0 +lbl_804551A0: +.incbin "baserom.dol", 0x3D4000, 0x4 + +.global lbl_804551A4 +lbl_804551A4: +.incbin "baserom.dol", 0x3D4004, 0x4 + +.global lbl_804551A8 +lbl_804551A8: +.incbin "baserom.dol", 0x3D4008, 0x4 + +.global lbl_804551AC +lbl_804551AC: +.incbin "baserom.dol", 0x3D400C, 0x4 + +.global lbl_804551B0 +lbl_804551B0: +.incbin "baserom.dol", 0x3D4010, 0x4 + +.global lbl_804551B4 +lbl_804551B4: +.incbin "baserom.dol", 0x3D4014, 0x4 + +.global lbl_804551B8 +lbl_804551B8: +.incbin "baserom.dol", 0x3D4018, 0x4 + +.global lbl_804551BC +lbl_804551BC: +.incbin "baserom.dol", 0x3D401C, 0x4 + +.global lbl_804551C0 +lbl_804551C0: +.incbin "baserom.dol", 0x3D4020, 0x4 + +.global lbl_804551C4 +lbl_804551C4: +.incbin "baserom.dol", 0x3D4024, 0x4 + +.global lbl_804551C8 +lbl_804551C8: +.incbin "baserom.dol", 0x3D4028, 0x4 + +.global lbl_804551CC +lbl_804551CC: +.incbin "baserom.dol", 0x3D402C, 0x4 + diff --git a/asm/sdata2/c_m3d_g_aab.s b/asm/sdata2/c_m3d_g_aab.s new file mode 100644 index 0000000000..171c733bbd --- /dev/null +++ b/asm/sdata2/c_m3d_g_aab.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804551d0 - 0x804551e0 + +.global lbl_804551D0 +lbl_804551D0: +.incbin "baserom.dol", 0x3D4030, 0x4 + +.global lbl_804551D4 +lbl_804551D4: +.incbin "baserom.dol", 0x3D4034, 0x4 + +.global lbl_804551D8 +lbl_804551D8: +.incbin "baserom.dol", 0x3D4038, 0x8 + diff --git a/asm/sdata2/c_math.s b/asm/sdata2/c_math.s new file mode 100644 index 0000000000..d02c22f8c2 --- /dev/null +++ b/asm/sdata2/c_math.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804550a8 - 0x804550e8 + +.global lbl_804550A8 +lbl_804550A8: +.incbin "baserom.dol", 0x3D3F08, 0x8 + +.global lbl_804550B0 +lbl_804550B0: +.incbin "baserom.dol", 0x3D3F10, 0x4 + +.global lbl_804550B4 +lbl_804550B4: +.incbin "baserom.dol", 0x3D3F14, 0x4 + +.global lbl_804550B8 +lbl_804550B8: +.incbin "baserom.dol", 0x3D3F18, 0x4 + +.global lbl_804550BC +lbl_804550BC: +.incbin "baserom.dol", 0x3D3F1C, 0x4 + +.global lbl_804550C0 +lbl_804550C0: +.incbin "baserom.dol", 0x3D3F20, 0x8 + +.global lbl_804550C8 +lbl_804550C8: +.incbin "baserom.dol", 0x3D3F28, 0x4 + +.global lbl_804550CC +lbl_804550CC: +.incbin "baserom.dol", 0x3D3F2C, 0x4 + +.global lbl_804550D0 +lbl_804550D0: +.incbin "baserom.dol", 0x3D3F30, 0x8 + +.global lbl_804550D8 +lbl_804550D8: +.incbin "baserom.dol", 0x3D3F38, 0x8 + +.global lbl_804550E0 +lbl_804550E0: +.incbin "baserom.dol", 0x3D3F40, 0x4 + +.global lbl_804550E4 +lbl_804550E4: +.incbin "baserom.dol", 0x3D3F44, 0x4 + diff --git a/asm/sdata2/c_sxyz.s b/asm/sdata2/c_sxyz.s new file mode 100644 index 0000000000..a892a228e9 --- /dev/null +++ b/asm/sdata2/c_sxyz.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804550a0 - 0x804550a8 + +.global lbl_804550A0 +lbl_804550A0: +.incbin "baserom.dol", 0x3D3F00, 0x8 + diff --git a/asm/sdata2/c_xyz.s b/asm/sdata2/c_xyz.s new file mode 100644 index 0000000000..1da99d9ce9 --- /dev/null +++ b/asm/sdata2/c_xyz.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455070 - 0x804550a0 + +.global lbl_80455070 +lbl_80455070: +.incbin "baserom.dol", 0x3D3ED0, 0x4 + +.global lbl_80455074 +lbl_80455074: +.incbin "baserom.dol", 0x3D3ED4, 0x4 + +.global lbl_80455078 +lbl_80455078: +.incbin "baserom.dol", 0x3D3ED8, 0x4 + +.global lbl_8045507C +lbl_8045507C: +.incbin "baserom.dol", 0x3D3EDC, 0x4 + +.global lbl_80455080 +lbl_80455080: +.incbin "baserom.dol", 0x3D3EE0, 0x4 + +.global lbl_80455084 +lbl_80455084: +.incbin "baserom.dol", 0x3D3EE4, 0x4 + +.global lbl_80455088 +lbl_80455088: +.incbin "baserom.dol", 0x3D3EE8, 0x8 + +.global lbl_80455090 +lbl_80455090: +.incbin "baserom.dol", 0x3D3EF0, 0x8 + +.global lbl_80455098 +lbl_80455098: +.incbin "baserom.dol", 0x3D3EF8, 0x8 + diff --git a/asm/sdata2/ctb-data.s b/asm/sdata2/ctb-data.s new file mode 100644 index 0000000000..1e969cc8ae --- /dev/null +++ b/asm/sdata2/ctb-data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804553f8 - 0x80455400 + +.global lbl_804553F8 +lbl_804553F8: +.incbin "baserom.dol", 0x3D4258, 0x8 + diff --git a/asm/sdata2/d_a_alink.s b/asm/sdata2/d_a_alink.s new file mode 100644 index 0000000000..6ae5c50814 --- /dev/null +++ b/asm/sdata2/d_a_alink.s @@ -0,0 +1,1723 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452c50 - 0x804533a8 + +.global lbl_80452C50 +lbl_80452C50: +.incbin "baserom.dol", 0x3D1AB0, 0x8 + +.global lbl_80452C58 +lbl_80452C58: +.incbin "baserom.dol", 0x3D1AB8, 0x8 + +.global lbl_80452C60 +lbl_80452C60: +.incbin "baserom.dol", 0x3D1AC0, 0x8 + +.global lbl_80452C68 +lbl_80452C68: +.incbin "baserom.dol", 0x3D1AC8, 0x8 + +.global lbl_80452C70 +lbl_80452C70: +.incbin "baserom.dol", 0x3D1AD0, 0x8 + +.global lbl_80452C78 +lbl_80452C78: +.incbin "baserom.dol", 0x3D1AD8, 0x8 + +.global lbl_80452C80 +lbl_80452C80: +.incbin "baserom.dol", 0x3D1AE0, 0x8 + +.global lbl_80452C88 +lbl_80452C88: +.incbin "baserom.dol", 0x3D1AE8, 0x8 + +.global lbl_80452C90 +lbl_80452C90: +.incbin "baserom.dol", 0x3D1AF0, 0x8 + +.global lbl_80452C98 +lbl_80452C98: +.incbin "baserom.dol", 0x3D1AF8, 0x4 + +.global lbl_80452C9C +lbl_80452C9C: +.incbin "baserom.dol", 0x3D1AFC, 0x4 + +.global lbl_80452CA0 +lbl_80452CA0: +.incbin "baserom.dol", 0x3D1B00, 0x4 + +.global lbl_80452CA4 +lbl_80452CA4: +.incbin "baserom.dol", 0x3D1B04, 0x4 + +.global lbl_80452CA8 +lbl_80452CA8: +.incbin "baserom.dol", 0x3D1B08, 0x4 + +.global lbl_80452CAC +lbl_80452CAC: +.incbin "baserom.dol", 0x3D1B0C, 0x4 + +.global lbl_80452CB0 +lbl_80452CB0: +.incbin "baserom.dol", 0x3D1B10, 0x8 + +.global lbl_80452CB8 +lbl_80452CB8: +.incbin "baserom.dol", 0x3D1B18, 0x4 + +.global lbl_80452CBC +lbl_80452CBC: +.incbin "baserom.dol", 0x3D1B1C, 0x4 + +.global lbl_80452CC0 +lbl_80452CC0: +.incbin "baserom.dol", 0x3D1B20, 0x4 + +.global lbl_80452CC4 +lbl_80452CC4: +.incbin "baserom.dol", 0x3D1B24, 0x4 + +.global lbl_80452CC8 +lbl_80452CC8: +.incbin "baserom.dol", 0x3D1B28, 0x4 + +.global lbl_80452CCC +lbl_80452CCC: +.incbin "baserom.dol", 0x3D1B2C, 0x4 + +.global lbl_80452CD0 +lbl_80452CD0: +.incbin "baserom.dol", 0x3D1B30, 0x4 + +.global lbl_80452CD4 +lbl_80452CD4: +.incbin "baserom.dol", 0x3D1B34, 0x4 + +.global lbl_80452CD8 +lbl_80452CD8: +.incbin "baserom.dol", 0x3D1B38, 0x4 + +.global lbl_80452CDC +lbl_80452CDC: +.incbin "baserom.dol", 0x3D1B3C, 0x4 + +.global lbl_80452CE0 +lbl_80452CE0: +.incbin "baserom.dol", 0x3D1B40, 0x8 + +.global lbl_80452CE8 +lbl_80452CE8: +.incbin "baserom.dol", 0x3D1B48, 0x8 + +.global lbl_80452CF0 +lbl_80452CF0: +.incbin "baserom.dol", 0x3D1B50, 0x8 + +.global lbl_80452CF8 +lbl_80452CF8: +.incbin "baserom.dol", 0x3D1B58, 0x8 + +.global lbl_80452D00 +lbl_80452D00: +.incbin "baserom.dol", 0x3D1B60, 0x4 + +.global lbl_80452D04 +lbl_80452D04: +.incbin "baserom.dol", 0x3D1B64, 0x4 + +.global lbl_80452D08 +lbl_80452D08: +.incbin "baserom.dol", 0x3D1B68, 0x4 + +.global lbl_80452D0C +lbl_80452D0C: +.incbin "baserom.dol", 0x3D1B6C, 0x4 + +.global lbl_80452D10 +lbl_80452D10: +.incbin "baserom.dol", 0x3D1B70, 0x4 + +.global lbl_80452D14 +lbl_80452D14: +.incbin "baserom.dol", 0x3D1B74, 0x4 + +.global lbl_80452D18 +lbl_80452D18: +.incbin "baserom.dol", 0x3D1B78, 0x4 + +.global lbl_80452D1C +lbl_80452D1C: +.incbin "baserom.dol", 0x3D1B7C, 0x4 + +.global lbl_80452D20 +lbl_80452D20: +.incbin "baserom.dol", 0x3D1B80, 0x4 + +.global lbl_80452D24 +lbl_80452D24: +.incbin "baserom.dol", 0x3D1B84, 0x4 + +.global lbl_80452D28 +lbl_80452D28: +.incbin "baserom.dol", 0x3D1B88, 0x4 + +.global lbl_80452D2C +lbl_80452D2C: +.incbin "baserom.dol", 0x3D1B8C, 0x4 + +.global lbl_80452D30 +lbl_80452D30: +.incbin "baserom.dol", 0x3D1B90, 0x4 + +.global lbl_80452D34 +lbl_80452D34: +.incbin "baserom.dol", 0x3D1B94, 0x4 + +.global lbl_80452D38 +lbl_80452D38: +.incbin "baserom.dol", 0x3D1B98, 0x4 + +.global lbl_80452D3C +lbl_80452D3C: +.incbin "baserom.dol", 0x3D1B9C, 0x4 + +.global lbl_80452D40 +lbl_80452D40: +.incbin "baserom.dol", 0x3D1BA0, 0x4 + +.global lbl_80452D44 +lbl_80452D44: +.incbin "baserom.dol", 0x3D1BA4, 0x4 + +.global lbl_80452D48 +lbl_80452D48: +.incbin "baserom.dol", 0x3D1BA8, 0x4 + +.global lbl_80452D4C +lbl_80452D4C: +.incbin "baserom.dol", 0x3D1BAC, 0x4 + +.global lbl_80452D50 +lbl_80452D50: +.incbin "baserom.dol", 0x3D1BB0, 0x4 + +.global lbl_80452D54 +lbl_80452D54: +.incbin "baserom.dol", 0x3D1BB4, 0x4 + +.global lbl_80452D58 +lbl_80452D58: +.incbin "baserom.dol", 0x3D1BB8, 0x4 + +.global lbl_80452D5C +lbl_80452D5C: +.incbin "baserom.dol", 0x3D1BBC, 0x4 + +.global lbl_80452D60 +lbl_80452D60: +.incbin "baserom.dol", 0x3D1BC0, 0x4 + +.global lbl_80452D64 +lbl_80452D64: +.incbin "baserom.dol", 0x3D1BC4, 0x4 + +.global lbl_80452D68 +lbl_80452D68: +.incbin "baserom.dol", 0x3D1BC8, 0x4 + +.global lbl_80452D6C +lbl_80452D6C: +.incbin "baserom.dol", 0x3D1BCC, 0x4 + +.global lbl_80452D70 +lbl_80452D70: +.incbin "baserom.dol", 0x3D1BD0, 0x4 + +.global lbl_80452D74 +lbl_80452D74: +.incbin "baserom.dol", 0x3D1BD4, 0x4 + +.global lbl_80452D78 +lbl_80452D78: +.incbin "baserom.dol", 0x3D1BD8, 0x4 + +.global lbl_80452D7C +lbl_80452D7C: +.incbin "baserom.dol", 0x3D1BDC, 0x4 + +.global lbl_80452D80 +lbl_80452D80: +.incbin "baserom.dol", 0x3D1BE0, 0x4 + +.global lbl_80452D84 +lbl_80452D84: +.incbin "baserom.dol", 0x3D1BE4, 0x4 + +.global lbl_80452D88 +lbl_80452D88: +.incbin "baserom.dol", 0x3D1BE8, 0x4 + +.global lbl_80452D8C +lbl_80452D8C: +.incbin "baserom.dol", 0x3D1BEC, 0x4 + +.global lbl_80452D90 +lbl_80452D90: +.incbin "baserom.dol", 0x3D1BF0, 0x4 + +.global lbl_80452D94 +lbl_80452D94: +.incbin "baserom.dol", 0x3D1BF4, 0x4 + +.global lbl_80452D98 +lbl_80452D98: +.incbin "baserom.dol", 0x3D1BF8, 0x4 + +.global lbl_80452D9C +lbl_80452D9C: +.incbin "baserom.dol", 0x3D1BFC, 0x4 + +.global lbl_80452DA0 +lbl_80452DA0: +.incbin "baserom.dol", 0x3D1C00, 0x4 + +.global lbl_80452DA4 +lbl_80452DA4: +.incbin "baserom.dol", 0x3D1C04, 0x4 + +.global lbl_80452DA8 +lbl_80452DA8: +.incbin "baserom.dol", 0x3D1C08, 0x4 + +.global lbl_80452DAC +lbl_80452DAC: +.incbin "baserom.dol", 0x3D1C0C, 0x4 + +.global lbl_80452DB0 +lbl_80452DB0: +.incbin "baserom.dol", 0x3D1C10, 0x4 + +.global lbl_80452DB4 +lbl_80452DB4: +.incbin "baserom.dol", 0x3D1C14, 0x4 + +.global lbl_80452DB8 +lbl_80452DB8: +.incbin "baserom.dol", 0x3D1C18, 0x4 + +.global lbl_80452DBC +lbl_80452DBC: +.incbin "baserom.dol", 0x3D1C1C, 0x4 + +.global lbl_80452DC0 +lbl_80452DC0: +.incbin "baserom.dol", 0x3D1C20, 0x4 + +.global lbl_80452DC4 +lbl_80452DC4: +.incbin "baserom.dol", 0x3D1C24, 0x4 + +.global lbl_80452DC8 +lbl_80452DC8: +.incbin "baserom.dol", 0x3D1C28, 0x4 + +.global lbl_80452DCC +lbl_80452DCC: +.incbin "baserom.dol", 0x3D1C2C, 0x4 + +.global lbl_80452DD0 +lbl_80452DD0: +.incbin "baserom.dol", 0x3D1C30, 0x4 + +.global lbl_80452DD4 +lbl_80452DD4: +.incbin "baserom.dol", 0x3D1C34, 0x4 + +.global lbl_80452DD8 +lbl_80452DD8: +.incbin "baserom.dol", 0x3D1C38, 0x4 + +.global lbl_80452DDC +lbl_80452DDC: +.incbin "baserom.dol", 0x3D1C3C, 0x4 + +.global lbl_80452DE0 +lbl_80452DE0: +.incbin "baserom.dol", 0x3D1C40, 0x4 + +.global lbl_80452DE4 +lbl_80452DE4: +.incbin "baserom.dol", 0x3D1C44, 0x4 + +.global lbl_80452DE8 +lbl_80452DE8: +.incbin "baserom.dol", 0x3D1C48, 0x4 + +.global lbl_80452DEC +lbl_80452DEC: +.incbin "baserom.dol", 0x3D1C4C, 0x4 + +.global lbl_80452DF0 +lbl_80452DF0: +.incbin "baserom.dol", 0x3D1C50, 0x4 + +.global lbl_80452DF4 +lbl_80452DF4: +.incbin "baserom.dol", 0x3D1C54, 0x4 + +.global lbl_80452DF8 +lbl_80452DF8: +.incbin "baserom.dol", 0x3D1C58, 0x4 + +.global lbl_80452DFC +lbl_80452DFC: +.incbin "baserom.dol", 0x3D1C5C, 0x4 + +.global lbl_80452E00 +lbl_80452E00: +.incbin "baserom.dol", 0x3D1C60, 0x4 + +.global lbl_80452E04 +lbl_80452E04: +.incbin "baserom.dol", 0x3D1C64, 0x4 + +.global lbl_80452E08 +lbl_80452E08: +.incbin "baserom.dol", 0x3D1C68, 0x4 + +.global lbl_80452E0C +lbl_80452E0C: +.incbin "baserom.dol", 0x3D1C6C, 0x4 + +.global lbl_80452E10 +lbl_80452E10: +.incbin "baserom.dol", 0x3D1C70, 0x4 + +.global lbl_80452E14 +lbl_80452E14: +.incbin "baserom.dol", 0x3D1C74, 0x4 + +.global lbl_80452E18 +lbl_80452E18: +.incbin "baserom.dol", 0x3D1C78, 0x4 + +.global lbl_80452E1C +lbl_80452E1C: +.incbin "baserom.dol", 0x3D1C7C, 0x4 + +.global lbl_80452E20 +lbl_80452E20: +.incbin "baserom.dol", 0x3D1C80, 0x4 + +.global lbl_80452E24 +lbl_80452E24: +.incbin "baserom.dol", 0x3D1C84, 0x4 + +.global lbl_80452E28 +lbl_80452E28: +.incbin "baserom.dol", 0x3D1C88, 0x4 + +.global lbl_80452E2C +lbl_80452E2C: +.incbin "baserom.dol", 0x3D1C8C, 0x4 + +.global lbl_80452E30 +lbl_80452E30: +.incbin "baserom.dol", 0x3D1C90, 0x4 + +.global lbl_80452E34 +lbl_80452E34: +.incbin "baserom.dol", 0x3D1C94, 0x4 + +.global lbl_80452E38 +lbl_80452E38: +.incbin "baserom.dol", 0x3D1C98, 0x4 + +.global lbl_80452E3C +lbl_80452E3C: +.incbin "baserom.dol", 0x3D1C9C, 0x4 + +.global lbl_80452E40 +lbl_80452E40: +.incbin "baserom.dol", 0x3D1CA0, 0x4 + +.global lbl_80452E44 +lbl_80452E44: +.incbin "baserom.dol", 0x3D1CA4, 0x4 + +.global lbl_80452E48 +lbl_80452E48: +.incbin "baserom.dol", 0x3D1CA8, 0x4 + +.global lbl_80452E4C +lbl_80452E4C: +.incbin "baserom.dol", 0x3D1CAC, 0x4 + +.global lbl_80452E50 +lbl_80452E50: +.incbin "baserom.dol", 0x3D1CB0, 0x4 + +.global lbl_80452E54 +lbl_80452E54: +.incbin "baserom.dol", 0x3D1CB4, 0x4 + +.global lbl_80452E58 +lbl_80452E58: +.incbin "baserom.dol", 0x3D1CB8, 0x4 + +.global lbl_80452E5C +lbl_80452E5C: +.incbin "baserom.dol", 0x3D1CBC, 0x4 + +.global lbl_80452E60 +lbl_80452E60: +.incbin "baserom.dol", 0x3D1CC0, 0x4 + +.global lbl_80452E64 +lbl_80452E64: +.incbin "baserom.dol", 0x3D1CC4, 0x4 + +.global lbl_80452E68 +lbl_80452E68: +.incbin "baserom.dol", 0x3D1CC8, 0x4 + +.global lbl_80452E6C +lbl_80452E6C: +.incbin "baserom.dol", 0x3D1CCC, 0x4 + +.global lbl_80452E70 +lbl_80452E70: +.incbin "baserom.dol", 0x3D1CD0, 0x4 + +.global lbl_80452E74 +lbl_80452E74: +.incbin "baserom.dol", 0x3D1CD4, 0x4 + +.global lbl_80452E78 +lbl_80452E78: +.incbin "baserom.dol", 0x3D1CD8, 0x4 + +.global lbl_80452E7C +lbl_80452E7C: +.incbin "baserom.dol", 0x3D1CDC, 0x4 + +.global lbl_80452E80 +lbl_80452E80: +.incbin "baserom.dol", 0x3D1CE0, 0x4 + +.global lbl_80452E84 +lbl_80452E84: +.incbin "baserom.dol", 0x3D1CE4, 0x4 + +.global lbl_80452E88 +lbl_80452E88: +.incbin "baserom.dol", 0x3D1CE8, 0x4 + +.global lbl_80452E8C +lbl_80452E8C: +.incbin "baserom.dol", 0x3D1CEC, 0x4 + +.global lbl_80452E90 +lbl_80452E90: +.incbin "baserom.dol", 0x3D1CF0, 0x4 + +.global lbl_80452E94 +lbl_80452E94: +.incbin "baserom.dol", 0x3D1CF4, 0x4 + +.global lbl_80452E98 +lbl_80452E98: +.incbin "baserom.dol", 0x3D1CF8, 0x4 + +.global lbl_80452E9C +lbl_80452E9C: +.incbin "baserom.dol", 0x3D1CFC, 0x4 + +.global lbl_80452EA0 +lbl_80452EA0: +.incbin "baserom.dol", 0x3D1D00, 0x4 + +.global lbl_80452EA4 +lbl_80452EA4: +.incbin "baserom.dol", 0x3D1D04, 0x4 + +.global lbl_80452EA8 +lbl_80452EA8: +.incbin "baserom.dol", 0x3D1D08, 0x4 + +.global lbl_80452EAC +lbl_80452EAC: +.incbin "baserom.dol", 0x3D1D0C, 0x4 + +.global lbl_80452EB0 +lbl_80452EB0: +.incbin "baserom.dol", 0x3D1D10, 0x4 + +.global lbl_80452EB4 +lbl_80452EB4: +.incbin "baserom.dol", 0x3D1D14, 0x4 + +.global lbl_80452EB8 +lbl_80452EB8: +.incbin "baserom.dol", 0x3D1D18, 0x4 + +.global lbl_80452EBC +lbl_80452EBC: +.incbin "baserom.dol", 0x3D1D1C, 0x4 + +.global lbl_80452EC0 +lbl_80452EC0: +.incbin "baserom.dol", 0x3D1D20, 0x4 + +.global lbl_80452EC4 +lbl_80452EC4: +.incbin "baserom.dol", 0x3D1D24, 0x4 + +.global lbl_80452EC8 +lbl_80452EC8: +.incbin "baserom.dol", 0x3D1D28, 0x4 + +.global lbl_80452ECC +lbl_80452ECC: +.incbin "baserom.dol", 0x3D1D2C, 0x4 + +.global lbl_80452ED0 +lbl_80452ED0: +.incbin "baserom.dol", 0x3D1D30, 0x4 + +.global lbl_80452ED4 +lbl_80452ED4: +.incbin "baserom.dol", 0x3D1D34, 0x4 + +.global lbl_80452ED8 +lbl_80452ED8: +.incbin "baserom.dol", 0x3D1D38, 0x4 + +.global lbl_80452EDC +lbl_80452EDC: +.incbin "baserom.dol", 0x3D1D3C, 0x4 + +.global lbl_80452EE0 +lbl_80452EE0: +.incbin "baserom.dol", 0x3D1D40, 0x4 + +.global lbl_80452EE4 +lbl_80452EE4: +.incbin "baserom.dol", 0x3D1D44, 0x4 + +.global lbl_80452EE8 +lbl_80452EE8: +.incbin "baserom.dol", 0x3D1D48, 0x4 + +.global lbl_80452EEC +lbl_80452EEC: +.incbin "baserom.dol", 0x3D1D4C, 0x4 + +.global lbl_80452EF0 +lbl_80452EF0: +.incbin "baserom.dol", 0x3D1D50, 0x4 + +.global lbl_80452EF4 +lbl_80452EF4: +.incbin "baserom.dol", 0x3D1D54, 0x4 + +.global lbl_80452EF8 +lbl_80452EF8: +.incbin "baserom.dol", 0x3D1D58, 0x4 + +.global lbl_80452EFC +lbl_80452EFC: +.incbin "baserom.dol", 0x3D1D5C, 0x4 + +.global lbl_80452F00 +lbl_80452F00: +.incbin "baserom.dol", 0x3D1D60, 0x4 + +.global lbl_80452F04 +lbl_80452F04: +.incbin "baserom.dol", 0x3D1D64, 0x4 + +.global lbl_80452F08 +lbl_80452F08: +.incbin "baserom.dol", 0x3D1D68, 0x4 + +.global lbl_80452F0C +lbl_80452F0C: +.incbin "baserom.dol", 0x3D1D6C, 0x4 + +.global lbl_80452F10 +lbl_80452F10: +.incbin "baserom.dol", 0x3D1D70, 0x4 + +.global lbl_80452F14 +lbl_80452F14: +.incbin "baserom.dol", 0x3D1D74, 0x4 + +.global lbl_80452F18 +lbl_80452F18: +.incbin "baserom.dol", 0x3D1D78, 0x4 + +.global lbl_80452F1C +lbl_80452F1C: +.incbin "baserom.dol", 0x3D1D7C, 0x4 + +.global lbl_80452F20 +lbl_80452F20: +.incbin "baserom.dol", 0x3D1D80, 0x4 + +.global lbl_80452F24 +lbl_80452F24: +.incbin "baserom.dol", 0x3D1D84, 0x4 + +.global lbl_80452F28 +lbl_80452F28: +.incbin "baserom.dol", 0x3D1D88, 0x4 + +.global lbl_80452F2C +lbl_80452F2C: +.incbin "baserom.dol", 0x3D1D8C, 0x4 + +.global lbl_80452F30 +lbl_80452F30: +.incbin "baserom.dol", 0x3D1D90, 0x4 + +.global lbl_80452F34 +lbl_80452F34: +.incbin "baserom.dol", 0x3D1D94, 0x4 + +.global lbl_80452F38 +lbl_80452F38: +.incbin "baserom.dol", 0x3D1D98, 0x1 + +.global lbl_80452F39 +lbl_80452F39: +.incbin "baserom.dol", 0x3D1D99, 0x3 + +.global lbl_80452F3C +lbl_80452F3C: +.incbin "baserom.dol", 0x3D1D9C, 0x4 + +.global lbl_80452F40 +lbl_80452F40: +.incbin "baserom.dol", 0x3D1DA0, 0x4 + +.global lbl_80452F44 +lbl_80452F44: +.incbin "baserom.dol", 0x3D1DA4, 0x4 + +.global lbl_80452F48 +lbl_80452F48: +.incbin "baserom.dol", 0x3D1DA8, 0x4 + +.global lbl_80452F4C +lbl_80452F4C: +.incbin "baserom.dol", 0x3D1DAC, 0x4 + +.global lbl_80452F50 +lbl_80452F50: +.incbin "baserom.dol", 0x3D1DB0, 0x4 + +.global lbl_80452F54 +lbl_80452F54: +.incbin "baserom.dol", 0x3D1DB4, 0x4 + +.global lbl_80452F58 +lbl_80452F58: +.incbin "baserom.dol", 0x3D1DB8, 0x4 + +.global lbl_80452F5C +lbl_80452F5C: +.incbin "baserom.dol", 0x3D1DBC, 0x4 + +.global lbl_80452F60 +lbl_80452F60: +.incbin "baserom.dol", 0x3D1DC0, 0x4 + +.global lbl_80452F64 +lbl_80452F64: +.incbin "baserom.dol", 0x3D1DC4, 0x4 + +.global lbl_80452F68 +lbl_80452F68: +.incbin "baserom.dol", 0x3D1DC8, 0x4 + +.global lbl_80452F6C +lbl_80452F6C: +.incbin "baserom.dol", 0x3D1DCC, 0x4 + +.global lbl_80452F70 +lbl_80452F70: +.incbin "baserom.dol", 0x3D1DD0, 0x4 + +.global lbl_80452F74 +lbl_80452F74: +.incbin "baserom.dol", 0x3D1DD4, 0x4 + +.global lbl_80452F78 +lbl_80452F78: +.incbin "baserom.dol", 0x3D1DD8, 0x4 + +.global lbl_80452F7C +lbl_80452F7C: +.incbin "baserom.dol", 0x3D1DDC, 0x4 + +.global lbl_80452F80 +lbl_80452F80: +.incbin "baserom.dol", 0x3D1DE0, 0x4 + +.global lbl_80452F84 +lbl_80452F84: +.incbin "baserom.dol", 0x3D1DE4, 0x4 + +.global lbl_80452F88 +lbl_80452F88: +.incbin "baserom.dol", 0x3D1DE8, 0x4 + +.global lbl_80452F8C +lbl_80452F8C: +.incbin "baserom.dol", 0x3D1DEC, 0x4 + +.global lbl_80452F90 +lbl_80452F90: +.incbin "baserom.dol", 0x3D1DF0, 0x4 + +.global lbl_80452F94 +lbl_80452F94: +.incbin "baserom.dol", 0x3D1DF4, 0x4 + +.global lbl_80452F98 +lbl_80452F98: +.incbin "baserom.dol", 0x3D1DF8, 0x4 + +.global lbl_80452F9C +lbl_80452F9C: +.incbin "baserom.dol", 0x3D1DFC, 0x4 + +.global lbl_80452FA0 +lbl_80452FA0: +.incbin "baserom.dol", 0x3D1E00, 0x4 + +.global lbl_80452FA4 +lbl_80452FA4: +.incbin "baserom.dol", 0x3D1E04, 0x4 + +.global lbl_80452FA8 +lbl_80452FA8: +.incbin "baserom.dol", 0x3D1E08, 0x8 + +.global lbl_80452FB0 +lbl_80452FB0: +.incbin "baserom.dol", 0x3D1E10, 0x4 + +.global lbl_80452FB4 +lbl_80452FB4: +.incbin "baserom.dol", 0x3D1E14, 0x4 + +.global lbl_80452FB8 +lbl_80452FB8: +.incbin "baserom.dol", 0x3D1E18, 0x4 + +.global lbl_80452FBC +lbl_80452FBC: +.incbin "baserom.dol", 0x3D1E1C, 0x4 + +.global lbl_80452FC0 +lbl_80452FC0: +.incbin "baserom.dol", 0x3D1E20, 0x4 + +.global lbl_80452FC4 +lbl_80452FC4: +.incbin "baserom.dol", 0x3D1E24, 0x4 + +.global lbl_80452FC8 +lbl_80452FC8: +.incbin "baserom.dol", 0x3D1E28, 0x4 + +.global lbl_80452FCC +lbl_80452FCC: +.incbin "baserom.dol", 0x3D1E2C, 0x4 + +.global lbl_80452FD0 +lbl_80452FD0: +.incbin "baserom.dol", 0x3D1E30, 0x4 + +.global lbl_80452FD4 +lbl_80452FD4: +.incbin "baserom.dol", 0x3D1E34, 0x4 + +.global lbl_80452FD8 +lbl_80452FD8: +.incbin "baserom.dol", 0x3D1E38, 0x4 + +.global lbl_80452FDC +lbl_80452FDC: +.incbin "baserom.dol", 0x3D1E3C, 0x4 + +.global lbl_80452FE0 +lbl_80452FE0: +.incbin "baserom.dol", 0x3D1E40, 0x4 + +.global lbl_80452FE4 +lbl_80452FE4: +.incbin "baserom.dol", 0x3D1E44, 0x4 + +.global lbl_80452FE8 +lbl_80452FE8: +.incbin "baserom.dol", 0x3D1E48, 0x4 + +.global lbl_80452FEC +lbl_80452FEC: +.incbin "baserom.dol", 0x3D1E4C, 0x4 + +.global lbl_80452FF0 +lbl_80452FF0: +.incbin "baserom.dol", 0x3D1E50, 0x4 + +.global lbl_80452FF4 +lbl_80452FF4: +.incbin "baserom.dol", 0x3D1E54, 0x4 + +.global lbl_80452FF8 +lbl_80452FF8: +.incbin "baserom.dol", 0x3D1E58, 0x4 + +.global lbl_80452FFC +lbl_80452FFC: +.incbin "baserom.dol", 0x3D1E5C, 0x4 + +.global lbl_80453000 +lbl_80453000: +.incbin "baserom.dol", 0x3D1E60, 0x4 + +.global lbl_80453004 +lbl_80453004: +.incbin "baserom.dol", 0x3D1E64, 0x4 + +.global lbl_80453008 +lbl_80453008: +.incbin "baserom.dol", 0x3D1E68, 0x8 + +.global lbl_80453010 +lbl_80453010: +.incbin "baserom.dol", 0x3D1E70, 0x4 + +.global lbl_80453014 +lbl_80453014: +.incbin "baserom.dol", 0x3D1E74, 0x4 + +.global lbl_80453018 +lbl_80453018: +.incbin "baserom.dol", 0x3D1E78, 0x4 + +.global lbl_8045301C +lbl_8045301C: +.incbin "baserom.dol", 0x3D1E7C, 0x4 + +.global lbl_80453020 +lbl_80453020: +.incbin "baserom.dol", 0x3D1E80, 0x4 + +.global lbl_80453024 +lbl_80453024: +.incbin "baserom.dol", 0x3D1E84, 0x4 + +.global lbl_80453028 +lbl_80453028: +.incbin "baserom.dol", 0x3D1E88, 0x4 + +.global lbl_8045302C +lbl_8045302C: +.incbin "baserom.dol", 0x3D1E8C, 0x4 + +.global lbl_80453030 +lbl_80453030: +.incbin "baserom.dol", 0x3D1E90, 0x4 + +.global lbl_80453034 +lbl_80453034: +.incbin "baserom.dol", 0x3D1E94, 0x4 + +.global lbl_80453038 +lbl_80453038: +.incbin "baserom.dol", 0x3D1E98, 0x4 + +.global lbl_8045303C +lbl_8045303C: +.incbin "baserom.dol", 0x3D1E9C, 0x4 + +.global lbl_80453040 +lbl_80453040: +.incbin "baserom.dol", 0x3D1EA0, 0x4 + +.global lbl_80453044 +lbl_80453044: +.incbin "baserom.dol", 0x3D1EA4, 0x4 + +.global lbl_80453048 +lbl_80453048: +.incbin "baserom.dol", 0x3D1EA8, 0x4 + +.global lbl_8045304C +lbl_8045304C: +.incbin "baserom.dol", 0x3D1EAC, 0x4 + +.global lbl_80453050 +lbl_80453050: +.incbin "baserom.dol", 0x3D1EB0, 0x4 + +.global lbl_80453054 +lbl_80453054: +.incbin "baserom.dol", 0x3D1EB4, 0x4 + +.global lbl_80453058 +lbl_80453058: +.incbin "baserom.dol", 0x3D1EB8, 0x4 + +.global lbl_8045305C +lbl_8045305C: +.incbin "baserom.dol", 0x3D1EBC, 0x4 + +.global lbl_80453060 +lbl_80453060: +.incbin "baserom.dol", 0x3D1EC0, 0x4 + +.global lbl_80453064 +lbl_80453064: +.incbin "baserom.dol", 0x3D1EC4, 0x4 + +.global lbl_80453068 +lbl_80453068: +.incbin "baserom.dol", 0x3D1EC8, 0x4 + +.global lbl_8045306C +lbl_8045306C: +.incbin "baserom.dol", 0x3D1ECC, 0x4 + +.global lbl_80453070 +lbl_80453070: +.incbin "baserom.dol", 0x3D1ED0, 0x4 + +.global lbl_80453074 +lbl_80453074: +.incbin "baserom.dol", 0x3D1ED4, 0x4 + +.global lbl_80453078 +lbl_80453078: +.incbin "baserom.dol", 0x3D1ED8, 0x4 + +.global lbl_8045307C +lbl_8045307C: +.incbin "baserom.dol", 0x3D1EDC, 0x4 + +.global lbl_80453080 +lbl_80453080: +.incbin "baserom.dol", 0x3D1EE0, 0x4 + +.global lbl_80453084 +lbl_80453084: +.incbin "baserom.dol", 0x3D1EE4, 0x4 + +.global lbl_80453088 +lbl_80453088: +.incbin "baserom.dol", 0x3D1EE8, 0x4 + +.global lbl_8045308C +lbl_8045308C: +.incbin "baserom.dol", 0x3D1EEC, 0x4 + +.global lbl_80453090 +lbl_80453090: +.incbin "baserom.dol", 0x3D1EF0, 0x4 + +.global lbl_80453094 +lbl_80453094: +.incbin "baserom.dol", 0x3D1EF4, 0x8 + +.global lbl_8045309C +lbl_8045309C: +.incbin "baserom.dol", 0x3D1EFC, 0x8 + +.global lbl_804530A4 +lbl_804530A4: +.incbin "baserom.dol", 0x3D1F04, 0x8 + +.global lbl_804530AC +lbl_804530AC: +.incbin "baserom.dol", 0x3D1F0C, 0x4 + +.global lbl_804530B0 +lbl_804530B0: +.incbin "baserom.dol", 0x3D1F10, 0x8 + +.global lbl_804530B8 +lbl_804530B8: +.incbin "baserom.dol", 0x3D1F18, 0x4 + +.global lbl_804530BC +lbl_804530BC: +.incbin "baserom.dol", 0x3D1F1C, 0x4 + +.global lbl_804530C0 +lbl_804530C0: +.incbin "baserom.dol", 0x3D1F20, 0x8 + +.global lbl_804530C8 +lbl_804530C8: +.incbin "baserom.dol", 0x3D1F28, 0x8 + +.global lbl_804530D0 +lbl_804530D0: +.incbin "baserom.dol", 0x3D1F30, 0x8 + +.global lbl_804530D8 +lbl_804530D8: +.incbin "baserom.dol", 0x3D1F38, 0x8 + +.global lbl_804530E0 +lbl_804530E0: +.incbin "baserom.dol", 0x3D1F40, 0x8 + +.global lbl_804530E8 +lbl_804530E8: +.incbin "baserom.dol", 0x3D1F48, 0x8 + +.global lbl_804530F0 +lbl_804530F0: +.incbin "baserom.dol", 0x3D1F50, 0x4 + +.global lbl_804530F4 +lbl_804530F4: +.incbin "baserom.dol", 0x3D1F54, 0x4 + +.global lbl_804530F8 +lbl_804530F8: +.incbin "baserom.dol", 0x3D1F58, 0x8 + +.global lbl_80453100 +lbl_80453100: +.incbin "baserom.dol", 0x3D1F60, 0x4 + +.global lbl_80453104 +lbl_80453104: +.incbin "baserom.dol", 0x3D1F64, 0x8 + +.global lbl_8045310C +lbl_8045310C: +.incbin "baserom.dol", 0x3D1F6C, 0x4 + +.global lbl_80453110 +lbl_80453110: +.incbin "baserom.dol", 0x3D1F70, 0x4 + +.global lbl_80453114 +lbl_80453114: +.incbin "baserom.dol", 0x3D1F74, 0x4 + +.global lbl_80453118 +lbl_80453118: +.incbin "baserom.dol", 0x3D1F78, 0x4 + +.global lbl_8045311C +lbl_8045311C: +.incbin "baserom.dol", 0x3D1F7C, 0x4 + +.global lbl_80453120 +lbl_80453120: +.incbin "baserom.dol", 0x3D1F80, 0x4 + +.global lbl_80453124 +lbl_80453124: +.incbin "baserom.dol", 0x3D1F84, 0x4 + +.global lbl_80453128 +lbl_80453128: +.incbin "baserom.dol", 0x3D1F88, 0x4 + +.global lbl_8045312C +lbl_8045312C: +.incbin "baserom.dol", 0x3D1F8C, 0x4 + +.global lbl_80453130 +lbl_80453130: +.incbin "baserom.dol", 0x3D1F90, 0x4 + +.global lbl_80453134 +lbl_80453134: +.incbin "baserom.dol", 0x3D1F94, 0x4 + +.global lbl_80453138 +lbl_80453138: +.incbin "baserom.dol", 0x3D1F98, 0x4 + +.global lbl_8045313C +lbl_8045313C: +.incbin "baserom.dol", 0x3D1F9C, 0x4 + +.global lbl_80453140 +lbl_80453140: +.incbin "baserom.dol", 0x3D1FA0, 0x4 + +.global lbl_80453144 +lbl_80453144: +.incbin "baserom.dol", 0x3D1FA4, 0x4 + +.global lbl_80453148 +lbl_80453148: +.incbin "baserom.dol", 0x3D1FA8, 0x4 + +.global lbl_8045314C +lbl_8045314C: +.incbin "baserom.dol", 0x3D1FAC, 0x4 + +.global lbl_80453150 +lbl_80453150: +.incbin "baserom.dol", 0x3D1FB0, 0x4 + +.global lbl_80453154 +lbl_80453154: +.incbin "baserom.dol", 0x3D1FB4, 0x4 + +.global lbl_80453158 +lbl_80453158: +.incbin "baserom.dol", 0x3D1FB8, 0x4 + +.global lbl_8045315C +lbl_8045315C: +.incbin "baserom.dol", 0x3D1FBC, 0x4 + +.global lbl_80453160 +lbl_80453160: +.incbin "baserom.dol", 0x3D1FC0, 0x4 + +.global lbl_80453164 +lbl_80453164: +.incbin "baserom.dol", 0x3D1FC4, 0x4 + +.global lbl_80453168 +lbl_80453168: +.incbin "baserom.dol", 0x3D1FC8, 0x4 + +.global lbl_8045316C +lbl_8045316C: +.incbin "baserom.dol", 0x3D1FCC, 0x4 + +.global lbl_80453170 +lbl_80453170: +.incbin "baserom.dol", 0x3D1FD0, 0x4 + +.global lbl_80453174 +lbl_80453174: +.incbin "baserom.dol", 0x3D1FD4, 0x4 + +.global lbl_80453178 +lbl_80453178: +.incbin "baserom.dol", 0x3D1FD8, 0x4 + +.global lbl_8045317C +lbl_8045317C: +.incbin "baserom.dol", 0x3D1FDC, 0x4 + +.global lbl_80453180 +lbl_80453180: +.incbin "baserom.dol", 0x3D1FE0, 0x4 + +.global lbl_80453184 +lbl_80453184: +.incbin "baserom.dol", 0x3D1FE4, 0x4 + +.global lbl_80453188 +lbl_80453188: +.incbin "baserom.dol", 0x3D1FE8, 0x4 + +.global lbl_8045318C +lbl_8045318C: +.incbin "baserom.dol", 0x3D1FEC, 0x4 + +.global lbl_80453190 +lbl_80453190: +.incbin "baserom.dol", 0x3D1FF0, 0x4 + +.global lbl_80453194 +lbl_80453194: +.incbin "baserom.dol", 0x3D1FF4, 0x4 + +.global lbl_80453198 +lbl_80453198: +.incbin "baserom.dol", 0x3D1FF8, 0x4 + +.global lbl_8045319C +lbl_8045319C: +.incbin "baserom.dol", 0x3D1FFC, 0x4 + +.global lbl_804531A0 +lbl_804531A0: +.incbin "baserom.dol", 0x3D2000, 0x4 + +.global lbl_804531A4 +lbl_804531A4: +.incbin "baserom.dol", 0x3D2004, 0x4 + +.global lbl_804531A8 +lbl_804531A8: +.incbin "baserom.dol", 0x3D2008, 0x4 + +.global lbl_804531AC +lbl_804531AC: +.incbin "baserom.dol", 0x3D200C, 0x4 + +.global lbl_804531B0 +lbl_804531B0: +.incbin "baserom.dol", 0x3D2010, 0x4 + +.global lbl_804531B4 +lbl_804531B4: +.incbin "baserom.dol", 0x3D2014, 0x4 + +.global lbl_804531B8 +lbl_804531B8: +.incbin "baserom.dol", 0x3D2018, 0x4 + +.global lbl_804531BC +lbl_804531BC: +.incbin "baserom.dol", 0x3D201C, 0x4 + +.global lbl_804531C0 +lbl_804531C0: +.incbin "baserom.dol", 0x3D2020, 0x4 + +.global lbl_804531C4 +lbl_804531C4: +.incbin "baserom.dol", 0x3D2024, 0x4 + +.global lbl_804531C8 +lbl_804531C8: +.incbin "baserom.dol", 0x3D2028, 0x4 + +.global lbl_804531CC +lbl_804531CC: +.incbin "baserom.dol", 0x3D202C, 0x4 + +.global lbl_804531D0 +lbl_804531D0: +.incbin "baserom.dol", 0x3D2030, 0x4 + +.global lbl_804531D4 +lbl_804531D4: +.incbin "baserom.dol", 0x3D2034, 0x4 + +.global lbl_804531D8 +lbl_804531D8: +.incbin "baserom.dol", 0x3D2038, 0x8 + +.global lbl_804531E0 +lbl_804531E0: +.incbin "baserom.dol", 0x3D2040, 0x8 + +.global lbl_804531E8 +lbl_804531E8: +.incbin "baserom.dol", 0x3D2048, 0x8 + +.global lbl_804531F0 +lbl_804531F0: +.incbin "baserom.dol", 0x3D2050, 0x4 + +.global lbl_804531F4 +lbl_804531F4: +.incbin "baserom.dol", 0x3D2054, 0x4 + +.global lbl_804531F8 +lbl_804531F8: +.incbin "baserom.dol", 0x3D2058, 0x4 + +.global lbl_804531FC +lbl_804531FC: +.incbin "baserom.dol", 0x3D205C, 0x4 + +.global lbl_80453200 +lbl_80453200: +.incbin "baserom.dol", 0x3D2060, 0x4 + +.global lbl_80453204 +lbl_80453204: +.incbin "baserom.dol", 0x3D2064, 0x4 + +.global lbl_80453208 +lbl_80453208: +.incbin "baserom.dol", 0x3D2068, 0x4 + +.global lbl_8045320C +lbl_8045320C: +.incbin "baserom.dol", 0x3D206C, 0x4 + +.global lbl_80453210 +lbl_80453210: +.incbin "baserom.dol", 0x3D2070, 0x4 + +.global lbl_80453214 +lbl_80453214: +.incbin "baserom.dol", 0x3D2074, 0x4 + +.global lbl_80453218 +lbl_80453218: +.incbin "baserom.dol", 0x3D2078, 0x4 + +.global lbl_8045321C +lbl_8045321C: +.incbin "baserom.dol", 0x3D207C, 0x4 + +.global lbl_80453220 +lbl_80453220: +.incbin "baserom.dol", 0x3D2080, 0x4 + +.global lbl_80453224 +lbl_80453224: +.incbin "baserom.dol", 0x3D2084, 0x4 + +.global lbl_80453228 +lbl_80453228: +.incbin "baserom.dol", 0x3D2088, 0x4 + +.global lbl_8045322C +lbl_8045322C: +.incbin "baserom.dol", 0x3D208C, 0x4 + +.global lbl_80453230 +lbl_80453230: +.incbin "baserom.dol", 0x3D2090, 0x4 + +.global lbl_80453234 +lbl_80453234: +.incbin "baserom.dol", 0x3D2094, 0x4 + +.global lbl_80453238 +lbl_80453238: +.incbin "baserom.dol", 0x3D2098, 0x4 + +.global lbl_8045323C +lbl_8045323C: +.incbin "baserom.dol", 0x3D209C, 0x4 + +.global lbl_80453240 +lbl_80453240: +.incbin "baserom.dol", 0x3D20A0, 0x4 + +.global lbl_80453244 +lbl_80453244: +.incbin "baserom.dol", 0x3D20A4, 0x4 + +.global lbl_80453248 +lbl_80453248: +.incbin "baserom.dol", 0x3D20A8, 0x4 + +.global lbl_8045324C +lbl_8045324C: +.incbin "baserom.dol", 0x3D20AC, 0x4 + +.global lbl_80453250 +lbl_80453250: +.incbin "baserom.dol", 0x3D20B0, 0x4 + +.global lbl_80453254 +lbl_80453254: +.incbin "baserom.dol", 0x3D20B4, 0x4 + +.global lbl_80453258 +lbl_80453258: +.incbin "baserom.dol", 0x3D20B8, 0x4 + +.global lbl_8045325C +lbl_8045325C: +.incbin "baserom.dol", 0x3D20BC, 0x4 + +.global lbl_80453260 +lbl_80453260: +.incbin "baserom.dol", 0x3D20C0, 0x4 + +.global lbl_80453264 +lbl_80453264: +.incbin "baserom.dol", 0x3D20C4, 0x4 + +.global lbl_80453268 +lbl_80453268: +.incbin "baserom.dol", 0x3D20C8, 0x4 + +.global lbl_8045326C +lbl_8045326C: +.incbin "baserom.dol", 0x3D20CC, 0x4 + +.global lbl_80453270 +lbl_80453270: +.incbin "baserom.dol", 0x3D20D0, 0x4 + +.global lbl_80453274 +lbl_80453274: +.incbin "baserom.dol", 0x3D20D4, 0x4 + +.global lbl_80453278 +lbl_80453278: +.incbin "baserom.dol", 0x3D20D8, 0x8 + +.global lbl_80453280 +lbl_80453280: +.incbin "baserom.dol", 0x3D20E0, 0x4 + +.global lbl_80453284 +lbl_80453284: +.incbin "baserom.dol", 0x3D20E4, 0x4 + +.global lbl_80453288 +lbl_80453288: +.incbin "baserom.dol", 0x3D20E8, 0x4 + +.global lbl_8045328C +lbl_8045328C: +.incbin "baserom.dol", 0x3D20EC, 0x4 + +.global lbl_80453290 +lbl_80453290: +.incbin "baserom.dol", 0x3D20F0, 0x4 + +.global lbl_80453294 +lbl_80453294: +.incbin "baserom.dol", 0x3D20F4, 0x4 + +.global lbl_80453298 +lbl_80453298: +.incbin "baserom.dol", 0x3D20F8, 0x4 + +.global lbl_8045329C +lbl_8045329C: +.incbin "baserom.dol", 0x3D20FC, 0x4 + +.global lbl_804532A0 +lbl_804532A0: +.incbin "baserom.dol", 0x3D2100, 0x4 + +.global lbl_804532A4 +lbl_804532A4: +.incbin "baserom.dol", 0x3D2104, 0x4 + +.global lbl_804532A8 +lbl_804532A8: +.incbin "baserom.dol", 0x3D2108, 0x4 + +.global lbl_804532AC +lbl_804532AC: +.incbin "baserom.dol", 0x3D210C, 0x4 + +.global lbl_804532B0 +lbl_804532B0: +.incbin "baserom.dol", 0x3D2110, 0x4 + +.global lbl_804532B4 +lbl_804532B4: +.incbin "baserom.dol", 0x3D2114, 0x4 + +.global lbl_804532B8 +lbl_804532B8: +.incbin "baserom.dol", 0x3D2118, 0x4 + +.global lbl_804532BC +lbl_804532BC: +.incbin "baserom.dol", 0x3D211C, 0x4 + +.global lbl_804532C0 +lbl_804532C0: +.incbin "baserom.dol", 0x3D2120, 0x4 + +.global lbl_804532C4 +lbl_804532C4: +.incbin "baserom.dol", 0x3D2124, 0x4 + +.global lbl_804532C8 +lbl_804532C8: +.incbin "baserom.dol", 0x3D2128, 0x4 + +.global lbl_804532CC +lbl_804532CC: +.incbin "baserom.dol", 0x3D212C, 0x4 + +.global lbl_804532D0 +lbl_804532D0: +.incbin "baserom.dol", 0x3D2130, 0x4 + +.global lbl_804532D4 +lbl_804532D4: +.incbin "baserom.dol", 0x3D2134, 0x4 + +.global lbl_804532D8 +lbl_804532D8: +.incbin "baserom.dol", 0x3D2138, 0x4 + +.global lbl_804532DC +lbl_804532DC: +.incbin "baserom.dol", 0x3D213C, 0x4 + +.global lbl_804532E0 +lbl_804532E0: +.incbin "baserom.dol", 0x3D2140, 0x4 + +.global lbl_804532E4 +lbl_804532E4: +.incbin "baserom.dol", 0x3D2144, 0x4 + +.global lbl_804532E8 +lbl_804532E8: +.incbin "baserom.dol", 0x3D2148, 0x4 + +.global lbl_804532EC +lbl_804532EC: +.incbin "baserom.dol", 0x3D214C, 0x4 + +.global lbl_804532F0 +lbl_804532F0: +.incbin "baserom.dol", 0x3D2150, 0x4 + +.global lbl_804532F4 +lbl_804532F4: +.incbin "baserom.dol", 0x3D2154, 0x4 + +.global lbl_804532F8 +lbl_804532F8: +.incbin "baserom.dol", 0x3D2158, 0x8 + +.global lbl_80453300 +lbl_80453300: +.incbin "baserom.dol", 0x3D2160, 0x8 + +.global lbl_80453308 +lbl_80453308: +.incbin "baserom.dol", 0x3D2168, 0x8 + +.global lbl_80453310 +lbl_80453310: +.incbin "baserom.dol", 0x3D2170, 0x8 + +.global lbl_80453318 +lbl_80453318: +.incbin "baserom.dol", 0x3D2178, 0x8 + +.global lbl_80453320 +lbl_80453320: +.incbin "baserom.dol", 0x3D2180, 0x8 + +.global lbl_80453328 +lbl_80453328: +.incbin "baserom.dol", 0x3D2188, 0x8 + +.global lbl_80453330 +lbl_80453330: +.incbin "baserom.dol", 0x3D2190, 0x4 + +.global lbl_80453334 +lbl_80453334: +.incbin "baserom.dol", 0x3D2194, 0x4 + +.global lbl_80453338 +lbl_80453338: +.incbin "baserom.dol", 0x3D2198, 0x4 + +.global lbl_8045333C +lbl_8045333C: +.incbin "baserom.dol", 0x3D219C, 0x8 + +.global lbl_80453344 +lbl_80453344: +.incbin "baserom.dol", 0x3D21A4, 0x4 + +.global lbl_80453348 +lbl_80453348: +.incbin "baserom.dol", 0x3D21A8, 0x4 + +.global lbl_8045334C +lbl_8045334C: +.incbin "baserom.dol", 0x3D21AC, 0x4 + +.global lbl_80453350 +lbl_80453350: +.incbin "baserom.dol", 0x3D21B0, 0x4 + +.global lbl_80453354 +lbl_80453354: +.incbin "baserom.dol", 0x3D21B4, 0x4 + +.global lbl_80453358 +lbl_80453358: +.incbin "baserom.dol", 0x3D21B8, 0x4 + +.global lbl_8045335C +lbl_8045335C: +.incbin "baserom.dol", 0x3D21BC, 0x4 + +.global lbl_80453360 +lbl_80453360: +.incbin "baserom.dol", 0x3D21C0, 0x4 + +.global lbl_80453364 +lbl_80453364: +.incbin "baserom.dol", 0x3D21C4, 0x4 + +.global lbl_80453368 +lbl_80453368: +.incbin "baserom.dol", 0x3D21C8, 0x4 + +.global lbl_8045336C +lbl_8045336C: +.incbin "baserom.dol", 0x3D21CC, 0x4 + +.global lbl_80453370 +lbl_80453370: +.incbin "baserom.dol", 0x3D21D0, 0x4 + +.global lbl_80453374 +lbl_80453374: +.incbin "baserom.dol", 0x3D21D4, 0x4 + +.global lbl_80453378 +lbl_80453378: +.incbin "baserom.dol", 0x3D21D8, 0x4 + +.global lbl_8045337C +lbl_8045337C: +.incbin "baserom.dol", 0x3D21DC, 0x4 + +.global lbl_80453380 +lbl_80453380: +.incbin "baserom.dol", 0x3D21E0, 0x4 + +.global lbl_80453384 +lbl_80453384: +.incbin "baserom.dol", 0x3D21E4, 0x4 + +.global lbl_80453388 +lbl_80453388: +.incbin "baserom.dol", 0x3D21E8, 0x4 + +.global lbl_8045338C +lbl_8045338C: +.incbin "baserom.dol", 0x3D21EC, 0x4 + +.global lbl_80453390 +lbl_80453390: +.incbin "baserom.dol", 0x3D21F0, 0x4 + +.global lbl_80453394 +lbl_80453394: +.incbin "baserom.dol", 0x3D21F4, 0x4 + +.global lbl_80453398 +lbl_80453398: +.incbin "baserom.dol", 0x3D21F8, 0x4 + +.global lbl_8045339C +lbl_8045339C: +.incbin "baserom.dol", 0x3D21FC, 0x4 + +.global lbl_804533A0 +lbl_804533A0: +.incbin "baserom.dol", 0x3D2200, 0x8 + diff --git a/asm/sdata2/d_a_itembase.s b/asm/sdata2/d_a_itembase.s new file mode 100644 index 0000000000..2354a0c6b0 --- /dev/null +++ b/asm/sdata2/d_a_itembase.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804533a8 - 0x804533c8 + +.global lbl_804533A8 +lbl_804533A8: +.incbin "baserom.dol", 0x3D2208, 0x4 + +.global lbl_804533AC +lbl_804533AC: +.incbin "baserom.dol", 0x3D220C, 0x4 + +.global lbl_804533B0 +lbl_804533B0: +.incbin "baserom.dol", 0x3D2210, 0x8 + +.global lbl_804533B8 +lbl_804533B8: +.incbin "baserom.dol", 0x3D2218, 0x8 + +.global lbl_804533C0 +lbl_804533C0: +.incbin "baserom.dol", 0x3D2220, 0x8 + diff --git a/asm/sdata2/d_a_no_chg_room.s b/asm/sdata2/d_a_no_chg_room.s new file mode 100644 index 0000000000..86f22af31f --- /dev/null +++ b/asm/sdata2/d_a_no_chg_room.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804533c8 - 0x804533d8 + +.global lbl_804533C8 +lbl_804533C8: +.incbin "baserom.dol", 0x3D2228, 0x4 + +.global lbl_804533CC +lbl_804533CC: +.incbin "baserom.dol", 0x3D222C, 0x4 + +.global lbl_804533D0 +lbl_804533D0: +.incbin "baserom.dol", 0x3D2230, 0x8 + diff --git a/asm/sdata2/d_a_npc.s b/asm/sdata2/d_a_npc.s new file mode 100644 index 0000000000..e93abc4344 --- /dev/null +++ b/asm/sdata2/d_a_npc.s @@ -0,0 +1,203 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804533d8 - 0x804534b8 + +.global lbl_804533D8 +lbl_804533D8: +.incbin "baserom.dol", 0x3D2238, 0x4 + +.global lbl_804533DC +lbl_804533DC: +.incbin "baserom.dol", 0x3D223C, 0x4 + +.global lbl_804533E0 +lbl_804533E0: +.incbin "baserom.dol", 0x3D2240, 0x8 + +.global lbl_804533E8 +lbl_804533E8: +.incbin "baserom.dol", 0x3D2248, 0x4 + +.global lbl_804533EC +lbl_804533EC: +.incbin "baserom.dol", 0x3D224C, 0x4 + +.global lbl_804533F0 +lbl_804533F0: +.incbin "baserom.dol", 0x3D2250, 0x4 + +.global lbl_804533F4 +lbl_804533F4: +.incbin "baserom.dol", 0x3D2254, 0x4 + +.global lbl_804533F8 +lbl_804533F8: +.incbin "baserom.dol", 0x3D2258, 0x8 + +.global lbl_80453400 +lbl_80453400: +.incbin "baserom.dol", 0x3D2260, 0x8 + +.global lbl_80453408 +lbl_80453408: +.incbin "baserom.dol", 0x3D2268, 0x8 + +.global lbl_80453410 +lbl_80453410: +.incbin "baserom.dol", 0x3D2270, 0x8 + +.global lbl_80453418 +lbl_80453418: +.incbin "baserom.dol", 0x3D2278, 0x8 + +.global lbl_80453420 +lbl_80453420: +.incbin "baserom.dol", 0x3D2280, 0x4 + +.global lbl_80453424 +lbl_80453424: +.incbin "baserom.dol", 0x3D2284, 0x4 + +.global lbl_80453428 +lbl_80453428: +.incbin "baserom.dol", 0x3D2288, 0x4 + +.global lbl_8045342C +lbl_8045342C: +.incbin "baserom.dol", 0x3D228C, 0x4 + +.global lbl_80453430 +lbl_80453430: +.incbin "baserom.dol", 0x3D2290, 0x4 + +.global lbl_80453434 +lbl_80453434: +.incbin "baserom.dol", 0x3D2294, 0x4 + +.global lbl_80453438 +lbl_80453438: +.incbin "baserom.dol", 0x3D2298, 0x4 + +.global lbl_8045343C +lbl_8045343C: +.incbin "baserom.dol", 0x3D229C, 0x4 + +.global lbl_80453440 +lbl_80453440: +.incbin "baserom.dol", 0x3D22A0, 0x4 + +.global lbl_80453444 +lbl_80453444: +.incbin "baserom.dol", 0x3D22A4, 0x4 + +.global lbl_80453448 +lbl_80453448: +.incbin "baserom.dol", 0x3D22A8, 0x4 + +.global lbl_8045344C +lbl_8045344C: +.incbin "baserom.dol", 0x3D22AC, 0x4 + +.global lbl_80453450 +lbl_80453450: +.incbin "baserom.dol", 0x3D22B0, 0x4 + +.global lbl_80453454 +lbl_80453454: +.incbin "baserom.dol", 0x3D22B4, 0x4 + +.global lbl_80453458 +lbl_80453458: +.incbin "baserom.dol", 0x3D22B8, 0x4 + +.global lbl_8045345C +lbl_8045345C: +.incbin "baserom.dol", 0x3D22BC, 0x4 + +.global lbl_80453460 +lbl_80453460: +.incbin "baserom.dol", 0x3D22C0, 0x4 + +.global lbl_80453464 +lbl_80453464: +.incbin "baserom.dol", 0x3D22C4, 0x4 + +.global lbl_80453468 +lbl_80453468: +.incbin "baserom.dol", 0x3D22C8, 0x4 + +.global lbl_8045346C +lbl_8045346C: +.incbin "baserom.dol", 0x3D22CC, 0x4 + +.global lbl_80453470 +lbl_80453470: +.incbin "baserom.dol", 0x3D22D0, 0x4 + +.global lbl_80453474 +lbl_80453474: +.incbin "baserom.dol", 0x3D22D4, 0x4 + +.global lbl_80453478 +lbl_80453478: +.incbin "baserom.dol", 0x3D22D8, 0x4 + +.global lbl_8045347C +lbl_8045347C: +.incbin "baserom.dol", 0x3D22DC, 0x4 + +.global lbl_80453480 +lbl_80453480: +.incbin "baserom.dol", 0x3D22E0, 0x4 + +.global lbl_80453484 +lbl_80453484: +.incbin "baserom.dol", 0x3D22E4, 0x4 + +.global lbl_80453488 +lbl_80453488: +.incbin "baserom.dol", 0x3D22E8, 0x4 + +.global lbl_8045348C +lbl_8045348C: +.incbin "baserom.dol", 0x3D22EC, 0x4 + +.global lbl_80453490 +lbl_80453490: +.incbin "baserom.dol", 0x3D22F0, 0x4 + +.global lbl_80453494 +lbl_80453494: +.incbin "baserom.dol", 0x3D22F4, 0x4 + +.global lbl_80453498 +lbl_80453498: +.incbin "baserom.dol", 0x3D22F8, 0x4 + +.global lbl_8045349C +lbl_8045349C: +.incbin "baserom.dol", 0x3D22FC, 0x4 + +.global lbl_804534A0 +lbl_804534A0: +.incbin "baserom.dol", 0x3D2300, 0x4 + +.global lbl_804534A4 +lbl_804534A4: +.incbin "baserom.dol", 0x3D2304, 0x4 + +.global lbl_804534A8 +lbl_804534A8: +.incbin "baserom.dol", 0x3D2308, 0x4 + +.global lbl_804534AC +lbl_804534AC: +.incbin "baserom.dol", 0x3D230C, 0x4 + +.global lbl_804534B0 +lbl_804534B0: +.incbin "baserom.dol", 0x3D2310, 0x4 + +.global lbl_804534B4 +lbl_804534B4: +.incbin "baserom.dol", 0x3D2314, 0x4 + diff --git a/asm/sdata2/d_a_npc_cd.s b/asm/sdata2/d_a_npc_cd.s new file mode 100644 index 0000000000..2e8d9989df --- /dev/null +++ b/asm/sdata2/d_a_npc_cd.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804534b8 - 0x804534e0 + +.global lbl_804534B8 +lbl_804534B8: +.incbin "baserom.dol", 0x3D2318, 0x4 + +.global lbl_804534BC +lbl_804534BC: +.incbin "baserom.dol", 0x3D231C, 0x4 + +.global lbl_804534C0 +lbl_804534C0: +.incbin "baserom.dol", 0x3D2320, 0x8 + +.global lbl_804534C8 +lbl_804534C8: +.incbin "baserom.dol", 0x3D2328, 0x8 + +.global lbl_804534D0 +lbl_804534D0: +.incbin "baserom.dol", 0x3D2330, 0x4 + +.global lbl_804534D4 +lbl_804534D4: +.incbin "baserom.dol", 0x3D2334, 0x4 + +.global lbl_804534D8 +lbl_804534D8: +.incbin "baserom.dol", 0x3D2338, 0x4 + +.global lbl_804534DC +lbl_804534DC: +.incbin "baserom.dol", 0x3D233C, 0x4 + diff --git a/asm/sdata2/d_a_npc_cd2.s b/asm/sdata2/d_a_npc_cd2.s new file mode 100644 index 0000000000..873f8fb3f2 --- /dev/null +++ b/asm/sdata2/d_a_npc_cd2.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804534e0 - 0x80453550 + +.global lbl_804534E0 +lbl_804534E0: +.incbin "baserom.dol", 0x3D2340, 0x4 + +.global lbl_804534E4 +lbl_804534E4: +.incbin "baserom.dol", 0x3D2344, 0x4 + +.global lbl_804534E8 +lbl_804534E8: +.incbin "baserom.dol", 0x3D2348, 0x8 + +.global lbl_804534F0 +lbl_804534F0: +.incbin "baserom.dol", 0x3D2350, 0x8 + +.global lbl_804534F8 +lbl_804534F8: +.incbin "baserom.dol", 0x3D2358, 0x4 + +.global lbl_804534FC +lbl_804534FC: +.incbin "baserom.dol", 0x3D235C, 0x4 + +.global lbl_80453500 +lbl_80453500: +.incbin "baserom.dol", 0x3D2360, 0x4 + +.global lbl_80453504 +lbl_80453504: +.incbin "baserom.dol", 0x3D2364, 0x4 + +.global lbl_80453508 +lbl_80453508: +.incbin "baserom.dol", 0x3D2368, 0x8 + +.global lbl_80453510 +lbl_80453510: +.incbin "baserom.dol", 0x3D2370, 0x8 + +.global lbl_80453518 +lbl_80453518: +.incbin "baserom.dol", 0x3D2378, 0x8 + +.global lbl_80453520 +lbl_80453520: +.incbin "baserom.dol", 0x3D2380, 0x8 + +.global lbl_80453528 +lbl_80453528: +.incbin "baserom.dol", 0x3D2388, 0x8 + +.global lbl_80453530 +lbl_80453530: +.incbin "baserom.dol", 0x3D2390, 0x8 + +.global lbl_80453538 +lbl_80453538: +.incbin "baserom.dol", 0x3D2398, 0x8 + +.global lbl_80453540 +lbl_80453540: +.incbin "baserom.dol", 0x3D23A0, 0x8 + +.global lbl_80453548 +lbl_80453548: +.incbin "baserom.dol", 0x3D23A8, 0x8 + diff --git a/asm/sdata2/d_a_obj.s b/asm/sdata2/d_a_obj.s new file mode 100644 index 0000000000..6b7067c2c2 --- /dev/null +++ b/asm/sdata2/d_a_obj.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451d98 - 0x80451db0 + +.global lbl_80451D98 +lbl_80451D98: +.incbin "baserom.dol", 0x3D0BF8, 0x4 + +.global lbl_80451D9C +lbl_80451D9C: +.incbin "baserom.dol", 0x3D0BFC, 0x4 + +.global lbl_80451DA0 +lbl_80451DA0: +.incbin "baserom.dol", 0x3D0C00, 0x4 + +.global lbl_80451DA4 +lbl_80451DA4: +.incbin "baserom.dol", 0x3D0C04, 0x4 + +.global lbl_80451DA8 +lbl_80451DA8: +.incbin "baserom.dol", 0x3D0C08, 0x8 + diff --git a/asm/sdata2/d_a_obj_item.s b/asm/sdata2/d_a_obj_item.s new file mode 100644 index 0000000000..35a7612f38 --- /dev/null +++ b/asm/sdata2/d_a_obj_item.s @@ -0,0 +1,115 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453550 - 0x804535e0 + +.global lbl_80453550 +lbl_80453550: +.incbin "baserom.dol", 0x3D23B0, 0x8 + +.global lbl_80453558 +lbl_80453558: +.incbin "baserom.dol", 0x3D23B8, 0x8 + +.global lbl_80453560 +lbl_80453560: +.incbin "baserom.dol", 0x3D23C0, 0x8 + +.global lbl_80453568 +lbl_80453568: +.incbin "baserom.dol", 0x3D23C8, 0x8 + +.global lbl_80453570 +lbl_80453570: +.incbin "baserom.dol", 0x3D23D0, 0x4 + +.global lbl_80453574 +lbl_80453574: +.incbin "baserom.dol", 0x3D23D4, 0x4 + +.global lbl_80453578 +lbl_80453578: +.incbin "baserom.dol", 0x3D23D8, 0x4 + +.global lbl_8045357C +lbl_8045357C: +.incbin "baserom.dol", 0x3D23DC, 0x4 + +.global lbl_80453580 +lbl_80453580: +.incbin "baserom.dol", 0x3D23E0, 0x8 + +.global lbl_80453588 +lbl_80453588: +.incbin "baserom.dol", 0x3D23E8, 0x8 + +.global lbl_80453590 +lbl_80453590: +.incbin "baserom.dol", 0x3D23F0, 0x4 + +.global lbl_80453594 +lbl_80453594: +.incbin "baserom.dol", 0x3D23F4, 0x4 + +.global lbl_80453598 +lbl_80453598: +.incbin "baserom.dol", 0x3D23F8, 0x4 + +.global lbl_8045359C +lbl_8045359C: +.incbin "baserom.dol", 0x3D23FC, 0x4 + +.global lbl_804535A0 +lbl_804535A0: +.incbin "baserom.dol", 0x3D2400, 0x4 + +.global lbl_804535A4 +lbl_804535A4: +.incbin "baserom.dol", 0x3D2404, 0x4 + +.global lbl_804535A8 +lbl_804535A8: +.incbin "baserom.dol", 0x3D2408, 0x8 + +.global lbl_804535B0 +lbl_804535B0: +.incbin "baserom.dol", 0x3D2410, 0x8 + +.global lbl_804535B8 +lbl_804535B8: +.incbin "baserom.dol", 0x3D2418, 0x4 + +.global lbl_804535BC +lbl_804535BC: +.incbin "baserom.dol", 0x3D241C, 0x4 + +.global lbl_804535C0 +lbl_804535C0: +.incbin "baserom.dol", 0x3D2420, 0x4 + +.global lbl_804535C4 +lbl_804535C4: +.incbin "baserom.dol", 0x3D2424, 0x4 + +.global lbl_804535C8 +lbl_804535C8: +.incbin "baserom.dol", 0x3D2428, 0x4 + +.global lbl_804535CC +lbl_804535CC: +.incbin "baserom.dol", 0x3D242C, 0x4 + +.global lbl_804535D0 +lbl_804535D0: +.incbin "baserom.dol", 0x3D2430, 0x4 + +.global lbl_804535D4 +lbl_804535D4: +.incbin "baserom.dol", 0x3D2434, 0x4 + +.global lbl_804535D8 +lbl_804535D8: +.incbin "baserom.dol", 0x3D2438, 0x4 + +.global lbl_804535DC +lbl_804535DC: +.incbin "baserom.dol", 0x3D243C, 0x4 + diff --git a/asm/sdata2/d_a_player.s b/asm/sdata2/d_a_player.s new file mode 100644 index 0000000000..4873c2a561 --- /dev/null +++ b/asm/sdata2/d_a_player.s @@ -0,0 +1,95 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453600 - 0x80453690 + +.global lbl_80453600 +lbl_80453600: +.incbin "baserom.dol", 0x3D2460, 0x8 + +.global lbl_80453608 +lbl_80453608: +.incbin "baserom.dol", 0x3D2468, 0x8 + +.global lbl_80453610 +lbl_80453610: +.incbin "baserom.dol", 0x3D2470, 0x4 + +.global lbl_80453614 +lbl_80453614: +.incbin "baserom.dol", 0x3D2474, 0x4 + +.global lbl_80453618 +lbl_80453618: +.incbin "baserom.dol", 0x3D2478, 0x4 + +.global lbl_8045361C +lbl_8045361C: +.incbin "baserom.dol", 0x3D247C, 0x4 + +.global lbl_80453620 +lbl_80453620: +.incbin "baserom.dol", 0x3D2480, 0x4 + +.global lbl_80453624 +lbl_80453624: +.incbin "baserom.dol", 0x3D2484, 0x4 + +.global lbl_80453628 +lbl_80453628: +.incbin "baserom.dol", 0x3D2488, 0x8 + +.global lbl_80453630 +lbl_80453630: +.incbin "baserom.dol", 0x3D2490, 0x8 + +.global lbl_80453638 +lbl_80453638: +.incbin "baserom.dol", 0x3D2498, 0x8 + +.global lbl_80453640 +lbl_80453640: +.incbin "baserom.dol", 0x3D24A0, 0x8 + +.global lbl_80453648 +lbl_80453648: +.incbin "baserom.dol", 0x3D24A8, 0x8 + +.global lbl_80453650 +lbl_80453650: +.incbin "baserom.dol", 0x3D24B0, 0x8 + +.global lbl_80453658 +lbl_80453658: +.incbin "baserom.dol", 0x3D24B8, 0x8 + +.global lbl_80453660 +lbl_80453660: +.incbin "baserom.dol", 0x3D24C0, 0x8 + +.global lbl_80453668 +lbl_80453668: +.incbin "baserom.dol", 0x3D24C8, 0x8 + +.global lbl_80453670 +lbl_80453670: +.incbin "baserom.dol", 0x3D24D0, 0x8 + +.global lbl_80453678 +lbl_80453678: +.incbin "baserom.dol", 0x3D24D8, 0x4 + +.global lbl_8045367C +lbl_8045367C: +.incbin "baserom.dol", 0x3D24DC, 0x4 + +.global lbl_80453680 +lbl_80453680: +.incbin "baserom.dol", 0x3D24E0, 0x4 + +.global lbl_80453684 +lbl_80453684: +.incbin "baserom.dol", 0x3D24E4, 0x4 + +.global lbl_80453688 +lbl_80453688: +.incbin "baserom.dol", 0x3D24E8, 0x8 + diff --git a/asm/sdata2/d_attention.s b/asm/sdata2/d_attention.s new file mode 100644 index 0000000000..0ada09a4de --- /dev/null +++ b/asm/sdata2/d_attention.s @@ -0,0 +1,119 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452628 - 0x804526b8 + +.global lbl_80452628 +lbl_80452628: +.incbin "baserom.dol", 0x3D1488, 0x4 + +.global lbl_8045262C +lbl_8045262C: +.incbin "baserom.dol", 0x3D148C, 0x4 + +.global lbl_80452630 +lbl_80452630: +.incbin "baserom.dol", 0x3D1490, 0x4 + +.global lbl_80452634 +lbl_80452634: +.incbin "baserom.dol", 0x3D1494, 0x4 + +.global lbl_80452638 +lbl_80452638: +.incbin "baserom.dol", 0x3D1498, 0x4 + +.global lbl_8045263C +lbl_8045263C: +.incbin "baserom.dol", 0x3D149C, 0x4 + +.global lbl_80452640 +lbl_80452640: +.incbin "baserom.dol", 0x3D14A0, 0x4 + +.global lbl_80452644 +lbl_80452644: +.incbin "baserom.dol", 0x3D14A4, 0x4 + +.global lbl_80452648 +lbl_80452648: +.incbin "baserom.dol", 0x3D14A8, 0x4 + +.global lbl_8045264C +lbl_8045264C: +.incbin "baserom.dol", 0x3D14AC, 0x4 + +.global lbl_80452650 +lbl_80452650: +.incbin "baserom.dol", 0x3D14B0, 0x4 + +.global lbl_80452654 +lbl_80452654: +.incbin "baserom.dol", 0x3D14B4, 0x4 + +.global lbl_80452658 +lbl_80452658: +.incbin "baserom.dol", 0x3D14B8, 0x4 + +.global lbl_8045265C +lbl_8045265C: +.incbin "baserom.dol", 0x3D14BC, 0x4 + +.global lbl_80452660 +lbl_80452660: +.incbin "baserom.dol", 0x3D14C0, 0x4 + +.global lbl_80452664 +lbl_80452664: +.incbin "baserom.dol", 0x3D14C4, 0x4 + +.global lbl_80452668 +lbl_80452668: +.incbin "baserom.dol", 0x3D14C8, 0x8 + +.global lbl_80452670 +lbl_80452670: +.incbin "baserom.dol", 0x3D14D0, 0x8 + +.global lbl_80452678 +lbl_80452678: +.incbin "baserom.dol", 0x3D14D8, 0x8 + +.global lbl_80452680 +lbl_80452680: +.incbin "baserom.dol", 0x3D14E0, 0x8 + +.global lbl_80452688 +lbl_80452688: +.incbin "baserom.dol", 0x3D14E8, 0x8 + +.global lbl_80452690 +lbl_80452690: +.incbin "baserom.dol", 0x3D14F0, 0x4 + +.global lbl_80452694 +lbl_80452694: +.incbin "baserom.dol", 0x3D14F4, 0x4 + +.global lbl_80452698 +lbl_80452698: +.incbin "baserom.dol", 0x3D14F8, 0x4 + +.global lbl_8045269C +lbl_8045269C: +.incbin "baserom.dol", 0x3D14FC, 0x4 + +.global lbl_804526A0 +lbl_804526A0: +.incbin "baserom.dol", 0x3D1500, 0x8 + +.global lbl_804526A8 +lbl_804526A8: +.incbin "baserom.dol", 0x3D1508, 0x8 + +.global lbl_804526B0 +lbl_804526B0: +.incbin "baserom.dol", 0x3D1510, 0x4 + +.global lbl_804526B4 +lbl_804526B4: +.incbin "baserom.dol", 0x3D1514, 0x4 + diff --git a/asm/sdata2/d_bg_s.s b/asm/sdata2/d_bg_s.s new file mode 100644 index 0000000000..27af84f3d7 --- /dev/null +++ b/asm/sdata2/d_bg_s.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804526b8 - 0x804526c0 + +.global lbl_804526B8 +lbl_804526B8: +.incbin "baserom.dol", 0x3D1518, 0x8 + diff --git a/asm/sdata2/d_bg_s_acch.s b/asm/sdata2/d_bg_s_acch.s new file mode 100644 index 0000000000..b6aa7f6d1a --- /dev/null +++ b/asm/sdata2/d_bg_s_acch.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804526c0 - 0x804526e8 + +.global lbl_804526C0 +lbl_804526C0: +.incbin "baserom.dol", 0x3D1520, 0x4 + +.global lbl_804526C4 +lbl_804526C4: +.incbin "baserom.dol", 0x3D1524, 0x4 + +.global lbl_804526C8 +lbl_804526C8: +.incbin "baserom.dol", 0x3D1528, 0x4 + +.global lbl_804526CC +lbl_804526CC: +.incbin "baserom.dol", 0x3D152C, 0x4 + +.global lbl_804526D0 +lbl_804526D0: +.incbin "baserom.dol", 0x3D1530, 0x4 + +.global lbl_804526D4 +lbl_804526D4: +.incbin "baserom.dol", 0x3D1534, 0x4 + +.global lbl_804526D8 +lbl_804526D8: +.incbin "baserom.dol", 0x3D1538, 0x4 + +.global lbl_804526DC +lbl_804526DC: +.incbin "baserom.dol", 0x3D153C, 0x4 + +.global lbl_804526E0 +lbl_804526E0: +.incbin "baserom.dol", 0x3D1540, 0x8 + diff --git a/asm/sdata2/d_bg_s_roof_chk.s b/asm/sdata2/d_bg_s_roof_chk.s new file mode 100644 index 0000000000..cca10afc1e --- /dev/null +++ b/asm/sdata2/d_bg_s_roof_chk.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804526f0 - 0x804526f8 + +.global lbl_804526F0 +lbl_804526F0: +.incbin "baserom.dol", 0x3D1550, 0x4 + +.global lbl_804526F4 +lbl_804526F4: +.incbin "baserom.dol", 0x3D1554, 0x4 + diff --git a/asm/sdata2/d_bg_s_spl_grp_chk.s b/asm/sdata2/d_bg_s_spl_grp_chk.s new file mode 100644 index 0000000000..b380f41555 --- /dev/null +++ b/asm/sdata2/d_bg_s_spl_grp_chk.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804526e8 - 0x804526f0 + +.global lbl_804526E8 +lbl_804526E8: +.incbin "baserom.dol", 0x3D1548, 0x4 + +.global lbl_804526EC +lbl_804526EC: +.incbin "baserom.dol", 0x3D154C, 0x4 + diff --git a/asm/sdata2/d_bg_w.s b/asm/sdata2/d_bg_w.s new file mode 100644 index 0000000000..0a8590dfcd --- /dev/null +++ b/asm/sdata2/d_bg_w.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804526f8 - 0x80452718 + +.global lbl_804526F8 +lbl_804526F8: +.incbin "baserom.dol", 0x3D1558, 0x4 + +.global lbl_804526FC +lbl_804526FC: +.incbin "baserom.dol", 0x3D155C, 0x4 + +.global lbl_80452700 +lbl_80452700: +.incbin "baserom.dol", 0x3D1560, 0x4 + +.global lbl_80452704 +lbl_80452704: +.incbin "baserom.dol", 0x3D1564, 0x4 + +.global lbl_80452708 +lbl_80452708: +.incbin "baserom.dol", 0x3D1568, 0x4 + +.global lbl_8045270C +lbl_8045270C: +.incbin "baserom.dol", 0x3D156C, 0x4 + +.global lbl_80452710 +lbl_80452710: +.incbin "baserom.dol", 0x3D1570, 0x8 + diff --git a/asm/sdata2/d_bg_w_kcol.s b/asm/sdata2/d_bg_w_kcol.s new file mode 100644 index 0000000000..3ea651425c --- /dev/null +++ b/asm/sdata2/d_bg_w_kcol.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452718 - 0x80452758 + +.global lbl_80452718 +lbl_80452718: +.incbin "baserom.dol", 0x3D1578, 0x4 + +.global lbl_8045271C +lbl_8045271C: +.incbin "baserom.dol", 0x3D157C, 0x4 + +.global lbl_80452720 +lbl_80452720: +.incbin "baserom.dol", 0x3D1580, 0x4 + +.global lbl_80452724 +lbl_80452724: +.incbin "baserom.dol", 0x3D1584, 0x4 + +.global lbl_80452728 +lbl_80452728: +.incbin "baserom.dol", 0x3D1588, 0x4 + +.global lbl_8045272C +lbl_8045272C: +.incbin "baserom.dol", 0x3D158C, 0x4 + +.global lbl_80452730 +lbl_80452730: +.incbin "baserom.dol", 0x3D1590, 0x8 + +.global lbl_80452738 +lbl_80452738: +.incbin "baserom.dol", 0x3D1598, 0x8 + +.global lbl_80452740 +lbl_80452740: +.incbin "baserom.dol", 0x3D15A0, 0x8 + +.global lbl_80452748 +lbl_80452748: +.incbin "baserom.dol", 0x3D15A8, 0x8 + +.global lbl_80452750 +lbl_80452750: +.incbin "baserom.dol", 0x3D15B0, 0x8 + diff --git a/asm/sdata2/d_bg_w_sv.s b/asm/sdata2/d_bg_w_sv.s new file mode 100644 index 0000000000..a4e0a5b0d6 --- /dev/null +++ b/asm/sdata2/d_bg_w_sv.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452758 - 0x80452760 + +.global lbl_80452758 +lbl_80452758: +.incbin "baserom.dol", 0x3D15B8, 0x4 + +.global lbl_8045275C +lbl_8045275C: +.incbin "baserom.dol", 0x3D15BC, 0x4 + diff --git a/asm/sdata2/d_bright_check.s b/asm/sdata2/d_bright_check.s new file mode 100644 index 0000000000..4edaec5d5e --- /dev/null +++ b/asm/sdata2/d_bright_check.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453a00 - 0x80453a10 + +.global lbl_80453A00 +lbl_80453A00: +.incbin "baserom.dol", 0x3D2860, 0x4 + +.global lbl_80453A04 +lbl_80453A04: +.incbin "baserom.dol", 0x3D2864, 0x4 + +.global lbl_80453A08 +lbl_80453A08: +.incbin "baserom.dol", 0x3D2868, 0x8 + diff --git a/asm/sdata2/d_cam_param.s b/asm/sdata2/d_cam_param.s new file mode 100644 index 0000000000..4e31f9303b --- /dev/null +++ b/asm/sdata2/d_cam_param.s @@ -0,0 +1,207 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804527c8 - 0x804528b8 + +.global lbl_804527C8 +lbl_804527C8: +.incbin "baserom.dol", 0x3D1628, 0x8 + +.global lbl_804527D0 +lbl_804527D0: +.incbin "baserom.dol", 0x3D1630, 0x8 + +.global lbl_804527D8 +lbl_804527D8: +.incbin "baserom.dol", 0x3D1638, 0x8 + +.global lbl_804527E0 +lbl_804527E0: +.incbin "baserom.dol", 0x3D1640, 0x8 + +.global lbl_804527E8 +lbl_804527E8: +.incbin "baserom.dol", 0x3D1648, 0x8 + +.global lbl_804527F0 +lbl_804527F0: +.incbin "baserom.dol", 0x3D1650, 0x8 + +.global lbl_804527F8 +lbl_804527F8: +.incbin "baserom.dol", 0x3D1658, 0x8 + +.global lbl_80452800 +lbl_80452800: +.incbin "baserom.dol", 0x3D1660, 0x8 + +.global lbl_80452808 +lbl_80452808: +.incbin "baserom.dol", 0x3D1668, 0x8 + +.global lbl_80452810 +lbl_80452810: +.incbin "baserom.dol", 0x3D1670, 0x4 + +.global lbl_80452814 +lbl_80452814: +.incbin "baserom.dol", 0x3D1674, 0x4 + +.global lbl_80452818 +lbl_80452818: +.incbin "baserom.dol", 0x3D1678, 0x4 + +.global lbl_8045281C +lbl_8045281C: +.incbin "baserom.dol", 0x3D167C, 0x4 + +.global lbl_80452820 +lbl_80452820: +.incbin "baserom.dol", 0x3D1680, 0x4 + +.global lbl_80452824 +lbl_80452824: +.incbin "baserom.dol", 0x3D1684, 0x4 + +.global lbl_80452828 +lbl_80452828: +.incbin "baserom.dol", 0x3D1688, 0x4 + +.global lbl_8045282C +lbl_8045282C: +.incbin "baserom.dol", 0x3D168C, 0x4 + +.global lbl_80452830 +lbl_80452830: +.incbin "baserom.dol", 0x3D1690, 0x4 + +.global lbl_80452834 +lbl_80452834: +.incbin "baserom.dol", 0x3D1694, 0x4 + +.global lbl_80452838 +lbl_80452838: +.incbin "baserom.dol", 0x3D1698, 0x4 + +.global lbl_8045283C +lbl_8045283C: +.incbin "baserom.dol", 0x3D169C, 0x4 + +.global lbl_80452840 +lbl_80452840: +.incbin "baserom.dol", 0x3D16A0, 0x4 + +.global lbl_80452844 +lbl_80452844: +.incbin "baserom.dol", 0x3D16A4, 0x4 + +.global lbl_80452848 +lbl_80452848: +.incbin "baserom.dol", 0x3D16A8, 0x4 + +.global lbl_8045284C +lbl_8045284C: +.incbin "baserom.dol", 0x3D16AC, 0x4 + +.global lbl_80452850 +lbl_80452850: +.incbin "baserom.dol", 0x3D16B0, 0x4 + +.global lbl_80452854 +lbl_80452854: +.incbin "baserom.dol", 0x3D16B4, 0x4 + +.global lbl_80452858 +lbl_80452858: +.incbin "baserom.dol", 0x3D16B8, 0x4 + +.global lbl_8045285C +lbl_8045285C: +.incbin "baserom.dol", 0x3D16BC, 0x4 + +.global lbl_80452860 +lbl_80452860: +.incbin "baserom.dol", 0x3D16C0, 0x4 + +.global lbl_80452864 +lbl_80452864: +.incbin "baserom.dol", 0x3D16C4, 0x4 + +.global lbl_80452868 +lbl_80452868: +.incbin "baserom.dol", 0x3D16C8, 0x4 + +.global lbl_8045286C +lbl_8045286C: +.incbin "baserom.dol", 0x3D16CC, 0x4 + +.global lbl_80452870 +lbl_80452870: +.incbin "baserom.dol", 0x3D16D0, 0x4 + +.global lbl_80452874 +lbl_80452874: +.incbin "baserom.dol", 0x3D16D4, 0x4 + +.global lbl_80452878 +lbl_80452878: +.incbin "baserom.dol", 0x3D16D8, 0x4 + +.global lbl_8045287C +lbl_8045287C: +.incbin "baserom.dol", 0x3D16DC, 0x4 + +.global lbl_80452880 +lbl_80452880: +.incbin "baserom.dol", 0x3D16E0, 0x4 + +.global lbl_80452884 +lbl_80452884: +.incbin "baserom.dol", 0x3D16E4, 0x4 + +.global lbl_80452888 +lbl_80452888: +.incbin "baserom.dol", 0x3D16E8, 0x4 + +.global lbl_8045288C +lbl_8045288C: +.incbin "baserom.dol", 0x3D16EC, 0x4 + +.global lbl_80452890 +lbl_80452890: +.incbin "baserom.dol", 0x3D16F0, 0x4 + +.global lbl_80452894 +lbl_80452894: +.incbin "baserom.dol", 0x3D16F4, 0x4 + +.global lbl_80452898 +lbl_80452898: +.incbin "baserom.dol", 0x3D16F8, 0x4 + +.global lbl_8045289C +lbl_8045289C: +.incbin "baserom.dol", 0x3D16FC, 0x4 + +.global lbl_804528A0 +lbl_804528A0: +.incbin "baserom.dol", 0x3D1700, 0x4 + +.global lbl_804528A4 +lbl_804528A4: +.incbin "baserom.dol", 0x3D1704, 0x4 + +.global lbl_804528A8 +lbl_804528A8: +.incbin "baserom.dol", 0x3D1708, 0x4 + +.global lbl_804528AC +lbl_804528AC: +.incbin "baserom.dol", 0x3D170C, 0x4 + +.global lbl_804528B0 +lbl_804528B0: +.incbin "baserom.dol", 0x3D1710, 0x4 + +.global lbl_804528B4 +lbl_804528B4: +.incbin "baserom.dol", 0x3D1714, 0x4 + diff --git a/asm/sdata2/d_camera.s b/asm/sdata2/d_camera.s new file mode 100644 index 0000000000..038aac0317 --- /dev/null +++ b/asm/sdata2/d_camera.s @@ -0,0 +1,639 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453690 - 0x80453928 + +.global lbl_80453690 +lbl_80453690: +.incbin "baserom.dol", 0x3D24F0, 0x8 + +.global lbl_80453698 +lbl_80453698: +.incbin "baserom.dol", 0x3D24F8, 0x8 + +.global lbl_804536A0 +lbl_804536A0: +.incbin "baserom.dol", 0x3D2500, 0x4 + +.global lbl_804536A4 +lbl_804536A4: +.incbin "baserom.dol", 0x3D2504, 0x4 + +.global lbl_804536A8 +lbl_804536A8: +.incbin "baserom.dol", 0x3D2508, 0x4 + +.global lbl_804536AC +lbl_804536AC: +.incbin "baserom.dol", 0x3D250C, 0x4 + +.global lbl_804536B0 +lbl_804536B0: +.incbin "baserom.dol", 0x3D2510, 0x4 + +.global lbl_804536B4 +lbl_804536B4: +.incbin "baserom.dol", 0x3D2514, 0x4 + +.global lbl_804536B8 +lbl_804536B8: +.incbin "baserom.dol", 0x3D2518, 0x4 + +.global lbl_804536BC +lbl_804536BC: +.incbin "baserom.dol", 0x3D251C, 0x4 + +.global lbl_804536C0 +lbl_804536C0: +.incbin "baserom.dol", 0x3D2520, 0x8 + +.global lbl_804536C8 +lbl_804536C8: +.incbin "baserom.dol", 0x3D2528, 0x8 + +.global lbl_804536D0 +lbl_804536D0: +.incbin "baserom.dol", 0x3D2530, 0x8 + +.global lbl_804536D8 +lbl_804536D8: +.incbin "baserom.dol", 0x3D2538, 0x8 + +.global lbl_804536E0 +lbl_804536E0: +.incbin "baserom.dol", 0x3D2540, 0x4 + +.global lbl_804536E4 +lbl_804536E4: +.incbin "baserom.dol", 0x3D2544, 0x4 + +.global lbl_804536E8 +lbl_804536E8: +.incbin "baserom.dol", 0x3D2548, 0x4 + +.global lbl_804536EC +lbl_804536EC: +.incbin "baserom.dol", 0x3D254C, 0x4 + +.global lbl_804536F0 +lbl_804536F0: +.incbin "baserom.dol", 0x3D2550, 0x4 + +.global lbl_804536F4 +lbl_804536F4: +.incbin "baserom.dol", 0x3D2554, 0x4 + +.global lbl_804536F8 +lbl_804536F8: +.incbin "baserom.dol", 0x3D2558, 0x4 + +.global lbl_804536FC +lbl_804536FC: +.incbin "baserom.dol", 0x3D255C, 0x4 + +.global lbl_80453700 +lbl_80453700: +.incbin "baserom.dol", 0x3D2560, 0x4 + +.global lbl_80453704 +lbl_80453704: +.incbin "baserom.dol", 0x3D2564, 0x4 + +.global lbl_80453708 +lbl_80453708: +.incbin "baserom.dol", 0x3D2568, 0x4 + +.global lbl_8045370C +lbl_8045370C: +.incbin "baserom.dol", 0x3D256C, 0x4 + +.global lbl_80453710 +lbl_80453710: +.incbin "baserom.dol", 0x3D2570, 0x4 + +.global lbl_80453714 +lbl_80453714: +.incbin "baserom.dol", 0x3D2574, 0x4 + +.global lbl_80453718 +lbl_80453718: +.incbin "baserom.dol", 0x3D2578, 0x4 + +.global lbl_8045371C +lbl_8045371C: +.incbin "baserom.dol", 0x3D257C, 0x4 + +.global lbl_80453720 +lbl_80453720: +.incbin "baserom.dol", 0x3D2580, 0x4 + +.global lbl_80453724 +lbl_80453724: +.incbin "baserom.dol", 0x3D2584, 0x4 + +.global lbl_80453728 +lbl_80453728: +.incbin "baserom.dol", 0x3D2588, 0x4 + +.global lbl_8045372C +lbl_8045372C: +.incbin "baserom.dol", 0x3D258C, 0x4 + +.global lbl_80453730 +lbl_80453730: +.incbin "baserom.dol", 0x3D2590, 0x4 + +.global lbl_80453734 +lbl_80453734: +.incbin "baserom.dol", 0x3D2594, 0x4 + +.global lbl_80453738 +lbl_80453738: +.incbin "baserom.dol", 0x3D2598, 0x4 + +.global lbl_8045373C +lbl_8045373C: +.incbin "baserom.dol", 0x3D259C, 0x4 + +.global lbl_80453740 +lbl_80453740: +.incbin "baserom.dol", 0x3D25A0, 0x4 + +.global lbl_80453744 +lbl_80453744: +.incbin "baserom.dol", 0x3D25A4, 0x4 + +.global lbl_80453748 +lbl_80453748: +.incbin "baserom.dol", 0x3D25A8, 0x4 + +.global lbl_8045374C +lbl_8045374C: +.incbin "baserom.dol", 0x3D25AC, 0x4 + +.global lbl_80453750 +lbl_80453750: +.incbin "baserom.dol", 0x3D25B0, 0x4 + +.global lbl_80453754 +lbl_80453754: +.incbin "baserom.dol", 0x3D25B4, 0x4 + +.global lbl_80453758 +lbl_80453758: +.incbin "baserom.dol", 0x3D25B8, 0x4 + +.global lbl_8045375C +lbl_8045375C: +.incbin "baserom.dol", 0x3D25BC, 0x4 + +.global lbl_80453760 +lbl_80453760: +.incbin "baserom.dol", 0x3D25C0, 0x8 + +.global lbl_80453768 +lbl_80453768: +.incbin "baserom.dol", 0x3D25C8, 0x4 + +.global lbl_8045376C +lbl_8045376C: +.incbin "baserom.dol", 0x3D25CC, 0x4 + +.global lbl_80453770 +lbl_80453770: +.incbin "baserom.dol", 0x3D25D0, 0x4 + +.global lbl_80453774 +lbl_80453774: +.incbin "baserom.dol", 0x3D25D4, 0x4 + +.global lbl_80453778 +lbl_80453778: +.incbin "baserom.dol", 0x3D25D8, 0x4 + +.global lbl_8045377C +lbl_8045377C: +.incbin "baserom.dol", 0x3D25DC, 0x4 + +.global lbl_80453780 +lbl_80453780: +.incbin "baserom.dol", 0x3D25E0, 0x4 + +.global lbl_80453784 +lbl_80453784: +.incbin "baserom.dol", 0x3D25E4, 0x4 + +.global lbl_80453788 +lbl_80453788: +.incbin "baserom.dol", 0x3D25E8, 0x4 + +.global lbl_8045378C +lbl_8045378C: +.incbin "baserom.dol", 0x3D25EC, 0x4 + +.global lbl_80453790 +lbl_80453790: +.incbin "baserom.dol", 0x3D25F0, 0x4 + +.global lbl_80453794 +lbl_80453794: +.incbin "baserom.dol", 0x3D25F4, 0x4 + +.global lbl_80453798 +lbl_80453798: +.incbin "baserom.dol", 0x3D25F8, 0x4 + +.global lbl_8045379C +lbl_8045379C: +.incbin "baserom.dol", 0x3D25FC, 0x4 + +.global lbl_804537A0 +lbl_804537A0: +.incbin "baserom.dol", 0x3D2600, 0x4 + +.global lbl_804537A4 +lbl_804537A4: +.incbin "baserom.dol", 0x3D2604, 0x4 + +.global lbl_804537A8 +lbl_804537A8: +.incbin "baserom.dol", 0x3D2608, 0x4 + +.global lbl_804537AC +lbl_804537AC: +.incbin "baserom.dol", 0x3D260C, 0x4 + +.global lbl_804537B0 +lbl_804537B0: +.incbin "baserom.dol", 0x3D2610, 0x4 + +.global lbl_804537B4 +lbl_804537B4: +.incbin "baserom.dol", 0x3D2614, 0x4 + +.global lbl_804537B8 +lbl_804537B8: +.incbin "baserom.dol", 0x3D2618, 0x4 + +.global lbl_804537BC +lbl_804537BC: +.incbin "baserom.dol", 0x3D261C, 0x4 + +.global lbl_804537C0 +lbl_804537C0: +.incbin "baserom.dol", 0x3D2620, 0x4 + +.global lbl_804537C4 +lbl_804537C4: +.incbin "baserom.dol", 0x3D2624, 0x4 + +.global lbl_804537C8 +lbl_804537C8: +.incbin "baserom.dol", 0x3D2628, 0x4 + +.global lbl_804537CC +lbl_804537CC: +.incbin "baserom.dol", 0x3D262C, 0x4 + +.global lbl_804537D0 +lbl_804537D0: +.incbin "baserom.dol", 0x3D2630, 0x4 + +.global lbl_804537D4 +lbl_804537D4: +.incbin "baserom.dol", 0x3D2634, 0x4 + +.global lbl_804537D8 +lbl_804537D8: +.incbin "baserom.dol", 0x3D2638, 0x4 + +.global lbl_804537DC +lbl_804537DC: +.incbin "baserom.dol", 0x3D263C, 0x4 + +.global lbl_804537E0 +lbl_804537E0: +.incbin "baserom.dol", 0x3D2640, 0x4 + +.global lbl_804537E4 +lbl_804537E4: +.incbin "baserom.dol", 0x3D2644, 0x4 + +.global lbl_804537E8 +lbl_804537E8: +.incbin "baserom.dol", 0x3D2648, 0x4 + +.global lbl_804537EC +lbl_804537EC: +.incbin "baserom.dol", 0x3D264C, 0x4 + +.global lbl_804537F0 +lbl_804537F0: +.incbin "baserom.dol", 0x3D2650, 0x4 + +.global lbl_804537F4 +lbl_804537F4: +.incbin "baserom.dol", 0x3D2654, 0x4 + +.global lbl_804537F8 +lbl_804537F8: +.incbin "baserom.dol", 0x3D2658, 0x4 + +.global lbl_804537FC +lbl_804537FC: +.incbin "baserom.dol", 0x3D265C, 0x4 + +.global lbl_80453800 +lbl_80453800: +.incbin "baserom.dol", 0x3D2660, 0x4 + +.global lbl_80453804 +lbl_80453804: +.incbin "baserom.dol", 0x3D2664, 0x4 + +.global lbl_80453808 +lbl_80453808: +.incbin "baserom.dol", 0x3D2668, 0x4 + +.global lbl_8045380C +lbl_8045380C: +.incbin "baserom.dol", 0x3D266C, 0x4 + +.global lbl_80453810 +lbl_80453810: +.incbin "baserom.dol", 0x3D2670, 0x4 + +.global lbl_80453814 +lbl_80453814: +.incbin "baserom.dol", 0x3D2674, 0x4 + +.global lbl_80453818 +lbl_80453818: +.incbin "baserom.dol", 0x3D2678, 0x4 + +.global lbl_8045381C +lbl_8045381C: +.incbin "baserom.dol", 0x3D267C, 0x4 + +.global lbl_80453820 +lbl_80453820: +.incbin "baserom.dol", 0x3D2680, 0x4 + +.global lbl_80453824 +lbl_80453824: +.incbin "baserom.dol", 0x3D2684, 0x4 + +.global lbl_80453828 +lbl_80453828: +.incbin "baserom.dol", 0x3D2688, 0x4 + +.global lbl_8045382C +lbl_8045382C: +.incbin "baserom.dol", 0x3D268C, 0x4 + +.global lbl_80453830 +lbl_80453830: +.incbin "baserom.dol", 0x3D2690, 0x4 + +.global lbl_80453834 +lbl_80453834: +.incbin "baserom.dol", 0x3D2694, 0x4 + +.global lbl_80453838 +lbl_80453838: +.incbin "baserom.dol", 0x3D2698, 0x4 + +.global lbl_8045383C +lbl_8045383C: +.incbin "baserom.dol", 0x3D269C, 0x4 + +.global lbl_80453840 +lbl_80453840: +.incbin "baserom.dol", 0x3D26A0, 0x4 + +.global lbl_80453844 +lbl_80453844: +.incbin "baserom.dol", 0x3D26A4, 0x4 + +.global lbl_80453848 +lbl_80453848: +.incbin "baserom.dol", 0x3D26A8, 0x4 + +.global lbl_8045384C +lbl_8045384C: +.incbin "baserom.dol", 0x3D26AC, 0x4 + +.global lbl_80453850 +lbl_80453850: +.incbin "baserom.dol", 0x3D26B0, 0x4 + +.global lbl_80453854 +lbl_80453854: +.incbin "baserom.dol", 0x3D26B4, 0x4 + +.global lbl_80453858 +lbl_80453858: +.incbin "baserom.dol", 0x3D26B8, 0x4 + +.global lbl_8045385C +lbl_8045385C: +.incbin "baserom.dol", 0x3D26BC, 0x4 + +.global lbl_80453860 +lbl_80453860: +.incbin "baserom.dol", 0x3D26C0, 0x4 + +.global lbl_80453864 +lbl_80453864: +.incbin "baserom.dol", 0x3D26C4, 0x4 + +.global lbl_80453868 +lbl_80453868: +.incbin "baserom.dol", 0x3D26C8, 0x4 + +.global lbl_8045386C +lbl_8045386C: +.incbin "baserom.dol", 0x3D26CC, 0x4 + +.global lbl_80453870 +lbl_80453870: +.incbin "baserom.dol", 0x3D26D0, 0x4 + +.global lbl_80453874 +lbl_80453874: +.incbin "baserom.dol", 0x3D26D4, 0x4 + +.global lbl_80453878 +lbl_80453878: +.incbin "baserom.dol", 0x3D26D8, 0x4 + +.global lbl_8045387C +lbl_8045387C: +.incbin "baserom.dol", 0x3D26DC, 0x4 + +.global lbl_80453880 +lbl_80453880: +.incbin "baserom.dol", 0x3D26E0, 0x4 + +.global lbl_80453884 +lbl_80453884: +.incbin "baserom.dol", 0x3D26E4, 0x4 + +.global lbl_80453888 +lbl_80453888: +.incbin "baserom.dol", 0x3D26E8, 0x4 + +.global lbl_8045388C +lbl_8045388C: +.incbin "baserom.dol", 0x3D26EC, 0x4 + +.global lbl_80453890 +lbl_80453890: +.incbin "baserom.dol", 0x3D26F0, 0x4 + +.global lbl_80453894 +lbl_80453894: +.incbin "baserom.dol", 0x3D26F4, 0x4 + +.global lbl_80453898 +lbl_80453898: +.incbin "baserom.dol", 0x3D26F8, 0x4 + +.global lbl_8045389C +lbl_8045389C: +.incbin "baserom.dol", 0x3D26FC, 0x4 + +.global lbl_804538A0 +lbl_804538A0: +.incbin "baserom.dol", 0x3D2700, 0x4 + +.global lbl_804538A4 +lbl_804538A4: +.incbin "baserom.dol", 0x3D2704, 0x4 + +.global lbl_804538A8 +lbl_804538A8: +.incbin "baserom.dol", 0x3D2708, 0x4 + +.global lbl_804538AC +lbl_804538AC: +.incbin "baserom.dol", 0x3D270C, 0x4 + +.global lbl_804538B0 +lbl_804538B0: +.incbin "baserom.dol", 0x3D2710, 0x4 + +.global lbl_804538B4 +lbl_804538B4: +.incbin "baserom.dol", 0x3D2714, 0x4 + +.global lbl_804538B8 +lbl_804538B8: +.incbin "baserom.dol", 0x3D2718, 0x4 + +.global lbl_804538BC +lbl_804538BC: +.incbin "baserom.dol", 0x3D271C, 0x4 + +.global lbl_804538C0 +lbl_804538C0: +.incbin "baserom.dol", 0x3D2720, 0x4 + +.global lbl_804538C4 +lbl_804538C4: +.incbin "baserom.dol", 0x3D2724, 0x4 + +.global lbl_804538C8 +lbl_804538C8: +.incbin "baserom.dol", 0x3D2728, 0x4 + +.global lbl_804538CC +lbl_804538CC: +.incbin "baserom.dol", 0x3D272C, 0x4 + +.global lbl_804538D0 +lbl_804538D0: +.incbin "baserom.dol", 0x3D2730, 0x4 + +.global lbl_804538D4 +lbl_804538D4: +.incbin "baserom.dol", 0x3D2734, 0x4 + +.global lbl_804538D8 +lbl_804538D8: +.incbin "baserom.dol", 0x3D2738, 0x4 + +.global lbl_804538DC +lbl_804538DC: +.incbin "baserom.dol", 0x3D273C, 0x4 + +.global lbl_804538E0 +lbl_804538E0: +.incbin "baserom.dol", 0x3D2740, 0x4 + +.global lbl_804538E4 +lbl_804538E4: +.incbin "baserom.dol", 0x3D2744, 0x4 + +.global lbl_804538E8 +lbl_804538E8: +.incbin "baserom.dol", 0x3D2748, 0x4 + +.global lbl_804538EC +lbl_804538EC: +.incbin "baserom.dol", 0x3D274C, 0x4 + +.global lbl_804538F0 +lbl_804538F0: +.incbin "baserom.dol", 0x3D2750, 0x4 + +.global lbl_804538F4 +lbl_804538F4: +.incbin "baserom.dol", 0x3D2754, 0x4 + +.global lbl_804538F8 +lbl_804538F8: +.incbin "baserom.dol", 0x3D2758, 0x4 + +.global lbl_804538FC +lbl_804538FC: +.incbin "baserom.dol", 0x3D275C, 0x4 + +.global lbl_80453900 +lbl_80453900: +.incbin "baserom.dol", 0x3D2760, 0x4 + +.global lbl_80453904 +lbl_80453904: +.incbin "baserom.dol", 0x3D2764, 0x4 + +.global lbl_80453908 +lbl_80453908: +.incbin "baserom.dol", 0x3D2768, 0x4 + +.global lbl_8045390C +lbl_8045390C: +.incbin "baserom.dol", 0x3D276C, 0x4 + +.global lbl_80453910 +lbl_80453910: +.incbin "baserom.dol", 0x3D2770, 0x4 + +.global lbl_80453914 +lbl_80453914: +.incbin "baserom.dol", 0x3D2774, 0x4 + +.global lbl_80453918 +lbl_80453918: +.incbin "baserom.dol", 0x3D2778, 0x4 + +.global lbl_8045391C +lbl_8045391C: +.incbin "baserom.dol", 0x3D277C, 0x4 + +.global lbl_80453920 +lbl_80453920: +.incbin "baserom.dol", 0x3D2780, 0x4 + +.global lbl_80453924 +lbl_80453924: +.incbin "baserom.dol", 0x3D2784, 0x4 + diff --git a/asm/sdata2/d_cc_mass_s.s b/asm/sdata2/d_cc_mass_s.s new file mode 100644 index 0000000000..6d8480f96a --- /dev/null +++ b/asm/sdata2/d_cc_mass_s.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452760 - 0x80452778 + +.global lbl_80452760 +lbl_80452760: +.incbin "baserom.dol", 0x3D15C0, 0x4 + +.global lbl_80452764 +lbl_80452764: +.incbin "baserom.dol", 0x3D15C4, 0x4 + +.global lbl_80452768 +lbl_80452768: +.incbin "baserom.dol", 0x3D15C8, 0x4 + +.global lbl_8045276C +lbl_8045276C: +.incbin "baserom.dol", 0x3D15CC, 0x4 + +.global lbl_80452770 +lbl_80452770: +.incbin "baserom.dol", 0x3D15D0, 0x4 + +.global lbl_80452774 +lbl_80452774: +.incbin "baserom.dol", 0x3D15D4, 0x4 + diff --git a/asm/sdata2/d_cc_s.s b/asm/sdata2/d_cc_s.s new file mode 100644 index 0000000000..65a96dd1c1 --- /dev/null +++ b/asm/sdata2/d_cc_s.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452778 - 0x80452798 + +.global lbl_80452778 +lbl_80452778: +.incbin "baserom.dol", 0x3D15D8, 0x4 + +.global lbl_8045277C +lbl_8045277C: +.incbin "baserom.dol", 0x3D15DC, 0x4 + +.global lbl_80452780 +lbl_80452780: +.incbin "baserom.dol", 0x3D15E0, 0x8 + +.global lbl_80452788 +lbl_80452788: +.incbin "baserom.dol", 0x3D15E8, 0x8 + +.global lbl_80452790 +lbl_80452790: +.incbin "baserom.dol", 0x3D15F0, 0x8 + diff --git a/asm/sdata2/d_cc_uty.s b/asm/sdata2/d_cc_uty.s new file mode 100644 index 0000000000..703efaeb12 --- /dev/null +++ b/asm/sdata2/d_cc_uty.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452798 - 0x804527c8 + +.global lbl_80452798 +lbl_80452798: +.incbin "baserom.dol", 0x3D15F8, 0x8 + +.global lbl_804527A0 +lbl_804527A0: +.incbin "baserom.dol", 0x3D1600, 0x8 + +.global lbl_804527A8 +lbl_804527A8: +.incbin "baserom.dol", 0x3D1608, 0x8 + +.global lbl_804527B0 +lbl_804527B0: +.incbin "baserom.dol", 0x3D1610, 0x8 + +.global lbl_804527B8 +lbl_804527B8: +.incbin "baserom.dol", 0x3D1618, 0x4 + +.global lbl_804527BC +lbl_804527BC: +.incbin "baserom.dol", 0x3D161C, 0x4 + +.global lbl_804527C0 +lbl_804527C0: +.incbin "baserom.dol", 0x3D1620, 0x8 + diff --git a/asm/sdata2/d_com_inf_game.s b/asm/sdata2/d_com_inf_game.s new file mode 100644 index 0000000000..961ad14ea7 --- /dev/null +++ b/asm/sdata2/d_com_inf_game.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451d00 - 0x80451d28 + +.global lbl_80451D00 +lbl_80451D00: +.incbin "baserom.dol", 0x3D0B60, 0x4 + +.global lbl_80451D04 +lbl_80451D04: +.incbin "baserom.dol", 0x3D0B64, 0x4 + +.global lbl_80451D08 +lbl_80451D08: +.incbin "baserom.dol", 0x3D0B68, 0x8 + +.global lbl_80451D10 +lbl_80451D10: +.incbin "baserom.dol", 0x3D0B70, 0x8 + +.global lbl_80451D18 +lbl_80451D18: +.incbin "baserom.dol", 0x3D0B78, 0x4 + +.global lbl_80451D1C +lbl_80451D1C: +.incbin "baserom.dol", 0x3D0B7C, 0x4 + +.global lbl_80451D20 +lbl_80451D20: +.incbin "baserom.dol", 0x3D0B80, 0x8 + diff --git a/asm/sdata2/d_com_static.s b/asm/sdata2/d_com_static.s new file mode 100644 index 0000000000..e40a57cc4d --- /dev/null +++ b/asm/sdata2/d_com_static.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451d28 - 0x80451d58 + +.global lbl_80451D28 +lbl_80451D28: +.incbin "baserom.dol", 0x3D0B88, 0x8 + +.global lbl_80451D30 +lbl_80451D30: +.incbin "baserom.dol", 0x3D0B90, 0x4 + +.global lbl_80451D34 +lbl_80451D34: +.incbin "baserom.dol", 0x3D0B94, 0x4 + +.global lbl_80451D38 +lbl_80451D38: +.incbin "baserom.dol", 0x3D0B98, 0x4 + +.global lbl_80451D3C +lbl_80451D3C: +.incbin "baserom.dol", 0x3D0B9C, 0x4 + +.global lbl_80451D40 +lbl_80451D40: +.incbin "baserom.dol", 0x3D0BA0, 0x4 + +.global lbl_80451D44 +lbl_80451D44: +.incbin "baserom.dol", 0x3D0BA4, 0x4 + +.global lbl_80451D48 +lbl_80451D48: +.incbin "baserom.dol", 0x3D0BA8, 0x4 + +.global lbl_80451D4C +lbl_80451D4C: +.incbin "baserom.dol", 0x3D0BAC, 0x4 + +.global lbl_80451D50 +lbl_80451D50: +.incbin "baserom.dol", 0x3D0BB0, 0x4 + +.global lbl_80451D54 +lbl_80451D54: +.incbin "baserom.dol", 0x3D0BB4, 0x4 + diff --git a/asm/sdata2/d_demo.s b/asm/sdata2/d_demo.s new file mode 100644 index 0000000000..54c4926b2e --- /dev/null +++ b/asm/sdata2/d_demo.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451db0 - 0x80451df0 + +.global lbl_80451DB0 +lbl_80451DB0: +.incbin "baserom.dol", 0x3D0C10, 0x4 + +.global lbl_80451DB4 +lbl_80451DB4: +.incbin "baserom.dol", 0x3D0C14, 0x4 + +.global lbl_80451DB8 +lbl_80451DB8: +.incbin "baserom.dol", 0x3D0C18, 0x8 + +.global lbl_80451DC0 +lbl_80451DC0: +.incbin "baserom.dol", 0x3D0C20, 0x4 + +.global lbl_80451DC4 +lbl_80451DC4: +.incbin "baserom.dol", 0x3D0C24, 0x4 + +.global lbl_80451DC8 +lbl_80451DC8: +.incbin "baserom.dol", 0x3D0C28, 0x4 + +.global lbl_80451DCC +lbl_80451DCC: +.incbin "baserom.dol", 0x3D0C2C, 0x4 + +.global lbl_80451DD0 +lbl_80451DD0: +.incbin "baserom.dol", 0x3D0C30, 0x4 + +.global lbl_80451DD4 +lbl_80451DD4: +.incbin "baserom.dol", 0x3D0C34, 0x4 + +.global lbl_80451DD8 +lbl_80451DD8: +.incbin "baserom.dol", 0x3D0C38, 0x8 + +.global lbl_80451DE0 +lbl_80451DE0: +.incbin "baserom.dol", 0x3D0C40, 0x8 + +.global lbl_80451DE8 +lbl_80451DE8: +.incbin "baserom.dol", 0x3D0C48, 0x8 + diff --git a/asm/sdata2/d_drawlist.s b/asm/sdata2/d_drawlist.s new file mode 100644 index 0000000000..5743d4fc1c --- /dev/null +++ b/asm/sdata2/d_drawlist.s @@ -0,0 +1,183 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452008 - 0x804520e0 + +.global lbl_80452008 +lbl_80452008: +.incbin "baserom.dol", 0x3D0E68, 0x4 + +.global lbl_8045200C +lbl_8045200C: +.incbin "baserom.dol", 0x3D0E6C, 0x4 + +.global lbl_80452010 +lbl_80452010: +.incbin "baserom.dol", 0x3D0E70, 0x8 + +.global lbl_80452018 +lbl_80452018: +.incbin "baserom.dol", 0x3D0E78, 0x8 + +.global lbl_80452020 +lbl_80452020: +.incbin "baserom.dol", 0x3D0E80, 0x8 + +.global lbl_80452028 +lbl_80452028: +.incbin "baserom.dol", 0x3D0E88, 0x4 + +.global lbl_8045202C +lbl_8045202C: +.incbin "baserom.dol", 0x3D0E8C, 0x4 + +.global lbl_80452030 +lbl_80452030: +.incbin "baserom.dol", 0x3D0E90, 0x4 + +.global lbl_80452034 +lbl_80452034: +.incbin "baserom.dol", 0x3D0E94, 0x4 + +.global lbl_80452038 +lbl_80452038: +.incbin "baserom.dol", 0x3D0E98, 0x4 + +.global lbl_8045203C +lbl_8045203C: +.incbin "baserom.dol", 0x3D0E9C, 0x4 + +.global lbl_80452040 +lbl_80452040: +.incbin "baserom.dol", 0x3D0EA0, 0x8 + +.global lbl_80452048 +lbl_80452048: +.incbin "baserom.dol", 0x3D0EA8, 0x4 + +.global lbl_8045204C +lbl_8045204C: +.incbin "baserom.dol", 0x3D0EAC, 0x4 + +.global lbl_80452050 +lbl_80452050: +.incbin "baserom.dol", 0x3D0EB0, 0x4 + +.global lbl_80452054 +lbl_80452054: +.incbin "baserom.dol", 0x3D0EB4, 0x4 + +.global lbl_80452058 +lbl_80452058: +.incbin "baserom.dol", 0x3D0EB8, 0x4 + +.global lbl_8045205C +lbl_8045205C: +.incbin "baserom.dol", 0x3D0EBC, 0x4 + +.global lbl_80452060 +lbl_80452060: +.incbin "baserom.dol", 0x3D0EC0, 0x4 + +.global lbl_80452064 +lbl_80452064: +.incbin "baserom.dol", 0x3D0EC4, 0x4 + +.global lbl_80452068 +lbl_80452068: +.incbin "baserom.dol", 0x3D0EC8, 0x4 + +.global lbl_8045206C +lbl_8045206C: +.incbin "baserom.dol", 0x3D0ECC, 0x4 + +.global lbl_80452070 +lbl_80452070: +.incbin "baserom.dol", 0x3D0ED0, 0x4 + +.global lbl_80452074 +lbl_80452074: +.incbin "baserom.dol", 0x3D0ED4, 0x4 + +.global lbl_80452078 +lbl_80452078: +.incbin "baserom.dol", 0x3D0ED8, 0x8 + +.global lbl_80452080 +lbl_80452080: +.incbin "baserom.dol", 0x3D0EE0, 0x8 + +.global lbl_80452088 +lbl_80452088: +.incbin "baserom.dol", 0x3D0EE8, 0x8 + +.global lbl_80452090 +lbl_80452090: +.incbin "baserom.dol", 0x3D0EF0, 0x8 + +.global lbl_80452098 +lbl_80452098: +.incbin "baserom.dol", 0x3D0EF8, 0x4 + +.global lbl_8045209C +lbl_8045209C: +.incbin "baserom.dol", 0x3D0EFC, 0x4 + +.global lbl_804520A0 +lbl_804520A0: +.incbin "baserom.dol", 0x3D0F00, 0x4 + +.global lbl_804520A4 +lbl_804520A4: +.incbin "baserom.dol", 0x3D0F04, 0x4 + +.global lbl_804520A8 +lbl_804520A8: +.incbin "baserom.dol", 0x3D0F08, 0x4 + +.global lbl_804520AC +lbl_804520AC: +.incbin "baserom.dol", 0x3D0F0C, 0x4 + +.global lbl_804520B0 +lbl_804520B0: +.incbin "baserom.dol", 0x3D0F10, 0x4 + +.global lbl_804520B4 +lbl_804520B4: +.incbin "baserom.dol", 0x3D0F14, 0x4 + +.global lbl_804520B8 +lbl_804520B8: +.incbin "baserom.dol", 0x3D0F18, 0x4 + +.global lbl_804520BC +lbl_804520BC: +.incbin "baserom.dol", 0x3D0F1C, 0x4 + +.global lbl_804520C0 +lbl_804520C0: +.incbin "baserom.dol", 0x3D0F20, 0x4 + +.global lbl_804520C4 +lbl_804520C4: +.incbin "baserom.dol", 0x3D0F24, 0x8 + +.global lbl_804520CC +lbl_804520CC: +.incbin "baserom.dol", 0x3D0F2C, 0x4 + +.global lbl_804520D0 +lbl_804520D0: +.incbin "baserom.dol", 0x3D0F30, 0x4 + +.global lbl_804520D4 +lbl_804520D4: +.incbin "baserom.dol", 0x3D0F34, 0x4 + +.global lbl_804520D8 +lbl_804520D8: +.incbin "baserom.dol", 0x3D0F38, 0x4 + +.global lbl_804520DC +lbl_804520DC: +.incbin "baserom.dol", 0x3D0F3C, 0x4 + diff --git a/asm/sdata2/d_error_msg.s b/asm/sdata2/d_error_msg.s new file mode 100644 index 0000000000..327d09bf23 --- /dev/null +++ b/asm/sdata2/d_error_msg.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452c18 - 0x80452c50 + +.global lbl_80452C18 +lbl_80452C18: +.incbin "baserom.dol", 0x3D1A78, 0x4 + +.global lbl_80452C1C +lbl_80452C1C: +.incbin "baserom.dol", 0x3D1A7C, 0x4 + +.global lbl_80452C20 +lbl_80452C20: +.incbin "baserom.dol", 0x3D1A80, 0x4 + +.global lbl_80452C24 +lbl_80452C24: +.incbin "baserom.dol", 0x3D1A84, 0x4 + +.global lbl_80452C28 +lbl_80452C28: +.incbin "baserom.dol", 0x3D1A88, 0x4 + +.global lbl_80452C2C +lbl_80452C2C: +.incbin "baserom.dol", 0x3D1A8C, 0x4 + +.global lbl_80452C30 +lbl_80452C30: +.incbin "baserom.dol", 0x3D1A90, 0x4 + +.global lbl_80452C34 +lbl_80452C34: +.incbin "baserom.dol", 0x3D1A94, 0x4 + +.global lbl_80452C38 +lbl_80452C38: +.incbin "baserom.dol", 0x3D1A98, 0x4 + +.global lbl_80452C3C +lbl_80452C3C: +.incbin "baserom.dol", 0x3D1A9C, 0x4 + +.global lbl_80452C40 +lbl_80452C40: +.incbin "baserom.dol", 0x3D1AA0, 0x8 + +.global lbl_80452C48 +lbl_80452C48: +.incbin "baserom.dol", 0x3D1AA8, 0x8 + diff --git a/asm/sdata2/d_ev_camera.s b/asm/sdata2/d_ev_camera.s new file mode 100644 index 0000000000..f35d34c984 --- /dev/null +++ b/asm/sdata2/d_ev_camera.s @@ -0,0 +1,755 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804528b8 - 0x80452bc8 + +.global lbl_804528B8 +lbl_804528B8: +.incbin "baserom.dol", 0x3D1718, 0x8 + +.global lbl_804528C0 +lbl_804528C0: +.incbin "baserom.dol", 0x3D1720, 0x8 + +.global lbl_804528C8 +lbl_804528C8: +.incbin "baserom.dol", 0x3D1728, 0x8 + +.global lbl_804528D0 +lbl_804528D0: +.incbin "baserom.dol", 0x3D1730, 0x8 + +.global lbl_804528D8 +lbl_804528D8: +.incbin "baserom.dol", 0x3D1738, 0x4 + +.global lbl_804528DC +lbl_804528DC: +.incbin "baserom.dol", 0x3D173C, 0x4 + +.global lbl_804528E0 +lbl_804528E0: +.incbin "baserom.dol", 0x3D1740, 0x8 + +.global lbl_804528E8 +lbl_804528E8: +.incbin "baserom.dol", 0x3D1748, 0x8 + +.global lbl_804528F0 +lbl_804528F0: +.incbin "baserom.dol", 0x3D1750, 0x8 + +.global lbl_804528F8 +lbl_804528F8: +.incbin "baserom.dol", 0x3D1758, 0x8 + +.global lbl_80452900 +lbl_80452900: +.incbin "baserom.dol", 0x3D1760, 0x4 + +.global lbl_80452904 +lbl_80452904: +.incbin "baserom.dol", 0x3D1764, 0x4 + +.global lbl_80452908 +lbl_80452908: +.incbin "baserom.dol", 0x3D1768, 0x4 + +.global lbl_8045290C +lbl_8045290C: +.incbin "baserom.dol", 0x3D176C, 0x4 + +.global lbl_80452910 +lbl_80452910: +.incbin "baserom.dol", 0x3D1770, 0x4 + +.global lbl_80452914 +lbl_80452914: +.incbin "baserom.dol", 0x3D1774, 0x4 + +.global lbl_80452918 +lbl_80452918: +.incbin "baserom.dol", 0x3D1778, 0x4 + +.global lbl_8045291C +lbl_8045291C: +.incbin "baserom.dol", 0x3D177C, 0x4 + +.global lbl_80452920 +lbl_80452920: +.incbin "baserom.dol", 0x3D1780, 0x4 + +.global lbl_80452924 +lbl_80452924: +.incbin "baserom.dol", 0x3D1784, 0x4 + +.global lbl_80452928 +lbl_80452928: +.incbin "baserom.dol", 0x3D1788, 0x4 + +.global lbl_8045292C +lbl_8045292C: +.incbin "baserom.dol", 0x3D178C, 0x4 + +.global lbl_80452930 +lbl_80452930: +.incbin "baserom.dol", 0x3D1790, 0x4 + +.global lbl_80452934 +lbl_80452934: +.incbin "baserom.dol", 0x3D1794, 0x4 + +.global lbl_80452938 +lbl_80452938: +.incbin "baserom.dol", 0x3D1798, 0x4 + +.global lbl_8045293C +lbl_8045293C: +.incbin "baserom.dol", 0x3D179C, 0x4 + +.global lbl_80452940 +lbl_80452940: +.incbin "baserom.dol", 0x3D17A0, 0x4 + +.global lbl_80452944 +lbl_80452944: +.incbin "baserom.dol", 0x3D17A4, 0x4 + +.global lbl_80452948 +lbl_80452948: +.incbin "baserom.dol", 0x3D17A8, 0x4 + +.global lbl_8045294C +lbl_8045294C: +.incbin "baserom.dol", 0x3D17AC, 0x4 + +.global lbl_80452950 +lbl_80452950: +.incbin "baserom.dol", 0x3D17B0, 0x4 + +.global lbl_80452954 +lbl_80452954: +.incbin "baserom.dol", 0x3D17B4, 0x4 + +.global lbl_80452958 +lbl_80452958: +.incbin "baserom.dol", 0x3D17B8, 0x4 + +.global lbl_8045295C +lbl_8045295C: +.incbin "baserom.dol", 0x3D17BC, 0x4 + +.global lbl_80452960 +lbl_80452960: +.incbin "baserom.dol", 0x3D17C0, 0x4 + +.global lbl_80452964 +lbl_80452964: +.incbin "baserom.dol", 0x3D17C4, 0x4 + +.global lbl_80452968 +lbl_80452968: +.incbin "baserom.dol", 0x3D17C8, 0x4 + +.global lbl_8045296C +lbl_8045296C: +.incbin "baserom.dol", 0x3D17CC, 0x4 + +.global lbl_80452970 +lbl_80452970: +.incbin "baserom.dol", 0x3D17D0, 0x4 + +.global lbl_80452974 +lbl_80452974: +.incbin "baserom.dol", 0x3D17D4, 0x4 + +.global lbl_80452978 +lbl_80452978: +.incbin "baserom.dol", 0x3D17D8, 0x4 + +.global lbl_8045297C +lbl_8045297C: +.incbin "baserom.dol", 0x3D17DC, 0x4 + +.global lbl_80452980 +lbl_80452980: +.incbin "baserom.dol", 0x3D17E0, 0x4 + +.global lbl_80452984 +lbl_80452984: +.incbin "baserom.dol", 0x3D17E4, 0x4 + +.global lbl_80452988 +lbl_80452988: +.incbin "baserom.dol", 0x3D17E8, 0x4 + +.global lbl_8045298C +lbl_8045298C: +.incbin "baserom.dol", 0x3D17EC, 0x4 + +.global lbl_80452990 +lbl_80452990: +.incbin "baserom.dol", 0x3D17F0, 0x4 + +.global lbl_80452994 +lbl_80452994: +.incbin "baserom.dol", 0x3D17F4, 0x4 + +.global lbl_80452998 +lbl_80452998: +.incbin "baserom.dol", 0x3D17F8, 0x4 + +.global lbl_8045299C +lbl_8045299C: +.incbin "baserom.dol", 0x3D17FC, 0x4 + +.global lbl_804529A0 +lbl_804529A0: +.incbin "baserom.dol", 0x3D1800, 0x4 + +.global lbl_804529A4 +lbl_804529A4: +.incbin "baserom.dol", 0x3D1804, 0x4 + +.global lbl_804529A8 +lbl_804529A8: +.incbin "baserom.dol", 0x3D1808, 0x4 + +.global lbl_804529AC +lbl_804529AC: +.incbin "baserom.dol", 0x3D180C, 0x4 + +.global lbl_804529B0 +lbl_804529B0: +.incbin "baserom.dol", 0x3D1810, 0x4 + +.global lbl_804529B4 +lbl_804529B4: +.incbin "baserom.dol", 0x3D1814, 0x4 + +.global lbl_804529B8 +lbl_804529B8: +.incbin "baserom.dol", 0x3D1818, 0x4 + +.global lbl_804529BC +lbl_804529BC: +.incbin "baserom.dol", 0x3D181C, 0x4 + +.global lbl_804529C0 +lbl_804529C0: +.incbin "baserom.dol", 0x3D1820, 0x4 + +.global lbl_804529C4 +lbl_804529C4: +.incbin "baserom.dol", 0x3D1824, 0x4 + +.global lbl_804529C8 +lbl_804529C8: +.incbin "baserom.dol", 0x3D1828, 0x4 + +.global lbl_804529CC +lbl_804529CC: +.incbin "baserom.dol", 0x3D182C, 0x4 + +.global lbl_804529D0 +lbl_804529D0: +.incbin "baserom.dol", 0x3D1830, 0x4 + +.global lbl_804529D4 +lbl_804529D4: +.incbin "baserom.dol", 0x3D1834, 0x4 + +.global lbl_804529D8 +lbl_804529D8: +.incbin "baserom.dol", 0x3D1838, 0x4 + +.global lbl_804529DC +lbl_804529DC: +.incbin "baserom.dol", 0x3D183C, 0x4 + +.global lbl_804529E0 +lbl_804529E0: +.incbin "baserom.dol", 0x3D1840, 0x4 + +.global lbl_804529E4 +lbl_804529E4: +.incbin "baserom.dol", 0x3D1844, 0x4 + +.global lbl_804529E8 +lbl_804529E8: +.incbin "baserom.dol", 0x3D1848, 0x4 + +.global lbl_804529EC +lbl_804529EC: +.incbin "baserom.dol", 0x3D184C, 0x4 + +.global lbl_804529F0 +lbl_804529F0: +.incbin "baserom.dol", 0x3D1850, 0x4 + +.global lbl_804529F4 +lbl_804529F4: +.incbin "baserom.dol", 0x3D1854, 0x4 + +.global lbl_804529F8 +lbl_804529F8: +.incbin "baserom.dol", 0x3D1858, 0x4 + +.global lbl_804529FC +lbl_804529FC: +.incbin "baserom.dol", 0x3D185C, 0x4 + +.global lbl_80452A00 +lbl_80452A00: +.incbin "baserom.dol", 0x3D1860, 0x4 + +.global lbl_80452A04 +lbl_80452A04: +.incbin "baserom.dol", 0x3D1864, 0x4 + +.global lbl_80452A08 +lbl_80452A08: +.incbin "baserom.dol", 0x3D1868, 0x4 + +.global lbl_80452A0C +lbl_80452A0C: +.incbin "baserom.dol", 0x3D186C, 0x4 + +.global lbl_80452A10 +lbl_80452A10: +.incbin "baserom.dol", 0x3D1870, 0x4 + +.global lbl_80452A14 +lbl_80452A14: +.incbin "baserom.dol", 0x3D1874, 0x4 + +.global lbl_80452A18 +lbl_80452A18: +.incbin "baserom.dol", 0x3D1878, 0x4 + +.global lbl_80452A1C +lbl_80452A1C: +.incbin "baserom.dol", 0x3D187C, 0x4 + +.global lbl_80452A20 +lbl_80452A20: +.incbin "baserom.dol", 0x3D1880, 0x4 + +.global lbl_80452A24 +lbl_80452A24: +.incbin "baserom.dol", 0x3D1884, 0x4 + +.global lbl_80452A28 +lbl_80452A28: +.incbin "baserom.dol", 0x3D1888, 0x4 + +.global lbl_80452A2C +lbl_80452A2C: +.incbin "baserom.dol", 0x3D188C, 0x4 + +.global lbl_80452A30 +lbl_80452A30: +.incbin "baserom.dol", 0x3D1890, 0x4 + +.global lbl_80452A34 +lbl_80452A34: +.incbin "baserom.dol", 0x3D1894, 0x4 + +.global lbl_80452A38 +lbl_80452A38: +.incbin "baserom.dol", 0x3D1898, 0x4 + +.global lbl_80452A3C +lbl_80452A3C: +.incbin "baserom.dol", 0x3D189C, 0x4 + +.global lbl_80452A40 +lbl_80452A40: +.incbin "baserom.dol", 0x3D18A0, 0x4 + +.global lbl_80452A44 +lbl_80452A44: +.incbin "baserom.dol", 0x3D18A4, 0x4 + +.global lbl_80452A48 +lbl_80452A48: +.incbin "baserom.dol", 0x3D18A8, 0x4 + +.global lbl_80452A4C +lbl_80452A4C: +.incbin "baserom.dol", 0x3D18AC, 0x4 + +.global lbl_80452A50 +lbl_80452A50: +.incbin "baserom.dol", 0x3D18B0, 0x4 + +.global lbl_80452A54 +lbl_80452A54: +.incbin "baserom.dol", 0x3D18B4, 0x4 + +.global lbl_80452A58 +lbl_80452A58: +.incbin "baserom.dol", 0x3D18B8, 0x4 + +.global lbl_80452A5C +lbl_80452A5C: +.incbin "baserom.dol", 0x3D18BC, 0x4 + +.global lbl_80452A60 +lbl_80452A60: +.incbin "baserom.dol", 0x3D18C0, 0x4 + +.global lbl_80452A64 +lbl_80452A64: +.incbin "baserom.dol", 0x3D18C4, 0x4 + +.global lbl_80452A68 +lbl_80452A68: +.incbin "baserom.dol", 0x3D18C8, 0x4 + +.global lbl_80452A6C +lbl_80452A6C: +.incbin "baserom.dol", 0x3D18CC, 0x4 + +.global lbl_80452A70 +lbl_80452A70: +.incbin "baserom.dol", 0x3D18D0, 0x4 + +.global lbl_80452A74 +lbl_80452A74: +.incbin "baserom.dol", 0x3D18D4, 0x4 + +.global lbl_80452A78 +lbl_80452A78: +.incbin "baserom.dol", 0x3D18D8, 0x4 + +.global lbl_80452A7C +lbl_80452A7C: +.incbin "baserom.dol", 0x3D18DC, 0x4 + +.global lbl_80452A80 +lbl_80452A80: +.incbin "baserom.dol", 0x3D18E0, 0x4 + +.global lbl_80452A84 +lbl_80452A84: +.incbin "baserom.dol", 0x3D18E4, 0x4 + +.global lbl_80452A88 +lbl_80452A88: +.incbin "baserom.dol", 0x3D18E8, 0x4 + +.global lbl_80452A8C +lbl_80452A8C: +.incbin "baserom.dol", 0x3D18EC, 0x4 + +.global lbl_80452A90 +lbl_80452A90: +.incbin "baserom.dol", 0x3D18F0, 0x4 + +.global lbl_80452A94 +lbl_80452A94: +.incbin "baserom.dol", 0x3D18F4, 0x4 + +.global lbl_80452A98 +lbl_80452A98: +.incbin "baserom.dol", 0x3D18F8, 0x4 + +.global lbl_80452A9C +lbl_80452A9C: +.incbin "baserom.dol", 0x3D18FC, 0x4 + +.global lbl_80452AA0 +lbl_80452AA0: +.incbin "baserom.dol", 0x3D1900, 0x4 + +.global lbl_80452AA4 +lbl_80452AA4: +.incbin "baserom.dol", 0x3D1904, 0x4 + +.global lbl_80452AA8 +lbl_80452AA8: +.incbin "baserom.dol", 0x3D1908, 0x4 + +.global lbl_80452AAC +lbl_80452AAC: +.incbin "baserom.dol", 0x3D190C, 0x4 + +.global lbl_80452AB0 +lbl_80452AB0: +.incbin "baserom.dol", 0x3D1910, 0x4 + +.global lbl_80452AB4 +lbl_80452AB4: +.incbin "baserom.dol", 0x3D1914, 0x4 + +.global lbl_80452AB8 +lbl_80452AB8: +.incbin "baserom.dol", 0x3D1918, 0x4 + +.global lbl_80452ABC +lbl_80452ABC: +.incbin "baserom.dol", 0x3D191C, 0x4 + +.global lbl_80452AC0 +lbl_80452AC0: +.incbin "baserom.dol", 0x3D1920, 0x4 + +.global lbl_80452AC4 +lbl_80452AC4: +.incbin "baserom.dol", 0x3D1924, 0x4 + +.global lbl_80452AC8 +lbl_80452AC8: +.incbin "baserom.dol", 0x3D1928, 0x4 + +.global lbl_80452ACC +lbl_80452ACC: +.incbin "baserom.dol", 0x3D192C, 0x4 + +.global lbl_80452AD0 +lbl_80452AD0: +.incbin "baserom.dol", 0x3D1930, 0x4 + +.global lbl_80452AD4 +lbl_80452AD4: +.incbin "baserom.dol", 0x3D1934, 0x4 + +.global lbl_80452AD8 +lbl_80452AD8: +.incbin "baserom.dol", 0x3D1938, 0x4 + +.global lbl_80452ADC +lbl_80452ADC: +.incbin "baserom.dol", 0x3D193C, 0x4 + +.global lbl_80452AE0 +lbl_80452AE0: +.incbin "baserom.dol", 0x3D1940, 0x4 + +.global lbl_80452AE4 +lbl_80452AE4: +.incbin "baserom.dol", 0x3D1944, 0x4 + +.global lbl_80452AE8 +lbl_80452AE8: +.incbin "baserom.dol", 0x3D1948, 0x4 + +.global lbl_80452AEC +lbl_80452AEC: +.incbin "baserom.dol", 0x3D194C, 0x4 + +.global lbl_80452AF0 +lbl_80452AF0: +.incbin "baserom.dol", 0x3D1950, 0x4 + +.global lbl_80452AF4 +lbl_80452AF4: +.incbin "baserom.dol", 0x3D1954, 0x4 + +.global lbl_80452AF8 +lbl_80452AF8: +.incbin "baserom.dol", 0x3D1958, 0x4 + +.global lbl_80452AFC +lbl_80452AFC: +.incbin "baserom.dol", 0x3D195C, 0x4 + +.global lbl_80452B00 +lbl_80452B00: +.incbin "baserom.dol", 0x3D1960, 0x4 + +.global lbl_80452B04 +lbl_80452B04: +.incbin "baserom.dol", 0x3D1964, 0x4 + +.global lbl_80452B08 +lbl_80452B08: +.incbin "baserom.dol", 0x3D1968, 0x4 + +.global lbl_80452B0C +lbl_80452B0C: +.incbin "baserom.dol", 0x3D196C, 0x4 + +.global lbl_80452B10 +lbl_80452B10: +.incbin "baserom.dol", 0x3D1970, 0x4 + +.global lbl_80452B14 +lbl_80452B14: +.incbin "baserom.dol", 0x3D1974, 0x4 + +.global lbl_80452B18 +lbl_80452B18: +.incbin "baserom.dol", 0x3D1978, 0x4 + +.global lbl_80452B1C +lbl_80452B1C: +.incbin "baserom.dol", 0x3D197C, 0x4 + +.global lbl_80452B20 +lbl_80452B20: +.incbin "baserom.dol", 0x3D1980, 0x4 + +.global lbl_80452B24 +lbl_80452B24: +.incbin "baserom.dol", 0x3D1984, 0x4 + +.global lbl_80452B28 +lbl_80452B28: +.incbin "baserom.dol", 0x3D1988, 0x4 + +.global lbl_80452B2C +lbl_80452B2C: +.incbin "baserom.dol", 0x3D198C, 0x4 + +.global lbl_80452B30 +lbl_80452B30: +.incbin "baserom.dol", 0x3D1990, 0x4 + +.global lbl_80452B34 +lbl_80452B34: +.incbin "baserom.dol", 0x3D1994, 0x4 + +.global lbl_80452B38 +lbl_80452B38: +.incbin "baserom.dol", 0x3D1998, 0x4 + +.global lbl_80452B3C +lbl_80452B3C: +.incbin "baserom.dol", 0x3D199C, 0x4 + +.global lbl_80452B40 +lbl_80452B40: +.incbin "baserom.dol", 0x3D19A0, 0x4 + +.global lbl_80452B44 +lbl_80452B44: +.incbin "baserom.dol", 0x3D19A4, 0x4 + +.global lbl_80452B48 +lbl_80452B48: +.incbin "baserom.dol", 0x3D19A8, 0x4 + +.global lbl_80452B4C +lbl_80452B4C: +.incbin "baserom.dol", 0x3D19AC, 0x4 + +.global lbl_80452B50 +lbl_80452B50: +.incbin "baserom.dol", 0x3D19B0, 0x4 + +.global lbl_80452B54 +lbl_80452B54: +.incbin "baserom.dol", 0x3D19B4, 0x4 + +.global lbl_80452B58 +lbl_80452B58: +.incbin "baserom.dol", 0x3D19B8, 0x4 + +.global lbl_80452B5C +lbl_80452B5C: +.incbin "baserom.dol", 0x3D19BC, 0x4 + +.global lbl_80452B60 +lbl_80452B60: +.incbin "baserom.dol", 0x3D19C0, 0x4 + +.global lbl_80452B64 +lbl_80452B64: +.incbin "baserom.dol", 0x3D19C4, 0x4 + +.global lbl_80452B68 +lbl_80452B68: +.incbin "baserom.dol", 0x3D19C8, 0x4 + +.global lbl_80452B6C +lbl_80452B6C: +.incbin "baserom.dol", 0x3D19CC, 0x4 + +.global lbl_80452B70 +lbl_80452B70: +.incbin "baserom.dol", 0x3D19D0, 0x4 + +.global lbl_80452B74 +lbl_80452B74: +.incbin "baserom.dol", 0x3D19D4, 0x4 + +.global lbl_80452B78 +lbl_80452B78: +.incbin "baserom.dol", 0x3D19D8, 0x4 + +.global lbl_80452B7C +lbl_80452B7C: +.incbin "baserom.dol", 0x3D19DC, 0x4 + +.global lbl_80452B80 +lbl_80452B80: +.incbin "baserom.dol", 0x3D19E0, 0x4 + +.global lbl_80452B84 +lbl_80452B84: +.incbin "baserom.dol", 0x3D19E4, 0x4 + +.global lbl_80452B88 +lbl_80452B88: +.incbin "baserom.dol", 0x3D19E8, 0x4 + +.global lbl_80452B8C +lbl_80452B8C: +.incbin "baserom.dol", 0x3D19EC, 0x4 + +.global lbl_80452B90 +lbl_80452B90: +.incbin "baserom.dol", 0x3D19F0, 0x4 + +.global lbl_80452B94 +lbl_80452B94: +.incbin "baserom.dol", 0x3D19F4, 0x4 + +.global lbl_80452B98 +lbl_80452B98: +.incbin "baserom.dol", 0x3D19F8, 0x4 + +.global lbl_80452B9C +lbl_80452B9C: +.incbin "baserom.dol", 0x3D19FC, 0x4 + +.global lbl_80452BA0 +lbl_80452BA0: +.incbin "baserom.dol", 0x3D1A00, 0x4 + +.global lbl_80452BA4 +lbl_80452BA4: +.incbin "baserom.dol", 0x3D1A04, 0x4 + +.global lbl_80452BA8 +lbl_80452BA8: +.incbin "baserom.dol", 0x3D1A08, 0x4 + +.global lbl_80452BAC +lbl_80452BAC: +.incbin "baserom.dol", 0x3D1A0C, 0x4 + +.global lbl_80452BB0 +lbl_80452BB0: +.incbin "baserom.dol", 0x3D1A10, 0x4 + +.global lbl_80452BB4 +lbl_80452BB4: +.incbin "baserom.dol", 0x3D1A14, 0x4 + +.global lbl_80452BB8 +lbl_80452BB8: +.incbin "baserom.dol", 0x3D1A18, 0x4 + +.global lbl_80452BBC +lbl_80452BBC: +.incbin "baserom.dol", 0x3D1A1C, 0x4 + +.global lbl_80452BC0 +lbl_80452BC0: +.incbin "baserom.dol", 0x3D1A20, 0x4 + +.global lbl_80452BC4 +lbl_80452BC4: +.incbin "baserom.dol", 0x3D1A24, 0x4 + diff --git a/asm/sdata2/d_event.s b/asm/sdata2/d_event.s new file mode 100644 index 0000000000..627a0332e8 --- /dev/null +++ b/asm/sdata2/d_event.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451ec0 - 0x80451ed0 + +.global lbl_80451EC0 +lbl_80451EC0: +.incbin "baserom.dol", 0x3D0D20, 0x4 + +.global lbl_80451EC4 +lbl_80451EC4: +.incbin "baserom.dol", 0x3D0D24, 0x4 + +.global lbl_80451EC8 +lbl_80451EC8: +.incbin "baserom.dol", 0x3D0D28, 0x4 + +.global lbl_80451ECC +lbl_80451ECC: +.incbin "baserom.dol", 0x3D0D2C, 0x4 + diff --git a/asm/sdata2/d_event_data.s b/asm/sdata2/d_event_data.s new file mode 100644 index 0000000000..7573f2b957 --- /dev/null +++ b/asm/sdata2/d_event_data.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451ed0 - 0x80451f00 + +.global lbl_80451ED0 +lbl_80451ED0: +.incbin "baserom.dol", 0x3D0D30, 0x4 + +.global lbl_80451ED4 +lbl_80451ED4: +.incbin "baserom.dol", 0x3D0D34, 0x4 + +.global lbl_80451ED8 +lbl_80451ED8: +.incbin "baserom.dol", 0x3D0D38, 0x8 + +.global lbl_80451EE0 +lbl_80451EE0: +.incbin "baserom.dol", 0x3D0D40, 0x8 + +.global lbl_80451EE8 +lbl_80451EE8: +.incbin "baserom.dol", 0x3D0D48, 0x8 + +.global lbl_80451EF0 +lbl_80451EF0: +.incbin "baserom.dol", 0x3D0D50, 0x4 + +.global lbl_80451EF4 +lbl_80451EF4: +.incbin "baserom.dol", 0x3D0D54, 0x4 + +.global lbl_80451EF8 +lbl_80451EF8: +.incbin "baserom.dol", 0x3D0D58, 0x4 + +.global lbl_80451EFC +lbl_80451EFC: +.incbin "baserom.dol", 0x3D0D5C, 0x4 + diff --git a/asm/sdata2/d_event_manager.s b/asm/sdata2/d_event_manager.s new file mode 100644 index 0000000000..498deec610 --- /dev/null +++ b/asm/sdata2/d_event_manager.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451f00 - 0x80451f38 + +.global lbl_80451F00 +lbl_80451F00: +.incbin "baserom.dol", 0x3D0D60, 0x8 + +.global lbl_80451F08 +lbl_80451F08: +.incbin "baserom.dol", 0x3D0D68, 0x8 + +.global lbl_80451F10 +lbl_80451F10: +.incbin "baserom.dol", 0x3D0D70, 0x8 + +.global lbl_80451F18 +lbl_80451F18: +.incbin "baserom.dol", 0x3D0D78, 0x8 + +.global lbl_80451F20 +lbl_80451F20: +.incbin "baserom.dol", 0x3D0D80, 0x4 + +.global lbl_80451F24 +lbl_80451F24: +.incbin "baserom.dol", 0x3D0D84, 0x4 + +.global lbl_80451F28 +lbl_80451F28: +.incbin "baserom.dol", 0x3D0D88, 0x4 + +.global lbl_80451F2C +lbl_80451F2C: +.incbin "baserom.dol", 0x3D0D8C, 0x4 + +.global lbl_80451F30 +lbl_80451F30: +.incbin "baserom.dol", 0x3D0D90, 0x4 + +.global lbl_80451F34 +lbl_80451F34: +.incbin "baserom.dol", 0x3D0D94, 0x4 + diff --git a/asm/sdata2/d_eye_hl.s b/asm/sdata2/d_eye_hl.s new file mode 100644 index 0000000000..afc2621d9c --- /dev/null +++ b/asm/sdata2/d_eye_hl.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452c10 - 0x80452c18 + +.global lbl_80452C10 +lbl_80452C10: +.incbin "baserom.dol", 0x3D1A70, 0x4 + +.global lbl_80452C14 +lbl_80452C14: +.incbin "baserom.dol", 0x3D1A74, 0x4 + diff --git a/asm/sdata2/d_file_sel_info.s b/asm/sdata2/d_file_sel_info.s new file mode 100644 index 0000000000..97f54d563a --- /dev/null +++ b/asm/sdata2/d_file_sel_info.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804539f8 - 0x80453a00 + +.global lbl_804539F8 +lbl_804539F8: +.incbin "baserom.dol", 0x3D2858, 0x4 + +.global lbl_804539FC +lbl_804539FC: +.incbin "baserom.dol", 0x3D285C, 0x4 + diff --git a/asm/sdata2/d_file_sel_warning.s b/asm/sdata2/d_file_sel_warning.s new file mode 100644 index 0000000000..42b7bb4375 --- /dev/null +++ b/asm/sdata2/d_file_sel_warning.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804539d8 - 0x804539f8 + +.global lbl_804539D8 +lbl_804539D8: +.incbin "baserom.dol", 0x3D2838, 0x4 + +.global lbl_804539DC +lbl_804539DC: +.incbin "baserom.dol", 0x3D283C, 0x4 + +.global lbl_804539E0 +lbl_804539E0: +.incbin "baserom.dol", 0x3D2840, 0x4 + +.global lbl_804539E4 +lbl_804539E4: +.incbin "baserom.dol", 0x3D2844, 0x4 + +.global lbl_804539E8 +lbl_804539E8: +.incbin "baserom.dol", 0x3D2848, 0x4 + +.global lbl_804539EC +lbl_804539EC: +.incbin "baserom.dol", 0x3D284C, 0x4 + +.global lbl_804539F0 +lbl_804539F0: +.incbin "baserom.dol", 0x3D2850, 0x8 + diff --git a/asm/sdata2/d_file_select.s b/asm/sdata2/d_file_select.s new file mode 100644 index 0000000000..922d0e1550 --- /dev/null +++ b/asm/sdata2/d_file_select.s @@ -0,0 +1,155 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453928 - 0x804539d8 + +.global lbl_80453928 +lbl_80453928: +.incbin "baserom.dol", 0x3D2788, 0x4 + +.global lbl_8045392C +lbl_8045392C: +.incbin "baserom.dol", 0x3D278C, 0x4 + +.global lbl_80453930 +lbl_80453930: +.incbin "baserom.dol", 0x3D2790, 0x8 + +.global lbl_80453938 +lbl_80453938: +.incbin "baserom.dol", 0x3D2798, 0x8 + +.global lbl_80453940 +lbl_80453940: +.incbin "baserom.dol", 0x3D27A0, 0x4 + +.global lbl_80453944 +lbl_80453944: +.incbin "baserom.dol", 0x3D27A4, 0x4 + +.global lbl_80453948 +lbl_80453948: +.incbin "baserom.dol", 0x3D27A8, 0x4 + +.global lbl_8045394C +lbl_8045394C: +.incbin "baserom.dol", 0x3D27AC, 0x4 + +.global lbl_80453950 +lbl_80453950: +.incbin "baserom.dol", 0x3D27B0, 0x8 + +.global lbl_80453958 +lbl_80453958: +.incbin "baserom.dol", 0x3D27B8, 0x8 + +.global lbl_80453960 +lbl_80453960: +.incbin "baserom.dol", 0x3D27C0, 0x4 + +.global lbl_80453964 +lbl_80453964: +.incbin "baserom.dol", 0x3D27C4, 0x4 + +.global lbl_80453968 +lbl_80453968: +.incbin "baserom.dol", 0x3D27C8, 0x4 + +.global lbl_8045396C +lbl_8045396C: +.incbin "baserom.dol", 0x3D27CC, 0x4 + +.global lbl_80453970 +lbl_80453970: +.incbin "baserom.dol", 0x3D27D0, 0x4 + +.global lbl_80453974 +lbl_80453974: +.incbin "baserom.dol", 0x3D27D4, 0x4 + +.global lbl_80453978 +lbl_80453978: +.incbin "baserom.dol", 0x3D27D8, 0x4 + +.global lbl_8045397C +lbl_8045397C: +.incbin "baserom.dol", 0x3D27DC, 0x4 + +.global lbl_80453980 +lbl_80453980: +.incbin "baserom.dol", 0x3D27E0, 0x4 + +.global lbl_80453984 +lbl_80453984: +.incbin "baserom.dol", 0x3D27E4, 0x4 + +.global lbl_80453988 +lbl_80453988: +.incbin "baserom.dol", 0x3D27E8, 0x4 + +.global lbl_8045398C +lbl_8045398C: +.incbin "baserom.dol", 0x3D27EC, 0x4 + +.global lbl_80453990 +lbl_80453990: +.incbin "baserom.dol", 0x3D27F0, 0x4 + +.global lbl_80453994 +lbl_80453994: +.incbin "baserom.dol", 0x3D27F4, 0x4 + +.global lbl_80453998 +lbl_80453998: +.incbin "baserom.dol", 0x3D27F8, 0x4 + +.global lbl_8045399C +lbl_8045399C: +.incbin "baserom.dol", 0x3D27FC, 0x4 + +.global lbl_804539A0 +lbl_804539A0: +.incbin "baserom.dol", 0x3D2800, 0x4 + +.global lbl_804539A4 +lbl_804539A4: +.incbin "baserom.dol", 0x3D2804, 0x4 + +.global lbl_804539A8 +lbl_804539A8: +.incbin "baserom.dol", 0x3D2808, 0x4 + +.global lbl_804539AC +lbl_804539AC: +.incbin "baserom.dol", 0x3D280C, 0x4 + +.global lbl_804539B0 +lbl_804539B0: +.incbin "baserom.dol", 0x3D2810, 0x4 + +.global lbl_804539B4 +lbl_804539B4: +.incbin "baserom.dol", 0x3D2814, 0x4 + +.global lbl_804539B8 +lbl_804539B8: +.incbin "baserom.dol", 0x3D2818, 0x4 + +.global lbl_804539BC +lbl_804539BC: +.incbin "baserom.dol", 0x3D281C, 0x4 + +.global lbl_804539C0 +lbl_804539C0: +.incbin "baserom.dol", 0x3D2820, 0x8 + +.global lbl_804539C8 +lbl_804539C8: +.incbin "baserom.dol", 0x3D2828, 0x8 + +.global lbl_804539D0 +lbl_804539D0: +.incbin "baserom.dol", 0x3D2830, 0x4 + +.global lbl_804539D4 +lbl_804539D4: +.incbin "baserom.dol", 0x3D2834, 0x4 + diff --git a/asm/sdata2/d_gameover.s b/asm/sdata2/d_gameover.s new file mode 100644 index 0000000000..3e78040cb4 --- /dev/null +++ b/asm/sdata2/d_gameover.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453b80 - 0x80453bc0 + +.global lbl_80453B80 +lbl_80453B80: +.incbin "baserom.dol", 0x3D29E0, 0x4 + +.global lbl_80453B84 +lbl_80453B84: +.incbin "baserom.dol", 0x3D29E4, 0x4 + +.global lbl_80453B88 +lbl_80453B88: +.incbin "baserom.dol", 0x3D29E8, 0x4 + +.global lbl_80453B8C +lbl_80453B8C: +.incbin "baserom.dol", 0x3D29EC, 0x4 + +.global lbl_80453B90 +lbl_80453B90: +.incbin "baserom.dol", 0x3D29F0, 0x4 + +.global lbl_80453B94 +lbl_80453B94: +.incbin "baserom.dol", 0x3D29F4, 0x4 + +.global lbl_80453B98 +lbl_80453B98: +.incbin "baserom.dol", 0x3D29F8, 0x8 + +.global lbl_80453BA0 +lbl_80453BA0: +.incbin "baserom.dol", 0x3D2A00, 0x4 + +.global lbl_80453BA4 +lbl_80453BA4: +.incbin "baserom.dol", 0x3D2A04, 0x4 + +.global lbl_80453BA8 +lbl_80453BA8: +.incbin "baserom.dol", 0x3D2A08, 0x4 + +.global lbl_80453BAC +lbl_80453BAC: +.incbin "baserom.dol", 0x3D2A0C, 0x4 + +.global lbl_80453BB0 +lbl_80453BB0: +.incbin "baserom.dol", 0x3D2A10, 0x4 + +.global lbl_80453BB4 +lbl_80453BB4: +.incbin "baserom.dol", 0x3D2A14, 0x4 + +.global lbl_80453BB8 +lbl_80453BB8: +.incbin "baserom.dol", 0x3D2A18, 0x8 + diff --git a/asm/sdata2/d_insect.s b/asm/sdata2/d_insect.s new file mode 100644 index 0000000000..c399fdddc1 --- /dev/null +++ b/asm/sdata2/d_insect.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804535e0 - 0x80453600 + +.global lbl_804535E0 +lbl_804535E0: +.incbin "baserom.dol", 0x3D2440, 0x4 + +.global lbl_804535E4 +lbl_804535E4: +.incbin "baserom.dol", 0x3D2444, 0x4 + +.global lbl_804535E8 +lbl_804535E8: +.incbin "baserom.dol", 0x3D2448, 0x4 + +.global lbl_804535EC +lbl_804535EC: +.incbin "baserom.dol", 0x3D244C, 0x4 + +.global lbl_804535F0 +lbl_804535F0: +.incbin "baserom.dol", 0x3D2450, 0x4 + +.global lbl_804535F4 +lbl_804535F4: +.incbin "baserom.dol", 0x3D2454, 0x4 + +.global lbl_804535F8 +lbl_804535F8: +.incbin "baserom.dol", 0x3D2458, 0x8 + diff --git a/asm/sdata2/d_item.s b/asm/sdata2/d_item.s new file mode 100644 index 0000000000..e0b92f53bd --- /dev/null +++ b/asm/sdata2/d_item.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452bd8 - 0x80452be8 + +.global lbl_80452BD8 +lbl_80452BD8: +.incbin "baserom.dol", 0x3D1A38, 0x4 + +.global lbl_80452BDC +lbl_80452BDC: +.incbin "baserom.dol", 0x3D1A3C, 0x4 + +.global lbl_80452BE0 +lbl_80452BE0: +.incbin "baserom.dol", 0x3D1A40, 0x8 + diff --git a/asm/sdata2/d_jnt_col.s b/asm/sdata2/d_jnt_col.s new file mode 100644 index 0000000000..d79d621029 --- /dev/null +++ b/asm/sdata2/d_jnt_col.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451d60 - 0x80451d98 + +.global lbl_80451D60 +lbl_80451D60: +.incbin "baserom.dol", 0x3D0BC0, 0x4 + +.global lbl_80451D64 +lbl_80451D64: +.incbin "baserom.dol", 0x3D0BC4, 0x4 + +.global lbl_80451D68 +lbl_80451D68: +.incbin "baserom.dol", 0x3D0BC8, 0x8 + +.global lbl_80451D70 +lbl_80451D70: +.incbin "baserom.dol", 0x3D0BD0, 0x8 + +.global lbl_80451D78 +lbl_80451D78: +.incbin "baserom.dol", 0x3D0BD8, 0x8 + +.global lbl_80451D80 +lbl_80451D80: +.incbin "baserom.dol", 0x3D0BE0, 0x8 + +.global lbl_80451D88 +lbl_80451D88: +.incbin "baserom.dol", 0x3D0BE8, 0x4 + +.global lbl_80451D8C +lbl_80451D8C: +.incbin "baserom.dol", 0x3D0BEC, 0x4 + +.global lbl_80451D90 +lbl_80451D90: +.incbin "baserom.dol", 0x3D0BF0, 0x4 + +.global lbl_80451D94 +lbl_80451D94: +.incbin "baserom.dol", 0x3D0BF4, 0x4 + diff --git a/asm/sdata2/d_k_wmark.s b/asm/sdata2/d_k_wmark.s new file mode 100644 index 0000000000..b6ff81e84f --- /dev/null +++ b/asm/sdata2/d_k_wmark.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454fb0 - 0x80454ff0 + +.global lbl_80454FB0 +lbl_80454FB0: +.incbin "baserom.dol", 0x3D3E10, 0x4 + +.global lbl_80454FB4 +lbl_80454FB4: +.incbin "baserom.dol", 0x3D3E14, 0x4 + +.global lbl_80454FB8 +lbl_80454FB8: +.incbin "baserom.dol", 0x3D3E18, 0x4 + +.global lbl_80454FBC +lbl_80454FBC: +.incbin "baserom.dol", 0x3D3E1C, 0x4 + +.global lbl_80454FC0 +lbl_80454FC0: +.incbin "baserom.dol", 0x3D3E20, 0x8 + +.global lbl_80454FC8 +lbl_80454FC8: +.incbin "baserom.dol", 0x3D3E28, 0x8 + +.global lbl_80454FD0 +lbl_80454FD0: +.incbin "baserom.dol", 0x3D3E30, 0x8 + +.global lbl_80454FD8 +lbl_80454FD8: +.incbin "baserom.dol", 0x3D3E38, 0x8 + +.global lbl_80454FE0 +lbl_80454FE0: +.incbin "baserom.dol", 0x3D3E40, 0x4 + +.global lbl_80454FE4 +lbl_80454FE4: +.incbin "baserom.dol", 0x3D3E44, 0x4 + +.global lbl_80454FE8 +lbl_80454FE8: +.incbin "baserom.dol", 0x3D3E48, 0x8 + diff --git a/asm/sdata2/d_k_wpillar.s b/asm/sdata2/d_k_wpillar.s new file mode 100644 index 0000000000..767c15b096 --- /dev/null +++ b/asm/sdata2/d_k_wpillar.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454ff0 - 0x80455008 + +.global lbl_80454FF0 +lbl_80454FF0: +.incbin "baserom.dol", 0x3D3E50, 0x8 + +.global lbl_80454FF8 +lbl_80454FF8: +.incbin "baserom.dol", 0x3D3E58, 0x4 + +.global lbl_80454FFC +lbl_80454FFC: +.incbin "baserom.dol", 0x3D3E5C, 0x4 + +.global lbl_80455000 +lbl_80455000: +.incbin "baserom.dol", 0x3D3E60, 0x4 + +.global lbl_80455004 +lbl_80455004: +.incbin "baserom.dol", 0x3D3E64, 0x4 + diff --git a/asm/sdata2/d_kankyo.s b/asm/sdata2/d_kankyo.s new file mode 100644 index 0000000000..ec18b701a7 --- /dev/null +++ b/asm/sdata2/d_kankyo.s @@ -0,0 +1,639 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453bc0 - 0x80453e58 + +.global lbl_80453BC0 +lbl_80453BC0: +.incbin "baserom.dol", 0x3D2A20, 0x4 + +.global lbl_80453BC4 +lbl_80453BC4: +.incbin "baserom.dol", 0x3D2A24, 0x4 + +.global lbl_80453BC8 +lbl_80453BC8: +.incbin "baserom.dol", 0x3D2A28, 0x4 + +.global lbl_80453BCC +lbl_80453BCC: +.incbin "baserom.dol", 0x3D2A2C, 0x4 + +.global lbl_80453BD0 +lbl_80453BD0: +.incbin "baserom.dol", 0x3D2A30, 0x4 + +.global lbl_80453BD4 +lbl_80453BD4: +.incbin "baserom.dol", 0x3D2A34, 0x4 + +.global lbl_80453BD8 +lbl_80453BD8: +.incbin "baserom.dol", 0x3D2A38, 0x4 + +.global lbl_80453BDC +lbl_80453BDC: +.incbin "baserom.dol", 0x3D2A3C, 0x4 + +.global lbl_80453BE0 +lbl_80453BE0: +.incbin "baserom.dol", 0x3D2A40, 0x4 + +.global lbl_80453BE4 +lbl_80453BE4: +.incbin "baserom.dol", 0x3D2A44, 0x4 + +.global lbl_80453BE8 +lbl_80453BE8: +.incbin "baserom.dol", 0x3D2A48, 0x4 + +.global lbl_80453BEC +lbl_80453BEC: +.incbin "baserom.dol", 0x3D2A4C, 0x4 + +.global lbl_80453BF0 +lbl_80453BF0: +.incbin "baserom.dol", 0x3D2A50, 0x4 + +.global lbl_80453BF4 +lbl_80453BF4: +.incbin "baserom.dol", 0x3D2A54, 0x4 + +.global lbl_80453BF8 +lbl_80453BF8: +.incbin "baserom.dol", 0x3D2A58, 0x4 + +.global lbl_80453BFC +lbl_80453BFC: +.incbin "baserom.dol", 0x3D2A5C, 0x4 + +.global lbl_80453C00 +lbl_80453C00: +.incbin "baserom.dol", 0x3D2A60, 0x4 + +.global lbl_80453C04 +lbl_80453C04: +.incbin "baserom.dol", 0x3D2A64, 0x4 + +.global lbl_80453C08 +lbl_80453C08: +.incbin "baserom.dol", 0x3D2A68, 0x4 + +.global lbl_80453C0C +lbl_80453C0C: +.incbin "baserom.dol", 0x3D2A6C, 0x4 + +.global lbl_80453C10 +lbl_80453C10: +.incbin "baserom.dol", 0x3D2A70, 0x8 + +.global lbl_80453C18 +lbl_80453C18: +.incbin "baserom.dol", 0x3D2A78, 0x8 + +.global lbl_80453C20 +lbl_80453C20: +.incbin "baserom.dol", 0x3D2A80, 0x8 + +.global lbl_80453C28 +lbl_80453C28: +.incbin "baserom.dol", 0x3D2A88, 0x4 + +.global lbl_80453C2C +lbl_80453C2C: +.incbin "baserom.dol", 0x3D2A8C, 0x4 + +.global lbl_80453C30 +lbl_80453C30: +.incbin "baserom.dol", 0x3D2A90, 0x8 + +.global lbl_80453C38 +lbl_80453C38: +.incbin "baserom.dol", 0x3D2A98, 0x4 + +.global lbl_80453C3C +lbl_80453C3C: +.incbin "baserom.dol", 0x3D2A9C, 0x4 + +.global lbl_80453C40 +lbl_80453C40: +.incbin "baserom.dol", 0x3D2AA0, 0x4 + +.global lbl_80453C44 +lbl_80453C44: +.incbin "baserom.dol", 0x3D2AA4, 0x4 + +.global lbl_80453C48 +lbl_80453C48: +.incbin "baserom.dol", 0x3D2AA8, 0x4 + +.global lbl_80453C4C +lbl_80453C4C: +.incbin "baserom.dol", 0x3D2AAC, 0x4 + +.global lbl_80453C50 +lbl_80453C50: +.incbin "baserom.dol", 0x3D2AB0, 0x4 + +.global lbl_80453C54 +lbl_80453C54: +.incbin "baserom.dol", 0x3D2AB4, 0x4 + +.global lbl_80453C58 +lbl_80453C58: +.incbin "baserom.dol", 0x3D2AB8, 0x4 + +.global lbl_80453C5C +lbl_80453C5C: +.incbin "baserom.dol", 0x3D2ABC, 0x4 + +.global lbl_80453C60 +lbl_80453C60: +.incbin "baserom.dol", 0x3D2AC0, 0x4 + +.global lbl_80453C64 +lbl_80453C64: +.incbin "baserom.dol", 0x3D2AC4, 0x4 + +.global lbl_80453C68 +lbl_80453C68: +.incbin "baserom.dol", 0x3D2AC8, 0x4 + +.global lbl_80453C6C +lbl_80453C6C: +.incbin "baserom.dol", 0x3D2ACC, 0x4 + +.global lbl_80453C70 +lbl_80453C70: +.incbin "baserom.dol", 0x3D2AD0, 0x4 + +.global lbl_80453C74 +lbl_80453C74: +.incbin "baserom.dol", 0x3D2AD4, 0x4 + +.global lbl_80453C78 +lbl_80453C78: +.incbin "baserom.dol", 0x3D2AD8, 0x8 + +.global lbl_80453C80 +lbl_80453C80: +.incbin "baserom.dol", 0x3D2AE0, 0x8 + +.global lbl_80453C88 +lbl_80453C88: +.incbin "baserom.dol", 0x3D2AE8, 0x4 + +.global lbl_80453C8C +lbl_80453C8C: +.incbin "baserom.dol", 0x3D2AEC, 0x4 + +.global lbl_80453C90 +lbl_80453C90: +.incbin "baserom.dol", 0x3D2AF0, 0x4 + +.global lbl_80453C94 +lbl_80453C94: +.incbin "baserom.dol", 0x3D2AF4, 0x4 + +.global lbl_80453C98 +lbl_80453C98: +.incbin "baserom.dol", 0x3D2AF8, 0x4 + +.global lbl_80453C9C +lbl_80453C9C: +.incbin "baserom.dol", 0x3D2AFC, 0x4 + +.global lbl_80453CA0 +lbl_80453CA0: +.incbin "baserom.dol", 0x3D2B00, 0x4 + +.global lbl_80453CA4 +lbl_80453CA4: +.incbin "baserom.dol", 0x3D2B04, 0x4 + +.global lbl_80453CA8 +lbl_80453CA8: +.incbin "baserom.dol", 0x3D2B08, 0x4 + +.global lbl_80453CAC +lbl_80453CAC: +.incbin "baserom.dol", 0x3D2B0C, 0x4 + +.global lbl_80453CB0 +lbl_80453CB0: +.incbin "baserom.dol", 0x3D2B10, 0x4 + +.global lbl_80453CB4 +lbl_80453CB4: +.incbin "baserom.dol", 0x3D2B14, 0x4 + +.global lbl_80453CB8 +lbl_80453CB8: +.incbin "baserom.dol", 0x3D2B18, 0x4 + +.global lbl_80453CBC +lbl_80453CBC: +.incbin "baserom.dol", 0x3D2B1C, 0x4 + +.global lbl_80453CC0 +lbl_80453CC0: +.incbin "baserom.dol", 0x3D2B20, 0x4 + +.global lbl_80453CC4 +lbl_80453CC4: +.incbin "baserom.dol", 0x3D2B24, 0x4 + +.global lbl_80453CC8 +lbl_80453CC8: +.incbin "baserom.dol", 0x3D2B28, 0x4 + +.global lbl_80453CCC +lbl_80453CCC: +.incbin "baserom.dol", 0x3D2B2C, 0x4 + +.global lbl_80453CD0 +lbl_80453CD0: +.incbin "baserom.dol", 0x3D2B30, 0x4 + +.global lbl_80453CD4 +lbl_80453CD4: +.incbin "baserom.dol", 0x3D2B34, 0x4 + +.global lbl_80453CD8 +lbl_80453CD8: +.incbin "baserom.dol", 0x3D2B38, 0x4 + +.global lbl_80453CDC +lbl_80453CDC: +.incbin "baserom.dol", 0x3D2B3C, 0x4 + +.global lbl_80453CE0 +lbl_80453CE0: +.incbin "baserom.dol", 0x3D2B40, 0x4 + +.global lbl_80453CE4 +lbl_80453CE4: +.incbin "baserom.dol", 0x3D2B44, 0x4 + +.global lbl_80453CE8 +lbl_80453CE8: +.incbin "baserom.dol", 0x3D2B48, 0x4 + +.global lbl_80453CEC +lbl_80453CEC: +.incbin "baserom.dol", 0x3D2B4C, 0x4 + +.global lbl_80453CF0 +lbl_80453CF0: +.incbin "baserom.dol", 0x3D2B50, 0x4 + +.global lbl_80453CF4 +lbl_80453CF4: +.incbin "baserom.dol", 0x3D2B54, 0x4 + +.global lbl_80453CF8 +lbl_80453CF8: +.incbin "baserom.dol", 0x3D2B58, 0x4 + +.global lbl_80453CFC +lbl_80453CFC: +.incbin "baserom.dol", 0x3D2B5C, 0x4 + +.global lbl_80453D00 +lbl_80453D00: +.incbin "baserom.dol", 0x3D2B60, 0x4 + +.global lbl_80453D04 +lbl_80453D04: +.incbin "baserom.dol", 0x3D2B64, 0x4 + +.global lbl_80453D08 +lbl_80453D08: +.incbin "baserom.dol", 0x3D2B68, 0x4 + +.global lbl_80453D0C +lbl_80453D0C: +.incbin "baserom.dol", 0x3D2B6C, 0x4 + +.global lbl_80453D10 +lbl_80453D10: +.incbin "baserom.dol", 0x3D2B70, 0x4 + +.global lbl_80453D14 +lbl_80453D14: +.incbin "baserom.dol", 0x3D2B74, 0x4 + +.global lbl_80453D18 +lbl_80453D18: +.incbin "baserom.dol", 0x3D2B78, 0x4 + +.global lbl_80453D1C +lbl_80453D1C: +.incbin "baserom.dol", 0x3D2B7C, 0x4 + +.global lbl_80453D20 +lbl_80453D20: +.incbin "baserom.dol", 0x3D2B80, 0x4 + +.global lbl_80453D24 +lbl_80453D24: +.incbin "baserom.dol", 0x3D2B84, 0x4 + +.global lbl_80453D28 +lbl_80453D28: +.incbin "baserom.dol", 0x3D2B88, 0x4 + +.global lbl_80453D2C +lbl_80453D2C: +.incbin "baserom.dol", 0x3D2B8C, 0x4 + +.global lbl_80453D30 +lbl_80453D30: +.incbin "baserom.dol", 0x3D2B90, 0x4 + +.global lbl_80453D34 +lbl_80453D34: +.incbin "baserom.dol", 0x3D2B94, 0x4 + +.global lbl_80453D38 +lbl_80453D38: +.incbin "baserom.dol", 0x3D2B98, 0x4 + +.global lbl_80453D3C +lbl_80453D3C: +.incbin "baserom.dol", 0x3D2B9C, 0x4 + +.global lbl_80453D40 +lbl_80453D40: +.incbin "baserom.dol", 0x3D2BA0, 0x4 + +.global lbl_80453D44 +lbl_80453D44: +.incbin "baserom.dol", 0x3D2BA4, 0x4 + +.global lbl_80453D48 +lbl_80453D48: +.incbin "baserom.dol", 0x3D2BA8, 0x4 + +.global lbl_80453D4C +lbl_80453D4C: +.incbin "baserom.dol", 0x3D2BAC, 0x4 + +.global lbl_80453D50 +lbl_80453D50: +.incbin "baserom.dol", 0x3D2BB0, 0x4 + +.global lbl_80453D54 +lbl_80453D54: +.incbin "baserom.dol", 0x3D2BB4, 0x4 + +.global lbl_80453D58 +lbl_80453D58: +.incbin "baserom.dol", 0x3D2BB8, 0x4 + +.global lbl_80453D5C +lbl_80453D5C: +.incbin "baserom.dol", 0x3D2BBC, 0x4 + +.global lbl_80453D60 +lbl_80453D60: +.incbin "baserom.dol", 0x3D2BC0, 0x4 + +.global lbl_80453D64 +lbl_80453D64: +.incbin "baserom.dol", 0x3D2BC4, 0x4 + +.global lbl_80453D68 +lbl_80453D68: +.incbin "baserom.dol", 0x3D2BC8, 0x4 + +.global lbl_80453D6C +lbl_80453D6C: +.incbin "baserom.dol", 0x3D2BCC, 0x4 + +.global lbl_80453D70 +lbl_80453D70: +.incbin "baserom.dol", 0x3D2BD0, 0x4 + +.global lbl_80453D74 +lbl_80453D74: +.incbin "baserom.dol", 0x3D2BD4, 0x4 + +.global lbl_80453D78 +lbl_80453D78: +.incbin "baserom.dol", 0x3D2BD8, 0x4 + +.global lbl_80453D7C +lbl_80453D7C: +.incbin "baserom.dol", 0x3D2BDC, 0x4 + +.global lbl_80453D80 +lbl_80453D80: +.incbin "baserom.dol", 0x3D2BE0, 0x4 + +.global lbl_80453D84 +lbl_80453D84: +.incbin "baserom.dol", 0x3D2BE4, 0x4 + +.global lbl_80453D88 +lbl_80453D88: +.incbin "baserom.dol", 0x3D2BE8, 0x4 + +.global lbl_80453D8C +lbl_80453D8C: +.incbin "baserom.dol", 0x3D2BEC, 0x4 + +.global lbl_80453D90 +lbl_80453D90: +.incbin "baserom.dol", 0x3D2BF0, 0x4 + +.global lbl_80453D94 +lbl_80453D94: +.incbin "baserom.dol", 0x3D2BF4, 0x4 + +.global lbl_80453D98 +lbl_80453D98: +.incbin "baserom.dol", 0x3D2BF8, 0x4 + +.global lbl_80453D9C +lbl_80453D9C: +.incbin "baserom.dol", 0x3D2BFC, 0x4 + +.global lbl_80453DA0 +lbl_80453DA0: +.incbin "baserom.dol", 0x3D2C00, 0x4 + +.global lbl_80453DA4 +lbl_80453DA4: +.incbin "baserom.dol", 0x3D2C04, 0x4 + +.global lbl_80453DA8 +lbl_80453DA8: +.incbin "baserom.dol", 0x3D2C08, 0x4 + +.global lbl_80453DAC +lbl_80453DAC: +.incbin "baserom.dol", 0x3D2C0C, 0x4 + +.global lbl_80453DB0 +lbl_80453DB0: +.incbin "baserom.dol", 0x3D2C10, 0x4 + +.global lbl_80453DB4 +lbl_80453DB4: +.incbin "baserom.dol", 0x3D2C14, 0x4 + +.global lbl_80453DB8 +lbl_80453DB8: +.incbin "baserom.dol", 0x3D2C18, 0x4 + +.global lbl_80453DBC +lbl_80453DBC: +.incbin "baserom.dol", 0x3D2C1C, 0x4 + +.global lbl_80453DC0 +lbl_80453DC0: +.incbin "baserom.dol", 0x3D2C20, 0x4 + +.global lbl_80453DC4 +lbl_80453DC4: +.incbin "baserom.dol", 0x3D2C24, 0x4 + +.global lbl_80453DC8 +lbl_80453DC8: +.incbin "baserom.dol", 0x3D2C28, 0x4 + +.global lbl_80453DCC +lbl_80453DCC: +.incbin "baserom.dol", 0x3D2C2C, 0x4 + +.global lbl_80453DD0 +lbl_80453DD0: +.incbin "baserom.dol", 0x3D2C30, 0x4 + +.global lbl_80453DD4 +lbl_80453DD4: +.incbin "baserom.dol", 0x3D2C34, 0x4 + +.global lbl_80453DD8 +lbl_80453DD8: +.incbin "baserom.dol", 0x3D2C38, 0x4 + +.global lbl_80453DDC +lbl_80453DDC: +.incbin "baserom.dol", 0x3D2C3C, 0x4 + +.global lbl_80453DE0 +lbl_80453DE0: +.incbin "baserom.dol", 0x3D2C40, 0x4 + +.global lbl_80453DE4 +lbl_80453DE4: +.incbin "baserom.dol", 0x3D2C44, 0x4 + +.global lbl_80453DE8 +lbl_80453DE8: +.incbin "baserom.dol", 0x3D2C48, 0x4 + +.global lbl_80453DEC +lbl_80453DEC: +.incbin "baserom.dol", 0x3D2C4C, 0x4 + +.global lbl_80453DF0 +lbl_80453DF0: +.incbin "baserom.dol", 0x3D2C50, 0x4 + +.global lbl_80453DF4 +lbl_80453DF4: +.incbin "baserom.dol", 0x3D2C54, 0x4 + +.global lbl_80453DF8 +lbl_80453DF8: +.incbin "baserom.dol", 0x3D2C58, 0x4 + +.global lbl_80453DFC +lbl_80453DFC: +.incbin "baserom.dol", 0x3D2C5C, 0x4 + +.global lbl_80453E00 +lbl_80453E00: +.incbin "baserom.dol", 0x3D2C60, 0x4 + +.global lbl_80453E04 +lbl_80453E04: +.incbin "baserom.dol", 0x3D2C64, 0x4 + +.global lbl_80453E08 +lbl_80453E08: +.incbin "baserom.dol", 0x3D2C68, 0x4 + +.global lbl_80453E0C +lbl_80453E0C: +.incbin "baserom.dol", 0x3D2C6C, 0x4 + +.global lbl_80453E10 +lbl_80453E10: +.incbin "baserom.dol", 0x3D2C70, 0x4 + +.global lbl_80453E14 +lbl_80453E14: +.incbin "baserom.dol", 0x3D2C74, 0x4 + +.global lbl_80453E18 +lbl_80453E18: +.incbin "baserom.dol", 0x3D2C78, 0x4 + +.global lbl_80453E1C +lbl_80453E1C: +.incbin "baserom.dol", 0x3D2C7C, 0x4 + +.global lbl_80453E20 +lbl_80453E20: +.incbin "baserom.dol", 0x3D2C80, 0x4 + +.global lbl_80453E24 +lbl_80453E24: +.incbin "baserom.dol", 0x3D2C84, 0x4 + +.global lbl_80453E28 +lbl_80453E28: +.incbin "baserom.dol", 0x3D2C88, 0x4 + +.global lbl_80453E2C +lbl_80453E2C: +.incbin "baserom.dol", 0x3D2C8C, 0x4 + +.global lbl_80453E30 +lbl_80453E30: +.incbin "baserom.dol", 0x3D2C90, 0x4 + +.global lbl_80453E34 +lbl_80453E34: +.incbin "baserom.dol", 0x3D2C94, 0x4 + +.global lbl_80453E38 +lbl_80453E38: +.incbin "baserom.dol", 0x3D2C98, 0x4 + +.global lbl_80453E3C +lbl_80453E3C: +.incbin "baserom.dol", 0x3D2C9C, 0x4 + +.global lbl_80453E40 +lbl_80453E40: +.incbin "baserom.dol", 0x3D2CA0, 0x4 + +.global lbl_80453E44 +lbl_80453E44: +.incbin "baserom.dol", 0x3D2CA4, 0x4 + +.global lbl_80453E48 +lbl_80453E48: +.incbin "baserom.dol", 0x3D2CA8, 0x4 + +.global lbl_80453E4C +lbl_80453E4C: +.incbin "baserom.dol", 0x3D2CAC, 0x4 + +.global lbl_80453E50 +lbl_80453E50: +.incbin "baserom.dol", 0x3D2CB0, 0x8 + diff --git a/asm/sdata2/d_kankyo_rain.s b/asm/sdata2/d_kankyo_rain.s new file mode 100644 index 0000000000..056afa1136 --- /dev/null +++ b/asm/sdata2/d_kankyo_rain.s @@ -0,0 +1,1103 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804521b0 - 0x80452620 + +.global lbl_804521B0 +lbl_804521B0: +.incbin "baserom.dol", 0x3D1010, 0x8 + +.global lbl_804521B8 +lbl_804521B8: +.incbin "baserom.dol", 0x3D1018, 0x4 + +.global lbl_804521BC +lbl_804521BC: +.incbin "baserom.dol", 0x3D101C, 0x4 + +.global lbl_804521C0 +lbl_804521C0: +.incbin "baserom.dol", 0x3D1020, 0x4 + +.global lbl_804521C4 +lbl_804521C4: +.incbin "baserom.dol", 0x3D1024, 0x4 + +.global lbl_804521C8 +lbl_804521C8: +.incbin "baserom.dol", 0x3D1028, 0x8 + +.global lbl_804521D0 +lbl_804521D0: +.incbin "baserom.dol", 0x3D1030, 0x4 + +.global lbl_804521D4 +lbl_804521D4: +.incbin "baserom.dol", 0x3D1034, 0x4 + +.global lbl_804521D8 +lbl_804521D8: +.incbin "baserom.dol", 0x3D1038, 0x4 + +.global lbl_804521DC +lbl_804521DC: +.incbin "baserom.dol", 0x3D103C, 0x4 + +.global lbl_804521E0 +lbl_804521E0: +.incbin "baserom.dol", 0x3D1040, 0x4 + +.global lbl_804521E4 +lbl_804521E4: +.incbin "baserom.dol", 0x3D1044, 0x4 + +.global lbl_804521E8 +lbl_804521E8: +.incbin "baserom.dol", 0x3D1048, 0x8 + +.global lbl_804521F0 +lbl_804521F0: +.incbin "baserom.dol", 0x3D1050, 0x8 + +.global lbl_804521F8 +lbl_804521F8: +.incbin "baserom.dol", 0x3D1058, 0x4 + +.global lbl_804521FC +lbl_804521FC: +.incbin "baserom.dol", 0x3D105C, 0x4 + +.global lbl_80452200 +lbl_80452200: +.incbin "baserom.dol", 0x3D1060, 0x4 + +.global lbl_80452204 +lbl_80452204: +.incbin "baserom.dol", 0x3D1064, 0x4 + +.global lbl_80452208 +lbl_80452208: +.incbin "baserom.dol", 0x3D1068, 0x4 + +.global lbl_8045220C +lbl_8045220C: +.incbin "baserom.dol", 0x3D106C, 0x4 + +.global lbl_80452210 +lbl_80452210: +.incbin "baserom.dol", 0x3D1070, 0x4 + +.global lbl_80452214 +lbl_80452214: +.incbin "baserom.dol", 0x3D1074, 0x4 + +.global lbl_80452218 +lbl_80452218: +.incbin "baserom.dol", 0x3D1078, 0x4 + +.global lbl_8045221C +lbl_8045221C: +.incbin "baserom.dol", 0x3D107C, 0x4 + +.global lbl_80452220 +lbl_80452220: +.incbin "baserom.dol", 0x3D1080, 0x4 + +.global lbl_80452224 +lbl_80452224: +.incbin "baserom.dol", 0x3D1084, 0x4 + +.global lbl_80452228 +lbl_80452228: +.incbin "baserom.dol", 0x3D1088, 0x4 + +.global lbl_8045222C +lbl_8045222C: +.incbin "baserom.dol", 0x3D108C, 0x4 + +.global lbl_80452230 +lbl_80452230: +.incbin "baserom.dol", 0x3D1090, 0x4 + +.global lbl_80452234 +lbl_80452234: +.incbin "baserom.dol", 0x3D1094, 0x4 + +.global lbl_80452238 +lbl_80452238: +.incbin "baserom.dol", 0x3D1098, 0x4 + +.global lbl_8045223C +lbl_8045223C: +.incbin "baserom.dol", 0x3D109C, 0x4 + +.global lbl_80452240 +lbl_80452240: +.incbin "baserom.dol", 0x3D10A0, 0x4 + +.global lbl_80452244 +lbl_80452244: +.incbin "baserom.dol", 0x3D10A4, 0x4 + +.global lbl_80452248 +lbl_80452248: +.incbin "baserom.dol", 0x3D10A8, 0x4 + +.global lbl_8045224C +lbl_8045224C: +.incbin "baserom.dol", 0x3D10AC, 0x4 + +.global lbl_80452250 +lbl_80452250: +.incbin "baserom.dol", 0x3D10B0, 0x4 + +.global lbl_80452254 +lbl_80452254: +.incbin "baserom.dol", 0x3D10B4, 0x4 + +.global lbl_80452258 +lbl_80452258: +.incbin "baserom.dol", 0x3D10B8, 0x4 + +.global lbl_8045225C +lbl_8045225C: +.incbin "baserom.dol", 0x3D10BC, 0x4 + +.global lbl_80452260 +lbl_80452260: +.incbin "baserom.dol", 0x3D10C0, 0x4 + +.global lbl_80452264 +lbl_80452264: +.incbin "baserom.dol", 0x3D10C4, 0x4 + +.global lbl_80452268 +lbl_80452268: +.incbin "baserom.dol", 0x3D10C8, 0x4 + +.global lbl_8045226C +lbl_8045226C: +.incbin "baserom.dol", 0x3D10CC, 0x4 + +.global lbl_80452270 +lbl_80452270: +.incbin "baserom.dol", 0x3D10D0, 0x8 + +.global lbl_80452278 +lbl_80452278: +.incbin "baserom.dol", 0x3D10D8, 0x4 + +.global lbl_8045227C +lbl_8045227C: +.incbin "baserom.dol", 0x3D10DC, 0x4 + +.global lbl_80452280 +lbl_80452280: +.incbin "baserom.dol", 0x3D10E0, 0x4 + +.global lbl_80452284 +lbl_80452284: +.incbin "baserom.dol", 0x3D10E4, 0x4 + +.global lbl_80452288 +lbl_80452288: +.incbin "baserom.dol", 0x3D10E8, 0x4 + +.global lbl_8045228C +lbl_8045228C: +.incbin "baserom.dol", 0x3D10EC, 0x4 + +.global lbl_80452290 +lbl_80452290: +.incbin "baserom.dol", 0x3D10F0, 0x4 + +.global lbl_80452294 +lbl_80452294: +.incbin "baserom.dol", 0x3D10F4, 0x4 + +.global lbl_80452298 +lbl_80452298: +.incbin "baserom.dol", 0x3D10F8, 0x4 + +.global lbl_8045229C +lbl_8045229C: +.incbin "baserom.dol", 0x3D10FC, 0x4 + +.global lbl_804522A0 +lbl_804522A0: +.incbin "baserom.dol", 0x3D1100, 0x4 + +.global lbl_804522A4 +lbl_804522A4: +.incbin "baserom.dol", 0x3D1104, 0x4 + +.global lbl_804522A8 +lbl_804522A8: +.incbin "baserom.dol", 0x3D1108, 0x4 + +.global lbl_804522AC +lbl_804522AC: +.incbin "baserom.dol", 0x3D110C, 0x4 + +.global lbl_804522B0 +lbl_804522B0: +.incbin "baserom.dol", 0x3D1110, 0x4 + +.global lbl_804522B4 +lbl_804522B4: +.incbin "baserom.dol", 0x3D1114, 0x4 + +.global lbl_804522B8 +lbl_804522B8: +.incbin "baserom.dol", 0x3D1118, 0x4 + +.global lbl_804522BC +lbl_804522BC: +.incbin "baserom.dol", 0x3D111C, 0x4 + +.global lbl_804522C0 +lbl_804522C0: +.incbin "baserom.dol", 0x3D1120, 0x4 + +.global lbl_804522C4 +lbl_804522C4: +.incbin "baserom.dol", 0x3D1124, 0x4 + +.global lbl_804522C8 +lbl_804522C8: +.incbin "baserom.dol", 0x3D1128, 0x4 + +.global lbl_804522CC +lbl_804522CC: +.incbin "baserom.dol", 0x3D112C, 0x4 + +.global lbl_804522D0 +lbl_804522D0: +.incbin "baserom.dol", 0x3D1130, 0x4 + +.global lbl_804522D4 +lbl_804522D4: +.incbin "baserom.dol", 0x3D1134, 0x4 + +.global lbl_804522D8 +lbl_804522D8: +.incbin "baserom.dol", 0x3D1138, 0x4 + +.global lbl_804522DC +lbl_804522DC: +.incbin "baserom.dol", 0x3D113C, 0x4 + +.global lbl_804522E0 +lbl_804522E0: +.incbin "baserom.dol", 0x3D1140, 0x4 + +.global lbl_804522E4 +lbl_804522E4: +.incbin "baserom.dol", 0x3D1144, 0x4 + +.global lbl_804522E8 +lbl_804522E8: +.incbin "baserom.dol", 0x3D1148, 0x4 + +.global lbl_804522EC +lbl_804522EC: +.incbin "baserom.dol", 0x3D114C, 0x4 + +.global lbl_804522F0 +lbl_804522F0: +.incbin "baserom.dol", 0x3D1150, 0x4 + +.global lbl_804522F4 +lbl_804522F4: +.incbin "baserom.dol", 0x3D1154, 0x4 + +.global lbl_804522F8 +lbl_804522F8: +.incbin "baserom.dol", 0x3D1158, 0x4 + +.global lbl_804522FC +lbl_804522FC: +.incbin "baserom.dol", 0x3D115C, 0x4 + +.global lbl_80452300 +lbl_80452300: +.incbin "baserom.dol", 0x3D1160, 0x4 + +.global lbl_80452304 +lbl_80452304: +.incbin "baserom.dol", 0x3D1164, 0x4 + +.global lbl_80452308 +lbl_80452308: +.incbin "baserom.dol", 0x3D1168, 0x4 + +.global lbl_8045230C +lbl_8045230C: +.incbin "baserom.dol", 0x3D116C, 0x4 + +.global lbl_80452310 +lbl_80452310: +.incbin "baserom.dol", 0x3D1170, 0x4 + +.global lbl_80452314 +lbl_80452314: +.incbin "baserom.dol", 0x3D1174, 0x4 + +.global lbl_80452318 +lbl_80452318: +.incbin "baserom.dol", 0x3D1178, 0x4 + +.global lbl_8045231C +lbl_8045231C: +.incbin "baserom.dol", 0x3D117C, 0x4 + +.global lbl_80452320 +lbl_80452320: +.incbin "baserom.dol", 0x3D1180, 0x4 + +.global lbl_80452324 +lbl_80452324: +.incbin "baserom.dol", 0x3D1184, 0x4 + +.global lbl_80452328 +lbl_80452328: +.incbin "baserom.dol", 0x3D1188, 0x4 + +.global lbl_8045232C +lbl_8045232C: +.incbin "baserom.dol", 0x3D118C, 0x4 + +.global lbl_80452330 +lbl_80452330: +.incbin "baserom.dol", 0x3D1190, 0x4 + +.global lbl_80452334 +lbl_80452334: +.incbin "baserom.dol", 0x3D1194, 0x4 + +.global lbl_80452338 +lbl_80452338: +.incbin "baserom.dol", 0x3D1198, 0x4 + +.global lbl_8045233C +lbl_8045233C: +.incbin "baserom.dol", 0x3D119C, 0x4 + +.global lbl_80452340 +lbl_80452340: +.incbin "baserom.dol", 0x3D11A0, 0x4 + +.global lbl_80452344 +lbl_80452344: +.incbin "baserom.dol", 0x3D11A4, 0x4 + +.global lbl_80452348 +lbl_80452348: +.incbin "baserom.dol", 0x3D11A8, 0x4 + +.global lbl_8045234C +lbl_8045234C: +.incbin "baserom.dol", 0x3D11AC, 0x4 + +.global lbl_80452350 +lbl_80452350: +.incbin "baserom.dol", 0x3D11B0, 0x4 + +.global lbl_80452354 +lbl_80452354: +.incbin "baserom.dol", 0x3D11B4, 0x4 + +.global lbl_80452358 +lbl_80452358: +.incbin "baserom.dol", 0x3D11B8, 0x4 + +.global lbl_8045235C +lbl_8045235C: +.incbin "baserom.dol", 0x3D11BC, 0x4 + +.global lbl_80452360 +lbl_80452360: +.incbin "baserom.dol", 0x3D11C0, 0x4 + +.global lbl_80452364 +lbl_80452364: +.incbin "baserom.dol", 0x3D11C4, 0x4 + +.global lbl_80452368 +lbl_80452368: +.incbin "baserom.dol", 0x3D11C8, 0x4 + +.global lbl_8045236C +lbl_8045236C: +.incbin "baserom.dol", 0x3D11CC, 0x4 + +.global lbl_80452370 +lbl_80452370: +.incbin "baserom.dol", 0x3D11D0, 0x4 + +.global lbl_80452374 +lbl_80452374: +.incbin "baserom.dol", 0x3D11D4, 0x4 + +.global lbl_80452378 +lbl_80452378: +.incbin "baserom.dol", 0x3D11D8, 0x4 + +.global lbl_8045237C +lbl_8045237C: +.incbin "baserom.dol", 0x3D11DC, 0x4 + +.global lbl_80452380 +lbl_80452380: +.incbin "baserom.dol", 0x3D11E0, 0x4 + +.global lbl_80452384 +lbl_80452384: +.incbin "baserom.dol", 0x3D11E4, 0x4 + +.global lbl_80452388 +lbl_80452388: +.incbin "baserom.dol", 0x3D11E8, 0x4 + +.global lbl_8045238C +lbl_8045238C: +.incbin "baserom.dol", 0x3D11EC, 0x4 + +.global lbl_80452390 +lbl_80452390: +.incbin "baserom.dol", 0x3D11F0, 0x4 + +.global lbl_80452394 +lbl_80452394: +.incbin "baserom.dol", 0x3D11F4, 0x4 + +.global lbl_80452398 +lbl_80452398: +.incbin "baserom.dol", 0x3D11F8, 0x4 + +.global lbl_8045239C +lbl_8045239C: +.incbin "baserom.dol", 0x3D11FC, 0x4 + +.global lbl_804523A0 +lbl_804523A0: +.incbin "baserom.dol", 0x3D1200, 0x4 + +.global lbl_804523A4 +lbl_804523A4: +.incbin "baserom.dol", 0x3D1204, 0x4 + +.global lbl_804523A8 +lbl_804523A8: +.incbin "baserom.dol", 0x3D1208, 0x4 + +.global lbl_804523AC +lbl_804523AC: +.incbin "baserom.dol", 0x3D120C, 0x4 + +.global lbl_804523B0 +lbl_804523B0: +.incbin "baserom.dol", 0x3D1210, 0x4 + +.global lbl_804523B4 +lbl_804523B4: +.incbin "baserom.dol", 0x3D1214, 0x4 + +.global lbl_804523B8 +lbl_804523B8: +.incbin "baserom.dol", 0x3D1218, 0x4 + +.global lbl_804523BC +lbl_804523BC: +.incbin "baserom.dol", 0x3D121C, 0x4 + +.global lbl_804523C0 +lbl_804523C0: +.incbin "baserom.dol", 0x3D1220, 0x4 + +.global lbl_804523C4 +lbl_804523C4: +.incbin "baserom.dol", 0x3D1224, 0x4 + +.global lbl_804523C8 +lbl_804523C8: +.incbin "baserom.dol", 0x3D1228, 0x8 + +.global lbl_804523D0 +lbl_804523D0: +.incbin "baserom.dol", 0x3D1230, 0x8 + +.global lbl_804523D8 +lbl_804523D8: +.incbin "baserom.dol", 0x3D1238, 0x4 + +.global lbl_804523DC +lbl_804523DC: +.incbin "baserom.dol", 0x3D123C, 0x4 + +.global lbl_804523E0 +lbl_804523E0: +.incbin "baserom.dol", 0x3D1240, 0x4 + +.global lbl_804523E4 +lbl_804523E4: +.incbin "baserom.dol", 0x3D1244, 0x4 + +.global lbl_804523E8 +lbl_804523E8: +.incbin "baserom.dol", 0x3D1248, 0x4 + +.global lbl_804523EC +lbl_804523EC: +.incbin "baserom.dol", 0x3D124C, 0x4 + +.global lbl_804523F0 +lbl_804523F0: +.incbin "baserom.dol", 0x3D1250, 0x4 + +.global lbl_804523F4 +lbl_804523F4: +.incbin "baserom.dol", 0x3D1254, 0x4 + +.global lbl_804523F8 +lbl_804523F8: +.incbin "baserom.dol", 0x3D1258, 0x4 + +.global lbl_804523FC +lbl_804523FC: +.incbin "baserom.dol", 0x3D125C, 0x4 + +.global lbl_80452400 +lbl_80452400: +.incbin "baserom.dol", 0x3D1260, 0x4 + +.global lbl_80452404 +lbl_80452404: +.incbin "baserom.dol", 0x3D1264, 0x4 + +.global lbl_80452408 +lbl_80452408: +.incbin "baserom.dol", 0x3D1268, 0x4 + +.global lbl_8045240C +lbl_8045240C: +.incbin "baserom.dol", 0x3D126C, 0x4 + +.global lbl_80452410 +lbl_80452410: +.incbin "baserom.dol", 0x3D1270, 0x4 + +.global lbl_80452414 +lbl_80452414: +.incbin "baserom.dol", 0x3D1274, 0x4 + +.global lbl_80452418 +lbl_80452418: +.incbin "baserom.dol", 0x3D1278, 0x4 + +.global lbl_8045241C +lbl_8045241C: +.incbin "baserom.dol", 0x3D127C, 0x4 + +.global lbl_80452420 +lbl_80452420: +.incbin "baserom.dol", 0x3D1280, 0x4 + +.global lbl_80452424 +lbl_80452424: +.incbin "baserom.dol", 0x3D1284, 0x4 + +.global lbl_80452428 +lbl_80452428: +.incbin "baserom.dol", 0x3D1288, 0x4 + +.global lbl_8045242C +lbl_8045242C: +.incbin "baserom.dol", 0x3D128C, 0x4 + +.global lbl_80452430 +lbl_80452430: +.incbin "baserom.dol", 0x3D1290, 0x8 + +.global lbl_80452438 +lbl_80452438: +.incbin "baserom.dol", 0x3D1298, 0x8 + +.global lbl_80452440 +lbl_80452440: +.incbin "baserom.dol", 0x3D12A0, 0x4 + +.global lbl_80452444 +lbl_80452444: +.incbin "baserom.dol", 0x3D12A4, 0x4 + +.global lbl_80452448 +lbl_80452448: +.incbin "baserom.dol", 0x3D12A8, 0x4 + +.global lbl_8045244C +lbl_8045244C: +.incbin "baserom.dol", 0x3D12AC, 0x4 + +.global lbl_80452450 +lbl_80452450: +.incbin "baserom.dol", 0x3D12B0, 0x4 + +.global lbl_80452454 +lbl_80452454: +.incbin "baserom.dol", 0x3D12B4, 0x4 + +.global lbl_80452458 +lbl_80452458: +.incbin "baserom.dol", 0x3D12B8, 0x4 + +.global lbl_8045245C +lbl_8045245C: +.incbin "baserom.dol", 0x3D12BC, 0x4 + +.global lbl_80452460 +lbl_80452460: +.incbin "baserom.dol", 0x3D12C0, 0x4 + +.global lbl_80452464 +lbl_80452464: +.incbin "baserom.dol", 0x3D12C4, 0x4 + +.global lbl_80452468 +lbl_80452468: +.incbin "baserom.dol", 0x3D12C8, 0x4 + +.global lbl_8045246C +lbl_8045246C: +.incbin "baserom.dol", 0x3D12CC, 0x4 + +.global lbl_80452470 +lbl_80452470: +.incbin "baserom.dol", 0x3D12D0, 0x4 + +.global lbl_80452474 +lbl_80452474: +.incbin "baserom.dol", 0x3D12D4, 0x4 + +.global lbl_80452478 +lbl_80452478: +.incbin "baserom.dol", 0x3D12D8, 0x4 + +.global lbl_8045247C +lbl_8045247C: +.incbin "baserom.dol", 0x3D12DC, 0x4 + +.global lbl_80452480 +lbl_80452480: +.incbin "baserom.dol", 0x3D12E0, 0x4 + +.global lbl_80452484 +lbl_80452484: +.incbin "baserom.dol", 0x3D12E4, 0x4 + +.global lbl_80452488 +lbl_80452488: +.incbin "baserom.dol", 0x3D12E8, 0x4 + +.global lbl_8045248C +lbl_8045248C: +.incbin "baserom.dol", 0x3D12EC, 0x4 + +.global lbl_80452490 +lbl_80452490: +.incbin "baserom.dol", 0x3D12F0, 0x4 + +.global lbl_80452494 +lbl_80452494: +.incbin "baserom.dol", 0x3D12F4, 0x4 + +.global lbl_80452498 +lbl_80452498: +.incbin "baserom.dol", 0x3D12F8, 0x4 + +.global lbl_8045249C +lbl_8045249C: +.incbin "baserom.dol", 0x3D12FC, 0x4 + +.global lbl_804524A0 +lbl_804524A0: +.incbin "baserom.dol", 0x3D1300, 0x4 + +.global lbl_804524A4 +lbl_804524A4: +.incbin "baserom.dol", 0x3D1304, 0x4 + +.global lbl_804524A8 +lbl_804524A8: +.incbin "baserom.dol", 0x3D1308, 0x4 + +.global lbl_804524AC +lbl_804524AC: +.incbin "baserom.dol", 0x3D130C, 0x4 + +.global lbl_804524B0 +lbl_804524B0: +.incbin "baserom.dol", 0x3D1310, 0x4 + +.global lbl_804524B4 +lbl_804524B4: +.incbin "baserom.dol", 0x3D1314, 0x4 + +.global lbl_804524B8 +lbl_804524B8: +.incbin "baserom.dol", 0x3D1318, 0x4 + +.global lbl_804524BC +lbl_804524BC: +.incbin "baserom.dol", 0x3D131C, 0x4 + +.global lbl_804524C0 +lbl_804524C0: +.incbin "baserom.dol", 0x3D1320, 0x4 + +.global lbl_804524C4 +lbl_804524C4: +.incbin "baserom.dol", 0x3D1324, 0x4 + +.global lbl_804524C8 +lbl_804524C8: +.incbin "baserom.dol", 0x3D1328, 0x4 + +.global lbl_804524CC +lbl_804524CC: +.incbin "baserom.dol", 0x3D132C, 0x4 + +.global lbl_804524D0 +lbl_804524D0: +.incbin "baserom.dol", 0x3D1330, 0x4 + +.global lbl_804524D4 +lbl_804524D4: +.incbin "baserom.dol", 0x3D1334, 0x4 + +.global lbl_804524D8 +lbl_804524D8: +.incbin "baserom.dol", 0x3D1338, 0x4 + +.global lbl_804524DC +lbl_804524DC: +.incbin "baserom.dol", 0x3D133C, 0x4 + +.global lbl_804524E0 +lbl_804524E0: +.incbin "baserom.dol", 0x3D1340, 0x4 + +.global lbl_804524E4 +lbl_804524E4: +.incbin "baserom.dol", 0x3D1344, 0x4 + +.global lbl_804524E8 +lbl_804524E8: +.incbin "baserom.dol", 0x3D1348, 0x4 + +.global lbl_804524EC +lbl_804524EC: +.incbin "baserom.dol", 0x3D134C, 0x4 + +.global lbl_804524F0 +lbl_804524F0: +.incbin "baserom.dol", 0x3D1350, 0x4 + +.global lbl_804524F4 +lbl_804524F4: +.incbin "baserom.dol", 0x3D1354, 0x4 + +.global lbl_804524F8 +lbl_804524F8: +.incbin "baserom.dol", 0x3D1358, 0x4 + +.global lbl_804524FC +lbl_804524FC: +.incbin "baserom.dol", 0x3D135C, 0x4 + +.global lbl_80452500 +lbl_80452500: +.incbin "baserom.dol", 0x3D1360, 0x4 + +.global lbl_80452504 +lbl_80452504: +.incbin "baserom.dol", 0x3D1364, 0x4 + +.global lbl_80452508 +lbl_80452508: +.incbin "baserom.dol", 0x3D1368, 0x4 + +.global lbl_8045250C +lbl_8045250C: +.incbin "baserom.dol", 0x3D136C, 0x4 + +.global lbl_80452510 +lbl_80452510: +.incbin "baserom.dol", 0x3D1370, 0x4 + +.global lbl_80452514 +lbl_80452514: +.incbin "baserom.dol", 0x3D1374, 0x4 + +.global lbl_80452518 +lbl_80452518: +.incbin "baserom.dol", 0x3D1378, 0x4 + +.global lbl_8045251C +lbl_8045251C: +.incbin "baserom.dol", 0x3D137C, 0x4 + +.global lbl_80452520 +lbl_80452520: +.incbin "baserom.dol", 0x3D1380, 0x4 + +.global lbl_80452524 +lbl_80452524: +.incbin "baserom.dol", 0x3D1384, 0x4 + +.global lbl_80452528 +lbl_80452528: +.incbin "baserom.dol", 0x3D1388, 0x4 + +.global lbl_8045252C +lbl_8045252C: +.incbin "baserom.dol", 0x3D138C, 0x4 + +.global lbl_80452530 +lbl_80452530: +.incbin "baserom.dol", 0x3D1390, 0x4 + +.global lbl_80452534 +lbl_80452534: +.incbin "baserom.dol", 0x3D1394, 0x4 + +.global lbl_80452538 +lbl_80452538: +.incbin "baserom.dol", 0x3D1398, 0x4 + +.global lbl_8045253C +lbl_8045253C: +.incbin "baserom.dol", 0x3D139C, 0x4 + +.global lbl_80452540 +lbl_80452540: +.incbin "baserom.dol", 0x3D13A0, 0x4 + +.global lbl_80452544 +lbl_80452544: +.incbin "baserom.dol", 0x3D13A4, 0x4 + +.global lbl_80452548 +lbl_80452548: +.incbin "baserom.dol", 0x3D13A8, 0x4 + +.global lbl_8045254C +lbl_8045254C: +.incbin "baserom.dol", 0x3D13AC, 0x4 + +.global lbl_80452550 +lbl_80452550: +.incbin "baserom.dol", 0x3D13B0, 0x4 + +.global lbl_80452554 +lbl_80452554: +.incbin "baserom.dol", 0x3D13B4, 0x4 + +.global lbl_80452558 +lbl_80452558: +.incbin "baserom.dol", 0x3D13B8, 0x4 + +.global lbl_8045255C +lbl_8045255C: +.incbin "baserom.dol", 0x3D13BC, 0x4 + +.global lbl_80452560 +lbl_80452560: +.incbin "baserom.dol", 0x3D13C0, 0x4 + +.global lbl_80452564 +lbl_80452564: +.incbin "baserom.dol", 0x3D13C4, 0x4 + +.global lbl_80452568 +lbl_80452568: +.incbin "baserom.dol", 0x3D13C8, 0x4 + +.global lbl_8045256C +lbl_8045256C: +.incbin "baserom.dol", 0x3D13CC, 0x4 + +.global lbl_80452570 +lbl_80452570: +.incbin "baserom.dol", 0x3D13D0, 0x4 + +.global lbl_80452574 +lbl_80452574: +.incbin "baserom.dol", 0x3D13D4, 0x4 + +.global lbl_80452578 +lbl_80452578: +.incbin "baserom.dol", 0x3D13D8, 0x4 + +.global lbl_8045257C +lbl_8045257C: +.incbin "baserom.dol", 0x3D13DC, 0x4 + +.global lbl_80452580 +lbl_80452580: +.incbin "baserom.dol", 0x3D13E0, 0x4 + +.global lbl_80452584 +lbl_80452584: +.incbin "baserom.dol", 0x3D13E4, 0x4 + +.global lbl_80452588 +lbl_80452588: +.incbin "baserom.dol", 0x3D13E8, 0x4 + +.global lbl_8045258C +lbl_8045258C: +.incbin "baserom.dol", 0x3D13EC, 0x4 + +.global lbl_80452590 +lbl_80452590: +.incbin "baserom.dol", 0x3D13F0, 0x4 + +.global lbl_80452594 +lbl_80452594: +.incbin "baserom.dol", 0x3D13F4, 0x4 + +.global lbl_80452598 +lbl_80452598: +.incbin "baserom.dol", 0x3D13F8, 0x4 + +.global lbl_8045259C +lbl_8045259C: +.incbin "baserom.dol", 0x3D13FC, 0x4 + +.global lbl_804525A0 +lbl_804525A0: +.incbin "baserom.dol", 0x3D1400, 0x4 + +.global lbl_804525A4 +lbl_804525A4: +.incbin "baserom.dol", 0x3D1404, 0x4 + +.global lbl_804525A8 +lbl_804525A8: +.incbin "baserom.dol", 0x3D1408, 0x4 + +.global lbl_804525AC +lbl_804525AC: +.incbin "baserom.dol", 0x3D140C, 0x4 + +.global lbl_804525B0 +lbl_804525B0: +.incbin "baserom.dol", 0x3D1410, 0x4 + +.global lbl_804525B4 +lbl_804525B4: +.incbin "baserom.dol", 0x3D1414, 0x4 + +.global lbl_804525B8 +lbl_804525B8: +.incbin "baserom.dol", 0x3D1418, 0x4 + +.global lbl_804525BC +lbl_804525BC: +.incbin "baserom.dol", 0x3D141C, 0x4 + +.global lbl_804525C0 +lbl_804525C0: +.incbin "baserom.dol", 0x3D1420, 0x4 + +.global lbl_804525C4 +lbl_804525C4: +.incbin "baserom.dol", 0x3D1424, 0x4 + +.global lbl_804525C8 +lbl_804525C8: +.incbin "baserom.dol", 0x3D1428, 0x4 + +.global lbl_804525CC +lbl_804525CC: +.incbin "baserom.dol", 0x3D142C, 0x4 + +.global lbl_804525D0 +lbl_804525D0: +.incbin "baserom.dol", 0x3D1430, 0x4 + +.global lbl_804525D4 +lbl_804525D4: +.incbin "baserom.dol", 0x3D1434, 0x4 + +.global lbl_804525D8 +lbl_804525D8: +.incbin "baserom.dol", 0x3D1438, 0x4 + +.global lbl_804525DC +lbl_804525DC: +.incbin "baserom.dol", 0x3D143C, 0x4 + +.global lbl_804525E0 +lbl_804525E0: +.incbin "baserom.dol", 0x3D1440, 0x4 + +.global lbl_804525E4 +lbl_804525E4: +.incbin "baserom.dol", 0x3D1444, 0x4 + +.global lbl_804525E8 +lbl_804525E8: +.incbin "baserom.dol", 0x3D1448, 0x4 + +.global lbl_804525EC +lbl_804525EC: +.incbin "baserom.dol", 0x3D144C, 0x4 + +.global lbl_804525F0 +lbl_804525F0: +.incbin "baserom.dol", 0x3D1450, 0x4 + +.global lbl_804525F4 +lbl_804525F4: +.incbin "baserom.dol", 0x3D1454, 0x4 + +.global lbl_804525F8 +lbl_804525F8: +.incbin "baserom.dol", 0x3D1458, 0x4 + +.global lbl_804525FC +lbl_804525FC: +.incbin "baserom.dol", 0x3D145C, 0x4 + +.global lbl_80452600 +lbl_80452600: +.incbin "baserom.dol", 0x3D1460, 0x4 + +.global lbl_80452604 +lbl_80452604: +.incbin "baserom.dol", 0x3D1464, 0x4 + +.global lbl_80452608 +lbl_80452608: +.incbin "baserom.dol", 0x3D1468, 0x4 + +.global lbl_8045260C +lbl_8045260C: +.incbin "baserom.dol", 0x3D146C, 0x4 + +.global lbl_80452610 +lbl_80452610: +.incbin "baserom.dol", 0x3D1470, 0x4 + +.global lbl_80452614 +lbl_80452614: +.incbin "baserom.dol", 0x3D1474, 0x4 + +.global lbl_80452618 +lbl_80452618: +.incbin "baserom.dol", 0x3D1478, 0x4 + +.global lbl_8045261C +lbl_8045261C: +.incbin "baserom.dol", 0x3D147C, 0x4 + diff --git a/asm/sdata2/d_kankyo_wether.s b/asm/sdata2/d_kankyo_wether.s new file mode 100644 index 0000000000..1ef01ec3ba --- /dev/null +++ b/asm/sdata2/d_kankyo_wether.s @@ -0,0 +1,187 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804520e0 - 0x804521b0 + +.global lbl_804520E0 +lbl_804520E0: +.incbin "baserom.dol", 0x3D0F40, 0x4 + +.global lbl_804520E4 +lbl_804520E4: +.incbin "baserom.dol", 0x3D0F44, 0x4 + +.global lbl_804520E8 +lbl_804520E8: +.incbin "baserom.dol", 0x3D0F48, 0x4 + +.global lbl_804520EC +lbl_804520EC: +.incbin "baserom.dol", 0x3D0F4C, 0x4 + +.global lbl_804520F0 +lbl_804520F0: +.incbin "baserom.dol", 0x3D0F50, 0x4 + +.global lbl_804520F4 +lbl_804520F4: +.incbin "baserom.dol", 0x3D0F54, 0x4 + +.global lbl_804520F8 +lbl_804520F8: +.incbin "baserom.dol", 0x3D0F58, 0x8 + +.global lbl_80452100 +lbl_80452100: +.incbin "baserom.dol", 0x3D0F60, 0x4 + +.global lbl_80452104 +lbl_80452104: +.incbin "baserom.dol", 0x3D0F64, 0x4 + +.global lbl_80452108 +lbl_80452108: +.incbin "baserom.dol", 0x3D0F68, 0x4 + +.global lbl_8045210C +lbl_8045210C: +.incbin "baserom.dol", 0x3D0F6C, 0x4 + +.global lbl_80452110 +lbl_80452110: +.incbin "baserom.dol", 0x3D0F70, 0x4 + +.global lbl_80452114 +lbl_80452114: +.incbin "baserom.dol", 0x3D0F74, 0x4 + +.global lbl_80452118 +lbl_80452118: +.incbin "baserom.dol", 0x3D0F78, 0x4 + +.global lbl_8045211C +lbl_8045211C: +.incbin "baserom.dol", 0x3D0F7C, 0x4 + +.global lbl_80452120 +lbl_80452120: +.incbin "baserom.dol", 0x3D0F80, 0x4 + +.global lbl_80452124 +lbl_80452124: +.incbin "baserom.dol", 0x3D0F84, 0x4 + +.global lbl_80452128 +lbl_80452128: +.incbin "baserom.dol", 0x3D0F88, 0x4 + +.global lbl_8045212C +lbl_8045212C: +.incbin "baserom.dol", 0x3D0F8C, 0x4 + +.global lbl_80452130 +lbl_80452130: +.incbin "baserom.dol", 0x3D0F90, 0x4 + +.global lbl_80452134 +lbl_80452134: +.incbin "baserom.dol", 0x3D0F94, 0x4 + +.global lbl_80452138 +lbl_80452138: +.incbin "baserom.dol", 0x3D0F98, 0x4 + +.global lbl_8045213C +lbl_8045213C: +.incbin "baserom.dol", 0x3D0F9C, 0x4 + +.global lbl_80452140 +lbl_80452140: +.incbin "baserom.dol", 0x3D0FA0, 0x4 + +.global lbl_80452144 +lbl_80452144: +.incbin "baserom.dol", 0x3D0FA4, 0x4 + +.global lbl_80452148 +lbl_80452148: +.incbin "baserom.dol", 0x3D0FA8, 0x4 + +.global lbl_8045214C +lbl_8045214C: +.incbin "baserom.dol", 0x3D0FAC, 0x4 + +.global lbl_80452150 +lbl_80452150: +.incbin "baserom.dol", 0x3D0FB0, 0x4 + +.global lbl_80452154 +lbl_80452154: +.incbin "baserom.dol", 0x3D0FB4, 0x4 + +.global lbl_80452158 +lbl_80452158: +.incbin "baserom.dol", 0x3D0FB8, 0x4 + +.global lbl_8045215C +lbl_8045215C: +.incbin "baserom.dol", 0x3D0FBC, 0x4 + +.global lbl_80452160 +lbl_80452160: +.incbin "baserom.dol", 0x3D0FC0, 0x4 + +.global lbl_80452164 +lbl_80452164: +.incbin "baserom.dol", 0x3D0FC4, 0x4 + +.global lbl_80452168 +lbl_80452168: +.incbin "baserom.dol", 0x3D0FC8, 0x4 + +.global lbl_8045216C +lbl_8045216C: +.incbin "baserom.dol", 0x3D0FCC, 0x4 + +.global lbl_80452170 +lbl_80452170: +.incbin "baserom.dol", 0x3D0FD0, 0x8 + +.global lbl_80452178 +lbl_80452178: +.incbin "baserom.dol", 0x3D0FD8, 0x8 + +.global lbl_80452180 +lbl_80452180: +.incbin "baserom.dol", 0x3D0FE0, 0x8 + +.global lbl_80452188 +lbl_80452188: +.incbin "baserom.dol", 0x3D0FE8, 0x8 + +.global lbl_80452190 +lbl_80452190: +.incbin "baserom.dol", 0x3D0FF0, 0x4 + +.global lbl_80452194 +lbl_80452194: +.incbin "baserom.dol", 0x3D0FF4, 0x4 + +.global lbl_80452198 +lbl_80452198: +.incbin "baserom.dol", 0x3D0FF8, 0x4 + +.global lbl_8045219C +lbl_8045219C: +.incbin "baserom.dol", 0x3D0FFC, 0x4 + +.global lbl_804521A0 +lbl_804521A0: +.incbin "baserom.dol", 0x3D1000, 0x4 + +.global lbl_804521A4 +lbl_804521A4: +.incbin "baserom.dol", 0x3D1004, 0x4 + +.global lbl_804521A8 +lbl_804521A8: +.incbin "baserom.dol", 0x3D1008, 0x8 + diff --git a/asm/sdata2/d_kantera_icon_meter.s b/asm/sdata2/d_kantera_icon_meter.s new file mode 100644 index 0000000000..2e3b3b7407 --- /dev/null +++ b/asm/sdata2/d_kantera_icon_meter.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453ef8 - 0x80453f10 + +.global lbl_80453EF8 +lbl_80453EF8: +.incbin "baserom.dol", 0x3D2D58, 0x8 + +.global lbl_80453F00 +lbl_80453F00: +.incbin "baserom.dol", 0x3D2D60, 0x8 + +.global lbl_80453F08 +lbl_80453F08: +.incbin "baserom.dol", 0x3D2D68, 0x8 + diff --git a/asm/sdata2/d_ky_thunder.s b/asm/sdata2/d_ky_thunder.s new file mode 100644 index 0000000000..9523904224 --- /dev/null +++ b/asm/sdata2/d_ky_thunder.s @@ -0,0 +1,131 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453e70 - 0x80453ef8 + +.global lbl_80453E70 +lbl_80453E70: +.incbin "baserom.dol", 0x3D2CD0, 0x4 + +.global lbl_80453E74 +lbl_80453E74: +.incbin "baserom.dol", 0x3D2CD4, 0x4 + +.global lbl_80453E78 +lbl_80453E78: +.incbin "baserom.dol", 0x3D2CD8, 0x4 + +.global lbl_80453E7C +lbl_80453E7C: +.incbin "baserom.dol", 0x3D2CDC, 0x4 + +.global lbl_80453E80 +lbl_80453E80: +.incbin "baserom.dol", 0x3D2CE0, 0x4 + +.global lbl_80453E84 +lbl_80453E84: +.incbin "baserom.dol", 0x3D2CE4, 0x4 + +.global lbl_80453E88 +lbl_80453E88: +.incbin "baserom.dol", 0x3D2CE8, 0x4 + +.global lbl_80453E8C +lbl_80453E8C: +.incbin "baserom.dol", 0x3D2CEC, 0x4 + +.global lbl_80453E90 +lbl_80453E90: +.incbin "baserom.dol", 0x3D2CF0, 0x4 + +.global lbl_80453E94 +lbl_80453E94: +.incbin "baserom.dol", 0x3D2CF4, 0x4 + +.global lbl_80453E98 +lbl_80453E98: +.incbin "baserom.dol", 0x3D2CF8, 0x4 + +.global lbl_80453E9C +lbl_80453E9C: +.incbin "baserom.dol", 0x3D2CFC, 0x4 + +.global lbl_80453EA0 +lbl_80453EA0: +.incbin "baserom.dol", 0x3D2D00, 0x4 + +.global lbl_80453EA4 +lbl_80453EA4: +.incbin "baserom.dol", 0x3D2D04, 0x4 + +.global lbl_80453EA8 +lbl_80453EA8: +.incbin "baserom.dol", 0x3D2D08, 0x4 + +.global lbl_80453EAC +lbl_80453EAC: +.incbin "baserom.dol", 0x3D2D0C, 0x4 + +.global lbl_80453EB0 +lbl_80453EB0: +.incbin "baserom.dol", 0x3D2D10, 0x4 + +.global lbl_80453EB4 +lbl_80453EB4: +.incbin "baserom.dol", 0x3D2D14, 0x4 + +.global lbl_80453EB8 +lbl_80453EB8: +.incbin "baserom.dol", 0x3D2D18, 0x4 + +.global lbl_80453EBC +lbl_80453EBC: +.incbin "baserom.dol", 0x3D2D1C, 0x4 + +.global lbl_80453EC0 +lbl_80453EC0: +.incbin "baserom.dol", 0x3D2D20, 0x4 + +.global lbl_80453EC4 +lbl_80453EC4: +.incbin "baserom.dol", 0x3D2D24, 0x4 + +.global lbl_80453EC8 +lbl_80453EC8: +.incbin "baserom.dol", 0x3D2D28, 0x8 + +.global lbl_80453ED0 +lbl_80453ED0: +.incbin "baserom.dol", 0x3D2D30, 0x8 + +.global lbl_80453ED8 +lbl_80453ED8: +.incbin "baserom.dol", 0x3D2D38, 0x4 + +.global lbl_80453EDC +lbl_80453EDC: +.incbin "baserom.dol", 0x3D2D3C, 0x4 + +.global lbl_80453EE0 +lbl_80453EE0: +.incbin "baserom.dol", 0x3D2D40, 0x4 + +.global lbl_80453EE4 +lbl_80453EE4: +.incbin "baserom.dol", 0x3D2D44, 0x4 + +.global lbl_80453EE8 +lbl_80453EE8: +.incbin "baserom.dol", 0x3D2D48, 0x4 + +.global lbl_80453EEC +lbl_80453EEC: +.incbin "baserom.dol", 0x3D2D4C, 0x4 + +.global lbl_80453EF0 +lbl_80453EF0: +.incbin "baserom.dol", 0x3D2D50, 0x4 + +.global lbl_80453EF4 +lbl_80453EF4: +.incbin "baserom.dol", 0x3D2D54, 0x4 + diff --git a/asm/sdata2/d_kyeff.s b/asm/sdata2/d_kyeff.s new file mode 100644 index 0000000000..e5bdc322aa --- /dev/null +++ b/asm/sdata2/d_kyeff.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453e58 - 0x80453e70 + +.global lbl_80453E58 +lbl_80453E58: +.incbin "baserom.dol", 0x3D2CB8, 0x4 + +.global lbl_80453E5C +lbl_80453E5C: +.incbin "baserom.dol", 0x3D2CBC, 0x4 + +.global lbl_80453E60 +lbl_80453E60: +.incbin "baserom.dol", 0x3D2CC0, 0x8 + +.global lbl_80453E68 +lbl_80453E68: +.incbin "baserom.dol", 0x3D2CC8, 0x4 + +.global lbl_80453E6C +lbl_80453E6C: +.incbin "baserom.dol", 0x3D2CCC, 0x4 + diff --git a/asm/sdata2/d_map.s b/asm/sdata2/d_map.s new file mode 100644 index 0000000000..ee26b4d063 --- /dev/null +++ b/asm/sdata2/d_map.s @@ -0,0 +1,75 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451ca0 - 0x80451d00 + +.global lbl_80451CA0 +lbl_80451CA0: +.incbin "baserom.dol", 0x3D0B00, 0x4 + +.global lbl_80451CA4 +lbl_80451CA4: +.incbin "baserom.dol", 0x3D0B04, 0x4 + +.global lbl_80451CA8 +lbl_80451CA8: +.incbin "baserom.dol", 0x3D0B08, 0x8 + +.global lbl_80451CB0 +lbl_80451CB0: +.incbin "baserom.dol", 0x3D0B10, 0x8 + +.global lbl_80451CB8 +lbl_80451CB8: +.incbin "baserom.dol", 0x3D0B18, 0x8 + +.global lbl_80451CC0 +lbl_80451CC0: +.incbin "baserom.dol", 0x3D0B20, 0x8 + +.global lbl_80451CC8 +lbl_80451CC8: +.incbin "baserom.dol", 0x3D0B28, 0x8 + +.global lbl_80451CD0 +lbl_80451CD0: +.incbin "baserom.dol", 0x3D0B30, 0x8 + +.global lbl_80451CD8 +lbl_80451CD8: +.incbin "baserom.dol", 0x3D0B38, 0x4 + +.global lbl_80451CDC +lbl_80451CDC: +.incbin "baserom.dol", 0x3D0B3C, 0x4 + +.global lbl_80451CE0 +lbl_80451CE0: +.incbin "baserom.dol", 0x3D0B40, 0x4 + +.global lbl_80451CE4 +lbl_80451CE4: +.incbin "baserom.dol", 0x3D0B44, 0x4 + +.global lbl_80451CE8 +lbl_80451CE8: +.incbin "baserom.dol", 0x3D0B48, 0x4 + +.global lbl_80451CEC +lbl_80451CEC: +.incbin "baserom.dol", 0x3D0B4C, 0x4 + +.global lbl_80451CF0 +lbl_80451CF0: +.incbin "baserom.dol", 0x3D0B50, 0x4 + +.global lbl_80451CF4 +lbl_80451CF4: +.incbin "baserom.dol", 0x3D0B54, 0x4 + +.global lbl_80451CF8 +lbl_80451CF8: +.incbin "baserom.dol", 0x3D0B58, 0x4 + +.global lbl_80451CFC +lbl_80451CFC: +.incbin "baserom.dol", 0x3D0B5C, 0x4 + diff --git a/asm/sdata2/d_map_path.s b/asm/sdata2/d_map_path.s new file mode 100644 index 0000000000..e36818f9e3 --- /dev/null +++ b/asm/sdata2/d_map_path.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451e08 - 0x80451e20 + +.global lbl_80451E08 +lbl_80451E08: +.incbin "baserom.dol", 0x3D0C68, 0x4 + +.global lbl_80451E0C +lbl_80451E0C: +.incbin "baserom.dol", 0x3D0C6C, 0x4 + +.global lbl_80451E10 +lbl_80451E10: +.incbin "baserom.dol", 0x3D0C70, 0x4 + +.global lbl_80451E14 +lbl_80451E14: +.incbin "baserom.dol", 0x3D0C74, 0x4 + +.global lbl_80451E18 +lbl_80451E18: +.incbin "baserom.dol", 0x3D0C78, 0x8 + diff --git a/asm/sdata2/d_map_path_dmap.s b/asm/sdata2/d_map_path_dmap.s new file mode 100644 index 0000000000..cacbf97ad6 --- /dev/null +++ b/asm/sdata2/d_map_path_dmap.s @@ -0,0 +1,127 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451e28 - 0x80451ec0 + +.global lbl_80451E28 +lbl_80451E28: +.incbin "baserom.dol", 0x3D0C88, 0x4 + +.global lbl_80451E2C +lbl_80451E2C: +.incbin "baserom.dol", 0x3D0C8C, 0x4 + +.global lbl_80451E30 +lbl_80451E30: +.incbin "baserom.dol", 0x3D0C90, 0x8 + +.global lbl_80451E38 +lbl_80451E38: +.incbin "baserom.dol", 0x3D0C98, 0x8 + +.global lbl_80451E40 +lbl_80451E40: +.incbin "baserom.dol", 0x3D0CA0, 0x8 + +.global lbl_80451E48 +lbl_80451E48: +.incbin "baserom.dol", 0x3D0CA8, 0x4 + +.global lbl_80451E4C +lbl_80451E4C: +.incbin "baserom.dol", 0x3D0CAC, 0x4 + +.global lbl_80451E50 +lbl_80451E50: +.incbin "baserom.dol", 0x3D0CB0, 0x4 + +.global lbl_80451E54 +lbl_80451E54: +.incbin "baserom.dol", 0x3D0CB4, 0x4 + +.global lbl_80451E58 +lbl_80451E58: +.incbin "baserom.dol", 0x3D0CB8, 0x4 + +.global lbl_80451E5C +lbl_80451E5C: +.incbin "baserom.dol", 0x3D0CBC, 0x4 + +.global lbl_80451E60 +lbl_80451E60: +.incbin "baserom.dol", 0x3D0CC0, 0x4 + +.global lbl_80451E64 +lbl_80451E64: +.incbin "baserom.dol", 0x3D0CC4, 0x4 + +.global lbl_80451E68 +lbl_80451E68: +.incbin "baserom.dol", 0x3D0CC8, 0x8 + +.global lbl_80451E70 +lbl_80451E70: +.incbin "baserom.dol", 0x3D0CD0, 0x4 + +.global lbl_80451E74 +lbl_80451E74: +.incbin "baserom.dol", 0x3D0CD4, 0x4 + +.global lbl_80451E78 +lbl_80451E78: +.incbin "baserom.dol", 0x3D0CD8, 0x4 + +.global lbl_80451E7C +lbl_80451E7C: +.incbin "baserom.dol", 0x3D0CDC, 0x4 + +.global lbl_80451E80 +lbl_80451E80: +.incbin "baserom.dol", 0x3D0CE0, 0x4 + +.global lbl_80451E84 +lbl_80451E84: +.incbin "baserom.dol", 0x3D0CE4, 0x4 + +.global lbl_80451E88 +lbl_80451E88: +.incbin "baserom.dol", 0x3D0CE8, 0x4 + +.global lbl_80451E8C +lbl_80451E8C: +.incbin "baserom.dol", 0x3D0CEC, 0x4 + +.global lbl_80451E90 +lbl_80451E90: +.incbin "baserom.dol", 0x3D0CF0, 0x4 + +.global lbl_80451E94 +lbl_80451E94: +.incbin "baserom.dol", 0x3D0CF4, 0x4 + +.global lbl_80451E98 +lbl_80451E98: +.incbin "baserom.dol", 0x3D0CF8, 0x4 + +.global lbl_80451E9C +lbl_80451E9C: +.incbin "baserom.dol", 0x3D0CFC, 0x8 + +.global lbl_80451EA4 +lbl_80451EA4: +.incbin "baserom.dol", 0x3D0D04, 0x4 + +.global lbl_80451EA8 +lbl_80451EA8: +.incbin "baserom.dol", 0x3D0D08, 0x4 + +.global lbl_80451EAC +lbl_80451EAC: +.incbin "baserom.dol", 0x3D0D0C, 0x8 + +.global lbl_80451EB4 +lbl_80451EB4: +.incbin "baserom.dol", 0x3D0D14, 0x4 + +.global lbl_80451EB8 +lbl_80451EB8: +.incbin "baserom.dol", 0x3D0D18, 0x8 + diff --git a/asm/sdata2/d_map_path_fmap.s b/asm/sdata2/d_map_path_fmap.s new file mode 100644 index 0000000000..820f67dcb1 --- /dev/null +++ b/asm/sdata2/d_map_path_fmap.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451e20 - 0x80451e28 + +.global lbl_80451E20 +lbl_80451E20: +.incbin "baserom.dol", 0x3D0C80, 0x8 + diff --git a/asm/sdata2/d_menu_calibration.s b/asm/sdata2/d_menu_calibration.s new file mode 100644 index 0000000000..0370ebdd03 --- /dev/null +++ b/asm/sdata2/d_menu_calibration.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453f10 - 0x80453f28 + +.global lbl_80453F10 +lbl_80453F10: +.incbin "baserom.dol", 0x3D2D70, 0x4 + +.global lbl_80453F14 +lbl_80453F14: +.incbin "baserom.dol", 0x3D2D74, 0x4 + +.global lbl_80453F18 +lbl_80453F18: +.incbin "baserom.dol", 0x3D2D78, 0x8 + +.global lbl_80453F20 +lbl_80453F20: +.incbin "baserom.dol", 0x3D2D80, 0x8 + diff --git a/asm/sdata2/d_menu_collect.s b/asm/sdata2/d_menu_collect.s new file mode 100644 index 0000000000..d46820bd86 --- /dev/null +++ b/asm/sdata2/d_menu_collect.s @@ -0,0 +1,179 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453f28 - 0x80453fe8 + +.global lbl_80453F28 +lbl_80453F28: +.incbin "baserom.dol", 0x3D2D88, 0x4 + +.global lbl_80453F2C +lbl_80453F2C: +.incbin "baserom.dol", 0x3D2D8C, 0x4 + +.global lbl_80453F30 +lbl_80453F30: +.incbin "baserom.dol", 0x3D2D90, 0x4 + +.global lbl_80453F34 +lbl_80453F34: +.incbin "baserom.dol", 0x3D2D94, 0x4 + +.global lbl_80453F38 +lbl_80453F38: +.incbin "baserom.dol", 0x3D2D98, 0x8 + +.global lbl_80453F40 +lbl_80453F40: +.incbin "baserom.dol", 0x3D2DA0, 0x4 + +.global lbl_80453F44 +lbl_80453F44: +.incbin "baserom.dol", 0x3D2DA4, 0x4 + +.global lbl_80453F48 +lbl_80453F48: +.incbin "baserom.dol", 0x3D2DA8, 0x8 + +.global lbl_80453F50 +lbl_80453F50: +.incbin "baserom.dol", 0x3D2DB0, 0x4 + +.global lbl_80453F54 +lbl_80453F54: +.incbin "baserom.dol", 0x3D2DB4, 0x4 + +.global lbl_80453F58 +lbl_80453F58: +.incbin "baserom.dol", 0x3D2DB8, 0x4 + +.global lbl_80453F5C +lbl_80453F5C: +.incbin "baserom.dol", 0x3D2DBC, 0x4 + +.global lbl_80453F60 +lbl_80453F60: +.incbin "baserom.dol", 0x3D2DC0, 0x4 + +.global lbl_80453F64 +lbl_80453F64: +.incbin "baserom.dol", 0x3D2DC4, 0x4 + +.global lbl_80453F68 +lbl_80453F68: +.incbin "baserom.dol", 0x3D2DC8, 0x4 + +.global lbl_80453F6C +lbl_80453F6C: +.incbin "baserom.dol", 0x3D2DCC, 0x4 + +.global lbl_80453F70 +lbl_80453F70: +.incbin "baserom.dol", 0x3D2DD0, 0x4 + +.global lbl_80453F74 +lbl_80453F74: +.incbin "baserom.dol", 0x3D2DD4, 0x4 + +.global lbl_80453F78 +lbl_80453F78: +.incbin "baserom.dol", 0x3D2DD8, 0x4 + +.global lbl_80453F7C +lbl_80453F7C: +.incbin "baserom.dol", 0x3D2DDC, 0x4 + +.global lbl_80453F80 +lbl_80453F80: +.incbin "baserom.dol", 0x3D2DE0, 0x4 + +.global lbl_80453F84 +lbl_80453F84: +.incbin "baserom.dol", 0x3D2DE4, 0x4 + +.global lbl_80453F88 +lbl_80453F88: +.incbin "baserom.dol", 0x3D2DE8, 0x4 + +.global lbl_80453F8C +lbl_80453F8C: +.incbin "baserom.dol", 0x3D2DEC, 0x4 + +.global lbl_80453F90 +lbl_80453F90: +.incbin "baserom.dol", 0x3D2DF0, 0x4 + +.global lbl_80453F94 +lbl_80453F94: +.incbin "baserom.dol", 0x3D2DF4, 0x4 + +.global lbl_80453F98 +lbl_80453F98: +.incbin "baserom.dol", 0x3D2DF8, 0x4 + +.global lbl_80453F9C +lbl_80453F9C: +.incbin "baserom.dol", 0x3D2DFC, 0x4 + +.global lbl_80453FA0 +lbl_80453FA0: +.incbin "baserom.dol", 0x3D2E00, 0x4 + +.global lbl_80453FA4 +lbl_80453FA4: +.incbin "baserom.dol", 0x3D2E04, 0x4 + +.global lbl_80453FA8 +lbl_80453FA8: +.incbin "baserom.dol", 0x3D2E08, 0x4 + +.global lbl_80453FAC +lbl_80453FAC: +.incbin "baserom.dol", 0x3D2E0C, 0x4 + +.global lbl_80453FB0 +lbl_80453FB0: +.incbin "baserom.dol", 0x3D2E10, 0x4 + +.global lbl_80453FB4 +lbl_80453FB4: +.incbin "baserom.dol", 0x3D2E14, 0x4 + +.global lbl_80453FB8 +lbl_80453FB8: +.incbin "baserom.dol", 0x3D2E18, 0x4 + +.global lbl_80453FBC +lbl_80453FBC: +.incbin "baserom.dol", 0x3D2E1C, 0x4 + +.global lbl_80453FC0 +lbl_80453FC0: +.incbin "baserom.dol", 0x3D2E20, 0x4 + +.global lbl_80453FC4 +lbl_80453FC4: +.incbin "baserom.dol", 0x3D2E24, 0x4 + +.global lbl_80453FC8 +lbl_80453FC8: +.incbin "baserom.dol", 0x3D2E28, 0x4 + +.global lbl_80453FCC +lbl_80453FCC: +.incbin "baserom.dol", 0x3D2E2C, 0x4 + +.global lbl_80453FD0 +lbl_80453FD0: +.incbin "baserom.dol", 0x3D2E30, 0x4 + +.global lbl_80453FD4 +lbl_80453FD4: +.incbin "baserom.dol", 0x3D2E34, 0x4 + +.global lbl_80453FD8 +lbl_80453FD8: +.incbin "baserom.dol", 0x3D2E38, 0x8 + +.global lbl_80453FE0 +lbl_80453FE0: +.incbin "baserom.dol", 0x3D2E40, 0x8 + diff --git a/asm/sdata2/d_menu_dmap.s b/asm/sdata2/d_menu_dmap.s new file mode 100644 index 0000000000..088835c89c --- /dev/null +++ b/asm/sdata2/d_menu_dmap.s @@ -0,0 +1,115 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453fe8 - 0x80454060 + +.global lbl_80453FE8 +lbl_80453FE8: +.incbin "baserom.dol", 0x3D2E48, 0x4 + +.global lbl_80453FEC +lbl_80453FEC: +.incbin "baserom.dol", 0x3D2E4C, 0x4 + +.global lbl_80453FF0 +lbl_80453FF0: +.incbin "baserom.dol", 0x3D2E50, 0x4 + +.global lbl_80453FF4 +lbl_80453FF4: +.incbin "baserom.dol", 0x3D2E54, 0x4 + +.global lbl_80453FF8 +lbl_80453FF8: +.incbin "baserom.dol", 0x3D2E58, 0x8 + +.global lbl_80454000 +lbl_80454000: +.incbin "baserom.dol", 0x3D2E60, 0x4 + +.global lbl_80454004 +lbl_80454004: +.incbin "baserom.dol", 0x3D2E64, 0x4 + +.global lbl_80454008 +lbl_80454008: +.incbin "baserom.dol", 0x3D2E68, 0x4 + +.global lbl_8045400C +lbl_8045400C: +.incbin "baserom.dol", 0x3D2E6C, 0x4 + +.global lbl_80454010 +lbl_80454010: +.incbin "baserom.dol", 0x3D2E70, 0x4 + +.global lbl_80454014 +lbl_80454014: +.incbin "baserom.dol", 0x3D2E74, 0x4 + +.global lbl_80454018 +lbl_80454018: +.incbin "baserom.dol", 0x3D2E78, 0x4 + +.global lbl_8045401C +lbl_8045401C: +.incbin "baserom.dol", 0x3D2E7C, 0x4 + +.global lbl_80454020 +lbl_80454020: +.incbin "baserom.dol", 0x3D2E80, 0x4 + +.global lbl_80454024 +lbl_80454024: +.incbin "baserom.dol", 0x3D2E84, 0x4 + +.global lbl_80454028 +lbl_80454028: +.incbin "baserom.dol", 0x3D2E88, 0x4 + +.global lbl_8045402C +lbl_8045402C: +.incbin "baserom.dol", 0x3D2E8C, 0x4 + +.global lbl_80454030 +lbl_80454030: +.incbin "baserom.dol", 0x3D2E90, 0x4 + +.global lbl_80454034 +lbl_80454034: +.incbin "baserom.dol", 0x3D2E94, 0x4 + +.global lbl_80454038 +lbl_80454038: +.incbin "baserom.dol", 0x3D2E98, 0x8 + +.global lbl_80454040 +lbl_80454040: +.incbin "baserom.dol", 0x3D2EA0, 0x4 + +.global lbl_80454044 +lbl_80454044: +.incbin "baserom.dol", 0x3D2EA4, 0x4 + +.global lbl_80454048 +lbl_80454048: +.incbin "baserom.dol", 0x3D2EA8, 0x4 + +.global lbl_8045404C +lbl_8045404C: +.incbin "baserom.dol", 0x3D2EAC, 0x4 + +.global lbl_80454050 +lbl_80454050: +.incbin "baserom.dol", 0x3D2EB0, 0x4 + +.global lbl_80454054 +lbl_80454054: +.incbin "baserom.dol", 0x3D2EB4, 0x4 + +.global lbl_80454058 +lbl_80454058: +.incbin "baserom.dol", 0x3D2EB8, 0x4 + +.global lbl_8045405C +lbl_8045405C: +.incbin "baserom.dol", 0x3D2EBC, 0x4 + diff --git a/asm/sdata2/d_menu_dmap_map.s b/asm/sdata2/d_menu_dmap_map.s new file mode 100644 index 0000000000..d6952b839d --- /dev/null +++ b/asm/sdata2/d_menu_dmap_map.s @@ -0,0 +1,79 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454060 - 0x804540d8 + +.global lbl_80454060 +lbl_80454060: +.incbin "baserom.dol", 0x3D2EC0, 0x4 + +.global lbl_80454064 +lbl_80454064: +.incbin "baserom.dol", 0x3D2EC4, 0x8 + +.global lbl_8045406C +lbl_8045406C: +.incbin "baserom.dol", 0x3D2ECC, 0x8 + +.global lbl_80454074 +lbl_80454074: +.incbin "baserom.dol", 0x3D2ED4, 0x8 + +.global lbl_8045407C +lbl_8045407C: +.incbin "baserom.dol", 0x3D2EDC, 0x8 + +.global lbl_80454084 +lbl_80454084: +.incbin "baserom.dol", 0x3D2EE4, 0x8 + +.global lbl_8045408C +lbl_8045408C: +.incbin "baserom.dol", 0x3D2EEC, 0x8 + +.global lbl_80454094 +lbl_80454094: +.incbin "baserom.dol", 0x3D2EF4, 0x4 + +.global lbl_80454098 +lbl_80454098: +.incbin "baserom.dol", 0x3D2EF8, 0x8 + +.global lbl_804540A0 +lbl_804540A0: +.incbin "baserom.dol", 0x3D2F00, 0x8 + +.global lbl_804540A8 +lbl_804540A8: +.incbin "baserom.dol", 0x3D2F08, 0x8 + +.global lbl_804540B0 +lbl_804540B0: +.incbin "baserom.dol", 0x3D2F10, 0x8 + +.global lbl_804540B8 +lbl_804540B8: +.incbin "baserom.dol", 0x3D2F18, 0x4 + +.global lbl_804540BC +lbl_804540BC: +.incbin "baserom.dol", 0x3D2F1C, 0x4 + +.global lbl_804540C0 +lbl_804540C0: +.incbin "baserom.dol", 0x3D2F20, 0x4 + +.global lbl_804540C4 +lbl_804540C4: +.incbin "baserom.dol", 0x3D2F24, 0x4 + +.global lbl_804540C8 +lbl_804540C8: +.incbin "baserom.dol", 0x3D2F28, 0x4 + +.global lbl_804540CC +lbl_804540CC: +.incbin "baserom.dol", 0x3D2F2C, 0x4 + +.global lbl_804540D0 +lbl_804540D0: +.incbin "baserom.dol", 0x3D2F30, 0x8 + diff --git a/asm/sdata2/d_menu_fishing.s b/asm/sdata2/d_menu_fishing.s new file mode 100644 index 0000000000..7cd2c06ba8 --- /dev/null +++ b/asm/sdata2/d_menu_fishing.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454108 - 0x80454120 + +.global lbl_80454108 +lbl_80454108: +.incbin "baserom.dol", 0x3D2F68, 0x4 + +.global lbl_8045410C +lbl_8045410C: +.incbin "baserom.dol", 0x3D2F6C, 0x4 + +.global lbl_80454110 +lbl_80454110: +.incbin "baserom.dol", 0x3D2F70, 0x4 + +.global lbl_80454114 +lbl_80454114: +.incbin "baserom.dol", 0x3D2F74, 0x4 + +.global lbl_80454118 +lbl_80454118: +.incbin "baserom.dol", 0x3D2F78, 0x8 + diff --git a/asm/sdata2/d_menu_fmap.s b/asm/sdata2/d_menu_fmap.s new file mode 100644 index 0000000000..536c951055 --- /dev/null +++ b/asm/sdata2/d_menu_fmap.s @@ -0,0 +1,87 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454120 - 0x80454178 + +.global lbl_80454120 +lbl_80454120: +.incbin "baserom.dol", 0x3D2F80, 0x4 + +.global lbl_80454124 +lbl_80454124: +.incbin "baserom.dol", 0x3D2F84, 0x4 + +.global lbl_80454128 +lbl_80454128: +.incbin "baserom.dol", 0x3D2F88, 0x4 + +.global lbl_8045412C +lbl_8045412C: +.incbin "baserom.dol", 0x3D2F8C, 0x4 + +.global lbl_80454130 +lbl_80454130: +.incbin "baserom.dol", 0x3D2F90, 0x4 + +.global lbl_80454134 +lbl_80454134: +.incbin "baserom.dol", 0x3D2F94, 0x4 + +.global lbl_80454138 +lbl_80454138: +.incbin "baserom.dol", 0x3D2F98, 0x4 + +.global lbl_8045413C +lbl_8045413C: +.incbin "baserom.dol", 0x3D2F9C, 0x4 + +.global lbl_80454140 +lbl_80454140: +.incbin "baserom.dol", 0x3D2FA0, 0x8 + +.global lbl_80454148 +lbl_80454148: +.incbin "baserom.dol", 0x3D2FA8, 0x4 + +.global lbl_8045414C +lbl_8045414C: +.incbin "baserom.dol", 0x3D2FAC, 0x4 + +.global lbl_80454150 +lbl_80454150: +.incbin "baserom.dol", 0x3D2FB0, 0x4 + +.global lbl_80454154 +lbl_80454154: +.incbin "baserom.dol", 0x3D2FB4, 0x4 + +.global lbl_80454158 +lbl_80454158: +.incbin "baserom.dol", 0x3D2FB8, 0x4 + +.global lbl_8045415C +lbl_8045415C: +.incbin "baserom.dol", 0x3D2FBC, 0x4 + +.global lbl_80454160 +lbl_80454160: +.incbin "baserom.dol", 0x3D2FC0, 0x4 + +.global lbl_80454164 +lbl_80454164: +.incbin "baserom.dol", 0x3D2FC4, 0x4 + +.global lbl_80454168 +lbl_80454168: +.incbin "baserom.dol", 0x3D2FC8, 0x4 + +.global lbl_8045416C +lbl_8045416C: +.incbin "baserom.dol", 0x3D2FCC, 0x4 + +.global lbl_80454170 +lbl_80454170: +.incbin "baserom.dol", 0x3D2FD0, 0x4 + +.global lbl_80454174 +lbl_80454174: +.incbin "baserom.dol", 0x3D2FD4, 0x4 + diff --git a/asm/sdata2/d_menu_fmap2D.s b/asm/sdata2/d_menu_fmap2D.s new file mode 100644 index 0000000000..2794719eff --- /dev/null +++ b/asm/sdata2/d_menu_fmap2D.s @@ -0,0 +1,91 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804541d0 - 0x80454238 + +.global lbl_804541D0 +lbl_804541D0: +.incbin "baserom.dol", 0x3D3030, 0x4 + +.global lbl_804541D4 +lbl_804541D4: +.incbin "baserom.dol", 0x3D3034, 0x4 + +.global lbl_804541D8 +lbl_804541D8: +.incbin "baserom.dol", 0x3D3038, 0x4 + +.global lbl_804541DC +lbl_804541DC: +.incbin "baserom.dol", 0x3D303C, 0x4 + +.global lbl_804541E0 +lbl_804541E0: +.incbin "baserom.dol", 0x3D3040, 0x4 + +.global lbl_804541E4 +lbl_804541E4: +.incbin "baserom.dol", 0x3D3044, 0x4 + +.global lbl_804541E8 +lbl_804541E8: +.incbin "baserom.dol", 0x3D3048, 0x4 + +.global lbl_804541EC +lbl_804541EC: +.incbin "baserom.dol", 0x3D304C, 0x4 + +.global lbl_804541F0 +lbl_804541F0: +.incbin "baserom.dol", 0x3D3050, 0x4 + +.global lbl_804541F4 +lbl_804541F4: +.incbin "baserom.dol", 0x3D3054, 0x4 + +.global lbl_804541F8 +lbl_804541F8: +.incbin "baserom.dol", 0x3D3058, 0x8 + +.global lbl_80454200 +lbl_80454200: +.incbin "baserom.dol", 0x3D3060, 0x8 + +.global lbl_80454208 +lbl_80454208: +.incbin "baserom.dol", 0x3D3068, 0x8 + +.global lbl_80454210 +lbl_80454210: +.incbin "baserom.dol", 0x3D3070, 0x4 + +.global lbl_80454214 +lbl_80454214: +.incbin "baserom.dol", 0x3D3074, 0x4 + +.global lbl_80454218 +lbl_80454218: +.incbin "baserom.dol", 0x3D3078, 0x4 + +.global lbl_8045421C +lbl_8045421C: +.incbin "baserom.dol", 0x3D307C, 0x4 + +.global lbl_80454220 +lbl_80454220: +.incbin "baserom.dol", 0x3D3080, 0x4 + +.global lbl_80454224 +lbl_80454224: +.incbin "baserom.dol", 0x3D3084, 0x4 + +.global lbl_80454228 +lbl_80454228: +.incbin "baserom.dol", 0x3D3088, 0x4 + +.global lbl_8045422C +lbl_8045422C: +.incbin "baserom.dol", 0x3D308C, 0x4 + +.global lbl_80454230 +lbl_80454230: +.incbin "baserom.dol", 0x3D3090, 0x8 + diff --git a/asm/sdata2/d_menu_fmap_map.s b/asm/sdata2/d_menu_fmap_map.s new file mode 100644 index 0000000000..f3b21ef777 --- /dev/null +++ b/asm/sdata2/d_menu_fmap_map.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454178 - 0x804541d0 + +.global lbl_80454178 +lbl_80454178: +.incbin "baserom.dol", 0x3D2FD8, 0x8 + +.global lbl_80454180 +lbl_80454180: +.incbin "baserom.dol", 0x3D2FE0, 0x4 + +.global lbl_80454184 +lbl_80454184: +.incbin "baserom.dol", 0x3D2FE4, 0x4 + +.global lbl_80454188 +lbl_80454188: +.incbin "baserom.dol", 0x3D2FE8, 0x4 + +.global lbl_8045418C +lbl_8045418C: +.incbin "baserom.dol", 0x3D2FEC, 0x4 + +.global lbl_80454190 +lbl_80454190: +.incbin "baserom.dol", 0x3D2FF0, 0x4 + +.global lbl_80454194 +lbl_80454194: +.incbin "baserom.dol", 0x3D2FF4, 0x4 + +.global lbl_80454198 +lbl_80454198: +.incbin "baserom.dol", 0x3D2FF8, 0x4 + +.global lbl_8045419C +lbl_8045419C: +.incbin "baserom.dol", 0x3D2FFC, 0x4 + +.global lbl_804541A0 +lbl_804541A0: +.incbin "baserom.dol", 0x3D3000, 0x8 + +.global lbl_804541A8 +lbl_804541A8: +.incbin "baserom.dol", 0x3D3008, 0x8 + +.global lbl_804541B0 +lbl_804541B0: +.incbin "baserom.dol", 0x3D3010, 0x8 + +.global lbl_804541B8 +lbl_804541B8: +.incbin "baserom.dol", 0x3D3018, 0x8 + +.global lbl_804541C0 +lbl_804541C0: +.incbin "baserom.dol", 0x3D3020, 0x4 + +.global lbl_804541C4 +lbl_804541C4: +.incbin "baserom.dol", 0x3D3024, 0x4 + +.global lbl_804541C8 +lbl_804541C8: +.incbin "baserom.dol", 0x3D3028, 0x4 + +.global lbl_804541CC +lbl_804541CC: +.incbin "baserom.dol", 0x3D302C, 0x4 + diff --git a/asm/sdata2/d_menu_insect.s b/asm/sdata2/d_menu_insect.s new file mode 100644 index 0000000000..6f5c55ffa4 --- /dev/null +++ b/asm/sdata2/d_menu_insect.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454238 - 0x80454288 + +.global lbl_80454238 +lbl_80454238: +.incbin "baserom.dol", 0x3D3098, 0x4 + +.global lbl_8045423C +lbl_8045423C: +.incbin "baserom.dol", 0x3D309C, 0x4 + +.global lbl_80454240 +lbl_80454240: +.incbin "baserom.dol", 0x3D30A0, 0x4 + +.global lbl_80454244 +lbl_80454244: +.incbin "baserom.dol", 0x3D30A4, 0x4 + +.global lbl_80454248 +lbl_80454248: +.incbin "baserom.dol", 0x3D30A8, 0x4 + +.global lbl_8045424C +lbl_8045424C: +.incbin "baserom.dol", 0x3D30AC, 0x4 + +.global lbl_80454250 +lbl_80454250: +.incbin "baserom.dol", 0x3D30B0, 0x4 + +.global lbl_80454254 +lbl_80454254: +.incbin "baserom.dol", 0x3D30B4, 0x4 + +.global lbl_80454258 +lbl_80454258: +.incbin "baserom.dol", 0x3D30B8, 0x8 + +.global lbl_80454260 +lbl_80454260: +.incbin "baserom.dol", 0x3D30C0, 0x8 + +.global lbl_80454268 +lbl_80454268: +.incbin "baserom.dol", 0x3D30C8, 0x4 + +.global lbl_8045426C +lbl_8045426C: +.incbin "baserom.dol", 0x3D30CC, 0x4 + +.global lbl_80454270 +lbl_80454270: +.incbin "baserom.dol", 0x3D30D0, 0x8 + +.global lbl_80454278 +lbl_80454278: +.incbin "baserom.dol", 0x3D30D8, 0x8 + +.global lbl_80454280 +lbl_80454280: +.incbin "baserom.dol", 0x3D30E0, 0x8 + diff --git a/asm/sdata2/d_menu_item_explain.s b/asm/sdata2/d_menu_item_explain.s new file mode 100644 index 0000000000..c3688b9638 --- /dev/null +++ b/asm/sdata2/d_menu_item_explain.s @@ -0,0 +1,79 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454288 - 0x804542e0 + +.global lbl_80454288 +lbl_80454288: +.incbin "baserom.dol", 0x3D30E8, 0x4 + +.global lbl_8045428C +lbl_8045428C: +.incbin "baserom.dol", 0x3D30EC, 0x4 + +.global lbl_80454290 +lbl_80454290: +.incbin "baserom.dol", 0x3D30F0, 0x4 + +.global lbl_80454294 +lbl_80454294: +.incbin "baserom.dol", 0x3D30F4, 0x4 + +.global lbl_80454298 +lbl_80454298: +.incbin "baserom.dol", 0x3D30F8, 0x8 + +.global lbl_804542A0 +lbl_804542A0: +.incbin "baserom.dol", 0x3D3100, 0x8 + +.global lbl_804542A8 +lbl_804542A8: +.incbin "baserom.dol", 0x3D3108, 0x4 + +.global lbl_804542AC +lbl_804542AC: +.incbin "baserom.dol", 0x3D310C, 0x4 + +.global lbl_804542B0 +lbl_804542B0: +.incbin "baserom.dol", 0x3D3110, 0x4 + +.global lbl_804542B4 +lbl_804542B4: +.incbin "baserom.dol", 0x3D3114, 0x4 + +.global lbl_804542B8 +lbl_804542B8: +.incbin "baserom.dol", 0x3D3118, 0x4 + +.global lbl_804542BC +lbl_804542BC: +.incbin "baserom.dol", 0x3D311C, 0x4 + +.global lbl_804542C0 +lbl_804542C0: +.incbin "baserom.dol", 0x3D3120, 0x4 + +.global lbl_804542C4 +lbl_804542C4: +.incbin "baserom.dol", 0x3D3124, 0x4 + +.global lbl_804542C8 +lbl_804542C8: +.incbin "baserom.dol", 0x3D3128, 0x4 + +.global lbl_804542CC +lbl_804542CC: +.incbin "baserom.dol", 0x3D312C, 0x4 + +.global lbl_804542D0 +lbl_804542D0: +.incbin "baserom.dol", 0x3D3130, 0x4 + +.global lbl_804542D4 +lbl_804542D4: +.incbin "baserom.dol", 0x3D3134, 0x4 + +.global lbl_804542D8 +lbl_804542D8: +.incbin "baserom.dol", 0x3D3138, 0x8 + diff --git a/asm/sdata2/d_menu_letter.s b/asm/sdata2/d_menu_letter.s new file mode 100644 index 0000000000..7433cc1099 --- /dev/null +++ b/asm/sdata2/d_menu_letter.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804542e0 - 0x80454328 + +.global lbl_804542E0 +lbl_804542E0: +.incbin "baserom.dol", 0x3D3140, 0x4 + +.global lbl_804542E4 +lbl_804542E4: +.incbin "baserom.dol", 0x3D3144, 0x4 + +.global lbl_804542E8 +lbl_804542E8: +.incbin "baserom.dol", 0x3D3148, 0x4 + +.global lbl_804542EC +lbl_804542EC: +.incbin "baserom.dol", 0x3D314C, 0x4 + +.global lbl_804542F0 +lbl_804542F0: +.incbin "baserom.dol", 0x3D3150, 0x4 + +.global lbl_804542F4 +lbl_804542F4: +.incbin "baserom.dol", 0x3D3154, 0x4 + +.global lbl_804542F8 +lbl_804542F8: +.incbin "baserom.dol", 0x3D3158, 0x4 + +.global lbl_804542FC +lbl_804542FC: +.incbin "baserom.dol", 0x3D315C, 0x4 + +.global lbl_80454300 +lbl_80454300: +.incbin "baserom.dol", 0x3D3160, 0x8 + +.global lbl_80454308 +lbl_80454308: +.incbin "baserom.dol", 0x3D3168, 0x8 + +.global lbl_80454310 +lbl_80454310: +.incbin "baserom.dol", 0x3D3170, 0x8 + +.global lbl_80454318 +lbl_80454318: +.incbin "baserom.dol", 0x3D3178, 0x4 + +.global lbl_8045431C +lbl_8045431C: +.incbin "baserom.dol", 0x3D317C, 0x4 + +.global lbl_80454320 +lbl_80454320: +.incbin "baserom.dol", 0x3D3180, 0x8 + diff --git a/asm/sdata2/d_menu_map_common.s b/asm/sdata2/d_menu_map_common.s new file mode 100644 index 0000000000..f9d878f4ea --- /dev/null +++ b/asm/sdata2/d_menu_map_common.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804540d8 - 0x80454108 + +.global lbl_804540D8 +lbl_804540D8: +.incbin "baserom.dol", 0x3D2F38, 0x4 + +.global lbl_804540DC +lbl_804540DC: +.incbin "baserom.dol", 0x3D2F3C, 0x4 + +.global lbl_804540E0 +lbl_804540E0: +.incbin "baserom.dol", 0x3D2F40, 0x4 + +.global lbl_804540E4 +lbl_804540E4: +.incbin "baserom.dol", 0x3D2F44, 0x4 + +.global lbl_804540E8 +lbl_804540E8: +.incbin "baserom.dol", 0x3D2F48, 0x4 + +.global lbl_804540EC +lbl_804540EC: +.incbin "baserom.dol", 0x3D2F4C, 0x4 + +.global lbl_804540F0 +lbl_804540F0: +.incbin "baserom.dol", 0x3D2F50, 0x4 + +.global lbl_804540F4 +lbl_804540F4: +.incbin "baserom.dol", 0x3D2F54, 0x4 + +.global lbl_804540F8 +lbl_804540F8: +.incbin "baserom.dol", 0x3D2F58, 0x8 + +.global lbl_80454100 +lbl_80454100: +.incbin "baserom.dol", 0x3D2F60, 0x8 + diff --git a/asm/sdata2/d_menu_option.s b/asm/sdata2/d_menu_option.s new file mode 100644 index 0000000000..63fba89693 --- /dev/null +++ b/asm/sdata2/d_menu_option.s @@ -0,0 +1,87 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454328 - 0x80454388 + +.global lbl_80454328 +lbl_80454328: +.incbin "baserom.dol", 0x3D3188, 0x4 + +.global lbl_8045432C +lbl_8045432C: +.incbin "baserom.dol", 0x3D318C, 0x4 + +.global lbl_80454330 +lbl_80454330: +.incbin "baserom.dol", 0x3D3190, 0x4 + +.global lbl_80454334 +lbl_80454334: +.incbin "baserom.dol", 0x3D3194, 0x4 + +.global lbl_80454338 +lbl_80454338: +.incbin "baserom.dol", 0x3D3198, 0x8 + +.global lbl_80454340 +lbl_80454340: +.incbin "baserom.dol", 0x3D31A0, 0x8 + +.global lbl_80454348 +lbl_80454348: +.incbin "baserom.dol", 0x3D31A8, 0x4 + +.global lbl_8045434C +lbl_8045434C: +.incbin "baserom.dol", 0x3D31AC, 0x4 + +.global lbl_80454350 +lbl_80454350: +.incbin "baserom.dol", 0x3D31B0, 0x4 + +.global lbl_80454354 +lbl_80454354: +.incbin "baserom.dol", 0x3D31B4, 0x4 + +.global lbl_80454358 +lbl_80454358: +.incbin "baserom.dol", 0x3D31B8, 0x8 + +.global lbl_80454360 +lbl_80454360: +.incbin "baserom.dol", 0x3D31C0, 0x4 + +.global lbl_80454364 +lbl_80454364: +.incbin "baserom.dol", 0x3D31C4, 0x4 + +.global lbl_80454368 +lbl_80454368: +.incbin "baserom.dol", 0x3D31C8, 0x4 + +.global lbl_8045436C +lbl_8045436C: +.incbin "baserom.dol", 0x3D31CC, 0x4 + +.global lbl_80454370 +lbl_80454370: +.incbin "baserom.dol", 0x3D31D0, 0x4 + +.global lbl_80454374 +lbl_80454374: +.incbin "baserom.dol", 0x3D31D4, 0x4 + +.global lbl_80454378 +lbl_80454378: +.incbin "baserom.dol", 0x3D31D8, 0x4 + +.global lbl_8045437C +lbl_8045437C: +.incbin "baserom.dol", 0x3D31DC, 0x4 + +.global lbl_80454380 +lbl_80454380: +.incbin "baserom.dol", 0x3D31E0, 0x4 + +.global lbl_80454384 +lbl_80454384: +.incbin "baserom.dol", 0x3D31E4, 0x4 + diff --git a/asm/sdata2/d_menu_ring.s b/asm/sdata2/d_menu_ring.s new file mode 100644 index 0000000000..95af3661d6 --- /dev/null +++ b/asm/sdata2/d_menu_ring.s @@ -0,0 +1,139 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454388 - 0x80454438 + +.global lbl_80454388 +lbl_80454388: +.incbin "baserom.dol", 0x3D31E8, 0x4 + +.global lbl_8045438C +lbl_8045438C: +.incbin "baserom.dol", 0x3D31EC, 0x4 + +.global lbl_80454390 +lbl_80454390: +.incbin "baserom.dol", 0x3D31F0, 0x4 + +.global lbl_80454394 +lbl_80454394: +.incbin "baserom.dol", 0x3D31F4, 0x4 + +.global lbl_80454398 +lbl_80454398: +.incbin "baserom.dol", 0x3D31F8, 0x4 + +.global lbl_8045439C +lbl_8045439C: +.incbin "baserom.dol", 0x3D31FC, 0x4 + +.global lbl_804543A0 +lbl_804543A0: +.incbin "baserom.dol", 0x3D3200, 0x4 + +.global lbl_804543A4 +lbl_804543A4: +.incbin "baserom.dol", 0x3D3204, 0x4 + +.global lbl_804543A8 +lbl_804543A8: +.incbin "baserom.dol", 0x3D3208, 0x4 + +.global lbl_804543AC +lbl_804543AC: +.incbin "baserom.dol", 0x3D320C, 0x4 + +.global lbl_804543B0 +lbl_804543B0: +.incbin "baserom.dol", 0x3D3210, 0x8 + +.global lbl_804543B8 +lbl_804543B8: +.incbin "baserom.dol", 0x3D3218, 0x8 + +.global lbl_804543C0 +lbl_804543C0: +.incbin "baserom.dol", 0x3D3220, 0x8 + +.global lbl_804543C8 +lbl_804543C8: +.incbin "baserom.dol", 0x3D3228, 0x8 + +.global lbl_804543D0 +lbl_804543D0: +.incbin "baserom.dol", 0x3D3230, 0x4 + +.global lbl_804543D4 +lbl_804543D4: +.incbin "baserom.dol", 0x3D3234, 0x4 + +.global lbl_804543D8 +lbl_804543D8: +.incbin "baserom.dol", 0x3D3238, 0x4 + +.global lbl_804543DC +lbl_804543DC: +.incbin "baserom.dol", 0x3D323C, 0x4 + +.global lbl_804543E0 +lbl_804543E0: +.incbin "baserom.dol", 0x3D3240, 0x4 + +.global lbl_804543E4 +lbl_804543E4: +.incbin "baserom.dol", 0x3D3244, 0x4 + +.global lbl_804543E8 +lbl_804543E8: +.incbin "baserom.dol", 0x3D3248, 0x4 + +.global lbl_804543EC +lbl_804543EC: +.incbin "baserom.dol", 0x3D324C, 0x4 + +.global lbl_804543F0 +lbl_804543F0: +.incbin "baserom.dol", 0x3D3250, 0x4 + +.global lbl_804543F4 +lbl_804543F4: +.incbin "baserom.dol", 0x3D3254, 0x4 + +.global lbl_804543F8 +lbl_804543F8: +.incbin "baserom.dol", 0x3D3258, 0x8 + +.global lbl_80454400 +lbl_80454400: +.incbin "baserom.dol", 0x3D3260, 0x8 + +.global lbl_80454408 +lbl_80454408: +.incbin "baserom.dol", 0x3D3268, 0x8 + +.global lbl_80454410 +lbl_80454410: +.incbin "baserom.dol", 0x3D3270, 0x4 + +.global lbl_80454414 +lbl_80454414: +.incbin "baserom.dol", 0x3D3274, 0x4 + +.global lbl_80454418 +lbl_80454418: +.incbin "baserom.dol", 0x3D3278, 0x4 + +.global lbl_8045441C +lbl_8045441C: +.incbin "baserom.dol", 0x3D327C, 0x4 + +.global lbl_80454420 +lbl_80454420: +.incbin "baserom.dol", 0x3D3280, 0x4 + +.global lbl_80454424 +lbl_80454424: +.incbin "baserom.dol", 0x3D3284, 0x8 + +.global lbl_8045442C +lbl_8045442C: +.incbin "baserom.dol", 0x3D328C, 0xC + diff --git a/asm/sdata2/d_menu_save.s b/asm/sdata2/d_menu_save.s new file mode 100644 index 0000000000..531526b773 --- /dev/null +++ b/asm/sdata2/d_menu_save.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454438 - 0x80454488 + +.global lbl_80454438 +lbl_80454438: +.incbin "baserom.dol", 0x3D3298, 0x4 + +.global lbl_8045443C +lbl_8045443C: +.incbin "baserom.dol", 0x3D329C, 0x4 + +.global lbl_80454440 +lbl_80454440: +.incbin "baserom.dol", 0x3D32A0, 0x4 + +.global lbl_80454444 +lbl_80454444: +.incbin "baserom.dol", 0x3D32A4, 0x4 + +.global lbl_80454448 +lbl_80454448: +.incbin "baserom.dol", 0x3D32A8, 0x4 + +.global lbl_8045444C +lbl_8045444C: +.incbin "baserom.dol", 0x3D32AC, 0x4 + +.global lbl_80454450 +lbl_80454450: +.incbin "baserom.dol", 0x3D32B0, 0x4 + +.global lbl_80454454 +lbl_80454454: +.incbin "baserom.dol", 0x3D32B4, 0x4 + +.global lbl_80454458 +lbl_80454458: +.incbin "baserom.dol", 0x3D32B8, 0x4 + +.global lbl_8045445C +lbl_8045445C: +.incbin "baserom.dol", 0x3D32BC, 0x4 + +.global lbl_80454460 +lbl_80454460: +.incbin "baserom.dol", 0x3D32C0, 0x4 + +.global lbl_80454464 +lbl_80454464: +.incbin "baserom.dol", 0x3D32C4, 0x4 + +.global lbl_80454468 +lbl_80454468: +.incbin "baserom.dol", 0x3D32C8, 0x8 + +.global lbl_80454470 +lbl_80454470: +.incbin "baserom.dol", 0x3D32D0, 0x8 + +.global lbl_80454478 +lbl_80454478: +.incbin "baserom.dol", 0x3D32D8, 0x4 + +.global lbl_8045447C +lbl_8045447C: +.incbin "baserom.dol", 0x3D32DC, 0x4 + +.global lbl_80454480 +lbl_80454480: +.incbin "baserom.dol", 0x3D32E0, 0x8 + diff --git a/asm/sdata2/d_menu_skill.s b/asm/sdata2/d_menu_skill.s new file mode 100644 index 0000000000..d6011b363d --- /dev/null +++ b/asm/sdata2/d_menu_skill.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454488 - 0x804544c0 + +.global lbl_80454488 +lbl_80454488: +.incbin "baserom.dol", 0x3D32E8, 0x4 + +.global lbl_8045448C +lbl_8045448C: +.incbin "baserom.dol", 0x3D32EC, 0x4 + +.global lbl_80454490 +lbl_80454490: +.incbin "baserom.dol", 0x3D32F0, 0x4 + +.global lbl_80454494 +lbl_80454494: +.incbin "baserom.dol", 0x3D32F4, 0x4 + +.global lbl_80454498 +lbl_80454498: +.incbin "baserom.dol", 0x3D32F8, 0x4 + +.global lbl_8045449C +lbl_8045449C: +.incbin "baserom.dol", 0x3D32FC, 0x4 + +.global lbl_804544A0 +lbl_804544A0: +.incbin "baserom.dol", 0x3D3300, 0x4 + +.global lbl_804544A4 +lbl_804544A4: +.incbin "baserom.dol", 0x3D3304, 0x4 + +.global lbl_804544A8 +lbl_804544A8: +.incbin "baserom.dol", 0x3D3308, 0x8 + +.global lbl_804544B0 +lbl_804544B0: +.incbin "baserom.dol", 0x3D3310, 0x8 + +.global lbl_804544B8 +lbl_804544B8: +.incbin "baserom.dol", 0x3D3318, 0x8 + diff --git a/asm/sdata2/d_menu_window.s b/asm/sdata2/d_menu_window.s new file mode 100644 index 0000000000..7d7c2bac91 --- /dev/null +++ b/asm/sdata2/d_menu_window.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804544c0 - 0x804544e0 + +.global lbl_804544C0 +lbl_804544C0: +.incbin "baserom.dol", 0x3D3320, 0x4 + +.global lbl_804544C4 +lbl_804544C4: +.incbin "baserom.dol", 0x3D3324, 0x4 + +.global lbl_804544C8 +lbl_804544C8: +.incbin "baserom.dol", 0x3D3328, 0x4 + +.global lbl_804544CC +lbl_804544CC: +.incbin "baserom.dol", 0x3D332C, 0x4 + +.global lbl_804544D0 +lbl_804544D0: +.incbin "baserom.dol", 0x3D3330, 0x4 + +.global lbl_804544D4 +lbl_804544D4: +.incbin "baserom.dol", 0x3D3334, 0x4 + +.global lbl_804544D8 +lbl_804544D8: +.incbin "baserom.dol", 0x3D3338, 0x8 + diff --git a/asm/sdata2/d_meter2.s b/asm/sdata2/d_meter2.s new file mode 100644 index 0000000000..e94107781f --- /dev/null +++ b/asm/sdata2/d_meter2.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804549c8 - 0x80454a10 + +.global lbl_804549C8 +lbl_804549C8: +.incbin "baserom.dol", 0x3D3828, 0x4 + +.global lbl_804549CC +lbl_804549CC: +.incbin "baserom.dol", 0x3D382C, 0x4 + +.global lbl_804549D0 +lbl_804549D0: +.incbin "baserom.dol", 0x3D3830, 0x8 + +.global lbl_804549D8 +lbl_804549D8: +.incbin "baserom.dol", 0x3D3838, 0x8 + +.global lbl_804549E0 +lbl_804549E0: +.incbin "baserom.dol", 0x3D3840, 0x8 + +.global lbl_804549E8 +lbl_804549E8: +.incbin "baserom.dol", 0x3D3848, 0x4 + +.global lbl_804549EC +lbl_804549EC: +.incbin "baserom.dol", 0x3D384C, 0x4 + +.global lbl_804549F0 +lbl_804549F0: +.incbin "baserom.dol", 0x3D3850, 0x4 + +.global lbl_804549F4 +lbl_804549F4: +.incbin "baserom.dol", 0x3D3854, 0x4 + +.global lbl_804549F8 +lbl_804549F8: +.incbin "baserom.dol", 0x3D3858, 0x4 + +.global lbl_804549FC +lbl_804549FC: +.incbin "baserom.dol", 0x3D385C, 0x4 + +.global lbl_80454A00 +lbl_80454A00: +.incbin "baserom.dol", 0x3D3860, 0x4 + +.global lbl_80454A04 +lbl_80454A04: +.incbin "baserom.dol", 0x3D3864, 0x4 + +.global lbl_80454A08 +lbl_80454A08: +.incbin "baserom.dol", 0x3D3868, 0x8 + diff --git a/asm/sdata2/d_meter2_draw.s b/asm/sdata2/d_meter2_draw.s new file mode 100644 index 0000000000..ff41c2faa6 --- /dev/null +++ b/asm/sdata2/d_meter2_draw.s @@ -0,0 +1,271 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454880 - 0x80454998 + +.global lbl_80454880 +lbl_80454880: +.incbin "baserom.dol", 0x3D36E0, 0x4 + +.global lbl_80454884 +lbl_80454884: +.incbin "baserom.dol", 0x3D36E4, 0x4 + +.global lbl_80454888 +lbl_80454888: +.incbin "baserom.dol", 0x3D36E8, 0x4 + +.global lbl_8045488C +lbl_8045488C: +.incbin "baserom.dol", 0x3D36EC, 0x4 + +.global lbl_80454890 +lbl_80454890: +.incbin "baserom.dol", 0x3D36F0, 0x4 + +.global lbl_80454894 +lbl_80454894: +.incbin "baserom.dol", 0x3D36F4, 0x4 + +.global lbl_80454898 +lbl_80454898: +.incbin "baserom.dol", 0x3D36F8, 0x8 + +.global lbl_804548A0 +lbl_804548A0: +.incbin "baserom.dol", 0x3D3700, 0x8 + +.global lbl_804548A8 +lbl_804548A8: +.incbin "baserom.dol", 0x3D3708, 0x4 + +.global lbl_804548AC +lbl_804548AC: +.incbin "baserom.dol", 0x3D370C, 0x4 + +.global lbl_804548B0 +lbl_804548B0: +.incbin "baserom.dol", 0x3D3710, 0x4 + +.global lbl_804548B4 +lbl_804548B4: +.incbin "baserom.dol", 0x3D3714, 0x4 + +.global lbl_804548B8 +lbl_804548B8: +.incbin "baserom.dol", 0x3D3718, 0x4 + +.global lbl_804548BC +lbl_804548BC: +.incbin "baserom.dol", 0x3D371C, 0x4 + +.global lbl_804548C0 +lbl_804548C0: +.incbin "baserom.dol", 0x3D3720, 0x8 + +.global lbl_804548C8 +lbl_804548C8: +.incbin "baserom.dol", 0x3D3728, 0x4 + +.global lbl_804548CC +lbl_804548CC: +.incbin "baserom.dol", 0x3D372C, 0x4 + +.global lbl_804548D0 +lbl_804548D0: +.incbin "baserom.dol", 0x3D3730, 0x4 + +.global lbl_804548D4 +lbl_804548D4: +.incbin "baserom.dol", 0x3D3734, 0x4 + +.global lbl_804548D8 +lbl_804548D8: +.incbin "baserom.dol", 0x3D3738, 0x4 + +.global lbl_804548DC +lbl_804548DC: +.incbin "baserom.dol", 0x3D373C, 0x4 + +.global lbl_804548E0 +lbl_804548E0: +.incbin "baserom.dol", 0x3D3740, 0x4 + +.global lbl_804548E4 +lbl_804548E4: +.incbin "baserom.dol", 0x3D3744, 0x4 + +.global lbl_804548E8 +lbl_804548E8: +.incbin "baserom.dol", 0x3D3748, 0x4 + +.global lbl_804548EC +lbl_804548EC: +.incbin "baserom.dol", 0x3D374C, 0x4 + +.global lbl_804548F0 +lbl_804548F0: +.incbin "baserom.dol", 0x3D3750, 0x4 + +.global lbl_804548F4 +lbl_804548F4: +.incbin "baserom.dol", 0x3D3754, 0x4 + +.global lbl_804548F8 +lbl_804548F8: +.incbin "baserom.dol", 0x3D3758, 0x4 + +.global lbl_804548FC +lbl_804548FC: +.incbin "baserom.dol", 0x3D375C, 0x4 + +.global lbl_80454900 +lbl_80454900: +.incbin "baserom.dol", 0x3D3760, 0x4 + +.global lbl_80454904 +lbl_80454904: +.incbin "baserom.dol", 0x3D3764, 0x4 + +.global lbl_80454908 +lbl_80454908: +.incbin "baserom.dol", 0x3D3768, 0x4 + +.global lbl_8045490C +lbl_8045490C: +.incbin "baserom.dol", 0x3D376C, 0x4 + +.global lbl_80454910 +lbl_80454910: +.incbin "baserom.dol", 0x3D3770, 0x4 + +.global lbl_80454914 +lbl_80454914: +.incbin "baserom.dol", 0x3D3774, 0x4 + +.global lbl_80454918 +lbl_80454918: +.incbin "baserom.dol", 0x3D3778, 0x4 + +.global lbl_8045491C +lbl_8045491C: +.incbin "baserom.dol", 0x3D377C, 0x4 + +.global lbl_80454920 +lbl_80454920: +.incbin "baserom.dol", 0x3D3780, 0x4 + +.global lbl_80454924 +lbl_80454924: +.incbin "baserom.dol", 0x3D3784, 0x4 + +.global lbl_80454928 +lbl_80454928: +.incbin "baserom.dol", 0x3D3788, 0x4 + +.global lbl_8045492C +lbl_8045492C: +.incbin "baserom.dol", 0x3D378C, 0x4 + +.global lbl_80454930 +lbl_80454930: +.incbin "baserom.dol", 0x3D3790, 0x4 + +.global lbl_80454934 +lbl_80454934: +.incbin "baserom.dol", 0x3D3794, 0x4 + +.global lbl_80454938 +lbl_80454938: +.incbin "baserom.dol", 0x3D3798, 0x4 + +.global lbl_8045493C +lbl_8045493C: +.incbin "baserom.dol", 0x3D379C, 0x4 + +.global lbl_80454940 +lbl_80454940: +.incbin "baserom.dol", 0x3D37A0, 0x4 + +.global lbl_80454944 +lbl_80454944: +.incbin "baserom.dol", 0x3D37A4, 0x4 + +.global lbl_80454948 +lbl_80454948: +.incbin "baserom.dol", 0x3D37A8, 0x4 + +.global lbl_8045494C +lbl_8045494C: +.incbin "baserom.dol", 0x3D37AC, 0x4 + +.global lbl_80454950 +lbl_80454950: +.incbin "baserom.dol", 0x3D37B0, 0x4 + +.global lbl_80454954 +lbl_80454954: +.incbin "baserom.dol", 0x3D37B4, 0x4 + +.global lbl_80454958 +lbl_80454958: +.incbin "baserom.dol", 0x3D37B8, 0x4 + +.global lbl_8045495C +lbl_8045495C: +.incbin "baserom.dol", 0x3D37BC, 0x4 + +.global lbl_80454960 +lbl_80454960: +.incbin "baserom.dol", 0x3D37C0, 0x4 + +.global lbl_80454964 +lbl_80454964: +.incbin "baserom.dol", 0x3D37C4, 0x4 + +.global lbl_80454968 +lbl_80454968: +.incbin "baserom.dol", 0x3D37C8, 0x4 + +.global lbl_8045496C +lbl_8045496C: +.incbin "baserom.dol", 0x3D37CC, 0x4 + +.global lbl_80454970 +lbl_80454970: +.incbin "baserom.dol", 0x3D37D0, 0x4 + +.global lbl_80454974 +lbl_80454974: +.incbin "baserom.dol", 0x3D37D4, 0x4 + +.global lbl_80454978 +lbl_80454978: +.incbin "baserom.dol", 0x3D37D8, 0x4 + +.global lbl_8045497C +lbl_8045497C: +.incbin "baserom.dol", 0x3D37DC, 0x4 + +.global lbl_80454980 +lbl_80454980: +.incbin "baserom.dol", 0x3D37E0, 0x4 + +.global lbl_80454984 +lbl_80454984: +.incbin "baserom.dol", 0x3D37E4, 0x4 + +.global lbl_80454988 +lbl_80454988: +.incbin "baserom.dol", 0x3D37E8, 0x4 + +.global lbl_8045498C +lbl_8045498C: +.incbin "baserom.dol", 0x3D37EC, 0x4 + +.global lbl_80454990 +lbl_80454990: +.incbin "baserom.dol", 0x3D37F0, 0x4 + +.global lbl_80454994 +lbl_80454994: +.incbin "baserom.dol", 0x3D37F4, 0x4 + diff --git a/asm/sdata2/d_meter2_info.s b/asm/sdata2/d_meter2_info.s new file mode 100644 index 0000000000..ee812d01ab --- /dev/null +++ b/asm/sdata2/d_meter2_info.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454998 - 0x804549c8 + +.global lbl_80454998 +lbl_80454998: +.incbin "baserom.dol", 0x3D37F8, 0x4 + +.global lbl_8045499C +lbl_8045499C: +.incbin "baserom.dol", 0x3D37FC, 0x4 + +.global lbl_804549A0 +lbl_804549A0: +.incbin "baserom.dol", 0x3D3800, 0x4 + +.global lbl_804549A4 +lbl_804549A4: +.incbin "baserom.dol", 0x3D3804, 0x4 + +.global lbl_804549A8 +lbl_804549A8: +.incbin "baserom.dol", 0x3D3808, 0x4 + +.global lbl_804549AC +lbl_804549AC: +.incbin "baserom.dol", 0x3D380C, 0x4 + +.global lbl_804549B0 +lbl_804549B0: +.incbin "baserom.dol", 0x3D3810, 0x8 + +.global lbl_804549B8 +lbl_804549B8: +.incbin "baserom.dol", 0x3D3818, 0x8 + +.global lbl_804549C0 +lbl_804549C0: +.incbin "baserom.dol", 0x3D3820, 0x8 + diff --git a/asm/sdata2/d_meter_HIO.s b/asm/sdata2/d_meter_HIO.s new file mode 100644 index 0000000000..138f98b092 --- /dev/null +++ b/asm/sdata2/d_meter_HIO.s @@ -0,0 +1,615 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804544e0 - 0x80454748 + +.global lbl_804544E0 +lbl_804544E0: +.incbin "baserom.dol", 0x3D3340, 0x4 + +.global lbl_804544E4 +lbl_804544E4: +.incbin "baserom.dol", 0x3D3344, 0x4 + +.global lbl_804544E8 +lbl_804544E8: +.incbin "baserom.dol", 0x3D3348, 0x4 + +.global lbl_804544EC +lbl_804544EC: +.incbin "baserom.dol", 0x3D334C, 0x4 + +.global lbl_804544F0 +lbl_804544F0: +.incbin "baserom.dol", 0x3D3350, 0x4 + +.global lbl_804544F4 +lbl_804544F4: +.incbin "baserom.dol", 0x3D3354, 0x4 + +.global lbl_804544F8 +lbl_804544F8: +.incbin "baserom.dol", 0x3D3358, 0x4 + +.global lbl_804544FC +lbl_804544FC: +.incbin "baserom.dol", 0x3D335C, 0x4 + +.global lbl_80454500 +lbl_80454500: +.incbin "baserom.dol", 0x3D3360, 0x4 + +.global lbl_80454504 +lbl_80454504: +.incbin "baserom.dol", 0x3D3364, 0x4 + +.global lbl_80454508 +lbl_80454508: +.incbin "baserom.dol", 0x3D3368, 0x4 + +.global lbl_8045450C +lbl_8045450C: +.incbin "baserom.dol", 0x3D336C, 0x4 + +.global lbl_80454510 +lbl_80454510: +.incbin "baserom.dol", 0x3D3370, 0x4 + +.global lbl_80454514 +lbl_80454514: +.incbin "baserom.dol", 0x3D3374, 0x4 + +.global lbl_80454518 +lbl_80454518: +.incbin "baserom.dol", 0x3D3378, 0x4 + +.global lbl_8045451C +lbl_8045451C: +.incbin "baserom.dol", 0x3D337C, 0x4 + +.global lbl_80454520 +lbl_80454520: +.incbin "baserom.dol", 0x3D3380, 0x4 + +.global lbl_80454524 +lbl_80454524: +.incbin "baserom.dol", 0x3D3384, 0x4 + +.global lbl_80454528 +lbl_80454528: +.incbin "baserom.dol", 0x3D3388, 0x4 + +.global lbl_8045452C +lbl_8045452C: +.incbin "baserom.dol", 0x3D338C, 0x4 + +.global lbl_80454530 +lbl_80454530: +.incbin "baserom.dol", 0x3D3390, 0x4 + +.global lbl_80454534 +lbl_80454534: +.incbin "baserom.dol", 0x3D3394, 0x4 + +.global lbl_80454538 +lbl_80454538: +.incbin "baserom.dol", 0x3D3398, 0x4 + +.global lbl_8045453C +lbl_8045453C: +.incbin "baserom.dol", 0x3D339C, 0x4 + +.global lbl_80454540 +lbl_80454540: +.incbin "baserom.dol", 0x3D33A0, 0x4 + +.global lbl_80454544 +lbl_80454544: +.incbin "baserom.dol", 0x3D33A4, 0x4 + +.global lbl_80454548 +lbl_80454548: +.incbin "baserom.dol", 0x3D33A8, 0x4 + +.global lbl_8045454C +lbl_8045454C: +.incbin "baserom.dol", 0x3D33AC, 0x4 + +.global lbl_80454550 +lbl_80454550: +.incbin "baserom.dol", 0x3D33B0, 0x4 + +.global lbl_80454554 +lbl_80454554: +.incbin "baserom.dol", 0x3D33B4, 0x4 + +.global lbl_80454558 +lbl_80454558: +.incbin "baserom.dol", 0x3D33B8, 0x4 + +.global lbl_8045455C +lbl_8045455C: +.incbin "baserom.dol", 0x3D33BC, 0x4 + +.global lbl_80454560 +lbl_80454560: +.incbin "baserom.dol", 0x3D33C0, 0x4 + +.global lbl_80454564 +lbl_80454564: +.incbin "baserom.dol", 0x3D33C4, 0x4 + +.global lbl_80454568 +lbl_80454568: +.incbin "baserom.dol", 0x3D33C8, 0x4 + +.global lbl_8045456C +lbl_8045456C: +.incbin "baserom.dol", 0x3D33CC, 0x4 + +.global lbl_80454570 +lbl_80454570: +.incbin "baserom.dol", 0x3D33D0, 0x4 + +.global lbl_80454574 +lbl_80454574: +.incbin "baserom.dol", 0x3D33D4, 0x4 + +.global lbl_80454578 +lbl_80454578: +.incbin "baserom.dol", 0x3D33D8, 0x4 + +.global lbl_8045457C +lbl_8045457C: +.incbin "baserom.dol", 0x3D33DC, 0x4 + +.global lbl_80454580 +lbl_80454580: +.incbin "baserom.dol", 0x3D33E0, 0x4 + +.global lbl_80454584 +lbl_80454584: +.incbin "baserom.dol", 0x3D33E4, 0x4 + +.global lbl_80454588 +lbl_80454588: +.incbin "baserom.dol", 0x3D33E8, 0x4 + +.global lbl_8045458C +lbl_8045458C: +.incbin "baserom.dol", 0x3D33EC, 0x4 + +.global lbl_80454590 +lbl_80454590: +.incbin "baserom.dol", 0x3D33F0, 0x4 + +.global lbl_80454594 +lbl_80454594: +.incbin "baserom.dol", 0x3D33F4, 0x4 + +.global lbl_80454598 +lbl_80454598: +.incbin "baserom.dol", 0x3D33F8, 0x4 + +.global lbl_8045459C +lbl_8045459C: +.incbin "baserom.dol", 0x3D33FC, 0x4 + +.global lbl_804545A0 +lbl_804545A0: +.incbin "baserom.dol", 0x3D3400, 0x4 + +.global lbl_804545A4 +lbl_804545A4: +.incbin "baserom.dol", 0x3D3404, 0x4 + +.global lbl_804545A8 +lbl_804545A8: +.incbin "baserom.dol", 0x3D3408, 0x4 + +.global lbl_804545AC +lbl_804545AC: +.incbin "baserom.dol", 0x3D340C, 0x4 + +.global lbl_804545B0 +lbl_804545B0: +.incbin "baserom.dol", 0x3D3410, 0x4 + +.global lbl_804545B4 +lbl_804545B4: +.incbin "baserom.dol", 0x3D3414, 0x4 + +.global lbl_804545B8 +lbl_804545B8: +.incbin "baserom.dol", 0x3D3418, 0x4 + +.global lbl_804545BC +lbl_804545BC: +.incbin "baserom.dol", 0x3D341C, 0x4 + +.global lbl_804545C0 +lbl_804545C0: +.incbin "baserom.dol", 0x3D3420, 0x4 + +.global lbl_804545C4 +lbl_804545C4: +.incbin "baserom.dol", 0x3D3424, 0x4 + +.global lbl_804545C8 +lbl_804545C8: +.incbin "baserom.dol", 0x3D3428, 0x4 + +.global lbl_804545CC +lbl_804545CC: +.incbin "baserom.dol", 0x3D342C, 0x4 + +.global lbl_804545D0 +lbl_804545D0: +.incbin "baserom.dol", 0x3D3430, 0x4 + +.global lbl_804545D4 +lbl_804545D4: +.incbin "baserom.dol", 0x3D3434, 0x4 + +.global lbl_804545D8 +lbl_804545D8: +.incbin "baserom.dol", 0x3D3438, 0x4 + +.global lbl_804545DC +lbl_804545DC: +.incbin "baserom.dol", 0x3D343C, 0x4 + +.global lbl_804545E0 +lbl_804545E0: +.incbin "baserom.dol", 0x3D3440, 0x4 + +.global lbl_804545E4 +lbl_804545E4: +.incbin "baserom.dol", 0x3D3444, 0x4 + +.global lbl_804545E8 +lbl_804545E8: +.incbin "baserom.dol", 0x3D3448, 0x4 + +.global lbl_804545EC +lbl_804545EC: +.incbin "baserom.dol", 0x3D344C, 0x4 + +.global lbl_804545F0 +lbl_804545F0: +.incbin "baserom.dol", 0x3D3450, 0x4 + +.global lbl_804545F4 +lbl_804545F4: +.incbin "baserom.dol", 0x3D3454, 0x4 + +.global lbl_804545F8 +lbl_804545F8: +.incbin "baserom.dol", 0x3D3458, 0x4 + +.global lbl_804545FC +lbl_804545FC: +.incbin "baserom.dol", 0x3D345C, 0x4 + +.global lbl_80454600 +lbl_80454600: +.incbin "baserom.dol", 0x3D3460, 0x4 + +.global lbl_80454604 +lbl_80454604: +.incbin "baserom.dol", 0x3D3464, 0x4 + +.global lbl_80454608 +lbl_80454608: +.incbin "baserom.dol", 0x3D3468, 0x4 + +.global lbl_8045460C +lbl_8045460C: +.incbin "baserom.dol", 0x3D346C, 0x4 + +.global lbl_80454610 +lbl_80454610: +.incbin "baserom.dol", 0x3D3470, 0x4 + +.global lbl_80454614 +lbl_80454614: +.incbin "baserom.dol", 0x3D3474, 0x4 + +.global lbl_80454618 +lbl_80454618: +.incbin "baserom.dol", 0x3D3478, 0x4 + +.global lbl_8045461C +lbl_8045461C: +.incbin "baserom.dol", 0x3D347C, 0x4 + +.global lbl_80454620 +lbl_80454620: +.incbin "baserom.dol", 0x3D3480, 0x4 + +.global lbl_80454624 +lbl_80454624: +.incbin "baserom.dol", 0x3D3484, 0x4 + +.global lbl_80454628 +lbl_80454628: +.incbin "baserom.dol", 0x3D3488, 0x4 + +.global lbl_8045462C +lbl_8045462C: +.incbin "baserom.dol", 0x3D348C, 0x4 + +.global lbl_80454630 +lbl_80454630: +.incbin "baserom.dol", 0x3D3490, 0x4 + +.global lbl_80454634 +lbl_80454634: +.incbin "baserom.dol", 0x3D3494, 0x4 + +.global lbl_80454638 +lbl_80454638: +.incbin "baserom.dol", 0x3D3498, 0x4 + +.global lbl_8045463C +lbl_8045463C: +.incbin "baserom.dol", 0x3D349C, 0x4 + +.global lbl_80454640 +lbl_80454640: +.incbin "baserom.dol", 0x3D34A0, 0x4 + +.global lbl_80454644 +lbl_80454644: +.incbin "baserom.dol", 0x3D34A4, 0x4 + +.global lbl_80454648 +lbl_80454648: +.incbin "baserom.dol", 0x3D34A8, 0x4 + +.global lbl_8045464C +lbl_8045464C: +.incbin "baserom.dol", 0x3D34AC, 0x4 + +.global lbl_80454650 +lbl_80454650: +.incbin "baserom.dol", 0x3D34B0, 0x4 + +.global lbl_80454654 +lbl_80454654: +.incbin "baserom.dol", 0x3D34B4, 0x4 + +.global lbl_80454658 +lbl_80454658: +.incbin "baserom.dol", 0x3D34B8, 0x4 + +.global lbl_8045465C +lbl_8045465C: +.incbin "baserom.dol", 0x3D34BC, 0x4 + +.global lbl_80454660 +lbl_80454660: +.incbin "baserom.dol", 0x3D34C0, 0x4 + +.global lbl_80454664 +lbl_80454664: +.incbin "baserom.dol", 0x3D34C4, 0x4 + +.global lbl_80454668 +lbl_80454668: +.incbin "baserom.dol", 0x3D34C8, 0x4 + +.global lbl_8045466C +lbl_8045466C: +.incbin "baserom.dol", 0x3D34CC, 0x4 + +.global lbl_80454670 +lbl_80454670: +.incbin "baserom.dol", 0x3D34D0, 0x4 + +.global lbl_80454674 +lbl_80454674: +.incbin "baserom.dol", 0x3D34D4, 0x4 + +.global lbl_80454678 +lbl_80454678: +.incbin "baserom.dol", 0x3D34D8, 0x4 + +.global lbl_8045467C +lbl_8045467C: +.incbin "baserom.dol", 0x3D34DC, 0x4 + +.global lbl_80454680 +lbl_80454680: +.incbin "baserom.dol", 0x3D34E0, 0x4 + +.global lbl_80454684 +lbl_80454684: +.incbin "baserom.dol", 0x3D34E4, 0x4 + +.global lbl_80454688 +lbl_80454688: +.incbin "baserom.dol", 0x3D34E8, 0x4 + +.global lbl_8045468C +lbl_8045468C: +.incbin "baserom.dol", 0x3D34EC, 0x4 + +.global lbl_80454690 +lbl_80454690: +.incbin "baserom.dol", 0x3D34F0, 0x4 + +.global lbl_80454694 +lbl_80454694: +.incbin "baserom.dol", 0x3D34F4, 0x4 + +.global lbl_80454698 +lbl_80454698: +.incbin "baserom.dol", 0x3D34F8, 0x4 + +.global lbl_8045469C +lbl_8045469C: +.incbin "baserom.dol", 0x3D34FC, 0x4 + +.global lbl_804546A0 +lbl_804546A0: +.incbin "baserom.dol", 0x3D3500, 0x4 + +.global lbl_804546A4 +lbl_804546A4: +.incbin "baserom.dol", 0x3D3504, 0x4 + +.global lbl_804546A8 +lbl_804546A8: +.incbin "baserom.dol", 0x3D3508, 0x4 + +.global lbl_804546AC +lbl_804546AC: +.incbin "baserom.dol", 0x3D350C, 0x4 + +.global lbl_804546B0 +lbl_804546B0: +.incbin "baserom.dol", 0x3D3510, 0x4 + +.global lbl_804546B4 +lbl_804546B4: +.incbin "baserom.dol", 0x3D3514, 0x4 + +.global lbl_804546B8 +lbl_804546B8: +.incbin "baserom.dol", 0x3D3518, 0x4 + +.global lbl_804546BC +lbl_804546BC: +.incbin "baserom.dol", 0x3D351C, 0x4 + +.global lbl_804546C0 +lbl_804546C0: +.incbin "baserom.dol", 0x3D3520, 0x4 + +.global lbl_804546C4 +lbl_804546C4: +.incbin "baserom.dol", 0x3D3524, 0x4 + +.global lbl_804546C8 +lbl_804546C8: +.incbin "baserom.dol", 0x3D3528, 0x4 + +.global lbl_804546CC +lbl_804546CC: +.incbin "baserom.dol", 0x3D352C, 0x4 + +.global lbl_804546D0 +lbl_804546D0: +.incbin "baserom.dol", 0x3D3530, 0x4 + +.global lbl_804546D4 +lbl_804546D4: +.incbin "baserom.dol", 0x3D3534, 0x4 + +.global lbl_804546D8 +lbl_804546D8: +.incbin "baserom.dol", 0x3D3538, 0x4 + +.global lbl_804546DC +lbl_804546DC: +.incbin "baserom.dol", 0x3D353C, 0x4 + +.global lbl_804546E0 +lbl_804546E0: +.incbin "baserom.dol", 0x3D3540, 0x4 + +.global lbl_804546E4 +lbl_804546E4: +.incbin "baserom.dol", 0x3D3544, 0x4 + +.global lbl_804546E8 +lbl_804546E8: +.incbin "baserom.dol", 0x3D3548, 0x4 + +.global lbl_804546EC +lbl_804546EC: +.incbin "baserom.dol", 0x3D354C, 0x4 + +.global lbl_804546F0 +lbl_804546F0: +.incbin "baserom.dol", 0x3D3550, 0x4 + +.global lbl_804546F4 +lbl_804546F4: +.incbin "baserom.dol", 0x3D3554, 0x4 + +.global lbl_804546F8 +lbl_804546F8: +.incbin "baserom.dol", 0x3D3558, 0x4 + +.global lbl_804546FC +lbl_804546FC: +.incbin "baserom.dol", 0x3D355C, 0x4 + +.global lbl_80454700 +lbl_80454700: +.incbin "baserom.dol", 0x3D3560, 0x4 + +.global lbl_80454704 +lbl_80454704: +.incbin "baserom.dol", 0x3D3564, 0x4 + +.global lbl_80454708 +lbl_80454708: +.incbin "baserom.dol", 0x3D3568, 0x4 + +.global lbl_8045470C +lbl_8045470C: +.incbin "baserom.dol", 0x3D356C, 0x4 + +.global lbl_80454710 +lbl_80454710: +.incbin "baserom.dol", 0x3D3570, 0x4 + +.global lbl_80454714 +lbl_80454714: +.incbin "baserom.dol", 0x3D3574, 0x4 + +.global lbl_80454718 +lbl_80454718: +.incbin "baserom.dol", 0x3D3578, 0x4 + +.global lbl_8045471C +lbl_8045471C: +.incbin "baserom.dol", 0x3D357C, 0x4 + +.global lbl_80454720 +lbl_80454720: +.incbin "baserom.dol", 0x3D3580, 0x4 + +.global lbl_80454724 +lbl_80454724: +.incbin "baserom.dol", 0x3D3584, 0x4 + +.global lbl_80454728 +lbl_80454728: +.incbin "baserom.dol", 0x3D3588, 0x4 + +.global lbl_8045472C +lbl_8045472C: +.incbin "baserom.dol", 0x3D358C, 0x4 + +.global lbl_80454730 +lbl_80454730: +.incbin "baserom.dol", 0x3D3590, 0x4 + +.global lbl_80454734 +lbl_80454734: +.incbin "baserom.dol", 0x3D3594, 0x4 + +.global lbl_80454738 +lbl_80454738: +.incbin "baserom.dol", 0x3D3598, 0x4 + +.global lbl_8045473C +lbl_8045473C: +.incbin "baserom.dol", 0x3D359C, 0x4 + +.global lbl_80454740 +lbl_80454740: +.incbin "baserom.dol", 0x3D35A0, 0x8 + diff --git a/asm/sdata2/d_meter_button.s b/asm/sdata2/d_meter_button.s new file mode 100644 index 0000000000..e08357cc3b --- /dev/null +++ b/asm/sdata2/d_meter_button.s @@ -0,0 +1,99 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454748 - 0x804547b0 + +.global lbl_80454748 +lbl_80454748: +.incbin "baserom.dol", 0x3D35A8, 0x4 + +.global lbl_8045474C +lbl_8045474C: +.incbin "baserom.dol", 0x3D35AC, 0x4 + +.global lbl_80454750 +lbl_80454750: +.incbin "baserom.dol", 0x3D35B0, 0x4 + +.global lbl_80454754 +lbl_80454754: +.incbin "baserom.dol", 0x3D35B4, 0x4 + +.global lbl_80454758 +lbl_80454758: +.incbin "baserom.dol", 0x3D35B8, 0x4 + +.global lbl_8045475C +lbl_8045475C: +.incbin "baserom.dol", 0x3D35BC, 0x4 + +.global lbl_80454760 +lbl_80454760: +.incbin "baserom.dol", 0x3D35C0, 0x8 + +.global lbl_80454768 +lbl_80454768: +.incbin "baserom.dol", 0x3D35C8, 0x8 + +.global lbl_80454770 +lbl_80454770: +.incbin "baserom.dol", 0x3D35D0, 0x4 + +.global lbl_80454774 +lbl_80454774: +.incbin "baserom.dol", 0x3D35D4, 0x4 + +.global lbl_80454778 +lbl_80454778: +.incbin "baserom.dol", 0x3D35D8, 0x4 + +.global lbl_8045477C +lbl_8045477C: +.incbin "baserom.dol", 0x3D35DC, 0x4 + +.global lbl_80454780 +lbl_80454780: +.incbin "baserom.dol", 0x3D35E0, 0x4 + +.global lbl_80454784 +lbl_80454784: +.incbin "baserom.dol", 0x3D35E4, 0x4 + +.global lbl_80454788 +lbl_80454788: +.incbin "baserom.dol", 0x3D35E8, 0x4 + +.global lbl_8045478C +lbl_8045478C: +.incbin "baserom.dol", 0x3D35EC, 0x4 + +.global lbl_80454790 +lbl_80454790: +.incbin "baserom.dol", 0x3D35F0, 0x4 + +.global lbl_80454794 +lbl_80454794: +.incbin "baserom.dol", 0x3D35F4, 0x4 + +.global lbl_80454798 +lbl_80454798: +.incbin "baserom.dol", 0x3D35F8, 0x4 + +.global lbl_8045479C +lbl_8045479C: +.incbin "baserom.dol", 0x3D35FC, 0x4 + +.global lbl_804547A0 +lbl_804547A0: +.incbin "baserom.dol", 0x3D3600, 0x4 + +.global lbl_804547A4 +lbl_804547A4: +.incbin "baserom.dol", 0x3D3604, 0x4 + +.global lbl_804547A8 +lbl_804547A8: +.incbin "baserom.dol", 0x3D3608, 0x4 + +.global lbl_804547AC +lbl_804547AC: +.incbin "baserom.dol", 0x3D360C, 0x4 + diff --git a/asm/sdata2/d_meter_haihai.s b/asm/sdata2/d_meter_haihai.s new file mode 100644 index 0000000000..c57581e23d --- /dev/null +++ b/asm/sdata2/d_meter_haihai.s @@ -0,0 +1,75 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804547b0 - 0x80454800 + +.global lbl_804547B0 +lbl_804547B0: +.incbin "baserom.dol", 0x3D3610, 0x4 + +.global lbl_804547B4 +lbl_804547B4: +.incbin "baserom.dol", 0x3D3614, 0x4 + +.global lbl_804547B8 +lbl_804547B8: +.incbin "baserom.dol", 0x3D3618, 0x4 + +.global lbl_804547BC +lbl_804547BC: +.incbin "baserom.dol", 0x3D361C, 0x4 + +.global lbl_804547C0 +lbl_804547C0: +.incbin "baserom.dol", 0x3D3620, 0x4 + +.global lbl_804547C4 +lbl_804547C4: +.incbin "baserom.dol", 0x3D3624, 0x4 + +.global lbl_804547C8 +lbl_804547C8: +.incbin "baserom.dol", 0x3D3628, 0x4 + +.global lbl_804547CC +lbl_804547CC: +.incbin "baserom.dol", 0x3D362C, 0x4 + +.global lbl_804547D0 +lbl_804547D0: +.incbin "baserom.dol", 0x3D3630, 0x4 + +.global lbl_804547D4 +lbl_804547D4: +.incbin "baserom.dol", 0x3D3634, 0x4 + +.global lbl_804547D8 +lbl_804547D8: +.incbin "baserom.dol", 0x3D3638, 0x4 + +.global lbl_804547DC +lbl_804547DC: +.incbin "baserom.dol", 0x3D363C, 0x4 + +.global lbl_804547E0 +lbl_804547E0: +.incbin "baserom.dol", 0x3D3640, 0x4 + +.global lbl_804547E4 +lbl_804547E4: +.incbin "baserom.dol", 0x3D3644, 0x4 + +.global lbl_804547E8 +lbl_804547E8: +.incbin "baserom.dol", 0x3D3648, 0x4 + +.global lbl_804547EC +lbl_804547EC: +.incbin "baserom.dol", 0x3D364C, 0x4 + +.global lbl_804547F0 +lbl_804547F0: +.incbin "baserom.dol", 0x3D3650, 0x8 + +.global lbl_804547F8 +lbl_804547F8: +.incbin "baserom.dol", 0x3D3658, 0x8 + diff --git a/asm/sdata2/d_meter_hakusha.s b/asm/sdata2/d_meter_hakusha.s new file mode 100644 index 0000000000..e75838b71d --- /dev/null +++ b/asm/sdata2/d_meter_hakusha.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454800 - 0x80454820 + +.global lbl_80454800 +lbl_80454800: +.incbin "baserom.dol", 0x3D3660, 0x4 + +.global lbl_80454804 +lbl_80454804: +.incbin "baserom.dol", 0x3D3664, 0x4 + +.global lbl_80454808 +lbl_80454808: +.incbin "baserom.dol", 0x3D3668, 0x4 + +.global lbl_8045480C +lbl_8045480C: +.incbin "baserom.dol", 0x3D366C, 0x4 + +.global lbl_80454810 +lbl_80454810: +.incbin "baserom.dol", 0x3D3670, 0x4 + +.global lbl_80454814 +lbl_80454814: +.incbin "baserom.dol", 0x3D3674, 0x4 + +.global lbl_80454818 +lbl_80454818: +.incbin "baserom.dol", 0x3D3678, 0x8 + diff --git a/asm/sdata2/d_meter_map.s b/asm/sdata2/d_meter_map.s new file mode 100644 index 0000000000..c4a2ae2bcf --- /dev/null +++ b/asm/sdata2/d_meter_map.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454820 - 0x80454848 + +.global lbl_80454820 +lbl_80454820: +.incbin "baserom.dol", 0x3D3680, 0x8 + +.global lbl_80454828 +lbl_80454828: +.incbin "baserom.dol", 0x3D3688, 0x8 + +.global lbl_80454830 +lbl_80454830: +.incbin "baserom.dol", 0x3D3690, 0x4 + +.global lbl_80454834 +lbl_80454834: +.incbin "baserom.dol", 0x3D3694, 0x4 + +.global lbl_80454838 +lbl_80454838: +.incbin "baserom.dol", 0x3D3698, 0x8 + +.global lbl_80454840 +lbl_80454840: +.incbin "baserom.dol", 0x3D36A0, 0x4 + +.global lbl_80454844 +lbl_80454844: +.incbin "baserom.dol", 0x3D36A4, 0x4 + diff --git a/asm/sdata2/d_meter_string.s b/asm/sdata2/d_meter_string.s new file mode 100644 index 0000000000..d5dca02e5d --- /dev/null +++ b/asm/sdata2/d_meter_string.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454848 - 0x80454880 + +.global lbl_80454848 +lbl_80454848: +.incbin "baserom.dol", 0x3D36A8, 0x4 + +.global lbl_8045484C +lbl_8045484C: +.incbin "baserom.dol", 0x3D36AC, 0x4 + +.global lbl_80454850 +lbl_80454850: +.incbin "baserom.dol", 0x3D36B0, 0x4 + +.global lbl_80454854 +lbl_80454854: +.incbin "baserom.dol", 0x3D36B4, 0x4 + +.global lbl_80454858 +lbl_80454858: +.incbin "baserom.dol", 0x3D36B8, 0x4 + +.global lbl_8045485C +lbl_8045485C: +.incbin "baserom.dol", 0x3D36BC, 0x4 + +.global lbl_80454860 +lbl_80454860: +.incbin "baserom.dol", 0x3D36C0, 0x4 + +.global lbl_80454864 +lbl_80454864: +.incbin "baserom.dol", 0x3D36C4, 0x4 + +.global lbl_80454868 +lbl_80454868: +.incbin "baserom.dol", 0x3D36C8, 0x8 + +.global lbl_80454870 +lbl_80454870: +.incbin "baserom.dol", 0x3D36D0, 0x8 + +.global lbl_80454878 +lbl_80454878: +.incbin "baserom.dol", 0x3D36D8, 0x4 + +.global lbl_8045487C +lbl_8045487C: +.incbin "baserom.dol", 0x3D36DC, 0x4 + diff --git a/asm/sdata2/d_msg_class.s b/asm/sdata2/d_msg_class.s new file mode 100644 index 0000000000..83ae2f26bc --- /dev/null +++ b/asm/sdata2/d_msg_class.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454a58 - 0x80454aa0 + +.global lbl_80454A58 +lbl_80454A58: +.incbin "baserom.dol", 0x3D38B8, 0x4 + +.global lbl_80454A5C +lbl_80454A5C: +.incbin "baserom.dol", 0x3D38BC, 0x4 + +.global lbl_80454A60 +lbl_80454A60: +.incbin "baserom.dol", 0x3D38C0, 0x4 + +.global lbl_80454A64 +lbl_80454A64: +.incbin "baserom.dol", 0x3D38C4, 0x4 + +.global lbl_80454A68 +lbl_80454A68: +.incbin "baserom.dol", 0x3D38C8, 0x8 + +.global lbl_80454A70 +lbl_80454A70: +.incbin "baserom.dol", 0x3D38D0, 0x8 + +.global lbl_80454A78 +lbl_80454A78: +.incbin "baserom.dol", 0x3D38D8, 0x4 + +.global lbl_80454A7C +lbl_80454A7C: +.incbin "baserom.dol", 0x3D38DC, 0x4 + +.global lbl_80454A80 +lbl_80454A80: +.incbin "baserom.dol", 0x3D38E0, 0x8 + +.global lbl_80454A88 +lbl_80454A88: +.incbin "baserom.dol", 0x3D38E8, 0x4 + +.global lbl_80454A8C +lbl_80454A8C: +.incbin "baserom.dol", 0x3D38EC, 0x4 + +.global lbl_80454A90 +lbl_80454A90: +.incbin "baserom.dol", 0x3D38F0, 0x4 + +.global lbl_80454A94 +lbl_80454A94: +.incbin "baserom.dol", 0x3D38F4, 0x4 + +.global lbl_80454A98 +lbl_80454A98: +.incbin "baserom.dol", 0x3D38F8, 0x8 + diff --git a/asm/sdata2/d_msg_flow.s b/asm/sdata2/d_msg_flow.s new file mode 100644 index 0000000000..3cd6b1959c --- /dev/null +++ b/asm/sdata2/d_msg_flow.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454d90 - 0x80454db0 + +.global lbl_80454D90 +lbl_80454D90: +.incbin "baserom.dol", 0x3D3BF0, 0x8 + +.global lbl_80454D98 +lbl_80454D98: +.incbin "baserom.dol", 0x3D3BF8, 0x8 + +.global lbl_80454DA0 +lbl_80454DA0: +.incbin "baserom.dol", 0x3D3C00, 0x8 + +.global lbl_80454DA8 +lbl_80454DA8: +.incbin "baserom.dol", 0x3D3C08, 0x4 + +.global lbl_80454DAC +lbl_80454DAC: +.incbin "baserom.dol", 0x3D3C0C, 0x4 + diff --git a/asm/sdata2/d_msg_object.s b/asm/sdata2/d_msg_object.s new file mode 100644 index 0000000000..b14dce7914 --- /dev/null +++ b/asm/sdata2/d_msg_object.s @@ -0,0 +1,151 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454aa0 - 0x80454b40 + +.global lbl_80454AA0 +lbl_80454AA0: +.incbin "baserom.dol", 0x3D3900, 0x4 + +.global lbl_80454AA4 +lbl_80454AA4: +.incbin "baserom.dol", 0x3D3904, 0x4 + +.global lbl_80454AA8 +lbl_80454AA8: +.incbin "baserom.dol", 0x3D3908, 0x4 + +.global lbl_80454AAC +lbl_80454AAC: +.incbin "baserom.dol", 0x3D390C, 0x4 + +.global lbl_80454AB0 +lbl_80454AB0: +.incbin "baserom.dol", 0x3D3910, 0x4 + +.global lbl_80454AB4 +lbl_80454AB4: +.incbin "baserom.dol", 0x3D3914, 0x4 + +.global lbl_80454AB8 +lbl_80454AB8: +.incbin "baserom.dol", 0x3D3918, 0x4 + +.global lbl_80454ABC +lbl_80454ABC: +.incbin "baserom.dol", 0x3D391C, 0x4 + +.global lbl_80454AC0 +lbl_80454AC0: +.incbin "baserom.dol", 0x3D3920, 0x4 + +.global lbl_80454AC4 +lbl_80454AC4: +.incbin "baserom.dol", 0x3D3924, 0x4 + +.global lbl_80454AC8 +lbl_80454AC8: +.incbin "baserom.dol", 0x3D3928, 0x4 + +.global lbl_80454ACC +lbl_80454ACC: +.incbin "baserom.dol", 0x3D392C, 0x4 + +.global lbl_80454AD0 +lbl_80454AD0: +.incbin "baserom.dol", 0x3D3930, 0x4 + +.global lbl_80454AD4 +lbl_80454AD4: +.incbin "baserom.dol", 0x3D3934, 0x4 + +.global lbl_80454AD8 +lbl_80454AD8: +.incbin "baserom.dol", 0x3D3938, 0x4 + +.global lbl_80454ADC +lbl_80454ADC: +.incbin "baserom.dol", 0x3D393C, 0x4 + +.global lbl_80454AE0 +lbl_80454AE0: +.incbin "baserom.dol", 0x3D3940, 0x4 + +.global lbl_80454AE4 +lbl_80454AE4: +.incbin "baserom.dol", 0x3D3944, 0x4 + +.global lbl_80454AE8 +lbl_80454AE8: +.incbin "baserom.dol", 0x3D3948, 0x4 + +.global lbl_80454AEC +lbl_80454AEC: +.incbin "baserom.dol", 0x3D394C, 0x4 + +.global lbl_80454AF0 +lbl_80454AF0: +.incbin "baserom.dol", 0x3D3950, 0x4 + +.global lbl_80454AF4 +lbl_80454AF4: +.incbin "baserom.dol", 0x3D3954, 0x4 + +.global lbl_80454AF8 +lbl_80454AF8: +.incbin "baserom.dol", 0x3D3958, 0x4 + +.global lbl_80454AFC +lbl_80454AFC: +.incbin "baserom.dol", 0x3D395C, 0x4 + +.global lbl_80454B00 +lbl_80454B00: +.incbin "baserom.dol", 0x3D3960, 0x4 + +.global lbl_80454B04 +lbl_80454B04: +.incbin "baserom.dol", 0x3D3964, 0x4 + +.global lbl_80454B08 +lbl_80454B08: +.incbin "baserom.dol", 0x3D3968, 0x4 + +.global lbl_80454B0C +lbl_80454B0C: +.incbin "baserom.dol", 0x3D396C, 0x4 + +.global lbl_80454B10 +lbl_80454B10: +.incbin "baserom.dol", 0x3D3970, 0x4 + +.global lbl_80454B14 +lbl_80454B14: +.incbin "baserom.dol", 0x3D3974, 0x4 + +.global lbl_80454B18 +lbl_80454B18: +.incbin "baserom.dol", 0x3D3978, 0x8 + +.global lbl_80454B20 +lbl_80454B20: +.incbin "baserom.dol", 0x3D3980, 0x8 + +.global lbl_80454B28 +lbl_80454B28: +.incbin "baserom.dol", 0x3D3988, 0x4 + +.global lbl_80454B2C +lbl_80454B2C: +.incbin "baserom.dol", 0x3D398C, 0x4 + +.global lbl_80454B30 +lbl_80454B30: +.incbin "baserom.dol", 0x3D3990, 0x4 + +.global lbl_80454B34 +lbl_80454B34: +.incbin "baserom.dol", 0x3D3994, 0x4 + +.global lbl_80454B38 +lbl_80454B38: +.incbin "baserom.dol", 0x3D3998, 0x8 + diff --git a/asm/sdata2/d_msg_out_font.s b/asm/sdata2/d_msg_out_font.s new file mode 100644 index 0000000000..4dc7339a1e --- /dev/null +++ b/asm/sdata2/d_msg_out_font.s @@ -0,0 +1,67 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454a10 - 0x80454a58 + +.global lbl_80454A10 +lbl_80454A10: +.incbin "baserom.dol", 0x3D3870, 0x4 + +.global lbl_80454A14 +lbl_80454A14: +.incbin "baserom.dol", 0x3D3874, 0x4 + +.global lbl_80454A18 +lbl_80454A18: +.incbin "baserom.dol", 0x3D3878, 0x8 + +.global lbl_80454A20 +lbl_80454A20: +.incbin "baserom.dol", 0x3D3880, 0x4 + +.global lbl_80454A24 +lbl_80454A24: +.incbin "baserom.dol", 0x3D3884, 0x4 + +.global lbl_80454A28 +lbl_80454A28: +.incbin "baserom.dol", 0x3D3888, 0x4 + +.global lbl_80454A2C +lbl_80454A2C: +.incbin "baserom.dol", 0x3D388C, 0x4 + +.global lbl_80454A30 +lbl_80454A30: +.incbin "baserom.dol", 0x3D3890, 0x4 + +.global lbl_80454A34 +lbl_80454A34: +.incbin "baserom.dol", 0x3D3894, 0x4 + +.global lbl_80454A38 +lbl_80454A38: +.incbin "baserom.dol", 0x3D3898, 0x4 + +.global lbl_80454A3C +lbl_80454A3C: +.incbin "baserom.dol", 0x3D389C, 0x4 + +.global lbl_80454A40 +lbl_80454A40: +.incbin "baserom.dol", 0x3D38A0, 0x4 + +.global lbl_80454A44 +lbl_80454A44: +.incbin "baserom.dol", 0x3D38A4, 0x4 + +.global lbl_80454A48 +lbl_80454A48: +.incbin "baserom.dol", 0x3D38A8, 0x4 + +.global lbl_80454A4C +lbl_80454A4C: +.incbin "baserom.dol", 0x3D38AC, 0x4 + +.global lbl_80454A50 +lbl_80454A50: +.incbin "baserom.dol", 0x3D38B0, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_3select.s b/asm/sdata2/d_msg_scrn_3select.s new file mode 100644 index 0000000000..47005a4828 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_3select.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454b58 - 0x80454b98 + +.global lbl_80454B58 +lbl_80454B58: +.incbin "baserom.dol", 0x3D39B8, 0x4 + +.global lbl_80454B5C +lbl_80454B5C: +.incbin "baserom.dol", 0x3D39BC, 0x4 + +.global lbl_80454B60 +lbl_80454B60: +.incbin "baserom.dol", 0x3D39C0, 0x4 + +.global lbl_80454B64 +lbl_80454B64: +.incbin "baserom.dol", 0x3D39C4, 0x4 + +.global lbl_80454B68 +lbl_80454B68: +.incbin "baserom.dol", 0x3D39C8, 0x4 + +.global lbl_80454B6C +lbl_80454B6C: +.incbin "baserom.dol", 0x3D39CC, 0x4 + +.global lbl_80454B70 +lbl_80454B70: +.incbin "baserom.dol", 0x3D39D0, 0x4 + +.global lbl_80454B74 +lbl_80454B74: +.incbin "baserom.dol", 0x3D39D4, 0x4 + +.global lbl_80454B78 +lbl_80454B78: +.incbin "baserom.dol", 0x3D39D8, 0x8 + +.global lbl_80454B80 +lbl_80454B80: +.incbin "baserom.dol", 0x3D39E0, 0x4 + +.global lbl_80454B84 +lbl_80454B84: +.incbin "baserom.dol", 0x3D39E4, 0x4 + +.global lbl_80454B88 +lbl_80454B88: +.incbin "baserom.dol", 0x3D39E8, 0x4 + +.global lbl_80454B8C +lbl_80454B8C: +.incbin "baserom.dol", 0x3D39EC, 0x4 + +.global lbl_80454B90 +lbl_80454B90: +.incbin "baserom.dol", 0x3D39F0, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_arrow.s b/asm/sdata2/d_msg_scrn_arrow.s new file mode 100644 index 0000000000..5739cfa0cd --- /dev/null +++ b/asm/sdata2/d_msg_scrn_arrow.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454b98 - 0x80454ba8 + +.global lbl_80454B98 +lbl_80454B98: +.incbin "baserom.dol", 0x3D39F8, 0x4 + +.global lbl_80454B9C +lbl_80454B9C: +.incbin "baserom.dol", 0x3D39FC, 0x4 + +.global lbl_80454BA0 +lbl_80454BA0: +.incbin "baserom.dol", 0x3D3A00, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_base.s b/asm/sdata2/d_msg_scrn_base.s new file mode 100644 index 0000000000..96e6002f3a --- /dev/null +++ b/asm/sdata2/d_msg_scrn_base.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454ba8 - 0x80454bb0 + +.global lbl_80454BA8 +lbl_80454BA8: +.incbin "baserom.dol", 0x3D3A08, 0x4 + +.global lbl_80454BAC +lbl_80454BAC: +.incbin "baserom.dol", 0x3D3A0C, 0x4 + diff --git a/asm/sdata2/d_msg_scrn_boss.s b/asm/sdata2/d_msg_scrn_boss.s new file mode 100644 index 0000000000..fb27dc8c64 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_boss.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454bb0 - 0x80454bb8 + +.global lbl_80454BB0 +lbl_80454BB0: +.incbin "baserom.dol", 0x3D3A10, 0x4 + +.global lbl_80454BB4 +lbl_80454BB4: +.incbin "baserom.dol", 0x3D3A14, 0x4 + diff --git a/asm/sdata2/d_msg_scrn_explain.s b/asm/sdata2/d_msg_scrn_explain.s new file mode 100644 index 0000000000..5d2f189203 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_explain.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454bb8 - 0x80454bf8 + +.global lbl_80454BB8 +lbl_80454BB8: +.incbin "baserom.dol", 0x3D3A18, 0x4 + +.global lbl_80454BBC +lbl_80454BBC: +.incbin "baserom.dol", 0x3D3A1C, 0x4 + +.global lbl_80454BC0 +lbl_80454BC0: +.incbin "baserom.dol", 0x3D3A20, 0x4 + +.global lbl_80454BC4 +lbl_80454BC4: +.incbin "baserom.dol", 0x3D3A24, 0x4 + +.global lbl_80454BC8 +lbl_80454BC8: +.incbin "baserom.dol", 0x3D3A28, 0x4 + +.global lbl_80454BCC +lbl_80454BCC: +.incbin "baserom.dol", 0x3D3A2C, 0x4 + +.global lbl_80454BD0 +lbl_80454BD0: +.incbin "baserom.dol", 0x3D3A30, 0x4 + +.global lbl_80454BD4 +lbl_80454BD4: +.incbin "baserom.dol", 0x3D3A34, 0x4 + +.global lbl_80454BD8 +lbl_80454BD8: +.incbin "baserom.dol", 0x3D3A38, 0x4 + +.global lbl_80454BDC +lbl_80454BDC: +.incbin "baserom.dol", 0x3D3A3C, 0x4 + +.global lbl_80454BE0 +lbl_80454BE0: +.incbin "baserom.dol", 0x3D3A40, 0x4 + +.global lbl_80454BE4 +lbl_80454BE4: +.incbin "baserom.dol", 0x3D3A44, 0x4 + +.global lbl_80454BE8 +lbl_80454BE8: +.incbin "baserom.dol", 0x3D3A48, 0x4 + +.global lbl_80454BEC +lbl_80454BEC: +.incbin "baserom.dol", 0x3D3A4C, 0x4 + +.global lbl_80454BF0 +lbl_80454BF0: +.incbin "baserom.dol", 0x3D3A50, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_howl.s b/asm/sdata2/d_msg_scrn_howl.s new file mode 100644 index 0000000000..25d949fb5f --- /dev/null +++ b/asm/sdata2/d_msg_scrn_howl.s @@ -0,0 +1,83 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454c50 - 0x80454cb0 + +.global lbl_80454C50 +lbl_80454C50: +.incbin "baserom.dol", 0x3D3AB0, 0x4 + +.global lbl_80454C54 +lbl_80454C54: +.incbin "baserom.dol", 0x3D3AB4, 0x4 + +.global lbl_80454C58 +lbl_80454C58: +.incbin "baserom.dol", 0x3D3AB8, 0x4 + +.global lbl_80454C5C +lbl_80454C5C: +.incbin "baserom.dol", 0x3D3ABC, 0x4 + +.global lbl_80454C60 +lbl_80454C60: +.incbin "baserom.dol", 0x3D3AC0, 0x8 + +.global lbl_80454C68 +lbl_80454C68: +.incbin "baserom.dol", 0x3D3AC8, 0x8 + +.global lbl_80454C70 +lbl_80454C70: +.incbin "baserom.dol", 0x3D3AD0, 0x4 + +.global lbl_80454C74 +lbl_80454C74: +.incbin "baserom.dol", 0x3D3AD4, 0x4 + +.global lbl_80454C78 +lbl_80454C78: +.incbin "baserom.dol", 0x3D3AD8, 0x8 + +.global lbl_80454C80 +lbl_80454C80: +.incbin "baserom.dol", 0x3D3AE0, 0x8 + +.global lbl_80454C88 +lbl_80454C88: +.incbin "baserom.dol", 0x3D3AE8, 0x4 + +.global lbl_80454C8C +lbl_80454C8C: +.incbin "baserom.dol", 0x3D3AEC, 0x4 + +.global lbl_80454C90 +lbl_80454C90: +.incbin "baserom.dol", 0x3D3AF0, 0x4 + +.global lbl_80454C94 +lbl_80454C94: +.incbin "baserom.dol", 0x3D3AF4, 0x4 + +.global lbl_80454C98 +lbl_80454C98: +.incbin "baserom.dol", 0x3D3AF8, 0x4 + +.global lbl_80454C9C +lbl_80454C9C: +.incbin "baserom.dol", 0x3D3AFC, 0x4 + +.global lbl_80454CA0 +lbl_80454CA0: +.incbin "baserom.dol", 0x3D3B00, 0x4 + +.global lbl_80454CA4 +lbl_80454CA4: +.incbin "baserom.dol", 0x3D3B04, 0x4 + +.global lbl_80454CA8 +lbl_80454CA8: +.incbin "baserom.dol", 0x3D3B08, 0x4 + +.global lbl_80454CAC +lbl_80454CAC: +.incbin "baserom.dol", 0x3D3B0C, 0x4 + diff --git a/asm/sdata2/d_msg_scrn_item.s b/asm/sdata2/d_msg_scrn_item.s new file mode 100644 index 0000000000..a9f3e4d243 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_item.s @@ -0,0 +1,83 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454bf8 - 0x80454c50 + +.global lbl_80454BF8 +lbl_80454BF8: +.incbin "baserom.dol", 0x3D3A58, 0x4 + +.global lbl_80454BFC +lbl_80454BFC: +.incbin "baserom.dol", 0x3D3A5C, 0x4 + +.global lbl_80454C00 +lbl_80454C00: +.incbin "baserom.dol", 0x3D3A60, 0x4 + +.global lbl_80454C04 +lbl_80454C04: +.incbin "baserom.dol", 0x3D3A64, 0x4 + +.global lbl_80454C08 +lbl_80454C08: +.incbin "baserom.dol", 0x3D3A68, 0x4 + +.global lbl_80454C0C +lbl_80454C0C: +.incbin "baserom.dol", 0x3D3A6C, 0x4 + +.global lbl_80454C10 +lbl_80454C10: +.incbin "baserom.dol", 0x3D3A70, 0x8 + +.global lbl_80454C18 +lbl_80454C18: +.incbin "baserom.dol", 0x3D3A78, 0x8 + +.global lbl_80454C20 +lbl_80454C20: +.incbin "baserom.dol", 0x3D3A80, 0x4 + +.global lbl_80454C24 +lbl_80454C24: +.incbin "baserom.dol", 0x3D3A84, 0x4 + +.global lbl_80454C28 +lbl_80454C28: +.incbin "baserom.dol", 0x3D3A88, 0x4 + +.global lbl_80454C2C +lbl_80454C2C: +.incbin "baserom.dol", 0x3D3A8C, 0x4 + +.global lbl_80454C30 +lbl_80454C30: +.incbin "baserom.dol", 0x3D3A90, 0x4 + +.global lbl_80454C34 +lbl_80454C34: +.incbin "baserom.dol", 0x3D3A94, 0x4 + +.global lbl_80454C38 +lbl_80454C38: +.incbin "baserom.dol", 0x3D3A98, 0x4 + +.global lbl_80454C3C +lbl_80454C3C: +.incbin "baserom.dol", 0x3D3A9C, 0x4 + +.global lbl_80454C40 +lbl_80454C40: +.incbin "baserom.dol", 0x3D3AA0, 0x4 + +.global lbl_80454C44 +lbl_80454C44: +.incbin "baserom.dol", 0x3D3AA4, 0x4 + +.global lbl_80454C48 +lbl_80454C48: +.incbin "baserom.dol", 0x3D3AA8, 0x4 + +.global lbl_80454C4C +lbl_80454C4C: +.incbin "baserom.dol", 0x3D3AAC, 0x4 + diff --git a/asm/sdata2/d_msg_scrn_jimaku.s b/asm/sdata2/d_msg_scrn_jimaku.s new file mode 100644 index 0000000000..a475120d1b --- /dev/null +++ b/asm/sdata2/d_msg_scrn_jimaku.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454cb0 - 0x80454cc0 + +.global lbl_80454CB0 +lbl_80454CB0: +.incbin "baserom.dol", 0x3D3B10, 0x4 + +.global lbl_80454CB4 +lbl_80454CB4: +.incbin "baserom.dol", 0x3D3B14, 0x4 + +.global lbl_80454CB8 +lbl_80454CB8: +.incbin "baserom.dol", 0x3D3B18, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_kanban.s b/asm/sdata2/d_msg_scrn_kanban.s new file mode 100644 index 0000000000..c96530c26d --- /dev/null +++ b/asm/sdata2/d_msg_scrn_kanban.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454cc0 - 0x80454cd8 + +.global lbl_80454CC0 +lbl_80454CC0: +.incbin "baserom.dol", 0x3D3B20, 0x4 + +.global lbl_80454CC4 +lbl_80454CC4: +.incbin "baserom.dol", 0x3D3B24, 0x4 + +.global lbl_80454CC8 +lbl_80454CC8: +.incbin "baserom.dol", 0x3D3B28, 0x8 + +.global lbl_80454CD0 +lbl_80454CD0: +.incbin "baserom.dol", 0x3D3B30, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_light.s b/asm/sdata2/d_msg_scrn_light.s new file mode 100644 index 0000000000..de5ef653e8 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_light.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454cd8 - 0x80454ce8 + +.global lbl_80454CD8 +lbl_80454CD8: +.incbin "baserom.dol", 0x3D3B38, 0x4 + +.global lbl_80454CDC +lbl_80454CDC: +.incbin "baserom.dol", 0x3D3B3C, 0x4 + +.global lbl_80454CE0 +lbl_80454CE0: +.incbin "baserom.dol", 0x3D3B40, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_place.s b/asm/sdata2/d_msg_scrn_place.s new file mode 100644 index 0000000000..5ced430a3e --- /dev/null +++ b/asm/sdata2/d_msg_scrn_place.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454ce8 - 0x80454cf8 + +.global lbl_80454CE8 +lbl_80454CE8: +.incbin "baserom.dol", 0x3D3B48, 0x4 + +.global lbl_80454CEC +lbl_80454CEC: +.incbin "baserom.dol", 0x3D3B4C, 0x4 + +.global lbl_80454CF0 +lbl_80454CF0: +.incbin "baserom.dol", 0x3D3B50, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_staff.s b/asm/sdata2/d_msg_scrn_staff.s new file mode 100644 index 0000000000..e9a5756205 --- /dev/null +++ b/asm/sdata2/d_msg_scrn_staff.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454cf8 - 0x80454d00 + +.global lbl_80454CF8 +lbl_80454CF8: +.incbin "baserom.dol", 0x3D3B58, 0x4 + +.global lbl_80454CFC +lbl_80454CFC: +.incbin "baserom.dol", 0x3D3B5C, 0x4 + diff --git a/asm/sdata2/d_msg_scrn_talk.s b/asm/sdata2/d_msg_scrn_talk.s new file mode 100644 index 0000000000..2947f57bdf --- /dev/null +++ b/asm/sdata2/d_msg_scrn_talk.s @@ -0,0 +1,83 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454d00 - 0x80454d58 + +.global lbl_80454D00 +lbl_80454D00: +.incbin "baserom.dol", 0x3D3B60, 0x4 + +.global lbl_80454D04 +lbl_80454D04: +.incbin "baserom.dol", 0x3D3B64, 0x4 + +.global lbl_80454D08 +lbl_80454D08: +.incbin "baserom.dol", 0x3D3B68, 0x4 + +.global lbl_80454D0C +lbl_80454D0C: +.incbin "baserom.dol", 0x3D3B6C, 0x4 + +.global lbl_80454D10 +lbl_80454D10: +.incbin "baserom.dol", 0x3D3B70, 0x4 + +.global lbl_80454D14 +lbl_80454D14: +.incbin "baserom.dol", 0x3D3B74, 0x4 + +.global lbl_80454D18 +lbl_80454D18: +.incbin "baserom.dol", 0x3D3B78, 0x4 + +.global lbl_80454D1C +lbl_80454D1C: +.incbin "baserom.dol", 0x3D3B7C, 0x4 + +.global lbl_80454D20 +lbl_80454D20: +.incbin "baserom.dol", 0x3D3B80, 0x4 + +.global lbl_80454D24 +lbl_80454D24: +.incbin "baserom.dol", 0x3D3B84, 0x4 + +.global lbl_80454D28 +lbl_80454D28: +.incbin "baserom.dol", 0x3D3B88, 0x4 + +.global lbl_80454D2C +lbl_80454D2C: +.incbin "baserom.dol", 0x3D3B8C, 0x4 + +.global lbl_80454D30 +lbl_80454D30: +.incbin "baserom.dol", 0x3D3B90, 0x4 + +.global lbl_80454D34 +lbl_80454D34: +.incbin "baserom.dol", 0x3D3B94, 0x4 + +.global lbl_80454D38 +lbl_80454D38: +.incbin "baserom.dol", 0x3D3B98, 0x4 + +.global lbl_80454D3C +lbl_80454D3C: +.incbin "baserom.dol", 0x3D3B9C, 0x4 + +.global lbl_80454D40 +lbl_80454D40: +.incbin "baserom.dol", 0x3D3BA0, 0x4 + +.global lbl_80454D44 +lbl_80454D44: +.incbin "baserom.dol", 0x3D3BA4, 0x4 + +.global lbl_80454D48 +lbl_80454D48: +.incbin "baserom.dol", 0x3D3BA8, 0x8 + +.global lbl_80454D50 +lbl_80454D50: +.incbin "baserom.dol", 0x3D3BB0, 0x8 + diff --git a/asm/sdata2/d_msg_scrn_tree.s b/asm/sdata2/d_msg_scrn_tree.s new file mode 100644 index 0000000000..462da4d64b --- /dev/null +++ b/asm/sdata2/d_msg_scrn_tree.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454d58 - 0x80454d70 + +.global lbl_80454D58 +lbl_80454D58: +.incbin "baserom.dol", 0x3D3BB8, 0x4 + +.global lbl_80454D5C +lbl_80454D5C: +.incbin "baserom.dol", 0x3D3BBC, 0x4 + +.global lbl_80454D60 +lbl_80454D60: +.incbin "baserom.dol", 0x3D3BC0, 0x8 + +.global lbl_80454D68 +lbl_80454D68: +.incbin "baserom.dol", 0x3D3BC8, 0x8 + diff --git a/asm/sdata2/d_msg_string.s b/asm/sdata2/d_msg_string.s new file mode 100644 index 0000000000..577b26e812 --- /dev/null +++ b/asm/sdata2/d_msg_string.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454d78 - 0x80454d90 + +.global lbl_80454D78 +lbl_80454D78: +.incbin "baserom.dol", 0x3D3BD8, 0x4 + +.global lbl_80454D7C +lbl_80454D7C: +.incbin "baserom.dol", 0x3D3BDC, 0x4 + +.global lbl_80454D80 +lbl_80454D80: +.incbin "baserom.dol", 0x3D3BE0, 0x8 + +.global lbl_80454D88 +lbl_80454D88: +.incbin "baserom.dol", 0x3D3BE8, 0x8 + diff --git a/asm/sdata2/d_msg_string_base.s b/asm/sdata2/d_msg_string_base.s new file mode 100644 index 0000000000..21ed5ae8f9 --- /dev/null +++ b/asm/sdata2/d_msg_string_base.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454d70 - 0x80454d78 + +.global lbl_80454D70 +lbl_80454D70: +.incbin "baserom.dol", 0x3D3BD0, 0x8 + diff --git a/asm/sdata2/d_msg_unit.s b/asm/sdata2/d_msg_unit.s new file mode 100644 index 0000000000..cef9a03ffe --- /dev/null +++ b/asm/sdata2/d_msg_unit.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454b40 - 0x80454b58 + +.global lbl_80454B40 +lbl_80454B40: +.incbin "baserom.dol", 0x3D39A0, 0x4 + +.global lbl_80454B44 +lbl_80454B44: +.incbin "baserom.dol", 0x3D39A4, 0x4 + +.global lbl_80454B48 +lbl_80454B48: +.incbin "baserom.dol", 0x3D39A8, 0x8 + +.global lbl_80454B50 +lbl_80454B50: +.incbin "baserom.dol", 0x3D39B0, 0x8 + diff --git a/asm/sdata2/d_name.s b/asm/sdata2/d_name.s new file mode 100644 index 0000000000..6b72e9c28e --- /dev/null +++ b/asm/sdata2/d_name.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454db0 - 0x80454de8 + +.global lbl_80454DB0 +lbl_80454DB0: +.incbin "baserom.dol", 0x3D3C10, 0x4 + +.global lbl_80454DB4 +lbl_80454DB4: +.incbin "baserom.dol", 0x3D3C14, 0x4 + +.global lbl_80454DB8 +lbl_80454DB8: +.incbin "baserom.dol", 0x3D3C18, 0x4 + +.global lbl_80454DBC +lbl_80454DBC: +.incbin "baserom.dol", 0x3D3C1C, 0x4 + +.global lbl_80454DC0 +lbl_80454DC0: +.incbin "baserom.dol", 0x3D3C20, 0x4 + +.global lbl_80454DC4 +lbl_80454DC4: +.incbin "baserom.dol", 0x3D3C24, 0x4 + +.global lbl_80454DC8 +lbl_80454DC8: +.incbin "baserom.dol", 0x3D3C28, 0x8 + +.global lbl_80454DD0 +lbl_80454DD0: +.incbin "baserom.dol", 0x3D3C30, 0x4 + +.global lbl_80454DD4 +lbl_80454DD4: +.incbin "baserom.dol", 0x3D3C34, 0x4 + +.global lbl_80454DD8 +lbl_80454DD8: +.incbin "baserom.dol", 0x3D3C38, 0x4 + +.global lbl_80454DDC +lbl_80454DDC: +.incbin "baserom.dol", 0x3D3C3C, 0x4 + +.global lbl_80454DE0 +lbl_80454DE0: +.incbin "baserom.dol", 0x3D3C40, 0x8 + diff --git a/asm/sdata2/d_npc_lib.s b/asm/sdata2/d_npc_lib.s new file mode 100644 index 0000000000..fd73c181c8 --- /dev/null +++ b/asm/sdata2/d_npc_lib.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454de8 - 0x80454e20 + +.global lbl_80454DE8 +lbl_80454DE8: +.incbin "baserom.dol", 0x3D3C48, 0x4 + +.global lbl_80454DEC +lbl_80454DEC: +.incbin "baserom.dol", 0x3D3C4C, 0x4 + +.global lbl_80454DF0 +lbl_80454DF0: +.incbin "baserom.dol", 0x3D3C50, 0x8 + +.global lbl_80454DF8 +lbl_80454DF8: +.incbin "baserom.dol", 0x3D3C58, 0x8 + +.global lbl_80454E00 +lbl_80454E00: +.incbin "baserom.dol", 0x3D3C60, 0x8 + +.global lbl_80454E08 +lbl_80454E08: +.incbin "baserom.dol", 0x3D3C68, 0x8 + +.global lbl_80454E10 +lbl_80454E10: +.incbin "baserom.dol", 0x3D3C70, 0x8 + +.global lbl_80454E18 +lbl_80454E18: +.incbin "baserom.dol", 0x3D3C78, 0x8 + diff --git a/asm/sdata2/d_ovlp_fade2.s b/asm/sdata2/d_ovlp_fade2.s new file mode 100644 index 0000000000..c6c81a73fe --- /dev/null +++ b/asm/sdata2/d_ovlp_fade2.s @@ -0,0 +1,59 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454e20 - 0x80454e58 + +.global lbl_80454E20 +lbl_80454E20: +.incbin "baserom.dol", 0x3D3C80, 0x4 + +.global lbl_80454E24 +lbl_80454E24: +.incbin "baserom.dol", 0x3D3C84, 0x4 + +.global lbl_80454E28 +lbl_80454E28: +.incbin "baserom.dol", 0x3D3C88, 0x4 + +.global lbl_80454E2C +lbl_80454E2C: +.incbin "baserom.dol", 0x3D3C8C, 0x4 + +.global lbl_80454E30 +lbl_80454E30: +.incbin "baserom.dol", 0x3D3C90, 0x4 + +.global lbl_80454E34 +lbl_80454E34: +.incbin "baserom.dol", 0x3D3C94, 0x4 + +.global lbl_80454E38 +lbl_80454E38: +.incbin "baserom.dol", 0x3D3C98, 0x4 + +.global lbl_80454E3C +lbl_80454E3C: +.incbin "baserom.dol", 0x3D3C9C, 0x4 + +.global lbl_80454E40 +lbl_80454E40: +.incbin "baserom.dol", 0x3D3CA0, 0x4 + +.global lbl_80454E44 +lbl_80454E44: +.incbin "baserom.dol", 0x3D3CA4, 0x4 + +.global lbl_80454E48 +lbl_80454E48: +.incbin "baserom.dol", 0x3D3CA8, 0x4 + +.global lbl_80454E4C +lbl_80454E4C: +.incbin "baserom.dol", 0x3D3CAC, 0x4 + +.global lbl_80454E50 +lbl_80454E50: +.incbin "baserom.dol", 0x3D3CB0, 0x4 + +.global lbl_80454E54 +lbl_80454E54: +.incbin "baserom.dol", 0x3D3CB4, 0x4 + diff --git a/asm/sdata2/d_ovlp_fade3.s b/asm/sdata2/d_ovlp_fade3.s new file mode 100644 index 0000000000..24625eff16 --- /dev/null +++ b/asm/sdata2/d_ovlp_fade3.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454e58 - 0x80454e88 + +.global lbl_80454E58 +lbl_80454E58: +.incbin "baserom.dol", 0x3D3CB8, 0x4 + +.global lbl_80454E5C +lbl_80454E5C: +.incbin "baserom.dol", 0x3D3CBC, 0x4 + +.global lbl_80454E60 +lbl_80454E60: +.incbin "baserom.dol", 0x3D3CC0, 0x4 + +.global lbl_80454E64 +lbl_80454E64: +.incbin "baserom.dol", 0x3D3CC4, 0x4 + +.global lbl_80454E68 +lbl_80454E68: +.incbin "baserom.dol", 0x3D3CC8, 0x4 + +.global lbl_80454E6C +lbl_80454E6C: +.incbin "baserom.dol", 0x3D3CCC, 0x4 + +.global lbl_80454E70 +lbl_80454E70: +.incbin "baserom.dol", 0x3D3CD0, 0x4 + +.global lbl_80454E74 +lbl_80454E74: +.incbin "baserom.dol", 0x3D3CD4, 0x4 + +.global lbl_80454E78 +lbl_80454E78: +.incbin "baserom.dol", 0x3D3CD8, 0x4 + +.global lbl_80454E7C +lbl_80454E7C: +.incbin "baserom.dol", 0x3D3CDC, 0x4 + +.global lbl_80454E80 +lbl_80454E80: +.incbin "baserom.dol", 0x3D3CE0, 0x4 + +.global lbl_80454E84 +lbl_80454E84: +.incbin "baserom.dol", 0x3D3CE4, 0x4 + diff --git a/asm/sdata2/d_pane_class.s b/asm/sdata2/d_pane_class.s new file mode 100644 index 0000000000..525c0eb05b --- /dev/null +++ b/asm/sdata2/d_pane_class.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454e88 - 0x80454eb8 + +.global lbl_80454E88 +lbl_80454E88: +.incbin "baserom.dol", 0x3D3CE8, 0x8 + +.global lbl_80454E90 +lbl_80454E90: +.incbin "baserom.dol", 0x3D3CF0, 0x8 + +.global lbl_80454E98 +lbl_80454E98: +.incbin "baserom.dol", 0x3D3CF8, 0x8 + +.global lbl_80454EA0 +lbl_80454EA0: +.incbin "baserom.dol", 0x3D3D00, 0x8 + +.global lbl_80454EA8 +lbl_80454EA8: +.incbin "baserom.dol", 0x3D3D08, 0x4 + +.global lbl_80454EAC +lbl_80454EAC: +.incbin "baserom.dol", 0x3D3D0C, 0x4 + +.global lbl_80454EB0 +lbl_80454EB0: +.incbin "baserom.dol", 0x3D3D10, 0x4 + +.global lbl_80454EB4 +lbl_80454EB4: +.incbin "baserom.dol", 0x3D3D14, 0x4 + diff --git a/asm/sdata2/d_pane_class_alpha.s b/asm/sdata2/d_pane_class_alpha.s new file mode 100644 index 0000000000..9dd51c12c8 --- /dev/null +++ b/asm/sdata2/d_pane_class_alpha.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454eb8 - 0x80454ed8 + +.global lbl_80454EB8 +lbl_80454EB8: +.incbin "baserom.dol", 0x3D3D18, 0x8 + +.global lbl_80454EC0 +lbl_80454EC0: +.incbin "baserom.dol", 0x3D3D20, 0x8 + +.global lbl_80454EC8 +lbl_80454EC8: +.incbin "baserom.dol", 0x3D3D28, 0x8 + +.global lbl_80454ED0 +lbl_80454ED0: +.incbin "baserom.dol", 0x3D3D30, 0x8 + diff --git a/asm/sdata2/d_particle.s b/asm/sdata2/d_particle.s new file mode 100644 index 0000000000..33677a1f64 --- /dev/null +++ b/asm/sdata2/d_particle.s @@ -0,0 +1,163 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451f40 - 0x80451ff8 + +.global lbl_80451F40 +lbl_80451F40: +.incbin "baserom.dol", 0x3D0DA0, 0x4 + +.global lbl_80451F44 +lbl_80451F44: +.incbin "baserom.dol", 0x3D0DA4, 0x4 + +.global lbl_80451F48 +lbl_80451F48: +.incbin "baserom.dol", 0x3D0DA8, 0x8 + +.global lbl_80451F50 +lbl_80451F50: +.incbin "baserom.dol", 0x3D0DB0, 0x4 + +.global lbl_80451F54 +lbl_80451F54: +.incbin "baserom.dol", 0x3D0DB4, 0x4 + +.global lbl_80451F58 +lbl_80451F58: +.incbin "baserom.dol", 0x3D0DB8, 0x4 + +.global lbl_80451F5C +lbl_80451F5C: +.incbin "baserom.dol", 0x3D0DBC, 0x4 + +.global lbl_80451F60 +lbl_80451F60: +.incbin "baserom.dol", 0x3D0DC0, 0x8 + +.global lbl_80451F68 +lbl_80451F68: +.incbin "baserom.dol", 0x3D0DC8, 0x8 + +.global lbl_80451F70 +lbl_80451F70: +.incbin "baserom.dol", 0x3D0DD0, 0x4 + +.global lbl_80451F74 +lbl_80451F74: +.incbin "baserom.dol", 0x3D0DD4, 0x4 + +.global lbl_80451F78 +lbl_80451F78: +.incbin "baserom.dol", 0x3D0DD8, 0x4 + +.global lbl_80451F7C +lbl_80451F7C: +.incbin "baserom.dol", 0x3D0DDC, 0x4 + +.global lbl_80451F80 +lbl_80451F80: +.incbin "baserom.dol", 0x3D0DE0, 0x4 + +.global lbl_80451F84 +lbl_80451F84: +.incbin "baserom.dol", 0x3D0DE4, 0x4 + +.global lbl_80451F88 +lbl_80451F88: +.incbin "baserom.dol", 0x3D0DE8, 0x4 + +.global lbl_80451F8C +lbl_80451F8C: +.incbin "baserom.dol", 0x3D0DEC, 0x4 + +.global lbl_80451F90 +lbl_80451F90: +.incbin "baserom.dol", 0x3D0DF0, 0x4 + +.global lbl_80451F94 +lbl_80451F94: +.incbin "baserom.dol", 0x3D0DF4, 0x4 + +.global lbl_80451F98 +lbl_80451F98: +.incbin "baserom.dol", 0x3D0DF8, 0x4 + +.global lbl_80451F9C +lbl_80451F9C: +.incbin "baserom.dol", 0x3D0DFC, 0x4 + +.global lbl_80451FA0 +lbl_80451FA0: +.incbin "baserom.dol", 0x3D0E00, 0x8 + +.global lbl_80451FA8 +lbl_80451FA8: +.incbin "baserom.dol", 0x3D0E08, 0x8 + +.global lbl_80451FB0 +lbl_80451FB0: +.incbin "baserom.dol", 0x3D0E10, 0x8 + +.global lbl_80451FB8 +lbl_80451FB8: +.incbin "baserom.dol", 0x3D0E18, 0x4 + +.global lbl_80451FBC +lbl_80451FBC: +.incbin "baserom.dol", 0x3D0E1C, 0x4 + +.global lbl_80451FC0 +lbl_80451FC0: +.incbin "baserom.dol", 0x3D0E20, 0x4 + +.global lbl_80451FC4 +lbl_80451FC4: +.incbin "baserom.dol", 0x3D0E24, 0x4 + +.global lbl_80451FC8 +lbl_80451FC8: +.incbin "baserom.dol", 0x3D0E28, 0x4 + +.global lbl_80451FCC +lbl_80451FCC: +.incbin "baserom.dol", 0x3D0E2C, 0x4 + +.global lbl_80451FD0 +lbl_80451FD0: +.incbin "baserom.dol", 0x3D0E30, 0x4 + +.global lbl_80451FD4 +lbl_80451FD4: +.incbin "baserom.dol", 0x3D0E34, 0x4 + +.global lbl_80451FD8 +lbl_80451FD8: +.incbin "baserom.dol", 0x3D0E38, 0x4 + +.global lbl_80451FDC +lbl_80451FDC: +.incbin "baserom.dol", 0x3D0E3C, 0x4 + +.global lbl_80451FE0 +lbl_80451FE0: +.incbin "baserom.dol", 0x3D0E40, 0x4 + +.global lbl_80451FE4 +lbl_80451FE4: +.incbin "baserom.dol", 0x3D0E44, 0x4 + +.global lbl_80451FE8 +lbl_80451FE8: +.incbin "baserom.dol", 0x3D0E48, 0x4 + +.global lbl_80451FEC +lbl_80451FEC: +.incbin "baserom.dol", 0x3D0E4C, 0x4 + +.global lbl_80451FF0 +lbl_80451FF0: +.incbin "baserom.dol", 0x3D0E50, 0x4 + +.global lbl_80451FF4 +lbl_80451FF4: +.incbin "baserom.dol", 0x3D0E54, 0x4 + diff --git a/asm/sdata2/d_particle_copoly.s b/asm/sdata2/d_particle_copoly.s new file mode 100644 index 0000000000..ec61aed067 --- /dev/null +++ b/asm/sdata2/d_particle_copoly.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451ff8 - 0x80452000 + +.global lbl_80451FF8 +lbl_80451FF8: +.incbin "baserom.dol", 0x3D0E58, 0x8 + diff --git a/asm/sdata2/d_path.s b/asm/sdata2/d_path.s new file mode 100644 index 0000000000..7311b95e35 --- /dev/null +++ b/asm/sdata2/d_path.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452000 - 0x80452008 + +.global lbl_80452000 +lbl_80452000: +.incbin "baserom.dol", 0x3D0E60, 0x8 + diff --git a/asm/sdata2/d_resorce.s b/asm/sdata2/d_resorce.s new file mode 100644 index 0000000000..337f444e5a --- /dev/null +++ b/asm/sdata2/d_resorce.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451df0 - 0x80451e08 + +.global lbl_80451DF0 +lbl_80451DF0: +.incbin "baserom.dol", 0x3D0C50, 0x8 + +.global lbl_80451DF8 +lbl_80451DF8: +.incbin "baserom.dol", 0x3D0C58, 0x8 + +.global lbl_80451E00 +lbl_80451E00: +.incbin "baserom.dol", 0x3D0C60, 0x8 + diff --git a/asm/sdata2/d_s_logo.s b/asm/sdata2/d_s_logo.s new file mode 100644 index 0000000000..20f1274de7 --- /dev/null +++ b/asm/sdata2/d_s_logo.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454ed8 - 0x80454ef8 + +.global lbl_80454ED8 +lbl_80454ED8: +.incbin "baserom.dol", 0x3D3D38, 0x4 + +.global lbl_80454EDC +lbl_80454EDC: +.incbin "baserom.dol", 0x3D3D3C, 0x4 + +.global lbl_80454EE0 +lbl_80454EE0: +.incbin "baserom.dol", 0x3D3D40, 0x4 + +.global lbl_80454EE4 +lbl_80454EE4: +.incbin "baserom.dol", 0x3D3D44, 0x4 + +.global lbl_80454EE8 +lbl_80454EE8: +.incbin "baserom.dol", 0x3D3D48, 0x4 + +.global lbl_80454EEC +lbl_80454EEC: +.incbin "baserom.dol", 0x3D3D4C, 0x4 + +.global lbl_80454EF0 +lbl_80454EF0: +.incbin "baserom.dol", 0x3D3D50, 0x8 + diff --git a/asm/sdata2/d_s_name.s b/asm/sdata2/d_s_name.s new file mode 100644 index 0000000000..3b3293ed82 --- /dev/null +++ b/asm/sdata2/d_s_name.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454ef8 - 0x80454f18 + +.global lbl_80454EF8 +lbl_80454EF8: +.incbin "baserom.dol", 0x3D3D58, 0x4 + +.global lbl_80454EFC +lbl_80454EFC: +.incbin "baserom.dol", 0x3D3D5C, 0x4 + +.global lbl_80454F00 +lbl_80454F00: +.incbin "baserom.dol", 0x3D3D60, 0x4 + +.global lbl_80454F04 +lbl_80454F04: +.incbin "baserom.dol", 0x3D3D64, 0x4 + +.global lbl_80454F08 +lbl_80454F08: +.incbin "baserom.dol", 0x3D3D68, 0x4 + +.global lbl_80454F0C +lbl_80454F0C: +.incbin "baserom.dol", 0x3D3D6C, 0x4 + +.global lbl_80454F10 +lbl_80454F10: +.incbin "baserom.dol", 0x3D3D70, 0x8 + diff --git a/asm/sdata2/d_s_play.s b/asm/sdata2/d_s_play.s new file mode 100644 index 0000000000..dec0a939f6 --- /dev/null +++ b/asm/sdata2/d_s_play.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454f18 - 0x80454f40 + +.global lbl_80454F18 +lbl_80454F18: +.incbin "baserom.dol", 0x3D3D78, 0x4 + +.global lbl_80454F1C +lbl_80454F1C: +.incbin "baserom.dol", 0x3D3D7C, 0x4 + +.global lbl_80454F20 +lbl_80454F20: +.incbin "baserom.dol", 0x3D3D80, 0x4 + +.global lbl_80454F24 +lbl_80454F24: +.incbin "baserom.dol", 0x3D3D84, 0x4 + +.global lbl_80454F28 +lbl_80454F28: +.incbin "baserom.dol", 0x3D3D88, 0x4 + +.global lbl_80454F2C +lbl_80454F2C: +.incbin "baserom.dol", 0x3D3D8C, 0x4 + +.global lbl_80454F30 +lbl_80454F30: +.incbin "baserom.dol", 0x3D3D90, 0x4 + +.global lbl_80454F34 +lbl_80454F34: +.incbin "baserom.dol", 0x3D3D94, 0x4 + +.global lbl_80454F38 +lbl_80454F38: +.incbin "baserom.dol", 0x3D3D98, 0x8 + diff --git a/asm/sdata2/d_save.s b/asm/sdata2/d_save.s new file mode 100644 index 0000000000..a31e2fee65 --- /dev/null +++ b/asm/sdata2/d_save.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451d58 - 0x80451d60 + +.global lbl_80451D58 +lbl_80451D58: +.incbin "baserom.dol", 0x3D0BB8, 0x4 + +.global lbl_80451D5C +lbl_80451D5C: +.incbin "baserom.dol", 0x3D0BBC, 0x4 + diff --git a/asm/sdata2/d_scope.s b/asm/sdata2/d_scope.s new file mode 100644 index 0000000000..b6d40b8cbb --- /dev/null +++ b/asm/sdata2/d_scope.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453a10 - 0x80453a48 + +.global lbl_80453A10 +lbl_80453A10: +.incbin "baserom.dol", 0x3D2870, 0x4 + +.global lbl_80453A14 +lbl_80453A14: +.incbin "baserom.dol", 0x3D2874, 0x4 + +.global lbl_80453A18 +lbl_80453A18: +.incbin "baserom.dol", 0x3D2878, 0x8 + +.global lbl_80453A20 +lbl_80453A20: +.incbin "baserom.dol", 0x3D2880, 0x4 + +.global lbl_80453A24 +lbl_80453A24: +.incbin "baserom.dol", 0x3D2884, 0x4 + +.global lbl_80453A28 +lbl_80453A28: +.incbin "baserom.dol", 0x3D2888, 0x4 + +.global lbl_80453A2C +lbl_80453A2C: +.incbin "baserom.dol", 0x3D288C, 0x4 + +.global lbl_80453A30 +lbl_80453A30: +.incbin "baserom.dol", 0x3D2890, 0x4 + +.global lbl_80453A34 +lbl_80453A34: +.incbin "baserom.dol", 0x3D2894, 0x4 + +.global lbl_80453A38 +lbl_80453A38: +.incbin "baserom.dol", 0x3D2898, 0x4 + +.global lbl_80453A3C +lbl_80453A3C: +.incbin "baserom.dol", 0x3D289C, 0x4 + +.global lbl_80453A40 +lbl_80453A40: +.incbin "baserom.dol", 0x3D28A0, 0x8 + diff --git a/asm/sdata2/d_select_cursor.s b/asm/sdata2/d_select_cursor.s new file mode 100644 index 0000000000..321ad3505a --- /dev/null +++ b/asm/sdata2/d_select_cursor.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453a48 - 0x80453a70 + +.global lbl_80453A48 +lbl_80453A48: +.incbin "baserom.dol", 0x3D28A8, 0x4 + +.global lbl_80453A4C +lbl_80453A4C: +.incbin "baserom.dol", 0x3D28AC, 0x4 + +.global lbl_80453A50 +lbl_80453A50: +.incbin "baserom.dol", 0x3D28B0, 0x4 + +.global lbl_80453A54 +lbl_80453A54: +.incbin "baserom.dol", 0x3D28B4, 0x4 + +.global lbl_80453A58 +lbl_80453A58: +.incbin "baserom.dol", 0x3D28B8, 0x8 + +.global lbl_80453A60 +lbl_80453A60: +.incbin "baserom.dol", 0x3D28C0, 0x4 + +.global lbl_80453A64 +lbl_80453A64: +.incbin "baserom.dol", 0x3D28C4, 0x4 + +.global lbl_80453A68 +lbl_80453A68: +.incbin "baserom.dol", 0x3D28C8, 0x4 + +.global lbl_80453A6C +lbl_80453A6C: +.incbin "baserom.dol", 0x3D28CC, 0x4 + diff --git a/asm/sdata2/d_select_icon.s b/asm/sdata2/d_select_icon.s new file mode 100644 index 0000000000..4bd2211a6f --- /dev/null +++ b/asm/sdata2/d_select_icon.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453a70 - 0x80453a88 + +.global lbl_80453A70 +lbl_80453A70: +.incbin "baserom.dol", 0x3D28D0, 0x8 + +.global lbl_80453A78 +lbl_80453A78: +.incbin "baserom.dol", 0x3D28D8, 0x8 + +.global lbl_80453A80 +lbl_80453A80: +.incbin "baserom.dol", 0x3D28E0, 0x8 + diff --git a/asm/sdata2/d_shop_camera.s b/asm/sdata2/d_shop_camera.s new file mode 100644 index 0000000000..f8b821dddb --- /dev/null +++ b/asm/sdata2/d_shop_camera.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453a88 - 0x80453ad0 + +.global lbl_80453A88 +lbl_80453A88: +.incbin "baserom.dol", 0x3D28E8, 0x4 + +.global lbl_80453A8C +lbl_80453A8C: +.incbin "baserom.dol", 0x3D28EC, 0x4 + +.global lbl_80453A90 +lbl_80453A90: +.incbin "baserom.dol", 0x3D28F0, 0x4 + +.global lbl_80453A94 +lbl_80453A94: +.incbin "baserom.dol", 0x3D28F4, 0x4 + +.global lbl_80453A98 +lbl_80453A98: +.incbin "baserom.dol", 0x3D28F8, 0x8 + +.global lbl_80453AA0 +lbl_80453AA0: +.incbin "baserom.dol", 0x3D2900, 0x8 + +.global lbl_80453AA8 +lbl_80453AA8: +.incbin "baserom.dol", 0x3D2908, 0x8 + +.global lbl_80453AB0 +lbl_80453AB0: +.incbin "baserom.dol", 0x3D2910, 0x4 + +.global lbl_80453AB4 +lbl_80453AB4: +.incbin "baserom.dol", 0x3D2914, 0x4 + +.global lbl_80453AB8 +lbl_80453AB8: +.incbin "baserom.dol", 0x3D2918, 0x4 + +.global lbl_80453ABC +lbl_80453ABC: +.incbin "baserom.dol", 0x3D291C, 0x4 + +.global lbl_80453AC0 +lbl_80453AC0: +.incbin "baserom.dol", 0x3D2920, 0x4 + +.global lbl_80453AC4 +lbl_80453AC4: +.incbin "baserom.dol", 0x3D2924, 0x4 + +.global lbl_80453AC8 +lbl_80453AC8: +.incbin "baserom.dol", 0x3D2928, 0x4 + +.global lbl_80453ACC +lbl_80453ACC: +.incbin "baserom.dol", 0x3D292C, 0x4 + diff --git a/asm/sdata2/d_shop_item_ctrl.s b/asm/sdata2/d_shop_item_ctrl.s new file mode 100644 index 0000000000..3ada949287 --- /dev/null +++ b/asm/sdata2/d_shop_item_ctrl.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453ad0 - 0x80453b00 + +.global lbl_80453AD0 +lbl_80453AD0: +.incbin "baserom.dol", 0x3D2930, 0x8 + +.global lbl_80453AD8 +lbl_80453AD8: +.incbin "baserom.dol", 0x3D2938, 0x8 + +.global lbl_80453AE0 +lbl_80453AE0: +.incbin "baserom.dol", 0x3D2940, 0x8 + +.global lbl_80453AE8 +lbl_80453AE8: +.incbin "baserom.dol", 0x3D2948, 0x8 + +.global lbl_80453AF0 +lbl_80453AF0: +.incbin "baserom.dol", 0x3D2950, 0x4 + +.global lbl_80453AF4 +lbl_80453AF4: +.incbin "baserom.dol", 0x3D2954, 0x4 + +.global lbl_80453AF8 +lbl_80453AF8: +.incbin "baserom.dol", 0x3D2958, 0x4 + +.global lbl_80453AFC +lbl_80453AFC: +.incbin "baserom.dol", 0x3D295C, 0x4 + diff --git a/asm/sdata2/d_shop_system.s b/asm/sdata2/d_shop_system.s new file mode 100644 index 0000000000..9a7952333a --- /dev/null +++ b/asm/sdata2/d_shop_system.s @@ -0,0 +1,119 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80453b00 - 0x80453b80 + +.global lbl_80453B00 +lbl_80453B00: +.incbin "baserom.dol", 0x3D2960, 0x4 + +.global lbl_80453B04 +lbl_80453B04: +.incbin "baserom.dol", 0x3D2964, 0x4 + +.global lbl_80453B08 +lbl_80453B08: +.incbin "baserom.dol", 0x3D2968, 0x4 + +.global lbl_80453B0C +lbl_80453B0C: +.incbin "baserom.dol", 0x3D296C, 0x4 + +.global lbl_80453B10 +lbl_80453B10: +.incbin "baserom.dol", 0x3D2970, 0x4 + +.global lbl_80453B14 +lbl_80453B14: +.incbin "baserom.dol", 0x3D2974, 0x4 + +.global lbl_80453B18 +lbl_80453B18: +.incbin "baserom.dol", 0x3D2978, 0x4 + +.global lbl_80453B1C +lbl_80453B1C: +.incbin "baserom.dol", 0x3D297C, 0x4 + +.global lbl_80453B20 +lbl_80453B20: +.incbin "baserom.dol", 0x3D2980, 0x4 + +.global lbl_80453B24 +lbl_80453B24: +.incbin "baserom.dol", 0x3D2984, 0x4 + +.global lbl_80453B28 +lbl_80453B28: +.incbin "baserom.dol", 0x3D2988, 0x4 + +.global lbl_80453B2C +lbl_80453B2C: +.incbin "baserom.dol", 0x3D298C, 0x4 + +.global lbl_80453B30 +lbl_80453B30: +.incbin "baserom.dol", 0x3D2990, 0x4 + +.global lbl_80453B34 +lbl_80453B34: +.incbin "baserom.dol", 0x3D2994, 0x4 + +.global lbl_80453B38 +lbl_80453B38: +.incbin "baserom.dol", 0x3D2998, 0x4 + +.global lbl_80453B3C +lbl_80453B3C: +.incbin "baserom.dol", 0x3D299C, 0x4 + +.global lbl_80453B40 +lbl_80453B40: +.incbin "baserom.dol", 0x3D29A0, 0x4 + +.global lbl_80453B44 +lbl_80453B44: +.incbin "baserom.dol", 0x3D29A4, 0x4 + +.global lbl_80453B48 +lbl_80453B48: +.incbin "baserom.dol", 0x3D29A8, 0x8 + +.global lbl_80453B50 +lbl_80453B50: +.incbin "baserom.dol", 0x3D29B0, 0x8 + +.global lbl_80453B58 +lbl_80453B58: +.incbin "baserom.dol", 0x3D29B8, 0x8 + +.global lbl_80453B60 +lbl_80453B60: +.incbin "baserom.dol", 0x3D29C0, 0x4 + +.global lbl_80453B64 +lbl_80453B64: +.incbin "baserom.dol", 0x3D29C4, 0x4 + +.global lbl_80453B68 +lbl_80453B68: +.incbin "baserom.dol", 0x3D29C8, 0x4 + +.global lbl_80453B6C +lbl_80453B6C: +.incbin "baserom.dol", 0x3D29CC, 0x4 + +.global lbl_80453B70 +lbl_80453B70: +.incbin "baserom.dol", 0x3D29D0, 0x4 + +.global lbl_80453B74 +lbl_80453B74: +.incbin "baserom.dol", 0x3D29D4, 0x4 + +.global lbl_80453B78 +lbl_80453B78: +.incbin "baserom.dol", 0x3D29D8, 0x4 + +.global lbl_80453B7C +lbl_80453B7C: +.incbin "baserom.dol", 0x3D29DC, 0x4 + diff --git a/asm/sdata2/d_simple_model.s b/asm/sdata2/d_simple_model.s new file mode 100644 index 0000000000..18573e53d7 --- /dev/null +++ b/asm/sdata2/d_simple_model.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451f38 - 0x80451f40 + +.global lbl_80451F38 +lbl_80451F38: +.incbin "baserom.dol", 0x3D0D98, 0x8 + diff --git a/asm/sdata2/d_spline_path.s b/asm/sdata2/d_spline_path.s new file mode 100644 index 0000000000..7059e45a62 --- /dev/null +++ b/asm/sdata2/d_spline_path.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452bc8 - 0x80452bd8 + +.global lbl_80452BC8 +lbl_80452BC8: +.incbin "baserom.dol", 0x3D1A28, 0x8 + +.global lbl_80452BD0 +lbl_80452BD0: +.incbin "baserom.dol", 0x3D1A30, 0x4 + +.global lbl_80452BD4 +lbl_80452BD4: +.incbin "baserom.dol", 0x3D1A34, 0x4 + diff --git a/asm/sdata2/d_stage.s b/asm/sdata2/d_stage.s new file mode 100644 index 0000000000..a419ec18d5 --- /dev/null +++ b/asm/sdata2/d_stage.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451c90 - 0x80451ca0 + +.global lbl_80451C90 +lbl_80451C90: +.incbin "baserom.dol", 0x3D0AF0, 0x4 + +.global lbl_80451C94 +lbl_80451C94: +.incbin "baserom.dol", 0x3D0AF4, 0x4 + +.global lbl_80451C98 +lbl_80451C98: +.incbin "baserom.dol", 0x3D0AF8, 0x8 + diff --git a/asm/sdata2/d_timer.s b/asm/sdata2/d_timer.s new file mode 100644 index 0000000000..016faec28e --- /dev/null +++ b/asm/sdata2/d_timer.s @@ -0,0 +1,103 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80454f40 - 0x80454fb0 + +.global lbl_80454F40 +lbl_80454F40: +.incbin "baserom.dol", 0x3D3DA0, 0x4 + +.global lbl_80454F44 +lbl_80454F44: +.incbin "baserom.dol", 0x3D3DA4, 0x4 + +.global lbl_80454F48 +lbl_80454F48: +.incbin "baserom.dol", 0x3D3DA8, 0x4 + +.global lbl_80454F4C +lbl_80454F4C: +.incbin "baserom.dol", 0x3D3DAC, 0x4 + +.global lbl_80454F50 +lbl_80454F50: +.incbin "baserom.dol", 0x3D3DB0, 0x8 + +.global lbl_80454F58 +lbl_80454F58: +.incbin "baserom.dol", 0x3D3DB8, 0x8 + +.global lbl_80454F60 +lbl_80454F60: +.incbin "baserom.dol", 0x3D3DC0, 0x8 + +.global lbl_80454F68 +lbl_80454F68: +.incbin "baserom.dol", 0x3D3DC8, 0x4 + +.global lbl_80454F6C +lbl_80454F6C: +.incbin "baserom.dol", 0x3D3DCC, 0x4 + +.global lbl_80454F70 +lbl_80454F70: +.incbin "baserom.dol", 0x3D3DD0, 0x4 + +.global lbl_80454F74 +lbl_80454F74: +.incbin "baserom.dol", 0x3D3DD4, 0x4 + +.global lbl_80454F78 +lbl_80454F78: +.incbin "baserom.dol", 0x3D3DD8, 0x4 + +.global lbl_80454F7C +lbl_80454F7C: +.incbin "baserom.dol", 0x3D3DDC, 0x4 + +.global lbl_80454F80 +lbl_80454F80: +.incbin "baserom.dol", 0x3D3DE0, 0x4 + +.global lbl_80454F84 +lbl_80454F84: +.incbin "baserom.dol", 0x3D3DE4, 0x4 + +.global lbl_80454F88 +lbl_80454F88: +.incbin "baserom.dol", 0x3D3DE8, 0x4 + +.global lbl_80454F8C +lbl_80454F8C: +.incbin "baserom.dol", 0x3D3DEC, 0x4 + +.global lbl_80454F90 +lbl_80454F90: +.incbin "baserom.dol", 0x3D3DF0, 0x4 + +.global lbl_80454F94 +lbl_80454F94: +.incbin "baserom.dol", 0x3D3DF4, 0x4 + +.global lbl_80454F98 +lbl_80454F98: +.incbin "baserom.dol", 0x3D3DF8, 0x4 + +.global lbl_80454F9C +lbl_80454F9C: +.incbin "baserom.dol", 0x3D3DFC, 0x4 + +.global lbl_80454FA0 +lbl_80454FA0: +.incbin "baserom.dol", 0x3D3E00, 0x4 + +.global lbl_80454FA4 +lbl_80454FA4: +.incbin "baserom.dol", 0x3D3E04, 0x4 + +.global lbl_80454FA8 +lbl_80454FA8: +.incbin "baserom.dol", 0x3D3E08, 0x4 + +.global lbl_80454FAC +lbl_80454FAC: +.incbin "baserom.dol", 0x3D3E0C, 0x4 + diff --git a/asm/sdata2/d_tresure.s b/asm/sdata2/d_tresure.s new file mode 100644 index 0000000000..dbdbfe4bf7 --- /dev/null +++ b/asm/sdata2/d_tresure.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452be8 - 0x80452c10 + +.global lbl_80452BE8 +lbl_80452BE8: +.incbin "baserom.dol", 0x3D1A48, 0x4 + +.global lbl_80452BEC +lbl_80452BEC: +.incbin "baserom.dol", 0x3D1A4C, 0x4 + +.global lbl_80452BF0 +lbl_80452BF0: +.incbin "baserom.dol", 0x3D1A50, 0x8 + +.global lbl_80452BF8 +lbl_80452BF8: +.incbin "baserom.dol", 0x3D1A58, 0x8 + +.global lbl_80452C00 +lbl_80452C00: +.incbin "baserom.dol", 0x3D1A60, 0x8 + +.global lbl_80452C08 +lbl_80452C08: +.incbin "baserom.dol", 0x3D1A68, 0x8 + diff --git a/asm/sdata2/d_vibration.s b/asm/sdata2/d_vibration.s new file mode 100644 index 0000000000..87e724bc20 --- /dev/null +++ b/asm/sdata2/d_vibration.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80452620 - 0x80452628 + +.global lbl_80452620 +lbl_80452620: +.incbin "baserom.dol", 0x3D1480, 0x8 + diff --git a/asm/sdata2/data.s b/asm/sdata2/data.s new file mode 100644 index 0000000000..ab56a07fcc --- /dev/null +++ b/asm/sdata2/data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455818 - 0x80455820 + +.global lbl_80455818 +lbl_80455818: +.incbin "baserom.dol", 0x3D4678, 0x8 + diff --git a/asm/sdata2/dspproc.s b/asm/sdata2/dspproc.s new file mode 100644 index 0000000000..516831078d --- /dev/null +++ b/asm/sdata2/dspproc.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455770 - 0x80455778 + +.global lbl_80455770 +lbl_80455770: +.incbin "baserom.dol", 0x3D45D0, 0x8 + diff --git a/asm/sdata2/e_acos.s b/asm/sdata2/e_acos.s new file mode 100644 index 0000000000..260d5f7cc8 --- /dev/null +++ b/asm/sdata2/e_acos.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456678 - 0x80456700 + +.global lbl_80456678 +lbl_80456678: +.incbin "baserom.dol", 0x3D54D8, 0x8 + +.global lbl_80456680 +lbl_80456680: +.incbin "baserom.dol", 0x3D54E0, 0x8 + +.global lbl_80456688 +lbl_80456688: +.incbin "baserom.dol", 0x3D54E8, 0x8 + +.global lbl_80456690 +lbl_80456690: +.incbin "baserom.dol", 0x3D54F0, 0x8 + +.global lbl_80456698 +lbl_80456698: +.incbin "baserom.dol", 0x3D54F8, 0x8 + +.global lbl_804566A0 +lbl_804566A0: +.incbin "baserom.dol", 0x3D5500, 0x8 + +.global lbl_804566A8 +lbl_804566A8: +.incbin "baserom.dol", 0x3D5508, 0x8 + +.global lbl_804566B0 +lbl_804566B0: +.incbin "baserom.dol", 0x3D5510, 0x8 + +.global lbl_804566B8 +lbl_804566B8: +.incbin "baserom.dol", 0x3D5518, 0x8 + +.global lbl_804566C0 +lbl_804566C0: +.incbin "baserom.dol", 0x3D5520, 0x8 + +.global lbl_804566C8 +lbl_804566C8: +.incbin "baserom.dol", 0x3D5528, 0x8 + +.global lbl_804566D0 +lbl_804566D0: +.incbin "baserom.dol", 0x3D5530, 0x8 + +.global lbl_804566D8 +lbl_804566D8: +.incbin "baserom.dol", 0x3D5538, 0x8 + +.global lbl_804566E0 +lbl_804566E0: +.incbin "baserom.dol", 0x3D5540, 0x8 + +.global lbl_804566E8 +lbl_804566E8: +.incbin "baserom.dol", 0x3D5548, 0x8 + +.global lbl_804566F0 +lbl_804566F0: +.incbin "baserom.dol", 0x3D5550, 0x8 + +.global lbl_804566F8 +lbl_804566F8: +.incbin "baserom.dol", 0x3D5558, 0x8 + diff --git a/asm/sdata2/e_asin.s b/asm/sdata2/e_asin.s new file mode 100644 index 0000000000..402086c418 --- /dev/null +++ b/asm/sdata2/e_asin.s @@ -0,0 +1,71 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456700 - 0x80456788 + +.global lbl_80456700 +lbl_80456700: +.incbin "baserom.dol", 0x3D5560, 0x8 + +.global lbl_80456708 +lbl_80456708: +.incbin "baserom.dol", 0x3D5568, 0x8 + +.global lbl_80456710 +lbl_80456710: +.incbin "baserom.dol", 0x3D5570, 0x8 + +.global lbl_80456718 +lbl_80456718: +.incbin "baserom.dol", 0x3D5578, 0x8 + +.global lbl_80456720 +lbl_80456720: +.incbin "baserom.dol", 0x3D5580, 0x8 + +.global lbl_80456728 +lbl_80456728: +.incbin "baserom.dol", 0x3D5588, 0x8 + +.global lbl_80456730 +lbl_80456730: +.incbin "baserom.dol", 0x3D5590, 0x8 + +.global lbl_80456738 +lbl_80456738: +.incbin "baserom.dol", 0x3D5598, 0x8 + +.global lbl_80456740 +lbl_80456740: +.incbin "baserom.dol", 0x3D55A0, 0x8 + +.global lbl_80456748 +lbl_80456748: +.incbin "baserom.dol", 0x3D55A8, 0x8 + +.global lbl_80456750 +lbl_80456750: +.incbin "baserom.dol", 0x3D55B0, 0x8 + +.global lbl_80456758 +lbl_80456758: +.incbin "baserom.dol", 0x3D55B8, 0x8 + +.global lbl_80456760 +lbl_80456760: +.incbin "baserom.dol", 0x3D55C0, 0x8 + +.global lbl_80456768 +lbl_80456768: +.incbin "baserom.dol", 0x3D55C8, 0x8 + +.global lbl_80456770 +lbl_80456770: +.incbin "baserom.dol", 0x3D55D0, 0x8 + +.global lbl_80456778 +lbl_80456778: +.incbin "baserom.dol", 0x3D55D8, 0x8 + +.global lbl_80456780 +lbl_80456780: +.incbin "baserom.dol", 0x3D55E0, 0x8 + diff --git a/asm/sdata2/e_atan2.s b/asm/sdata2/e_atan2.s new file mode 100644 index 0000000000..00ed8e337e --- /dev/null +++ b/asm/sdata2/e_atan2.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456788 - 0x804567e0 + +.global lbl_80456788 +lbl_80456788: +.incbin "baserom.dol", 0x3D55E8, 0x8 + +.global lbl_80456790 +lbl_80456790: +.incbin "baserom.dol", 0x3D55F0, 0x8 + +.global lbl_80456798 +lbl_80456798: +.incbin "baserom.dol", 0x3D55F8, 0x8 + +.global lbl_804567A0 +lbl_804567A0: +.incbin "baserom.dol", 0x3D5600, 0x8 + +.global lbl_804567A8 +lbl_804567A8: +.incbin "baserom.dol", 0x3D5608, 0x8 + +.global lbl_804567B0 +lbl_804567B0: +.incbin "baserom.dol", 0x3D5610, 0x8 + +.global lbl_804567B8 +lbl_804567B8: +.incbin "baserom.dol", 0x3D5618, 0x8 + +.global lbl_804567C0 +lbl_804567C0: +.incbin "baserom.dol", 0x3D5620, 0x8 + +.global lbl_804567C8 +lbl_804567C8: +.incbin "baserom.dol", 0x3D5628, 0x8 + +.global lbl_804567D0 +lbl_804567D0: +.incbin "baserom.dol", 0x3D5630, 0x8 + +.global lbl_804567D8 +lbl_804567D8: +.incbin "baserom.dol", 0x3D5638, 0x8 + diff --git a/asm/sdata2/e_exp.s b/asm/sdata2/e_exp.s new file mode 100644 index 0000000000..6f305009c3 --- /dev/null +++ b/asm/sdata2/e_exp.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804567e0 - 0x80456858 + +.global lbl_804567E0 +lbl_804567E0: +.incbin "baserom.dol", 0x3D5640, 0x8 + +.global lbl_804567E8 +lbl_804567E8: +.incbin "baserom.dol", 0x3D5648, 0x8 + +.global lbl_804567F0 +lbl_804567F0: +.incbin "baserom.dol", 0x3D5650, 0x8 + +.global lbl_804567F8 +lbl_804567F8: +.incbin "baserom.dol", 0x3D5658, 0x8 + +.global lbl_80456800 +lbl_80456800: +.incbin "baserom.dol", 0x3D5660, 0x8 + +.global lbl_80456808 +lbl_80456808: +.incbin "baserom.dol", 0x3D5668, 0x8 + +.global lbl_80456810 +lbl_80456810: +.incbin "baserom.dol", 0x3D5670, 0x8 + +.global lbl_80456818 +lbl_80456818: +.incbin "baserom.dol", 0x3D5678, 0x8 + +.global lbl_80456820 +lbl_80456820: +.incbin "baserom.dol", 0x3D5680, 0x8 + +.global lbl_80456828 +lbl_80456828: +.incbin "baserom.dol", 0x3D5688, 0x8 + +.global lbl_80456830 +lbl_80456830: +.incbin "baserom.dol", 0x3D5690, 0x8 + +.global lbl_80456838 +lbl_80456838: +.incbin "baserom.dol", 0x3D5698, 0x8 + +.global lbl_80456840 +lbl_80456840: +.incbin "baserom.dol", 0x3D56A0, 0x8 + +.global lbl_80456848 +lbl_80456848: +.incbin "baserom.dol", 0x3D56A8, 0x8 + +.global lbl_80456850 +lbl_80456850: +.incbin "baserom.dol", 0x3D56B0, 0x8 + diff --git a/asm/sdata2/e_pow.s b/asm/sdata2/e_pow.s new file mode 100644 index 0000000000..b4343d037a --- /dev/null +++ b/asm/sdata2/e_pow.s @@ -0,0 +1,139 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456858 - 0x80456968 + +.global lbl_80456858 +lbl_80456858: +.incbin "baserom.dol", 0x3D56B8, 0x8 + +.global lbl_80456860 +lbl_80456860: +.incbin "baserom.dol", 0x3D56C0, 0x8 + +.global lbl_80456868 +lbl_80456868: +.incbin "baserom.dol", 0x3D56C8, 0x8 + +.global lbl_80456870 +lbl_80456870: +.incbin "baserom.dol", 0x3D56D0, 0x8 + +.global lbl_80456878 +lbl_80456878: +.incbin "baserom.dol", 0x3D56D8, 0x8 + +.global lbl_80456880 +lbl_80456880: +.incbin "baserom.dol", 0x3D56E0, 0x8 + +.global lbl_80456888 +lbl_80456888: +.incbin "baserom.dol", 0x3D56E8, 0x8 + +.global lbl_80456890 +lbl_80456890: +.incbin "baserom.dol", 0x3D56F0, 0x8 + +.global lbl_80456898 +lbl_80456898: +.incbin "baserom.dol", 0x3D56F8, 0x8 + +.global lbl_804568A0 +lbl_804568A0: +.incbin "baserom.dol", 0x3D5700, 0x8 + +.global lbl_804568A8 +lbl_804568A8: +.incbin "baserom.dol", 0x3D5708, 0x8 + +.global lbl_804568B0 +lbl_804568B0: +.incbin "baserom.dol", 0x3D5710, 0x8 + +.global lbl_804568B8 +lbl_804568B8: +.incbin "baserom.dol", 0x3D5718, 0x8 + +.global lbl_804568C0 +lbl_804568C0: +.incbin "baserom.dol", 0x3D5720, 0x8 + +.global lbl_804568C8 +lbl_804568C8: +.incbin "baserom.dol", 0x3D5728, 0x8 + +.global lbl_804568D0 +lbl_804568D0: +.incbin "baserom.dol", 0x3D5730, 0x8 + +.global lbl_804568D8 +lbl_804568D8: +.incbin "baserom.dol", 0x3D5738, 0x8 + +.global lbl_804568E0 +lbl_804568E0: +.incbin "baserom.dol", 0x3D5740, 0x8 + +.global lbl_804568E8 +lbl_804568E8: +.incbin "baserom.dol", 0x3D5748, 0x8 + +.global lbl_804568F0 +lbl_804568F0: +.incbin "baserom.dol", 0x3D5750, 0x8 + +.global lbl_804568F8 +lbl_804568F8: +.incbin "baserom.dol", 0x3D5758, 0x8 + +.global lbl_80456900 +lbl_80456900: +.incbin "baserom.dol", 0x3D5760, 0x8 + +.global lbl_80456908 +lbl_80456908: +.incbin "baserom.dol", 0x3D5768, 0x8 + +.global lbl_80456910 +lbl_80456910: +.incbin "baserom.dol", 0x3D5770, 0x8 + +.global lbl_80456918 +lbl_80456918: +.incbin "baserom.dol", 0x3D5778, 0x8 + +.global lbl_80456920 +lbl_80456920: +.incbin "baserom.dol", 0x3D5780, 0x8 + +.global lbl_80456928 +lbl_80456928: +.incbin "baserom.dol", 0x3D5788, 0x8 + +.global lbl_80456930 +lbl_80456930: +.incbin "baserom.dol", 0x3D5790, 0x8 + +.global lbl_80456938 +lbl_80456938: +.incbin "baserom.dol", 0x3D5798, 0x8 + +.global lbl_80456940 +lbl_80456940: +.incbin "baserom.dol", 0x3D57A0, 0x8 + +.global lbl_80456948 +lbl_80456948: +.incbin "baserom.dol", 0x3D57A8, 0x8 + +.global lbl_80456950 +lbl_80456950: +.incbin "baserom.dol", 0x3D57B0, 0x8 + +.global lbl_80456958 +lbl_80456958: +.incbin "baserom.dol", 0x3D57B8, 0x8 + +.global lbl_80456960 +lbl_80456960: +.incbin "baserom.dol", 0x3D57C0, 0x8 + diff --git a/asm/sdata2/e_rem_pio2.s b/asm/sdata2/e_rem_pio2.s new file mode 100644 index 0000000000..ce895bc6c2 --- /dev/null +++ b/asm/sdata2/e_rem_pio2.s @@ -0,0 +1,47 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456968 - 0x804569c0 + +.global lbl_80456968 +lbl_80456968: +.incbin "baserom.dol", 0x3D57C8, 0x8 + +.global lbl_80456970 +lbl_80456970: +.incbin "baserom.dol", 0x3D57D0, 0x8 + +.global lbl_80456978 +lbl_80456978: +.incbin "baserom.dol", 0x3D57D8, 0x8 + +.global lbl_80456980 +lbl_80456980: +.incbin "baserom.dol", 0x3D57E0, 0x8 + +.global lbl_80456988 +lbl_80456988: +.incbin "baserom.dol", 0x3D57E8, 0x8 + +.global lbl_80456990 +lbl_80456990: +.incbin "baserom.dol", 0x3D57F0, 0x8 + +.global lbl_80456998 +lbl_80456998: +.incbin "baserom.dol", 0x3D57F8, 0x8 + +.global lbl_804569A0 +lbl_804569A0: +.incbin "baserom.dol", 0x3D5800, 0x8 + +.global lbl_804569A8 +lbl_804569A8: +.incbin "baserom.dol", 0x3D5808, 0x8 + +.global lbl_804569B0 +lbl_804569B0: +.incbin "baserom.dol", 0x3D5810, 0x8 + +.global lbl_804569B8 +lbl_804569B8: +.incbin "baserom.dol", 0x3D5818, 0x8 + diff --git a/asm/sdata2/e_sqrt.s b/asm/sdata2/e_sqrt.s new file mode 100644 index 0000000000..c51caff14d --- /dev/null +++ b/asm/sdata2/e_sqrt.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456b48 - 0x0 + +.global lbl_80456B48 +lbl_80456B48: +.incbin "baserom.dol", 0x3D59A8, 0x18 + diff --git a/asm/sdata2/f_ap_game.s b/asm/sdata2/f_ap_game.s new file mode 100644 index 0000000000..c0b0e7febe --- /dev/null +++ b/asm/sdata2/f_ap_game.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451bc0 - 0x80451bc8 + +.global lbl_80451BC0 +lbl_80451BC0: +.incbin "baserom.dol", 0x3D0A20, 0x4 + +.global lbl_80451BC4 +lbl_80451BC4: +.incbin "baserom.dol", 0x3D0A24, 0x4 + diff --git a/asm/sdata2/f_op_actor.s b/asm/sdata2/f_op_actor.s new file mode 100644 index 0000000000..6719909aec --- /dev/null +++ b/asm/sdata2/f_op_actor.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451bc8 - 0x80451c00 + +.global lbl_80451BC8 +lbl_80451BC8: +.incbin "baserom.dol", 0x3D0A28, 0x4 + +.global lbl_80451BCC +lbl_80451BCC: +.incbin "baserom.dol", 0x3D0A2C, 0x4 + +.global lbl_80451BD0 +lbl_80451BD0: +.incbin "baserom.dol", 0x3D0A30, 0x4 + +.global lbl_80451BD4 +lbl_80451BD4: +.incbin "baserom.dol", 0x3D0A34, 0x4 + +.global lbl_80451BD8 +lbl_80451BD8: +.incbin "baserom.dol", 0x3D0A38, 0x8 + +.global lbl_80451BE0 +lbl_80451BE0: +.incbin "baserom.dol", 0x3D0A40, 0x8 + +.global lbl_80451BE8 +lbl_80451BE8: +.incbin "baserom.dol", 0x3D0A48, 0x8 + +.global lbl_80451BF0 +lbl_80451BF0: +.incbin "baserom.dol", 0x3D0A50, 0x4 + +.global lbl_80451BF4 +lbl_80451BF4: +.incbin "baserom.dol", 0x3D0A54, 0x4 + +.global lbl_80451BF8 +lbl_80451BF8: +.incbin "baserom.dol", 0x3D0A58, 0x8 + diff --git a/asm/sdata2/f_op_actor_mng.s b/asm/sdata2/f_op_actor_mng.s new file mode 100644 index 0000000000..e85f06f905 --- /dev/null +++ b/asm/sdata2/f_op_actor_mng.s @@ -0,0 +1,91 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451c00 - 0x80451c68 + +.global lbl_80451C00 +lbl_80451C00: +.incbin "baserom.dol", 0x3D0A60, 0x4 + +.global lbl_80451C04 +lbl_80451C04: +.incbin "baserom.dol", 0x3D0A64, 0x4 + +.global lbl_80451C08 +lbl_80451C08: +.incbin "baserom.dol", 0x3D0A68, 0x8 + +.global lbl_80451C10 +lbl_80451C10: +.incbin "baserom.dol", 0x3D0A70, 0x8 + +.global lbl_80451C18 +lbl_80451C18: +.incbin "baserom.dol", 0x3D0A78, 0x8 + +.global lbl_80451C20 +lbl_80451C20: +.incbin "baserom.dol", 0x3D0A80, 0x4 + +.global lbl_80451C24 +lbl_80451C24: +.incbin "baserom.dol", 0x3D0A84, 0x4 + +.global lbl_80451C28 +lbl_80451C28: +.incbin "baserom.dol", 0x3D0A88, 0x4 + +.global lbl_80451C2C +lbl_80451C2C: +.incbin "baserom.dol", 0x3D0A8C, 0x4 + +.global lbl_80451C30 +lbl_80451C30: +.incbin "baserom.dol", 0x3D0A90, 0x4 + +.global lbl_80451C34 +lbl_80451C34: +.incbin "baserom.dol", 0x3D0A94, 0x4 + +.global lbl_80451C38 +lbl_80451C38: +.incbin "baserom.dol", 0x3D0A98, 0x4 + +.global lbl_80451C3C +lbl_80451C3C: +.incbin "baserom.dol", 0x3D0A9C, 0x4 + +.global lbl_80451C40 +lbl_80451C40: +.incbin "baserom.dol", 0x3D0AA0, 0x4 + +.global lbl_80451C44 +lbl_80451C44: +.incbin "baserom.dol", 0x3D0AA4, 0x4 + +.global lbl_80451C48 +lbl_80451C48: +.incbin "baserom.dol", 0x3D0AA8, 0x4 + +.global lbl_80451C4C +lbl_80451C4C: +.incbin "baserom.dol", 0x3D0AAC, 0x4 + +.global lbl_80451C50 +lbl_80451C50: +.incbin "baserom.dol", 0x3D0AB0, 0x4 + +.global lbl_80451C54 +lbl_80451C54: +.incbin "baserom.dol", 0x3D0AB4, 0x4 + +.global lbl_80451C58 +lbl_80451C58: +.incbin "baserom.dol", 0x3D0AB8, 0x4 + +.global lbl_80451C5C +lbl_80451C5C: +.incbin "baserom.dol", 0x3D0ABC, 0x4 + +.global lbl_80451C60 +lbl_80451C60: +.incbin "baserom.dol", 0x3D0AC0, 0x8 + diff --git a/asm/sdata2/f_op_kankyo_mng.s b/asm/sdata2/f_op_kankyo_mng.s new file mode 100644 index 0000000000..4454e4ed9f --- /dev/null +++ b/asm/sdata2/f_op_kankyo_mng.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451c68 - 0x80451c70 + +.global lbl_80451C68 +lbl_80451C68: +.incbin "baserom.dol", 0x3D0AC8, 0x8 + diff --git a/asm/sdata2/f_op_msg_mng.s b/asm/sdata2/f_op_msg_mng.s new file mode 100644 index 0000000000..3b21348644 --- /dev/null +++ b/asm/sdata2/f_op_msg_mng.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451c70 - 0x80451c90 + +.global lbl_80451C70 +lbl_80451C70: +.incbin "baserom.dol", 0x3D0AD0, 0x4 + +.global lbl_80451C74 +lbl_80451C74: +.incbin "baserom.dol", 0x3D0AD4, 0x4 + +.global lbl_80451C78 +lbl_80451C78: +.incbin "baserom.dol", 0x3D0AD8, 0x4 + +.global lbl_80451C7C +lbl_80451C7C: +.incbin "baserom.dol", 0x3D0ADC, 0x4 + +.global lbl_80451C80 +lbl_80451C80: +.incbin "baserom.dol", 0x3D0AE0, 0x4 + +.global lbl_80451C84 +lbl_80451C84: +.incbin "baserom.dol", 0x3D0AE4, 0x4 + +.global lbl_80451C88 +lbl_80451C88: +.incbin "baserom.dol", 0x3D0AE8, 0x8 + diff --git a/asm/sdata2/functionvalue.s b/asm/sdata2/functionvalue.s new file mode 100644 index 0000000000..73be0c89de --- /dev/null +++ b/asm/sdata2/functionvalue.s @@ -0,0 +1,43 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455400 - 0x80455450 + +.global lbl_80455400 +lbl_80455400: +.incbin "baserom.dol", 0x3D4260, 0x8 + +.global lbl_80455408 +lbl_80455408: +.incbin "baserom.dol", 0x3D4268, 0x8 + +.global lbl_80455410 +lbl_80455410: +.incbin "baserom.dol", 0x3D4270, 0x8 + +.global lbl_80455418 +lbl_80455418: +.incbin "baserom.dol", 0x3D4278, 0x8 + +.global lbl_80455420 +lbl_80455420: +.incbin "baserom.dol", 0x3D4280, 0x8 + +.global lbl_80455428 +lbl_80455428: +.incbin "baserom.dol", 0x3D4288, 0x8 + +.global lbl_80455430 +lbl_80455430: +.incbin "baserom.dol", 0x3D4290, 0x8 + +.global lbl_80455438 +lbl_80455438: +.incbin "baserom.dol", 0x3D4298, 0x8 + +.global lbl_80455440 +lbl_80455440: +.incbin "baserom.dol", 0x3D42A0, 0x8 + +.global lbl_80455448 +lbl_80455448: +.incbin "baserom.dol", 0x3D42A8, 0x8 + diff --git a/asm/sdata2/fvb-data.s b/asm/sdata2/fvb-data.s new file mode 100644 index 0000000000..0da9b1ef5f --- /dev/null +++ b/asm/sdata2/fvb-data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455450 - 0x80455458 + +.global lbl_80455450 +lbl_80455450: +.incbin "baserom.dol", 0x3D42B0, 0x8 + diff --git a/asm/sdata2/jstudio-control.s b/asm/sdata2/jstudio-control.s new file mode 100644 index 0000000000..e00aa1014a --- /dev/null +++ b/asm/sdata2/jstudio-control.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455458 - 0x80455460 + +.global lbl_80455458 +lbl_80455458: +.incbin "baserom.dol", 0x3D42B8, 0x4 + +.global lbl_8045545C +lbl_8045545C: +.incbin "baserom.dol", 0x3D42BC, 0x4 + diff --git a/asm/sdata2/jstudio-data.s b/asm/sdata2/jstudio-data.s new file mode 100644 index 0000000000..0c1d7787c2 --- /dev/null +++ b/asm/sdata2/jstudio-data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455460 - 0x80455468 + +.global lbl_80455460 +lbl_80455460: +.incbin "baserom.dol", 0x3D42C0, 0x8 + diff --git a/asm/sdata2/jstudio-math.s b/asm/sdata2/jstudio-math.s new file mode 100644 index 0000000000..0f2f54eb3a --- /dev/null +++ b/asm/sdata2/jstudio-math.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455468 - 0x804554a0 + +.global lbl_80455468 +lbl_80455468: +.incbin "baserom.dol", 0x3D42C8, 0x4 + +.global lbl_8045546C +lbl_8045546C: +.incbin "baserom.dol", 0x3D42CC, 0x4 + +.global lbl_80455470 +lbl_80455470: +.incbin "baserom.dol", 0x3D42D0, 0x8 + +.global lbl_80455478 +lbl_80455478: +.incbin "baserom.dol", 0x3D42D8, 0x8 + +.global lbl_80455480 +lbl_80455480: +.incbin "baserom.dol", 0x3D42E0, 0x8 + +.global lbl_80455488 +lbl_80455488: +.incbin "baserom.dol", 0x3D42E8, 0x8 + +.global lbl_80455490 +lbl_80455490: +.incbin "baserom.dol", 0x3D42F0, 0x8 + +.global lbl_80455498 +lbl_80455498: +.incbin "baserom.dol", 0x3D42F8, 0x8 + diff --git a/asm/sdata2/jstudio-object.s b/asm/sdata2/jstudio-object.s new file mode 100644 index 0000000000..5546323e40 --- /dev/null +++ b/asm/sdata2/jstudio-object.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804554a0 - 0x804554d0 + +.global lbl_804554A0 +lbl_804554A0: +.incbin "baserom.dol", 0x3D4300, 0x8 + +.global lbl_804554A8 +lbl_804554A8: +.incbin "baserom.dol", 0x3D4308, 0x4 + +.global lbl_804554AC +lbl_804554AC: +.incbin "baserom.dol", 0x3D430C, 0x4 + +.global lbl_804554B0 +lbl_804554B0: +.incbin "baserom.dol", 0x3D4310, 0x8 + +.global lbl_804554B8 +lbl_804554B8: +.incbin "baserom.dol", 0x3D4318, 0x8 + +.global lbl_804554C0 +lbl_804554C0: +.incbin "baserom.dol", 0x3D4320, 0x8 + +.global lbl_804554C8 +lbl_804554C8: +.incbin "baserom.dol", 0x3D4328, 0x8 + diff --git a/asm/sdata2/k_cos.s b/asm/sdata2/k_cos.s new file mode 100644 index 0000000000..a978d5a7eb --- /dev/null +++ b/asm/sdata2/k_cos.s @@ -0,0 +1,39 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804569c0 - 0x80456a08 + +.global lbl_804569C0 +lbl_804569C0: +.incbin "baserom.dol", 0x3D5820, 0x8 + +.global lbl_804569C8 +lbl_804569C8: +.incbin "baserom.dol", 0x3D5828, 0x8 + +.global lbl_804569D0 +lbl_804569D0: +.incbin "baserom.dol", 0x3D5830, 0x8 + +.global lbl_804569D8 +lbl_804569D8: +.incbin "baserom.dol", 0x3D5838, 0x8 + +.global lbl_804569E0 +lbl_804569E0: +.incbin "baserom.dol", 0x3D5840, 0x8 + +.global lbl_804569E8 +lbl_804569E8: +.incbin "baserom.dol", 0x3D5848, 0x8 + +.global lbl_804569F0 +lbl_804569F0: +.incbin "baserom.dol", 0x3D5850, 0x8 + +.global lbl_804569F8 +lbl_804569F8: +.incbin "baserom.dol", 0x3D5858, 0x8 + +.global lbl_80456A00 +lbl_80456A00: +.incbin "baserom.dol", 0x3D5860, 0x8 + diff --git a/asm/sdata2/k_rem_pio2.s b/asm/sdata2/k_rem_pio2.s new file mode 100644 index 0000000000..27bd8db07f --- /dev/null +++ b/asm/sdata2/k_rem_pio2.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456a08 - 0x80456a48 + +.global lbl_80456A08 +lbl_80456A08: +.incbin "baserom.dol", 0x3D5868, 0x8 + +.global lbl_80456A10 +lbl_80456A10: +.incbin "baserom.dol", 0x3D5870, 0x8 + +.global lbl_80456A18 +lbl_80456A18: +.incbin "baserom.dol", 0x3D5878, 0x8 + +.global lbl_80456A20 +lbl_80456A20: +.incbin "baserom.dol", 0x3D5880, 0x8 + +.global lbl_80456A28 +lbl_80456A28: +.incbin "baserom.dol", 0x3D5888, 0x8 + +.global lbl_80456A30 +lbl_80456A30: +.incbin "baserom.dol", 0x3D5890, 0x8 + +.global lbl_80456A38 +lbl_80456A38: +.incbin "baserom.dol", 0x3D5898, 0x8 + +.global lbl_80456A40 +lbl_80456A40: +.incbin "baserom.dol", 0x3D58A0, 0x8 + diff --git a/asm/sdata2/k_sin.s b/asm/sdata2/k_sin.s new file mode 100644 index 0000000000..1c18708623 --- /dev/null +++ b/asm/sdata2/k_sin.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456a48 - 0x80456a80 + +.global lbl_80456A48 +lbl_80456A48: +.incbin "baserom.dol", 0x3D58A8, 0x8 + +.global lbl_80456A50 +lbl_80456A50: +.incbin "baserom.dol", 0x3D58B0, 0x8 + +.global lbl_80456A58 +lbl_80456A58: +.incbin "baserom.dol", 0x3D58B8, 0x8 + +.global lbl_80456A60 +lbl_80456A60: +.incbin "baserom.dol", 0x3D58C0, 0x8 + +.global lbl_80456A68 +lbl_80456A68: +.incbin "baserom.dol", 0x3D58C8, 0x8 + +.global lbl_80456A70 +lbl_80456A70: +.incbin "baserom.dol", 0x3D58D0, 0x8 + +.global lbl_80456A78 +lbl_80456A78: +.incbin "baserom.dol", 0x3D58D8, 0x8 + diff --git a/asm/sdata2/k_tan.s b/asm/sdata2/k_tan.s new file mode 100644 index 0000000000..2ab8bbd1e4 --- /dev/null +++ b/asm/sdata2/k_tan.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456a80 - 0x80456ab8 + +.global lbl_80456A80 +lbl_80456A80: +.incbin "baserom.dol", 0x3D58E0, 0x8 + +.global lbl_80456A88 +lbl_80456A88: +.incbin "baserom.dol", 0x3D58E8, 0x8 + +.global lbl_80456A90 +lbl_80456A90: +.incbin "baserom.dol", 0x3D58F0, 0x8 + +.global lbl_80456A98 +lbl_80456A98: +.incbin "baserom.dol", 0x3D58F8, 0x8 + +.global lbl_80456AA0 +lbl_80456AA0: +.incbin "baserom.dol", 0x3D5900, 0x8 + +.global lbl_80456AA8 +lbl_80456AA8: +.incbin "baserom.dol", 0x3D5908, 0x8 + +.global lbl_80456AB0 +lbl_80456AB0: +.incbin "baserom.dol", 0x3D5910, 0x8 + diff --git a/asm/sdata2/m_Do_controller_pad.s b/asm/sdata2/m_Do_controller_pad.s new file mode 100644 index 0000000000..268626c0d7 --- /dev/null +++ b/asm/sdata2/m_Do_controller_pad.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451a20 - 0x80451a38 + +.global lbl_80451A20 +lbl_80451A20: +.incbin "baserom.dol", 0x3D0880, 0x4 + +.global lbl_80451A24 +lbl_80451A24: +.incbin "baserom.dol", 0x3D0884, 0x4 + +.global lbl_80451A28 +lbl_80451A28: +.incbin "baserom.dol", 0x3D0888, 0x8 + +.global lbl_80451A30 +lbl_80451A30: +.incbin "baserom.dol", 0x3D0890, 0x8 + diff --git a/asm/sdata2/m_Do_ext.s b/asm/sdata2/m_Do_ext.s new file mode 100644 index 0000000000..dd602dbf72 --- /dev/null +++ b/asm/sdata2/m_Do_ext.s @@ -0,0 +1,63 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451b18 - 0x80451b70 + +.global lbl_80451B18 +lbl_80451B18: +.incbin "baserom.dol", 0x3D0978, 0x4 + +.global lbl_80451B1C +lbl_80451B1C: +.incbin "baserom.dol", 0x3D097C, 0x4 + +.global lbl_80451B20 +lbl_80451B20: +.incbin "baserom.dol", 0x3D0980, 0x8 + +.global lbl_80451B28 +lbl_80451B28: +.incbin "baserom.dol", 0x3D0988, 0x4 + +.global lbl_80451B2C +lbl_80451B2C: +.incbin "baserom.dol", 0x3D098C, 0x4 + +.global lbl_80451B30 +lbl_80451B30: +.incbin "baserom.dol", 0x3D0990, 0x8 + +.global lbl_80451B38 +lbl_80451B38: +.incbin "baserom.dol", 0x3D0998, 0x8 + +.global lbl_80451B40 +lbl_80451B40: +.incbin "baserom.dol", 0x3D09A0, 0x4 + +.global lbl_80451B44 +lbl_80451B44: +.incbin "baserom.dol", 0x3D09A4, 0x4 + +.global lbl_80451B48 +lbl_80451B48: +.incbin "baserom.dol", 0x3D09A8, 0x8 + +.global lbl_80451B50 +lbl_80451B50: +.incbin "baserom.dol", 0x3D09B0, 0x8 + +.global lbl_80451B58 +lbl_80451B58: +.incbin "baserom.dol", 0x3D09B8, 0x8 + +.global lbl_80451B60 +lbl_80451B60: +.incbin "baserom.dol", 0x3D09C0, 0x4 + +.global lbl_80451B64 +lbl_80451B64: +.incbin "baserom.dol", 0x3D09C4, 0x4 + +.global lbl_80451B68 +lbl_80451B68: +.incbin "baserom.dol", 0x3D09C8, 0x8 + diff --git a/asm/sdata2/m_Do_graphic.s b/asm/sdata2/m_Do_graphic.s new file mode 100644 index 0000000000..8565427e5a --- /dev/null +++ b/asm/sdata2/m_Do_graphic.s @@ -0,0 +1,179 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451a38 - 0x80451b00 + +.global lbl_80451A38 +lbl_80451A38: +.incbin "baserom.dol", 0x3D0898, 0x4 + +.global lbl_80451A3C +lbl_80451A3C: +.incbin "baserom.dol", 0x3D089C, 0x4 + +.global lbl_80451A40 +lbl_80451A40: +.incbin "baserom.dol", 0x3D08A0, 0x4 + +.global lbl_80451A44 +lbl_80451A44: +.incbin "baserom.dol", 0x3D08A4, 0x4 + +.global lbl_80451A48 +lbl_80451A48: +.incbin "baserom.dol", 0x3D08A8, 0x4 + +.global lbl_80451A4C +lbl_80451A4C: +.incbin "baserom.dol", 0x3D08AC, 0x4 + +.global lbl_80451A50 +lbl_80451A50: +.incbin "baserom.dol", 0x3D08B0, 0x4 + +.global lbl_80451A54 +lbl_80451A54: +.incbin "baserom.dol", 0x3D08B4, 0x4 + +.global lbl_80451A58 +lbl_80451A58: +.incbin "baserom.dol", 0x3D08B8, 0x8 + +.global lbl_80451A60 +lbl_80451A60: +.incbin "baserom.dol", 0x3D08C0, 0x8 + +.global lbl_80451A68 +lbl_80451A68: +.incbin "baserom.dol", 0x3D08C8, 0x8 + +.global lbl_80451A70 +lbl_80451A70: +.incbin "baserom.dol", 0x3D08D0, 0x4 + +.global lbl_80451A74 +lbl_80451A74: +.incbin "baserom.dol", 0x3D08D4, 0x4 + +.global lbl_80451A78 +lbl_80451A78: +.incbin "baserom.dol", 0x3D08D8, 0x4 + +.global lbl_80451A7C +lbl_80451A7C: +.incbin "baserom.dol", 0x3D08DC, 0x4 + +.global lbl_80451A80 +lbl_80451A80: +.incbin "baserom.dol", 0x3D08E0, 0x4 + +.global lbl_80451A84 +lbl_80451A84: +.incbin "baserom.dol", 0x3D08E4, 0x4 + +.global lbl_80451A88 +lbl_80451A88: +.incbin "baserom.dol", 0x3D08E8, 0x4 + +.global lbl_80451A8C +lbl_80451A8C: +.incbin "baserom.dol", 0x3D08EC, 0x4 + +.global lbl_80451A90 +lbl_80451A90: +.incbin "baserom.dol", 0x3D08F0, 0x4 + +.global lbl_80451A94 +lbl_80451A94: +.incbin "baserom.dol", 0x3D08F4, 0x4 + +.global lbl_80451A98 +lbl_80451A98: +.incbin "baserom.dol", 0x3D08F8, 0x4 + +.global lbl_80451A9C +lbl_80451A9C: +.incbin "baserom.dol", 0x3D08FC, 0x4 + +.global lbl_80451AA0 +lbl_80451AA0: +.incbin "baserom.dol", 0x3D0900, 0x4 + +.global lbl_80451AA4 +lbl_80451AA4: +.incbin "baserom.dol", 0x3D0904, 0x4 + +.global lbl_80451AA8 +lbl_80451AA8: +.incbin "baserom.dol", 0x3D0908, 0x4 + +.global lbl_80451AAC +lbl_80451AAC: +.incbin "baserom.dol", 0x3D090C, 0x4 + +.global lbl_80451AB0 +lbl_80451AB0: +.incbin "baserom.dol", 0x3D0910, 0x4 + +.global lbl_80451AB4 +lbl_80451AB4: +.incbin "baserom.dol", 0x3D0914, 0x4 + +.global lbl_80451AB8 +lbl_80451AB8: +.incbin "baserom.dol", 0x3D0918, 0x4 + +.global lbl_80451ABC +lbl_80451ABC: +.incbin "baserom.dol", 0x3D091C, 0x4 + +.global lbl_80451AC0 +lbl_80451AC0: +.incbin "baserom.dol", 0x3D0920, 0x8 + +.global lbl_80451AC8 +lbl_80451AC8: +.incbin "baserom.dol", 0x3D0928, 0x8 + +.global lbl_80451AD0 +lbl_80451AD0: +.incbin "baserom.dol", 0x3D0930, 0x4 + +.global lbl_80451AD4 +lbl_80451AD4: +.incbin "baserom.dol", 0x3D0934, 0x4 + +.global lbl_80451AD8 +lbl_80451AD8: +.incbin "baserom.dol", 0x3D0938, 0x4 + +.global lbl_80451ADC +lbl_80451ADC: +.incbin "baserom.dol", 0x3D093C, 0x4 + +.global lbl_80451AE0 +lbl_80451AE0: +.incbin "baserom.dol", 0x3D0940, 0x4 + +.global lbl_80451AE4 +lbl_80451AE4: +.incbin "baserom.dol", 0x3D0944, 0x4 + +.global lbl_80451AE8 +lbl_80451AE8: +.incbin "baserom.dol", 0x3D0948, 0x4 + +.global lbl_80451AEC +lbl_80451AEC: +.incbin "baserom.dol", 0x3D094C, 0x4 + +.global lbl_80451AF0 +lbl_80451AF0: +.incbin "baserom.dol", 0x3D0950, 0x4 + +.global lbl_80451AF4 +lbl_80451AF4: +.incbin "baserom.dol", 0x3D0954, 0x4 + +.global lbl_80451AF8 +lbl_80451AF8: +.incbin "baserom.dol", 0x3D0958, 0x8 + diff --git a/asm/sdata2/m_Do_lib.s b/asm/sdata2/m_Do_lib.s new file mode 100644 index 0000000000..08fd2605dc --- /dev/null +++ b/asm/sdata2/m_Do_lib.s @@ -0,0 +1,51 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451b70 - 0x80451ba8 + +.global lbl_80451B70 +lbl_80451B70: +.incbin "baserom.dol", 0x3D09D0, 0x4 + +.global lbl_80451B74 +lbl_80451B74: +.incbin "baserom.dol", 0x3D09D4, 0x4 + +.global lbl_80451B78 +lbl_80451B78: +.incbin "baserom.dol", 0x3D09D8, 0x8 + +.global lbl_80451B80 +lbl_80451B80: +.incbin "baserom.dol", 0x3D09E0, 0x4 + +.global lbl_80451B84 +lbl_80451B84: +.incbin "baserom.dol", 0x3D09E4, 0x4 + +.global lbl_80451B88 +lbl_80451B88: +.incbin "baserom.dol", 0x3D09E8, 0x4 + +.global lbl_80451B8C +lbl_80451B8C: +.incbin "baserom.dol", 0x3D09EC, 0x4 + +.global lbl_80451B90 +lbl_80451B90: +.incbin "baserom.dol", 0x3D09F0, 0x4 + +.global lbl_80451B94 +lbl_80451B94: +.incbin "baserom.dol", 0x3D09F4, 0x4 + +.global lbl_80451B98 +lbl_80451B98: +.incbin "baserom.dol", 0x3D09F8, 0x4 + +.global lbl_80451B9C +lbl_80451B9C: +.incbin "baserom.dol", 0x3D09FC, 0x4 + +.global lbl_80451BA0 +lbl_80451BA0: +.incbin "baserom.dol", 0x3D0A00, 0x8 + diff --git a/asm/sdata2/m_Do_machine.s b/asm/sdata2/m_Do_machine.s new file mode 100644 index 0000000000..0fb3cce796 --- /dev/null +++ b/asm/sdata2/m_Do_machine.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451b00 - 0x80451b08 + +.global lbl_80451B00 +lbl_80451B00: +.incbin "baserom.dol", 0x3D0960, 0x4 + +.global lbl_80451B04 +lbl_80451B04: +.incbin "baserom.dol", 0x3D0964, 0x4 + diff --git a/asm/sdata2/m_Do_main.s b/asm/sdata2/m_Do_main.s new file mode 100644 index 0000000000..d27143a7d1 --- /dev/null +++ b/asm/sdata2/m_Do_main.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451a00 - 0x80451a20 + +.global lbl_80451A00 +lbl_80451A00: +.incbin "baserom.dol", 0x3D0860, 0x4 + +.global lbl_80451A04 +lbl_80451A04: +.incbin "baserom.dol", 0x3D0864, 0x4 + +.global lbl_80451A08 +lbl_80451A08: +.incbin "baserom.dol", 0x3D0868, 0x4 + +.global lbl_80451A0C +lbl_80451A0C: +.incbin "baserom.dol", 0x3D086C, 0x4 + +.global lbl_80451A10 +lbl_80451A10: +.incbin "baserom.dol", 0x3D0870, 0x8 + +.global lbl_80451A18 +lbl_80451A18: +.incbin "baserom.dol", 0x3D0878, 0x8 + diff --git a/asm/sdata2/m_Do_mtx.s b/asm/sdata2/m_Do_mtx.s new file mode 100644 index 0000000000..da04971124 --- /dev/null +++ b/asm/sdata2/m_Do_mtx.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80451b08 - 0x80451b18 + +.global lbl_80451B08 +lbl_80451B08: +.incbin "baserom.dol", 0x3D0968, 0x4 + +.global lbl_80451B0C +lbl_80451B0C: +.incbin "baserom.dol", 0x3D096C, 0x4 + +.global lbl_80451B10 +lbl_80451B10: +.incbin "baserom.dol", 0x3D0970, 0x8 + diff --git a/asm/sdata2/mbstring.s b/asm/sdata2/mbstring.s new file mode 100644 index 0000000000..0e7cf009d0 --- /dev/null +++ b/asm/sdata2/mbstring.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456668 - 0x80456670 + +.global lbl_80456668 +lbl_80456668: +.incbin "baserom.dol", 0x3D54C8, 0x8 + diff --git a/asm/sdata2/mtx.s b/asm/sdata2/mtx.s new file mode 100644 index 0000000000..e1346b0fe8 --- /dev/null +++ b/asm/sdata2/mtx.s @@ -0,0 +1,31 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456508 - 0x80456528 + +.global lbl_80456508 +lbl_80456508: +.incbin "baserom.dol", 0x3D5368, 0x4 + +.global lbl_8045650C +lbl_8045650C: +.incbin "baserom.dol", 0x3D536C, 0x4 + +.global lbl_80456510 +lbl_80456510: +.incbin "baserom.dol", 0x3D5370, 0x4 + +.global lbl_80456514 +lbl_80456514: +.incbin "baserom.dol", 0x3D5374, 0x4 + +.global lbl_80456518 +lbl_80456518: +.incbin "baserom.dol", 0x3D5378, 0x4 + +.global lbl_8045651C +lbl_8045651C: +.incbin "baserom.dol", 0x3D537C, 0x4 + +.global lbl_80456520 +lbl_80456520: +.incbin "baserom.dol", 0x3D5380, 0x8 + diff --git a/asm/sdata2/mtx44.s b/asm/sdata2/mtx44.s new file mode 100644 index 0000000000..71bab2658c --- /dev/null +++ b/asm/sdata2/mtx44.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456528 - 0x80456540 + +.global lbl_80456528 +lbl_80456528: +.incbin "baserom.dol", 0x3D5388, 0x4 + +.global lbl_8045652C +lbl_8045652C: +.incbin "baserom.dol", 0x3D538C, 0x4 + +.global lbl_80456530 +lbl_80456530: +.incbin "baserom.dol", 0x3D5390, 0x4 + +.global lbl_80456534 +lbl_80456534: +.incbin "baserom.dol", 0x3D5394, 0x4 + +.global lbl_80456538 +lbl_80456538: +.incbin "baserom.dol", 0x3D5398, 0x4 + +.global lbl_8045653C +lbl_8045653C: +.incbin "baserom.dol", 0x3D539C, 0x4 + diff --git a/asm/sdata2/object-actor.s b/asm/sdata2/object-actor.s new file mode 100644 index 0000000000..70fee47538 --- /dev/null +++ b/asm/sdata2/object-actor.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804554e0 - 0x804554e8 + +.global lbl_804554E0 +lbl_804554E0: +.incbin "baserom.dol", 0x3D4340, 0x8 + diff --git a/asm/sdata2/object-light.s b/asm/sdata2/object-light.s new file mode 100644 index 0000000000..68bf3ce650 --- /dev/null +++ b/asm/sdata2/object-light.s @@ -0,0 +1,27 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804554e8 - 0x80455510 + +.global lbl_804554E8 +lbl_804554E8: +.incbin "baserom.dol", 0x3D4348, 0x8 + +.global lbl_804554F0 +lbl_804554F0: +.incbin "baserom.dol", 0x3D4350, 0x8 + +.global lbl_804554F8 +lbl_804554F8: +.incbin "baserom.dol", 0x3D4358, 0x8 + +.global lbl_80455500 +lbl_80455500: +.incbin "baserom.dol", 0x3D4360, 0x8 + +.global lbl_80455508 +lbl_80455508: +.incbin "baserom.dol", 0x3D4368, 0x4 + +.global lbl_8045550C +lbl_8045550C: +.incbin "baserom.dol", 0x3D436C, 0x4 + diff --git a/asm/sdata2/object-particle.s b/asm/sdata2/object-particle.s new file mode 100644 index 0000000000..7ae95a8a4b --- /dev/null +++ b/asm/sdata2/object-particle.s @@ -0,0 +1,35 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455520 - 0x80455558 + +.global lbl_80455520 +lbl_80455520: +.incbin "baserom.dol", 0x3D4380, 0x4 + +.global lbl_80455524 +lbl_80455524: +.incbin "baserom.dol", 0x3D4384, 0x4 + +.global lbl_80455528 +lbl_80455528: +.incbin "baserom.dol", 0x3D4388, 0x8 + +.global lbl_80455530 +lbl_80455530: +.incbin "baserom.dol", 0x3D4390, 0x8 + +.global lbl_80455538 +lbl_80455538: +.incbin "baserom.dol", 0x3D4398, 0x8 + +.global lbl_80455540 +lbl_80455540: +.incbin "baserom.dol", 0x3D43A0, 0x8 + +.global lbl_80455548 +lbl_80455548: +.incbin "baserom.dol", 0x3D43A8, 0x8 + +.global lbl_80455550 +lbl_80455550: +.incbin "baserom.dol", 0x3D43B0, 0x8 + diff --git a/asm/sdata2/object-sound.s b/asm/sdata2/object-sound.s new file mode 100644 index 0000000000..a93c6e6e86 --- /dev/null +++ b/asm/sdata2/object-sound.s @@ -0,0 +1,15 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80455510 - 0x80455520 + +.global lbl_80455510 +lbl_80455510: +.incbin "baserom.dol", 0x3D4370, 0x4 + +.global lbl_80455514 +lbl_80455514: +.incbin "baserom.dol", 0x3D4374, 0x4 + +.global lbl_80455518 +lbl_80455518: +.incbin "baserom.dol", 0x3D4378, 0x8 + diff --git a/asm/sdata2/printf.s b/asm/sdata2/printf.s new file mode 100644 index 0000000000..e612baf113 --- /dev/null +++ b/asm/sdata2/printf.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456670 - 0x80456678 + +.global lbl_80456670 +lbl_80456670: +.incbin "baserom.dol", 0x3D54D0, 0x8 + diff --git a/asm/sdata2/quat.s b/asm/sdata2/quat.s new file mode 100644 index 0000000000..6f8f574f94 --- /dev/null +++ b/asm/sdata2/quat.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456550 - 0x80456560 + +.global lbl_80456550 +lbl_80456550: +.incbin "baserom.dol", 0x3D53B0, 0x4 + +.global lbl_80456554 +lbl_80456554: +.incbin "baserom.dol", 0x3D53B4, 0x4 + +.global lbl_80456558 +lbl_80456558: +.incbin "baserom.dol", 0x3D53B8, 0x4 + +.global lbl_8045655C +lbl_8045655C: +.incbin "baserom.dol", 0x3D53BC, 0x4 + diff --git a/asm/sdata2/s_atan.s b/asm/sdata2/s_atan.s new file mode 100644 index 0000000000..aebfa9f221 --- /dev/null +++ b/asm/sdata2/s_atan.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456ab8 - 0x80456ae0 + +.global lbl_80456AB8 +lbl_80456AB8: +.incbin "baserom.dol", 0x3D5918, 0x8 + +.global lbl_80456AC0 +lbl_80456AC0: +.incbin "baserom.dol", 0x3D5920, 0x8 + +.global lbl_80456AC8 +lbl_80456AC8: +.incbin "baserom.dol", 0x3D5928, 0x8 + +.global lbl_80456AD0 +lbl_80456AD0: +.incbin "baserom.dol", 0x3D5930, 0x8 + +.global lbl_80456AD8 +lbl_80456AD8: +.incbin "baserom.dol", 0x3D5938, 0x8 + diff --git a/asm/sdata2/s_ceil.s b/asm/sdata2/s_ceil.s new file mode 100644 index 0000000000..404b5eb27c --- /dev/null +++ b/asm/sdata2/s_ceil.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456ae0 - 0x80456af0 + +.global lbl_80456AE0 +lbl_80456AE0: +.incbin "baserom.dol", 0x3D5940, 0x8 + +.global lbl_80456AE8 +lbl_80456AE8: +.incbin "baserom.dol", 0x3D5948, 0x8 + diff --git a/asm/sdata2/s_cos.s b/asm/sdata2/s_cos.s new file mode 100644 index 0000000000..c0ec27cda0 --- /dev/null +++ b/asm/sdata2/s_cos.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456af0 - 0x80456af8 + +.global lbl_80456AF0 +lbl_80456AF0: +.incbin "baserom.dol", 0x3D5950, 0x8 + diff --git a/asm/sdata2/s_floor.s b/asm/sdata2/s_floor.s new file mode 100644 index 0000000000..c32b58bf54 --- /dev/null +++ b/asm/sdata2/s_floor.s @@ -0,0 +1,11 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456af8 - 0x80456b08 + +.global lbl_80456AF8 +lbl_80456AF8: +.incbin "baserom.dol", 0x3D5958, 0x8 + +.global lbl_80456B00 +lbl_80456B00: +.incbin "baserom.dol", 0x3D5960, 0x8 + diff --git a/asm/sdata2/s_frexp.s b/asm/sdata2/s_frexp.s new file mode 100644 index 0000000000..e903d77eb2 --- /dev/null +++ b/asm/sdata2/s_frexp.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456b08 - 0x80456b10 + +.global lbl_80456B08 +lbl_80456B08: +.incbin "baserom.dol", 0x3D5968, 0x8 + diff --git a/asm/sdata2/s_ldexp.s b/asm/sdata2/s_ldexp.s new file mode 100644 index 0000000000..f71b6c23e5 --- /dev/null +++ b/asm/sdata2/s_ldexp.s @@ -0,0 +1,23 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456b10 - 0x80456b38 + +.global lbl_80456B10 +lbl_80456B10: +.incbin "baserom.dol", 0x3D5970, 0x8 + +.global lbl_80456B18 +lbl_80456B18: +.incbin "baserom.dol", 0x3D5978, 0x8 + +.global lbl_80456B20 +lbl_80456B20: +.incbin "baserom.dol", 0x3D5980, 0x8 + +.global lbl_80456B28 +lbl_80456B28: +.incbin "baserom.dol", 0x3D5988, 0x8 + +.global lbl_80456B30 +lbl_80456B30: +.incbin "baserom.dol", 0x3D5990, 0x8 + diff --git a/asm/sdata2/s_sin.s b/asm/sdata2/s_sin.s new file mode 100644 index 0000000000..dabc064a9e --- /dev/null +++ b/asm/sdata2/s_sin.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456b38 - 0x80456b40 + +.global lbl_80456B38 +lbl_80456B38: +.incbin "baserom.dol", 0x3D5998, 0x8 + diff --git a/asm/sdata2/s_tan.s b/asm/sdata2/s_tan.s new file mode 100644 index 0000000000..d9722aaa38 --- /dev/null +++ b/asm/sdata2/s_tan.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456b40 - 0x80456b48 + +.global lbl_80456B40 +lbl_80456B40: +.incbin "baserom.dol", 0x3D59A0, 0x8 + diff --git a/asm/sdata2/stb-data.s b/asm/sdata2/stb-data.s new file mode 100644 index 0000000000..272ab8c2ee --- /dev/null +++ b/asm/sdata2/stb-data.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804554d8 - 0x804554e0 + +.global lbl_804554D8 +lbl_804554D8: +.incbin "baserom.dol", 0x3D4338, 0x8 + diff --git a/asm/sdata2/stb.s b/asm/sdata2/stb.s new file mode 100644 index 0000000000..df153193ac --- /dev/null +++ b/asm/sdata2/stb.s @@ -0,0 +1,7 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x804554d0 - 0x804554d8 + +.global lbl_804554D0 +lbl_804554D0: +.incbin "baserom.dol", 0x3D4330, 0x8 + diff --git a/asm/sdata2/vec.s b/asm/sdata2/vec.s new file mode 100644 index 0000000000..685edb6aad --- /dev/null +++ b/asm/sdata2/vec.s @@ -0,0 +1,19 @@ +.include "macros.inc" +.section .sdata2, "a" # 0x80456540 - 0x80456550 + +.global lbl_80456540 +lbl_80456540: +.incbin "baserom.dol", 0x3D53A0, 0x4 + +.global lbl_80456544 +lbl_80456544: +.incbin "baserom.dol", 0x3D53A4, 0x4 + +.global lbl_80456548 +lbl_80456548: +.incbin "baserom.dol", 0x3D53A8, 0x4 + +.global lbl_8045654C +lbl_8045654C: +.incbin "baserom.dol", 0x3D53AC, 0x4 + diff --git a/include/JSystem/J2DGraph/J2DPane.h b/include/JSystem/J2DGraph/J2DPane.h index 62f15b515c..505c9b7cd9 100644 --- a/include/JSystem/J2DGraph/J2DPane.h +++ b/include/JSystem/J2DGraph/J2DPane.h @@ -109,8 +109,8 @@ public: /* 0x30 */ virtual void update(); /* 0x34 */ virtual void drawSelf(f32 arg1, f32 arg2); /* 0x38 */ virtual void drawSelf(f32 arg1, f32 arg2, Mtx* mtx); - /* 0x3c */ virtual const class J2DPane* search(u64 arg1); - /* 0x40 */ virtual const class J2DPane* searchUserInfo(u64 arg1); + /* 0x3c */ virtual const J2DPane* search(u64 tag); + /* 0x40 */ virtual const J2DPane* searchUserInfo(u64 tag); /* 0x44 */ virtual void makeMatrix(); /* 0x48 */ virtual void makeMatrix(f32 a, f32 b, f32 c, f32 d); /* 0x4c */ virtual bool isUsed(const ResTIMG* timg); @@ -133,14 +133,14 @@ public: /* 0x90 */ virtual const J2DAnmTransform* animationPane(const J2DAnmTransform* transform); // inlines - f32 getHeight() const { return _20.getHeight(); } - f32 getWidth() const { return _20.getWidth(); } + f32 getHeight() const { return mBounds.getHeight(); } + f32 getWidth() const { return mBounds.getWidth(); } JSUTree* getFirstChild() { return mPaneTree.getFirstChild(); } const JSUTree* getPaneTree() { return &mPaneTree; } // member functions void initiate(); - void initialize(u64 arg1, const TBox2& dim); + void initialize(u64 tag, const TBox2& dim); void makePaneStream(J2DPane* other, JSURandomInputStream* stream); void changeUseTrans(J2DPane* other); bool appendChild(J2DPane* child); @@ -148,15 +148,15 @@ public: void draw(f32 a1, f32 a2, const J2DGrafContext* ctx, bool a4, bool a5); void place(const TBox2& dim); TBox2& getBounds(); - void rotate(f32 a, f32 b, J2DRotateAxis axis, f32 angle); + void rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle); void rotate(f32 angle); void clip(const TBox2& bounds); void setBasePosition(J2DBasePosition position); void setInfluencedAlpha(bool arg1, bool arg2); void getGlbVtx(u8 arg1) const; - const class J2DPane* getFirstChildPane(); - const class J2DPane* getNextChildPane(); - const class J2DPane* getParentPane(); + const J2DPane* getFirstChildPane(); + const J2DPane* getNextChildPane(); + const J2DPane* getParentPane(); void makePaneExStream(J2DPane* other, JSURandomInputStream* stream); static s16 J2DCast_F32_to_S16(f32 value, u8 arg2); void* getPointer(JSURandomInputStream* stream, u32 size, JKRArchive* archive); @@ -168,30 +168,30 @@ private: /* 0x006 */ u8 _6[2]; /* 0x008 */ int id; /* 0x00c */ u8 _c[4]; - /* 0x010 */ u64 _10; - /* 0x018 */ u64 _18; - /* 0x020 */ TBox2 _20; - /* 0x030 */ TBox2 _30; - /* 0x040 */ TBox2 _40; - /* 0x050 */ Mtx _50; - /* 0x080 */ Mtx _80; + /* 0x010 */ u64 mInfoTag; + /* 0x018 */ u64 mUserInfoTag; + /* 0x020 */ TBox2 mBounds; + /* 0x030 */ TBox2 mGlobalBounds; + /* 0x040 */ TBox2 mClipRect; + /* 0x050 */ Mtx mPositionMtx; + /* 0x080 */ Mtx mGlobalMtx; /* 0x0b0 */ bool mVisible; /* 0x0b1 */ u8 mCullMode; /* 0x0b2 */ u8 mAlpha; - /* 0x0b3 */ u8 _b3; - /* 0x0b4 */ u8 _b4; + /* 0x0b3 */ u8 mColorAlpha; + /* 0x0b4 */ bool mIsInfluencedAlpha; /* 0x0b5 */ bool mConnected; /* 0x0b6 */ char mRotAxis; - /* 0x0b7 */ u8 _b7; - /* 0x0b8 */ f32 _b8; - /* 0x0bc */ f32 _bc; - /* 0x0c0 */ f32 _c0; - /* 0x0c4 */ f32 _c4; - /* 0x0c8 */ f32 _c8; - /* 0x0cc */ f32 _cc; - /* 0x0d0 */ f32 _d0; - /* 0x0d4 */ f32 _d4; - /* 0x0d8 */ f32 _d8; + /* 0x0b7 */ u8 mBasePosition; + /* 0x0b8 */ f32 mRotateX; + /* 0x0bc */ f32 mRotateY; + /* 0x0c0 */ f32 mRotateZ; + /* 0x0c4 */ f32 mRotateOffsetX; + /* 0x0c8 */ f32 mRotateOffsetY; + /* 0x0cc */ f32 mScaleX; + /* 0x0d0 */ f32 mScaleY; + /* 0x0d4 */ f32 mTranslateX; + /* 0x0d8 */ f32 mTranslateY; /* 0x0dc */ JSUTree mPaneTree; /* 0x0f8 */ const J2DAnmTransform* mTransform; /* 0x0fc */ u32 _fc; diff --git a/include/JSystem/JGadget/asm/func_802DC864.s b/include/JSystem/JGadget/asm/func_802DC864.s new file mode 100644 index 0000000000..a28117bf5e --- /dev/null +++ b/include/JSystem/JGadget/asm/func_802DC864.s @@ -0,0 +1,28 @@ +/* 802DC864 002D97A4 94 21 FF F0 */ stwu r1, -0x10(r1) +/* 802DC868 002D97A8 28 06 00 00 */ cmplwi r6, 0 +/* 802DC86C 002D97AC 40 82 00 08 */ bne lbl_802DC874 +/* 802DC870 002D97B0 38 C1 00 08 */ addi r6, r1, 8 +lbl_802DC874: +/* 802DC874 002D97B4 A0 E3 00 00 */ lhz r7, 0(r3) +/* 802DC878 002D97B8 54 E0 04 21 */ rlwinm. r0, r7, 0, 0x10, 0x10 +/* 802DC87C 002D97BC 40 82 00 20 */ bne lbl_802DC89C +/* 802DC880 002D97C0 38 00 00 10 */ li r0, 0x10 +/* 802DC884 002D97C4 90 06 00 00 */ stw r0, 0(r6) +/* 802DC888 002D97C8 90 E4 00 00 */ stw r7, 0(r4) +/* 802DC88C 002D97CC A0 03 00 02 */ lhz r0, 2(r3) +/* 802DC890 002D97D0 90 05 00 00 */ stw r0, 0(r5) +/* 802DC894 002D97D4 38 63 00 04 */ addi r3, r3, 4 +/* 802DC898 002D97D8 48 00 00 28 */ b lbl_802DC8C0 +lbl_802DC89C: +/* 802DC89C 002D97DC 38 00 00 20 */ li r0, 0x20 +/* 802DC8A0 002D97E0 90 06 00 00 */ stw r0, 0(r6) +/* 802DC8A4 002D97E4 54 E7 80 5E */ rlwinm r7, r7, 0x10, 1, 0xf +/* 802DC8A8 002D97E8 A0 03 00 02 */ lhz r0, 2(r3) +/* 802DC8AC 002D97EC 7C E7 03 78 */ or r7, r7, r0 +/* 802DC8B0 002D97F0 90 E4 00 00 */ stw r7, 0(r4) +/* 802DC8B4 002D97F4 80 03 00 04 */ lwz r0, 4(r3) +/* 802DC8B8 002D97F8 90 05 00 00 */ stw r0, 0(r5) +/* 802DC8BC 002D97FC 38 63 00 08 */ addi r3, r3, 8 +lbl_802DC8C0: +/* 802DC8C0 002D9800 38 21 00 10 */ addi r1, r1, 0x10 +/* 802DC8C4 002D9804 4E 80 00 20 */ blr diff --git a/include/JSystem/JGadget/asm/func_802DC910.s b/include/JSystem/JGadget/asm/func_802DC910.s new file mode 100644 index 0000000000..c216b2e558 --- /dev/null +++ b/include/JSystem/JGadget/asm/func_802DC910.s @@ -0,0 +1,76 @@ +/* 802DC910 002D9850 94 21 FF D0 */ stwu r1, -0x30(r1) +/* 802DC914 002D9854 7C 08 02 A6 */ mflr r0 +/* 802DC918 002D9858 90 01 00 34 */ stw r0, 0x34(r1) +/* 802DC91C 002D985C 39 61 00 30 */ addi r11, r1, 0x30 +/* 802DC920 002D9860 48 08 58 B1 */ bl _savegpr_26 +/* 802DC924 002D9864 7C 7A 1B 78 */ mr r26, r3 +/* 802DC928 002D9868 7C 9B 23 79 */ or. r27, r4, r4 +/* 802DC92C 002D986C 7C BC 2B 78 */ mr r28, r5 +/* 802DC930 002D9870 41 82 00 10 */ beq lbl_802DC940 +/* 802DC934 002D9874 80 1B 00 00 */ lwz r0, 0(r27) +/* 802DC938 002D9878 28 00 00 00 */ cmplwi r0, 0 +/* 802DC93C 002D987C 40 82 00 0C */ bne lbl_802DC948 +lbl_802DC940: +/* 802DC940 002D9880 38 60 00 00 */ li r3, 0 +/* 802DC944 002D9884 48 00 00 C0 */ b lbl_802DCA04 +lbl_802DC948: +/* 802DC948 002D9888 3B E0 00 00 */ li r31, 0 +/* 802DC94C 002D988C 38 A1 00 0C */ addi r5, r1, 0xc +/* 802DC950 002D9890 7F 86 E3 78 */ mr r6, r28 +/* 802DC954 002D9894 81 83 00 00 */ lwz r12, 0(r3) +/* 802DC958 002D9898 81 8C 00 0C */ lwz r12, 0xc(r12) +/* 802DC95C 002D989C 7D 89 03 A6 */ mtctr r12 +/* 802DC960 002D98A0 4E 80 04 21 */ bctrl +/* 802DC964 002D98A4 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802DC968 002D98A8 41 82 00 08 */ beq lbl_802DC970 +/* 802DC96C 002D98AC 3B E0 00 01 */ li r31, 1 +lbl_802DC970: +/* 802DC970 002D98B0 7F FD FB 78 */ mr r29, r31 +/* 802DC974 002D98B4 57 80 07 FF */ clrlwi. r0, r28, 0x1f +/* 802DC978 002D98B8 40 82 00 14 */ bne lbl_802DC98C +/* 802DC97C 002D98BC 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 802DC980 002D98C0 40 82 00 0C */ bne lbl_802DC98C +/* 802DC984 002D98C4 7F E3 FB 78 */ mr r3, r31 +/* 802DC988 002D98C8 48 00 00 7C */ b lbl_802DCA04 +lbl_802DC98C: +/* 802DC98C 002D98CC 57 9E 07 BC */ rlwinm r30, r28, 0, 0x1e, 0x1e +/* 802DC990 002D98D0 48 00 00 64 */ b lbl_802DC9F4 +lbl_802DC994: +/* 802DC994 002D98D4 3B E0 00 00 */ li r31, 0 +/* 802DC998 002D98D8 7F 43 D3 78 */ mr r3, r26 +/* 802DC99C 002D98DC 7F 64 DB 78 */ mr r4, r27 +/* 802DC9A0 002D98E0 38 A1 00 08 */ addi r5, r1, 8 +/* 802DC9A4 002D98E4 7F 86 E3 78 */ mr r6, r28 +/* 802DC9A8 002D98E8 81 9A 00 00 */ lwz r12, 0(r26) +/* 802DC9AC 002D98EC 81 8C 00 10 */ lwz r12, 0x10(r12) +/* 802DC9B0 002D98F0 7D 89 03 A6 */ mtctr r12 +/* 802DC9B4 002D98F4 4E 80 04 21 */ bctrl +/* 802DC9B8 002D98F8 54 60 06 3F */ clrlwi. r0, r3, 0x18 +/* 802DC9BC 002D98FC 41 82 00 10 */ beq lbl_802DC9CC +/* 802DC9C0 002D9900 57 A0 06 3F */ clrlwi. r0, r29, 0x18 +/* 802DC9C4 002D9904 41 82 00 08 */ beq lbl_802DC9CC +/* 802DC9C8 002D9908 3B E0 00 01 */ li r31, 1 +lbl_802DC9CC: +/* 802DC9CC 002D990C 7F FD FB 78 */ mr r29, r31 +/* 802DC9D0 002D9910 28 1E 00 00 */ cmplwi r30, 0 +/* 802DC9D4 002D9914 40 82 00 14 */ bne lbl_802DC9E8 +/* 802DC9D8 002D9918 57 E0 06 3F */ clrlwi. r0, r31, 0x18 +/* 802DC9DC 002D991C 40 82 00 0C */ bne lbl_802DC9E8 +/* 802DC9E0 002D9920 7F E3 FB 78 */ mr r3, r31 +/* 802DC9E4 002D9924 48 00 00 20 */ b lbl_802DCA04 +lbl_802DC9E8: +/* 802DC9E8 002D9928 80 61 00 0C */ lwz r3, 0xc(r1) +/* 802DC9EC 002D992C 38 03 FF FF */ addi r0, r3, -1 +/* 802DC9F0 002D9930 90 01 00 0C */ stw r0, 0xc(r1) +lbl_802DC9F4: +/* 802DC9F4 002D9934 80 01 00 0C */ lwz r0, 0xc(r1) +/* 802DC9F8 002D9938 28 00 00 00 */ cmplwi r0, 0 +/* 802DC9FC 002D993C 40 82 FF 98 */ bne lbl_802DC994 +/* 802DCA00 002D9940 7F A3 EB 78 */ mr r3, r29 +lbl_802DCA04: +/* 802DCA04 002D9944 39 61 00 30 */ addi r11, r1, 0x30 +/* 802DCA08 002D9948 48 08 58 15 */ bl _restgpr_26 +/* 802DCA0C 002D994C 80 01 00 34 */ lwz r0, 0x34(r1) +/* 802DCA10 002D9950 7C 08 03 A6 */ mtlr r0 +/* 802DCA14 002D9954 38 21 00 30 */ addi r1, r1, 0x30 +/* 802DCA18 002D9958 4E 80 00 20 */ blr diff --git a/include/JSystem/JGadget/binary.h b/include/JSystem/JGadget/binary.h index 8b947587ab..47b831acc0 100644 --- a/include/JSystem/JGadget/binary.h +++ b/include/JSystem/JGadget/binary.h @@ -6,6 +6,13 @@ namespace JGadget { namespace binary { +struct TEBit { + u32 value; +}; + +const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second, + TEBit* tebit); + inline u32 align_roundUp(u32 arg0, u32 uAlign) { return (arg0 + uAlign - 1) & ~(uAlign - 1); } @@ -27,8 +34,10 @@ struct TParseData_aligned : public TParseData { struct TParse_header_block { virtual ~TParse_header_block(); - virtual int parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg2) = 0; - virtual int parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg2) = 0; + virtual bool parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg2) = 0; + virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg2) = 0; + + bool parse_next(const void** ppData_inout, u32 a2); }; } // namespace binary diff --git a/include/JSystem/JStudio/stb.h b/include/JSystem/JStudio/stb.h index 3a6df1d44d..5de377d7bd 100644 --- a/include/JSystem/JStudio/stb.h +++ b/include/JSystem/JStudio/stb.h @@ -109,9 +109,9 @@ public: virtual ~TParse(); // virtuals - virtual int parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3); - virtual int parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg3); - virtual int parseHeader(const data::TParse_THeader& header, u32 arg2); + virtual bool parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3); + virtual bool parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg3); + virtual bool parseHeader(const data::TParse_THeader& header, u32 arg2); virtual bool parseBlock_block(const data::TParse_TBlock& referBlock, u32 arg2); virtual bool parseBlock_object(const data::TParse_TBlock_object& referObject, u32 arg2); diff --git a/include/SComponent/c_bg_s_chk.h b/include/SComponent/c_bg_s_chk.h index f0f1772b03..bd22199fa9 100644 --- a/include/SComponent/c_bg_s_chk.h +++ b/include/SComponent/c_bg_s_chk.h @@ -4,9 +4,15 @@ #include "global.h" class cBgS_Chk { +private: + /* 0x0 */ u32 unk_0x00; + /* 0x4 */ u32 unk_0x04; + /* 0x8 */ u32 unk_0x08; + /* 0xC */ u8 unk_0x0C; + /* 0x10 */ // __vtable__ public: cBgS_Chk(void); - ~cBgS_Chk(void); + virtual ~cBgS_Chk(void); void SetExtChk(cBgS_Chk&); bool ChkSameActorPid(unsigned int) const; }; diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s b/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s deleted file mode 100644 index f6368d6fdb..0000000000 --- a/include/SComponent/c_bg_s_chk/asm/func_80267B4C.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80267B4C 00264A8C 3C 80 80 3C */ lis r4, lbl_803C3F80@ha -/* 80267B50 00264A90 38 04 3F 80 */ addi r0, r4, lbl_803C3F80@l -/* 80267B54 00264A94 90 03 00 10 */ stw r0, 0x10(r3) -/* 80267B58 00264A98 38 00 00 00 */ li r0, 0 -/* 80267B5C 00264A9C 90 03 00 00 */ stw r0, 0(r3) -/* 80267B60 00264AA0 90 03 00 04 */ stw r0, 4(r3) -/* 80267B64 00264AA4 38 00 00 01 */ li r0, 1 -/* 80267B68 00264AA8 98 03 00 0C */ stb r0, 0xc(r3) -/* 80267B6C 00264AAC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267B70.s b/include/SComponent/c_bg_s_chk/asm/func_80267B70.s deleted file mode 100644 index eb0cabb579..0000000000 --- a/include/SComponent/c_bg_s_chk/asm/func_80267B70.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 80267B70 00264AB0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80267B74 00264AB4 7C 08 02 A6 */ mflr r0 -/* 80267B78 00264AB8 90 01 00 14 */ stw r0, 0x14(r1) -/* 80267B7C 00264ABC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80267B80 00264AC0 7C 7F 1B 79 */ or. r31, r3, r3 -/* 80267B84 00264AC4 41 82 00 1C */ beq lbl_80267BA0 -/* 80267B88 00264AC8 3C A0 80 3C */ lis r5, lbl_803C3F80@ha -/* 80267B8C 00264ACC 38 05 3F 80 */ addi r0, r5, lbl_803C3F80@l -/* 80267B90 00264AD0 90 1F 00 10 */ stw r0, 0x10(r31) -/* 80267B94 00264AD4 7C 80 07 35 */ extsh. r0, r4 -/* 80267B98 00264AD8 40 81 00 08 */ ble lbl_80267BA0 -/* 80267B9C 00264ADC 48 06 71 A1 */ bl __dl__FPv -lbl_80267BA0: -/* 80267BA0 00264AE0 7F E3 FB 78 */ mr r3, r31 -/* 80267BA4 00264AE4 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80267BA8 00264AE8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80267BAC 00264AEC 7C 08 03 A6 */ mtlr r0 -/* 80267BB0 00264AF0 38 21 00 10 */ addi r1, r1, 0x10 -/* 80267BB4 00264AF4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s b/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s deleted file mode 100644 index 95613597cd..0000000000 --- a/include/SComponent/c_bg_s_chk/asm/func_80267BB8.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80267BB8 00264AF8 80 04 00 00 */ lwz r0, 0(r4) -/* 80267BBC 00264AFC 90 03 00 00 */ stw r0, 0(r3) -/* 80267BC0 00264B00 80 04 00 04 */ lwz r0, 4(r4) -/* 80267BC4 00264B04 90 03 00 04 */ stw r0, 4(r3) -/* 80267BC8 00264B08 80 04 00 08 */ lwz r0, 8(r4) -/* 80267BCC 00264B0C 90 03 00 08 */ stw r0, 8(r3) -/* 80267BD0 00264B10 88 04 00 0C */ lbz r0, 0xc(r4) -/* 80267BD4 00264B14 98 03 00 0C */ stb r0, 0xc(r3) -/* 80267BD8 00264B18 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s b/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s deleted file mode 100644 index 46b6af51d2..0000000000 --- a/include/SComponent/c_bg_s_chk/asm/func_80267BDC.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 80267BDC 00264B1C 80 A3 00 08 */ lwz r5, 8(r3) -/* 80267BE0 00264B20 3C 05 00 01 */ addis r0, r5, 1 -/* 80267BE4 00264B24 28 00 FF FF */ cmplwi r0, 0xffff -/* 80267BE8 00264B28 41 82 00 1C */ beq lbl_80267C04 -/* 80267BEC 00264B2C 3C 04 00 01 */ addis r0, r4, 1 -/* 80267BF0 00264B30 28 00 FF FF */ cmplwi r0, 0xffff -/* 80267BF4 00264B34 41 82 00 10 */ beq lbl_80267C04 -/* 80267BF8 00264B38 88 03 00 0C */ lbz r0, 0xc(r3) -/* 80267BFC 00264B3C 28 00 00 00 */ cmplwi r0, 0 -/* 80267C00 00264B40 40 82 00 0C */ bne lbl_80267C0C -lbl_80267C04: -/* 80267C04 00264B44 38 60 00 00 */ li r3, 0 -/* 80267C08 00264B48 4E 80 00 20 */ blr -lbl_80267C0C: -/* 80267C0C 00264B4C 7C 05 20 50 */ subf r0, r5, r4 -/* 80267C10 00264B50 7C 00 00 34 */ cntlzw r0, r0 -/* 80267C14 00264B54 54 03 DE 3E */ rlwinm r3, r0, 0x1b, 0x18, 0x1f -/* 80267C18 00264B58 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_bg_s_gnd_chk.h b/include/SComponent/c_bg_s_gnd_chk.h index 533416f223..0098d1ddb1 100644 --- a/include/SComponent/c_bg_s_gnd_chk.h +++ b/include/SComponent/c_bg_s_gnd_chk.h @@ -1,12 +1,16 @@ #ifndef C_BG_S_GND_CHK_H_ #define C_BG_S_GND_CHK_H_ +#include "SComponent/c_bg_s_chk.h" #include "SComponent/c_xyz.h" #include "global.h" -class cBgS_GndChk { +class cBgS_GndChk : public cBgS_Chk { +private: + // poly info +public: cBgS_GndChk(void); - ~cBgS_GndChk(void); + virtual ~cBgS_GndChk(void); void SetPos(const Vec*); void SetPos(const cXyz*); void PreCheck(void); diff --git a/include/SComponent/c_bg_s_poly_info.h b/include/SComponent/c_bg_s_poly_info.h index 873e5c4743..c08105fe54 100644 --- a/include/SComponent/c_bg_s_poly_info.h +++ b/include/SComponent/c_bg_s_poly_info.h @@ -4,9 +4,15 @@ #include "global.h" class cBgS_PolyInfo { +private: + /* 0x00 */ u16 mPolyIndex; + /* 0x02 */ u16 unk_0x02; + /* 0x04 */ void* unk_0x04; + /* 0x08 */ u32 unk_0x08; + public: cBgS_PolyInfo(void); - ~cBgS_PolyInfo(void); + virtual ~cBgS_PolyInfo(void); bool ChkSetInfo(void) const; void ClearPi(void); void SetPolyInfo(const cBgS_PolyInfo&); diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s deleted file mode 100644 index ae051fa81c..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_80268074.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 80268074 00264FB4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80268078 00264FB8 7C 08 02 A6 */ mflr r0 -/* 8026807C 00264FBC 90 01 00 14 */ stw r0, 0x14(r1) -/* 80268080 00264FC0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 80268084 00264FC4 7C 7F 1B 78 */ mr r31, r3 -/* 80268088 00264FC8 3C 80 80 3C */ lis r4, lbl_803C3FD0@ha -/* 8026808C 00264FCC 38 04 3F D0 */ addi r0, r4, lbl_803C3FD0@l -/* 80268090 00264FD0 90 03 00 0C */ stw r0, 0xc(r3) -/* 80268094 00264FD4 48 00 00 8D */ bl ClearPi__13cBgS_PolyInfoFv -/* 80268098 00264FD8 7F E3 FB 78 */ mr r3, r31 -/* 8026809C 00264FDC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802680A0 00264FE0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802680A4 00264FE4 7C 08 03 A6 */ mtlr r0 -/* 802680A8 00264FE8 38 21 00 10 */ addi r1, r1, 0x10 -/* 802680AC 00264FEC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s b/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s deleted file mode 100644 index 4c369c5ee9..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_802680B0.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 802680B0 00264FF0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 802680B4 00264FF4 7C 08 02 A6 */ mflr r0 -/* 802680B8 00264FF8 90 01 00 14 */ stw r0, 0x14(r1) -/* 802680BC 00264FFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 802680C0 00265000 7C 7F 1B 79 */ or. r31, r3, r3 -/* 802680C4 00265004 41 82 00 1C */ beq lbl_802680E0 -/* 802680C8 00265008 3C A0 80 3C */ lis r5, lbl_803C3FD0@ha -/* 802680CC 0026500C 38 05 3F D0 */ addi r0, r5, lbl_803C3FD0@l -/* 802680D0 00265010 90 1F 00 0C */ stw r0, 0xc(r31) -/* 802680D4 00265014 7C 80 07 35 */ extsh. r0, r4 -/* 802680D8 00265018 40 81 00 08 */ ble lbl_802680E0 -/* 802680DC 0026501C 48 06 6C 61 */ bl __dl__FPv -lbl_802680E0: -/* 802680E0 00265020 7F E3 FB 78 */ mr r3, r31 -/* 802680E4 00265024 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802680E8 00265028 80 01 00 14 */ lwz r0, 0x14(r1) -/* 802680EC 0026502C 7C 08 03 A6 */ mtlr r0 -/* 802680F0 00265030 38 21 00 10 */ addi r1, r1, 0x10 -/* 802680F4 00265034 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s b/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s deleted file mode 100644 index 0a808e711c..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_802680F8.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 802680F8 00265038 A0 03 00 00 */ lhz r0, 0(r3) -/* 802680FC 0026503C 28 00 FF FF */ cmplwi r0, 0xffff -/* 80268100 00265040 41 82 00 10 */ beq lbl_80268110 -/* 80268104 00265044 A0 03 00 02 */ lhz r0, 2(r3) -/* 80268108 00265048 28 00 01 00 */ cmplwi r0, 0x100 -/* 8026810C 0026504C 40 82 00 0C */ bne lbl_80268118 -lbl_80268110: -/* 80268110 00265050 38 60 00 00 */ li r3, 0 -/* 80268114 00265054 4E 80 00 20 */ blr -lbl_80268118: -/* 80268118 00265058 38 60 00 01 */ li r3, 1 -/* 8026811C 0026505C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s deleted file mode 100644 index 08fa4e3b1d..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_80268120.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 80268120 00265060 3C 80 00 01 */ lis r4, 0x0000FFFF@ha -/* 80268124 00265064 38 04 FF FF */ addi r0, r4, 0x0000FFFF@l -/* 80268128 00265068 B0 03 00 00 */ sth r0, 0(r3) -/* 8026812C 0026506C 38 00 01 00 */ li r0, 0x100 -/* 80268130 00265070 B0 03 00 02 */ sth r0, 2(r3) -/* 80268134 00265074 38 00 00 00 */ li r0, 0 -/* 80268138 00265078 90 03 00 04 */ stw r0, 4(r3) -/* 8026813C 0026507C 38 00 FF FF */ li r0, -1 -/* 80268140 00265080 90 03 00 08 */ stw r0, 8(r3) -/* 80268144 00265084 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s b/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s deleted file mode 100644 index e151525026..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_80268148.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 80268148 00265088 A0 04 00 00 */ lhz r0, 0(r4) -/* 8026814C 0026508C B0 03 00 00 */ sth r0, 0(r3) -/* 80268150 00265090 A0 04 00 02 */ lhz r0, 2(r4) -/* 80268154 00265094 B0 03 00 02 */ sth r0, 2(r3) -/* 80268158 00265098 80 04 00 04 */ lwz r0, 4(r4) -/* 8026815C 0026509C 90 03 00 04 */ stw r0, 4(r3) -/* 80268160 002650A0 80 04 00 08 */ lwz r0, 8(r4) -/* 80268164 002650A4 90 03 00 08 */ stw r0, 8(r3) -/* 80268168 002650A8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s b/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s deleted file mode 100644 index 3b307a0a64..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_8026816C.s +++ /dev/null @@ -1,4 +0,0 @@ -/* 8026816C 002650AC B0 83 00 02 */ sth r4, 2(r3) -/* 80268170 002650B0 90 A3 00 04 */ stw r5, 4(r3) -/* 80268174 002650B4 90 C3 00 08 */ stw r6, 8(r3) -/* 80268178 002650B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s b/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s deleted file mode 100644 index 27fda2f852..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_8026817C.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8026817C 002650BC 80 03 00 04 */ lwz r0, 4(r3) -/* 80268180 002650C0 7C 00 20 40 */ cmplw r0, r4 -/* 80268184 002650C4 40 82 00 18 */ bne lbl_8026819C -/* 80268188 002650C8 80 03 00 08 */ lwz r0, 8(r3) -/* 8026818C 002650CC 7C 00 28 40 */ cmplw r0, r5 -/* 80268190 002650D0 40 82 00 0C */ bne lbl_8026819C -/* 80268194 002650D4 38 60 00 01 */ li r3, 1 -/* 80268198 002650D8 4E 80 00 20 */ blr -lbl_8026819C: -/* 8026819C 002650DC 38 60 00 00 */ li r3, 0 -/* 802681A0 002650E0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s b/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s deleted file mode 100644 index 5b6195e980..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_802681A4.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 802681A4 002650E4 B0 83 00 00 */ sth r4, 0(r3) -/* 802681A8 002650E8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s b/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s deleted file mode 100644 index 7c15041ccb..0000000000 --- a/include/SComponent/c_bg_s_poly_info/asm/func_802681AC.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 802681AC 002650EC A0 03 00 02 */ lhz r0, 2(r3) -/* 802681B0 002650F0 20 60 01 00 */ subfic r3, r0, 0x100 -/* 802681B4 002650F4 30 03 FF FF */ addic r0, r3, -1 -/* 802681B8 002650F8 7C 60 19 10 */ subfe r3, r0, r3 -/* 802681BC 002650FC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_cc_d/c_cc_d.h b/include/SComponent/c_cc_d/c_cc_d.h index dc897238dd..3783bc0c37 100644 --- a/include/SComponent/c_cc_d/c_cc_d.h +++ b/include/SComponent/c_cc_d/c_cc_d.h @@ -1,9 +1,9 @@ #ifndef C_CC_D_H_ #define C_CC_D_H_ -#include "SComponent/c_m3d/c_m3d.h" +#include "SComponent/c_m3d_g_aab.h" +#include "SComponent/c_m3d_g_cps.h" #include "SComponent/c_m3d_g_cyl.h" -#include "global.h" class cCcD_ShapeAttr { public: @@ -40,4 +40,4 @@ private: void* vtable; }; -#endif \ No newline at end of file +#endif diff --git a/include/SComponent/c_m3d.h b/include/SComponent/c_m3d.h index c3c56e93ac..8eacd15bfc 100644 --- a/include/SComponent/c_m3d.h +++ b/include/SComponent/c_m3d.h @@ -1,48 +1,50 @@ #ifndef C_M3D_H_ #define C_M3D_H_ -#include "SComponent/c_m3d_g_aab.h" -#include "SComponent/c_m3d_g_cps.h" -#include "SComponent/c_m3d_g_cyl.h" -#include "SComponent/c_m3d_g_lin.h" -#include "SComponent/c_m3d_g_pla.h" -#include "SComponent/c_m3d_g_tri.h" -#include "SComponent/c_sxyz.h" -#include "SComponent/c_xyz.h" -#include "global.h" +#include "dolphin/types.h" + +class cM3dGAab; +class cM3dGCps; +class cM3dGCyl; +class cM3dGLin; +class cM3dGPla; +class cM3dGSph; +class cM3dGTri; +class csXyz; +class cXyz; struct cM3d_Range; +struct Vec; -void cM3d_InDivPos1(const Vec*, const Vec*, float, Vec*); -void cM3d_InDivPos2(const Vec*, const Vec*, float, Vec*); -float cM3d_Len2dSq(float, float, float, float); -bool cM3d_Len2dSqPntAndSegLine(float, float, float, float, float, float, float*, float*, float*); -bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, float*); -float cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*); -float cM3d_VectorProduct2d(float, float, float, float, float, float); +void cM3d_InDivPos1(const Vec*, const Vec*, f32, Vec*); +void cM3d_InDivPos2(const Vec*, const Vec*, f32, Vec*); +f32 cM3d_Len2dSq(f32, f32, f32, f32); +bool cM3d_Len2dSqPntAndSegLine(f32, f32, f32, f32, f32, f32, f32*, f32*, f32*); +bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, f32*); +f32 cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*); +f32 cM3d_VectorProduct2d(f32, f32, f32, f32, f32, f32); void cM3d_VectorProduct(const cXyz*, const cXyz*, const cXyz*, cXyz*); -void cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, float*); +void cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, f32*); bool cM3d_Cross_AabAab(const cM3dGAab*, const cM3dGAab*); bool cM3d_Cross_AabCyl(const cM3dGAab*, const cM3dGCyl*); bool cM3d_Cross_AabSph(const cM3dGAab*, const cM3dGSph*); -int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, float*, float*); -bool cM3d_CrossInfLineVsInfPlane_proc(float, float, const Vec*, const Vec*, Vec*); +int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, f32*, f32*); +bool cM3d_CrossInfLineVsInfPlane_proc(f32, f32, const Vec*, const Vec*, Vec*); bool cM3d_Cross_LinPla(const cM3dGLin*, const cM3dGPla*, Vec*, bool, bool); bool cM3d_Cross_MinMaxBoxLine(const Vec*, const Vec*, const Vec*, const Vec*); -bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, float); -bool cM3d_InclusionCheckPosIn3PosBox2d(float, float, float, float, float, float, float, float, - float); -bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, float); +bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, f32); +bool cM3d_InclusionCheckPosIn3PosBox2d(f32, f32, f32, f32, f32, f32, f32, f32, f32); +bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, f32); bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*); bool cM3d_CrossX_LinTri_proc(const cM3dGTri*, const Vec*); bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*); bool cM3d_CrossY_LinTri_proc(const cM3dGTri*, const Vec*); bool cM3d_CrossY_Tri(const Vec&, const Vec&, const Vec&, const cM3dGPla&, const Vec*); bool cM3d_CrossY_Tri_Front(const Vec&, const Vec&, const Vec&, const Vec*); -bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float*); -bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float); -bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, float*); -bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, float); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32*); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32); +bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, f32*); +bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, f32); bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*); bool cM3d_CrossZ_LinTri_proc(const cM3dGTri*, const Vec*); bool cM3d_Cross_LinTri(const cM3dGLin*, const cM3dGTri*, Vec*, bool, bool); @@ -50,14 +52,14 @@ bool cM3d_Cross_LinTri_Easy(const cM3dGTri*, const Vec*); bool cM3d_Cross_SphPnt(const cM3dGSph*, const Vec*); bool cM3d_Cross_LinSph(const cM3dGLin*, const cM3dGSph*, Vec*); int cM3d_Cross_LinSph_CrossPos(const cM3dGSph&, const cM3dGLin&, Vec*, Vec*); -bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, float*); -bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, float*); -bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*); -bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*, float*); -void cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*); +bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, f32*); +bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, f32*); +bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*); +bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*, f32*); +bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*); void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph*, const cM3dGTri*, Vec*); bool cM3d_Cross_SphTri(const cM3dGSph*, const cM3dGTri*, Vec*); -bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, float*); +bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, f32*); bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, Vec*); bool cM3d_Cross_CylTri(const cM3dGCyl*, const cM3dGTri*, Vec*); int cM3d_Cross_CylLin(const cM3dGCyl*, const cM3dGLin*, Vec*, Vec*); @@ -71,11 +73,11 @@ bool cM3d_Cross_TriTri(const cM3dGTri&, const cM3dGTri&, Vec*); bool cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*); void cM3d_CalcVecAngle(const Vec&, short*, short*); void cM3d_CalcVecZAngle(const Vec&, csXyz*); -void cM3d_PlaneCrossLineProcWork(float, float, float, float, float, float, float, float*, float*); +void cM3d_PlaneCrossLineProcWork(f32, f32, f32, f32, f32, f32, f32, f32*, f32*); int cM3d_2PlaneCrossLine(const cM3dGPla&, const cM3dGPla&, cM3dGLin*); bool cM3d_3PlaneCrossPos(const cM3dGPla&, const cM3dGPla&, const cM3dGPla&, Vec*); -float cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*); -float cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*); +f32 cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*); +f32 cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*); int cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*); void cM3d_CrawVec(const Vec&, const Vec&, Vec*); diff --git a/include/SComponent/c_m3d/asm/func_80268560.s b/include/SComponent/c_m3d/asm/func_80268560.s deleted file mode 100644 index 3704d6ea87..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268560.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 80268560 002654A0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80268564 002654A4 7C 08 02 A6 */ mflr r0 -/* 80268568 002654A8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026856C 002654AC 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 80268570 002654B0 93 C1 00 18 */ stw r30, 0x18(r1) -/* 80268574 002654B4 7C 7E 1B 78 */ mr r30, r3 -/* 80268578 002654B8 7C BF 2B 78 */ mr r31, r5 -/* 8026857C 002654BC 7C 83 23 78 */ mr r3, r4 -/* 80268580 002654C0 38 81 00 08 */ addi r4, r1, 8 -/* 80268584 002654C4 48 0D EB 55 */ bl PSVECScale -/* 80268588 002654C8 38 61 00 08 */ addi r3, r1, 8 -/* 8026858C 002654CC 7F C4 F3 78 */ mr r4, r30 -/* 80268590 002654D0 7F E5 FB 78 */ mr r5, r31 -/* 80268594 002654D4 48 0D EA FD */ bl PSVECAdd -/* 80268598 002654D8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8026859C 002654DC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 802685A0 002654E0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 802685A4 002654E4 7C 08 03 A6 */ mtlr r0 -/* 802685A8 002654E8 38 21 00 20 */ addi r1, r1, 0x20 -/* 802685AC 002654EC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_802685B0.s b/include/SComponent/c_m3d/asm/func_802685B0.s deleted file mode 100644 index da2081ce8a..0000000000 --- a/include/SComponent/c_m3d/asm/func_802685B0.s +++ /dev/null @@ -1,25 +0,0 @@ -/* 802685B0 002654F0 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802685B4 002654F4 7C 08 02 A6 */ mflr r0 -/* 802685B8 002654F8 90 01 00 34 */ stw r0, 0x34(r1) -/* 802685BC 002654FC DB E1 00 28 */ stfd f31, 0x28(r1) -/* 802685C0 00265500 93 E1 00 24 */ stw r31, 0x24(r1) -/* 802685C4 00265504 93 C1 00 20 */ stw r30, 0x20(r1) -/* 802685C8 00265508 7C 7E 1B 78 */ mr r30, r3 -/* 802685CC 0026550C FF E0 08 90 */ fmr f31, f1 -/* 802685D0 00265510 7C BF 2B 78 */ mr r31, r5 -/* 802685D4 00265514 7C 83 23 78 */ mr r3, r4 -/* 802685D8 00265518 7F C4 F3 78 */ mr r4, r30 -/* 802685DC 0026551C 38 A1 00 08 */ addi r5, r1, 8 -/* 802685E0 00265520 48 0D EA D5 */ bl PSVECSubtract -/* 802685E4 00265524 7F C3 F3 78 */ mr r3, r30 -/* 802685E8 00265528 38 81 00 08 */ addi r4, r1, 8 -/* 802685EC 0026552C FC 20 F8 90 */ fmr f1, f31 -/* 802685F0 00265530 7F E5 FB 78 */ mr r5, r31 -/* 802685F4 00265534 4B FF FF 6D */ bl cM3d_InDivPos1__FPC3VecPC3VecfP3Vec -/* 802685F8 00265538 CB E1 00 28 */ lfd f31, 0x28(r1) -/* 802685FC 0026553C 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 80268600 00265540 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 80268604 00265544 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80268608 00265548 7C 08 03 A6 */ mtlr r0 -/* 8026860C 0026554C 38 21 00 30 */ addi r1, r1, 0x30 -/* 80268610 00265550 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268614.s b/include/SComponent/c_m3d/asm/func_80268614.s deleted file mode 100644 index bfa914c4f8..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268614.s +++ /dev/null @@ -1,6 +0,0 @@ -/* 80268614 00265554 EC 01 18 28 */ fsubs f0, f1, f3 -/* 80268618 00265558 EC 42 20 28 */ fsubs f2, f2, f4 -/* 8026861C 0026555C EC 20 00 32 */ fmuls f1, f0, f0 -/* 80268620 00265560 EC 02 00 B2 */ fmuls f0, f2, f2 -/* 80268624 00265564 EC 21 00 2A */ fadds f1, f1, f0 -/* 80268628 00265568 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026862C.s b/include/SComponent/c_m3d/asm/func_8026862C.s deleted file mode 100644 index b6281b66d3..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026862C.s +++ /dev/null @@ -1,60 +0,0 @@ -/* 8026862C 0026556C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80268630 00265570 7C 08 02 A6 */ mflr r0 -/* 80268634 00265574 90 01 00 14 */ stw r0, 0x14(r1) -/* 80268638 00265578 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026863C 0026557C 93 C1 00 08 */ stw r30, 8(r1) -/* 80268640 00265580 FD 00 08 90 */ fmr f8, f1 -/* 80268644 00265584 FC E0 10 90 */ fmr f7, f2 -/* 80268648 00265588 7C BE 2B 78 */ mr r30, r5 -/* 8026864C 0026558C 3B E0 00 00 */ li r31, 0 -/* 80268650 00265590 EC 45 18 28 */ fsubs f2, f5, f3 -/* 80268654 00265594 EC A6 20 28 */ fsubs f5, f6, f4 -/* 80268658 00265598 EC 22 00 B2 */ fmuls f1, f2, f2 -/* 8026865C 0026559C EC 05 01 72 */ fmuls f0, f5, f5 -/* 80268660 002655A0 EC C1 00 2A */ fadds f6, f1, f0 -/* 80268664 002655A4 FC 00 32 10 */ fabs f0, f6 -/* 80268668 002655A8 FC 20 00 18 */ frsp f1, f0 -/* 8026866C 002655AC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 80268670 002655B0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268674 002655B4 40 80 00 14 */ bge lbl_80268688 -/* 80268678 002655B8 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 8026867C 002655BC D0 1E 00 00 */ stfs f0, 0(r30) -/* 80268680 002655C0 38 60 00 00 */ li r3, 0 -/* 80268684 002655C4 48 00 00 74 */ b lbl_802686F8 -lbl_80268688: -/* 80268688 002655C8 EC 08 18 28 */ fsubs f0, f8, f3 -/* 8026868C 002655CC EC 22 00 32 */ fmuls f1, f2, f0 -/* 80268690 002655D0 EC 07 20 28 */ fsubs f0, f7, f4 -/* 80268694 002655D4 EC 05 00 32 */ fmuls f0, f5, f0 -/* 80268698 002655D8 EC 01 00 2A */ fadds f0, f1, f0 -/* 8026869C 002655DC EC 20 30 24 */ fdivs f1, f0, f6 -/* 802686A0 002655E0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 802686A4 002655E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802686A8 002655E8 4C 41 13 82 */ cror 2, 1, 2 -/* 802686AC 002655EC 40 82 00 18 */ bne lbl_802686C4 -/* 802686B0 002655F0 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) -/* 802686B4 002655F4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802686B8 002655F8 4C 40 13 82 */ cror 2, 0, 2 -/* 802686BC 002655FC 40 82 00 08 */ bne lbl_802686C4 -/* 802686C0 00265600 3B E0 00 01 */ li r31, 1 -lbl_802686C4: -/* 802686C4 00265604 EC 02 00 72 */ fmuls f0, f2, f1 -/* 802686C8 00265608 EC 03 00 2A */ fadds f0, f3, f0 -/* 802686CC 0026560C D0 03 00 00 */ stfs f0, 0(r3) -/* 802686D0 00265610 EC 05 00 72 */ fmuls f0, f5, f1 -/* 802686D4 00265614 EC 04 00 2A */ fadds f0, f4, f0 -/* 802686D8 00265618 D0 04 00 00 */ stfs f0, 0(r4) -/* 802686DC 0026561C C0 23 00 00 */ lfs f1, 0(r3) -/* 802686E0 00265620 C0 44 00 00 */ lfs f2, 0(r4) -/* 802686E4 00265624 FC 60 40 90 */ fmr f3, f8 -/* 802686E8 00265628 FC 80 38 90 */ fmr f4, f7 -/* 802686EC 0026562C 4B FF FF 29 */ bl cM3d_Len2dSq__Fffff -/* 802686F0 00265630 D0 3E 00 00 */ stfs f1, 0(r30) -/* 802686F4 00265634 7F E3 FB 78 */ mr r3, r31 -lbl_802686F8: -/* 802686F8 00265638 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 802686FC 0026563C 83 C1 00 08 */ lwz r30, 8(r1) -/* 80268700 00265640 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80268704 00265644 7C 08 03 A6 */ mtlr r0 -/* 80268708 00265648 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026870C 0026564C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268710.s b/include/SComponent/c_m3d/asm/func_80268710.s deleted file mode 100644 index 61cc804c41..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268710.s +++ /dev/null @@ -1,70 +0,0 @@ -/* 80268710 00265650 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 80268714 00265654 7C 08 02 A6 */ mflr r0 -/* 80268718 00265658 90 01 00 54 */ stw r0, 0x54(r1) -/* 8026871C 0026565C DB E1 00 40 */ stfd f31, 0x40(r1) -/* 80268720 00265660 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 -/* 80268724 00265664 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268728 00265668 48 0F 9A AD */ bl _savegpr_27 -/* 8026872C 0026566C 7C 7B 1B 78 */ mr r27, r3 -/* 80268730 00265670 7C 9C 23 78 */ mr r28, r4 -/* 80268734 00265674 7C BD 2B 78 */ mr r29, r5 -/* 80268738 00265678 7C DE 33 78 */ mr r30, r6 -/* 8026873C 0026567C 38 7B 00 0C */ addi r3, r27, 0xc -/* 80268740 00265680 7F 64 DB 78 */ mr r4, r27 -/* 80268744 00265684 38 A1 00 14 */ addi r5, r1, 0x14 -/* 80268748 00265688 48 0D E9 6D */ bl PSVECSubtract -/* 8026874C 0026568C 38 61 00 14 */ addi r3, r1, 0x14 -/* 80268750 00265690 7C 64 1B 78 */ mr r4, r3 -/* 80268754 00265694 48 0D EA 41 */ bl PSVECDotProduct -/* 80268758 00265698 FF E0 08 90 */ fmr f31, f1 -/* 8026875C 0026569C FC 00 FA 10 */ fabs f0, f31 -/* 80268760 002656A0 FC 20 00 18 */ frsp f1, f0 -/* 80268764 002656A4 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 80268768 002656A8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026876C 002656AC 40 80 00 14 */ bge lbl_80268780 -/* 80268770 002656B0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 80268774 002656B4 D0 1E 00 00 */ stfs f0, 0(r30) -/* 80268778 002656B8 38 60 00 00 */ li r3, 0 -/* 8026877C 002656BC 48 00 00 78 */ b lbl_802687F4 -lbl_80268780: -/* 80268780 002656C0 7F 83 E3 78 */ mr r3, r28 -/* 80268784 002656C4 7F 64 DB 78 */ mr r4, r27 -/* 80268788 002656C8 38 A1 00 08 */ addi r5, r1, 8 -/* 8026878C 002656CC 48 0D E9 29 */ bl PSVECSubtract -/* 80268790 002656D0 38 61 00 08 */ addi r3, r1, 8 -/* 80268794 002656D4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80268798 002656D8 48 0D E9 FD */ bl PSVECDotProduct -/* 8026879C 002656DC EC 21 F8 24 */ fdivs f1, f1, f31 -/* 802687A0 002656E0 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 802687A4 002656E4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802687A8 002656E8 41 80 00 10 */ blt lbl_802687B8 -/* 802687AC 002656EC C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) -/* 802687B0 002656F0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 802687B4 002656F4 40 81 00 0C */ ble lbl_802687C0 -lbl_802687B8: -/* 802687B8 002656F8 3B E0 00 00 */ li r31, 0 -/* 802687BC 002656FC 48 00 00 08 */ b lbl_802687C4 -lbl_802687C0: -/* 802687C0 00265700 3B E0 00 01 */ li r31, 1 -lbl_802687C4: -/* 802687C4 00265704 38 61 00 14 */ addi r3, r1, 0x14 -/* 802687C8 00265708 7C 64 1B 78 */ mr r4, r3 -/* 802687CC 0026570C 48 0D E9 0D */ bl PSVECScale -/* 802687D0 00265710 38 61 00 14 */ addi r3, r1, 0x14 -/* 802687D4 00265714 7F 64 DB 78 */ mr r4, r27 -/* 802687D8 00265718 7F A5 EB 78 */ mr r5, r29 -/* 802687DC 0026571C 48 0D E8 B5 */ bl PSVECAdd -/* 802687E0 00265720 7F A3 EB 78 */ mr r3, r29 -/* 802687E4 00265724 7F 84 E3 78 */ mr r4, r28 -/* 802687E8 00265728 48 0D EB B5 */ bl PSVECSquareDistance -/* 802687EC 0026572C D0 3E 00 00 */ stfs f1, 0(r30) -/* 802687F0 00265730 7F E3 FB 78 */ mr r3, r31 -lbl_802687F4: -/* 802687F4 00265734 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 -/* 802687F8 00265738 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 802687FC 0026573C 39 61 00 40 */ addi r11, r1, 0x40 -/* 80268800 00265740 48 0F 9A 21 */ bl _restgpr_27 -/* 80268804 00265744 80 01 00 54 */ lwz r0, 0x54(r1) -/* 80268808 00265748 7C 08 03 A6 */ mtlr r0 -/* 8026880C 0026574C 38 21 00 50 */ addi r1, r1, 0x50 -/* 80268810 00265750 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268814.s b/include/SComponent/c_m3d/asm/func_80268814.s deleted file mode 100644 index 143baa8b8a..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268814.s +++ /dev/null @@ -1,34 +0,0 @@ -/* 80268814 00265754 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 80268818 00265758 7C 08 02 A6 */ mflr r0 -/* 8026881C 0026575C 90 01 00 24 */ stw r0, 0x24(r1) -/* 80268820 00265760 DB E1 00 10 */ stfd f31, 0x10(r1) -/* 80268824 00265764 F3 E1 00 18 */ psq_st f31, 24(r1), 0, 0 -/* 80268828 00265768 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026882C 0026576C 93 C1 00 08 */ stw r30, 8(r1) -/* 80268830 00265770 7C 7E 1B 78 */ mr r30, r3 -/* 80268834 00265774 7C 9F 23 78 */ mr r31, r4 -/* 80268838 00265778 48 0D E9 19 */ bl PSVECMag -/* 8026883C 0026577C FF E0 08 90 */ fmr f31, f1 -/* 80268840 00265780 FC 00 FA 10 */ fabs f0, f31 -/* 80268844 00265784 FC 20 00 18 */ frsp f1, f0 -/* 80268848 00265788 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026884C 0026578C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268850 00265790 40 80 00 0C */ bge lbl_8026885C -/* 80268854 00265794 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) -/* 80268858 00265798 48 00 00 1C */ b lbl_80268874 -lbl_8026885C: -/* 8026885C 0026579C 7F C3 F3 78 */ mr r3, r30 -/* 80268860 002657A0 7F E4 FB 78 */ mr r4, r31 -/* 80268864 002657A4 48 0D E9 31 */ bl PSVECDotProduct -/* 80268868 002657A8 C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 8026886C 002657AC EC 00 08 2A */ fadds f0, f0, f1 -/* 80268870 002657B0 EC 20 F8 24 */ fdivs f1, f0, f31 -lbl_80268874: -/* 80268874 002657B4 E3 E1 00 18 */ psq_l f31, 24(r1), 0, 0 -/* 80268878 002657B8 CB E1 00 10 */ lfd f31, 0x10(r1) -/* 8026887C 002657BC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 80268880 002657C0 83 C1 00 08 */ lwz r30, 8(r1) -/* 80268884 002657C4 80 01 00 24 */ lwz r0, 0x24(r1) -/* 80268888 002657C8 7C 08 03 A6 */ mtlr r0 -/* 8026888C 002657CC 38 21 00 20 */ addi r1, r1, 0x20 -/* 80268890 002657D0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268894.s b/include/SComponent/c_m3d/asm/func_80268894.s deleted file mode 100644 index 571a81b3d9..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268894.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 80268894 002657D4 EC 63 08 28 */ fsubs f3, f3, f1 -/* 80268898 002657D8 EC 06 10 28 */ fsubs f0, f6, f2 -/* 8026889C 002657DC EC 63 00 32 */ fmuls f3, f3, f0 -/* 802688A0 002657E0 EC 44 10 28 */ fsubs f2, f4, f2 -/* 802688A4 002657E4 EC 05 08 28 */ fsubs f0, f5, f1 -/* 802688A8 002657E8 EC 02 00 32 */ fmuls f0, f2, f0 -/* 802688AC 002657EC EC 23 00 28 */ fsubs f1, f3, f0 -/* 802688B0 002657F0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d/asm/func_802688B4.s b/include/SComponent/c_m3d/asm/func_802688B4.s deleted file mode 100644 index 8d619ef553..0000000000 --- a/include/SComponent/c_m3d/asm/func_802688B4.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 802688B4 002657F4 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 802688B8 002657F8 7C 08 02 A6 */ mflr r0 -/* 802688BC 002657FC 90 01 00 34 */ stw r0, 0x34(r1) -/* 802688C0 00265800 39 61 00 30 */ addi r11, r1, 0x30 -/* 802688C4 00265804 48 0F 99 19 */ bl _savegpr_29 -/* 802688C8 00265808 7C 7D 1B 78 */ mr r29, r3 -/* 802688CC 0026580C 7C BE 2B 78 */ mr r30, r5 -/* 802688D0 00265810 7C DF 33 78 */ mr r31, r6 -/* 802688D4 00265814 7C 83 23 78 */ mr r3, r4 -/* 802688D8 00265818 7F A4 EB 78 */ mr r4, r29 -/* 802688DC 0026581C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 802688E0 00265820 48 0D E7 D5 */ bl PSVECSubtract -/* 802688E4 00265824 7F C3 F3 78 */ mr r3, r30 -/* 802688E8 00265828 7F A4 EB 78 */ mr r4, r29 -/* 802688EC 0026582C 38 A1 00 08 */ addi r5, r1, 8 -/* 802688F0 00265830 48 0D E7 C5 */ bl PSVECSubtract -/* 802688F4 00265834 38 61 00 14 */ addi r3, r1, 0x14 -/* 802688F8 00265838 38 81 00 08 */ addi r4, r1, 8 -/* 802688FC 0026583C 7F E5 FB 78 */ mr r5, r31 -/* 80268900 00265840 48 0D E8 B5 */ bl PSVECCrossProduct -/* 80268904 00265844 39 61 00 30 */ addi r11, r1, 0x30 -/* 80268908 00265848 48 0F 99 21 */ bl _restgpr_29 -/* 8026890C 0026584C 80 01 00 34 */ lwz r0, 0x34(r1) -/* 80268910 00265850 7C 08 03 A6 */ mtlr r0 -/* 80268914 00265854 38 21 00 30 */ addi r1, r1, 0x30 -/* 80268918 00265858 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026891C.s b/include/SComponent/c_m3d/asm/func_8026891C.s deleted file mode 100644 index 701a05376d..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026891C.s +++ /dev/null @@ -1,53 +0,0 @@ -/* 8026891C 0026585C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 80268920 00265860 7C 08 02 A6 */ mflr r0 -/* 80268924 00265864 90 01 00 34 */ stw r0, 0x34(r1) -/* 80268928 00265868 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026892C 0026586C 48 0F 98 AD */ bl _savegpr_28 -/* 80268930 00265870 7C 7C 1B 78 */ mr r28, r3 -/* 80268934 00265874 7C BD 2B 78 */ mr r29, r5 -/* 80268938 00265878 7C DE 33 78 */ mr r30, r6 -/* 8026893C 0026587C 7C FF 3B 78 */ mr r31, r7 -/* 80268940 00265880 7C 83 23 78 */ mr r3, r4 -/* 80268944 00265884 7F 84 E3 78 */ mr r4, r28 -/* 80268948 00265888 38 A1 00 08 */ addi r5, r1, 8 -/* 8026894C 0026588C 48 0D E7 69 */ bl PSVECSubtract -/* 80268950 00265890 7F A3 EB 78 */ mr r3, r29 -/* 80268954 00265894 7F 84 E3 78 */ mr r4, r28 -/* 80268958 00265898 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8026895C 0026589C 48 0D E7 59 */ bl PSVECSubtract -/* 80268960 002658A0 38 61 00 08 */ addi r3, r1, 8 -/* 80268964 002658A4 38 81 00 14 */ addi r4, r1, 0x14 -/* 80268968 002658A8 7F C5 F3 78 */ mr r5, r30 -/* 8026896C 002658AC 48 0D E8 49 */ bl PSVECCrossProduct -/* 80268970 002658B0 7F C3 F3 78 */ mr r3, r30 -/* 80268974 002658B4 48 0D E7 DD */ bl PSVECMag -/* 80268978 002658B8 FC 00 0A 10 */ fabs f0, f1 -/* 8026897C 002658BC FC 40 00 18 */ frsp f2, f0 -/* 80268980 002658C0 C0 02 B7 3C */ lfs f0, lbl_8045513C-_SDA2_BASE_(r2) -/* 80268984 002658C4 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80268988 002658C8 4C 41 13 82 */ cror 2, 1, 2 -/* 8026898C 002658CC 40 82 00 30 */ bne lbl_802689BC -/* 80268990 002658D0 7F C3 F3 78 */ mr r3, r30 -/* 80268994 002658D4 7F C4 F3 78 */ mr r4, r30 -/* 80268998 002658D8 C0 02 B7 38 */ lfs f0, lbl_80455138-_SDA2_BASE_(r2) -/* 8026899C 002658DC EC 20 08 24 */ fdivs f1, f0, f1 -/* 802689A0 002658E0 48 0D E7 39 */ bl PSVECScale -/* 802689A4 002658E4 7F C3 F3 78 */ mr r3, r30 -/* 802689A8 002658E8 7F 84 E3 78 */ mr r4, r28 -/* 802689AC 002658EC 48 0D E7 E9 */ bl PSVECDotProduct -/* 802689B0 002658F0 FC 00 08 50 */ fneg f0, f1 -/* 802689B4 002658F4 D0 1F 00 00 */ stfs f0, 0(r31) -/* 802689B8 002658F8 48 00 00 18 */ b lbl_802689D0 -lbl_802689BC: -/* 802689BC 002658FC C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 802689C0 00265900 D0 1E 00 04 */ stfs f0, 4(r30) -/* 802689C4 00265904 D0 1F 00 00 */ stfs f0, 0(r31) -/* 802689C8 00265908 D0 1E 00 08 */ stfs f0, 8(r30) -/* 802689CC 0026590C D0 1E 00 00 */ stfs f0, 0(r30) -lbl_802689D0: -/* 802689D0 00265910 39 61 00 30 */ addi r11, r1, 0x30 -/* 802689D4 00265914 48 0F 98 51 */ bl _restgpr_28 -/* 802689D8 00265918 80 01 00 34 */ lwz r0, 0x34(r1) -/* 802689DC 0026591C 7C 08 03 A6 */ mtlr r0 -/* 802689E0 00265920 38 21 00 30 */ addi r1, r1, 0x30 -/* 802689E4 00265924 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_802689E8.s b/include/SComponent/c_m3d/asm/func_802689E8.s deleted file mode 100644 index c0dea96fc3..0000000000 --- a/include/SComponent/c_m3d/asm/func_802689E8.s +++ /dev/null @@ -1,89 +0,0 @@ -/* 802689E8 00265928 C0 64 00 0C */ lfs f3, 0xc(r4) -/* 802689EC 0026592C C0 44 00 00 */ lfs f2, 0(r4) -/* 802689F0 00265930 C0 23 00 0C */ lfs f1, 0xc(r3) -/* 802689F4 00265934 C0 03 00 00 */ lfs f0, 0(r3) -/* 802689F8 00265938 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 802689FC 0026593C 40 81 00 0C */ ble lbl_80268A08 -/* 80268A00 00265940 38 00 00 00 */ li r0, 0 -/* 80268A04 00265944 48 00 00 38 */ b lbl_80268A3C -lbl_80268A08: -/* 80268A08 00265948 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80268A0C 0026594C 40 80 00 0C */ bge lbl_80268A18 -/* 80268A10 00265950 38 00 00 00 */ li r0, 0 -/* 80268A14 00265954 48 00 00 28 */ b lbl_80268A3C -lbl_80268A18: -/* 80268A18 00265958 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80268A1C 0026595C 40 81 00 0C */ ble lbl_80268A28 -/* 80268A20 00265960 38 00 00 00 */ li r0, 0 -/* 80268A24 00265964 48 00 00 18 */ b lbl_80268A3C -lbl_80268A28: -/* 80268A28 00265968 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80268A2C 0026596C 40 80 00 0C */ bge lbl_80268A38 -/* 80268A30 00265970 38 00 00 00 */ li r0, 0 -/* 80268A34 00265974 48 00 00 08 */ b lbl_80268A3C -lbl_80268A38: -/* 80268A38 00265978 38 00 00 01 */ li r0, 1 -lbl_80268A3C: -/* 80268A3C 0026597C 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80268A40 00265980 41 82 00 C4 */ beq lbl_80268B04 -/* 80268A44 00265984 C0 64 00 10 */ lfs f3, 0x10(r4) -/* 80268A48 00265988 C0 44 00 04 */ lfs f2, 4(r4) -/* 80268A4C 0026598C C0 23 00 10 */ lfs f1, 0x10(r3) -/* 80268A50 00265990 C0 03 00 04 */ lfs f0, 4(r3) -/* 80268A54 00265994 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 80268A58 00265998 40 81 00 0C */ ble lbl_80268A64 -/* 80268A5C 0026599C 38 00 00 00 */ li r0, 0 -/* 80268A60 002659A0 48 00 00 38 */ b lbl_80268A98 -lbl_80268A64: -/* 80268A64 002659A4 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80268A68 002659A8 40 80 00 0C */ bge lbl_80268A74 -/* 80268A6C 002659AC 38 00 00 00 */ li r0, 0 -/* 80268A70 002659B0 48 00 00 28 */ b lbl_80268A98 -lbl_80268A74: -/* 80268A74 002659B4 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80268A78 002659B8 40 81 00 0C */ ble lbl_80268A84 -/* 80268A7C 002659BC 38 00 00 00 */ li r0, 0 -/* 80268A80 002659C0 48 00 00 18 */ b lbl_80268A98 -lbl_80268A84: -/* 80268A84 002659C4 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80268A88 002659C8 40 80 00 0C */ bge lbl_80268A94 -/* 80268A8C 002659CC 38 00 00 00 */ li r0, 0 -/* 80268A90 002659D0 48 00 00 08 */ b lbl_80268A98 -lbl_80268A94: -/* 80268A94 002659D4 38 00 00 01 */ li r0, 1 -lbl_80268A98: -/* 80268A98 002659D8 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80268A9C 002659DC 41 82 00 68 */ beq lbl_80268B04 -/* 80268AA0 002659E0 C0 64 00 14 */ lfs f3, 0x14(r4) -/* 80268AA4 002659E4 C0 44 00 08 */ lfs f2, 8(r4) -/* 80268AA8 002659E8 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 80268AAC 002659EC C0 03 00 08 */ lfs f0, 8(r3) -/* 80268AB0 002659F0 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 80268AB4 002659F4 40 81 00 0C */ ble lbl_80268AC0 -/* 80268AB8 002659F8 38 00 00 00 */ li r0, 0 -/* 80268ABC 002659FC 48 00 00 38 */ b lbl_80268AF4 -lbl_80268AC0: -/* 80268AC0 00265A00 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 80268AC4 00265A04 40 80 00 0C */ bge lbl_80268AD0 -/* 80268AC8 00265A08 38 00 00 00 */ li r0, 0 -/* 80268ACC 00265A0C 48 00 00 28 */ b lbl_80268AF4 -lbl_80268AD0: -/* 80268AD0 00265A10 FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 80268AD4 00265A14 40 81 00 0C */ ble lbl_80268AE0 -/* 80268AD8 00265A18 38 00 00 00 */ li r0, 0 -/* 80268ADC 00265A1C 48 00 00 18 */ b lbl_80268AF4 -lbl_80268AE0: -/* 80268AE0 00265A20 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80268AE4 00265A24 40 80 00 0C */ bge lbl_80268AF0 -/* 80268AE8 00265A28 38 00 00 00 */ li r0, 0 -/* 80268AEC 00265A2C 48 00 00 08 */ b lbl_80268AF4 -lbl_80268AF0: -/* 80268AF0 00265A30 38 00 00 01 */ li r0, 1 -lbl_80268AF4: -/* 80268AF4 00265A34 54 00 06 3F */ clrlwi. r0, r0, 0x18 -/* 80268AF8 00265A38 41 82 00 0C */ beq lbl_80268B04 -/* 80268AFC 00265A3C 38 60 00 01 */ li r3, 1 -/* 80268B00 00265A40 4E 80 00 20 */ blr -lbl_80268B04: -/* 80268B04 00265A44 38 60 00 00 */ li r3, 0 -/* 80268B08 00265A48 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268B0C.s b/include/SComponent/c_m3d/asm/func_80268B0C.s deleted file mode 100644 index 8905a3eea6..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268B0C.s +++ /dev/null @@ -1,47 +0,0 @@ -/* 80268B0C 00265A4C C0 23 00 00 */ lfs f1, 0(r3) -/* 80268B10 00265A50 C0 44 00 00 */ lfs f2, 0(r4) -/* 80268B14 00265A54 C0 64 00 0C */ lfs f3, 0xc(r4) -/* 80268B18 00265A58 EC 02 18 2A */ fadds f0, f2, f3 -/* 80268B1C 00265A5C FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268B20 00265A60 40 81 00 0C */ ble lbl_80268B2C -/* 80268B24 00265A64 38 60 00 00 */ li r3, 0 -/* 80268B28 00265A68 4E 80 00 20 */ blr -lbl_80268B2C: -/* 80268B2C 00265A6C C0 23 00 0C */ lfs f1, 0xc(r3) -/* 80268B30 00265A70 EC 02 18 28 */ fsubs f0, f2, f3 -/* 80268B34 00265A74 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268B38 00265A78 40 80 00 0C */ bge lbl_80268B44 -/* 80268B3C 00265A7C 38 60 00 00 */ li r3, 0 -/* 80268B40 00265A80 4E 80 00 20 */ blr -lbl_80268B44: -/* 80268B44 00265A84 C0 23 00 08 */ lfs f1, 8(r3) -/* 80268B48 00265A88 C0 44 00 08 */ lfs f2, 8(r4) -/* 80268B4C 00265A8C EC 02 18 2A */ fadds f0, f2, f3 -/* 80268B50 00265A90 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268B54 00265A94 40 81 00 0C */ ble lbl_80268B60 -/* 80268B58 00265A98 38 60 00 00 */ li r3, 0 -/* 80268B5C 00265A9C 4E 80 00 20 */ blr -lbl_80268B60: -/* 80268B60 00265AA0 C0 23 00 14 */ lfs f1, 0x14(r3) -/* 80268B64 00265AA4 EC 02 18 28 */ fsubs f0, f2, f3 -/* 80268B68 00265AA8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268B6C 00265AAC 40 80 00 0C */ bge lbl_80268B78 -/* 80268B70 00265AB0 38 60 00 00 */ li r3, 0 -/* 80268B74 00265AB4 4E 80 00 20 */ blr -lbl_80268B78: -/* 80268B78 00265AB8 C0 23 00 04 */ lfs f1, 4(r3) -/* 80268B7C 00265ABC C0 44 00 04 */ lfs f2, 4(r4) -/* 80268B80 00265AC0 C0 04 00 10 */ lfs f0, 0x10(r4) -/* 80268B84 00265AC4 EC 02 00 2A */ fadds f0, f2, f0 -/* 80268B88 00265AC8 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 80268B8C 00265ACC 40 81 00 0C */ ble lbl_80268B98 -/* 80268B90 00265AD0 38 60 00 00 */ li r3, 0 -/* 80268B94 00265AD4 4E 80 00 20 */ blr -lbl_80268B98: -/* 80268B98 00265AD8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 80268B9C 00265ADC FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80268BA0 00265AE0 7C 00 00 26 */ mfcr r0 -/* 80268BA4 00265AE4 54 00 0F FE */ srwi r0, r0, 0x1f -/* 80268BA8 00265AE8 7C 00 00 34 */ cntlzw r0, r0 -/* 80268BAC 00265AEC 54 03 D9 7E */ srwi r3, r0, 5 -/* 80268BB0 00265AF0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80268ED4.s b/include/SComponent/c_m3d/asm/func_80268ED4.s deleted file mode 100644 index b4f2be8c60..0000000000 --- a/include/SComponent/c_m3d/asm/func_80268ED4.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 80268ED4 00265E14 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 80268ED8 00265E18 7C 08 02 A6 */ mflr r0 -/* 80268EDC 00265E1C 90 01 00 14 */ stw r0, 0x14(r1) -/* 80268EE0 00265E20 EC 61 10 28 */ fsubs f3, f1, f2 -/* 80268EE4 00265E24 FC 00 1A 10 */ fabs f0, f3 -/* 80268EE8 00265E28 FC 40 00 18 */ frsp f2, f0 -/* 80268EEC 00265E2C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 80268EF0 00265E30 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80268EF4 00265E34 40 80 00 24 */ bge lbl_80268F18 -/* 80268EF8 00265E38 C0 04 00 00 */ lfs f0, 0(r4) -/* 80268EFC 00265E3C D0 05 00 00 */ stfs f0, 0(r5) -/* 80268F00 00265E40 C0 04 00 04 */ lfs f0, 4(r4) -/* 80268F04 00265E44 D0 05 00 04 */ stfs f0, 4(r5) -/* 80268F08 00265E48 C0 04 00 08 */ lfs f0, 8(r4) -/* 80268F0C 00265E4C D0 05 00 08 */ stfs f0, 8(r5) -/* 80268F10 00265E50 38 60 00 00 */ li r3, 0 -/* 80268F14 00265E54 48 00 00 10 */ b lbl_80268F24 -lbl_80268F18: -/* 80268F18 00265E58 EC 21 18 24 */ fdivs f1, f1, f3 -/* 80268F1C 00265E5C 4B FF F6 95 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec -/* 80268F20 00265E60 38 60 00 01 */ li r3, 1 -lbl_80268F24: -/* 80268F24 00265E64 80 01 00 14 */ lwz r0, 0x14(r1) -/* 80268F28 00265E68 7C 08 03 A6 */ mtlr r0 -/* 80268F2C 00265E6C 38 21 00 10 */ addi r1, r1, 0x10 -/* 80268F30 00265E70 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_80269C2C.s b/include/SComponent/c_m3d/asm/func_80269C2C.s deleted file mode 100644 index 181bc35608..0000000000 --- a/include/SComponent/c_m3d/asm/func_80269C2C.s +++ /dev/null @@ -1,96 +0,0 @@ -/* 80269C2C 00266B6C C0 03 00 00 */ lfs f0, 0(r3) -/* 80269C30 00266B70 C0 44 00 00 */ lfs f2, 0(r4) -/* 80269C34 00266B74 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269C38 00266B78 40 80 00 10 */ bge lbl_80269C48 -/* 80269C3C 00266B7C FC 60 00 90 */ fmr f3, f0 -/* 80269C40 00266B80 FC 80 10 90 */ fmr f4, f2 -/* 80269C44 00266B84 48 00 00 0C */ b lbl_80269C50 -lbl_80269C48: -/* 80269C48 00266B88 FC 60 10 90 */ fmr f3, f2 -/* 80269C4C 00266B8C FC 80 00 90 */ fmr f4, f0 -lbl_80269C50: -/* 80269C50 00266B90 C0 05 00 00 */ lfs f0, 0(r5) -/* 80269C54 00266B94 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80269C58 00266B98 40 81 00 0C */ ble lbl_80269C64 -/* 80269C5C 00266B9C FC 60 00 90 */ fmr f3, f0 -/* 80269C60 00266BA0 48 00 00 10 */ b lbl_80269C70 -lbl_80269C64: -/* 80269C64 00266BA4 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 80269C68 00266BA8 40 80 00 08 */ bge lbl_80269C70 -/* 80269C6C 00266BAC FC 80 00 90 */ fmr f4, f0 -lbl_80269C70: -/* 80269C70 00266BB0 EC 03 08 28 */ fsubs f0, f3, f1 -/* 80269C74 00266BB4 C0 46 00 00 */ lfs f2, 0(r6) -/* 80269C78 00266BB8 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269C7C 00266BBC 41 81 00 10 */ bgt lbl_80269C8C -/* 80269C80 00266BC0 EC 04 08 2A */ fadds f0, f4, f1 -/* 80269C84 00266BC4 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269C88 00266BC8 40 80 00 0C */ bge lbl_80269C94 -lbl_80269C8C: -/* 80269C8C 00266BCC 38 60 00 00 */ li r3, 0 -/* 80269C90 00266BD0 4E 80 00 20 */ blr -lbl_80269C94: -/* 80269C94 00266BD4 C0 03 00 08 */ lfs f0, 8(r3) -/* 80269C98 00266BD8 C0 64 00 08 */ lfs f3, 8(r4) -/* 80269C9C 00266BDC FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 80269CA0 00266BE0 40 80 00 0C */ bge lbl_80269CAC -/* 80269CA4 00266BE4 FC 40 00 90 */ fmr f2, f0 -/* 80269CA8 00266BE8 48 00 00 0C */ b lbl_80269CB4 -lbl_80269CAC: -/* 80269CAC 00266BEC FC 40 18 90 */ fmr f2, f3 -/* 80269CB0 00266BF0 FC 60 00 90 */ fmr f3, f0 -lbl_80269CB4: -/* 80269CB4 00266BF4 C0 05 00 08 */ lfs f0, 8(r5) -/* 80269CB8 00266BF8 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80269CBC 00266BFC 40 81 00 0C */ ble lbl_80269CC8 -/* 80269CC0 00266C00 FC 40 00 90 */ fmr f2, f0 -/* 80269CC4 00266C04 48 00 00 10 */ b lbl_80269CD4 -lbl_80269CC8: -/* 80269CC8 00266C08 FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80269CCC 00266C0C 40 80 00 08 */ bge lbl_80269CD4 -/* 80269CD0 00266C10 FC 60 00 90 */ fmr f3, f0 -lbl_80269CD4: -/* 80269CD4 00266C14 EC 02 08 28 */ fsubs f0, f2, f1 -/* 80269CD8 00266C18 C0 46 00 08 */ lfs f2, 8(r6) -/* 80269CDC 00266C1C FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269CE0 00266C20 41 81 00 10 */ bgt lbl_80269CF0 -/* 80269CE4 00266C24 EC 03 08 2A */ fadds f0, f3, f1 -/* 80269CE8 00266C28 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269CEC 00266C2C 40 80 00 0C */ bge lbl_80269CF8 -lbl_80269CF0: -/* 80269CF0 00266C30 38 60 00 00 */ li r3, 0 -/* 80269CF4 00266C34 4E 80 00 20 */ blr -lbl_80269CF8: -/* 80269CF8 00266C38 C0 03 00 04 */ lfs f0, 4(r3) -/* 80269CFC 00266C3C C0 64 00 04 */ lfs f3, 4(r4) -/* 80269D00 00266C40 FC 00 18 40 */ fcmpo cr0, f0, f3 -/* 80269D04 00266C44 40 80 00 0C */ bge lbl_80269D10 -/* 80269D08 00266C48 FC 40 00 90 */ fmr f2, f0 -/* 80269D0C 00266C4C 48 00 00 0C */ b lbl_80269D18 -lbl_80269D10: -/* 80269D10 00266C50 FC 40 18 90 */ fmr f2, f3 -/* 80269D14 00266C54 FC 60 00 90 */ fmr f3, f0 -lbl_80269D18: -/* 80269D18 00266C58 C0 05 00 04 */ lfs f0, 4(r5) -/* 80269D1C 00266C5C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 80269D20 00266C60 40 81 00 0C */ ble lbl_80269D2C -/* 80269D24 00266C64 FC 40 00 90 */ fmr f2, f0 -/* 80269D28 00266C68 48 00 00 10 */ b lbl_80269D38 -lbl_80269D2C: -/* 80269D2C 00266C6C FC 03 00 40 */ fcmpo cr0, f3, f0 -/* 80269D30 00266C70 40 80 00 08 */ bge lbl_80269D38 -/* 80269D34 00266C74 FC 60 00 90 */ fmr f3, f0 -lbl_80269D38: -/* 80269D38 00266C78 EC 02 08 28 */ fsubs f0, f2, f1 -/* 80269D3C 00266C7C C0 46 00 04 */ lfs f2, 4(r6) -/* 80269D40 00266C80 FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269D44 00266C84 41 81 00 10 */ bgt lbl_80269D54 -/* 80269D48 00266C88 EC 03 08 2A */ fadds f0, f3, f1 -/* 80269D4C 00266C8C FC 00 10 40 */ fcmpo cr0, f0, f2 -/* 80269D50 00266C90 40 80 00 0C */ bge lbl_80269D5C -lbl_80269D54: -/* 80269D54 00266C94 38 60 00 00 */ li r3, 0 -/* 80269D58 00266C98 4E 80 00 20 */ blr -lbl_80269D5C: -/* 80269D5C 00266C9C 38 60 00 01 */ li r3, 1 -/* 80269D60 00266CA0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BD88.s b/include/SComponent/c_m3d/asm/func_8026BD88.s deleted file mode 100644 index eafdfcba6a..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026BD88.s +++ /dev/null @@ -1,57 +0,0 @@ -/* 8026BD88 00268CC8 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8026BD8C 00268CCC 7C 08 02 A6 */ mflr r0 -/* 8026BD90 00268CD0 90 01 00 44 */ stw r0, 0x44(r1) -/* 8026BD94 00268CD4 DB E1 00 30 */ stfd f31, 0x30(r1) -/* 8026BD98 00268CD8 F3 E1 00 38 */ psq_st f31, 56(r1), 0, 0 -/* 8026BD9C 00268CDC 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BDA0 00268CE0 48 0F 64 3D */ bl _savegpr_29 -/* 8026BDA4 00268CE4 7C 7D 1B 78 */ mr r29, r3 -/* 8026BDA8 00268CE8 7C 9E 23 78 */ mr r30, r4 -/* 8026BDAC 00268CEC 7C BF 2B 78 */ mr r31, r5 -/* 8026BDB0 00268CF0 38 A1 00 0C */ addi r5, r1, 0xc -/* 8026BDB4 00268CF4 38 C1 00 08 */ addi r6, r1, 8 -/* 8026BDB8 00268CF8 4B FF FF 45 */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf -/* 8026BDBC 00268CFC 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8026BDC0 00268D00 41 82 00 78 */ beq lbl_8026BE38 -/* 8026BDC4 00268D04 C0 41 00 0C */ lfs f2, 0xc(r1) -/* 8026BDC8 00268D08 FC 00 12 10 */ fabs f0, f2 -/* 8026BDCC 00268D0C FC 20 00 18 */ frsp f1, f0 -/* 8026BDD0 00268D10 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026BDD4 00268D14 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026BDD8 00268D18 41 80 00 40 */ blt lbl_8026BE18 -/* 8026BDDC 00268D1C C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 8026BDE0 00268D20 EF E0 10 24 */ fdivs f31, f0, f2 -/* 8026BDE4 00268D24 7F A3 EB 78 */ mr r3, r29 -/* 8026BDE8 00268D28 7F C4 F3 78 */ mr r4, r30 -/* 8026BDEC 00268D2C 38 A1 00 10 */ addi r5, r1, 0x10 -/* 8026BDF0 00268D30 48 0D B2 C5 */ bl PSVECSubtract -/* 8026BDF4 00268D34 38 61 00 10 */ addi r3, r1, 0x10 -/* 8026BDF8 00268D38 7C 64 1B 78 */ mr r4, r3 -/* 8026BDFC 00268D3C FC 20 F8 90 */ fmr f1, f31 -/* 8026BE00 00268D40 48 0D B2 D9 */ bl PSVECScale -/* 8026BE04 00268D44 38 61 00 10 */ addi r3, r1, 0x10 -/* 8026BE08 00268D48 7F C4 F3 78 */ mr r4, r30 -/* 8026BE0C 00268D4C 7F E5 FB 78 */ mr r5, r31 -/* 8026BE10 00268D50 48 0D B2 81 */ bl PSVECAdd -/* 8026BE14 00268D54 48 00 00 1C */ b lbl_8026BE30 -lbl_8026BE18: -/* 8026BE18 00268D58 C0 1D 00 00 */ lfs f0, 0(r29) -/* 8026BE1C 00268D5C D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026BE20 00268D60 C0 1D 00 04 */ lfs f0, 4(r29) -/* 8026BE24 00268D64 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026BE28 00268D68 C0 1D 00 08 */ lfs f0, 8(r29) -/* 8026BE2C 00268D6C D0 1F 00 08 */ stfs f0, 8(r31) -lbl_8026BE30: -/* 8026BE30 00268D70 38 60 00 01 */ li r3, 1 -/* 8026BE34 00268D74 48 00 00 08 */ b lbl_8026BE3C -lbl_8026BE38: -/* 8026BE38 00268D78 38 60 00 00 */ li r3, 0 -lbl_8026BE3C: -/* 8026BE3C 00268D7C E3 E1 00 38 */ psq_l f31, 56(r1), 0, 0 -/* 8026BE40 00268D80 CB E1 00 30 */ lfd f31, 0x30(r1) -/* 8026BE44 00268D84 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026BE48 00268D88 48 0F 63 E1 */ bl _restgpr_29 -/* 8026BE4C 00268D8C 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8026BE50 00268D90 7C 08 03 A6 */ mtlr r0 -/* 8026BE54 00268D94 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026BE58 00268D98 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026BE5C.s b/include/SComponent/c_m3d/asm/func_8026BE5C.s deleted file mode 100644 index e68f9f061d..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026BE5C.s +++ /dev/null @@ -1,44 +0,0 @@ -/* 8026BE5C 00268D9C 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8026BE60 00268DA0 7C 08 02 A6 */ mflr r0 -/* 8026BE64 00268DA4 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026BE68 00268DA8 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8026BE6C 00268DAC 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8026BE70 00268DB0 7C 7E 1B 78 */ mr r30, r3 -/* 8026BE74 00268DB4 7C BF 2B 78 */ mr r31, r5 -/* 8026BE78 00268DB8 38 64 00 14 */ addi r3, r4, 0x14 -/* 8026BE7C 00268DBC 38 84 00 20 */ addi r4, r4, 0x20 -/* 8026BE80 00268DC0 38 A1 00 08 */ addi r5, r1, 8 -/* 8026BE84 00268DC4 48 0D B2 0D */ bl PSVECAdd -/* 8026BE88 00268DC8 38 61 00 08 */ addi r3, r1, 8 -/* 8026BE8C 00268DCC 38 81 00 14 */ addi r4, r1, 0x14 -/* 8026BE90 00268DD0 C0 22 B7 C4 */ lfs f1, lbl_804551C4-_SDA2_BASE_(r2) -/* 8026BE94 00268DD4 48 0D B2 45 */ bl PSVECScale -/* 8026BE98 00268DD8 38 61 00 14 */ addi r3, r1, 0x14 -/* 8026BE9C 00268DDC 7F C4 F3 78 */ mr r4, r30 -/* 8026BEA0 00268DE0 48 0D B4 FD */ bl PSVECSquareDistance -/* 8026BEA4 00268DE4 FC 00 0A 10 */ fabs f0, f1 -/* 8026BEA8 00268DE8 FC 40 00 18 */ frsp f2, f0 -/* 8026BEAC 00268DEC C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026BEB0 00268DF0 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8026BEB4 00268DF4 40 80 00 20 */ bge lbl_8026BED4 -/* 8026BEB8 00268DF8 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8026BEBC 00268DFC D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026BEC0 00268E00 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8026BEC4 00268E04 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026BEC8 00268E08 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8026BECC 00268E0C D0 1F 00 08 */ stfs f0, 8(r31) -/* 8026BED0 00268E10 48 00 00 1C */ b lbl_8026BEEC -lbl_8026BED4: -/* 8026BED4 00268E14 7F C3 F3 78 */ mr r3, r30 -/* 8026BED8 00268E18 38 81 00 14 */ addi r4, r1, 0x14 -/* 8026BEDC 00268E1C C0 1E 00 0C */ lfs f0, 0xc(r30) -/* 8026BEE0 00268E20 EC 20 08 24 */ fdivs f1, f0, f1 -/* 8026BEE4 00268E24 7F E5 FB 78 */ mr r5, r31 -/* 8026BEE8 00268E28 4B FF C6 C9 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec -lbl_8026BEEC: -/* 8026BEEC 00268E2C 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8026BEF0 00268E30 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8026BEF4 00268E34 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026BEF8 00268E38 7C 08 03 A6 */ mtlr r0 -/* 8026BEFC 00268E3C 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026BF00 00268E40 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D044.s b/include/SComponent/c_m3d/asm/func_8026D044.s deleted file mode 100644 index b1e783e5dd..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026D044.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 8026D044 00269F84 94 21 FF C0 */ stwu r1, -0x40(r1) -/* 8026D048 00269F88 7C 08 02 A6 */ mflr r0 -/* 8026D04C 00269F8C 90 01 00 44 */ stw r0, 0x44(r1) -/* 8026D050 00269F90 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026D054 00269F94 48 0F 51 89 */ bl _savegpr_29 -/* 8026D058 00269F98 7C 7D 1B 78 */ mr r29, r3 -/* 8026D05C 00269F9C 7C DE 33 78 */ mr r30, r6 -/* 8026D060 00269FA0 7C FF 3B 78 */ mr r31, r7 -/* 8026D064 00269FA4 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026D068 00269FA8 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026D06C 00269FAC 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026D070 00269FB0 38 61 00 08 */ addi r3, r1, 8 -/* 8026D074 00269FB4 48 00 22 A9 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec -/* 8026D078 00269FB8 7F A3 EB 78 */ mr r3, r29 -/* 8026D07C 00269FBC 38 81 00 08 */ addi r4, r1, 8 -/* 8026D080 00269FC0 7F C5 F3 78 */ mr r5, r30 -/* 8026D084 00269FC4 7F E6 FB 78 */ mr r6, r31 -/* 8026D088 00269FC8 4B FF F8 BD */ bl cM3d_Cross_CylLin__FPC8cM3dGCylPC8cM3dGLinP3VecP3Vec -/* 8026D08C 00269FCC 3C 80 80 3A */ lis r4, lbl_803A78F8@ha -/* 8026D090 00269FD0 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l -/* 8026D094 00269FD4 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026D098 00269FD8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026D09C 00269FDC 48 0F 51 8D */ bl _restgpr_29 -/* 8026D0A0 00269FE0 80 01 00 44 */ lwz r0, 0x44(r1) -/* 8026D0A4 00269FE4 7C 08 03 A6 */ mtlr r0 -/* 8026D0A8 00269FE8 38 21 00 40 */ addi r1, r1, 0x40 -/* 8026D0AC 00269FEC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026D0B0.s b/include/SComponent/c_m3d/asm/func_8026D0B0.s deleted file mode 100644 index 1d604dd810..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026D0B0.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 8026D0B0 00269FF0 C0 23 00 00 */ lfs f1, 0(r3) -/* 8026D0B4 00269FF4 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026D0B8 00269FF8 EC 41 00 28 */ fsubs f2, f1, f0 -/* 8026D0BC 00269FFC C0 23 00 08 */ lfs f1, 8(r3) -/* 8026D0C0 0026A000 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026D0C4 0026A004 EC 61 00 28 */ fsubs f3, f1, f0 -/* 8026D0C8 0026A008 C0 83 00 04 */ lfs f4, 4(r3) -/* 8026D0CC 0026A00C C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8026D0D0 0026A010 EC A4 00 2A */ fadds f5, f4, f0 -/* 8026D0D4 0026A014 EC 22 00 B2 */ fmuls f1, f2, f2 -/* 8026D0D8 0026A018 EC 03 00 F2 */ fmuls f0, f3, f3 -/* 8026D0DC 0026A01C EC 21 00 2A */ fadds f1, f1, f0 -/* 8026D0E0 0026A020 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026D0E4 0026A024 EC 00 00 32 */ fmuls f0, f0, f0 -/* 8026D0E8 0026A028 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026D0EC 0026A02C 40 80 00 20 */ bge lbl_8026D10C -/* 8026D0F0 0026A030 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026D0F4 0026A034 FC 04 00 40 */ fcmpo cr0, f4, f0 -/* 8026D0F8 0026A038 40 80 00 14 */ bge lbl_8026D10C -/* 8026D0FC 0026A03C FC 05 00 40 */ fcmpo cr0, f5, f0 -/* 8026D100 0026A040 40 81 00 0C */ ble lbl_8026D10C -/* 8026D104 0026A044 38 60 00 01 */ li r3, 1 -/* 8026D108 0026A048 4E 80 00 20 */ blr -lbl_8026D10C: -/* 8026D10C 0026A04C 38 60 00 00 */ li r3, 0 -/* 8026D110 0026A050 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E4FC.s b/include/SComponent/c_m3d/asm/func_8026E4FC.s deleted file mode 100644 index 9867f78763..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026E4FC.s +++ /dev/null @@ -1,29 +0,0 @@ -/* 8026E4FC 0026B43C 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026E500 0026B440 7C 08 02 A6 */ mflr r0 -/* 8026E504 0026B444 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026E508 0026B448 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026E50C 0026B44C 48 0F 3C D1 */ bl _savegpr_29 -/* 8026E510 0026B450 7C 7D 1B 78 */ mr r29, r3 -/* 8026E514 0026B454 7C 9E 23 78 */ mr r30, r4 -/* 8026E518 0026B458 7C BF 2B 78 */ mr r31, r5 -/* 8026E51C 0026B45C C0 03 00 08 */ lfs f0, 8(r3) -/* 8026E520 0026B460 FC 20 00 50 */ fneg f1, f0 -/* 8026E524 0026B464 C0 03 00 04 */ lfs f0, 4(r3) -/* 8026E528 0026B468 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8026E52C 0026B46C C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) -/* 8026E530 0026B470 4B FF 91 45 */ bl cM_atan2s__Fff -/* 8026E534 0026B474 7C 03 00 D0 */ neg r0, r3 -/* 8026E538 0026B478 B0 1E 00 00 */ sth r0, 0(r30) -/* 8026E53C 0026B47C C0 1D 00 00 */ lfs f0, 0(r29) -/* 8026E540 0026B480 FC 20 00 50 */ fneg f1, f0 -/* 8026E544 0026B484 C0 1D 00 04 */ lfs f0, 4(r29) -/* 8026E548 0026B488 EC 21 00 32 */ fmuls f1, f1, f0 -/* 8026E54C 0026B48C C0 42 B7 38 */ lfs f2, lbl_80455138-_SDA2_BASE_(r2) -/* 8026E550 0026B490 4B FF 91 25 */ bl cM_atan2s__Fff -/* 8026E554 0026B494 B0 7F 00 00 */ sth r3, 0(r31) -/* 8026E558 0026B498 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026E55C 0026B49C 48 0F 3C CD */ bl _restgpr_29 -/* 8026E560 0026B4A0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026E564 0026B4A4 7C 08 03 A6 */ mtlr r0 -/* 8026E568 0026B4A8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026E56C 0026B4AC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E6C4.s b/include/SComponent/c_m3d/asm/func_8026E6C4.s deleted file mode 100644 index 4879a46882..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026E6C4.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8026E6C4 0026B604 EC 42 01 F2 */ fmuls f2, f2, f7 -/* 8026E6C8 0026B608 EC 04 01 B2 */ fmuls f0, f4, f6 -/* 8026E6CC 0026B60C EC 02 00 28 */ fsubs f0, f2, f0 -/* 8026E6D0 0026B610 EC 00 28 24 */ fdivs f0, f0, f5 -/* 8026E6D4 0026B614 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026E6D8 0026B618 EC 43 01 B2 */ fmuls f2, f3, f6 -/* 8026E6DC 0026B61C EC 01 01 F2 */ fmuls f0, f1, f7 -/* 8026E6E0 0026B620 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8026E6E4 0026B624 EC 00 28 24 */ fdivs f0, f0, f5 -/* 8026E6E8 0026B628 D0 04 00 00 */ stfs f0, 0(r4) -/* 8026E6EC 0026B62C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E6F0.s b/include/SComponent/c_m3d/asm/func_8026E6F0.s deleted file mode 100644 index 02bd84a3e8..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026E6F0.s +++ /dev/null @@ -1,114 +0,0 @@ -/* 8026E6F0 0026B630 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8026E6F4 0026B634 7C 08 02 A6 */ mflr r0 -/* 8026E6F8 0026B638 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026E6FC 0026B63C 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026E700 0026B640 48 0F 3A DD */ bl _savegpr_29 -/* 8026E704 0026B644 7C 7D 1B 78 */ mr r29, r3 -/* 8026E708 0026B648 7C 9E 23 78 */ mr r30, r4 -/* 8026E70C 0026B64C 7C BF 2B 78 */ mr r31, r5 -/* 8026E710 0026B650 38 A1 00 08 */ addi r5, r1, 8 -/* 8026E714 0026B654 48 0D 8A A1 */ bl PSVECCrossProduct -/* 8026E718 0026B658 C0 01 00 08 */ lfs f0, 8(r1) -/* 8026E71C 0026B65C FC 00 02 10 */ fabs f0, f0 -/* 8026E720 0026B660 FC 00 00 18 */ frsp f0, f0 -/* 8026E724 0026B664 C0 2D 8C 00 */ lfs f1, lbl_80451180-_SDA_BASE_(r13) -/* 8026E728 0026B668 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026E72C 0026B66C 40 80 00 34 */ bge lbl_8026E760 -/* 8026E730 0026B670 C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8026E734 0026B674 FC 00 02 10 */ fabs f0, f0 -/* 8026E738 0026B678 FC 00 00 18 */ frsp f0, f0 -/* 8026E73C 0026B67C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026E740 0026B680 40 80 00 20 */ bge lbl_8026E760 -/* 8026E744 0026B684 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8026E748 0026B688 FC 00 02 10 */ fabs f0, f0 -/* 8026E74C 0026B68C FC 00 00 18 */ frsp f0, f0 -/* 8026E750 0026B690 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026E754 0026B694 40 80 00 0C */ bge lbl_8026E760 -/* 8026E758 0026B698 38 60 00 00 */ li r3, 0 -/* 8026E75C 0026B69C 48 00 01 2C */ b lbl_8026E888 -lbl_8026E760: -/* 8026E760 0026B6A0 C0 A1 00 08 */ lfs f5, 8(r1) -/* 8026E764 0026B6A4 FC 00 2A 10 */ fabs f0, f5 -/* 8026E768 0026B6A8 FC 20 00 18 */ frsp f1, f0 -/* 8026E76C 0026B6AC C0 01 00 0C */ lfs f0, 0xc(r1) -/* 8026E770 0026B6B0 FC 00 02 10 */ fabs f0, f0 -/* 8026E774 0026B6B4 FC 40 00 18 */ frsp f2, f0 -/* 8026E778 0026B6B8 C0 01 00 10 */ lfs f0, 0x10(r1) -/* 8026E77C 0026B6BC FC 00 02 10 */ fabs f0, f0 -/* 8026E780 0026B6C0 FC 00 00 18 */ frsp f0, f0 -/* 8026E784 0026B6C4 FC 01 10 40 */ fcmpo cr0, f1, f2 -/* 8026E788 0026B6C8 4C 41 13 82 */ cror 2, 1, 2 -/* 8026E78C 0026B6CC 40 82 00 40 */ bne lbl_8026E7CC -/* 8026E790 0026B6D0 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026E794 0026B6D4 4C 41 13 82 */ cror 2, 1, 2 -/* 8026E798 0026B6D8 40 82 00 34 */ bne lbl_8026E7CC -/* 8026E79C 0026B6DC C0 3D 00 04 */ lfs f1, 4(r29) -/* 8026E7A0 0026B6E0 C0 5D 00 08 */ lfs f2, 8(r29) -/* 8026E7A4 0026B6E4 C0 7E 00 04 */ lfs f3, 4(r30) -/* 8026E7A8 0026B6E8 C0 9E 00 08 */ lfs f4, 8(r30) -/* 8026E7AC 0026B6EC C0 DD 00 0C */ lfs f6, 0xc(r29) -/* 8026E7B0 0026B6F0 C0 FE 00 0C */ lfs f7, 0xc(r30) -/* 8026E7B4 0026B6F4 38 7F 00 04 */ addi r3, r31, 4 -/* 8026E7B8 0026B6F8 38 9F 00 08 */ addi r4, r31, 8 -/* 8026E7BC 0026B6FC 4B FF FF 09 */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf -/* 8026E7C0 0026B700 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 8026E7C4 0026B704 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026E7C8 0026B708 48 00 00 80 */ b lbl_8026E848 -lbl_8026E7CC: -/* 8026E7CC 0026B70C FC 02 08 40 */ fcmpo cr0, f2, f1 -/* 8026E7D0 0026B710 4C 41 13 82 */ cror 2, 1, 2 -/* 8026E7D4 0026B714 40 82 00 44 */ bne lbl_8026E818 -/* 8026E7D8 0026B718 FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8026E7DC 0026B71C 4C 41 13 82 */ cror 2, 1, 2 -/* 8026E7E0 0026B720 40 82 00 38 */ bne lbl_8026E818 -/* 8026E7E4 0026B724 C0 3D 00 08 */ lfs f1, 8(r29) -/* 8026E7E8 0026B728 C0 5D 00 00 */ lfs f2, 0(r29) -/* 8026E7EC 0026B72C C0 7E 00 08 */ lfs f3, 8(r30) -/* 8026E7F0 0026B730 C0 9E 00 00 */ lfs f4, 0(r30) -/* 8026E7F4 0026B734 C0 A1 00 0C */ lfs f5, 0xc(r1) -/* 8026E7F8 0026B738 C0 DD 00 0C */ lfs f6, 0xc(r29) -/* 8026E7FC 0026B73C C0 FE 00 0C */ lfs f7, 0xc(r30) -/* 8026E800 0026B740 38 7F 00 08 */ addi r3, r31, 8 -/* 8026E804 0026B744 7F E4 FB 78 */ mr r4, r31 -/* 8026E808 0026B748 4B FF FE BD */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf -/* 8026E80C 0026B74C C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 8026E810 0026B750 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026E814 0026B754 48 00 00 34 */ b lbl_8026E848 -lbl_8026E818: -/* 8026E818 0026B758 C0 3D 00 00 */ lfs f1, 0(r29) -/* 8026E81C 0026B75C C0 5D 00 04 */ lfs f2, 4(r29) -/* 8026E820 0026B760 C0 7E 00 00 */ lfs f3, 0(r30) -/* 8026E824 0026B764 C0 9E 00 04 */ lfs f4, 4(r30) -/* 8026E828 0026B768 C0 A1 00 10 */ lfs f5, 0x10(r1) -/* 8026E82C 0026B76C C0 DD 00 0C */ lfs f6, 0xc(r29) -/* 8026E830 0026B770 C0 FE 00 0C */ lfs f7, 0xc(r30) -/* 8026E834 0026B774 7F E3 FB 78 */ mr r3, r31 -/* 8026E838 0026B778 38 9F 00 04 */ addi r4, r31, 4 -/* 8026E83C 0026B77C 4B FF FE 89 */ bl cM3d_PlaneCrossLineProcWork__FfffffffPfPf -/* 8026E840 0026B780 C0 02 B7 18 */ lfs f0, lbl_80455118-_SDA2_BASE_(r2) -/* 8026E844 0026B784 D0 1F 00 08 */ stfs f0, 8(r31) -lbl_8026E848: -/* 8026E848 0026B788 7F E3 FB 78 */ mr r3, r31 -/* 8026E84C 0026B78C 48 0D 89 05 */ bl PSVECMag -/* 8026E850 0026B790 FC 00 0A 10 */ fabs f0, f1 -/* 8026E854 0026B794 FC 40 00 18 */ frsp f2, f0 -/* 8026E858 0026B798 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026E85C 0026B79C FC 02 00 40 */ fcmpo cr0, f2, f0 -/* 8026E860 0026B7A0 40 80 00 08 */ bge lbl_8026E868 -/* 8026E864 0026B7A4 C0 22 B7 38 */ lfs f1, lbl_80455138-_SDA2_BASE_(r2) -lbl_8026E868: -/* 8026E868 0026B7A8 38 61 00 08 */ addi r3, r1, 8 -/* 8026E86C 0026B7AC 7C 64 1B 78 */ mr r4, r3 -/* 8026E870 0026B7B0 48 0D 88 69 */ bl PSVECScale -/* 8026E874 0026B7B4 7F E3 FB 78 */ mr r3, r31 -/* 8026E878 0026B7B8 38 81 00 08 */ addi r4, r1, 8 -/* 8026E87C 0026B7BC 38 BF 00 0C */ addi r5, r31, 0xc -/* 8026E880 0026B7C0 48 0D 88 11 */ bl PSVECAdd -/* 8026E884 0026B7C4 38 60 00 01 */ li r3, 1 -lbl_8026E888: -/* 8026E888 0026B7C8 39 61 00 30 */ addi r11, r1, 0x30 -/* 8026E88C 0026B7CC 48 0F 39 9D */ bl _restgpr_29 -/* 8026E890 0026B7D0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026E894 0026B7D4 7C 08 03 A6 */ mtlr r0 -/* 8026E898 0026B7D8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026E89C 0026B7DC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E8A0.s b/include/SComponent/c_m3d/asm/func_8026E8A0.s deleted file mode 100644 index bba9c70615..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026E8A0.s +++ /dev/null @@ -1,59 +0,0 @@ -/* 8026E8A0 0026B7E0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8026E8A4 0026B7E4 7C 08 02 A6 */ mflr r0 -/* 8026E8A8 0026B7E8 90 01 00 54 */ stw r0, 0x54(r1) -/* 8026E8AC 0026B7EC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8026E8B0 0026B7F0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 -/* 8026E8B4 0026B7F4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E8B8 0026B7F8 48 0F 39 25 */ bl _savegpr_29 -/* 8026E8BC 0026B7FC 7C BD 2B 78 */ mr r29, r5 -/* 8026E8C0 0026B800 7C DE 33 78 */ mr r30, r6 -/* 8026E8C4 0026B804 3C A0 80 3A */ lis r5, lbl_803A78F8@ha -/* 8026E8C8 0026B808 38 05 78 F8 */ addi r0, r5, lbl_803A78F8@l -/* 8026E8CC 0026B80C 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026E8D0 0026B810 38 A1 00 08 */ addi r5, r1, 8 -/* 8026E8D4 0026B814 4B FF FE 1D */ bl cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin -/* 8026E8D8 0026B818 2C 03 00 00 */ cmpwi r3, 0 -/* 8026E8DC 0026B81C 40 82 00 18 */ bne lbl_8026E8F4 -/* 8026E8E0 0026B820 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026E8E4 0026B824 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026E8E8 0026B828 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026E8EC 0026B82C 38 60 00 00 */ li r3, 0 -/* 8026E8F0 0026B830 48 00 00 70 */ b lbl_8026E960 -lbl_8026E8F4: -/* 8026E8F4 0026B834 3B E1 00 14 */ addi r31, r1, 0x14 -/* 8026E8F8 0026B838 7F A3 EB 78 */ mr r3, r29 -/* 8026E8FC 0026B83C 38 81 00 08 */ addi r4, r1, 8 -/* 8026E900 0026B840 48 0D 88 95 */ bl PSVECDotProduct -/* 8026E904 0026B844 C0 1D 00 0C */ lfs f0, 0xc(r29) -/* 8026E908 0026B848 EF E0 08 2A */ fadds f31, f0, f1 -/* 8026E90C 0026B84C 7F A3 EB 78 */ mr r3, r29 -/* 8026E910 0026B850 7F E4 FB 78 */ mr r4, r31 -/* 8026E914 0026B854 48 0D 88 81 */ bl PSVECDotProduct -/* 8026E918 0026B858 C0 1D 00 0C */ lfs f0, 0xc(r29) -/* 8026E91C 0026B85C EC 40 08 2A */ fadds f2, f0, f1 -/* 8026E920 0026B860 FC 20 F8 90 */ fmr f1, f31 -/* 8026E924 0026B864 38 61 00 08 */ addi r3, r1, 8 -/* 8026E928 0026B868 7F E4 FB 78 */ mr r4, r31 -/* 8026E92C 0026B86C 7F C5 F3 78 */ mr r5, r30 -/* 8026E930 0026B870 4B FF A5 A5 */ bl cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec -/* 8026E934 0026B874 54 60 06 3F */ clrlwi. r0, r3, 0x18 -/* 8026E938 0026B878 40 82 00 18 */ bne lbl_8026E950 -/* 8026E93C 0026B87C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026E940 0026B880 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026E944 0026B884 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026E948 0026B888 38 60 00 00 */ li r3, 0 -/* 8026E94C 0026B88C 48 00 00 14 */ b lbl_8026E960 -lbl_8026E950: -/* 8026E950 0026B890 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026E954 0026B894 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026E958 0026B898 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026E95C 0026B89C 38 60 00 01 */ li r3, 1 -lbl_8026E960: -/* 8026E960 0026B8A0 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 -/* 8026E964 0026B8A4 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8026E968 0026B8A8 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E96C 0026B8AC 48 0F 38 BD */ bl _restgpr_29 -/* 8026E970 0026B8B0 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8026E974 0026B8B4 7C 08 03 A6 */ mtlr r0 -/* 8026E978 0026B8B8 38 21 00 50 */ addi r1, r1, 0x50 -/* 8026E97C 0026B8BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026E980.s b/include/SComponent/c_m3d/asm/func_8026E980.s deleted file mode 100644 index f2fe191bba..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026E980.s +++ /dev/null @@ -1,57 +0,0 @@ -/* 8026E980 0026B8C0 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8026E984 0026B8C4 7C 08 02 A6 */ mflr r0 -/* 8026E988 0026B8C8 90 01 00 54 */ stw r0, 0x54(r1) -/* 8026E98C 0026B8CC DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8026E990 0026B8D0 F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 -/* 8026E994 0026B8D4 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026E998 0026B8D8 48 0F 38 45 */ bl _savegpr_29 -/* 8026E99C 0026B8DC 7C 7D 1B 78 */ mr r29, r3 -/* 8026E9A0 0026B8E0 7C 9E 23 78 */ mr r30, r4 -/* 8026E9A4 0026B8E4 7C BF 2B 78 */ mr r31, r5 -/* 8026E9A8 0026B8E8 38 7D 00 0C */ addi r3, r29, 0xc -/* 8026E9AC 0026B8EC 7F A4 EB 78 */ mr r4, r29 -/* 8026E9B0 0026B8F0 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8026E9B4 0026B8F4 48 0D 87 01 */ bl PSVECSubtract -/* 8026E9B8 0026B8F8 38 61 00 20 */ addi r3, r1, 0x20 -/* 8026E9BC 0026B8FC 48 0D 87 7D */ bl PSVECSquareMag -/* 8026E9C0 0026B900 FF E0 08 90 */ fmr f31, f1 -/* 8026E9C4 0026B904 FC 00 FA 10 */ fabs f0, f31 -/* 8026E9C8 0026B908 FC 20 00 18 */ frsp f1, f0 -/* 8026E9CC 0026B90C C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026E9D0 0026B910 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026E9D4 0026B914 40 80 00 24 */ bge lbl_8026E9F8 -/* 8026E9D8 0026B918 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8026E9DC 0026B91C D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026E9E0 0026B920 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8026E9E4 0026B924 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026E9E8 0026B928 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8026E9EC 0026B92C D0 1F 00 08 */ stfs f0, 8(r31) -/* 8026E9F0 0026B930 C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) -/* 8026E9F4 0026B934 48 00 00 48 */ b lbl_8026EA3C -lbl_8026E9F8: -/* 8026E9F8 0026B938 7F C3 F3 78 */ mr r3, r30 -/* 8026E9FC 0026B93C 7F A4 EB 78 */ mr r4, r29 -/* 8026EA00 0026B940 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8026EA04 0026B944 48 0D 86 B1 */ bl PSVECSubtract -/* 8026EA08 0026B948 38 61 00 14 */ addi r3, r1, 0x14 -/* 8026EA0C 0026B94C 38 81 00 20 */ addi r4, r1, 0x20 -/* 8026EA10 0026B950 48 0D 87 85 */ bl PSVECDotProduct -/* 8026EA14 0026B954 EF E1 F8 24 */ fdivs f31, f1, f31 -/* 8026EA18 0026B958 38 61 00 20 */ addi r3, r1, 0x20 -/* 8026EA1C 0026B95C 38 81 00 08 */ addi r4, r1, 8 -/* 8026EA20 0026B960 FC 20 F8 90 */ fmr f1, f31 -/* 8026EA24 0026B964 48 0D 86 B5 */ bl PSVECScale -/* 8026EA28 0026B968 38 61 00 08 */ addi r3, r1, 8 -/* 8026EA2C 0026B96C 7F A4 EB 78 */ mr r4, r29 -/* 8026EA30 0026B970 7F E5 FB 78 */ mr r5, r31 -/* 8026EA34 0026B974 48 0D 86 5D */ bl PSVECAdd -/* 8026EA38 0026B978 FC 20 F8 90 */ fmr f1, f31 -lbl_8026EA3C: -/* 8026EA3C 0026B97C E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 -/* 8026EA40 0026B980 CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8026EA44 0026B984 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EA48 0026B988 48 0F 37 E1 */ bl _restgpr_29 -/* 8026EA4C 0026B98C 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8026EA50 0026B990 7C 08 03 A6 */ mtlr r0 -/* 8026EA54 0026B994 38 21 00 50 */ addi r1, r1, 0x50 -/* 8026EA58 0026B998 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EA5C.s b/include/SComponent/c_m3d/asm/func_8026EA5C.s deleted file mode 100644 index a0cf4792f8..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026EA5C.s +++ /dev/null @@ -1,57 +0,0 @@ -/* 8026EA5C 0026B99C 94 21 FF B0 */ stwu r1, -0x50(r1) -/* 8026EA60 0026B9A0 7C 08 02 A6 */ mflr r0 -/* 8026EA64 0026B9A4 90 01 00 54 */ stw r0, 0x54(r1) -/* 8026EA68 0026B9A8 DB E1 00 40 */ stfd f31, 0x40(r1) -/* 8026EA6C 0026B9AC F3 E1 00 48 */ psq_st f31, 72(r1), 0, 0 -/* 8026EA70 0026B9B0 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EA74 0026B9B4 48 0F 37 69 */ bl _savegpr_29 -/* 8026EA78 0026B9B8 7C 7D 1B 78 */ mr r29, r3 -/* 8026EA7C 0026B9BC 7C BE 2B 78 */ mr r30, r5 -/* 8026EA80 0026B9C0 7C DF 33 78 */ mr r31, r6 -/* 8026EA84 0026B9C4 7C 83 23 78 */ mr r3, r4 -/* 8026EA88 0026B9C8 7F A4 EB 78 */ mr r4, r29 -/* 8026EA8C 0026B9CC 38 A1 00 20 */ addi r5, r1, 0x20 -/* 8026EA90 0026B9D0 48 0D 86 25 */ bl PSVECSubtract -/* 8026EA94 0026B9D4 38 61 00 20 */ addi r3, r1, 0x20 -/* 8026EA98 0026B9D8 48 0D 86 A1 */ bl PSVECSquareMag -/* 8026EA9C 0026B9DC FF E0 08 90 */ fmr f31, f1 -/* 8026EAA0 0026B9E0 FC 00 FA 10 */ fabs f0, f31 -/* 8026EAA4 0026B9E4 FC 20 00 18 */ frsp f1, f0 -/* 8026EAA8 0026B9E8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026EAAC 0026B9EC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026EAB0 0026B9F0 40 80 00 24 */ bge lbl_8026EAD4 -/* 8026EAB4 0026B9F4 C0 1E 00 00 */ lfs f0, 0(r30) -/* 8026EAB8 0026B9F8 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026EABC 0026B9FC C0 1E 00 04 */ lfs f0, 4(r30) -/* 8026EAC0 0026BA00 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026EAC4 0026BA04 C0 1E 00 08 */ lfs f0, 8(r30) -/* 8026EAC8 0026BA08 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8026EACC 0026BA0C C0 22 B7 18 */ lfs f1, lbl_80455118-_SDA2_BASE_(r2) -/* 8026EAD0 0026BA10 48 00 00 48 */ b lbl_8026EB18 -lbl_8026EAD4: -/* 8026EAD4 0026BA14 7F C3 F3 78 */ mr r3, r30 -/* 8026EAD8 0026BA18 7F A4 EB 78 */ mr r4, r29 -/* 8026EADC 0026BA1C 38 A1 00 14 */ addi r5, r1, 0x14 -/* 8026EAE0 0026BA20 48 0D 85 D5 */ bl PSVECSubtract -/* 8026EAE4 0026BA24 38 61 00 14 */ addi r3, r1, 0x14 -/* 8026EAE8 0026BA28 38 81 00 20 */ addi r4, r1, 0x20 -/* 8026EAEC 0026BA2C 48 0D 86 A9 */ bl PSVECDotProduct -/* 8026EAF0 0026BA30 EF E1 F8 24 */ fdivs f31, f1, f31 -/* 8026EAF4 0026BA34 38 61 00 20 */ addi r3, r1, 0x20 -/* 8026EAF8 0026BA38 38 81 00 08 */ addi r4, r1, 8 -/* 8026EAFC 0026BA3C FC 20 F8 90 */ fmr f1, f31 -/* 8026EB00 0026BA40 48 0D 85 D9 */ bl PSVECScale -/* 8026EB04 0026BA44 38 61 00 08 */ addi r3, r1, 8 -/* 8026EB08 0026BA48 7F A4 EB 78 */ mr r4, r29 -/* 8026EB0C 0026BA4C 7F E5 FB 78 */ mr r5, r31 -/* 8026EB10 0026BA50 48 0D 85 81 */ bl PSVECAdd -/* 8026EB14 0026BA54 FC 20 F8 90 */ fmr f1, f31 -lbl_8026EB18: -/* 8026EB18 0026BA58 E3 E1 00 48 */ psq_l f31, 72(r1), 0, 0 -/* 8026EB1C 0026BA5C CB E1 00 40 */ lfd f31, 0x40(r1) -/* 8026EB20 0026BA60 39 61 00 40 */ addi r11, r1, 0x40 -/* 8026EB24 0026BA64 48 0F 37 05 */ bl _restgpr_29 -/* 8026EB28 0026BA68 80 01 00 54 */ lwz r0, 0x54(r1) -/* 8026EB2C 0026BA6C 7C 08 03 A6 */ mtlr r0 -/* 8026EB30 0026BA70 38 21 00 50 */ addi r1, r1, 0x50 -/* 8026EB34 0026BA74 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EB38.s b/include/SComponent/c_m3d/asm/func_8026EB38.s deleted file mode 100644 index 17a50cfde8..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026EB38.s +++ /dev/null @@ -1,35 +0,0 @@ -/* 8026EB38 0026BA78 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8026EB3C 0026BA7C 7C 08 02 A6 */ mflr r0 -/* 8026EB40 0026BA80 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026EB44 0026BA84 93 E1 00 2C */ stw r31, 0x2c(r1) -/* 8026EB48 0026BA88 93 C1 00 28 */ stw r30, 0x28(r1) -/* 8026EB4C 0026BA8C 7C BE 2B 78 */ mr r30, r5 -/* 8026EB50 0026BA90 7C DF 33 78 */ mr r31, r6 -/* 8026EB54 0026BA94 3C A0 80 3A */ lis r5, lbl_803A78F8@ha -/* 8026EB58 0026BA98 38 05 78 F8 */ addi r0, r5, lbl_803A78F8@l -/* 8026EB5C 0026BA9C 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026EB60 0026BAA0 38 A1 00 08 */ addi r5, r1, 8 -/* 8026EB64 0026BAA4 4B FF FB 8D */ bl cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin -/* 8026EB68 0026BAA8 2C 03 00 00 */ cmpwi r3, 0 -/* 8026EB6C 0026BAAC 40 82 00 18 */ bne lbl_8026EB84 -/* 8026EB70 0026BAB0 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026EB74 0026BAB4 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026EB78 0026BAB8 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026EB7C 0026BABC 38 60 00 00 */ li r3, 0 -/* 8026EB80 0026BAC0 48 00 00 24 */ b lbl_8026EBA4 -lbl_8026EB84: -/* 8026EB84 0026BAC4 38 61 00 08 */ addi r3, r1, 8 -/* 8026EB88 0026BAC8 7F C4 F3 78 */ mr r4, r30 -/* 8026EB8C 0026BACC 7F E5 FB 78 */ mr r5, r31 -/* 8026EB90 0026BAD0 4B FF FD F1 */ bl cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec -/* 8026EB94 0026BAD4 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026EB98 0026BAD8 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026EB9C 0026BADC 90 01 00 20 */ stw r0, 0x20(r1) -/* 8026EBA0 0026BAE0 38 60 00 01 */ li r3, 1 -lbl_8026EBA4: -/* 8026EBA4 0026BAE4 83 E1 00 2C */ lwz r31, 0x2c(r1) -/* 8026EBA8 0026BAE8 83 C1 00 28 */ lwz r30, 0x28(r1) -/* 8026EBAC 0026BAEC 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026EBB0 0026BAF0 7C 08 03 A6 */ mtlr r0 -/* 8026EBB4 0026BAF4 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026EBB8 0026BAF8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d/asm/func_8026EBBC.s b/include/SComponent/c_m3d/asm/func_8026EBBC.s deleted file mode 100644 index 42e61ff9e9..0000000000 --- a/include/SComponent/c_m3d/asm/func_8026EBBC.s +++ /dev/null @@ -1,32 +0,0 @@ -/* 8026EBBC 0026BAFC 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026EBC0 0026BB00 7C 08 02 A6 */ mflr r0 -/* 8026EBC4 0026BB04 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026EBC8 0026BB08 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8026EBCC 0026BB0C 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8026EBD0 0026BB10 7C 9E 23 78 */ mr r30, r4 -/* 8026EBD4 0026BB14 7C BF 2B 78 */ mr r31, r5 -/* 8026EBD8 0026BB18 C0 24 00 08 */ lfs f1, 8(r4) -/* 8026EBDC 0026BB1C C0 03 00 08 */ lfs f0, 8(r3) -/* 8026EBE0 0026BB20 EC 61 00 32 */ fmuls f3, f1, f0 -/* 8026EBE4 0026BB24 C0 24 00 00 */ lfs f1, 0(r4) -/* 8026EBE8 0026BB28 C0 03 00 00 */ lfs f0, 0(r3) -/* 8026EBEC 0026BB2C EC 41 00 32 */ fmuls f2, f1, f0 -/* 8026EBF0 0026BB30 C0 24 00 04 */ lfs f1, 4(r4) -/* 8026EBF4 0026BB34 C0 03 00 04 */ lfs f0, 4(r3) -/* 8026EBF8 0026BB38 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8026EBFC 0026BB3C EC 02 00 2A */ fadds f0, f2, f0 -/* 8026EC00 0026BB40 EC 03 00 2A */ fadds f0, f3, f0 -/* 8026EC04 0026BB44 FC 00 02 10 */ fabs f0, f0 -/* 8026EC08 0026BB48 FC 20 00 18 */ frsp f1, f0 -/* 8026EC0C 0026BB4C 38 81 00 08 */ addi r4, r1, 8 -/* 8026EC10 0026BB50 48 0D 84 C9 */ bl PSVECScale -/* 8026EC14 0026BB54 38 61 00 08 */ addi r3, r1, 8 -/* 8026EC18 0026BB58 7F C4 F3 78 */ mr r4, r30 -/* 8026EC1C 0026BB5C 7F E5 FB 78 */ mr r5, r31 -/* 8026EC20 0026BB60 48 0D 84 71 */ bl PSVECAdd -/* 8026EC24 0026BB64 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8026EC28 0026BB68 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8026EC2C 0026BB6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026EC30 0026BB70 7C 08 03 A6 */ mtlr r0 -/* 8026EC34 0026BB74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026EC38 0026BB78 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d/c_m3d.h b/include/SComponent/c_m3d/c_m3d.h deleted file mode 100644 index d1b028b036..0000000000 --- a/include/SComponent/c_m3d/c_m3d.h +++ /dev/null @@ -1,30 +0,0 @@ -#ifndef C_M3D_H_ -#define C_M3D_H_ - -#include "SComponent/c_xyz/c_xyz.h" -#include "global.h" - -class cM3dGLin_members { -public: -private: - cXyz start; - cXyz end; -}; - -class cM3dGCps { -public: -private: - cM3dGLin_members base; - void* vtable; - float field_0x1c; -}; - -class cM3dGAab { /* Axis-aligned bounding box */ -public: -private: - cXyz min; - cXyz max; - void* vtable; -}; - -#endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_aab.h b/include/SComponent/c_m3d_g_aab.h index d0735f1c1e..9c3c3a7c00 100644 --- a/include/SComponent/c_m3d_g_aab.h +++ b/include/SComponent/c_m3d_g_aab.h @@ -4,19 +4,33 @@ #include "SComponent/c_xyz.h" #include "global.h" +// Axis aligned bounding box class cM3dGAab { +private: public: + cXyz mMin; + cXyz mMax; + + virtual ~cM3dGAab(); void Set(const cXyz*, const cXyz*); bool CrossY(const cXyz*) const; - bool UnderPlaneYUnder(float) const; - bool TopPlaneYUnder(float) const; + bool UnderPlaneYUnder(f32) const; + bool TopPlaneYUnder(f32) const; void ClearForMinMax(void); void SetMinMax(const cXyz&); void SetMinMax(const cM3dGAab&); void SetMin(const cXyz&); void SetMax(const cXyz&); void CalcCenter(cXyz*) const; - void PlusR(float); + void PlusR(f32); + const cXyz& getMaxP(void) const { return mMax; } + const cXyz& getMinP(void) const { return mMin; } + const f32 GetMaxX(void) const { return mMax.GetX(); } + const f32 GetMaxY(void) const { return mMax.GetY(); } + const f32 GetMaxZ(void) const { return mMax.GetZ(); } + const f32 GetMinX(void) const { return mMin.GetX(); } + const f32 GetMinY(void) const { return mMin.GetY(); } + const f32 GetMinZ(void) const { return mMin.GetZ(); } }; #endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s deleted file mode 100644 index ee48d8c14f..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EC54.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8026EC54 0026BB94 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026EC58 0026BB98 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026EC5C 0026BB9C C0 04 00 04 */ lfs f0, 4(r4) -/* 8026EC60 0026BBA0 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026EC64 0026BBA4 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026EC68 0026BBA8 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026EC6C 0026BBAC C0 05 00 00 */ lfs f0, 0(r5) -/* 8026EC70 0026BBB0 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026EC74 0026BBB4 C0 05 00 04 */ lfs f0, 4(r5) -/* 8026EC78 0026BBB8 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026EC7C 0026BBBC C0 05 00 08 */ lfs f0, 8(r5) -/* 8026EC80 0026BBC0 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026EC84 0026BBC4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s deleted file mode 100644 index 26461e9db2..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EC88.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 8026EC88 0026BBC8 C0 03 00 00 */ lfs f0, 0(r3) -/* 8026EC8C 0026BBCC C0 24 00 00 */ lfs f1, 0(r4) -/* 8026EC90 0026BBD0 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EC94 0026BBD4 41 81 00 2C */ bgt lbl_8026ECC0 -/* 8026EC98 0026BBD8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026EC9C 0026BBDC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026ECA0 0026BBE0 41 80 00 20 */ blt lbl_8026ECC0 -/* 8026ECA4 0026BBE4 C0 03 00 08 */ lfs f0, 8(r3) -/* 8026ECA8 0026BBE8 C0 24 00 08 */ lfs f1, 8(r4) -/* 8026ECAC 0026BBEC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026ECB0 0026BBF0 41 81 00 10 */ bgt lbl_8026ECC0 -/* 8026ECB4 0026BBF4 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8026ECB8 0026BBF8 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026ECBC 0026BBFC 40 80 00 0C */ bge lbl_8026ECC8 -lbl_8026ECC0: -/* 8026ECC0 0026BC00 38 60 00 00 */ li r3, 0 -/* 8026ECC4 0026BC04 4E 80 00 20 */ blr -lbl_8026ECC8: -/* 8026ECC8 0026BC08 38 60 00 01 */ li r3, 1 -/* 8026ECCC 0026BC0C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s deleted file mode 100644 index 0eaf6aac55..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026ECD0.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 8026ECD0 0026BC10 C0 03 00 04 */ lfs f0, 4(r3) -/* 8026ECD4 0026BC14 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026ECD8 0026BC18 7C 00 00 26 */ mfcr r0 -/* 8026ECDC 0026BC1C 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8026ECE0 0026BC20 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s deleted file mode 100644 index b91c2e5cc7..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026ECE4.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 8026ECE4 0026BC24 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8026ECE8 0026BC28 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026ECEC 0026BC2C 7C 00 00 26 */ mfcr r0 -/* 8026ECF0 0026BC30 54 03 0F FE */ srwi r3, r0, 0x1f -/* 8026ECF4 0026BC34 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s deleted file mode 100644 index 1606b58f6c..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026ECF8.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 8026ECF8 0026BC38 C0 02 B7 D0 */ lfs f0, lbl_804551D0-_SDA2_BASE_(r2) -/* 8026ECFC 0026BC3C D0 03 00 08 */ stfs f0, 8(r3) -/* 8026ED00 0026BC40 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026ED04 0026BC44 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026ED08 0026BC48 C0 02 B7 D4 */ lfs f0, lbl_804551D4-_SDA2_BASE_(r2) -/* 8026ED0C 0026BC4C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026ED10 0026BC50 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026ED14 0026BC54 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026ED18 0026BC58 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s deleted file mode 100644 index ac37532cfb..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026ED1C.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026ED1C 0026BC5C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026ED20 0026BC60 7C 08 02 A6 */ mflr r0 -/* 8026ED24 0026BC64 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026ED28 0026BC68 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026ED2C 0026BC6C 93 C1 00 08 */ stw r30, 8(r1) -/* 8026ED30 0026BC70 7C 7E 1B 78 */ mr r30, r3 -/* 8026ED34 0026BC74 7C 9F 23 78 */ mr r31, r4 -/* 8026ED38 0026BC78 48 00 00 6D */ bl SetMin__8cM3dGAabFRC4cXyz -/* 8026ED3C 0026BC7C 7F C3 F3 78 */ mr r3, r30 -/* 8026ED40 0026BC80 7F E4 FB 78 */ mr r4, r31 -/* 8026ED44 0026BC84 48 00 00 A1 */ bl SetMax__8cM3dGAabFRC4cXyz -/* 8026ED48 0026BC88 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026ED4C 0026BC8C 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026ED50 0026BC90 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026ED54 0026BC94 7C 08 03 A6 */ mtlr r0 -/* 8026ED58 0026BC98 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026ED5C 0026BC9C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s b/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s deleted file mode 100644 index 4adb753e44..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026ED60.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026ED60 0026BCA0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026ED64 0026BCA4 7C 08 02 A6 */ mflr r0 -/* 8026ED68 0026BCA8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026ED6C 0026BCAC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026ED70 0026BCB0 93 C1 00 08 */ stw r30, 8(r1) -/* 8026ED74 0026BCB4 7C 7E 1B 78 */ mr r30, r3 -/* 8026ED78 0026BCB8 7C 9F 23 78 */ mr r31, r4 -/* 8026ED7C 0026BCBC 4B FF FF A1 */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 8026ED80 0026BCC0 7F C3 F3 78 */ mr r3, r30 -/* 8026ED84 0026BCC4 38 9F 00 0C */ addi r4, r31, 0xc -/* 8026ED88 0026BCC8 4B FF FF 95 */ bl SetMinMax__8cM3dGAabFRC4cXyz -/* 8026ED8C 0026BCCC 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026ED90 0026BCD0 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026ED94 0026BCD4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026ED98 0026BCD8 7C 08 03 A6 */ mtlr r0 -/* 8026ED9C 0026BCDC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026EDA0 0026BCE0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s deleted file mode 100644 index 2321c02b39..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EDA4.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 8026EDA4 0026BCE4 C0 03 00 00 */ lfs f0, 0(r3) -/* 8026EDA8 0026BCE8 C0 24 00 00 */ lfs f1, 0(r4) -/* 8026EDAC 0026BCEC FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EDB0 0026BCF0 40 81 00 08 */ ble lbl_8026EDB8 -/* 8026EDB4 0026BCF4 D0 23 00 00 */ stfs f1, 0(r3) -lbl_8026EDB8: -/* 8026EDB8 0026BCF8 C0 03 00 04 */ lfs f0, 4(r3) -/* 8026EDBC 0026BCFC C0 24 00 04 */ lfs f1, 4(r4) -/* 8026EDC0 0026BD00 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EDC4 0026BD04 40 81 00 08 */ ble lbl_8026EDCC -/* 8026EDC8 0026BD08 D0 23 00 04 */ stfs f1, 4(r3) -lbl_8026EDCC: -/* 8026EDCC 0026BD0C C0 03 00 08 */ lfs f0, 8(r3) -/* 8026EDD0 0026BD10 C0 24 00 08 */ lfs f1, 8(r4) -/* 8026EDD4 0026BD14 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EDD8 0026BD18 4C 81 00 20 */ blelr -/* 8026EDDC 0026BD1C D0 23 00 08 */ stfs f1, 8(r3) -/* 8026EDE0 0026BD20 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s deleted file mode 100644 index 5512a1a5cf..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EDE4.s +++ /dev/null @@ -1,18 +0,0 @@ -/* 8026EDE4 0026BD24 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026EDE8 0026BD28 C0 24 00 00 */ lfs f1, 0(r4) -/* 8026EDEC 0026BD2C FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EDF0 0026BD30 40 80 00 08 */ bge lbl_8026EDF8 -/* 8026EDF4 0026BD34 D0 23 00 0C */ stfs f1, 0xc(r3) -lbl_8026EDF8: -/* 8026EDF8 0026BD38 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8026EDFC 0026BD3C C0 24 00 04 */ lfs f1, 4(r4) -/* 8026EE00 0026BD40 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EE04 0026BD44 40 80 00 08 */ bge lbl_8026EE0C -/* 8026EE08 0026BD48 D0 23 00 10 */ stfs f1, 0x10(r3) -lbl_8026EE0C: -/* 8026EE0C 0026BD4C C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8026EE10 0026BD50 C0 24 00 08 */ lfs f1, 8(r4) -/* 8026EE14 0026BD54 FC 00 08 40 */ fcmpo cr0, f0, f1 -/* 8026EE18 0026BD58 4C 80 00 20 */ bgelr -/* 8026EE1C 0026BD5C D0 23 00 14 */ stfs f1, 0x14(r3) -/* 8026EE20 0026BD60 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s deleted file mode 100644 index f39caf94a3..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EE24.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026EE24 0026BD64 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026EE28 0026BD68 7C 08 02 A6 */ mflr r0 -/* 8026EE2C 0026BD6C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026EE30 0026BD70 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026EE34 0026BD74 7C 9F 23 78 */ mr r31, r4 -/* 8026EE38 0026BD78 38 83 00 0C */ addi r4, r3, 0xc -/* 8026EE3C 0026BD7C 7F E5 FB 78 */ mr r5, r31 -/* 8026EE40 0026BD80 48 0D 82 51 */ bl PSVECAdd -/* 8026EE44 0026BD84 7F E3 FB 78 */ mr r3, r31 -/* 8026EE48 0026BD88 7F E4 FB 78 */ mr r4, r31 -/* 8026EE4C 0026BD8C C0 22 B7 D8 */ lfs f1, lbl_804551D8-_SDA2_BASE_(r2) -/* 8026EE50 0026BD90 48 0D 82 89 */ bl PSVECScale -/* 8026EE54 0026BD94 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026EE58 0026BD98 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026EE5C 0026BD9C 7C 08 03 A6 */ mtlr r0 -/* 8026EE60 0026BDA0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026EE64 0026BDA4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s b/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s deleted file mode 100644 index 89ffa194b8..0000000000 --- a/include/SComponent/c_m3d_g_aab/asm/func_8026EE68.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 8026EE68 0026BDA8 C0 03 00 00 */ lfs f0, 0(r3) -/* 8026EE6C 0026BDAC EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026EE70 0026BDB0 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026EE74 0026BDB4 C0 03 00 04 */ lfs f0, 4(r3) -/* 8026EE78 0026BDB8 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026EE7C 0026BDBC D0 03 00 04 */ stfs f0, 4(r3) -/* 8026EE80 0026BDC0 C0 03 00 08 */ lfs f0, 8(r3) -/* 8026EE84 0026BDC4 EC 00 08 28 */ fsubs f0, f0, f1 -/* 8026EE88 0026BDC8 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026EE8C 0026BDCC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026EE90 0026BDD0 EC 00 08 2A */ fadds f0, f0, f1 -/* 8026EE94 0026BDD4 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026EE98 0026BDD8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8026EE9C 0026BDDC EC 00 08 2A */ fadds f0, f0, f1 -/* 8026EEA0 0026BDE0 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026EEA4 0026BDE4 C0 03 00 14 */ lfs f0, 0x14(r3) -/* 8026EEA8 0026BDE8 EC 00 08 2A */ fadds f0, f0, f1 -/* 8026EEAC 0026BDEC D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026EEB0 0026BDF0 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir.h b/include/SComponent/c_m3d_g_cir.h index 254c9cdb8c..95068b18ca 100644 --- a/include/SComponent/c_m3d_g_cir.h +++ b/include/SComponent/c_m3d_g_cir.h @@ -3,11 +3,22 @@ #include "global.h" -class cM3dGCir { +class cM2dGCir { +public: + f32 mPosX; + f32 mPosY; + f32 mRadius; + cM2dGCir() {} + virtual ~cM2dGCir() {} +}; + +class cM3dGCir : public cM2dGCir { + f32 mPosZ; + public: cM3dGCir(void); - ~cM3dGCir(void); - void Set(float, float, float, float); + virtual ~cM3dGCir(void); + void Set(f32, f32, f32, f32); }; #endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s deleted file mode 100644 index 9d92a3051f..0000000000 --- a/include/SComponent/c_m3d_g_cir/asm/func_8026EEB4.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 8026EEB4 0026BDF4 3C 80 80 3C */ lis r4, lbl_803C3FEC@ha -/* 8026EEB8 0026BDF8 38 04 3F EC */ addi r0, r4, lbl_803C3FEC@l -/* 8026EEBC 0026BDFC 90 03 00 0C */ stw r0, 0xc(r3) -/* 8026EEC0 0026BE00 3C 80 80 3C */ lis r4, lbl_803C3FE0@ha -/* 8026EEC4 0026BE04 38 04 3F E0 */ addi r0, r4, lbl_803C3FE0@l -/* 8026EEC8 0026BE08 90 03 00 0C */ stw r0, 0xc(r3) -/* 8026EECC 0026BE0C 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s deleted file mode 100644 index 84637b9a49..0000000000 --- a/include/SComponent/c_m3d_g_cir/asm/func_8026EED0.s +++ /dev/null @@ -1,19 +0,0 @@ -/* 8026EED0 0026BE10 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026EED4 0026BE14 7C 08 02 A6 */ mflr r0 -/* 8026EED8 0026BE18 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026EEDC 0026BE1C 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026EEE0 0026BE20 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8026EEE4 0026BE24 41 82 00 1C */ beq lbl_8026EF00 -/* 8026EEE8 0026BE28 3C A0 80 3C */ lis r5, lbl_803C3FEC@ha -/* 8026EEEC 0026BE2C 38 05 3F EC */ addi r0, r5, lbl_803C3FEC@l -/* 8026EEF0 0026BE30 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8026EEF4 0026BE34 7C 80 07 35 */ extsh. r0, r4 -/* 8026EEF8 0026BE38 40 81 00 08 */ ble lbl_8026EF00 -/* 8026EEFC 0026BE3C 48 05 FE 41 */ bl __dl__FPv -lbl_8026EF00: -/* 8026EF00 0026BE40 7F E3 FB 78 */ mr r3, r31 -/* 8026EF04 0026BE44 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026EF08 0026BE48 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026EF0C 0026BE4C 7C 08 03 A6 */ mtlr r0 -/* 8026EF10 0026BE50 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026EF14 0026BE54 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s deleted file mode 100644 index 3040f4fc5c..0000000000 --- a/include/SComponent/c_m3d_g_cir/asm/func_8026EF18.s +++ /dev/null @@ -1,25 +0,0 @@ -/* 8026EF18 0026BE58 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026EF1C 0026BE5C 7C 08 02 A6 */ mflr r0 -/* 8026EF20 0026BE60 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026EF24 0026BE64 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026EF28 0026BE68 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8026EF2C 0026BE6C 41 82 00 30 */ beq lbl_8026EF5C -/* 8026EF30 0026BE70 3C 60 80 3C */ lis r3, lbl_803C3FE0@ha -/* 8026EF34 0026BE74 38 03 3F E0 */ addi r0, r3, lbl_803C3FE0@l -/* 8026EF38 0026BE78 90 1F 00 0C */ stw r0, 0xc(r31) -/* 8026EF3C 0026BE7C 41 82 00 10 */ beq lbl_8026EF4C -/* 8026EF40 0026BE80 3C 60 80 3C */ lis r3, lbl_803C3FEC@ha -/* 8026EF44 0026BE84 38 03 3F EC */ addi r0, r3, lbl_803C3FEC@l -/* 8026EF48 0026BE88 90 1F 00 0C */ stw r0, 0xc(r31) -lbl_8026EF4C: -/* 8026EF4C 0026BE8C 7C 80 07 35 */ extsh. r0, r4 -/* 8026EF50 0026BE90 40 81 00 0C */ ble lbl_8026EF5C -/* 8026EF54 0026BE94 7F E3 FB 78 */ mr r3, r31 -/* 8026EF58 0026BE98 48 05 FD E5 */ bl __dl__FPv -lbl_8026EF5C: -/* 8026EF5C 0026BE9C 7F E3 FB 78 */ mr r3, r31 -/* 8026EF60 0026BEA0 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026EF64 0026BEA4 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026EF68 0026BEA8 7C 08 03 A6 */ mtlr r0 -/* 8026EF6C 0026BEAC 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026EF70 0026BEB0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s b/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s deleted file mode 100644 index 0c13de6465..0000000000 --- a/include/SComponent/c_m3d_g_cir/asm/func_8026EF74.s +++ /dev/null @@ -1,5 +0,0 @@ -/* 8026EF74 0026BEB4 D0 23 00 00 */ stfs f1, 0(r3) -/* 8026EF78 0026BEB8 D0 43 00 04 */ stfs f2, 4(r3) -/* 8026EF7C 0026BEBC D0 83 00 08 */ stfs f4, 8(r3) -/* 8026EF80 0026BEC0 D0 63 00 10 */ stfs f3, 0x10(r3) -/* 8026EF84 0026BEC4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cps.h b/include/SComponent/c_m3d_g_cps.h index abb3dc9755..00b3ba32d9 100644 --- a/include/SComponent/c_m3d_g_cps.h +++ b/include/SComponent/c_m3d_g_cps.h @@ -1,16 +1,24 @@ #ifndef C_M3D_G_CPS_H_ #define C_M3D_G_CPS_H_ +#include "SComponent/c_m3d_g_lin.h" #include "SComponent/c_xyz.h" #include "global.h" -struct cM3dGCpsS; +struct cM3dGCpsS { + Vec mStart; + Vec mEnd; + f32 unk_0x1c; +}; + +class cM3dGCps : public cM3dGLin { +private: + f32 unk_0x1c; -class cM3dGCps { public: cM3dGCps(void); - ~cM3dGCps(void); - void Set(const cXyz&, const cXyz&, float); + virtual ~cM3dGCps(void); + void Set(const cXyz&, const cXyz&, f32); void Set(const cM3dGCpsS&); void SetCps(const cM3dGCps&); }; diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s b/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s deleted file mode 100644 index 6b9c26293f..0000000000 --- a/include/SComponent/c_m3d_g_cps/asm/func_8026EF88.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 8026EF88 0026BEC8 3C 80 80 3A */ lis r4, lbl_803A78F8@ha -/* 8026EF8C 0026BECC 38 04 78 F8 */ addi r0, r4, lbl_803A78F8@l -/* 8026EF90 0026BED0 90 03 00 18 */ stw r0, 0x18(r3) -/* 8026EF94 0026BED4 3C 80 80 3C */ lis r4, lbl_803C3FF8@ha -/* 8026EF98 0026BED8 38 04 3F F8 */ addi r0, r4, lbl_803C3FF8@l -/* 8026EF9C 0026BEDC 90 03 00 18 */ stw r0, 0x18(r3) -/* 8026EFA0 0026BEE0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s b/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s deleted file mode 100644 index f53c18b425..0000000000 --- a/include/SComponent/c_m3d_g_cps/asm/func_8026EFA4.s +++ /dev/null @@ -1,25 +0,0 @@ -/* 8026EFA4 0026BEE4 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026EFA8 0026BEE8 7C 08 02 A6 */ mflr r0 -/* 8026EFAC 0026BEEC 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026EFB0 0026BEF0 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026EFB4 0026BEF4 7C 7F 1B 79 */ or. r31, r3, r3 -/* 8026EFB8 0026BEF8 41 82 00 30 */ beq lbl_8026EFE8 -/* 8026EFBC 0026BEFC 3C 60 80 3C */ lis r3, lbl_803C3FF8@ha -/* 8026EFC0 0026BF00 38 03 3F F8 */ addi r0, r3, lbl_803C3FF8@l -/* 8026EFC4 0026BF04 90 1F 00 18 */ stw r0, 0x18(r31) -/* 8026EFC8 0026BF08 41 82 00 10 */ beq lbl_8026EFD8 -/* 8026EFCC 0026BF0C 3C 60 80 3A */ lis r3, lbl_803A78F8@ha -/* 8026EFD0 0026BF10 38 03 78 F8 */ addi r0, r3, lbl_803A78F8@l -/* 8026EFD4 0026BF14 90 1F 00 18 */ stw r0, 0x18(r31) -lbl_8026EFD8: -/* 8026EFD8 0026BF18 7C 80 07 35 */ extsh. r0, r4 -/* 8026EFDC 0026BF1C 40 81 00 0C */ ble lbl_8026EFE8 -/* 8026EFE0 0026BF20 7F E3 FB 78 */ mr r3, r31 -/* 8026EFE4 0026BF24 48 05 FD 59 */ bl __dl__FPv -lbl_8026EFE8: -/* 8026EFE8 0026BF28 7F E3 FB 78 */ mr r3, r31 -/* 8026EFEC 0026BF2C 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026EFF0 0026BF30 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026EFF4 0026BF34 7C 08 03 A6 */ mtlr r0 -/* 8026EFF8 0026BF38 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026EFFC 0026BF3C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s deleted file mode 100644 index 05af2d1d60..0000000000 --- a/include/SComponent/c_m3d_g_cps/asm/func_8026F000.s +++ /dev/null @@ -1,15 +0,0 @@ -/* 8026F000 0026BF40 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F004 0026BF44 7C 08 02 A6 */ mflr r0 -/* 8026F008 0026BF48 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F00C 0026BF4C DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8026F010 0026BF50 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8026F014 0026BF54 7C 7F 1B 78 */ mr r31, r3 -/* 8026F018 0026BF58 FF E0 08 90 */ fmr f31, f1 -/* 8026F01C 0026BF5C 48 00 02 CD */ bl SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -/* 8026F020 0026BF60 D3 FF 00 1C */ stfs f31, 0x1c(r31) -/* 8026F024 0026BF64 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 8026F028 0026BF68 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8026F02C 0026BF6C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F030 0026BF70 7C 08 03 A6 */ mtlr r0 -/* 8026F034 0026BF74 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F038 0026BF78 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s deleted file mode 100644 index 870817332e..0000000000 --- a/include/SComponent/c_m3d_g_cps/asm/func_8026F03C.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026F03C 0026BF7C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F040 0026BF80 7C 08 02 A6 */ mflr r0 -/* 8026F044 0026BF84 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F048 0026BF88 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026F04C 0026BF8C 93 C1 00 08 */ stw r30, 8(r1) -/* 8026F050 0026BF90 7C 7E 1B 78 */ mr r30, r3 -/* 8026F054 0026BF94 7C 9F 23 78 */ mr r31, r4 -/* 8026F058 0026BF98 38 BF 00 0C */ addi r5, r31, 0xc -/* 8026F05C 0026BF9C 48 00 02 C1 */ bl SetStartEnd__8cM3dGLinFRC3VecRC3Vec -/* 8026F060 0026BFA0 C0 1F 00 18 */ lfs f0, 0x18(r31) -/* 8026F064 0026BFA4 D0 1E 00 1C */ stfs f0, 0x1c(r30) -/* 8026F068 0026BFA8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026F06C 0026BFAC 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026F070 0026BFB0 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F074 0026BFB4 7C 08 03 A6 */ mtlr r0 -/* 8026F078 0026BFB8 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F07C 0026BFBC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s b/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s deleted file mode 100644 index ab6cc845ae..0000000000 --- a/include/SComponent/c_m3d_g_cps/asm/func_8026F080.s +++ /dev/null @@ -1,10 +0,0 @@ -/* 8026F080 0026BFC0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F084 0026BFC4 7C 08 02 A6 */ mflr r0 -/* 8026F088 0026BFC8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F08C 0026BFCC 38 A4 00 0C */ addi r5, r4, 0xc -/* 8026F090 0026BFD0 C0 24 00 1C */ lfs f1, 0x1c(r4) -/* 8026F094 0026BFD4 4B FF FF 6D */ bl Set__8cM3dGCpsFRC4cXyzRC4cXyzf -/* 8026F098 0026BFD8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F09C 0026BFDC 7C 08 03 A6 */ mtlr r0 -/* 8026F0A0 0026BFE0 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F0A4 0026BFE4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_cyl.h b/include/SComponent/c_m3d_g_cyl.h index de3300f0e4..d57cb1858a 100644 --- a/include/SComponent/c_m3d_g_cyl.h +++ b/include/SComponent/c_m3d_g_cyl.h @@ -4,26 +4,29 @@ #include "SComponent/c_xyz.h" #include "global.h" -struct cM3dGCylS; -struct cM3dGSph; +// Cylinder +struct cM3dGCylS { + cXyz mCenter; + f32 mRadius; + f32 mHeight; +}; +class cM3dGSph; -class cM3dGCyl { +class cM3dGCyl : public cM3dGCylS { public: - cM3dGCyl(const cXyz*, float, float); + cM3dGCyl(const cXyz*, f32, f32); + virtual ~cM3dGCyl(); void Set(const cM3dGCylS&); - void Set(const cXyz&, float, float); + void Set(const cXyz&, f32, f32); void SetC(const cXyz&); - void SetH(float); - void SetR(float); + void SetH(f32); + void SetR(f32); bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; void calcMinMax(cXyz*, cXyz*); - -private: - cXyz center; - float radius; - float height; - void* vtable; + const cXyz& GetCP(void) const { return mCenter; } + f32 GetR(void) const { return mRadius; } + f32 GetH(void) const { return mHeight; } }; -#endif \ No newline at end of file +#endif diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s deleted file mode 100644 index 6299d39be5..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 8026F0A8 0026BFE8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F0AC 0026BFEC 7C 08 02 A6 */ mflr r0 -/* 8026F0B0 0026BFF0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F0B4 0026BFF4 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8026F0B8 0026BFF8 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 8026F0BC 0026BFFC 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026F0C0 0026C000 7C 7F 1B 78 */ mr r31, r3 -/* 8026F0C4 0026C004 FF C0 08 90 */ fmr f30, f1 -/* 8026F0C8 0026C008 FF E0 10 90 */ fmr f31, f2 -/* 8026F0CC 0026C00C 3C A0 80 3A */ lis r5, lbl_803A720C@ha -/* 8026F0D0 0026C010 38 05 72 0C */ addi r0, r5, lbl_803A720C@l -/* 8026F0D4 0026C014 90 03 00 14 */ stw r0, 0x14(r3) -/* 8026F0D8 0026C018 48 00 01 05 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8026F0DC 0026C01C 7F E3 FB 78 */ mr r3, r31 -/* 8026F0E0 0026C020 FC 20 F0 90 */ fmr f1, f30 -/* 8026F0E4 0026C024 48 00 01 1D */ bl SetR__8cM3dGCylFf -/* 8026F0E8 0026C028 7F E3 FB 78 */ mr r3, r31 -/* 8026F0EC 0026C02C FC 20 F8 90 */ fmr f1, f31 -/* 8026F0F0 0026C030 48 00 01 09 */ bl SetH__8cM3dGCylFf -/* 8026F0F4 0026C034 7F E3 FB 78 */ mr r3, r31 -/* 8026F0F8 0026C038 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 8026F0FC 0026C03C CB C1 00 10 */ lfd f30, 0x10(r1) -/* 8026F100 0026C040 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026F104 0026C044 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F108 0026C048 7C 08 03 A6 */ mtlr r0 -/* 8026F10C 0026C04C 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F110 0026C050 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s deleted file mode 100644 index 8d3593573a..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F114.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 8026F114 0026C054 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F118 0026C058 7C 08 02 A6 */ mflr r0 -/* 8026F11C 0026C05C 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F120 0026C060 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8026F124 0026C064 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8026F128 0026C068 7C 7E 1B 78 */ mr r30, r3 -/* 8026F12C 0026C06C 7C 9F 23 78 */ mr r31, r4 -/* 8026F130 0026C070 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F134 0026C074 D0 01 00 08 */ stfs f0, 8(r1) -/* 8026F138 0026C078 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F13C 0026C07C D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8026F140 0026C080 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F144 0026C084 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8026F148 0026C088 38 81 00 08 */ addi r4, r1, 8 -/* 8026F14C 0026C08C 48 00 00 91 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8026F150 0026C090 7F C3 F3 78 */ mr r3, r30 -/* 8026F154 0026C094 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 8026F158 0026C098 48 00 00 A9 */ bl SetR__8cM3dGCylFf -/* 8026F15C 0026C09C 7F C3 F3 78 */ mr r3, r30 -/* 8026F160 0026C0A0 C0 3F 00 10 */ lfs f1, 0x10(r31) -/* 8026F164 0026C0A4 48 00 00 95 */ bl SetH__8cM3dGCylFf -/* 8026F168 0026C0A8 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8026F16C 0026C0AC 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8026F170 0026C0B0 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F174 0026C0B4 7C 08 03 A6 */ mtlr r0 -/* 8026F178 0026C0B8 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F17C 0026C0BC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s deleted file mode 100644 index df41ea289e..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F180.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 8026F180 0026C0C0 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F184 0026C0C4 7C 08 02 A6 */ mflr r0 -/* 8026F188 0026C0C8 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F18C 0026C0CC DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8026F190 0026C0D0 DB C1 00 10 */ stfd f30, 0x10(r1) -/* 8026F194 0026C0D4 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026F198 0026C0D8 7C 7F 1B 78 */ mr r31, r3 -/* 8026F19C 0026C0DC FF C0 08 90 */ fmr f30, f1 -/* 8026F1A0 0026C0E0 FF E0 10 90 */ fmr f31, f2 -/* 8026F1A4 0026C0E4 48 00 00 39 */ bl SetC__8cM3dGCylFRC4cXyz -/* 8026F1A8 0026C0E8 7F E3 FB 78 */ mr r3, r31 -/* 8026F1AC 0026C0EC FC 20 F0 90 */ fmr f1, f30 -/* 8026F1B0 0026C0F0 48 00 00 51 */ bl SetR__8cM3dGCylFf -/* 8026F1B4 0026C0F4 7F E3 FB 78 */ mr r3, r31 -/* 8026F1B8 0026C0F8 FC 20 F8 90 */ fmr f1, f31 -/* 8026F1BC 0026C0FC 48 00 00 3D */ bl SetH__8cM3dGCylFf -/* 8026F1C0 0026C100 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 8026F1C4 0026C104 CB C1 00 10 */ lfd f30, 0x10(r1) -/* 8026F1C8 0026C108 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026F1CC 0026C10C 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F1D0 0026C110 7C 08 03 A6 */ mtlr r0 -/* 8026F1D4 0026C114 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F1D8 0026C118 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s deleted file mode 100644 index 990e8af2d7..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 8026F1DC 0026C11C C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F1E0 0026C120 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F1E4 0026C124 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F1E8 0026C128 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F1EC 0026C12C C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F1F0 0026C130 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F1F4 0026C134 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s deleted file mode 100644 index 16de3d7eed..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8026F1F8 0026C138 D0 23 00 10 */ stfs f1, 0x10(r3) -/* 8026F1FC 0026C13C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s deleted file mode 100644 index de03746cb8..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F200.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8026F200 0026C140 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 8026F204 0026C144 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s deleted file mode 100644 index 4b0d1fbbaf..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F208.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 8026F208 0026C148 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F20C 0026C14C 7C 08 02 A6 */ mflr r0 -/* 8026F210 0026C150 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F214 0026C154 38 C1 00 08 */ addi r6, r1, 8 -/* 8026F218 0026C158 4B FF C8 31 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf -/* 8026F21C 0026C15C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F220 0026C160 7C 08 03 A6 */ mtlr r0 -/* 8026F224 0026C164 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F228 0026C168 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s deleted file mode 100644 index f57e724af5..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F22C.s +++ /dev/null @@ -1,8 +0,0 @@ -/* 8026F22C 0026C16C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F230 0026C170 7C 08 02 A6 */ mflr r0 -/* 8026F234 0026C174 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F238 0026C178 4B FF D1 7D */ bl cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylP3Vec -/* 8026F23C 0026C17C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F240 0026C180 7C 08 03 A6 */ mtlr r0 -/* 8026F244 0026C184 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F248 0026C188 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s b/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s deleted file mode 100644 index b800454404..0000000000 --- a/include/SComponent/c_m3d_g_cyl/asm/func_8026F24C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 8026F24C 0026C18C C0 23 00 00 */ lfs f1, 0(r3) -/* 8026F250 0026C190 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026F254 0026C194 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026F258 0026C198 D0 04 00 00 */ stfs f0, 0(r4) -/* 8026F25C 0026C19C C0 03 00 04 */ lfs f0, 4(r3) -/* 8026F260 0026C1A0 D0 04 00 04 */ stfs f0, 4(r4) -/* 8026F264 0026C1A4 C0 23 00 08 */ lfs f1, 8(r3) -/* 8026F268 0026C1A8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026F26C 0026C1AC EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026F270 0026C1B0 D0 04 00 08 */ stfs f0, 8(r4) -/* 8026F274 0026C1B4 C0 23 00 00 */ lfs f1, 0(r3) -/* 8026F278 0026C1B8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026F27C 0026C1BC EC 01 00 2A */ fadds f0, f1, f0 -/* 8026F280 0026C1C0 D0 05 00 00 */ stfs f0, 0(r5) -/* 8026F284 0026C1C4 C0 23 00 04 */ lfs f1, 4(r3) -/* 8026F288 0026C1C8 C0 03 00 10 */ lfs f0, 0x10(r3) -/* 8026F28C 0026C1CC EC 01 00 2A */ fadds f0, f1, f0 -/* 8026F290 0026C1D0 D0 05 00 04 */ stfs f0, 4(r5) -/* 8026F294 0026C1D4 C0 23 00 08 */ lfs f1, 8(r3) -/* 8026F298 0026C1D8 C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026F29C 0026C1DC EC 01 00 2A */ fadds f0, f1, f0 -/* 8026F2A0 0026C1E0 D0 05 00 08 */ stfs f0, 8(r5) -/* 8026F2A4 0026C1E4 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_lin.h b/include/SComponent/c_m3d_g_lin.h index 4c37a9d247..9916282f9c 100644 --- a/include/SComponent/c_m3d_g_lin.h +++ b/include/SComponent/c_m3d_g_lin.h @@ -4,13 +4,25 @@ #include "SComponent/c_xyz.h" #include "global.h" +// Line class cM3dGLin { + // private: public: + cXyz mStart; + cXyz mEnd; + + cM3dGLin() {} cM3dGLin(const cXyz&, const cXyz&); + virtual ~cM3dGLin() {} void SetStartEnd(const cXyz&, const cXyz&); void SetStartEnd(const Vec&, const Vec&); - void CalcPos(Vec*, float) const; + void CalcPos(Vec*, f32) const; + void CalcVec(Vec* pOut) const { PSVECSubtract(&this->mEnd, &this->mStart, pOut); } void SetEnd(const cXyz&); + const cXyz& GetStartP(void) const { return mStart; } + cXyz& GetStartP(void) { return mStart; } + const cXyz& GetEndP(void) const { return mEnd; } + cXyz& GetEndP(void) { return mEnd; } }; #endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s deleted file mode 100644 index 5cd73c667f..0000000000 --- a/include/SComponent/c_m3d_g_lin/asm/func_8026F2A8.s +++ /dev/null @@ -1,16 +0,0 @@ -/* 8026F2A8 0026C1E8 3C C0 80 3A */ lis r6, lbl_803A78F8@ha -/* 8026F2AC 0026C1EC 38 06 78 F8 */ addi r0, r6, lbl_803A78F8@l -/* 8026F2B0 0026C1F0 90 03 00 18 */ stw r0, 0x18(r3) -/* 8026F2B4 0026C1F4 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F2B8 0026C1F8 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F2BC 0026C1FC C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F2C0 0026C200 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F2C4 0026C204 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F2C8 0026C208 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F2CC 0026C20C C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F2D0 0026C210 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026F2D4 0026C214 C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F2D8 0026C218 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026F2DC 0026C21C C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F2E0 0026C220 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F2E4 0026C224 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s deleted file mode 100644 index 2406f3ebdd..0000000000 --- a/include/SComponent/c_m3d_g_lin/asm/func_8026F2E8.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8026F2E8 0026C228 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F2EC 0026C22C D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F2F0 0026C230 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F2F4 0026C234 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F2F8 0026C238 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F2FC 0026C23C D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F300 0026C240 C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F304 0026C244 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026F308 0026C248 C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F30C 0026C24C D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026F310 0026C250 C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F314 0026C254 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F318 0026C258 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s deleted file mode 100644 index d3a8ef59b8..0000000000 --- a/include/SComponent/c_m3d_g_lin/asm/func_8026F31C.s +++ /dev/null @@ -1,13 +0,0 @@ -/* 8026F31C 0026C25C C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F320 0026C260 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F324 0026C264 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F328 0026C268 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F32C 0026C26C C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F330 0026C270 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F334 0026C274 C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F338 0026C278 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026F33C 0026C27C C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F340 0026C280 D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026F344 0026C284 C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F348 0026C288 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F34C 0026C28C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s deleted file mode 100644 index 9dc6d718a5..0000000000 --- a/include/SComponent/c_m3d_g_lin/asm/func_8026F350.s +++ /dev/null @@ -1,28 +0,0 @@ -/* 8026F350 0026C290 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8026F354 0026C294 7C 08 02 A6 */ mflr r0 -/* 8026F358 0026C298 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026F35C 0026C29C DB E1 00 28 */ stfd f31, 0x28(r1) -/* 8026F360 0026C2A0 93 E1 00 24 */ stw r31, 0x24(r1) -/* 8026F364 0026C2A4 93 C1 00 20 */ stw r30, 0x20(r1) -/* 8026F368 0026C2A8 7C 7E 1B 78 */ mr r30, r3 -/* 8026F36C 0026C2AC 7C 9F 23 78 */ mr r31, r4 -/* 8026F370 0026C2B0 FF E0 08 90 */ fmr f31, f1 -/* 8026F374 0026C2B4 38 7E 00 0C */ addi r3, r30, 0xc -/* 8026F378 0026C2B8 7F C4 F3 78 */ mr r4, r30 -/* 8026F37C 0026C2BC 38 A1 00 08 */ addi r5, r1, 8 -/* 8026F380 0026C2C0 48 0D 7D 35 */ bl PSVECSubtract -/* 8026F384 0026C2C4 38 61 00 08 */ addi r3, r1, 8 -/* 8026F388 0026C2C8 7C 64 1B 78 */ mr r4, r3 -/* 8026F38C 0026C2CC FC 20 F8 90 */ fmr f1, f31 -/* 8026F390 0026C2D0 48 0D 7D 49 */ bl PSVECScale -/* 8026F394 0026C2D4 38 61 00 08 */ addi r3, r1, 8 -/* 8026F398 0026C2D8 7F C4 F3 78 */ mr r4, r30 -/* 8026F39C 0026C2DC 7F E5 FB 78 */ mr r5, r31 -/* 8026F3A0 0026C2E0 48 0D 7C F1 */ bl PSVECAdd -/* 8026F3A4 0026C2E4 CB E1 00 28 */ lfd f31, 0x28(r1) -/* 8026F3A8 0026C2E8 83 E1 00 24 */ lwz r31, 0x24(r1) -/* 8026F3AC 0026C2EC 83 C1 00 20 */ lwz r30, 0x20(r1) -/* 8026F3B0 0026C2F0 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026F3B4 0026C2F4 7C 08 03 A6 */ mtlr r0 -/* 8026F3B8 0026C2F8 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026F3BC 0026C2FC 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s b/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s deleted file mode 100644 index f16f3bd6e5..0000000000 --- a/include/SComponent/c_m3d_g_lin/asm/func_8026F3C0.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 8026F3C0 0026C300 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F3C4 0026C304 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026F3C8 0026C308 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F3CC 0026C30C D0 03 00 10 */ stfs f0, 0x10(r3) -/* 8026F3D0 0026C310 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F3D4 0026C314 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F3D8 0026C318 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_pla.h b/include/SComponent/c_m3d_g_pla.h index 9a7042ab15..5d440dfc23 100644 --- a/include/SComponent/c_m3d_g_pla.h +++ b/include/SComponent/c_m3d_g_pla.h @@ -4,15 +4,22 @@ #include "SComponent/c_xyz.h" #include "global.h" +// Plane with a normal class cM3dGPla { public: - cM3dGPla(const cXyz*, float); - void crossInfLin(const cXyz&, const cXyz&, cXyz&) const; + cXyz mNormal; + f32 mD; + cM3dGPla(const cXyz*, f32); + virtual ~cM3dGPla(); + bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const; void SetupNP0(const Vec&, const Vec&); void SetupNP(const Vec&, const Vec&); - bool getCrossY(const cXyz&, float*) const; - bool getCrossYLessD(const Vec&, float*) const; + bool getCrossY(const cXyz&, f32*) const; + bool getCrossYLessD(const Vec&, f32*) const; void Set(const cM3dGPla*); + f32 getPlaneFunc(const Vec* pPoint) const { return mD + PSVECDotProduct(&mNormal, pPoint); } + const cXyz& GetNP() const { return mNormal; } + f32 GetD() const { return mD; } }; #endif \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s deleted file mode 100644 index ddbce712ac..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F3DC.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8026F3DC 0026C31C 3C A0 80 3A */ lis r5, lbl_803A37C0@ha -/* 8026F3E0 0026C320 38 05 37 C0 */ addi r0, r5, lbl_803A37C0@l -/* 8026F3E4 0026C324 90 03 00 10 */ stw r0, 0x10(r3) -/* 8026F3E8 0026C328 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F3EC 0026C32C D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F3F0 0026C330 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F3F4 0026C334 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F3F8 0026C338 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F3FC 0026C33C D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F400 0026C340 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 8026F404 0026C344 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s deleted file mode 100644 index 6b96452223..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F408.s +++ /dev/null @@ -1,49 +0,0 @@ -/* 8026F408 0026C348 94 21 FF D0 */ stwu r1, -0x30(r1) -/* 8026F40C 0026C34C 7C 08 02 A6 */ mflr r0 -/* 8026F410 0026C350 90 01 00 34 */ stw r0, 0x34(r1) -/* 8026F414 0026C354 DB E1 00 20 */ stfd f31, 0x20(r1) -/* 8026F418 0026C358 F3 E1 00 28 */ psq_st f31, 40(r1), 0, 0 -/* 8026F41C 0026C35C 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026F420 0026C360 48 0F 2D B9 */ bl _savegpr_28 -/* 8026F424 0026C364 7C 7C 1B 78 */ mr r28, r3 -/* 8026F428 0026C368 7C 9D 23 78 */ mr r29, r4 -/* 8026F42C 0026C36C 7C BE 2B 78 */ mr r30, r5 -/* 8026F430 0026C370 7C DF 33 78 */ mr r31, r6 -/* 8026F434 0026C374 48 0D 7D 61 */ bl PSVECDotProduct -/* 8026F438 0026C378 C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 8026F43C 0026C37C EF E0 08 2A */ fadds f31, f0, f1 -/* 8026F440 0026C380 7F 83 E3 78 */ mr r3, r28 -/* 8026F444 0026C384 7F C4 F3 78 */ mr r4, r30 -/* 8026F448 0026C388 48 0D 7D 4D */ bl PSVECDotProduct -/* 8026F44C 0026C38C C0 1C 00 0C */ lfs f0, 0xc(r28) -/* 8026F450 0026C390 EC 00 08 2A */ fadds f0, f0, f1 -/* 8026F454 0026C394 EC 5F 00 28 */ fsubs f2, f31, f0 -/* 8026F458 0026C398 FC 00 12 10 */ fabs f0, f2 -/* 8026F45C 0026C39C FC 20 00 18 */ frsp f1, f0 -/* 8026F460 0026C3A0 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026F464 0026C3A4 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026F468 0026C3A8 40 80 00 24 */ bge lbl_8026F48C -/* 8026F46C 0026C3AC C0 1E 00 00 */ lfs f0, 0(r30) -/* 8026F470 0026C3B0 D0 1F 00 00 */ stfs f0, 0(r31) -/* 8026F474 0026C3B4 C0 1E 00 04 */ lfs f0, 4(r30) -/* 8026F478 0026C3B8 D0 1F 00 04 */ stfs f0, 4(r31) -/* 8026F47C 0026C3BC C0 1E 00 08 */ lfs f0, 8(r30) -/* 8026F480 0026C3C0 D0 1F 00 08 */ stfs f0, 8(r31) -/* 8026F484 0026C3C4 38 60 00 00 */ li r3, 0 -/* 8026F488 0026C3C8 48 00 00 1C */ b lbl_8026F4A4 -lbl_8026F48C: -/* 8026F48C 0026C3CC 7F A3 EB 78 */ mr r3, r29 -/* 8026F490 0026C3D0 7F C4 F3 78 */ mr r4, r30 -/* 8026F494 0026C3D4 EC 3F 10 24 */ fdivs f1, f31, f2 -/* 8026F498 0026C3D8 7F E5 FB 78 */ mr r5, r31 -/* 8026F49C 0026C3DC 4B FF 91 15 */ bl cM3d_InDivPos2__FPC3VecPC3VecfP3Vec -/* 8026F4A0 0026C3E0 38 60 00 01 */ li r3, 1 -lbl_8026F4A4: -/* 8026F4A4 0026C3E4 E3 E1 00 28 */ psq_l f31, 40(r1), 0, 0 -/* 8026F4A8 0026C3E8 CB E1 00 20 */ lfd f31, 0x20(r1) -/* 8026F4AC 0026C3EC 39 61 00 20 */ addi r11, r1, 0x20 -/* 8026F4B0 0026C3F0 48 0F 2D 75 */ bl _restgpr_28 -/* 8026F4B4 0026C3F4 80 01 00 34 */ lwz r0, 0x34(r1) -/* 8026F4B8 0026C3F8 7C 08 03 A6 */ mtlr r0 -/* 8026F4BC 0026C3FC 38 21 00 30 */ addi r1, r1, 0x30 -/* 8026F4C0 0026C400 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s deleted file mode 100644 index 11d6e5523e..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F4C4.s +++ /dev/null @@ -1,26 +0,0 @@ -/* 8026F4C4 0026C404 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F4C8 0026C408 7C 08 02 A6 */ mflr r0 -/* 8026F4CC 0026C40C 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F4D0 0026C410 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026F4D4 0026C414 93 C1 00 08 */ stw r30, 8(r1) -/* 8026F4D8 0026C418 7C 7E 1B 78 */ mr r30, r3 -/* 8026F4DC 0026C41C 7C BF 2B 78 */ mr r31, r5 -/* 8026F4E0 0026C420 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F4E4 0026C424 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F4E8 0026C428 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F4EC 0026C42C D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F4F0 0026C430 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F4F4 0026C434 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F4F8 0026C438 7F C4 F3 78 */ mr r4, r30 -/* 8026F4FC 0026C43C 48 0D 7B F9 */ bl PSVECNormalize -/* 8026F500 0026C440 7F C3 F3 78 */ mr r3, r30 -/* 8026F504 0026C444 7F E4 FB 78 */ mr r4, r31 -/* 8026F508 0026C448 48 0D 7C 8D */ bl PSVECDotProduct -/* 8026F50C 0026C44C FC 00 08 50 */ fneg f0, f1 -/* 8026F510 0026C450 D0 1E 00 0C */ stfs f0, 0xc(r30) -/* 8026F514 0026C454 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026F518 0026C458 83 C1 00 08 */ lwz r30, 8(r1) -/* 8026F51C 0026C45C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F520 0026C460 7C 08 03 A6 */ mtlr r0 -/* 8026F524 0026C464 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F528 0026C468 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s deleted file mode 100644 index 071828b359..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F52C.s +++ /dev/null @@ -1,20 +0,0 @@ -/* 8026F52C 0026C46C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F530 0026C470 7C 08 02 A6 */ mflr r0 -/* 8026F534 0026C474 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F538 0026C478 93 E1 00 0C */ stw r31, 0xc(r1) -/* 8026F53C 0026C47C 7C 7F 1B 78 */ mr r31, r3 -/* 8026F540 0026C480 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F544 0026C484 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F548 0026C488 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F54C 0026C48C D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F550 0026C490 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F554 0026C494 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F558 0026C498 7C A4 2B 78 */ mr r4, r5 -/* 8026F55C 0026C49C 48 0D 7C 39 */ bl PSVECDotProduct -/* 8026F560 0026C4A0 FC 00 08 50 */ fneg f0, f1 -/* 8026F564 0026C4A4 D0 1F 00 0C */ stfs f0, 0xc(r31) -/* 8026F568 0026C4A8 83 E1 00 0C */ lwz r31, 0xc(r1) -/* 8026F56C 0026C4AC 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F570 0026C4B0 7C 08 03 A6 */ mtlr r0 -/* 8026F574 0026C4B4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F578 0026C4B8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s deleted file mode 100644 index 8332636f23..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F57C.s +++ /dev/null @@ -1,23 +0,0 @@ -/* 8026F57C 0026C4BC C0 63 00 04 */ lfs f3, 4(r3) -/* 8026F580 0026C4C0 FC 00 1A 10 */ fabs f0, f3 -/* 8026F584 0026C4C4 FC 20 00 18 */ frsp f1, f0 -/* 8026F588 0026C4C8 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026F58C 0026C4CC FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026F590 0026C4D0 40 80 00 0C */ bge lbl_8026F59C -/* 8026F594 0026C4D4 38 60 00 00 */ li r3, 0 -/* 8026F598 0026C4D8 4E 80 00 20 */ blr -lbl_8026F59C: -/* 8026F59C 0026C4DC C0 03 00 00 */ lfs f0, 0(r3) -/* 8026F5A0 0026C4E0 FC 20 00 50 */ fneg f1, f0 -/* 8026F5A4 0026C4E4 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F5A8 0026C4E8 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8026F5AC 0026C4EC C0 23 00 08 */ lfs f1, 8(r3) -/* 8026F5B0 0026C4F0 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F5B4 0026C4F4 EC 01 00 32 */ fmuls f0, f1, f0 -/* 8026F5B8 0026C4F8 EC 22 00 28 */ fsubs f1, f2, f0 -/* 8026F5BC 0026C4FC C0 03 00 0C */ lfs f0, 0xc(r3) -/* 8026F5C0 0026C500 EC 01 00 28 */ fsubs f0, f1, f0 -/* 8026F5C4 0026C504 EC 00 18 24 */ fdivs f0, f0, f3 -/* 8026F5C8 0026C508 D0 05 00 00 */ stfs f0, 0(r5) -/* 8026F5CC 0026C50C 38 60 00 01 */ li r3, 1 -/* 8026F5D0 0026C510 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s deleted file mode 100644 index 40b9cc4452..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F5D4.s +++ /dev/null @@ -1,21 +0,0 @@ -/* 8026F5D4 0026C514 C0 63 00 04 */ lfs f3, 4(r3) -/* 8026F5D8 0026C518 FC 00 1A 10 */ fabs f0, f3 -/* 8026F5DC 0026C51C FC 20 00 18 */ frsp f1, f0 -/* 8026F5E0 0026C520 C0 0D 8C 00 */ lfs f0, lbl_80451180-_SDA_BASE_(r13) -/* 8026F5E4 0026C524 FC 01 00 40 */ fcmpo cr0, f1, f0 -/* 8026F5E8 0026C528 40 80 00 0C */ bge lbl_8026F5F4 -/* 8026F5EC 0026C52C 38 60 00 00 */ li r3, 0 -/* 8026F5F0 0026C530 4E 80 00 20 */ blr -lbl_8026F5F4: -/* 8026F5F4 0026C534 C0 03 00 00 */ lfs f0, 0(r3) -/* 8026F5F8 0026C538 FC 20 00 50 */ fneg f1, f0 -/* 8026F5FC 0026C53C C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F600 0026C540 EC 41 00 32 */ fmuls f2, f1, f0 -/* 8026F604 0026C544 C0 23 00 08 */ lfs f1, 8(r3) -/* 8026F608 0026C548 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F60C 0026C54C EC 01 00 32 */ fmuls f0, f1, f0 -/* 8026F610 0026C550 EC 02 00 28 */ fsubs f0, f2, f0 -/* 8026F614 0026C554 EC 00 18 24 */ fdivs f0, f0, f3 -/* 8026F618 0026C558 D0 05 00 00 */ stfs f0, 0(r5) -/* 8026F61C 0026C55C 38 60 00 01 */ li r3, 1 -/* 8026F620 0026C560 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s b/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s deleted file mode 100644 index 67bc63ec15..0000000000 --- a/include/SComponent/c_m3d_g_pla/asm/func_8026F624.s +++ /dev/null @@ -1,9 +0,0 @@ -/* 8026F624 0026C564 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F628 0026C568 D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F62C 0026C56C C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F630 0026C570 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F634 0026C574 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F638 0026C578 D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F63C 0026C57C C0 04 00 0C */ lfs f0, 0xc(r4) -/* 8026F640 0026C580 D0 03 00 0C */ stfs f0, 0xc(r3) -/* 8026F644 0026C584 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_sph.h b/include/SComponent/c_m3d_g_sph.h index 0ee96bfd7b..39cb80c668 100644 --- a/include/SComponent/c_m3d_g_sph.h +++ b/include/SComponent/c_m3d_g_sph.h @@ -5,17 +5,29 @@ #include "SComponent/c_xyz.h" #include "global.h" -struct cM3dGSphS; +struct cM3dGSphS { + Vec mCenter; + f32 mRadius; +}; class cM3dGSph { +private: public: + cXyz mCenter; + f32 mRadius; + void SetC(const cXyz&); - void Set(const cXyz&, float); + void Set(const cXyz&, f32); void Set(const cM3dGSphS&); - void SetR(float); + void SetR(f32); bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; void GetMinMaxCube(cXyz&, cXyz&) const; + const cXyz& GetC(void) const { return mCenter; } + const f32 GetR(void) const { return mRadius; } + f32 GetCX(void) const { return mCenter.GetX(); } + f32 GetCY(void) const { return mCenter.GetY(); } + f32 GetCZ(void) const { return mCenter.GetZ(); } }; // additional symbols needed for cM3dGSph diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s deleted file mode 100644 index ccd3e218a0..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F648.s +++ /dev/null @@ -1,7 +0,0 @@ -/* 8026F648 0026C588 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F64C 0026C58C D0 03 00 00 */ stfs f0, 0(r3) -/* 8026F650 0026C590 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F654 0026C594 D0 03 00 04 */ stfs f0, 4(r3) -/* 8026F658 0026C598 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F65C 0026C59C D0 03 00 08 */ stfs f0, 8(r3) -/* 8026F660 0026C5A0 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s deleted file mode 100644 index f0bc467d06..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F664.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026F664 0026C5A4 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F668 0026C5A8 7C 08 02 A6 */ mflr r0 -/* 8026F66C 0026C5AC 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F670 0026C5B0 DB E1 00 18 */ stfd f31, 0x18(r1) -/* 8026F674 0026C5B4 93 E1 00 14 */ stw r31, 0x14(r1) -/* 8026F678 0026C5B8 7C 7F 1B 78 */ mr r31, r3 -/* 8026F67C 0026C5BC FF E0 08 90 */ fmr f31, f1 -/* 8026F680 0026C5C0 4B FF FF C9 */ bl SetC__8cM3dGSphFRC4cXyz -/* 8026F684 0026C5C4 7F E3 FB 78 */ mr r3, r31 -/* 8026F688 0026C5C8 FC 20 F8 90 */ fmr f1, f31 -/* 8026F68C 0026C5CC 48 00 00 7D */ bl SetR__8cM3dGSphFf -/* 8026F690 0026C5D0 CB E1 00 18 */ lfd f31, 0x18(r1) -/* 8026F694 0026C5D4 83 E1 00 14 */ lwz r31, 0x14(r1) -/* 8026F698 0026C5D8 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F69C 0026C5DC 7C 08 03 A6 */ mtlr r0 -/* 8026F6A0 0026C5E0 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F6A4 0026C5E4 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s deleted file mode 100644 index 27af44ffe1..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F6A8.s +++ /dev/null @@ -1,24 +0,0 @@ -/* 8026F6A8 0026C5E8 94 21 FF E0 */ stwu r1, -0x20(r1) -/* 8026F6AC 0026C5EC 7C 08 02 A6 */ mflr r0 -/* 8026F6B0 0026C5F0 90 01 00 24 */ stw r0, 0x24(r1) -/* 8026F6B4 0026C5F4 93 E1 00 1C */ stw r31, 0x1c(r1) -/* 8026F6B8 0026C5F8 93 C1 00 18 */ stw r30, 0x18(r1) -/* 8026F6BC 0026C5FC 7C 7E 1B 78 */ mr r30, r3 -/* 8026F6C0 0026C600 7C 9F 23 78 */ mr r31, r4 -/* 8026F6C4 0026C604 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F6C8 0026C608 D0 01 00 08 */ stfs f0, 8(r1) -/* 8026F6CC 0026C60C C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F6D0 0026C610 D0 01 00 0C */ stfs f0, 0xc(r1) -/* 8026F6D4 0026C614 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F6D8 0026C618 D0 01 00 10 */ stfs f0, 0x10(r1) -/* 8026F6DC 0026C61C 38 81 00 08 */ addi r4, r1, 8 -/* 8026F6E0 0026C620 4B FF FF 69 */ bl SetC__8cM3dGSphFRC4cXyz -/* 8026F6E4 0026C624 7F C3 F3 78 */ mr r3, r30 -/* 8026F6E8 0026C628 C0 3F 00 0C */ lfs f1, 0xc(r31) -/* 8026F6EC 0026C62C 48 00 00 1D */ bl SetR__8cM3dGSphFf -/* 8026F6F0 0026C630 83 E1 00 1C */ lwz r31, 0x1c(r1) -/* 8026F6F4 0026C634 83 C1 00 18 */ lwz r30, 0x18(r1) -/* 8026F6F8 0026C638 80 01 00 24 */ lwz r0, 0x24(r1) -/* 8026F6FC 0026C63C 7C 08 03 A6 */ mtlr r0 -/* 8026F700 0026C640 38 21 00 20 */ addi r1, r1, 0x20 -/* 8026F704 0026C644 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s deleted file mode 100644 index 519eb584a8..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F708.s +++ /dev/null @@ -1,2 +0,0 @@ -/* 8026F708 0026C648 D0 23 00 0C */ stfs f1, 0xc(r3) -/* 8026F70C 0026C64C 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s deleted file mode 100644 index a481780420..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F710.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8026F710 0026C650 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F714 0026C654 7C 08 02 A6 */ mflr r0 -/* 8026F718 0026C658 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F71C 0026C65C 7C 60 1B 78 */ mr r0, r3 -/* 8026F720 0026C660 7C 83 23 78 */ mr r3, r4 -/* 8026F724 0026C664 7C 04 03 78 */ mr r4, r0 -/* 8026F728 0026C668 4B FF C6 61 */ bl cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec -/* 8026F72C 0026C66C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F730 0026C670 7C 08 03 A6 */ mtlr r0 -/* 8026F734 0026C674 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F738 0026C678 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s deleted file mode 100644 index 9f6a1ffe97..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F73C.s +++ /dev/null @@ -1,12 +0,0 @@ -/* 8026F73C 0026C67C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F740 0026C680 7C 08 02 A6 */ mflr r0 -/* 8026F744 0026C684 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F748 0026C688 7C 60 1B 78 */ mr r0, r3 -/* 8026F74C 0026C68C 7C 83 23 78 */ mr r3, r4 -/* 8026F750 0026C690 7C 04 03 78 */ mr r4, r0 -/* 8026F754 0026C694 38 C1 00 08 */ addi r6, r1, 8 -/* 8026F758 0026C698 4B FF C2 F1 */ bl cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf -/* 8026F75C 0026C69C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F760 0026C6A0 7C 08 03 A6 */ mtlr r0 -/* 8026F764 0026C6A4 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F768 0026C6A8 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s b/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s deleted file mode 100644 index fa4e2aa4e4..0000000000 --- a/include/SComponent/c_m3d_g_sph/asm/func_8026F76C.s +++ /dev/null @@ -1,17 +0,0 @@ -/* 8026F76C 0026C6AC C0 83 00 00 */ lfs f4, 0(r3) -/* 8026F770 0026C6B0 C0 63 00 0C */ lfs f3, 0xc(r3) -/* 8026F774 0026C6B4 EC 04 18 28 */ fsubs f0, f4, f3 -/* 8026F778 0026C6B8 D0 04 00 00 */ stfs f0, 0(r4) -/* 8026F77C 0026C6BC C0 43 00 04 */ lfs f2, 4(r3) -/* 8026F780 0026C6C0 EC 02 18 28 */ fsubs f0, f2, f3 -/* 8026F784 0026C6C4 D0 04 00 04 */ stfs f0, 4(r4) -/* 8026F788 0026C6C8 C0 23 00 08 */ lfs f1, 8(r3) -/* 8026F78C 0026C6CC EC 01 18 28 */ fsubs f0, f1, f3 -/* 8026F790 0026C6D0 D0 04 00 08 */ stfs f0, 8(r4) -/* 8026F794 0026C6D4 EC 04 18 2A */ fadds f0, f4, f3 -/* 8026F798 0026C6D8 D0 05 00 00 */ stfs f0, 0(r5) -/* 8026F79C 0026C6DC EC 02 18 2A */ fadds f0, f2, f3 -/* 8026F7A0 0026C6E0 D0 05 00 04 */ stfs f0, 4(r5) -/* 8026F7A4 0026C6E4 EC 01 18 2A */ fadds f0, f1, f3 -/* 8026F7A8 0026C6E8 D0 05 00 08 */ stfs f0, 8(r5) -/* 8026F7AC 0026C6EC 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_tri.h b/include/SComponent/c_m3d_g_tri.h index c22783ed50..3d2fdf89c6 100644 --- a/include/SComponent/c_m3d_g_tri.h +++ b/include/SComponent/c_m3d_g_tri.h @@ -7,7 +7,13 @@ #include "global.h" class cM3dGTri { + // private: public: + cM3dGPla mPlane; + cXyz mA; + cXyz mB; + cXyz mC; + bool cross(const cM3dGCyl*, Vec*) const; void setPos(const Vec*, const Vec*, const Vec*); void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*); diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s deleted file mode 100644 index 4fdcdca4a0..0000000000 --- a/include/SComponent/c_m3d_g_tri/asm/func_8026F7B0.s +++ /dev/null @@ -1,11 +0,0 @@ -/* 8026F7B0 0026C6F0 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F7B4 0026C6F4 7C 08 02 A6 */ mflr r0 -/* 8026F7B8 0026C6F8 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F7BC 0026C6FC 7C 60 1B 78 */ mr r0, r3 -/* 8026F7C0 0026C700 7C 83 23 78 */ mr r3, r4 -/* 8026F7C4 0026C704 7C 04 03 78 */ mr r4, r0 -/* 8026F7C8 0026C708 4B FF CE 09 */ bl cM3d_Cross_CylTri__FPC8cM3dGCylPC8cM3dGTriP3Vec -/* 8026F7CC 0026C70C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F7D0 0026C710 7C 08 03 A6 */ mtlr r0 -/* 8026F7D4 0026C714 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F7D8 0026C718 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s deleted file mode 100644 index 5cff0327af..0000000000 --- a/include/SComponent/c_m3d_g_tri/asm/func_8026F7DC.s +++ /dev/null @@ -1,32 +0,0 @@ -/* 8026F7DC 0026C71C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F7E0 0026C720 7C 08 02 A6 */ mflr r0 -/* 8026F7E4 0026C724 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F7E8 0026C728 7C 67 1B 78 */ mr r7, r3 -/* 8026F7EC 0026C72C C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F7F0 0026C730 D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F7F4 0026C734 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F7F8 0026C738 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8026F7FC 0026C73C C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F800 0026C740 D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8026F804 0026C744 C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F808 0026C748 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8026F80C 0026C74C C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F810 0026C750 D0 03 00 24 */ stfs f0, 0x24(r3) -/* 8026F814 0026C754 C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F818 0026C758 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8026F81C 0026C75C C0 06 00 00 */ lfs f0, 0(r6) -/* 8026F820 0026C760 D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8026F824 0026C764 C0 06 00 04 */ lfs f0, 4(r6) -/* 8026F828 0026C768 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 8026F82C 0026C76C C0 06 00 08 */ lfs f0, 8(r6) -/* 8026F830 0026C770 D0 03 00 34 */ stfs f0, 0x34(r3) -/* 8026F834 0026C774 38 67 00 14 */ addi r3, r7, 0x14 -/* 8026F838 0026C778 38 87 00 20 */ addi r4, r7, 0x20 -/* 8026F83C 0026C77C 38 A7 00 2C */ addi r5, r7, 0x2c -/* 8026F840 0026C780 7C E6 3B 78 */ mr r6, r7 -/* 8026F844 0026C784 38 E7 00 0C */ addi r7, r7, 0xc -/* 8026F848 0026C788 4B FF 90 D5 */ bl cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf -/* 8026F84C 0026C78C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F850 0026C790 7C 08 03 A6 */ mtlr r0 -/* 8026F854 0026C794 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F858 0026C798 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s deleted file mode 100644 index 0a53953221..0000000000 --- a/include/SComponent/c_m3d_g_tri/asm/func_8026F85C.s +++ /dev/null @@ -1,27 +0,0 @@ -/* 8026F85C 0026C79C 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F860 0026C7A0 7C 08 02 A6 */ mflr r0 -/* 8026F864 0026C7A4 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F868 0026C7A8 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F86C 0026C7AC D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F870 0026C7B0 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F874 0026C7B4 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8026F878 0026C7B8 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F87C 0026C7BC D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8026F880 0026C7C0 C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F884 0026C7C4 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8026F888 0026C7C8 C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F88C 0026C7CC D0 03 00 24 */ stfs f0, 0x24(r3) -/* 8026F890 0026C7D0 C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F894 0026C7D4 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8026F898 0026C7D8 C0 06 00 00 */ lfs f0, 0(r6) -/* 8026F89C 0026C7DC D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8026F8A0 0026C7E0 C0 06 00 04 */ lfs f0, 4(r6) -/* 8026F8A4 0026C7E4 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 8026F8A8 0026C7E8 C0 06 00 08 */ lfs f0, 8(r6) -/* 8026F8AC 0026C7EC D0 03 00 34 */ stfs f0, 0x34(r3) -/* 8026F8B0 0026C7F0 7C E4 3B 78 */ mr r4, r7 -/* 8026F8B4 0026C7F4 4B FF FD 71 */ bl Set__8cM3dGPlaFPC8cM3dGPla -/* 8026F8B8 0026C7F8 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F8BC 0026C7FC 7C 08 03 A6 */ mtlr r0 -/* 8026F8C0 0026C800 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F8C4 0026C804 4E 80 00 20 */ blr diff --git a/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s b/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s deleted file mode 100644 index 6e0d5c45f3..0000000000 --- a/include/SComponent/c_m3d_g_tri/asm/func_8026F8C8.s +++ /dev/null @@ -1,29 +0,0 @@ -/* 8026F8C8 0026C808 94 21 FF F0 */ stwu r1, -0x10(r1) -/* 8026F8CC 0026C80C 7C 08 02 A6 */ mflr r0 -/* 8026F8D0 0026C810 90 01 00 14 */ stw r0, 0x14(r1) -/* 8026F8D4 0026C814 7C 88 23 78 */ mr r8, r4 -/* 8026F8D8 0026C818 C0 04 00 00 */ lfs f0, 0(r4) -/* 8026F8DC 0026C81C D0 03 00 14 */ stfs f0, 0x14(r3) -/* 8026F8E0 0026C820 C0 04 00 04 */ lfs f0, 4(r4) -/* 8026F8E4 0026C824 D0 03 00 18 */ stfs f0, 0x18(r3) -/* 8026F8E8 0026C828 C0 04 00 08 */ lfs f0, 8(r4) -/* 8026F8EC 0026C82C D0 03 00 1C */ stfs f0, 0x1c(r3) -/* 8026F8F0 0026C830 C0 05 00 00 */ lfs f0, 0(r5) -/* 8026F8F4 0026C834 D0 03 00 20 */ stfs f0, 0x20(r3) -/* 8026F8F8 0026C838 C0 05 00 04 */ lfs f0, 4(r5) -/* 8026F8FC 0026C83C D0 03 00 24 */ stfs f0, 0x24(r3) -/* 8026F900 0026C840 C0 05 00 08 */ lfs f0, 8(r5) -/* 8026F904 0026C844 D0 03 00 28 */ stfs f0, 0x28(r3) -/* 8026F908 0026C848 C0 06 00 00 */ lfs f0, 0(r6) -/* 8026F90C 0026C84C D0 03 00 2C */ stfs f0, 0x2c(r3) -/* 8026F910 0026C850 C0 06 00 04 */ lfs f0, 4(r6) -/* 8026F914 0026C854 D0 03 00 30 */ stfs f0, 0x30(r3) -/* 8026F918 0026C858 C0 06 00 08 */ lfs f0, 8(r6) -/* 8026F91C 0026C85C D0 03 00 34 */ stfs f0, 0x34(r3) -/* 8026F920 0026C860 7C E4 3B 78 */ mr r4, r7 -/* 8026F924 0026C864 7D 05 43 78 */ mr r5, r8 -/* 8026F928 0026C868 4B FF FC 05 */ bl SetupNP__8cM3dGPlaFRC3VecRC3Vec -/* 8026F92C 0026C86C 80 01 00 14 */ lwz r0, 0x14(r1) -/* 8026F930 0026C870 7C 08 03 A6 */ mtlr r0 -/* 8026F934 0026C874 38 21 00 10 */ addi r1, r1, 0x10 -/* 8026F938 0026C878 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_malloc.h b/include/SComponent/c_malloc.h index 3107faae1f..510c65e5d8 100644 --- a/include/SComponent/c_malloc.h +++ b/include/SComponent/c_malloc.h @@ -5,6 +5,7 @@ #include "global.h" class cMl { +public: static void init(JKRHeap*); static void* memalignB(int, unsigned long); static void free(void*); diff --git a/include/SComponent/c_phase/asm/func_80266678.s b/include/SComponent/c_phase/asm/func_80266678.s deleted file mode 100644 index 4eb68aec8f..0000000000 --- a/include/SComponent/c_phase/asm/func_80266678.s +++ /dev/null @@ -1,28 +0,0 @@ -/* 80266678 002635B8 94 21 FF F0 */ stwu r1,-0x10(r1) -/* 8026667C 002635BC 7C 08 02 A6 */ mflr r0 -/* 80266680 002635C0 90 01 00 14 */ stw r0,0x14(r1) -/* 80266684 002635C4 80 A3 00 00 */ lwz r5,0(r3) -/* 80266688 002635C8 28 05 00 00 */ cmplwi r5,0 -/* 8026668C 002635CC 41 82 00 38 */ beq lbl_802666C4 -/* 80266690 002635D0 80 83 00 04 */ lwz r4,4(r3) -/* 80266694 002635D4 38 04 00 01 */ addi r0,r4,1 -/* 80266698 002635D8 90 03 00 04 */ stw r0,4(r3) -/* 8026669C 002635DC 80 03 00 04 */ lwz r0,4(r3) -/* 802666A0 002635E0 54 00 10 3A */ slwi r0,r0,2 -/* 802666A4 002635E4 7C 05 00 2E */ lwzx r0,r5,r0 -/* 802666A8 002635E8 28 00 00 00 */ cmplwi r0,0 -/* 802666AC 002635EC 41 82 00 08 */ beq lbl_802666B4 -/* 802666B0 002635F0 40 82 00 0C */ bne lbl_802666BC -lbl_802666B4: -/* 802666B4 002635F4 4B FF FF B5 */ bl cPhs_Compleate -/* 802666B8 002635F8 48 00 00 10 */ b lbl_802666C8 -lbl_802666BC: -/* 802666BC 002635FC 38 60 00 01 */ li r3,1 -/* 802666C0 00263600 48 00 00 08 */ b lbl_802666C8 -lbl_802666C4: -/* 802666C4 00263604 38 60 00 04 */ li r3,4 -lbl_802666C8: -/* 802666C8 00263608 80 01 00 14 */ lwz r0,0x14(r1) -/* 802666CC 0026360C 7C 08 03 A6 */ mtlr r0 -/* 802666D0 00263610 38 21 00 10 */ addi r1,r1,0x10 -/* 802666D4 00263614 4E 80 00 20 */ blr \ No newline at end of file diff --git a/include/SComponent/c_sxyz.h b/include/SComponent/c_sxyz.h index ec0365d7fa..604d05d4aa 100644 --- a/include/SComponent/c_sxyz.h +++ b/include/SComponent/c_sxyz.h @@ -12,7 +12,7 @@ public: csXyz operator+(csXyz&); void operator+=(csXyz&); csXyz operator-(csXyz&); - csXyz operator*(float); + csXyz operator*(f32); }; extern csXyz lbl_80451160; // SComponent::csXyz::Zero diff --git a/include/SComponent/c_xyz.h b/include/SComponent/c_xyz.h index 784100b25b..baac53cf79 100644 --- a/include/SComponent/c_xyz.h +++ b/include/SComponent/c_xyz.h @@ -4,22 +4,22 @@ #include "SComponent/c_math.h" #include "global.h" -extern float /* 1.0 */ lbl_80455070; -extern float /* epsilon */ lbl_80455074; -extern float lbl_80455078; -extern float lbl_8045507C; -extern float lbl_80455080; -extern float /* 32.0 */ lbl_80455084; -extern double lbl_80455088; -extern double lbl_80455090; -extern double lbl_80455098; +extern f32 /* 1.0 */ lbl_80455070; +extern f32 /* epsilon */ lbl_80455074; +extern f32 lbl_80455078; +extern f32 lbl_8045507C; +extern f32 lbl_80455080; +extern f32 /* 32.0 */ lbl_80455084; +extern f64 lbl_80455088; +extern f64 lbl_80455090; +extern f64 lbl_80455098; extern u8 lbl_80430CE8; class cXyz : public Vec { public: ~cXyz(){}; cXyz() {} - cXyz(float x, float y, float z) { + cXyz(f32 x, f32 y, f32 z) { this->x = x; this->y = y; this->z = z; @@ -34,18 +34,26 @@ public: this->y = vec.y; this->z = vec.z; } - cXyz operator=(const Vec& vec) { - cXyz ret; - ret.x = vec.x; - ret.y = vec.y; - ret.z = vec.z; - return ret; + void operator=(const Vec& vec) { + this->x = vec.x; + this->y = vec.y; + this->z = vec.z; } cXyz operator+(const Vec& vec) const; cXyz operator-(const Vec& vec) const; - cXyz operator*(float scale) const; + cXyz operator*(f32 scale) const; cXyz operator*(const Vec& vec) const; - cXyz operator/(float) const; + cXyz operator/(f32) const; + void operator+=(f32 f) { + x += f; + y += f; + z += f; + } + void operator-=(f32 f) { + x -= f; + y -= f; + z -= f; + } cXyz getCrossProduct(const Vec&) const; cXyz outprod(const Vec&) const; cXyz norm(void) const; @@ -60,10 +68,34 @@ public: s16 atan2sX_Z(void) const; s16 atan2sY_XZ(void) const; - void baseZ() { - this->x = lbl_80455080; - this->y = lbl_80455080; - this->z = lbl_80455070; + void setAll(f32 f) { + z = f; + y = f; + x = f; + } + + void setMin(const cXyz& other) { + if (x > other.x) { + x = other.x; + } + if (y > other.y) { + y = other.y; + } + if (z > other.z) { + z = other.z; + } + } + + void setMax(const cXyz& other) { + if (x < other.x) { + x = other.x; + } + if (y < other.y) { + y = other.y; + } + if (z < other.z) { + z = other.z; + } } bool checkEpsilon() const { return !(PSVECSquareMag(this) < lbl_80455074); } diff --git a/include/SComponent/c_xyz/c_xyz.h b/include/SComponent/c_xyz/c_xyz.h deleted file mode 100644 index 5b9e18b35c..0000000000 --- a/include/SComponent/c_xyz/c_xyz.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef C_XYZ_H_ -#define C_XYZ_H_ -#include "global.h" - -class cXyz { -public: - float x, y, z; -}; - -#endif \ No newline at end of file diff --git a/include/SStandard/s_basic.h b/include/SStandard/s_basic.h new file mode 100644 index 0000000000..ac0bb138f5 --- /dev/null +++ b/include/SStandard/s_basic.h @@ -0,0 +1,9 @@ +#ifndef S_BASIC_H_ +#define S_BASIC_H_ + +#include "global.h" + +void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue); +void sBs_ClearArea(void* pPtr, u32 pNumBytes); + +#endif \ No newline at end of file diff --git a/include/d/d_attention/d_attention.h b/include/d/d_attention/d_attention.h index a7fd8f18bc..24e0c5458a 100644 --- a/include/d/d_attention/d_attention.h +++ b/include/d/d_attention/d_attention.h @@ -2,7 +2,7 @@ #define D_ATTENTION_H_ #include "SComponent/c_angle.h" -#include "SComponent/c_xyz/c_xyz.h" +#include "SComponent/c_xyz.h" #include "global.h" #include "m_Do/m_Do_ext/m_Do_ext.h" diff --git a/include/d/d_camera/asm/func_80166764.s b/include/d/d_camera/asm/func_80166764.s index 7b37cc1a6e..187e5bf0ba 100644 --- a/include/d/d_camera/asm/func_80166764.s +++ b/include/d/d_camera/asm/func_80166764.s @@ -1201,7 +1201,7 @@ lbl_80167860: lbl_8016790C: /* 8016790C 0016484C 38 61 03 AC */ addi r3, r1, 0x3ac /* 80167910 00164850 38 80 FF FF */ li r4, -1 -/* 80167914 00164854 4B EC F1 49 */ bl cM3dGLin_NS_dtor +/* 80167914 00164854 4B EC F1 49 */ bl __dt__8cM3dGLinFv /* 80167918 00164858 38 61 03 C8 */ addi r3, r1, 0x3c8 /* 8016791C 0016485C 38 80 FF FF */ li r4, -1 /* 80167920 00164860 4B EC 95 1D */ bl cM3dGCyl_NS_dtor diff --git a/include/d/d_camera/asm/func_80168744.s b/include/d/d_camera/asm/func_80168744.s index 7d1a1e2f9e..be94956bcf 100644 --- a/include/d/d_camera/asm/func_80168744.s +++ b/include/d/d_camera/asm/func_80168744.s @@ -1554,7 +1554,7 @@ lbl_80169DD4: /* 80169DF4 00166D34 4B EC 67 1D */ bl cSAngle_NS_dtor /* 80169DF8 00166D38 38 61 04 9C */ addi r3, r1, 0x49c /* 80169DFC 00166D3C 38 80 FF FF */ li r4, -1 -/* 80169E00 00166D40 4B EC CC 5D */ bl cM3dGLin_NS_dtor +/* 80169E00 00166D40 4B EC CC 5D */ bl __dt__8cM3dGLinFv /* 80169E04 00166D44 38 61 04 2C */ addi r3, r1, 0x42c /* 80169E08 00166D48 38 80 FF FF */ li r4, -1 /* 80169E0C 00166D4C 4B E9 F3 79 */ bl cXyz_NS_dtor diff --git a/include/d/d_com/d_com_inf_game/d_com_inf_game.h b/include/d/d_com/d_com_inf_game/d_com_inf_game.h index 686726727f..640213d837 100644 --- a/include/d/d_com/d_com_inf_game/d_com_inf_game.h +++ b/include/d/d_com/d_com_inf_game/d_com_inf_game.h @@ -1,7 +1,7 @@ #ifndef D_COM_INF_GAME_H_ #define D_COM_INF_GAME_H_ -#include "SComponent/c_xyz/c_xyz.h" +#include "SComponent/c_xyz.h" #include "d/d_attention/d_attention.h" #include "d/d_bg/d_bg_s/d_bg_s.h" #include "d/d_bg/d_bg_w/d_bg_w_base/d_bg_w_base.h" diff --git a/include/d/d_save/d_save/d_save.h b/include/d/d_save/d_save/d_save.h index abefb974a9..4a0532dcde 100644 --- a/include/d/d_save/d_save/d_save.h +++ b/include/d/d_save/d_save/d_save.h @@ -1,7 +1,7 @@ #ifndef D_SAVE_H_ #define D_SAVE_H_ -#include "SComponent/c_xyz/c_xyz.h" +#include "SComponent/c_xyz.h" #include "d/d_meter2/d_meter2_info/d_meter2_info.h" #include "dolphin/types.h" #include "global.h" diff --git a/include/f/f_pc/f_pc_node_req.h b/include/f/f_pc/f_pc_node_req.h index e40a628b03..f526995eb3 100644 --- a/include/f/f_pc/f_pc_node_req.h +++ b/include/f/f_pc/f_pc_node_req.h @@ -57,7 +57,7 @@ s32 fpcNdRq_Cancel(node_create_request* pNodeCreateReq); s32 fpcNdRq_Handler(void); s32 fpcNdRq_IsPossibleTarget(struct process_node_class* pProcNode); s32 fpcNdRq_IsIng(struct process_node_class* pProcNode); -node_create_request* fpcNdRq_Create(s32 pRequestSize); +node_create_request* fpcNdRq_Create(u32 pRequestSize); node_create_request* fpcNdRq_ChangeNode(u32 pRequestSize, struct process_node_class* pProcNode, s16 param_3, void* param_4); node_create_request* fpcNdRq_DeleteNode(u32 pRequestSize, struct process_node_class* pProcNode); diff --git a/include/functions.h b/include/functions.h index 7f86fcd9f6..6537a025bf 100644 --- a/include/functions.h +++ b/include/functions.h @@ -5173,7 +5173,7 @@ void setCameraInWaterDepth__11Z2StatusMgrFf(void); void mDoCPd_c_NS_getTrigA(void); void dCamSetup_c_NS_PlayerHideDist(void); void preparation(void); -void cM3dGLin_NS_dtor(void); +void __dt__8cM3dGLinFv(void); void dCamSetup_c_NS_CheckLatitudeRange(void); void daPy_py_c_NS_checkGoronSideMove(void); void dComIfGp_getAttention(void); diff --git a/include/global.h b/include/global.h index 08b366ba21..ad9a464193 100644 --- a/include/global.h +++ b/include/global.h @@ -24,14 +24,18 @@ struct JUTWarn { extern float __fabsf(float); -inline double fabsf(double d) { - return __fabsf(d); +inline double fabsd(float f) { + return __fabsf(f); +} + +inline float fabsf(float f) { + return (float)fabsd(f); } extern float __fsqrte(float); -inline double sqrt(double d) { - return __fsqrte(d); +inline double sqrt(float f) { + return __fsqrte(f); } #include "dolphin/types.h" diff --git a/include/mtx_vec.h b/include/mtx_vec.h index 46b956a922..59199bc625 100644 --- a/include/mtx_vec.h +++ b/include/mtx_vec.h @@ -5,6 +5,12 @@ struct Vec { float x, y, z; + float GetX() const { return x; } + float GetY() const { return y; } + float GetZ() const { return z; } + float getXDiff(const Vec* other) const { return x - other->x; } + float getYDiff(const Vec* other) const { return y - other->y; } + float getZDiff(const Vec* other) const { return z - other->z; } }; struct Quaternion { diff --git a/include/variables.h b/include/variables.h index afe1655208..5010961585 100644 --- a/include/variables.h +++ b/include/variables.h @@ -6,7 +6,6 @@ extern u8 i_item_lst[24]; extern u8 lbl_80430188[16]; extern u8 lbl_80379235[16]; extern char lbl_80379234[0x64]; -extern char lbl_803739A0[0x310]; extern u32 _sRumbleSupported; extern u8 lbl_803A2EF4; extern char lbl_803A2EE0[20]; @@ -14,23 +13,16 @@ extern u8 lbl_80450B19; // extern u8 lbl_80450588; // extern u8 lbl_804511B8; extern u8 lbl_80450B20; -extern u8 lbl_80451A00; extern u8 lbl_80450B1C; extern u8 lbl_80450B28; -extern u8 lbl_80451A04; extern u8 lbl_80450B24; extern u8 lbl_80450B28; extern u8 lbl_80450B30; -extern u8 lbl_80451A08; extern u8 lbl_80450B2C; extern u8 lbl_80450B30; -extern u8 lbl_80451A08; extern u8 lbl_80450B2C; extern u8 lbl_80450B2C; -extern u8 lbl_80451A0C; -extern u8 lbl_80451A10; extern u8 lbl_80450B2C; -extern u8 lbl_80451A18; extern u8 lbl_80450B2C; extern u8 lbl_80450B1C; extern u8 lbl_80450B1C; @@ -101,9 +93,6 @@ extern u32 lbl_80000028; #define OS_GLOBAL(T, ADDR) *((T*)((void*)ADDR)) #define OS_GLOBAL_ADDR(T, ADDR) ((T*)((void*)ADDR)) -// func_802CEB40 -extern char lbl_8039CAD8[12]; // "JKRHeap.cpp" - // func_802D147C extern void* lbl_803CC0F0; // JKRDisposer::__vt @@ -192,10 +181,6 @@ extern void* lbl_804513C4; // JKRThreadSwitch::mUserPostCallback extern char lbl_8039CFA8[1]; // 8039cfdc-0x34 "JKRThreadSwitch: currentHeap destroyed.\n" -extern float lbl_80455FC0; // JKernel::@934 = 100.0 -extern float lbl_80455FC4; // JKernel::@935 = 1000.0 -extern double lbl_80455FC8; // JKernel::@937 = 4.503599627370496E15 - class JKRDvdFile; extern JSUList sDvdList__10JKRDvdFile; // JKRDvdFile::sDvdList extern u8 lbl_803CC438; // JKRDvdFile::__vt @@ -307,7 +292,6 @@ extern u8 lbl_80434318; // JKernel::@492 (global destructor chain) class JKRAramStream; extern JKRAramStream* sAramStreamObject__13JKRAramStream; // JKRAramStream::sAramStreamObject extern u8 transHeap__13JKRAramStream; // JKRAramStream::transHeap -extern char lbl_8039D120[16]; // "JKRAramStream.cpp" extern u8 transBuffer__13JKRAramStream; // JKRAramStream::transBuffer extern u8 transSize__13JKRAramStream; // JKRAramStream::transSize extern u8 lbl_803CC1B8; // JKRAramStream::__vt @@ -343,7 +327,6 @@ extern u8 lbl_803CC518; // JSUFileInputStream::__vt class JKRAram; extern u8 lbl_803CC158; // JKRAram::__vt -extern char lbl_8039D078[16]; // "JKRAram.cpp" extern JKRAram* sAramObject__7JKRAram; // JKRAram::sAramObject extern OSMessageQueue sMessageQueue__7JKRAram; // JKRAram::sMessageQueue extern bool lbl_804513FC; // DAT_804513fc (init global mutex) @@ -1066,26 +1049,7 @@ extern u8 lbl_804526B0; extern u8 lbl_804526B4; extern u8 lbl_80424B00; -// additional symbols needed for c_bg_s_chk.cpp -// autogenerated by split.py v0.3 at 2020-12-31 13:59:04.376186 -extern u8 lbl_803C3F80; - -// additional symbols needed for c_bg_s_gnd_chk.cpp -// autogenerated by split.py v0.3 at 2020-12-31 14:10:48.795807 -extern u8 lbl_803C3F90; - -// additional symbols needed for c_bg_s_lin_chk.cpp -// autogenerated by split.py v0.3 at 2021-01-01 12:56:44.686018 extern u8 lbl_803A78F8; -extern u8 lbl_803C3FA8; - -// additional symbols needed for c_bg_s_poly_info.cpp -// autogenerated by split.py v0.3 at 2021-01-01 12:59:59.584225 -extern u8 lbl_803C3FD0; - -// additional symbols needed for c_bg_s_shdw_draw.cpp -// autogenerated by split.py v0.3 at 2021-01-01 13:07:28.433195 -extern u8 lbl_803C3FC0; // additional symbols needed for c_cc_d.cpp // autogenerated by split.py v0.3 at 2021-01-01 13:13:17.720846 @@ -1125,85 +1089,11 @@ extern u8 lbl_804551F0; extern u8 lbl_80450768; extern u8 lbl_804551E0; extern u8 lbl_804551F8; -extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_ extern u8 lbl_80455200; -// additional symbols needed for c_m2d.cpp -// autogenerated by split.py v0.3 at 2021-01-01 14:23:08.023070 -extern u8 lbl_80455110; -extern u8 lbl_80455100; -extern u8 lbl_80455108; -extern u8 lbl_804550FC; -extern u8 lbl_804550F8; -extern u8 lbl_804550F4; -extern u8 lbl_804550F0; - -// additional symbols needed for c_m3d_g_aab.cpp -// autogenerated by split.py v0.3 at 2021-01-01 14:25:53.390342 -extern u8 lbl_804551D4; -extern u8 lbl_804551D0; -extern u8 lbl_804551D8; - -// additional symbols needed for c_m3d_g_cir.cpp -// autogenerated by split.py v0.3 at 2021-01-01 14:33:18.197884 -extern u8 lbl_803C3FEC; -extern u8 lbl_803C3FE0; - -// additional symbols needed for c_m3d_g_cps.cpp -// autogenerated by split.py v0.3 at 2021-01-01 14:41:13.414762 -extern u8 lbl_803C3FF8; - -// additional symbols needed for c_m3d.cpp -// autogenerated by split.py v0.3 at 2021-01-01 14:58:45.990799 -extern u8 lbl_80455158; -extern u8 lbl_8045513C; -extern u8 lbl_80455180; -extern u8 lbl_80455128; -extern u8 lbl_80455190; -extern u8 lbl_804551BC; -extern u8 lbl_80455168; -extern u8 lbl_804551C8; -extern u8 lbl_804551B8; -extern u8 lbl_80455148; -extern u8 lbl_804551C4; -extern u8 lbl_80455170; -extern u8 lbl_80455150; -extern u8 lbl_80455118; -extern u8 lbl_80455198; -extern u8 lbl_8045519C; -extern u8 lbl_8045515C; -extern u8 lbl_804551A0; -extern u8 lbl_80455174; -extern u8 lbl_80455178; -extern u8 lbl_804551CC; -extern u8 lbl_80450AEC; -extern u8 lbl_8045516C; -extern u8 lbl_80455194; -extern u8 lbl_804551C0; -extern u8 lbl_80455188; -extern u8 lbl_80455164; -extern u8 lbl_804551AC; -extern u8 lbl_8045517C; -extern u8 lbl_80455130; -extern u8 lbl_804551A4; -extern u8 lbl_8045514C; -extern u8 lbl_80455120; -extern u8 lbl_804551B4; -extern u8 lbl_804551A8; -extern u8 lbl_80455138; -extern u8 lbl_80455184; -extern u8 lbl_80455144; -extern u8 lbl_80455140; -extern u8 lbl_8045518C; -extern u8 lbl_80455154; -extern u8 lbl_804551B0; -extern u8 lbl_80455160; - // additional symbols needed for c_sxyz.cpp // autogenerated by split.py v0.3 at 2021-01-01 15:36:38.100807 -extern u8 lbl_804550A0; extern u8 lbl_80451164; -extern u8 lbl_80430DA8; // additional symbols needed for d_meter2_draw.cpp // autogenerated by split.py v0.3 at 2021-01-02 00:12:18.254960 diff --git a/ldscript.lcf b/ldscript.lcf index dc92b51eb5..c4d4eee46f 100644 --- a/ldscript.lcf +++ b/ldscript.lcf @@ -756,6 +756,8 @@ SECTIONS { "__vt__20J3DAnmVisibilityFull" = 0x803cf274; "__dt__7JKRFileFv" = 0x802D7B90; +"lbl_8039CE50" = 0x8039CE50; +"lbl_803739A0" = 0x803739A0; } FORCEACTIVE { getParentPane__7J2DPaneFv diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp index 7e081401ed..d9c5f258a9 100644 --- a/libs/JSystem/J2DGraph/J2DPane.cpp +++ b/libs/JSystem/J2DGraph/J2DPane.cpp @@ -1,12 +1,12 @@ #include "JSystem/J2DGraph/J2DPane.h" -J2DPane::J2DPane() : _20(), _30(), _40(), mPaneTree(this) { +J2DPane::J2DPane() : mBounds(), mGlobalBounds(), mClipRect(), mPaneTree(this) { mTransform = NULL; id = 'PAN1'; mVisible = true; - _10 = 0; - _18 = 0; - _20.set(lbl_804561F0, lbl_804561F0, lbl_804561F0, lbl_804561F0); + mInfoTag = 0; + mUserInfoTag = 0; + mBounds.set(lbl_804561F0, lbl_804561F0, lbl_804561F0, lbl_804561F0); initiate(); changeUseTrans(NULL); calcMtx(); @@ -14,14 +14,14 @@ J2DPane::J2DPane() : _20(), _30(), _40(), mPaneTree(this) { void J2DPane::initiate() { _4 = -1; - _c8 = _c4 = _c0 = _bc = _b8 = lbl_804561F0; - _b7 = 0; + mRotateOffsetY = mRotateOffsetX = mRotateZ = mRotateY = mRotateX = lbl_804561F0; + mBasePosition = 0; mRotAxis = AXIS_Z; - _d0 = _cc = lbl_804561F4; + mScaleY = mScaleX = lbl_804561F4; mCullMode = GX_CULL_NONE; mAlpha = 0xFF; - _b4 = 1; - _b3 = 0xFF; + mIsInfluencedAlpha = true; + mColorAlpha = 0xFF; mConnected = false; calcMtx(); @@ -52,12 +52,12 @@ asm void J2DPane_X2_(void) { } #ifdef NONMATCHING // templating..... again -void J2DPane::initialize(u64 arg1, const TBox2& dim) { +void J2DPane::initialize(u64 tag, const TBox2& dim) { id = 'PAN1'; mVisible = true; - _10 = arg1; - _18 = arg1; - _20.set(dim); + mInfoTag = tag; + mUserInfoTag = tag; + mBounds.set(dim); initiate(); changeUseTrans(NULL); calcMtx(); @@ -111,7 +111,7 @@ bool J2DPane::appendChild(J2DPane* child) { bool result = mPaneTree.appendChild(&child->mPaneTree); if (result && parent == NULL) { - child->add(_20.i.x, _20.i.y); + child->add(mBounds.i.x, mBounds.i.y); child->calcMtx(); } @@ -128,7 +128,7 @@ bool J2DPane::insertChild(J2DPane* before, J2DPane* child) { bool result = mPaneTree.insertChild(&before->mPaneTree, &child->mPaneTree); if (result && parent == NULL) { - child->add(_20.i.x, _20.i.y); + child->add(mBounds.i.x, mBounds.i.y); child->calcMtx(); } @@ -167,20 +167,20 @@ asm void J2DPane::move(f32 x, f32 y) { #endif void J2DPane::add(f32 x, f32 y) { - _d4 += x; - _d8 += y; + mTranslateX += x; + mTranslateY += y; calcMtx(); } #ifdef NONMATCHING void J2DPane::resize(f32 x, f32 y) { - TBox2 box = _20; + TBox2 box = mBounds; - box.addPos(TVec2(_d4, _d8)); + box.addPos(TVec2(mTranslateX, mTranslateY)); const J2DPane* parent = getParentPane(); if (parent != NULL) { - box.addPos(TVec2(-parent->_20.i.x, -parent->_20.i.y)); + box.addPos(TVec2(-parent->mBounds.i.x, -parent->mBounds.i.y)); } box.f.x = box.i.x + x; @@ -196,12 +196,12 @@ asm void J2DPane::resize(f32 x, f32 y) { #ifdef NONMATCHING // close ish TBox2& J2DPane::getBounds() { - lbl_804349B0 = _20; - lbl_804349B0.addPos(TVec2(_d4, _d8)); + lbl_804349B0 = mBounds; + lbl_804349B0.addPos(TVec2(mTranslateX, mTranslateY)); const J2DPane* parent = getParentPane(); if (parent != NULL) { - lbl_804349B0.addPos(TVec2(-parent->_20.i.x, -parent->_20.i.y)); + lbl_804349B0.addPos(TVec2(-parent->mBounds.i.x, -parent->mBounds.i.y)); } return lbl_804349B0; @@ -213,20 +213,21 @@ asm TBox2& J2DPane::getBounds() { } #endif -void J2DPane::rotate(f32 a, f32 b, J2DRotateAxis axis, f32 angle) { - _c4 = a; - _c8 = b; +void J2DPane::rotate(f32 offsetX, f32 offsetY, J2DRotateAxis axis, f32 angle) { + mRotateOffsetX = offsetX; + mRotateOffsetY = offsetY; mRotAxis = axis; rotate(angle); } void J2DPane::rotate(f32 angle) { - if (mRotAxis == AXIS_X) - _b8 = angle; - else if (mRotAxis == AXIS_Y) - _bc = angle; - else - _c0 = angle; + if (mRotAxis == AXIS_X) { + mRotateX = angle; + } else if (mRotAxis == AXIS_Y) { + mRotateY = angle; + } else { + mRotateZ = angle; + } calcMtx(); } @@ -244,32 +245,34 @@ asm void clip__7J2DPaneFRCQ29JGeometry8TBox2(void) { // void J2DPane::clip(const TBox2& bounds) { // TBox2 box = bounds; -// box.addPos(TVec2(_30, _34)); -// _40.intersect(box); +// box.addPos(TVec2(mGlobalBounds, _34)); +// mClipRect.intersect(box); // } -const class J2DPane* J2DPane::search(u64 arg1) { - if (arg1 == _10) +const J2DPane* J2DPane::search(u64 tag) { + if (tag == mInfoTag) { return this; + } JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - const J2DPane* result = iter.getObject()->search(arg1); - if (result) + if (const J2DPane* result = iter.getObject()->search(tag)) { return result; + } } return NULL; } -const class J2DPane* J2DPane::searchUserInfo(u64 arg1) { - if (arg1 == _18) +const J2DPane* J2DPane::searchUserInfo(u64 tag) { + if (tag == mUserInfoTag) { return this; + } JSUTreeIterator iter; for (iter = mPaneTree.getFirstChild(); iter != mPaneTree.getEndChild(); ++iter) { - const J2DPane* result = iter.getObject()->searchUserInfo(arg1); - if (result) + if (const J2DPane* result = iter.getObject()->searchUserInfo(tag)) { return result; + } } return NULL; } @@ -307,26 +310,26 @@ void J2DPane::setCullBack(GXCullMode mode) { } void J2DPane::setBasePosition(J2DBasePosition position) { - _b7 = position; + mBasePosition = position; mRotAxis = AXIS_Z; - _c4 = lbl_804561F0; + mRotateOffsetX = lbl_804561F0; if (position % 3 == 1) { f32 width = getWidth(); - _c4 = width * lbl_80456208; + mRotateOffsetX = width * lbl_80456208; } else if (position % 3 == 2) { f32 width = getWidth(); - _c4 = width; + mRotateOffsetX = width; } - _c8 = lbl_804561F0; + mRotateOffsetY = lbl_804561F0; if (position / 3 == 1) { f32 height = getHeight(); - _c8 = height * lbl_80456208; + mRotateOffsetY = height * lbl_80456208; } else if (position / 3 == 2) { f32 height = getHeight(); - _c8 = height; + mRotateOffsetY = height; } calcMtx(); @@ -343,27 +346,27 @@ asm void J2DPane::getGlbVtx(u8 arg1) const { } #ifdef NONMATCHING // probably an issue with JSUTree -const class J2DPane* J2DPane::getFirstChildPane() { +const J2DPane* J2DPane::getFirstChildPane() { if (!getFirstChild()) return NULL; return getFirstChild()->getObject(); } #else -asm const class J2DPane* J2DPane::getFirstChildPane() { +asm const J2DPane* J2DPane::getFirstChildPane() { nofralloc #include "JSystem/J2DGraph/J2DPane/asm/func_802F7A8C.s" } #endif -const class J2DPane* J2DPane::getNextChildPane() { +const J2DPane* J2DPane::getNextChildPane() { if (getPaneTree()->getNextChild() == NULL) return NULL; return getPaneTree()->getNextChild()->getObject(); } -const class J2DPane* J2DPane::getParentPane() { +const J2DPane* J2DPane::getParentPane() { if (getPaneTree()->getParent() == NULL) return NULL; diff --git a/libs/JSystem/JGadget/binary.cpp b/libs/JSystem/JGadget/binary.cpp index 4bf93c8658..84bdb2c1cd 100644 --- a/libs/JSystem/JGadget/binary.cpp +++ b/libs/JSystem/JGadget/binary.cpp @@ -1 +1,103 @@ -// ok +#include "JSystem/JGadget/binary.h" +#include "global.h" + +extern "C" { +void parse_next__Q37JGadget6binary19TParse_header_blockFPPCvUl(void); +void parseVariableUInt_16_32_following__Q27JGadget6binaryFPCvPUlPUlPQ37JGadget6binary5TEBit(void); +void __dt__Q37JGadget6binary19TParse_header_blockFv(void); +} + +extern u8 lbl_803C488C; + +namespace JGadget { +namespace binary { + +#ifdef NONMATCHING // really small difference +const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second, + TEBit* tebit) { + JUT_ASSERT(pu_16 != NULL); + JUT_ASSERT(pu32First != NULL); + JUT_ASSERT(pu32Second != NULL); + + TEBit bit; + + if (tebit == NULL) { + tebit = &bit; + } + + const u16* u = static_cast(pu16); + + if (!(u[0] & 0x8000)) { + tebit->value = 0x10; + *pu32First = u[0]; + *pu32Second = u[1]; + return &u[2]; + } else { + tebit->value = 0x20; + + const u32* u2 = static_cast(pu16); + *pu32First = (u[0] << 16) | u[1]; + *pu32Second = u2[1]; + return &u[4]; + } +} +#else +asm const void* parseVariableUInt_16_32_following(const void* pu16, u32* pu32First, u32* pu32Second, + TEBit* tebit) { + nofralloc +#include "JSystem/JGadget/asm/func_802DC864.s" +} +#endif + +TParse_header_block::~TParse_header_block() {} + +#ifdef NONMATCHING // minor regalloc +bool TParse_header_block::parse_next(const void** ppData_inout, u32 a2) { + bool result; + u32 count; + + if (ppData_inout == NULL || *ppData_inout == NULL) { + JUTWarn w; + w << "data not specified"; + + return false; + } + + bool headerOK = false; + if (parseHeader_next(ppData_inout, &count, a2)) { + headerOK = true; + } + + result = headerOK; + + if (!(a2 & 1) && !result) { + return result; + } + + for (; count != 0; --count) { + bool blockOK = false; + + const void* p = *ppData_inout; + + if (parseBlock_next(ppData_inout, &count, a2) && result) { + blockOK = true; + } + result = blockOK; + + JUT_ASSERT(std::uintptr_t(*ppData_inout) == std::uintptr_t(p) + uData); + + if (!(a2 & 2) && !blockOK) { + return result; + } + } + return result; +} +#else +asm bool TParse_header_block::parse_next(const void** ppData_inout, u32 a2) { + nofralloc +#include "JSystem/JGadget/asm/func_802DC910.s" +} +#endif + +} // namespace binary +} // namespace JGadget diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index ad2a8858fd..1a4843275d 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -107,17 +107,11 @@ asm void* JKRAram::run(void) { void JKRAram::checkOkAddress(u8* addr, u32 size, JKRAramBlock* block, u32 param_4) { if (!IS_ALIGNED((u32)addr, 0x20) && !IS_ALIGNED(size, 0x20)) { - const char* file = lbl_8039D078; - const char* format = lbl_8039D078 + 0xc; - const char* arg1 = lbl_8039D078 + 0xc + 0x3; - JUTException_NS_panic_f(file, 0xdb, format, arg1); + JUTException_NS_panic_f("JKRAram.cpp", 0xdb, "%s", ":::address not 32Byte aligned."); } if (block && !IS_ALIGNED((u32)block->getAddress() + param_4, 0x20)) { - const char* file = lbl_8039D078; - const char* format = lbl_8039D078 + 0xc; - const char* arg1 = lbl_8039D078 + 0xc + 0x3; - JUTException_NS_panic_f(file, 0xe3, format, arg1); + JUTException_NS_panic_f("JKRAram.cpp", 0xe3, "%s", ":::address not 32Byte aligned."); } } @@ -290,3 +284,6 @@ asm JSUList<12JKRAMCommand>::~JSUList<12JKRAMCommand>(void) { #include "JSystem/JKernel/JKRAram/asm/func_802D2DF0.s" } #endif + +const char* lbl_8039D0A6 = "bad aramSync\n"; +const char* lbl_8039D0B4 = "\x00\x00\x00"; /* padding */ diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index ad2b83d170..4f45b4ca4c 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -24,15 +24,11 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destinatio JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) { lock(); if (((source & 0x1f) != 0) || ((destination & 0x1f) != 0)) { - OSReport(lbl_8039D0B8, direction); // "direction = %x\n" - OSReport(lbl_8039D0B8 + 0x10, source); // "source = %x\n" - OSReport(lbl_8039D0B8 + 0x1D, destination); // "destination = %x\n" - OSReport(lbl_8039D0B8 + 0x2F, length); // "length = %x\n" - - const char* filename = lbl_8039D0B8 + 0x3C; // "JKRAramPiece.cpp"§ - const char* format = lbl_8039D0B8 + 0x3C + 0x11; // "%s" - const char* arg1 = lbl_8039D0B8 + 0x3C + 0x14; // "illegal address. abort." - JUTException_NS_panic_f(filename, 0x6c, format, arg1); + OSReport("direction = %x\n", direction); + OSReport("source = %x\n", source); + OSReport("destination = %x\n", destination); + OSReport("length = %x\n", length); + JUTException_NS_panic_f("JKRAramPiece.cpp", 0x6c, "%s", "illegal address. abort."); } Message* message = new (JKRHeap::getSystemHeap(), -4) Message(); diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index 353bfbe285..6e1f3322fb 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -2,6 +2,8 @@ #include "JSystem/JKernel/JKRAramPiece/JKRAramPiece.h" #include "global.h" +extern char lbl_8039D120[32]; + JKRAramStream* JKRAramStream::create(long priority) { if (!sAramStreamObject) { sAramStreamObject = new (JKRGetSystemHeap(), 0) JKRAramStream(priority); @@ -86,10 +88,7 @@ s32 JKRAramStream::writeToAram(JKRAramStreamCommand* command) { heap->dump(); } - const char* file = lbl_8039D120; // "JKRAramStream.cpp"; - const char* format = lbl_8039D120 + 0x12; // "%s"; - const char* arg1 = lbl_8039D120 + 0x15; // ":::Cannot alloc memory\n"; - JUTException_NS_panic_f(file, 0xac, format, arg1); + JUTException_NS_panic_f("JKRAramStream.cpp", 0xac, "%s", ":::Cannot alloc memory\n"); } if (buffer) { diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp index bf3ee74898..96d49dbb94 100644 --- a/libs/JSystem/JKernel/JKRHeap.cpp +++ b/libs/JSystem/JKernel/JKRHeap.cpp @@ -336,10 +336,7 @@ void JKRHeap::copyMemory(void* dst, void* src, u32 size) { } void JKRHeap::JKRDefaultMemoryErrorRoutine(JKRHeap* heap, u32 size, int alignment) { - const char* filename = lbl_8039CAD8; // "JKRHeap.cpp" - const char* format = lbl_8039CAD8 + 12; // "%s" - const char* arg1 = lbl_8039CAD8 + 15; // "abort\n" - JUTException_NS_panic_f(filename, 0x33f, format, arg1); + JUTException_NS_panic_f("JKRHeap.cpp", 0x33f, "%s", "abort\n"); } bool JKRHeap::setErrorFlag(bool errorFlag) { @@ -437,3 +434,5 @@ u8 JKRHeap::do_changeGroupID(u8 newGroupID) { u8 JKRHeap::do_getCurrentGroupId() const { return 0; } + +const char* lbl_8039CAEE = "\x00"; /* padding */ diff --git a/libs/JSystem/JKernel/JKRSolidHeap.cpp b/libs/JSystem/JKernel/JKRSolidHeap.cpp index d3d4d6b55f..ddbe0b75f9 100644 --- a/libs/JSystem/JKernel/JKRSolidHeap.cpp +++ b/libs/JSystem/JKernel/JKRSolidHeap.cpp @@ -122,9 +122,7 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) { mSolidHead += totalSize; mFreeSize -= totalSize; } else { - // "allocFromHead: cannot alloc memory (0x%x byte).\n" - const char* format = lbl_8039CE50; - JUTWarningConsole_f(format, totalSize); + JUTWarningConsole_f("allocFromHead: cannot alloc memory (0x%x byte).\n", totalSize); if (getErrorFlag() == true) { callErrorHandler(this, alignedSize, alignment); } @@ -133,21 +131,25 @@ void* JKRSolidHeap::allocFromHead(u32 size, int alignment) { return ptr; } #else +#if 1 +const char* _allocFromHead_str0 = "allocFromHead: cannot alloc memory (0x%x byte).\n"; +#endif asm void* JKRSolidHeap::allocFromHead(u32, int) { nofralloc #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0D58.s" } #endif +#if 1 +const char* _allocFromTail_str0 = "allocFromTail: cannot alloc memory (0x%x byte).\n"; +#endif asm void* JKRSolidHeap::allocFromTail(u32, int) { nofralloc #include "JSystem/JKernel/JKRSolidHeap/asm/func_802D0E20.s" } void JKRSolidHeap::do_free(void* ptr) { - // "free: cannot free memory block (%08x)\n" - const char* format = lbl_8039CE50 + 0x62; - JUTWarningConsole_f(format, ptr); + JUTWarningConsole_f("free: cannot free memory block (%08x)\n", ptr); } void JKRSolidHeap::do_freeAll(void) { @@ -188,16 +190,12 @@ void JKRSolidHeap::do_fillFreeArea(void) { } s32 JKRSolidHeap::do_resize(void* ptr, u32 newSize) { - // "resize: cannot resize memory block (%08x: %d)\n" - const char* format = lbl_8039CE50 + 0x89; - JUTWarningConsole_f(format, ptr, newSize); + JUTWarningConsole_f("resize: cannot resize memory block (%08x: %d)\n", ptr, newSize); return -1; } s32 JKRSolidHeap::do_getSize(void* ptr) const { - // "getSize: cannot get memory block size (%08x)\n" - const char* format = lbl_8039CE50 + 0xB8; - JUTWarningConsole_f(format, ptr); + JUTWarningConsole_f("getSize: cannot get memory block size (%08x)\n", ptr); return -1; } @@ -210,19 +208,14 @@ bool JKRSolidHeap::check(void) { u32 availableSize = mSize; if (calculatedSize != availableSize) { result = false; - // "check: bad total memory block size (%08X, %08X)\n" - const char* format = lbl_8039CE50 + 0xE6; - JUTWarningConsole_f(format, availableSize, calculatedSize); + JUTWarningConsole_f("check: bad total memory block size (%08X, %08X)\n", availableSize, + calculatedSize); } unlock(); return result; } -// problem: int -> float conversion creates a temporary value (lbl_80455FA0 = 4.503599627370496E15). -// Because the value is compiler generated the location in the .dol will not be the same as in the -// original .dol file. -#ifdef NONMATCHING bool JKRSolidHeap::dump(void) { bool result = check(); @@ -230,26 +223,16 @@ bool JKRSolidHeap::dump(void) { u32 headSize = ((u32)mSolidHead - (u32)mStart); u32 tailSize = ((u32)mEnd - (u32)mSolidTail); s32 htSize = headSize + tailSize; - const char* format1 = lbl_8039CE50 + 0x117; // "head %08x: %08x\n" - JUTReportConsole_f(format1, mStart, headSize); - - const char* format2 = lbl_8039CE50 + 0x128; // "tail %08x: %08x\n" - JUTReportConsole_f(format2, mSolidTail, ((u32)mEnd - (u32)mSolidTail)); + JUTReportConsole_f("head %08x: %08x\n", mStart, headSize); + JUTReportConsole_f("tail %08x: %08x\n", mSolidTail, ((u32)mEnd - (u32)mSolidTail)); u32 totalSize = mSize; - float percentage = (float)htSize / (float)totalSize * lbl_80455FA8; - const char* format3 = lbl_8039CE50 + 0x139; // "%d / %d bytes (%6.2f%%) used\n" - JUTReportConsole_f(format3, htSize, totalSize, percentage); + float percentage = (float)htSize / (float)totalSize * 100.0f; + JUTReportConsole_f("%d / %d bytes (%6.2f%%) used\n", htSize, totalSize, percentage); unlock(); return result; } -#else -asm bool JKRSolidHeap::dump(void) { - nofralloc -#include "JSystem/JKernel/JKRSolidHeap/asm/func_802D10FC.s" -} -#endif // full match expect using the wrong register #ifdef NONMATCHING @@ -299,3 +282,5 @@ void* JKRSolidHeap::do_getMaxFreeBlock(void) const { s32 JKRSolidHeap::do_getTotalFreeSize(void) const { return getFreeSize(); } + +const char* lbl_8039CFA7 = ""; /* padding */ diff --git a/libs/JSystem/JKernel/JKRThread.cpp b/libs/JSystem/JKernel/JKRThread.cpp index b37c996d3d..e2da7735f9 100644 --- a/libs/JSystem/JKernel/JKRThread.cpp +++ b/libs/JSystem/JKernel/JKRThread.cpp @@ -2,6 +2,13 @@ #include "JSystem/JKernel/JKRHeap/JKRHeap.h" #include "global.h" +// lbl_80455FC0 JKRThread.o @934 +static const u8 lbl_80455FC0[4] = {0x42, 0xc8, 0x0, 0x0}; +// lbl_80455FC4 JKRThread.o @935 +static const u8 lbl_80455FC4[4] = {0x44, 0x7a, 0x0, 0x0}; +// lbl_80455FC8 JKRThread.o @937 +static const u8 lbl_80455FC8[8] = {0x43, 0x30, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; + JKRThread::JKRThread(u32 stack_size, int message_count, int param_3) : mThreadListLink(this) { mSwitchCount = 0; mCost = 0; diff --git a/libs/JSystem/JStudio/stb.cpp b/libs/JSystem/JStudio/stb.cpp index 6d9f02f783..acdf026cca 100644 --- a/libs/JSystem/JStudio/stb.cpp +++ b/libs/JSystem/JStudio/stb.cpp @@ -256,7 +256,7 @@ TParse::TParse(TControl* pControl) : pControl(pControl) {} TParse::~TParse() {} #ifdef NONMATCHING // Close but is missing a temp or something -int TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3) { +bool TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3) { const void* pData = *ppData_inout; const data::TParse_THeader& header(pData); @@ -279,19 +279,19 @@ int TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 ar return parseHeader(header, arg3); } #else -asm int TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3) { +asm bool TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 arg3) { nofralloc #include "JSystem/JStudio/asm/parseHeader_next__Q37JStudio3stb6TParseFPPCvPUlUl.s" } #endif -asm int TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg3) { +asm bool TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 arg3) { nofralloc #include "JSystem/JStudio/asm/parseBlock_next__Q37JStudio3stb6TParseFPPCvPUlUl.s" } -int TParse::parseHeader(const data::TParse_THeader& header, u32 arg2) { - return 1; +bool TParse::parseHeader(const data::TParse_THeader& header, u32 arg2) { + return true; } bool TParse::parseBlock_block(const data::TParse_TBlock& ppBlock, u32 arg2) { diff --git a/libs/SSystem/SComponent/c_bg_s_chk.cpp b/libs/SSystem/SComponent/c_bg_s_chk.cpp index 7fbec11fc9..5ff94b7a8b 100644 --- a/libs/SSystem/SComponent/c_bg_s_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_chk.cpp @@ -3,26 +3,28 @@ #include "SComponent/c_bg_s_chk.h" // __ct__8cBgS_ChkFv -asm cBgS_Chk::cBgS_Chk(void) { - nofralloc -#include "SComponent/c_bg_s_chk/asm/func_80267B4C.s" +cBgS_Chk::cBgS_Chk(void) { + unk_0x00 = 0; + unk_0x04 = 0; + unk_0x0C = 1; } // __dt__8cBgS_ChkFv -asm cBgS_Chk::~cBgS_Chk(void) { - nofralloc -#include "SComponent/c_bg_s_chk/asm/func_80267B70.s" -} +cBgS_Chk::~cBgS_Chk(void) {} // SetExtChk__8cBgS_ChkFR8cBgS_Chk -asm void cBgS_Chk::SetExtChk(cBgS_Chk&) { - nofralloc -#include "SComponent/c_bg_s_chk/asm/func_80267BB8.s" +void cBgS_Chk::SetExtChk(cBgS_Chk& pOther) { + unk_0x00 = pOther.unk_0x00; + unk_0x04 = pOther.unk_0x04; + unk_0x08 = pOther.unk_0x08; + unk_0x0C = pOther.unk_0x0C; } // ChkSameActorPid__8cBgS_ChkCFUi -// cBgS_Chk::ChkSameActorPid(unsigned int) const -asm bool cBgS_Chk::ChkSameActorPid(unsigned int) const { - nofralloc -#include "SComponent/c_bg_s_chk/asm/func_80267BDC.s" +bool cBgS_Chk::ChkSameActorPid(unsigned int pUint) const { + if (unk_0x08 == -1 || pUint == UINT32_MAX || unk_0x0C == 0) { + return 0; + } else { + return (unk_0x08 == pUint) ? 1 : 0; + } } diff --git a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp index 7b584c5ea1..b2c637c7fd 100644 --- a/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -2,6 +2,10 @@ #include "SComponent/c_bg_s_gnd_chk.h" +// additional symbols needed for c_bg_s_gnd_chk.cpp +// autogenerated by split.py v0.3 at 2020-12-31 14:10:48.795807 +extern u8 lbl_803C3F90; + // __ct__11cBgS_GndChkFv asm cBgS_GndChk::cBgS_GndChk(void) { nofralloc diff --git a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp index a4e4efd0fa..b09963b075 100644 --- a/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/libs/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -2,6 +2,10 @@ #include "SComponent/c_bg_s_lin_chk.h" +// additional symbols needed for c_bg_s_lin_chk.cpp +// autogenerated by split.py v0.3 at 2021-01-01 12:56:44.686018 +extern u8 lbl_803C3FA8; + // __ct__11cBgS_LinChkFv // cBgS_LinChk::cBgS_LinChk(void) asm cBgS_LinChk::cBgS_LinChk(void) { diff --git a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp index 859cd3d2d0..b5ef983681 100644 --- a/libs/SSystem/SComponent/c_bg_s_poly_info.cpp +++ b/libs/SSystem/SComponent/c_bg_s_poly_info.cpp @@ -3,64 +3,60 @@ #include "SComponent/c_bg_s_poly_info.h" // __ct__13cBgS_PolyInfoFv -// cBgS_PolyInfo::cBgS_PolyInfo(void) -asm cBgS_PolyInfo::cBgS_PolyInfo(void) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_80268074.s" +cBgS_PolyInfo::cBgS_PolyInfo(void) { + this->ClearPi(); } // __dt__13cBgS_PolyInfoFv -// cBgS_PolyInfo::~cBgS_PolyInfo(void) -asm cBgS_PolyInfo::~cBgS_PolyInfo(void) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_802680B0.s" -} +cBgS_PolyInfo::~cBgS_PolyInfo(void) {} // ChkSetInfo__13cBgS_PolyInfoCFv -// cBgS_PolyInfo::ChkSetInfo(void) const -asm bool cBgS_PolyInfo::ChkSetInfo(void) const { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_802680F8.s" +bool cBgS_PolyInfo::ChkSetInfo(void) const { + if (mPolyIndex == 0xFFFF || unk_0x02 == 0x100) { + return false; + } else { + return true; + } } // ClearPi__13cBgS_PolyInfoFv -// cBgS_PolyInfo::ClearPi(void) -asm void cBgS_PolyInfo::ClearPi(void) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_80268120.s" +void cBgS_PolyInfo::ClearPi(void) { + mPolyIndex = 0xFFFF; + unk_0x02 = 0x100; + unk_0x04 = 0; + unk_0x08 = -1; } // SetPolyInfo__13cBgS_PolyInfoFRC13cBgS_PolyInfo -// cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo&) -asm void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo&) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_80268148.s" +void cBgS_PolyInfo::SetPolyInfo(const cBgS_PolyInfo& pOther) { + mPolyIndex = pOther.mPolyIndex; + unk_0x02 = pOther.unk_0x02; + unk_0x04 = pOther.unk_0x04; + unk_0x08 = pOther.unk_0x08; } // SetActorInfo__13cBgS_PolyInfoFiPvUi -// cBgS_PolyInfo::SetActorInfo(int, void*, unsigned int) -asm void cBgS_PolyInfo::SetActorInfo(int, void*, unsigned int) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_8026816C.s" +void cBgS_PolyInfo::SetActorInfo(int param_1, void* param_2, unsigned int param_3) { + unk_0x02 = param_1; + unk_0x04 = param_2; + unk_0x08 = param_3; } // ChkSafe__13cBgS_PolyInfoCFPCvUi -// cBgS_PolyInfo::ChkSafe(const void*, unsigned int) const -asm bool cBgS_PolyInfo::ChkSafe(const void*, unsigned int) const { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_8026817C.s" +bool cBgS_PolyInfo::ChkSafe(const void* param_1, unsigned int param_2) const { + if (unk_0x04 == param_1 && unk_0x08 == param_2) { + return true; + } else { + return false; + } } // SetPolyIndex__13cBgS_PolyInfoFi -// cBgS_PolyInfo::SetPolyIndex(int) -asm void cBgS_PolyInfo::SetPolyIndex(int) { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_802681A4.s" +void cBgS_PolyInfo::SetPolyIndex(int pPolyIndex) { + mPolyIndex = pPolyIndex; } // ChkBgIndex__13cBgS_PolyInfoCFv -// cBgS_PolyInfo::ChkBgIndex(void) const -asm bool cBgS_PolyInfo::ChkBgIndex(void) const { - nofralloc -#include "SComponent/c_bg_s_poly_info/asm/func_802681AC.s" +bool cBgS_PolyInfo::ChkBgIndex(void) const { + return unk_0x02 != 0x100; } diff --git a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp index df247b35b7..f4e4e0bb67 100644 --- a/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp +++ b/libs/SSystem/SComponent/c_bg_s_shdw_draw.cpp @@ -2,6 +2,10 @@ #include "SComponent/c_bg_s_shdw_draw.h" +// additional symbols needed for c_bg_s_shdw_draw.cpp +// autogenerated by split.py v0.3 at 2021-01-01 13:07:28.433195 +extern u8 lbl_803C3FC0; + // __ct__13cBgS_ShdwDrawFv // cBgS_ShdwDraw::cBgS_ShdwDraw(void) asm cBgS_ShdwDraw::cBgS_ShdwDraw(void) { diff --git a/libs/SSystem/SComponent/c_m2d.cpp b/libs/SSystem/SComponent/c_m2d.cpp index 25b8536564..66c1b14602 100644 --- a/libs/SSystem/SComponent/c_m2d.cpp +++ b/libs/SSystem/SComponent/c_m2d.cpp @@ -2,6 +2,16 @@ #include "SComponent/c_m2d.h" +// additional symbols needed for c_m2d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:23:08.023070 +extern u8 lbl_80455110; +extern u8 lbl_80455100; +extern u8 lbl_80455108; +extern u8 lbl_804550FC; +extern u8 lbl_804550F8; +extern u8 lbl_804550F4; +extern u8 lbl_804550F0; + // cM2d_CrossCirLin__FR8cM2dGCirffffPfPf asm void cM2d_CrossCirLin(cM2dGCir&, float, float, float, float, float*, float*) { nofralloc diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp index 738037d38b..2515d2ae05 100644 --- a/libs/SSystem/SComponent/c_m3d.cpp +++ b/libs/SSystem/SComponent/c_m3d.cpp @@ -1,112 +1,362 @@ /* c_m3d.cpp autogenerated by split.py v0.3 at 2021-01-01 14:58:46.459661 */ #include "SComponent/c_m3d.h" +#include "SComponent/c_m3d_g_aab.h" +#include "SComponent/c_m3d_g_cps.h" +#include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_m3d_g_lin.h" +#include "SComponent/c_m3d_g_pla.h" +#include "SComponent/c_m3d_g_sph.h" +#include "SComponent/c_m3d_g_tri.h" +#include "SComponent/c_sxyz.h" +#include "SComponent/c_xyz.h" +#include "global.h" + +extern f32 lbl_80455118; // SComponent::@2256, 0.0 +extern f32 lbl_80455138; // SComponent::@2273, 1.0 +extern f32 lbl_8045513C; // SComponent::@2346, 0.02 +extern f32 lbl_804551C4; // SComponent::@3892, 0.5 + +// additional symbols needed for c_m3d.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:58:45.990799 +extern u8 lbl_80455158; +extern u8 lbl_80455180; +extern u8 lbl_80455128; +extern u8 lbl_80455190; +extern u8 lbl_804551BC; +extern u8 lbl_80455168; +extern u8 lbl_804551C8; +extern u8 lbl_804551B8; +extern u8 lbl_80455148; +extern u8 lbl_80455170; +extern u8 lbl_80455150; +extern u8 lbl_80455198; +extern u8 lbl_8045519C; +extern u8 lbl_8045515C; +extern u8 lbl_804551A0; +extern u8 lbl_80455174; +extern u8 lbl_80455178; +extern u8 lbl_804551CC; +extern u8 lbl_80450AEC; +extern u8 lbl_8045516C; +extern u8 lbl_80455194; +extern u8 lbl_804551C0; +extern u8 lbl_80455188; +extern u8 lbl_80455164; +extern u8 lbl_804551AC; +extern u8 lbl_8045517C; +extern u8 lbl_80455130; +extern u8 lbl_804551A4; +extern u8 lbl_8045514C; +extern u8 lbl_80455120; +extern u8 lbl_804551B4; +extern u8 lbl_804551A8; +extern u8 lbl_80455184; +extern u8 lbl_80455144; +extern u8 lbl_80455140; +extern u8 lbl_8045518C; +extern u8 lbl_80455154; +extern u8 lbl_804551B0; +extern u8 lbl_80455160; // cM3d_InDivPos1__FPC3VecPC3VecfP3Vec -// cM3d_InDivPos1(const Vec*, const Vec*, float, Vec*) -asm void cM3d_InDivPos1(const Vec*, const Vec*, float, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268560.s" +void cM3d_InDivPos1(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) { + Vec tmp; + PSVECScale(pVecB, &tmp, pF); + PSVECAdd(&tmp, pVecA, pOut); } // cM3d_InDivPos2__FPC3VecPC3VecfP3Vec -// cM3d_InDivPos2(const Vec*, const Vec*, float, Vec*) -asm void cM3d_InDivPos2(const Vec*, const Vec*, float, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_802685B0.s" +void cM3d_InDivPos2(const Vec* pVecA, const Vec* pVecB, f32 pF, Vec* pOut) { + Vec tmp; + PSVECSubtract(pVecB, pVecA, &tmp); + cM3d_InDivPos1(pVecA, &tmp, pF, pOut); } // cM3d_Len2dSq__Fffff -// cM3d_Len2dSq(float, float, float, float) -asm float cM3d_Len2dSq(float, float, float, float) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268614.s" +f32 cM3d_Len2dSq(f32 pX1, f32 pY1, f32 pX2, f32 pY2) { + f32 xDiff = pX1 - pX2; + f32 yDiff = pY1 - pY2; + return xDiff * xDiff + yDiff * yDiff; +} + +inline bool cM3d_IsZero(f32 pF) { + return fabsf(pF) < lbl_80451180; } // cM3d_Len2dSqPntAndSegLine__FffffffPfPfPf -// cM3d_Len2dSqPntAndSegLine(float, float, float, float, float, float, float*, float*, float*) -asm bool cM3d_Len2dSqPntAndSegLine(float, float, float, float, float, float, float*, float*, - float*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026862C.s" +bool cM3d_Len2dSqPntAndSegLine(f32 param_1, f32 param_2, f32 param_3, f32 param_4, f32 p5, f32 p6, + f32* param_7, f32* param_8, f32* param_9) { + bool retVal = false; + f32 param_5 = p5 - param_3; + f32 param_6 = p6 - param_4; + f32 len = param_5 * param_5 + param_6 * param_6; + if (cM3d_IsZero(len)) { + *param_9 = /* 0.0 */ lbl_80455118; + return retVal; + } else { + len = (param_5 * (param_1 - param_3) + param_6 * (param_2 - param_4)) / len; + if (len >= /* 0.0 */ lbl_80455118 && len <= /* 1.0 */ lbl_80455138) { + retVal = true; + } + *param_7 = param_3 + param_5 * len; + *param_8 = param_4 + param_6 * len; + *param_9 = cM3d_Len2dSq(*param_7, *param_8, param_1, param_2); + return retVal; + } } // cM3d_Len3dSqPntAndSegLine__FPC8cM3dGLinPC3VecP3VecPf -// cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, float*) -asm bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin*, const Vec*, Vec*, float*) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268710.s" +bool cM3d_Len3dSqPntAndSegLine(const cM3dGLin* pLine, const Vec* pVec, Vec* pOutVec, f32* pOutF) { + bool retVal = 0; + Vec tmp; + PSVECSubtract(&pLine->GetEndP(), &pLine->GetStartP(), &tmp); + f32 seqLen = PSVECDotProduct(&tmp, &tmp); + if (cM3d_IsZero(seqLen)) { + *pOutF = /* 0.0 */ lbl_80455118; + return retVal; + } else { + Vec tmp2; + PSVECSubtract(pVec, &pLine->GetStartP(), &tmp2); + f32 tmpF = PSVECDotProduct(&tmp2, &tmp); + tmpF /= seqLen; + if (tmpF < /* 0.0 */ lbl_80455118 || tmpF > /* 1.0 */ lbl_80455138) { + retVal = false; + } else { + retVal = true; + } + PSVECScale(&tmp, &tmp, tmpF); + PSVECAdd(&tmp, &pLine->GetStartP(), pOutVec); + *pOutF = PSVECSquareDistance(pOutVec, pVec); + return retVal; + } } // cM3d_SignedLenPlaAndPos__FPC8cM3dGPlaPC3Vec -// cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*) -asm float cM3d_SignedLenPlaAndPos(const cM3dGPla*, const Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268814.s" +f32 cM3d_SignedLenPlaAndPos(const cM3dGPla* pPlane, const Vec* pPosition) { + f32 mag = PSVECMag(&pPlane->GetNP()); + if (cM3d_IsZero(mag)) { + return /* 0.0 */ lbl_80455118; + } else { + return (pPlane->mD + PSVECDotProduct(&pPlane->GetNP(), pPosition)) / mag; + } } // cM3d_VectorProduct2d__Fffffff -// cM3d_VectorProduct2d(float, float, float, float, float, float) -asm float cM3d_VectorProduct2d(float, float, float, float, float, float) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268894.s" +f32 cM3d_VectorProduct2d(f32 pX1, f32 pY1, f32 pX2, f32 pY2, f32 pX3, f32 pY3) { + return (pX2 - pX1) * (pY3 - pY1) - (pY2 - pY1) * (pX3 - pX1); } // cM3d_VectorProduct__FPC4cXyzPC4cXyzPC4cXyzP4cXyz -// cM3d_VectorProduct(const cXyz*, const cXyz*, const cXyz*, cXyz*) -asm void cM3d_VectorProduct(const cXyz*, const cXyz*, const cXyz*, cXyz*) { - nofralloc -#include "SComponent/c_m3d/asm/func_802688B4.s" +void cM3d_VectorProduct(const cXyz* pVecA, const cXyz* pVecB, const cXyz* pVecC, cXyz* pVecOut) { + Vec tmp1; + Vec tmp2; + PSVECSubtract(pVecB, pVecA, &tmp1); + PSVECSubtract(pVecC, pVecA, &tmp2); + PSVECCrossProduct(&tmp1, &tmp2, pVecOut); } // cM3d_CalcPla__FPC3VecPC3VecPC3VecP3VecPf -// cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, float*) -asm void cM3d_CalcPla(const Vec*, const Vec*, const Vec*, Vec*, float*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026891C.s" +void cM3d_CalcPla(const Vec* pVecA, const Vec* pVecB, const Vec* pVecC, Vec* pVecOut, f32* pD) { + Vec tmp2; + Vec tmp1; + PSVECSubtract(pVecB, pVecA, &tmp1); + PSVECSubtract(pVecC, pVecA, &tmp2); + PSVECCrossProduct(&tmp1, &tmp2, pVecOut); + f32 mag = PSVECMag(pVecOut); + if (fabsf(mag) >= /* 0.02 */ lbl_8045513C) { + PSVECScale(pVecOut, pVecOut, /* 1.0 */ lbl_80455138 / mag); + *pD = -PSVECDotProduct(pVecOut, pVecA); + } else { + f32 zero = /* 0.0 */ lbl_80455118; + pVecOut->y = zero; + *pD = zero; + pVecOut->z = zero; + pVecOut->x = zero; + } +} + +inline bool cM3d_CrossNumSection(f32 lMinX, f32 lMaxX, f32 rMinX, f32 rMaxX) { + if (lMinX > rMaxX) { + return false; + } else if (lMaxX < rMinX) { + return false; + } else if (rMinX > lMaxX) { + return false; + } else if (rMaxX < lMinX) { + return false; + } else { + return true; + } } // cM3d_Cross_AabAab__FPC8cM3dGAabPC8cM3dGAab -// cM3d_Cross_AabAab(const cM3dGAab*, const cM3dGAab*) -asm bool cM3d_Cross_AabAab(const cM3dGAab*, const cM3dGAab*) { - nofralloc -#include "SComponent/c_m3d/asm/func_802689E8.s" +bool cM3d_Cross_AabAab(const cM3dGAab* pAabA, const cM3dGAab* pAabB) { + if (cM3d_CrossNumSection(pAabA->getMinP().x, pAabA->getMaxP().x, pAabB->getMinP().x, + pAabB->getMaxP().x) && + cM3d_CrossNumSection(pAabA->getMinP().y, pAabA->getMaxP().y, pAabB->getMinP().y, + pAabB->getMaxP().y) && + cM3d_CrossNumSection(pAabA->getMinP().z, pAabA->getMaxP().z, pAabB->getMinP().z, + pAabB->getMaxP().z)) { + return true; + } else { + return false; + } } // cM3d_Cross_AabCyl__FPC8cM3dGAabPC8cM3dGCyl -// cM3d_Cross_AabCyl(const cM3dGAab*, const cM3dGCyl*) -asm bool cM3d_Cross_AabCyl(const cM3dGAab*, const cM3dGCyl*) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268B0C.s" +bool cM3d_Cross_AabCyl(const cM3dGAab* pAab, const cM3dGCyl* pCyl) { + if (pAab->getMinP().x > pCyl->GetCP().x + pCyl->GetR()) { + return false; + } else if (pAab->getMaxP().x < pCyl->GetCP().x - pCyl->GetR()) { + return false; + } else if (pAab->getMinP().z > pCyl->GetCP().z + pCyl->GetR()) { + return false; + } else if (pAab->getMaxP().z < pCyl->GetCP().z - pCyl->GetR()) { + return false; + } else if (pAab->getMinP().y > pCyl->GetCP().y + pCyl->GetH()) { + return false; + } else if (pAab->getMaxP().y < pCyl->GetCP().y) { + return false; + } else { + return true; + } } // cM3d_Cross_AabSph__FPC8cM3dGAabPC8cM3dGSph -// cM3d_Cross_AabSph(const cM3dGAab*, const cM3dGSph*) +#ifdef NON_MATCHING +bool cM3d_Cross_AabSph(const cM3dGAab* pAab, const cM3dGSph* pSph) { + f32 radius = pSph->GetR(); + if (pAab->GetMinX() > pSph->GetC().GetX() + radius) { // addition registers are flipped + return false; + } else if (pAab->GetMaxX() < pSph->GetC().GetX() - radius) { + return false; + } else if (pAab->GetMinZ() > pSph->GetC().GetZ() + radius) { + return false; + } else if (pAab->GetMaxZ() < pSph->GetC().GetZ() - radius) { + return false; + } else if (pAab->GetMinY() > pSph->GetC().GetY() + radius) { + return false; + } else if (pAab->GetMaxY() < pSph->GetC().GetY() - radius) { + return false; + } else { + return true; + } +} +#else asm bool cM3d_Cross_AabSph(const cM3dGAab*, const cM3dGSph*) { nofralloc #include "SComponent/c_m3d/asm/func_80268BB4.s" } +#endif +#ifdef NON_MATCHING // cM3d_Check_LinLin__FPC8cM3dGLinPC8cM3dGLinPfPf -// cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, float*, float*) -asm int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, float*, float*) { +int cM3d_Check_LinLin(const cM3dGLin* pLinA, const cM3dGLin* pLinB, f32* pFloatA, f32* pFloatB) { + Vec linAVec; + Vec linBVec; + pLinA->CalcVec(&linAVec); + pLinB->CalcVec(&linBVec); + f32 linALen = PSVECMag(&linAVec); + f32 linBLen = PSVECMag(&linBVec); + if (cM3d_IsZero(linALen) || cM3d_IsZero(linBLen)) { + return 1; + } else { + f32 invLinALen = /* 1.0 */ lbl_80455138 / linALen; + f32 invLinBLen = /* 1.0 */ lbl_80455138 / linBLen; + PSVECScale(&linAVec, &linAVec, invLinALen); + PSVECScale(&linBVec, &linBVec, invLinBLen); + Vec tmp; + PSVECSubtract(&pLinA->GetStartP(), &pLinB->GetStartP(), &tmp); + f32 tmpF = -PSVECDotProduct(&linAVec, &linBVec); + f32 tmpF2 = PSVECDotProduct(&tmp, &linAVec); + PSVECSquareMag(&tmp); // result not used + f32 tmpF3 = fabsf(/* 1.0 */ lbl_80455138 - (tmpF * tmpF)); + if (!cM3d_IsZero(tmpF3)) { + f32 tmpF4 = -PSVECDotProduct(&tmp, &linBVec); + f32 tmpF7 = /* 1.0 */ lbl_80455138 / tmpF3; + f32 outFloatAtmp = ((tmpF * tmpF4) - tmpF2) * tmpF7; + *pFloatA = outFloatAtmp * invLinALen; + f32 outFloatBtmp = ((tmpF * tmpF2) - tmpF4) * tmpF7; + *pFloatB = outFloatBtmp * invLinBLen; + return 3; + } else { + f32 tmpF5 = -tmpF2; + f32 tmpF6 = + /* 0.0 */ lbl_80455118; // would match with literals instead of labels + if (tmpF5 < /* 0.0 */ lbl_80455118 || (tmpF5 > linALen)) { + tmpF6 = linBLen; + tmpF5 = (tmpF6 * tmpF) - tmpF2; + } + f32 tmpF7 = PSVECDotProduct(&tmp, &linBVec); + if (tmpF5 < /* 0.0 */ lbl_80455118 || tmpF5 > linALen) { + tmpF5 = /* 0.0 */ lbl_80455118; + tmpF6 = tmpF7; + } + if (tmpF6 < /* 0.0 */ lbl_80455118 || tmpF6 > linBLen) { + tmpF5 = linALen; + tmpF6 = tmpF7 + (-linALen * tmpF); + } + *pFloatA = tmpF5 * invLinALen; + *pFloatB = tmpF6 * invLinBLen; + return 2; + } + } +} +#else +// cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, f32*, f32*) +asm int cM3d_Check_LinLin(const cM3dGLin*, const cM3dGLin*, f32*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_80268C5C.s" } +#endif // cM3d_CrossInfLineVsInfPlane_proc__FffPC3VecPC3VecP3Vec -// cM3d_CrossInfLineVsInfPlane_proc(float, float, const Vec*, const Vec*, Vec*) -asm bool cM3d_CrossInfLineVsInfPlane_proc(float, float, const Vec*, const Vec*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_80268ED4.s" +bool cM3d_CrossInfLineVsInfPlane_proc(f32 pFloatA, f32 pFloatB, const Vec* pVecA, const Vec* pVecB, + Vec* pVecOut) { + if (cM3d_IsZero(pFloatA - pFloatB)) { + *pVecOut = *pVecB; + return false; + } else { + cM3d_InDivPos2(pVecA, pVecB, pFloatA / (pFloatA - pFloatB), pVecOut); + return true; + } } // cM3d_Cross_LinPla__FPC8cM3dGLinPC8cM3dGPlaP3Vecbb -// cM3d_Cross_LinPla(const cM3dGLin*, const cM3dGPla*, Vec*, bool, bool) +#ifdef NON_MATCHING +bool cM3d_Cross_LinPla(const cM3dGLin* pLine, const cM3dGPla* pPlane, Vec* pVecOut, bool pBoolA, + bool pBoolB) { + f32 startVal = pPlane->getPlaneFunc(&pLine->GetStartP()); + f32 endVal = pPlane->getPlaneFunc(&pLine->GetEndP()); + if (startVal * endVal > /* 0.0 */ lbl_80455118) { + // matches with the literal, but that screws up data + // if (startVal * endVal > 0) { + *pVecOut = pLine->GetEndP(); + return false; + } else { + if (startVal >= /* 0.0 */ lbl_80455118 && endVal <= /* 0.0 */ lbl_80455118) { + // if (startVal >= 0 && endVal <= 0) { + if (pBoolA) { + return cM3d_CrossInfLineVsInfPlane_proc(startVal, endVal, &pLine->GetStartP(), + &pLine->GetEndP(), pVecOut); + } + } else { + if (pBoolB) { + return cM3d_CrossInfLineVsInfPlane_proc(startVal, endVal, &pLine->GetStartP(), + &pLine->GetEndP(), pVecOut); + } + } + *pVecOut = pLine->GetEndP(); + return true; + } +} +#else asm bool cM3d_Cross_LinPla(const cM3dGLin*, const cM3dGPla*, Vec*, bool, bool) { nofralloc #include "SComponent/c_m3d/asm/func_80268F34.s" } +#endif // cM3d_Cross_MinMaxBoxLine__FPC3VecPC3VecPC3VecPC3Vec // cM3d_Cross_MinMaxBoxLine(const Vec*, const Vec*, const Vec*, const Vec*) @@ -116,23 +366,69 @@ asm bool cM3d_Cross_MinMaxBoxLine(const Vec*, const Vec*, const Vec*, const Vec* } // cM3d_InclusionCheckPosIn3PosBox3d__FPC3VecPC3VecPC3VecPC3Vecf -// cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, float) -asm bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec*, const Vec*, const Vec*, const Vec*, float) { - nofralloc -#include "SComponent/c_m3d/asm/func_80269C2C.s" +bool cM3d_InclusionCheckPosIn3PosBox3d(const Vec* pVecA, const Vec* pVecB, const Vec* pVecC, + const Vec* pVecD, f32 pF) { + f32 min, max; + if (pVecA->GetX() < pVecB->GetX()) { + min = pVecA->GetX(); + max = pVecB->GetX(); + } else { + min = pVecB->GetX(); + max = pVecA->GetX(); + } + if (min > pVecC->GetX()) { + min = pVecC->GetX(); + } else if (max < pVecC->GetX()) { + max = pVecC->GetX(); + } + if (min - pF > pVecD->GetX() || max + pF < pVecD->GetX()) { + return false; + } + + if (pVecA->GetZ() < pVecB->GetZ()) { + min = pVecA->GetZ(); + max = pVecB->GetZ(); + } else { + min = pVecB->GetZ(); + max = pVecA->GetZ(); + } + if (min > pVecC->GetZ()) { + min = pVecC->GetZ(); + } else if (max < pVecC->GetZ()) { + max = pVecC->GetZ(); + } + if (min - pF > pVecD->GetZ() || max + pF < pVecD->GetZ()) { + return false; + } + + if (pVecA->GetY() < pVecB->GetY()) { + min = pVecA->GetY(); + max = pVecB->GetY(); + } else { + min = pVecB->GetY(); + max = pVecA->GetY(); + } + if (min > pVecC->GetY()) { + min = pVecC->GetY(); + } else if (max < pVecC->GetY()) { + max = pVecC->GetY(); + } + if (min - pF > pVecD->GetY() || max + pF < pVecD->GetY()) { + return false; + } + return true; } // cM3d_InclusionCheckPosIn3PosBox2d__Ffffffffff -// cM3d_InclusionCheckPosIn3PosBox2d(float, float, float, float, float, float, float, float, float) -asm bool cM3d_InclusionCheckPosIn3PosBox2d(float, float, float, float, float, float, float, float, - float) { +// cM3d_InclusionCheckPosIn3PosBox2d(f32, f32, f32, f32, f32, f32, f32, f32, f32) +asm bool cM3d_InclusionCheckPosIn3PosBox2d(f32, f32, f32, f32, f32, f32, f32, f32, f32) { nofralloc #include "SComponent/c_m3d/asm/func_80269D64.s" } // cM3d_CrossX_Tri__FPC8cM3dGTriPC3Vecf -// cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, float) -asm bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, float) { +// cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, f32) +asm bool cM3d_CrossX_Tri(const cM3dGTri*, const Vec*, f32) { nofralloc #include "SComponent/c_m3d/asm/func_80269E18.s" } @@ -180,29 +476,29 @@ asm bool cM3d_CrossY_Tri_Front(const Vec&, const Vec&, const Vec&, const Vec*) { } // cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPf -// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float*) -asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float*) { +// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32*) +asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026A8C0.s" } // cM3d_CrossY_Tri__FPC8cM3dGTriPC3Vecf -// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float) -asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, float) { +// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32) +asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, f32) { nofralloc #include "SComponent/c_m3d/asm/func_8026A944.s" } // cM3d_CrossY_Tri__FPC8cM3dGTriPC3VecPC10cM3d_RangePf -// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, float*) -asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, float*) { +// cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, f32*) +asm bool cM3d_CrossY_Tri(const cM3dGTri*, const Vec*, const cM3d_Range*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026AAE8.s" } // cM3d_CrossZ_Tri__FPC8cM3dGTriPC3Vecf -// cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, float) -asm bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, float) { +// cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, f32) +asm bool cM3d_CrossZ_Tri(const cM3dGTri*, const Vec*, f32) { nofralloc #include "SComponent/c_m3d/asm/func_8026ABD8.s" } @@ -257,45 +553,66 @@ asm int cM3d_Cross_LinSph_CrossPos(const cM3dGSph&, const cM3dGLin&, Vec*, Vec*) } // cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphPf -// cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, float*) -asm bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, float*) { +// cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, f32*) +asm bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026B8A4.s" } // cM3d_Cross_CylSph__FPC8cM3dGCylPC8cM3dGSphP3VecPf -// cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, float*) -asm bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, float*) { +// cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, f32*) +asm bool cM3d_Cross_CylSph(const cM3dGCyl*, const cM3dGSph*, Vec*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026BA48.s" } // cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPf -// cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*) -asm bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*) { +// cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*) +asm bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026BC7C.s" } // cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphPfPf -// cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*, float*) -asm bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, float*, float*) { +// cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*, f32*) +asm bool cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, f32*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026BCFC.s" } // cM3d_Cross_SphSph__FPC8cM3dGSphPC8cM3dGSphP3Vec -// cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*) -asm void cM3d_Cross_SphSph(const cM3dGSph*, const cM3dGSph*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026BD88.s" +bool cM3d_Cross_SphSph(const cM3dGSph* pSphereA, const cM3dGSph* pSphereB, Vec* pVecOut) { + f32 centerDist; + f32 overlapLen; + if (cM3d_Cross_SphSph(pSphereA, pSphereB, ¢erDist, &overlapLen)) { + if (!cM3d_IsZero(centerDist)) { + // could be an inlined function + f32 tmpF = pSphereB->GetR() / centerDist; + Vec tmp; + PSVECSubtract(&pSphereA->GetC(), &pSphereB->GetC(), &tmp); + PSVECScale(&tmp, &tmp, tmpF); + PSVECAdd(&tmp, &pSphereB->GetC(), pVecOut); + } else { + *pVecOut = pSphereA->GetC(); + } + return true; + } else { + return false; + } } // cM3d_CalcSphVsTriCrossPoint__FPC8cM3dGSphPC8cM3dGTriP3Vec -// cM3d_CalcSphVsTriCrossPoint(const cM3dGSph*, const cM3dGTri*, Vec*) -asm void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph*, const cM3dGTri*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026BE5C.s" +void cM3d_CalcSphVsTriCrossPoint(const cM3dGSph* pSphere, const cM3dGTri* pTriangle, Vec* pVecOut) { + Vec tmp2; + Vec tmp; + PSVECAdd(&pTriangle->mA, &pTriangle->mB, &tmp); + PSVECScale(&tmp, &tmp2, /* 0.5 */ lbl_804551C4); + f32 sqDist = PSVECSquareDistance(&tmp2, &pSphere->GetC()); + if (cM3d_IsZero(sqDist)) { + *pVecOut = pSphere->GetC(); + } else { + cM3d_InDivPos2(&pSphere->GetC(), &tmp2, pSphere->GetR() / sqDist, pVecOut); + } } // cM3d_Cross_SphTri__FPC8cM3dGSphPC8cM3dGTriP3Vec @@ -306,8 +623,8 @@ asm bool cM3d_Cross_SphTri(const cM3dGSph*, const cM3dGTri*, Vec*) { } // cM3d_Cross_CylCyl__FPC8cM3dGCylPC8cM3dGCylPf -// cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, float*) -asm bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, float*) { +// cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, f32*) +asm bool cM3d_Cross_CylCyl(const cM3dGCyl*, const cM3dGCyl*, f32*) { nofralloc #include "SComponent/c_m3d/asm/func_8026C22C.s" } @@ -334,17 +651,24 @@ asm int cM3d_Cross_CylLin(const cM3dGCyl*, const cM3dGLin*, Vec*, Vec*) { } // cM3d_Cross_CylPntPnt__FPC8cM3dGCylPC3VecPC3VecP3VecP3Vec -// cM3d_Cross_CylPntPnt(const cM3dGCyl*, const Vec*, const Vec*, Vec*, Vec*) -asm int cM3d_Cross_CylPntPnt(const cM3dGCyl*, const Vec*, const Vec*, Vec*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026D044.s" +int cM3d_Cross_CylPntPnt(const cM3dGCyl* pCylinder, const Vec* pVecStart, const Vec* pVecEnd, + Vec* pVecOutA, Vec* pVecOutB) { + cM3dGLin lin; + lin.SetStartEnd(*pVecStart, *pVecEnd); + return cM3d_Cross_CylLin(pCylinder, &lin, pVecOutA, pVecOutB); } // cM3d_Cross_CylPnt__FPC8cM3dGCylPC3Vec -// cM3d_Cross_CylPnt(const cM3dGCyl*, const Vec*) -asm bool cM3d_Cross_CylPnt(const cM3dGCyl*, const Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026D0B0.s" +bool cM3d_Cross_CylPnt(const cM3dGCyl* pCylinder, const Vec* pPoint) { + f32 dX = pCylinder->GetCP().getXDiff(pPoint); + f32 dZ = pCylinder->GetCP().getZDiff(pPoint); + f32 maxY = pCylinder->GetCP().y + pCylinder->GetH(); + if (dX * dX + dZ * dZ < pCylinder->GetR() * pCylinder->GetR() && + pCylinder->GetCP().y < pPoint->y && maxY > pPoint->y) { + return true; + } else { + return false; + } } // cM3d_Cross_CpsCps__FRC8cM3dGCpsRC8cM3dGCpsP3Vec @@ -382,6 +706,16 @@ asm bool cM3d_Cross_TriTri(const cM3dGTri&, const cM3dGTri&, Vec*) { #include "SComponent/c_m3d/asm/func_8026DE2C.s" } +inline f32 cM3d_2LinCenter(cM3dGLin const pLinA, f32 pLinAF, cM3dGLin const& pLinB, f32 pLinBF, + Vec* pVecOut) { + Vec tmp, tmp2; + pLinA.CalcPos(&tmp, pLinAF); + pLinB.CalcPos(&tmp2, pLinBF); + PSVECAdd(&tmp, &tmp2, pVecOut); + PSVECScale(pVecOut, pVecOut, /* 0.5 */ lbl_804551C4); + return PSVECDistance(&tmp, &tmp2); +} + // cM3d_Cross_CpsTri__FRC8cM3dGCps8cM3dGTriP3Vec // cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*) asm bool cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*) { @@ -390,10 +724,9 @@ asm bool cM3d_Cross_CpsTri(const cM3dGCps&, cM3dGTri, Vec*) { } // cM3d_CalcVecAngle__FRC3VecPsPs -// cM3d_CalcVecAngle(const Vec&, short*, short*) -asm void cM3d_CalcVecAngle(const Vec&, short*, short*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026E4FC.s" +void cM3d_CalcVecAngle(const Vec& pVec, s16* pOutA, s16* pOutB) { + *pOutA = -cM_atan2s(-pVec.z * pVec.y, /* 1.0 */ lbl_80455138); + *pOutB = cM_atan2s(-pVec.x * pVec.y, /* 1.0 */ lbl_80455138); } // cM3d_CalcVecZAngle__FRC3VecP5csXyz @@ -404,53 +737,126 @@ asm void cM3d_CalcVecZAngle(const Vec&, csXyz*) { } // cM3d_PlaneCrossLineProcWork__FfffffffPfPf -// cM3d_PlaneCrossLineProcWork(float, float, float, float, float, float, float, float*, float*) -asm void cM3d_PlaneCrossLineProcWork(float, float, float, float, float, float, float, float*, - float*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026E6C4.s" +void cM3d_PlaneCrossLineProcWork(f32 f1, f32 f2, f32 f3, f32 f4, f32 f5, f32 f6, f32 f7, f32* pF1, + f32* pF2) { + *pF1 = ((f2 * f7) - (f4 * f6)) / f5; + *pF2 = ((f3 * f6) - (f1 * f7)) / f5; } // cM3d_2PlaneCrossLine__FRC8cM3dGPlaRC8cM3dGPlaP8cM3dGLin -// cM3d_2PlaneCrossLine(const cM3dGPla&, const cM3dGPla&, cM3dGLin*) -asm int cM3d_2PlaneCrossLine(const cM3dGPla&, const cM3dGPla&, cM3dGLin*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026E6F0.s" +int cM3d_2PlaneCrossLine(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, cM3dGLin* pLinOut) { + Vec tmp; + PSVECCrossProduct(&pPlaneA.GetNP(), &pPlaneB.GetNP(), &tmp); + if (cM3d_IsZero(tmp.x) && cM3d_IsZero(tmp.y) && cM3d_IsZero(tmp.z)) { + return 0; + } else { + f32 absTX = fabsf(tmp.x); + f32 absTY = fabsf(tmp.y); + f32 absTZ = fabsf(tmp.z); + if (absTX >= absTY && absTX >= absTZ) { + cM3d_PlaneCrossLineProcWork(pPlaneA.GetNP().y, pPlaneA.GetNP().z, pPlaneB.GetNP().y, + pPlaneB.GetNP().z, tmp.x, pPlaneA.GetD(), pPlaneB.GetD(), + &pLinOut->GetStartP().y, &pLinOut->GetStartP().z); + pLinOut->GetStartP().x = /* 0.0 */ lbl_80455118; + } else if (absTY >= absTX && absTY >= absTZ) { + cM3d_PlaneCrossLineProcWork(pPlaneA.GetNP().z, pPlaneA.GetNP().x, pPlaneB.GetNP().z, + pPlaneB.GetNP().x, tmp.y, pPlaneA.GetD(), pPlaneB.GetD(), + &pLinOut->GetStartP().z, &pLinOut->GetStartP().x); + pLinOut->GetStartP().y = /* 0.0 */ lbl_80455118; + } else { + cM3d_PlaneCrossLineProcWork(pPlaneA.GetNP().x, pPlaneA.GetNP().y, pPlaneB.GetNP().x, + pPlaneB.GetNP().y, tmp.z, pPlaneA.GetD(), pPlaneB.GetD(), + &pLinOut->GetStartP().x, &pLinOut->GetStartP().y); + pLinOut->GetStartP().z = /* 0.0 */ lbl_80455118; + } + f32 scale = PSVECMag(&pLinOut->GetStartP()); + if (cM3d_IsZero(scale)) { + scale = /* 1.0 */ lbl_80455138; + } + PSVECScale(&tmp, &tmp, scale); + PSVECAdd(&pLinOut->GetStartP(), &tmp, &pLinOut->GetEndP()); + return 1; + } } // cM3d_3PlaneCrossPos__FRC8cM3dGPlaRC8cM3dGPlaRC8cM3dGPlaP3Vec -// cM3d_3PlaneCrossPos(const cM3dGPla&, const cM3dGPla&, const cM3dGPla&, Vec*) -asm bool cM3d_3PlaneCrossPos(const cM3dGPla&, const cM3dGPla&, const cM3dGPla&, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026E8A0.s" +bool cM3d_3PlaneCrossPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, const cM3dGPla& pPlaneC, + Vec* pVecOut) { + cM3dGLin lin; + if (!cM3d_2PlaneCrossLine(pPlaneA, pPlaneB, &lin)) { + return false; + } else { + const Vec* end = &lin.GetEndP(); + f32 tmpf1 = pPlaneC.getPlaneFunc(&lin.GetStartP()); + f32 tmpf2 = pPlaneC.getPlaneFunc(end); + if (!cM3d_CrossInfLineVsInfPlane_proc(tmpf1, tmpf2, &lin.GetStartP(), end, pVecOut)) { + return false; + } else { + return true; + } + } } // cM3d_lineVsPosSuisenCross__FPC8cM3dGLinPC3VecP3Vec -// cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*) -asm float cM3d_lineVsPosSuisenCross(const cM3dGLin*, const Vec*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026E980.s" +f32 cM3d_lineVsPosSuisenCross(const cM3dGLin* pLine, const Vec* pPoint, Vec* pVecOut) { + Vec tmp1; + Vec tmp2; + Vec tmp3; + // PSVECSubtract(&pLine->GetEndP(), &pLine->GetStartP(), &tmp1); + pLine->CalcVec(&tmp1); + f32 diffLen = PSVECSquareMag(&tmp1); + if (cM3d_IsZero(diffLen)) { + *pVecOut = *pPoint; + return /* 0.0 */ lbl_80455118; + } else { + PSVECSubtract(pPoint, &pLine->GetStartP(), &tmp2); + // f32 dotProd = PSVECDotProduct(&tmp2, &tmp1); + // f32 retVal = dotProd / diffLen; + f32 retVal = PSVECDotProduct(&tmp2, &tmp1) / diffLen; + PSVECScale(&tmp1, &tmp3, retVal); + PSVECAdd(&tmp3, &pLine->GetStartP(), pVecOut); + return retVal; + } } // cM3d_lineVsPosSuisenCross__FRC3VecRC3VecRC3VecP3Vec -// cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*) -asm float cM3d_lineVsPosSuisenCross(const Vec&, const Vec&, const Vec&, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026EA5C.s" +f32 cM3d_lineVsPosSuisenCross(const Vec& pLinePointA, const Vec& pLinePointB, const Vec& pPoint, + Vec* pVecOut) { + Vec tmp1; + Vec tmp2; + Vec tmp3; + PSVECSubtract(&pLinePointB, &pLinePointA, &tmp1); + f32 diffLen = PSVECSquareMag(&tmp1); + if (cM3d_IsZero(diffLen)) { + *pVecOut = pPoint; + return /* 0.0 */ lbl_80455118; + } else { + PSVECSubtract(&pPoint, &pLinePointA, &tmp2); + f32 dotProd = PSVECDotProduct(&tmp2, &tmp1); + f32 retVal = dotProd / diffLen; + PSVECScale(&tmp1, &tmp3, retVal); + PSVECAdd(&tmp3, &pLinePointA, pVecOut); + return retVal; + } } // cM3d_2PlaneLinePosNearPos__FRC8cM3dGPlaRC8cM3dGPlaPC3VecP3Vec -// cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*) -asm int cM3d_2PlaneLinePosNearPos(const cM3dGPla&, const cM3dGPla&, const Vec*, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026EB38.s" +int cM3d_2PlaneLinePosNearPos(const cM3dGPla& pPlaneA, const cM3dGPla& pPlaneB, const Vec* pVec, + Vec* pVecOut) { + cM3dGLin lin; + if (!cM3d_2PlaneCrossLine(pPlaneA, pPlaneB, &lin)) { + return FALSE; + } else { + cM3d_lineVsPosSuisenCross(&lin, pVec, pVecOut); + return TRUE; + } } // cM3d_CrawVec__FRC3VecRC3VecP3Vec -// cM3d_CrawVec(const Vec&, const Vec&, Vec*) -asm void cM3d_CrawVec(const Vec&, const Vec&, Vec*) { - nofralloc -#include "SComponent/c_m3d/asm/func_8026EBBC.s" +void cM3d_CrawVec(const Vec& pVecA, const Vec& pVecB, Vec* pVecOut) { + Vec tmp; + PSVECScale(&pVecA, &tmp, fabsf(pVecB.x * pVecA.x + pVecB.y * pVecA.y + pVecB.z * pVecA.z)); + PSVECAdd(&tmp, &pVecB, pVecOut); } extern "C" { diff --git a/libs/SSystem/SComponent/c_m3d_g_aab.cpp b/libs/SSystem/SComponent/c_m3d_g_aab.cpp index edc0bd661d..c01a35fbfc 100644 --- a/libs/SSystem/SComponent/c_m3d_g_aab.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_aab.cpp @@ -2,79 +2,73 @@ #include "SComponent/c_m3d_g_aab.h" +// additional symbols needed for c_m3d_g_aab.cpp +// autogenerated by split.py v0.3 at 2021-01-01 14:25:53.390342 +extern f32 lbl_804551D4; +extern f32 lbl_804551D0; +extern f32 lbl_804551D8; + // Set__8cM3dGAabFPC4cXyzPC4cXyz -// cM3dGAab::Set(const cXyz*, const cXyz*) -asm void cM3dGAab::Set(const cXyz*, const cXyz*) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EC54.s" +void cM3dGAab::Set(const cXyz* pMin, const cXyz* pMax) { + mMin = *pMin; + mMax = *pMax; } // CrossY__8cM3dGAabCFPC4cXyz -// cM3dGAab::CrossY(const cXyz*) const -asm bool cM3dGAab::CrossY(const cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EC88.s" +bool cM3dGAab::CrossY(const cXyz* pOther) const { + if (mMin.x > pOther->x || mMax.x < pOther->x || mMin.z > pOther->z || mMax.z < pOther->z) { + return false; + } else { + return true; + } } // UnderPlaneYUnder__8cM3dGAabCFf -// cM3dGAab::UnderPlaneYUnder(float) const -asm bool cM3dGAab::UnderPlaneYUnder(float) const { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026ECD0.s" +bool cM3dGAab::UnderPlaneYUnder(f32 pY) const { + return mMin.y < pY; } // TopPlaneYUnder__8cM3dGAabCFf -// cM3dGAab::TopPlaneYUnder(float) const -asm bool cM3dGAab::TopPlaneYUnder(float) const { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026ECE4.s" +bool cM3dGAab::TopPlaneYUnder(f32 pY) const { + return mMax.y < pY; } // ClearForMinMax__8cM3dGAabFv -// cM3dGAab::ClearForMinMax(void) -asm void cM3dGAab::ClearForMinMax(void) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026ECF8.s" +void cM3dGAab::ClearForMinMax(void) { + mMin.setAll(lbl_804551D0); + mMax.setAll(lbl_804551D4); } // SetMinMax__8cM3dGAabFRC4cXyz -// cM3dGAab::SetMinMax(const cXyz&) -asm void cM3dGAab::SetMinMax(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026ED1C.s" +void cM3dGAab::SetMinMax(const cXyz& pMinMax) { + this->SetMin(pMinMax); + this->SetMax(pMinMax); } // SetMinMax__8cM3dGAabFRC8cM3dGAab -// cM3dGAab::SetMinMax(const cM3dGAab&) -asm void cM3dGAab::SetMinMax(const cM3dGAab&) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026ED60.s" +void cM3dGAab::SetMinMax(const cM3dGAab& pOther) { + this->SetMinMax(pOther.mMin); + this->SetMinMax(pOther.mMax); } // SetMin__8cM3dGAabFRC4cXyz -// cM3dGAab::SetMin(const cXyz&) -asm void cM3dGAab::SetMin(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EDA4.s" +void cM3dGAab::SetMin(const cXyz& pMin) { + mMin.setMin(pMin); } // SetMax__8cM3dGAabFRC4cXyz -// cM3dGAab::SetMax(const cXyz&) -asm void cM3dGAab::SetMax(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EDE4.s" +void cM3dGAab::SetMax(const cXyz& pMax) { + mMax.setMax(pMax); } // CalcCenter__8cM3dGAabCFP4cXyz -// cM3dGAab::CalcCenter(cXyz*) const -asm void cM3dGAab::CalcCenter(cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EE24.s" +void cM3dGAab::CalcCenter(cXyz* pOut) const { + PSVECAdd(&mMin, &mMax, pOut); + PSVECScale(pOut, pOut, lbl_804551D8); } // PlusR__8cM3dGAabFf -// cM3dGAab::PlusR(float) -asm void cM3dGAab::PlusR(float) { - nofralloc -#include "SComponent/c_m3d_g_aab/asm/func_8026EE68.s" +void cM3dGAab::PlusR(f32 pR) { + mMin -= pR; + mMax += pR; } diff --git a/libs/SSystem/SComponent/c_m3d_g_cir.cpp b/libs/SSystem/SComponent/c_m3d_g_cir.cpp index 83e3f7f2ca..c6461fc4d1 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cir.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cir.cpp @@ -3,32 +3,18 @@ #include "SComponent/c_m3d_g_cir.h" // __ct__8cM3dGCirFv -// cM3dGCir::cM3dGCir(void) -asm cM3dGCir::cM3dGCir(void) { - nofralloc -#include "SComponent/c_m3d_g_cir/asm/func_8026EEB4.s" -} - -extern "C" { +cM3dGCir::cM3dGCir(void) {} +// inlined here // __dt__8cM2dGCirFv -// cM2dGCir::~cM2dGCir(void) -asm void __dt__8cM2dGCirFv(void) { - nofralloc -#include "SComponent/c_m3d_g_cir/asm/func_8026EED0.s" -} -} // __dt__8cM3dGCirFv -// cM3dGCir::~cM3dGCir(void) -asm cM3dGCir::~cM3dGCir(void) { - nofralloc -#include "SComponent/c_m3d_g_cir/asm/func_8026EF18.s" -} +cM3dGCir::~cM3dGCir(void) {} // Set__8cM3dGCirFffff -// cM3dGCir::Set(float, float, float, float) -asm void cM3dGCir::Set(float, float, float, float) { - nofralloc -#include "SComponent/c_m3d_g_cir/asm/func_8026EF74.s" +void cM3dGCir::Set(f32 pPosX, f32 pPosY, f32 pPosZ, f32 pRadius) { + mPosX = pPosX; + mPosY = pPosY; + mRadius = pRadius; + mPosZ = pPosZ; } diff --git a/libs/SSystem/SComponent/c_m3d_g_cps.cpp b/libs/SSystem/SComponent/c_m3d_g_cps.cpp index b65d244e3b..28010f892f 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cps.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cps.cpp @@ -3,36 +3,24 @@ #include "SComponent/c_m3d_g_cps.h" // __ct__8cM3dGCpsFv -// cM3dGCps::cM3dGCps(void) -asm cM3dGCps::cM3dGCps(void) { - nofralloc -#include "SComponent/c_m3d_g_cps/asm/func_8026EF88.s" -} +cM3dGCps::cM3dGCps(void) {} // __dt__8cM3dGCpsFv -// cM3dGCps::~cM3dGCps(void) -asm cM3dGCps::~cM3dGCps(void) { - nofralloc -#include "SComponent/c_m3d_g_cps/asm/func_8026EFA4.s" -} +cM3dGCps::~cM3dGCps(void) {} // Set__8cM3dGCpsFRC4cXyzRC4cXyzf -// cM3dGCps::Set(const cXyz&, const cXyz&, float) -asm void cM3dGCps::Set(const cXyz&, const cXyz&, float) { - nofralloc -#include "SComponent/c_m3d_g_cps/asm/func_8026F000.s" +void cM3dGCps::Set(const cXyz& pStart, const cXyz& pEnd, f32 pUnkF) { + this->SetStartEnd(pStart, pEnd); + unk_0x1c = pUnkF; } // Set__8cM3dGCpsFRC9cM3dGCpsS -// cM3dGCps::Set(const cM3dGCpsS&) -asm void cM3dGCps::Set(const cM3dGCpsS&) { - nofralloc -#include "SComponent/c_m3d_g_cps/asm/func_8026F03C.s" +void cM3dGCps::Set(const cM3dGCpsS& other) { + this->SetStartEnd(other.mStart, other.mEnd); + unk_0x1c = other.unk_0x1c; } // SetCps__8cM3dGCpsFRC8cM3dGCps -// cM3dGCps::SetCps(const cM3dGCps&) -asm void cM3dGCps::SetCps(const cM3dGCps&) { - nofralloc -#include "SComponent/c_m3d_g_cps/asm/func_8026F080.s" +void cM3dGCps::SetCps(const cM3dGCps& other) { + this->Set(other.GetStartP(), other.GetEndP(), other.unk_0x1c); } diff --git a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp index fefedadc96..14b7bc17e5 100644 --- a/libs/SSystem/SComponent/c_m3d_g_cyl.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_cyl.cpp @@ -1,66 +1,61 @@ /* c_m3d_g_cyl.cpp autogenerated by split.py v0.3 at 2021-01-01 14:45:46.600671 */ #include "SComponent/c_m3d_g_cyl.h" +#include "SComponent/c_m3d.h" // __ct__8cM3dGCylFPC4cXyzff -// cM3dGCyl::cM3dGCyl(const cXyz*, float, float) -asm cM3dGCyl::cM3dGCyl(const cXyz*, float, float) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F0A8.s" +cM3dGCyl::cM3dGCyl(const cXyz* pCenter, f32 pRadius, f32 pHeight) { + this->SetC(*pCenter); + this->SetR(pRadius); + this->SetH(pHeight); } // Set__8cM3dGCylFRC9cM3dGCylS -// cM3dGCyl::Set(const cM3dGCylS&) -asm void cM3dGCyl::Set(const cM3dGCylS&) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F114.s" +void cM3dGCyl::Set(const cM3dGCylS& other) { + this->SetC(cXyz(other.mCenter)); + this->SetR(other.mRadius); + this->SetH(other.mHeight); } // Set__8cM3dGCylFRC4cXyzff -// cM3dGCyl::Set(const cXyz&, float, float) -asm void cM3dGCyl::Set(const cXyz&, float, float) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F180.s" +void cM3dGCyl::Set(const cXyz& pCenter, f32 pRadius, f32 pHeight) { + this->SetC(pCenter); + this->SetR(pRadius); + this->SetH(pHeight); } // SetC__8cM3dGCylFRC4cXyz -// cM3dGCyl::SetC(const cXyz&) -asm void cM3dGCyl::SetC(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F1DC.s" +void cM3dGCyl::SetC(const cXyz& pCenter) { + mCenter = pCenter; } // SetH__8cM3dGCylFf -// cM3dGCyl::SetH(float) -asm void cM3dGCyl::SetH(float) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F1F8.s" +void cM3dGCyl::SetH(f32 pHeight) { + mHeight = pHeight; } // SetR__8cM3dGCylFf -// cM3dGCyl::SetR(float) -asm void cM3dGCyl::SetR(float) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F200.s" +void cM3dGCyl::SetR(f32 pRadius) { + mRadius = pRadius; } // cross__8cM3dGCylCFPC8cM3dGSphP4cXyz -// cM3dGCyl::cross(const cM3dGSph*, cXyz*) const -asm bool cM3dGCyl::cross(const cM3dGSph*, cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F208.s" +bool cM3dGCyl::cross(const cM3dGSph* pOther, cXyz* pOut) const { + f32 f; + return cM3d_Cross_CylSph(this, pOther, pOut, &f); } // cross__8cM3dGCylCFPC8cM3dGCylP4cXyz -// cM3dGCyl::cross(const cM3dGCyl*, cXyz*) const -asm bool cM3dGCyl::cross(const cM3dGCyl*, cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F22C.s" +bool cM3dGCyl::cross(const cM3dGCyl* pOther, cXyz* pOut) const { + return cM3d_Cross_CylCyl(this, pOther, pOut); } // calcMinMax__8cM3dGCylFP4cXyzP4cXyz -// cM3dGCyl::calcMinMax(cXyz*, cXyz*) -asm void cM3dGCyl::calcMinMax(cXyz*, cXyz*) { - nofralloc -#include "SComponent/c_m3d_g_cyl/asm/func_8026F24C.s" +void cM3dGCyl::calcMinMax(cXyz* pMin, cXyz* pMax) { + pMin->x = mCenter.x - mRadius; + pMin->y = mCenter.y; + pMin->z = mCenter.z - mRadius; + pMax->x = mCenter.x + mRadius; + pMax->y = mCenter.y + mHeight; + pMax->z = mCenter.z + mRadius; } diff --git a/libs/SSystem/SComponent/c_m3d_g_lin.cpp b/libs/SSystem/SComponent/c_m3d_g_lin.cpp index 8a4b67721f..f4312a4a55 100644 --- a/libs/SSystem/SComponent/c_m3d_g_lin.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_lin.cpp @@ -1,38 +1,32 @@ /* c_m3d_g_lin.cpp autogenerated by split.py v0.3 at 2021-01-01 14:48:45.519641 */ #include "SComponent/c_m3d_g_lin.h" +#include "mtx_vec.h" // __ct__8cM3dGLinFRC4cXyzRC4cXyz -// cM3dGLin::cM3dGLin(const cXyz&, const cXyz&) -asm cM3dGLin::cM3dGLin(const cXyz&, const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_lin/asm/func_8026F2A8.s" -} +cM3dGLin::cM3dGLin(const cXyz& pStart, const cXyz& pEnd) : mStart(pStart), mEnd(pEnd) {} // SetStartEnd__8cM3dGLinFRC4cXyzRC4cXyz -// cM3dGLin::SetStartEnd(const cXyz&, const cXyz&) -asm void cM3dGLin::SetStartEnd(const cXyz&, const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_lin/asm/func_8026F2E8.s" +void cM3dGLin::SetStartEnd(const cXyz& pStart, const cXyz& pEnd) { + mStart = pStart; + mEnd = pEnd; } // SetStartEnd__8cM3dGLinFRC3VecRC3Vec -// cM3dGLin::SetStartEnd(const Vec&, const Vec&) -asm void cM3dGLin::SetStartEnd(const Vec&, const Vec&) { - nofralloc -#include "SComponent/c_m3d_g_lin/asm/func_8026F31C.s" +void cM3dGLin::SetStartEnd(const Vec& pStart, const Vec& pEnd) { + mStart = pStart; + mEnd = pEnd; } // CalcPos__8cM3dGLinCFP3Vecf -// cM3dGLin::CalcPos(Vec*, float) const -asm void cM3dGLin::CalcPos(Vec*, float) const { - nofralloc -#include "SComponent/c_m3d_g_lin/asm/func_8026F350.s" +void cM3dGLin::CalcPos(Vec* pOut, f32 pScale) const { + Vec tmp; + PSVECSubtract(&mEnd, &mStart, &tmp); + PSVECScale(&tmp, &tmp, pScale); + PSVECAdd(&tmp, &mStart, pOut); } // SetEnd__8cM3dGLinFRC4cXyz -// cM3dGLin::SetEnd(const cXyz&) -asm void cM3dGLin::SetEnd(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_lin/asm/func_8026F3C0.s" +void cM3dGLin::SetEnd(const cXyz& pEnd) { + mEnd = pEnd; } \ No newline at end of file diff --git a/libs/SSystem/SComponent/c_m3d_g_pla.cpp b/libs/SSystem/SComponent/c_m3d_g_pla.cpp index 55f2bc5bba..0a3c28b917 100644 --- a/libs/SSystem/SComponent/c_m3d_g_pla.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_pla.cpp @@ -1,52 +1,58 @@ /* c_m3d_g_pla.cpp autogenerated by split.py v0.3 at 2021-01-01 14:50:54.810233 */ #include "SComponent/c_m3d_g_pla.h" +#include "SComponent/c_m3d.h" // __ct__8cM3dGPlaFPC4cXyzf -// cM3dGPla::cM3dGPla(const cXyz*, float) -asm cM3dGPla::cM3dGPla(const cXyz*, float) { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F3DC.s" -} +cM3dGPla::cM3dGPla(const cXyz* pNormal, f32 pD) : mNormal(*pNormal), mD(pD) {} // crossInfLin__8cM3dGPlaCFRC4cXyzRC4cXyzR4cXyz -// cM3dGPla::crossInfLin(const cXyz&, const cXyz&, cXyz&) const -asm void cM3dGPla::crossInfLin(const cXyz&, const cXyz&, cXyz&) const { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F408.s" +bool cM3dGPla::crossInfLin(const cXyz& pStart, const cXyz& pEnd, cXyz& out) const { + f32 tmp1 = (mD + PSVECDotProduct(&mNormal, &pStart)); + f32 tmp2 = tmp1 - (mD + PSVECDotProduct(&mNormal, &pEnd)); + if (fabsf(tmp2) < lbl_80451180) { + out = pEnd; + return false; + } else { + cM3d_InDivPos2(&pStart, &pEnd, (tmp1 / tmp2), &out); + return true; + } } // SetupNP0__8cM3dGPlaFRC3VecRC3Vec -// cM3dGPla::SetupNP0(const Vec&, const Vec&) -asm void cM3dGPla::SetupNP0(const Vec&, const Vec&) { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F4C4.s" +void cM3dGPla::SetupNP0(const Vec& pNormal, const Vec& pPoint) { + mNormal = pNormal; + PSVECNormalize(&mNormal, &mNormal); + mD = -PSVECDotProduct(&mNormal, &pPoint); } // SetupNP__8cM3dGPlaFRC3VecRC3Vec -// cM3dGPla::SetupNP(const Vec&, const Vec&) -asm void cM3dGPla::SetupNP(const Vec&, const Vec&) { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F52C.s" +void cM3dGPla::SetupNP(const Vec& pNormal, const Vec& pPoint) { + mNormal = pNormal; + mD = -PSVECDotProduct(&mNormal, &pPoint); } // getCrossY__8cM3dGPlaCFRC4cXyzPf -// cM3dGPla::getCrossY(const cXyz&, float*) const -asm bool cM3dGPla::getCrossY(const cXyz&, float*) const { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F57C.s" +bool cM3dGPla::getCrossY(const cXyz& pPoint, f32* pOut) const { + if (fabsf(mNormal.y) < lbl_80451180) { + return false; + } else { + *pOut = (-mNormal.x * pPoint.x - mNormal.z * pPoint.z - mD) / mNormal.y; + return true; + } } // getCrossYLessD__8cM3dGPlaCFRC3VecPf -// cM3dGPla::getCrossYLessD(const Vec&, float*) const -asm bool cM3dGPla::getCrossYLessD(const Vec&, float*) const { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F5D4.s" +bool cM3dGPla::getCrossYLessD(const Vec& pPoint, f32* pOut) const { + if (fabsf(mNormal.y) < lbl_80451180) { + return false; + } else { + *pOut = (-mNormal.x * pPoint.x - mNormal.z * pPoint.z) / mNormal.y; + return true; + } } // Set__8cM3dGPlaFPC8cM3dGPla -// cM3dGPla::Set(const cM3dGPla*) -asm void cM3dGPla::Set(const cM3dGPla*) { - nofralloc -#include "SComponent/c_m3d_g_pla/asm/func_8026F624.s" +void cM3dGPla::Set(const cM3dGPla* pOther) { + *this = *pOther; } diff --git a/libs/SSystem/SComponent/c_m3d_g_sph.cpp b/libs/SSystem/SComponent/c_m3d_g_sph.cpp index 4098bcefc1..7f0883a636 100644 --- a/libs/SSystem/SComponent/c_m3d_g_sph.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_sph.cpp @@ -1,52 +1,47 @@ /* c_m3d_g_sph.cpp autogenerated by split.py v0.3 at 2021-01-01 14:53:31.074880 */ #include "SComponent/c_m3d_g_sph.h" +#include "SComponent/c_m3d.h" // SetC__8cM3dGSphFRC4cXyz -// cM3dGSph::SetC(const cXyz&) -asm void cM3dGSph::SetC(const cXyz&) { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F648.s" +void cM3dGSph::SetC(const cXyz& pCenter) { + mCenter = pCenter; } // Set__8cM3dGSphFRC4cXyzf -// cM3dGSph::Set(const cXyz&, float) -asm void cM3dGSph::Set(const cXyz&, float) { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F664.s" +void cM3dGSph::Set(const cXyz& pCenter, f32 pRadius) { + this->SetC(pCenter); + this->SetR(pRadius); } // Set__8cM3dGSphFRC9cM3dGSphS -// cM3dGSph::Set(const cM3dGSphS&) -asm void cM3dGSph::Set(const cM3dGSphS&) { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F6A8.s" +void cM3dGSph::Set(const cM3dGSphS& pOther) { + this->SetC(cXyz(pOther.mCenter)); + this->SetR(pOther.mRadius); } // SetR__8cM3dGSphFf -// cM3dGSph::SetR(float) -asm void cM3dGSph::SetR(float) { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F708.s" +void cM3dGSph::SetR(f32 pRadius) { + mRadius = pRadius; } // cross__8cM3dGSphCFPC8cM3dGSphP4cXyz -// cM3dGSph::cross(const cM3dGSph*, cXyz*) const -asm bool cM3dGSph::cross(const cM3dGSph*, cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F710.s" +bool cM3dGSph::cross(const cM3dGSph* pOther, cXyz* pOut) const { + return cM3d_Cross_SphSph(pOther, this, pOut); } // cross__8cM3dGSphCFPC8cM3dGCylP4cXyz -// cM3dGSph::cross(const cM3dGCyl*, cXyz*) const -asm bool cM3dGSph::cross(const cM3dGCyl*, cXyz*) const { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F73C.s" +bool cM3dGSph::cross(const cM3dGCyl* pCylinder, cXyz* pOut) const { + f32 f; + return cM3d_Cross_CylSph(pCylinder, this, pOut, &f); } // GetMinMaxCube__8cM3dGSphCFR4cXyzR4cXyz -// cM3dGSph::GetMinMaxCube(cXyz&, cXyz&) const -asm void cM3dGSph::GetMinMaxCube(cXyz&, cXyz&) const { - nofralloc -#include "SComponent/c_m3d_g_sph/asm/func_8026F76C.s" +void cM3dGSph::GetMinMaxCube(cXyz& pMin, cXyz& pMax) const { + pMin.x = mCenter.x - mRadius; + pMin.y = mCenter.y - mRadius; + pMin.z = mCenter.z - mRadius; + pMax.x = mCenter.x + mRadius; + pMax.y = mCenter.y + mRadius; + pMax.z = mCenter.z + mRadius; } diff --git a/libs/SSystem/SComponent/c_m3d_g_tri.cpp b/libs/SSystem/SComponent/c_m3d_g_tri.cpp index 3b51b1eddc..dc7162a756 100644 --- a/libs/SSystem/SComponent/c_m3d_g_tri.cpp +++ b/libs/SSystem/SComponent/c_m3d_g_tri.cpp @@ -1,31 +1,33 @@ /* c_m3d_g_tri.cpp autogenerated by split.py v0.3 at 2021-01-01 14:55:53.593962 */ #include "SComponent/c_m3d_g_tri.h" +#include "SComponent/c_m3d.h" // cross__8cM3dGTriCFPC8cM3dGCylP3Vec -// cM3dGTri::cross(const cM3dGCyl*, Vec*) const -asm bool cM3dGTri::cross(const cM3dGCyl*, Vec*) const { - nofralloc -#include "SComponent/c_m3d_g_tri/asm/func_8026F7B0.s" +bool cM3dGTri::cross(const cM3dGCyl* pCylinder, Vec* out) const { + return cM3d_Cross_CylTri(pCylinder, this, out); } // setPos__8cM3dGTriFPC3VecPC3VecPC3Vec -// cM3dGTri::setPos(const Vec*, const Vec*, const Vec*) -asm void cM3dGTri::setPos(const Vec*, const Vec*, const Vec*) { - nofralloc -#include "SComponent/c_m3d_g_tri/asm/func_8026F7DC.s" +void cM3dGTri::setPos(const Vec* pA, const Vec* pB, const Vec* pC) { + mA = *pA; + mB = *pB; + mC = *pC; + cM3d_CalcPla(&mA, &mB, &mC, &mPlane.mNormal, &mPlane.mD); } // setBg__8cM3dGTriFPC3VecPC3VecPC3VecPC8cM3dGPla -// cM3dGTri::setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*) -asm void cM3dGTri::setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*) { - nofralloc -#include "SComponent/c_m3d_g_tri/asm/func_8026F85C.s" +void cM3dGTri::setBg(const Vec* pA, const Vec* pB, const Vec* pC, const cM3dGPla* pPlane) { + mA = *pA; + mB = *pB; + mC = *pC; + mPlane.Set(pPlane); } // set__8cM3dGTriFPC3VecPC3VecPC3VecPC3Vec -// cM3dGTri::set(const Vec*, const Vec*, const Vec*, const Vec*) -asm void cM3dGTri::set(const Vec*, const Vec*, const Vec*, const Vec*) { - nofralloc -#include "SComponent/c_m3d_g_tri/asm/func_8026F8C8.s" +void cM3dGTri::set(const Vec* pA, const Vec* pB, const Vec* pC, const Vec* pNormal) { + mA = *pA; + mB = *pB; + mC = *pC; + mPlane.SetupNP(*pNormal, *pA); } diff --git a/libs/SSystem/SComponent/c_phase.cpp b/libs/SSystem/SComponent/c_phase.cpp index a815b2ab63..e9b498d2af 100644 --- a/libs/SSystem/SComponent/c_phase.cpp +++ b/libs/SSystem/SComponent/c_phase.cpp @@ -21,49 +21,43 @@ int cPhs_Compleate(request_of_phase_process_class* pPhase) { return cPhs_COMPLEATE_e; } -#if NON_MATCHING int cPhs_Next(request_of_phase_process_class* pPhase) { - // flow control - - if (pPhase->mpHandlerTable != NULL) { + if (const cPhs__Handler* handlerTable = pPhase->mpHandlerTable) { pPhase->mPhaseStep++; - cPhs__Handler pHandler = pPhase->mpHandlerTable[pPhase->mPhaseStep]; - if (pHandler == NULL) + cPhs__Handler handler = handlerTable[pPhase->mPhaseStep]; + + // Double null check here actually matters for emitted assembly. + // Wee old compilers. + if (handler == NULL || handler == NULL) { return cPhs_Compleate(pPhase); - else if (pHandler != NULL) + } else { return 1; + } } return cPhs_COMPLEATE_e; } -#else -asm int cPhs_Next(request_of_phase_process_class* pPhase) { - nofralloc -#include "SComponent/c_phase/asm/func_80266678.s" -} -#endif #if NON_MATCHING int cPhs_Do(request_of_phase_process_class* pPhase, void* pUserData) { - cPhs__Handler* pHandlerTable = pPhase->mpHandlerTable; - if (pHandlerTable != NULL) { + if (const cPhs__Handler* pHandlerTable = pPhase->mpHandlerTable) { // the load of pUserData seems to be slightly scrambled.. - int step = pPhase->mPhaseStep; - cPhs__Handler pHandler = pHandlerTable[step]; - int newStep = pHandler(pUserData); + const cPhs__Handler pHandler = pHandlerTable[pPhase->mPhaseStep]; + const int newStep = pHandler(pUserData); + switch (newStep) { case 1: return cPhs_Next(pPhase); case 2: { - int step2 = cPhs_Next(pPhase); + const int step2 = cPhs_Next(pPhase); return step2 == 1 ? 2 : cPhs_COMPLEATE_e; } + case cPhs_COMPLEATE_e: + return cPhs_Compleate(pPhase); case 3: { cPhs_UnCompleate(pPhase); return 3; } - case cPhs_COMPLEATE_e: - return cPhs_Compleate(pPhase); case cPhs_ERROR_e: cPhs_UnCompleate(pPhase); return cPhs_ERROR_e; diff --git a/libs/SSystem/SComponent/c_sxyz.cpp b/libs/SSystem/SComponent/c_sxyz.cpp index a1b6ac82c8..8ec5ea17ca 100644 --- a/libs/SSystem/SComponent/c_sxyz.cpp +++ b/libs/SSystem/SComponent/c_sxyz.cpp @@ -2,6 +2,9 @@ #include "SComponent/c_sxyz.h" +extern u8 lbl_804550A0; +extern u8 lbl_80430DA8; + // __ct__5csXyzFsss csXyz::csXyz(s16 pX, s16 pY, s16 pZ) { mX = pX; @@ -28,11 +31,11 @@ csXyz csXyz::operator-(csXyz& other) { // __ml__5csXyzFf #ifdef NON_MATCHING -csXyz csXyz::operator*(float pFactor) { +csXyz csXyz::operator*(f32 pFactor) { return csXyz(mX * pFactor, mY * pFactor, mZ * pFactor); } #else -asm csXyz csXyz::operator*(float) { +asm csXyz csXyz::operator*(f32) { nofralloc #include "SComponent/c_sxyz/asm/func_802674E8.s" } diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp index fa266902f8..3d398f6a97 100644 --- a/libs/SSystem/SComponent/c_xyz.cpp +++ b/libs/SSystem/SComponent/c_xyz.cpp @@ -17,7 +17,7 @@ cXyz cXyz::operator-(const Vec& vec) const { } // __ml__4cXyzCFf -cXyz cXyz::operator*(float scale) const { +cXyz cXyz::operator*(f32 scale) const { Vec ret; PSVECScale(this, &ret, scale); return cXyz(ret); @@ -37,7 +37,7 @@ cXyz cXyz::operator*(const Vec& vec) const { } // __dv__4cXyzCFf -cXyz cXyz::operator/(float scale) const { +cXyz cXyz::operator/(f32 scale) const { Vec ret; PSVECScale(this, &ret, /* 1.0 */ lbl_80455070 / scale); return cXyz(ret); @@ -90,12 +90,12 @@ cXyz cXyz::normZC(void) const { if (!local_40.checkEpsilon()) { cXyz ret; // ret.baseZ(); - float v = lbl_80455080; + f32 v = lbl_80455080; ret.x = v; ret.y = v; v = lbl_80455070; ret.z = v; - // should do a struct copy with word and not float loads + // should do a struct copy with word and not f32 loads vec = lbl_8039A868; vec = ret; } @@ -147,14 +147,14 @@ bool cXyz::operator!=(const Vec& vec) const { // isZero__4cXyzCFv bool cXyz::isZero(void) const { - // return (float)fabsf(this->x) < lbl_80455084 * lbl_80450AEC && - // (float)fabsf(this->y) < lbl_80455084 * lbl_80450AEC && - // (float)fabsf(this->z) < lbl_80455084 * lbl_80450AEC; - return (float)fabsf(this->x) < + // return (f32)fabsf(this->x) < lbl_80455084 * lbl_80450AEC && + // (f32)fabsf(this->y) < lbl_80455084 * lbl_80450AEC && + // (f32)fabsf(this->z) < lbl_80455084 * lbl_80450AEC; + return fabsf(this->x) < /* 32 */ lbl_80455084 * - /* MSL_C.PPCEABI.bare.H::__float_epsilon */ *(float*)0x80450AEC && - (float)fabsf(this->y) < lbl_80455084 * *(float*)0x80450AEC && - (float)fabsf(this->z) < lbl_80455084 * *(float*)0x80450AEC; + /* MSL_C.PPCEABI.bare.H::__f32_epsilon */ *(f32*)0x80450AEC && + fabsf(this->y) < lbl_80455084 * *(f32*)0x80450AEC && + fabsf(this->z) < lbl_80455084 * *(f32*)0x80450AEC; } // atan2sX_Z__4cXyzCFv diff --git a/libs/SSystem/SStandard/s_basic.cpp b/libs/SSystem/SStandard/s_basic.cpp index 4bf93c8658..b1a72c168b 100644 --- a/libs/SSystem/SStandard/s_basic.cpp +++ b/libs/SSystem/SStandard/s_basic.cpp @@ -1 +1,17 @@ -// ok +/* s_basic.cpp autogenerated by split.py v0.4 at 2021-01-26 08:03:35.809652 */ + +#include "SStandard/s_basic.h" + +// sBs_FillArea_s__FPvUls +void sBs_FillArea_s(void* pPtr, u32 pNumBytes, s16 pValue) { + s16* castPtr = (s16*)pPtr; + for (int i = 0; i < pNumBytes / 2; i++) { + *castPtr = pValue; + castPtr++; + } +} + +// sBs_ClearArea__FPvUl +void sBs_ClearArea(void* pPtr, u32 pNumBytes) { + sBs_FillArea_s(pPtr, pNumBytes, 0); +} diff --git a/obj_files.mk b/obj_files.mk index 2239597f1d..47ad894829 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -10,616 +10,1097 @@ EXTABINDEX_O_FILES := \ $(BUILD_DIR)/asm/extabindex.o TEXT_O_FILES := \ - $(BUILD_DIR)/src/m_Do/m_Do_main.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_printf.o \ - $(BUILD_DIR)/src/m_Do/m_Do_audio.o \ - $(BUILD_DIR)/src/m_Do/m_Do_controller_pad.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_graphic.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_machine.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_mtx.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_ext.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_lib.o \ - $(BUILD_DIR)/src/m_Do/m_Do_Reset.o \ - $(BUILD_DIR)/asm/m/Do/dvd/m_Do_dvd_thread.o \ - $(BUILD_DIR)/src/m_Do/m_Do_DVDError.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_MemCard.o \ - $(BUILD_DIR)/asm/m/Do/m_Do_MemCardRWmng.o \ - $(BUILD_DIR)/asm/m/Do/machine/m_Do_machine_exception.o \ - $(BUILD_DIR)/asm/c/c_damagereaction.o \ - $(BUILD_DIR)/asm/c/c_dylink.o \ - $(BUILD_DIR)/asm/f/ap/f_ap_game.o \ - $(BUILD_DIR)/asm/f/op/f_op_actor.o \ - $(BUILD_DIR)/asm/f/op/actor/f_op_actor_iter.o \ - $(BUILD_DIR)/src/f/f_op/f_op_actor_tag.o \ - $(BUILD_DIR)/asm/f/op/actor/f_op_actor_mng.o \ - $(BUILD_DIR)/asm/f/op/f_op_camera.o \ - $(BUILD_DIR)/asm/f/op/camera/f_op_camera_mng.o \ - $(BUILD_DIR)/asm/f/op/f_op_overlap.o \ - $(BUILD_DIR)/asm/f/op/overlap/f_op_overlap_mng.o \ - $(BUILD_DIR)/asm/f/op/overlap/f_op_overlap_req.o \ - $(BUILD_DIR)/asm/f/op/f_op_scene.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_iter.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_mng.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_req.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_tag.o \ - $(BUILD_DIR)/asm/f/op/f_op_view.o \ - $(BUILD_DIR)/asm/f/op/f_op_kankyo.o \ - $(BUILD_DIR)/asm/f/op/f_op_msg.o \ - $(BUILD_DIR)/asm/f/op/kankyo/f_op_kankyo_mng.o \ - $(BUILD_DIR)/asm/f/op/msg/f_op_msg_mng.o \ - $(BUILD_DIR)/asm/f/op/draw/f_op_draw_iter.o \ - $(BUILD_DIR)/asm/f/op/draw/f_op_draw_tag.o \ - $(BUILD_DIR)/asm/f/op/scene/f_op_scene_pause.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_base.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_create_iter.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_create_req.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_create_tag.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_creator.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_delete_tag.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_deletor.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_draw_priority.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_executor.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_layer.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_leaf.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_layer_iter.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_layer_tag.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_line.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_load.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_manager.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_method.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_node.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_node_req.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_priority.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_profile.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_searcher.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_line_tag.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_line_iter.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_method_iter.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_method_tag.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_pause.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_draw.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_fstcreate_req.o \ - $(BUILD_DIR)/src/f/f_pc/f_pc_stdcreate_req.o \ - $(BUILD_DIR)/src/d/d_stage.o \ - $(BUILD_DIR)/asm/d/d_map.o \ - $(BUILD_DIR)/src/d/d_com/d_com_inf_game.o \ - $(BUILD_DIR)/asm/d/com/d_com_static.o \ - $(BUILD_DIR)/src/d/d_bomb.o \ - $(BUILD_DIR)/src/d/d_lib.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_main.o \ + $(BUILD_DIR)/src/m_Do/m_Do_main.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_printf.o \ + $(BUILD_DIR)/src/m_Do/m_Do_printf.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_printf.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_audio.o \ + $(BUILD_DIR)/src/m_Do/m_Do_audio.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_controller_pad.o \ + $(BUILD_DIR)/src/m_Do/m_Do_controller_pad.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_graphic.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_graphic.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_graphic.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_machine.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_machine.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_machine.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_mtx.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_mtx.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_ext.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_ext.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_ext.o \ + $(BUILD_DIR)/asm/sdata2/m_Do_lib.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_lib.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_Reset.o \ + $(BUILD_DIR)/src/m_Do/m_Do_Reset.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_dvd_thread.o \ + $(BUILD_DIR)/asm/m/Do/dvd/m_Do_dvd_thread.o \ + $(BUILD_DIR)/src/m_Do/m_Do_DVDError.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_MemCard.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_MemCard.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_MemCardRWmng.o \ + $(BUILD_DIR)/asm/m/Do/m_Do_MemCardRWmng.o \ + $(BUILD_DIR)/asm/rodata/rodata_m_Do_machine_exception.o \ + $(BUILD_DIR)/asm/m/Do/machine/m_Do_machine_exception.o \ + $(BUILD_DIR)/asm/sdata2/c_damagereaction.o \ + $(BUILD_DIR)/asm/c/c_damagereaction.o \ + $(BUILD_DIR)/asm/rodata/rodata_c_dylink.o \ + $(BUILD_DIR)/asm/c/c_dylink.o \ + $(BUILD_DIR)/asm/sdata2/f_ap_game.o \ + $(BUILD_DIR)/asm/f/ap/f_ap_game.o \ + $(BUILD_DIR)/asm/rodata/rodata_f_op_actor.o \ + $(BUILD_DIR)/asm/sdata2/f_op_actor.o \ + $(BUILD_DIR)/asm/f/op/f_op_actor.o \ + $(BUILD_DIR)/asm/f/op/actor/f_op_actor_iter.o \ + $(BUILD_DIR)/src/f/f_op/f_op_actor_tag.o \ + $(BUILD_DIR)/asm/rodata/rodata_f_op_actor_mng.o \ + $(BUILD_DIR)/asm/sdata2/f_op_actor_mng.o \ + $(BUILD_DIR)/asm/f/op/actor/f_op_actor_mng.o \ + $(BUILD_DIR)/asm/f/op/f_op_camera.o \ + $(BUILD_DIR)/asm/f/op/camera/f_op_camera_mng.o \ + $(BUILD_DIR)/asm/f/op/f_op_overlap.o \ + $(BUILD_DIR)/asm/f/op/overlap/f_op_overlap_mng.o \ + $(BUILD_DIR)/asm/f/op/overlap/f_op_overlap_req.o \ + $(BUILD_DIR)/asm/f/op/f_op_scene.o \ + $(BUILD_DIR)/asm/f/op/scene/f_op_scene_iter.o \ + $(BUILD_DIR)/asm/f/op/scene/f_op_scene_mng.o \ + $(BUILD_DIR)/asm/f/op/scene/f_op_scene_req.o \ + $(BUILD_DIR)/asm/f/op/scene/f_op_scene_tag.o \ + $(BUILD_DIR)/asm/f/op/f_op_view.o \ + $(BUILD_DIR)/asm/f/op/f_op_kankyo.o \ + $(BUILD_DIR)/asm/f/op/f_op_msg.o \ + $(BUILD_DIR)/asm/sdata2/f_op_kankyo_mng.o \ + $(BUILD_DIR)/asm/f/op/kankyo/f_op_kankyo_mng.o \ + $(BUILD_DIR)/asm/sdata2/f_op_msg_mng.o \ + $(BUILD_DIR)/asm/f/op/msg/f_op_msg_mng.o \ + $(BUILD_DIR)/asm/f/op/draw/f_op_draw_iter.o \ + $(BUILD_DIR)/asm/f/op/draw/f_op_draw_tag.o \ + $(BUILD_DIR)/asm/f/op/scene/f_op_scene_pause.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_base.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_create_iter.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_create_req.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_create_tag.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_creator.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_delete_tag.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_deletor.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_draw_priority.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_executor.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_layer.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_leaf.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_layer_iter.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_layer_tag.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_line.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_load.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_manager.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_method.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_node.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_node_req.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_priority.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_profile.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_searcher.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_line_tag.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_line_iter.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_method_iter.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_method_tag.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_pause.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_draw.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_fstcreate_req.o \ + $(BUILD_DIR)/src/f/f_pc/f_pc_stdcreate_req.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_stage.o \ + $(BUILD_DIR)/asm/sdata2/d_stage.o \ + $(BUILD_DIR)/src/d/d_stage.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_map.o \ + $(BUILD_DIR)/asm/sdata2/d_map.o \ + $(BUILD_DIR)/asm/d/d_map.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_com_inf_game.o \ + $(BUILD_DIR)/asm/sdata2/d_com_inf_game.o \ + $(BUILD_DIR)/src/d/d_com/d_com_inf_game.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_com_static.o \ + $(BUILD_DIR)/asm/sdata2/d_com_static.o \ + $(BUILD_DIR)/asm/d/com/d_com_static.o \ + $(BUILD_DIR)/src/d/d_bomb.o \ + $(BUILD_DIR)/src/d/d_lib.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_save.o \ + $(BUILD_DIR)/asm/sdata2/d_save.o \ $(BUILD_DIR)/src/d/d_save/d_save.o \ - $(BUILD_DIR)/src/d/d_save/d_save_init.o \ - $(BUILD_DIR)/asm/d/jnt/d_jnt_col.o \ - $(BUILD_DIR)/asm/d/a/d_a_obj.o \ - $(BUILD_DIR)/asm/d/a/itembase/d_a_itembase_static.o \ - $(BUILD_DIR)/src/d/d_a/d_a_item_static.o \ - $(BUILD_DIR)/asm/d/a/shop/item/d_a_shop_item_static.o \ - $(BUILD_DIR)/src/d/d_a/d_a_horse_static.o \ - $(BUILD_DIR)/asm/d/d_demo.o \ - $(BUILD_DIR)/asm/d/door/d_door_param2.o \ - $(BUILD_DIR)/asm/d/d_resorce.o \ - $(BUILD_DIR)/asm/d/map/d_map_path.o \ - $(BUILD_DIR)/asm/d/map/path/d_map_path_fmap.o \ - $(BUILD_DIR)/asm/d/map/path/d_map_path_dmap.o \ - $(BUILD_DIR)/asm/d/d_event.o \ - $(BUILD_DIR)/asm/d/event/d_event_data.o \ - $(BUILD_DIR)/asm/d/event/d_event_manager.o \ - $(BUILD_DIR)/asm/d/event/d_event_lib.o \ - $(BUILD_DIR)/asm/d/simple/d_simple_model.o \ - $(BUILD_DIR)/asm/d/d_particle.o \ - $(BUILD_DIR)/asm/d/particle/d_particle_copoly.o \ - $(BUILD_DIR)/asm/d/d_path.o \ - $(BUILD_DIR)/asm/d/d_drawlist.o \ - $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_data.o \ - $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_wether.o \ - $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_rain.o \ - $(BUILD_DIR)/asm/d/d_vibration.o \ - $(BUILD_DIR)/src/d/d_attention.o \ - $(BUILD_DIR)/asm/d/bg/d_bg_pc.o \ - $(BUILD_DIR)/asm/d/bg/d_bg_plc.o \ - $(BUILD_DIR)/asm/d/bg/d_bg_s.o \ - $(BUILD_DIR)/asm/d/bg/s/d_bg_s_acch.o \ - $(BUILD_DIR)/asm/d/bg/s/d_bg_s_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/gnd/d_bg_s_gnd_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/lin/d_bg_s_lin_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/movebg/d_bg_s_movebg_actor.o \ - $(BUILD_DIR)/asm/d/bg/s/sph/d_bg_s_sph_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.o \ - $(BUILD_DIR)/src/d/d_bg/d_bg_s_poly_pass_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/roof/d_bg_s_roof_chk.o \ - $(BUILD_DIR)/asm/d/bg/s/wtr/d_bg_s_wtr_chk.o \ - $(BUILD_DIR)/asm/d/bg/d_bg_w.o \ - $(BUILD_DIR)/asm/d/bg/w/d_bg_w_base.o \ - $(BUILD_DIR)/asm/d/bg/w/d_bg_w_kcol.o \ - $(BUILD_DIR)/asm/d/bg/w/d_bg_w_sv.o \ - $(BUILD_DIR)/asm/d/cc/d_cc_d.o \ - $(BUILD_DIR)/asm/d/cc/mass/d_cc_mass_s.o \ - $(BUILD_DIR)/asm/d/cc/d_cc_s.o \ - $(BUILD_DIR)/asm/d/cc/d_cc_uty.o \ - $(BUILD_DIR)/asm/d/cam/d_cam_param.o \ - $(BUILD_DIR)/asm/d/ev/d_ev_camera.o \ - $(BUILD_DIR)/asm/d/spline/d_spline_path.o \ - $(BUILD_DIR)/src/d/d_item/d_item.o \ - $(BUILD_DIR)/asm/d/d_tresure.o \ - $(BUILD_DIR)/asm/d/d_model.o \ - $(BUILD_DIR)/asm/d/eye/d_eye_hl.o \ - $(BUILD_DIR)/asm/d/error/d_error_msg.o \ - $(BUILD_DIR)/src/d/d_a/d_a_alink.o \ - $(BUILD_DIR)/asm/d/a/d_a_itembase.o \ - $(BUILD_DIR)/asm/d/a/no/chg/d_a_no_chg_room.o \ - $(BUILD_DIR)/asm/d/a/d_a_npc.o \ - $(BUILD_DIR)/asm/d/a/npc/d_a_npc_cd.o \ - $(BUILD_DIR)/asm/d/a/npc/d_a_npc_cd2.o \ - $(BUILD_DIR)/asm/d/a/obj/d_a_obj_item.o \ - $(BUILD_DIR)/asm/d/d_insect.o \ - $(BUILD_DIR)/asm/d/a/obj/ss/d_a_obj_ss_base.o \ - $(BUILD_DIR)/asm/d/a/d_a_player.o \ - $(BUILD_DIR)/src/d/d_camera.o \ - $(BUILD_DIR)/asm/d/d_envse.o \ - $(BUILD_DIR)/asm/d/file/d_file_select.o \ - $(BUILD_DIR)/asm/d/file/sel/d_file_sel_warning.o \ - $(BUILD_DIR)/src/d/d_file/d_file_sel_info.o \ - $(BUILD_DIR)/asm/d/bright/d_bright_check.o \ - $(BUILD_DIR)/asm/d/d_scope.o \ - $(BUILD_DIR)/asm/d/select/d_select_cursor.o \ - $(BUILD_DIR)/asm/d/select/d_select_icon.o \ - $(BUILD_DIR)/asm/d/shop/d_shop_camera.o \ - $(BUILD_DIR)/asm/d/shop/item/d_shop_item_ctrl.o \ - $(BUILD_DIR)/asm/d/shop/d_shop_system.o \ - $(BUILD_DIR)/asm/d/d_gameover.o \ - $(BUILD_DIR)/src/d/d_kankyo.o \ - $(BUILD_DIR)/asm/d/d_kyeff.o \ - $(BUILD_DIR)/asm/d/d_kyeff2.o \ - $(BUILD_DIR)/asm/d/ky/d_ky_thunder.o \ - $(BUILD_DIR)/src/d/d_kantera_icon_meter.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_calibration.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_collect.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_dmap.o \ - $(BUILD_DIR)/asm/d/menu/dmap/d_menu_dmap_map.o \ - $(BUILD_DIR)/asm/d/menu/map/d_menu_map_common.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_fishing.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_fmap.o \ - $(BUILD_DIR)/asm/d/menu/fmap/d_menu_fmap_map.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_fmap2D.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_insect.o \ - $(BUILD_DIR)/asm/d/menu/item/d_menu_item_explain.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_letter.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_option.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_ring.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_save.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_skill.o \ - $(BUILD_DIR)/asm/d/menu/window/d_menu_window_HIO.o \ - $(BUILD_DIR)/asm/d/menu/d_menu_window.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_HIO.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_button.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_haihai.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_hakusha.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_map.o \ - $(BUILD_DIR)/src/d/d_meter/d_meter_string.o \ - $(BUILD_DIR)/src/d/d_meter2/d_meter2_draw.o \ - $(BUILD_DIR)/src/d/d_meter2/d_meter2_info.o \ - $(BUILD_DIR)/src/d/d_meter2.o \ - $(BUILD_DIR)/asm/d/msg/out/d_msg_out_font.o \ - $(BUILD_DIR)/asm/d/msg/d_msg_class.o \ - $(BUILD_DIR)/asm/d/msg/d_msg_object.o \ - $(BUILD_DIR)/asm/d/msg/d_msg_unit.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_3select.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_arrow.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_base.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_boss.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_explain.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_item.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_howl.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_jimaku.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_kanban.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_light.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_place.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_staff.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_talk.o \ - $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_tree.o \ - $(BUILD_DIR)/asm/d/msg/string/d_msg_string_base.o \ - $(BUILD_DIR)/asm/d/msg/d_msg_string.o \ - $(BUILD_DIR)/asm/d/msg/d_msg_flow.o \ - $(BUILD_DIR)/asm/d/d_name.o \ - $(BUILD_DIR)/asm/d/npc/d_npc_lib.o \ - $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade.o \ - $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade2.o \ - $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade3.o \ - $(BUILD_DIR)/asm/d/pane/d_pane_class.o \ - $(BUILD_DIR)/asm/d/pane/class/d_pane_class_alpha.o \ - $(BUILD_DIR)/asm/d/pane/class/d_pane_class_ex.o \ - $(BUILD_DIR)/asm/d/s/d_s_logo.o \ - $(BUILD_DIR)/asm/d/s/d_s_name.o \ - $(BUILD_DIR)/asm/d/s/d_s_play.o \ - $(BUILD_DIR)/asm/d/s/d_s_room.o \ - $(BUILD_DIR)/src/d/d_save/d_save_HIO.o \ - $(BUILD_DIR)/asm/d/save/d_save_HIO.o \ - $(BUILD_DIR)/asm/d/d_timer.o \ - $(BUILD_DIR)/asm/d/k/d_k_wmark.o \ - $(BUILD_DIR)/asm/d/k/d_k_wpillar.o \ - $(BUILD_DIR)/asm/DynamicLink.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_malloc.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_API_controller_pad.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_API_graphic.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_cc_d.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_cc_s.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_counter.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_list.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_list_iter.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_node.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_node_iter.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_tree.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_tree_iter.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_phase.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_request.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_tag.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_tag_iter.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_xyz.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_sxyz.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_math.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_chk.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_gnd_chk.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_lin_chk.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_shdw_draw.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_poly_info.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_w.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m2d.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_aab.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cir.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cps.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cyl.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_lin.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_pla.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_sph.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_tri.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_lib.o \ - $(BUILD_DIR)/libs/SSystem/SComponent/c_angle.o \ - $(BUILD_DIR)/asm/SStandard/s/s_basic.o \ - $(BUILD_DIR)/asm/JFramework/JFWSystem.o \ - $(BUILD_DIR)/asm/JFramework/JFWDisplay.o \ - $(BUILD_DIR)/asm/J3DU/J3DUClipper.o \ - $(BUILD_DIR)/asm/J3DU/J3DUDL.o \ - $(BUILD_DIR)/asm/JParticle/JPAResourceManager.o \ - $(BUILD_DIR)/asm/JParticle/JPAResource.o \ - $(BUILD_DIR)/asm/JParticle/JPABaseShape.o \ - $(BUILD_DIR)/asm/JParticle/JPAExtraShape.o \ - $(BUILD_DIR)/asm/JParticle/JPAChildShape.o \ - $(BUILD_DIR)/asm/JParticle/JPAExTexShape.o \ - $(BUILD_DIR)/asm/JParticle/JPADynamicsBlock.o \ - $(BUILD_DIR)/asm/JParticle/JPAFieldBlock.o \ - $(BUILD_DIR)/asm/JParticle/JPAKeyBlock.o \ - $(BUILD_DIR)/asm/JParticle/JPATexture.o \ - $(BUILD_DIR)/asm/JParticle/JPAResourceLoader.o \ - $(BUILD_DIR)/asm/JParticle/JPAEmitterManager.o \ - $(BUILD_DIR)/asm/JParticle/JPAEmitter.o \ - $(BUILD_DIR)/asm/JParticle/JPAParticle.o \ - $(BUILD_DIR)/asm/JParticle/JPAMath.o \ - $(BUILD_DIR)/asm/JStage/JSGActor.o \ - $(BUILD_DIR)/asm/JStage/JSGAmbientLight.o \ - $(BUILD_DIR)/asm/JStage/JSGCamera.o \ - $(BUILD_DIR)/asm/JStage/JSGFog.o \ - $(BUILD_DIR)/asm/JStage/JSGLight.o \ - $(BUILD_DIR)/asm/JStage/JSGObject.o \ - $(BUILD_DIR)/asm/JStage/JSGSystem.o \ - $(BUILD_DIR)/asm/JStudio/ctb.o \ - $(BUILD_DIR)/libs/JSystem/JStudio/functionvalue.o \ - $(BUILD_DIR)/asm/JStudio/functionvalue.o \ - $(BUILD_DIR)/libs/JSystem/JStudio/fvb.o \ - $(BUILD_DIR)/asm/JStudio/fvb.o \ - $(BUILD_DIR)/asm/JStudio/fvb-data-parse.o \ - $(BUILD_DIR)/asm/JStudio/jstudio-control.o \ - $(BUILD_DIR)/asm/JStudio/jstudio-math.o \ - $(BUILD_DIR)/asm/JStudio/jstudio-object.o \ - $(BUILD_DIR)/asm/JStudio/object-id.o \ - $(BUILD_DIR)/libs/JSystem/JStudio/stb.o \ - $(BUILD_DIR)/asm/JStudio/stb-data-parse.o \ - $(BUILD_DIR)/asm/JStudio_JStage/control.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object-actor.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object-ambientlight.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object-camera.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object-fog.o \ - $(BUILD_DIR)/asm/JStudio_JStage/object-light.o \ - $(BUILD_DIR)/asm/JStudio_JAudio2/control.o \ - $(BUILD_DIR)/asm/JStudio_JAudio2/object-sound.o \ - $(BUILD_DIR)/asm/JStudio_JParticle/control.o \ - $(BUILD_DIR)/asm/JStudio_JParticle/object-particle.o \ - $(BUILD_DIR)/asm/JAudio2/JASCalc.o \ - $(BUILD_DIR)/asm/JAudio2/JASTaskThread.o \ - $(BUILD_DIR)/asm/JAudio2/JASDvdThread.o \ - $(BUILD_DIR)/asm/JAudio2/JASCallback.o \ - $(BUILD_DIR)/asm/JAudio2/JASHeapCtrl.o \ - $(BUILD_DIR)/asm/JAudio2/JASResArcLoader.o \ - $(BUILD_DIR)/asm/JAudio2/JASProbe.o \ - $(BUILD_DIR)/asm/JAudio2/JASReport.o \ - $(BUILD_DIR)/asm/JAudio2/JASCmdStack.o \ - $(BUILD_DIR)/asm/JAudio2/JASTrack.o \ - $(BUILD_DIR)/asm/JAudio2/JASTrackPort.o \ - $(BUILD_DIR)/asm/JAudio2/JASRegisterParam.o \ - $(BUILD_DIR)/asm/JAudio2/JASSeqCtrl.o \ - $(BUILD_DIR)/asm/JAudio2/JASSeqParser.o \ - $(BUILD_DIR)/asm/JAudio2/JASSeqReader.o \ - $(BUILD_DIR)/asm/JAudio2/JASAramStream.o \ - $(BUILD_DIR)/asm/JAudio2/JASBank.o \ - $(BUILD_DIR)/asm/JAudio2/JASBasicBank.o \ - $(BUILD_DIR)/asm/JAudio2/JASVoiceBank.o \ - $(BUILD_DIR)/asm/JAudio2/JASBasicInst.o \ - $(BUILD_DIR)/asm/JAudio2/JASDrumSet.o \ - $(BUILD_DIR)/asm/JAudio2/JASBasicWaveBank.o \ - $(BUILD_DIR)/asm/JAudio2/JASSimpleWaveBank.o \ - $(BUILD_DIR)/asm/JAudio2/JASWSParser.o \ - $(BUILD_DIR)/asm/JAudio2/JASBNKParser.o \ - $(BUILD_DIR)/asm/JAudio2/JASWaveArcLoader.o \ - $(BUILD_DIR)/asm/JAudio2/JASChannel.o \ - $(BUILD_DIR)/asm/JAudio2/JASLfo.o \ - $(BUILD_DIR)/asm/JAudio2/JASOscillator.o \ - $(BUILD_DIR)/asm/JAudio2/JASAiCtrl.o \ - $(BUILD_DIR)/asm/JAudio2/JASAudioThread.o \ - $(BUILD_DIR)/asm/JAudio2/JASAudioReseter.o \ - $(BUILD_DIR)/asm/JAudio2/JASDSPChannel.o \ - $(BUILD_DIR)/asm/JAudio2/JASDSPInterface.o \ - $(BUILD_DIR)/asm/JAudio2/JASDriverIF.o \ - $(BUILD_DIR)/asm/JAudio2/JASSoundParams.o \ - $(BUILD_DIR)/asm/JAudio2/dspproc.o \ - $(BUILD_DIR)/asm/JAudio2/dsptask.o \ - $(BUILD_DIR)/asm/JAudio2/osdsp.o \ - $(BUILD_DIR)/asm/JAudio2/osdsp/osdsp_task.o \ - $(BUILD_DIR)/asm/JAudio2/JAIAudible.o \ - $(BUILD_DIR)/asm/JAudio2/JAIAudience.o \ - $(BUILD_DIR)/asm/JAudio2/JAISe.o \ - $(BUILD_DIR)/asm/JAudio2/JAISeMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAISeq.o \ - $(BUILD_DIR)/asm/JAudio2/JAISeqDataMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAISeqMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAISound.o \ - $(BUILD_DIR)/asm/JAudio2/JAISoundChild.o \ - $(BUILD_DIR)/asm/JAudio2/JAISoundHandles.o \ - $(BUILD_DIR)/asm/JAudio2/JAISoundInfo.o \ - $(BUILD_DIR)/asm/JAudio2/JAISoundParams.o \ - $(BUILD_DIR)/asm/JAudio2/JAISoundStarter.o \ - $(BUILD_DIR)/asm/JAudio2/JAIStream.o \ - $(BUILD_DIR)/asm/JAudio2/JAIStreamDataMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAIStreamMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAUAudioArcInterpreter.o \ - $(BUILD_DIR)/asm/JAudio2/JAUAudioArcLoader.o \ - $(BUILD_DIR)/asm/JAudio2/JAUAudioMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAUBankTable.o \ - $(BUILD_DIR)/libs/JSystem/JAudio2/JAUClusterSound.o \ - $(BUILD_DIR)/asm/JAudio2/JAUInitializer.o \ - $(BUILD_DIR)/asm/JAudio2/JAUSectionHeap.o \ - $(BUILD_DIR)/asm/JAudio2/JAUSeqCollection.o \ - $(BUILD_DIR)/asm/JAudio2/JAUSeqDataBlockMgr.o \ - $(BUILD_DIR)/asm/JAudio2/JAUSoundAnimator.o \ - $(BUILD_DIR)/asm/JAudio2/JAUSoundTable.o \ - $(BUILD_DIR)/asm/JAudio2/JAUStreamFileTable.o \ - $(BUILD_DIR)/asm/JMessage/control.o \ - $(BUILD_DIR)/asm/JMessage/processor.o \ - $(BUILD_DIR)/asm/JMessage/resource.o \ - $(BUILD_DIR)/asm/JMessage/locale.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2Calc.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioArcLoader.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundStarter.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundHandles.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SeMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SeqMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2StatusMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SceneMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2FxLineMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundInfo.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2Audience.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundObject.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundObjMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2Creature.o \ + $(BUILD_DIR)/src/d/d_save/d_save_init.o \ + $(BUILD_DIR)/asm/sdata2/d_jnt_col.o \ + $(BUILD_DIR)/asm/d/jnt/d_jnt_col.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_obj.o \ + $(BUILD_DIR)/asm/sdata2/d_a_obj.o \ + $(BUILD_DIR)/asm/d/a/d_a_obj.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_itembase_static.o \ + $(BUILD_DIR)/asm/d/a/itembase/d_a_itembase_static.o \ + $(BUILD_DIR)/src/d/d_a/d_a_item_static.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_shop_item_static.o \ + $(BUILD_DIR)/asm/d/a/shop/item/d_a_shop_item_static.o \ + $(BUILD_DIR)/src/d/d_a/d_a_horse_static.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_demo.o \ + $(BUILD_DIR)/asm/sdata2/d_demo.o \ + $(BUILD_DIR)/asm/d/d_demo.o \ + $(BUILD_DIR)/asm/d/door/d_door_param2.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_resorce.o \ + $(BUILD_DIR)/asm/sdata2/d_resorce.o \ + $(BUILD_DIR)/asm/d/d_resorce.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_map_path.o \ + $(BUILD_DIR)/asm/sdata2/d_map_path.o \ + $(BUILD_DIR)/asm/d/map/d_map_path.o \ + $(BUILD_DIR)/asm/sdata2/d_map_path_fmap.o \ + $(BUILD_DIR)/asm/d/map/path/d_map_path_fmap.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_map_path_dmap.o \ + $(BUILD_DIR)/asm/sdata2/d_map_path_dmap.o \ + $(BUILD_DIR)/asm/d/map/path/d_map_path_dmap.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_event.o \ + $(BUILD_DIR)/asm/sdata2/d_event.o \ + $(BUILD_DIR)/asm/d/d_event.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_event_data.o \ + $(BUILD_DIR)/asm/sdata2/d_event_data.o \ + $(BUILD_DIR)/asm/d/event/d_event_data.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_event_manager.o \ + $(BUILD_DIR)/asm/sdata2/d_event_manager.o \ + $(BUILD_DIR)/asm/d/event/d_event_manager.o \ + $(BUILD_DIR)/asm/d/event/d_event_lib.o \ + $(BUILD_DIR)/asm/sdata2/d_simple_model.o \ + $(BUILD_DIR)/asm/d/simple/d_simple_model.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_particle.o \ + $(BUILD_DIR)/asm/sdata2/d_particle.o \ + $(BUILD_DIR)/asm/d/d_particle.o \ + $(BUILD_DIR)/asm/sdata2/d_particle_copoly.o \ + $(BUILD_DIR)/asm/d/particle/d_particle_copoly.o \ + $(BUILD_DIR)/asm/sdata2/d_path.o \ + $(BUILD_DIR)/asm/d/d_path.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_drawlist.o \ + $(BUILD_DIR)/asm/sdata2/d_drawlist.o \ + $(BUILD_DIR)/asm/d/d_drawlist.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kankyo_data.o \ + $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_data.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kankyo_wether.o \ + $(BUILD_DIR)/asm/sdata2/d_kankyo_wether.o \ + $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_wether.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kankyo_rain.o \ + $(BUILD_DIR)/asm/sdata2/d_kankyo_rain.o \ + $(BUILD_DIR)/src/d/d_kankyo/d_kankyo_rain.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_vib_pattern.o \ + $(BUILD_DIR)/asm/sdata2/d_vibration.o \ + $(BUILD_DIR)/asm/d/d_vibration.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_attention.o \ + $(BUILD_DIR)/asm/sdata2/d_attention.o \ + $(BUILD_DIR)/src/d/d_attention.o \ + $(BUILD_DIR)/asm/d/bg/d_bg_pc.o \ + $(BUILD_DIR)/asm/d/bg/d_bg_plc.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_s.o \ + $(BUILD_DIR)/asm/d/bg/d_bg_s.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_s_acch.o \ + $(BUILD_DIR)/asm/d/bg/s/d_bg_s_acch.o \ + $(BUILD_DIR)/asm/d/bg/s/d_bg_s_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/gnd/d_bg_s_gnd_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/grp/pass/d_bg_s_grp_pass_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/lin/d_bg_s_lin_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/movebg/d_bg_s_movebg_actor.o \ + $(BUILD_DIR)/asm/d/bg/s/sph/d_bg_s_sph_chk.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_s_spl_grp_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/spl/grp/d_bg_s_spl_grp_chk.o \ + $(BUILD_DIR)/src/d/d_bg/d_bg_s_poly_pass_chk.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_s_roof_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/roof/d_bg_s_roof_chk.o \ + $(BUILD_DIR)/asm/d/bg/s/wtr/d_bg_s_wtr_chk.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_w.o \ + $(BUILD_DIR)/asm/d/bg/d_bg_w.o \ + $(BUILD_DIR)/asm/d/bg/w/d_bg_w_base.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_w_kcol.o \ + $(BUILD_DIR)/asm/d/bg/w/d_bg_w_kcol.o \ + $(BUILD_DIR)/asm/sdata2/d_bg_w_sv.o \ + $(BUILD_DIR)/asm/d/bg/w/d_bg_w_sv.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_cc_d.o \ + $(BUILD_DIR)/asm/d/cc/d_cc_d.o \ + $(BUILD_DIR)/asm/sdata2/d_cc_mass_s.o \ + $(BUILD_DIR)/asm/d/cc/mass/d_cc_mass_s.o \ + $(BUILD_DIR)/asm/sdata2/d_cc_s.o \ + $(BUILD_DIR)/asm/d/cc/d_cc_s.o \ + $(BUILD_DIR)/asm/sdata2/d_cc_uty.o \ + $(BUILD_DIR)/asm/d/cc/d_cc_uty.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_cam_param.o \ + $(BUILD_DIR)/asm/sdata2/d_cam_param.o \ + $(BUILD_DIR)/asm/d/cam/d_cam_param.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_ev_camera.o \ + $(BUILD_DIR)/asm/sdata2/d_ev_camera.o \ + $(BUILD_DIR)/asm/d/ev/d_ev_camera.o \ + $(BUILD_DIR)/asm/sdata2/d_spline_path.o \ + $(BUILD_DIR)/asm/d/spline/d_spline_path.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_item_data.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_item.o \ + $(BUILD_DIR)/asm/sdata2/d_item.o \ + $(BUILD_DIR)/src/d/d_item/d_item.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_tresure.o \ + $(BUILD_DIR)/asm/sdata2/d_tresure.o \ + $(BUILD_DIR)/asm/d/d_tresure.o \ + $(BUILD_DIR)/asm/d/d_model.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_eye_hl.o \ + $(BUILD_DIR)/asm/sdata2/d_eye_hl.o \ + $(BUILD_DIR)/asm/d/eye/d_eye_hl.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_error_msg.o \ + $(BUILD_DIR)/asm/sdata2/d_error_msg.o \ + $(BUILD_DIR)/asm/d/error/d_error_msg.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_alink.o \ + $(BUILD_DIR)/asm/sdata2/d_a_alink.o \ + $(BUILD_DIR)/src/d/d_a/d_a_alink.o \ + $(BUILD_DIR)/asm/sdata2/d_a_itembase.o \ + $(BUILD_DIR)/asm/d/a/d_a_itembase.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_no_chg_room.o \ + $(BUILD_DIR)/asm/sdata2/d_a_no_chg_room.o \ + $(BUILD_DIR)/asm/d/a/no/chg/d_a_no_chg_room.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_npc.o \ + $(BUILD_DIR)/asm/sdata2/d_a_npc.o \ + $(BUILD_DIR)/asm/d/a/d_a_npc.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_npc_cd.o \ + $(BUILD_DIR)/asm/sdata2/d_a_npc_cd.o \ + $(BUILD_DIR)/asm/d/a/npc/d_a_npc_cd.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_npc_cd2.o \ + $(BUILD_DIR)/asm/sdata2/d_a_npc_cd2.o \ + $(BUILD_DIR)/asm/d/a/npc/d_a_npc_cd2.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_obj_item.o \ + $(BUILD_DIR)/asm/sdata2/d_a_obj_item.o \ + $(BUILD_DIR)/asm/d/a/obj/d_a_obj_item.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_insect.o \ + $(BUILD_DIR)/asm/sdata2/d_insect.o \ + $(BUILD_DIR)/asm/d/d_insect.o \ + $(BUILD_DIR)/asm/d/a/obj/ss/d_a_obj_ss_base.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_a_player.o \ + $(BUILD_DIR)/asm/sdata2/d_a_player.o \ + $(BUILD_DIR)/asm/d/a/d_a_player.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_camera.o \ + $(BUILD_DIR)/asm/sdata2/d_camera.o \ + $(BUILD_DIR)/src/d/d_camera.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_envse.o \ + $(BUILD_DIR)/asm/d/d_envse.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_file_select.o \ + $(BUILD_DIR)/asm/sdata2/d_file_select.o \ + $(BUILD_DIR)/asm/d/file/d_file_select.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_file_sel_warning.o \ + $(BUILD_DIR)/asm/sdata2/d_file_sel_warning.o \ + $(BUILD_DIR)/asm/d/file/sel/d_file_sel_warning.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_file_sel_info.o \ + $(BUILD_DIR)/asm/sdata2/d_file_sel_info.o \ + $(BUILD_DIR)/src/d/d_file/d_file_sel_info.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_bright_check.o \ + $(BUILD_DIR)/asm/sdata2/d_bright_check.o \ + $(BUILD_DIR)/asm/d/bright/d_bright_check.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_scope.o \ + $(BUILD_DIR)/asm/sdata2/d_scope.o \ + $(BUILD_DIR)/asm/d/d_scope.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_select_cursor.o \ + $(BUILD_DIR)/asm/sdata2/d_select_cursor.o \ + $(BUILD_DIR)/asm/d/select/d_select_cursor.o \ + $(BUILD_DIR)/asm/sdata2/d_select_icon.o \ + $(BUILD_DIR)/asm/d/select/d_select_icon.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_shop_system.o \ + $(BUILD_DIR)/asm/sdata2/d_shop_camera.o \ + $(BUILD_DIR)/asm/d/shop/d_shop_camera.o \ + $(BUILD_DIR)/asm/sdata2/d_shop_item_ctrl.o \ + $(BUILD_DIR)/asm/d/shop/item/d_shop_item_ctrl.o \ + $(BUILD_DIR)/asm/sdata2/d_shop_system.o \ + $(BUILD_DIR)/asm/d/shop/d_shop_system.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_gameover.o \ + $(BUILD_DIR)/asm/sdata2/d_gameover.o \ + $(BUILD_DIR)/asm/d/d_gameover.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kankyo.o \ + $(BUILD_DIR)/asm/sdata2/d_kankyo.o \ + $(BUILD_DIR)/src/d/d_kankyo.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kyeff.o \ + $(BUILD_DIR)/asm/sdata2/d_kyeff.o \ + $(BUILD_DIR)/asm/d/d_kyeff.o \ + $(BUILD_DIR)/asm/d/d_kyeff2.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_ky_thunder.o \ + $(BUILD_DIR)/asm/sdata2/d_ky_thunder.o \ + $(BUILD_DIR)/asm/d/ky/d_ky_thunder.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_kantera_icon_meter.o \ + $(BUILD_DIR)/asm/sdata2/d_kantera_icon_meter.o \ + $(BUILD_DIR)/src/d/d_kantera_icon_meter.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_calibration.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_calibration.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_calibration.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_collect.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_collect.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_collect.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_dmap.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_dmap.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_dmap.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_dmap_map.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_dmap_map.o \ + $(BUILD_DIR)/asm/d/menu/dmap/d_menu_dmap_map.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_map_common.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_map_common.o \ + $(BUILD_DIR)/asm/d/menu/map/d_menu_map_common.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_fishing.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_fishing.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_fishing.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_fmap.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_fmap.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_fmap.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_fmap_map.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_fmap_map.o \ + $(BUILD_DIR)/asm/d/menu/fmap/d_menu_fmap_map.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_fmap2D.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_fmap2D.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_fmap2D.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_insect.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_insect.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_insect.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_item_explain.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_item_explain.o \ + $(BUILD_DIR)/asm/d/menu/item/d_menu_item_explain.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_letter.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_letter.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_letter.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_option.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_option.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_option.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_ring.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_ring.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_ring.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_save.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_save.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_save.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_skill.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_skill.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_skill.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_menu_window.o \ + $(BUILD_DIR)/asm/d/menu/window/d_menu_window_HIO.o \ + $(BUILD_DIR)/asm/sdata2/d_menu_window.o \ + $(BUILD_DIR)/asm/d/menu/d_menu_window.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_HIO.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_HIO.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_HIO.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_button.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_button.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_button.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_haihai.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_haihai.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_haihai.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_hakusha.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_hakusha.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_hakusha.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_map.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_map.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_map.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter_string.o \ + $(BUILD_DIR)/asm/sdata2/d_meter_string.o \ + $(BUILD_DIR)/src/d/d_meter/d_meter_string.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter2_draw.o \ + $(BUILD_DIR)/asm/sdata2/d_meter2_draw.o \ + $(BUILD_DIR)/src/d/d_meter2/d_meter2_draw.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter2_info.o \ + $(BUILD_DIR)/asm/sdata2/d_meter2_info.o \ + $(BUILD_DIR)/src/d/d_meter2/d_meter2_info.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_meter2.o \ + $(BUILD_DIR)/asm/sdata2/d_meter2.o \ + $(BUILD_DIR)/src/d/d_meter2.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_out_font.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_out_font.o \ + $(BUILD_DIR)/asm/d/msg/out/d_msg_out_font.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_class.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_class.o \ + $(BUILD_DIR)/asm/d/msg/d_msg_class.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_object.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_object.o \ + $(BUILD_DIR)/asm/d/msg/d_msg_object.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_unit.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_unit.o \ + $(BUILD_DIR)/asm/d/msg/d_msg_unit.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_3select.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_3select.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_3select.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_arrow.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_arrow.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_arrow.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_boss.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_base.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_base.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_boss.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_boss.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_explain.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_explain.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_explain.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_item.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_item.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_item.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_howl.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_howl.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_howl.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_jimaku.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_jimaku.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_jimaku.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_kanban.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_kanban.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_kanban.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_light.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_light.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_light.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_place.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_place.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_place.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_staff.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_staff.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_staff.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_talk.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_talk.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_talk.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_scrn_tree.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_scrn_tree.o \ + $(BUILD_DIR)/asm/d/msg/scrn/d_msg_scrn_tree.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_string_base.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_string_base.o \ + $(BUILD_DIR)/asm/d/msg/string/d_msg_string_base.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_string.o \ + $(BUILD_DIR)/asm/d/msg/d_msg_string.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_msg_flow.o \ + $(BUILD_DIR)/asm/sdata2/d_msg_flow.o \ + $(BUILD_DIR)/asm/d/msg/d_msg_flow.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_name.o \ + $(BUILD_DIR)/asm/sdata2/d_name.o \ + $(BUILD_DIR)/asm/d/d_name.o \ + $(BUILD_DIR)/asm/sdata2/d_npc_lib.o \ + $(BUILD_DIR)/asm/d/npc/d_npc_lib.o \ + $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade.o \ + $(BUILD_DIR)/asm/sdata2/d_ovlp_fade2.o \ + $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade2.o \ + $(BUILD_DIR)/asm/sdata2/d_ovlp_fade3.o \ + $(BUILD_DIR)/asm/d/ovlp/d_ovlp_fade3.o \ + $(BUILD_DIR)/asm/sdata2/d_pane_class.o \ + $(BUILD_DIR)/asm/d/pane/d_pane_class.o \ + $(BUILD_DIR)/asm/sdata2/d_pane_class_alpha.o \ + $(BUILD_DIR)/asm/d/pane/class/d_pane_class_alpha.o \ + $(BUILD_DIR)/asm/d/pane/class/d_pane_class_ex.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_s_logo.o \ + $(BUILD_DIR)/asm/sdata2/d_s_logo.o \ + $(BUILD_DIR)/asm/d/s/d_s_logo.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_s_name.o \ + $(BUILD_DIR)/asm/sdata2/d_s_name.o \ + $(BUILD_DIR)/asm/d/s/d_s_name.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_s_play.o \ + $(BUILD_DIR)/asm/sdata2/d_s_play.o \ + $(BUILD_DIR)/asm/d/s/d_s_play.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_s_room.o \ + $(BUILD_DIR)/asm/d/s/d_s_room.o \ + $(BUILD_DIR)/src/d/d_save/d_save_HIO.o \ + $(BUILD_DIR)/asm/d/save/d_save_HIO.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_timer.o \ + $(BUILD_DIR)/asm/sdata2/d_timer.o \ + $(BUILD_DIR)/asm/d/d_timer.o \ + $(BUILD_DIR)/asm/rodata/rodata_d_k_wmark.o \ + $(BUILD_DIR)/asm/sdata2/d_k_wmark.o \ + $(BUILD_DIR)/asm/d/k/d_k_wmark.o \ + $(BUILD_DIR)/asm/sdata2/d_k_wpillar.o \ + $(BUILD_DIR)/asm/d/k/d_k_wpillar.o \ + $(BUILD_DIR)/asm/rodata/rodata_DynamicLink.o \ + $(BUILD_DIR)/asm/sdata2/DynamicLink.o \ + $(BUILD_DIR)/asm/DynamicLink.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_malloc.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_API_controller_pad.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_API_graphic.o \ + $(BUILD_DIR)/asm/rodata/rodata_c_cc_d.o \ + $(BUILD_DIR)/asm/sdata2/c_cc_d.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_cc_d.o \ + $(BUILD_DIR)/asm/sdata2/c_cc_s.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_cc_s.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_counter.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_list.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_list_iter.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_node.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_node_iter.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_tree.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_tree_iter.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_phase.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_request.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_tag.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_tag_iter.o \ + $(BUILD_DIR)/asm/rodata/rodata_c_xyz.o \ + $(BUILD_DIR)/asm/sdata2/c_xyz.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_xyz.o \ + $(BUILD_DIR)/asm/sdata2/c_sxyz.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_sxyz.o \ + $(BUILD_DIR)/asm/sdata2/c_math.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_math.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_chk.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_gnd_chk.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_lin_chk.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_shdw_draw.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_s_poly_info.o \ + $(BUILD_DIR)/asm/sdata2/c_bg_w.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_bg_w.o \ + $(BUILD_DIR)/asm/sdata2/c_m2d.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m2d.o \ + $(BUILD_DIR)/asm/sdata2/c_m3d.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d.o \ + $(BUILD_DIR)/asm/sdata2/c_m3d_g_aab.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_aab.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cir.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cps.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_cyl.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_lin.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_pla.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_sph.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_m3d_g_tri.o \ + $(BUILD_DIR)/asm/sdata2/c_lib.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_lib.o \ + $(BUILD_DIR)/asm/sdata2/c_angle.o \ + $(BUILD_DIR)/libs/SSystem/SComponent/c_angle.o \ + $(BUILD_DIR)/libs/SSystem/SStandard/s_basic.o \ + $(BUILD_DIR)/asm/sdata2/JFWSystem.o \ + $(BUILD_DIR)/asm/JFramework/JFWSystem.o \ + $(BUILD_DIR)/asm/rodata/rodata_JFWDisplay.o \ + $(BUILD_DIR)/asm/sdata2/JFWDisplay.o \ + $(BUILD_DIR)/asm/JFramework/JFWDisplay.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DUClipper.o \ + $(BUILD_DIR)/asm/sdata2/J3DUClipper.o \ + $(BUILD_DIR)/asm/J3DU/J3DUClipper.o \ + $(BUILD_DIR)/asm/J3DU/J3DUDL.o \ + $(BUILD_DIR)/asm/JParticle/JPAResourceManager.o \ + $(BUILD_DIR)/asm/sdata2/JPAResource.o \ + $(BUILD_DIR)/asm/JParticle/JPAResource.o \ + $(BUILD_DIR)/asm/sdata2/JPABaseShape.o \ + $(BUILD_DIR)/asm/JParticle/JPABaseShape.o \ + $(BUILD_DIR)/asm/sdata2/JPAExtraShape.o \ + $(BUILD_DIR)/asm/JParticle/JPAExtraShape.o \ + $(BUILD_DIR)/asm/sdata2/JPAChildShape.o \ + $(BUILD_DIR)/asm/JParticle/JPAChildShape.o \ + $(BUILD_DIR)/asm/JParticle/JPAExTexShape.o \ + $(BUILD_DIR)/asm/sdata2/JPADynamicsBlock.o \ + $(BUILD_DIR)/asm/JParticle/JPADynamicsBlock.o \ + $(BUILD_DIR)/asm/sdata2/JPAFieldBlock.o \ + $(BUILD_DIR)/asm/JParticle/JPAFieldBlock.o \ + $(BUILD_DIR)/asm/sdata2/JPAKeyBlock.o \ + $(BUILD_DIR)/asm/JParticle/JPAKeyBlock.o \ + $(BUILD_DIR)/asm/JParticle/JPATexture.o \ + $(BUILD_DIR)/asm/JParticle/JPAResourceLoader.o \ + $(BUILD_DIR)/asm/sdata2/JPAEmitterManager.o \ + $(BUILD_DIR)/asm/JParticle/JPAEmitterManager.o \ + $(BUILD_DIR)/asm/sdata2/JPAEmitter.o \ + $(BUILD_DIR)/asm/JParticle/JPAEmitter.o \ + $(BUILD_DIR)/asm/sdata2/JPAParticle.o \ + $(BUILD_DIR)/asm/JParticle/JPAParticle.o \ + $(BUILD_DIR)/asm/sdata2/JPAMath.o \ + $(BUILD_DIR)/asm/JParticle/JPAMath.o \ + $(BUILD_DIR)/asm/sdata2/JSGActor.o \ + $(BUILD_DIR)/asm/JStage/JSGActor.o \ + $(BUILD_DIR)/asm/sdata2/JSGAmbientLight.o \ + $(BUILD_DIR)/asm/JStage/JSGAmbientLight.o \ + $(BUILD_DIR)/asm/sdata2/JSGCamera.o \ + $(BUILD_DIR)/asm/JStage/JSGCamera.o \ + $(BUILD_DIR)/asm/sdata2/JSGFog.o \ + $(BUILD_DIR)/asm/JStage/JSGFog.o \ + $(BUILD_DIR)/asm/sdata2/JSGLight.o \ + $(BUILD_DIR)/asm/JStage/JSGLight.o \ + $(BUILD_DIR)/asm/sdata2/JSGObject.o \ + $(BUILD_DIR)/asm/JStage/JSGObject.o \ + $(BUILD_DIR)/asm/sdata2/ctb-data.o \ + $(BUILD_DIR)/asm/JStage/JSGSystem.o \ + $(BUILD_DIR)/asm/JStudio/ctb.o \ + $(BUILD_DIR)/asm/sdata2/functionvalue.o \ + $(BUILD_DIR)/asm/sdata2/fvb-data.o \ + $(BUILD_DIR)/libs/JSystem/JStudio/functionvalue.o \ + $(BUILD_DIR)/asm/rodata/rodata_functionvalue.o \ + $(BUILD_DIR)/asm/JStudio/functionvalue.o \ + $(BUILD_DIR)/libs/JSystem/JStudio/fvb.o \ + $(BUILD_DIR)/asm/rodata/rodata_fvb.o \ + $(BUILD_DIR)/asm/JStudio/fvb.o \ + $(BUILD_DIR)/asm/JStudio/fvb-data-parse.o \ + $(BUILD_DIR)/asm/rodata/rodata_jstudio-control.o \ + $(BUILD_DIR)/asm/sdata2/jstudio-control.o \ + $(BUILD_DIR)/asm/JStudio/jstudio-control.o \ + $(BUILD_DIR)/asm/sdata2/jstudio-data.o \ + $(BUILD_DIR)/asm/sdata2/jstudio-math.o \ + $(BUILD_DIR)/asm/JStudio/jstudio-math.o \ + $(BUILD_DIR)/asm/rodata/rodata_jstudio-object.o \ + $(BUILD_DIR)/asm/sdata2/jstudio-object.o \ + $(BUILD_DIR)/asm/JStudio/jstudio-object.o \ + $(BUILD_DIR)/asm/JStudio/object-id.o \ + $(BUILD_DIR)/asm/rodata/rodata_stb-data.o \ + $(BUILD_DIR)/asm/sdata2/stb.o \ + $(BUILD_DIR)/libs/JSystem/JStudio/stb.o \ + $(BUILD_DIR)/asm/sdata2/stb-data.o \ + $(BUILD_DIR)/asm/JStudio/stb-data-parse.o \ + $(BUILD_DIR)/asm/rodata/rodata_control.o \ + $(BUILD_DIR)/asm/JStudio_JStage/control.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object.o \ + $(BUILD_DIR)/asm/sdata2/object-actor.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object-actor.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object-ambientlight.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object-camera.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object-fog.o \ + $(BUILD_DIR)/asm/sdata2/object-light.o \ + $(BUILD_DIR)/asm/JStudio_JStage/object-light.o \ + $(BUILD_DIR)/asm/JStudio_JAudio2/control.o \ + $(BUILD_DIR)/asm/sdata2/object-sound.o \ + $(BUILD_DIR)/asm/JStudio_JAudio2/object-sound.o \ + $(BUILD_DIR)/asm/JStudio_JParticle/control.o \ + $(BUILD_DIR)/asm/sdata2/object-particle.o \ + $(BUILD_DIR)/asm/JStudio_JParticle/object-particle.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASCalc.o \ + $(BUILD_DIR)/asm/sdata2/JASCalc.o \ + $(BUILD_DIR)/asm/JAudio2/JASCalc.o \ + $(BUILD_DIR)/asm/JAudio2/JASTaskThread.o \ + $(BUILD_DIR)/asm/JAudio2/JASDvdThread.o \ + $(BUILD_DIR)/asm/JAudio2/JASCallback.o \ + $(BUILD_DIR)/asm/JAudio2/JASHeapCtrl.o \ + $(BUILD_DIR)/asm/JAudio2/JASResArcLoader.o \ + $(BUILD_DIR)/asm/sdata2/JASProbe.o \ + $(BUILD_DIR)/asm/JAudio2/JASProbe.o \ + $(BUILD_DIR)/asm/JAudio2/JASReport.o \ + $(BUILD_DIR)/asm/JAudio2/JASCmdStack.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASTrack.o \ + $(BUILD_DIR)/asm/sdata2/JASTrack.o \ + $(BUILD_DIR)/asm/JAudio2/JASTrack.o \ + $(BUILD_DIR)/asm/JAudio2/JASTrackPort.o \ + $(BUILD_DIR)/asm/JAudio2/JASRegisterParam.o \ + $(BUILD_DIR)/asm/JAudio2/JASSeqCtrl.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASSeqParser.o \ + $(BUILD_DIR)/asm/sdata2/JASSeqParser.o \ + $(BUILD_DIR)/asm/JAudio2/JASSeqParser.o \ + $(BUILD_DIR)/asm/JAudio2/JASSeqReader.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASAramStream.o \ + $(BUILD_DIR)/asm/sdata2/JASAramStream.o \ + $(BUILD_DIR)/asm/JAudio2/JASAramStream.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASBank.o \ + $(BUILD_DIR)/asm/sdata2/JASBank.o \ + $(BUILD_DIR)/asm/JAudio2/JASBank.o \ + $(BUILD_DIR)/asm/JAudio2/JASBasicBank.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASVoiceBank.o \ + $(BUILD_DIR)/asm/JAudio2/JASVoiceBank.o \ + $(BUILD_DIR)/asm/sdata2/JASBasicInst.o \ + $(BUILD_DIR)/asm/JAudio2/JASBasicInst.o \ + $(BUILD_DIR)/asm/sdata2/JASDrumSet.o \ + $(BUILD_DIR)/asm/JAudio2/JASDrumSet.o \ + $(BUILD_DIR)/asm/JAudio2/JASBasicWaveBank.o \ + $(BUILD_DIR)/asm/JAudio2/JASSimpleWaveBank.o \ + $(BUILD_DIR)/asm/JAudio2/JASWSParser.o \ + $(BUILD_DIR)/asm/sdata2/JASBNKParser.o \ + $(BUILD_DIR)/asm/JAudio2/JASBNKParser.o \ + $(BUILD_DIR)/asm/JAudio2/JASWaveArcLoader.o \ + $(BUILD_DIR)/asm/sdata2/JASChannel.o \ + $(BUILD_DIR)/asm/JAudio2/JASChannel.o \ + $(BUILD_DIR)/asm/sdata2/JASLfo.o \ + $(BUILD_DIR)/asm/JAudio2/JASLfo.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASOscillator.o \ + $(BUILD_DIR)/asm/sdata2/JASOscillator.o \ + $(BUILD_DIR)/asm/JAudio2/JASOscillator.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASAiCtrl.o \ + $(BUILD_DIR)/asm/sdata2/JASAiCtrl.o \ + $(BUILD_DIR)/asm/JAudio2/JASAiCtrl.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASAudioThread.o \ + $(BUILD_DIR)/asm/JAudio2/JASAudioThread.o \ + $(BUILD_DIR)/asm/sdata2/JASAudioReseter.o \ + $(BUILD_DIR)/asm/JAudio2/JASAudioReseter.o \ + $(BUILD_DIR)/asm/JAudio2/JASDSPChannel.o \ + $(BUILD_DIR)/asm/rodata/rodata_JASDSPInterface.o \ + $(BUILD_DIR)/asm/sdata2/JASDSPInterface.o \ + $(BUILD_DIR)/asm/JAudio2/JASDSPInterface.o \ + $(BUILD_DIR)/asm/JAudio2/JASDriverIF.o \ + $(BUILD_DIR)/asm/sdata2/JASSoundParams.o \ + $(BUILD_DIR)/asm/JAudio2/JASSoundParams.o \ + $(BUILD_DIR)/asm/sdata2/dspproc.o \ + $(BUILD_DIR)/asm/JAudio2/dspproc.o \ + $(BUILD_DIR)/asm/JAudio2/dsptask.o \ + $(BUILD_DIR)/asm/rodata/rodata_osdsp.o \ + $(BUILD_DIR)/asm/JAudio2/osdsp.o \ + $(BUILD_DIR)/asm/JAudio2/osdsp/osdsp_task.o \ + $(BUILD_DIR)/asm/JAudio2/JAIAudible.o \ + $(BUILD_DIR)/asm/JAudio2/JAIAudience.o \ + $(BUILD_DIR)/asm/sdata2/JAISe.o \ + $(BUILD_DIR)/asm/JAudio2/JAISe.o \ + $(BUILD_DIR)/asm/rodata/rodata_JAISeMgr.o \ + $(BUILD_DIR)/asm/sdata2/JAISeMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAISeMgr.o \ + $(BUILD_DIR)/asm/sdata2/JAISeq.o \ + $(BUILD_DIR)/asm/JAudio2/JAISeq.o \ + $(BUILD_DIR)/asm/JAudio2/JAISeqDataMgr.o \ + $(BUILD_DIR)/asm/sdata2/JAISeqMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAISeqMgr.o \ + $(BUILD_DIR)/asm/rodata/rodata_JAISound.o \ + $(BUILD_DIR)/asm/sdata2/JAISound.o \ + $(BUILD_DIR)/asm/JAudio2/JAISound.o \ + $(BUILD_DIR)/asm/sdata2/JAISoundChild.o \ + $(BUILD_DIR)/asm/JAudio2/JAISoundChild.o \ + $(BUILD_DIR)/asm/JAudio2/JAISoundHandles.o \ + $(BUILD_DIR)/asm/JAudio2/JAISoundInfo.o \ + $(BUILD_DIR)/asm/sdata2/JAISoundParams.o \ + $(BUILD_DIR)/asm/JAudio2/JAISoundParams.o \ + $(BUILD_DIR)/asm/JAudio2/JAISoundStarter.o \ + $(BUILD_DIR)/asm/sdata2/JAIStream.o \ + $(BUILD_DIR)/asm/JAudio2/JAIStream.o \ + $(BUILD_DIR)/asm/JAudio2/JAIStreamDataMgr.o \ + $(BUILD_DIR)/asm/sdata2/JAIStreamMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAIStreamMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAUAudioArcInterpreter.o \ + $(BUILD_DIR)/asm/JAudio2/JAUAudioArcLoader.o \ + $(BUILD_DIR)/asm/JAudio2/JAUAudioMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAUBankTable.o \ + $(BUILD_DIR)/libs/JSystem/JAudio2/JAUClusterSound.o \ + $(BUILD_DIR)/asm/sdata2/JAUInitializer.o \ + $(BUILD_DIR)/asm/JAudio2/JAUInitializer.o \ + $(BUILD_DIR)/asm/sdata2/data.o \ + $(BUILD_DIR)/asm/rodata/rodata_JAUSectionHeap.o \ + $(BUILD_DIR)/asm/JAudio2/JAUSectionHeap.o \ + $(BUILD_DIR)/asm/JAudio2/JAUSeqCollection.o \ + $(BUILD_DIR)/asm/JAudio2/JAUSeqDataBlockMgr.o \ + $(BUILD_DIR)/asm/JAudio2/JAUSoundAnimator.o \ + $(BUILD_DIR)/asm/JAudio2/JAUSoundTable.o \ + $(BUILD_DIR)/asm/JAudio2/JAUStreamFileTable.o \ + $(BUILD_DIR)/asm/JMessage/control.o \ + $(BUILD_DIR)/asm/JMessage/processor.o \ + $(BUILD_DIR)/asm/JMessage/resource.o \ + $(BUILD_DIR)/asm/JMessage/locale.o \ + $(BUILD_DIR)/asm/sdata2/Z2Calc.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2Calc.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioArcLoader.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SoundMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SoundMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SoundStarter.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundStarter.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundHandles.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SeMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SeMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SeMgr.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SeqMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SeqMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SeqMgr.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2StatusMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2StatusMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2StatusMgr.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SceneMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SceneMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SceneMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2FxLineMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SoundInfo.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundInfo.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2Audience.o \ + $(BUILD_DIR)/asm/sdata2/Z2Audience.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2Audience.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SoundObject.o \ + $(BUILD_DIR)/asm/sdata2/Z2SoundObject.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundObject.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SoundObjMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2SoundObjMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SoundObjMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2Creature.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2Creature.o \ + $(BUILD_DIR)/asm/sdata2/Z2LinkMgr.o \ $(BUILD_DIR)/libs/Z2AudioLib/Z2LinkMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2EnvSeMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2WolfHowlMgr.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2SpeechMgr2.o \ - $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioMgr.o \ - $(BUILD_DIR)/asm/gf/GFGeometry.o \ - $(BUILD_DIR)/asm/gf/GFLight.o \ - $(BUILD_DIR)/asm/gf/GFPixel.o \ - $(BUILD_DIR)/asm/gf/GFTev.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRHeap.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRExpHeap.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRSolidHeap.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAssertHeap.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDisposer.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRThread.o \ - $(BUILD_DIR)/asm/JKernel/JKRThread.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAram.o \ - $(BUILD_DIR)/asm/JKernel/JKRAram.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramHeap.o \ - $(BUILD_DIR)/asm/JKernel/JKRAramHeap.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramBlock.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramPiece.o \ - $(BUILD_DIR)/asm/JKernel/JKRAramPiece.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramStream.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileLoader.o \ - $(BUILD_DIR)/asm/JKernel/JKRFileLoader.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileFinder.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileCache.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRArchivePub.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRArchivePri.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRMemArchive.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramArchive.o \ - $(BUILD_DIR)/asm/JKernel/JKRAramArchive.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdArchive.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRCompArchive.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRFile.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdFile.o \ - $(BUILD_DIR)/asm/JKernel/JKRDvdFile.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdRipper.o \ - $(BUILD_DIR)/asm/JKernel/JKRDvdRipper.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdAramRipper.o \ - $(BUILD_DIR)/asm/JKernel/JKRDvdAramRipper.o \ - $(BUILD_DIR)/libs/JSystem/JKernel/JKRDecomp.o \ - $(BUILD_DIR)/libs/JSystem/JSupport/JSUList.o \ - $(BUILD_DIR)/asm/JSupport/JSUInputStream.o \ - $(BUILD_DIR)/asm/JSupport/JSUMemoryStream.o \ - $(BUILD_DIR)/asm/JSupport/JSUFileStream.o \ - $(BUILD_DIR)/asm/JGadget/binary.o \ - $(BUILD_DIR)/libs/JSystem/JGadget/linklist.o \ - $(BUILD_DIR)/asm/JGadget/linklist.o \ - $(BUILD_DIR)/libs/JSystem/JGadget/std-vector.o \ - $(BUILD_DIR)/asm/JGadget/std-vector.o \ - $(BUILD_DIR)/asm/JUtility/JUTCacheFont.o \ - $(BUILD_DIR)/asm/JUtility/JUTResource.o \ - $(BUILD_DIR)/asm/JUtility/JUTTexture.o \ - $(BUILD_DIR)/asm/JUtility/JUTPalette.o \ - $(BUILD_DIR)/asm/JUtility/JUTNameTab.o \ - $(BUILD_DIR)/asm/JUtility/JUTGraphFifo.o \ - $(BUILD_DIR)/libs/JSystem/JUtility/JUTFont.o \ - $(BUILD_DIR)/libs/JSystem/JUtility/JUTResFont.o \ - $(BUILD_DIR)/asm/JUtility/JUTDbPrint.o \ - $(BUILD_DIR)/libs/JSystem/JUtility/JUTGamePad.o \ - $(BUILD_DIR)/asm/JUtility/JUTGamePad.o \ - $(BUILD_DIR)/asm/JUtility/JUTException.o \ - $(BUILD_DIR)/asm/JUtility/JUTDirectPrint.o \ - $(BUILD_DIR)/asm/JUtility/JUTAssert.o \ - $(BUILD_DIR)/asm/JUtility/JUTVideo.o \ - $(BUILD_DIR)/libs/JSystem/JUtility/JUTXfb.o \ - $(BUILD_DIR)/asm/JUtility/JUTFader.o \ - $(BUILD_DIR)/asm/JUtility/JUTProcBar.o \ - $(BUILD_DIR)/asm/JUtility/JUTConsole.o \ - $(BUILD_DIR)/asm/JUtility/JUTDirectFile.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DGrafContext.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DOrthoGraph.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DTevs.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DMaterial.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DMatBlock.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DMaterialFactory.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DPrint.o \ - $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DPane.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DScreen.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DWindow.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DPicture.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DTextBox.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DWindowEx.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DPictureEx.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DTextBoxEx.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DAnmLoader.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DAnimation.o \ - $(BUILD_DIR)/asm/J2DGraph/J2DManage.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DGD.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DSys.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DVertex.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DTransform.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DTexture.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DPacket.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DShapeMtx.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DShapeDraw.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DShape.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DMaterial.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DMatBlock.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DTevs.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DDrawBuffer.o \ - $(BUILD_DIR)/asm/J3DGraphBase/J3DStruct.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DShapeTable.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DJointTree.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DModelData.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMtxBuffer.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DModel.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DAnimation.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMaterialAnm.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DSkinDeform.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DCluster.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DJoint.o \ - $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMaterialAttach.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DMaterialFactory.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DClusterLoader.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DModelLoader.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DModelLoaderCalcSize.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DJointFactory.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DShapeFactory.o \ - $(BUILD_DIR)/asm/J3DGraphLoader/J3DAnmLoader.o \ - $(BUILD_DIR)/asm/JMath/JMath.o \ - $(BUILD_DIR)/libs/JSystem/JMath/random.o \ - $(BUILD_DIR)/asm/JMath/JMATrigonometric.o \ - $(BUILD_DIR)/asm/base/PPCArch.o \ - $(BUILD_DIR)/asm/os/OS.o \ - $(BUILD_DIR)/asm/os/OSAlarm.o \ - $(BUILD_DIR)/asm/os/OSAlloc.o \ - $(BUILD_DIR)/asm/os/OSArena.o \ - $(BUILD_DIR)/asm/os/OSAudioSystem.o \ - $(BUILD_DIR)/asm/os/OSCache.o \ - $(BUILD_DIR)/asm/os/OSContext.o \ - $(BUILD_DIR)/asm/os/OSError.o \ - $(BUILD_DIR)/asm/os/OSExec.o \ - $(BUILD_DIR)/asm/os/OSFont.o \ - $(BUILD_DIR)/asm/os/OSInterrupt.o \ - $(BUILD_DIR)/asm/os/OSLink.o \ - $(BUILD_DIR)/asm/os/OSMessage.o \ - $(BUILD_DIR)/asm/os/OSMemory.o \ - $(BUILD_DIR)/asm/os/OSMutex.o \ - $(BUILD_DIR)/asm/os/OSReboot.o \ - $(BUILD_DIR)/asm/os/OSReset.o \ - $(BUILD_DIR)/asm/os/OSResetSW.o \ - $(BUILD_DIR)/asm/os/OSRtc.o \ - $(BUILD_DIR)/asm/os/OSSync.o \ - $(BUILD_DIR)/asm/os/OSThread.o \ - $(BUILD_DIR)/asm/os/OSTime.o \ - $(BUILD_DIR)/asm/os///ppc/eabi/__ppc_eabi_init.o \ - $(BUILD_DIR)/asm/exi/EXIBios.o \ - $(BUILD_DIR)/asm/exi/EXIUart.o \ - $(BUILD_DIR)/asm/si/SIBios.o \ - $(BUILD_DIR)/asm/si/SISamplingRate.o \ - $(BUILD_DIR)/asm/db/db.o \ - $(BUILD_DIR)/asm/mtx/mtx.o \ - $(BUILD_DIR)/asm/mtx/mtxvec.o \ - $(BUILD_DIR)/asm/mtx/mtx44.o \ - $(BUILD_DIR)/asm/mtx/vec.o \ - $(BUILD_DIR)/asm/mtx/quat.o \ - $(BUILD_DIR)/asm/dvd/dvdlow.o \ - $(BUILD_DIR)/asm/dvd/dvdfs.o \ - $(BUILD_DIR)/asm/dvd/dvd.o \ - $(BUILD_DIR)/asm/dvd/dvdqueue.o \ - $(BUILD_DIR)/asm/dvd/dvderror.o \ - $(BUILD_DIR)/asm/dvd/dvdidutils.o \ - $(BUILD_DIR)/asm/dvd/dvdFatal.o \ - $(BUILD_DIR)/asm/dvd/fstload.o \ - $(BUILD_DIR)/asm/vi/vi.o \ - $(BUILD_DIR)/asm/pad/Padclamp.o \ - $(BUILD_DIR)/asm/pad/Pad.o \ - $(BUILD_DIR)/asm/ai/ai.o \ - $(BUILD_DIR)/asm/ar/ar.o \ - $(BUILD_DIR)/asm/ar/arq.o \ - $(BUILD_DIR)/asm/dsp/dsp.o \ - $(BUILD_DIR)/asm/dsp/dsp/dsp_debug.o \ - $(BUILD_DIR)/asm/dsp/dsp/dsp_task.o \ - $(BUILD_DIR)/asm/card/CARDBios.o \ - $(BUILD_DIR)/asm/card/CARDUnlock.o \ - $(BUILD_DIR)/asm/card/CARDRdwr.o \ - $(BUILD_DIR)/asm/card/CARDBlock.o \ - $(BUILD_DIR)/asm/card/CARDDir.o \ - $(BUILD_DIR)/asm/card/CARDCheck.o \ - $(BUILD_DIR)/asm/card/CARDMount.o \ - $(BUILD_DIR)/asm/card/CARDFormat.o \ - $(BUILD_DIR)/asm/card/CARDOpen.o \ - $(BUILD_DIR)/asm/card/CARDCreate.o \ - $(BUILD_DIR)/asm/card/CARDRead.o \ - $(BUILD_DIR)/asm/card/CARDWrite.o \ - $(BUILD_DIR)/asm/card/CARDStat.o \ - $(BUILD_DIR)/asm/card/CARDNet.o \ - $(BUILD_DIR)/asm/gx/GXInit.o \ - $(BUILD_DIR)/asm/gx/GXFifo.o \ - $(BUILD_DIR)/asm/gx/GXAttr.o \ - $(BUILD_DIR)/asm/gx/GXMisc.o \ - $(BUILD_DIR)/asm/gx/GXGeometry.o \ - $(BUILD_DIR)/asm/gx/GXFrameBuf.o \ - $(BUILD_DIR)/asm/gx/GXLight.o \ - $(BUILD_DIR)/asm/gx/GXTexture.o \ - $(BUILD_DIR)/asm/gx/GXBump.o \ - $(BUILD_DIR)/asm/gx/GXTev.o \ - $(BUILD_DIR)/asm/gx/GXPixel.o \ - $(BUILD_DIR)/asm/gx/GXDisplayList.o \ - $(BUILD_DIR)/asm/gx/GXTransform.o \ - $(BUILD_DIR)/asm/gx/GXPerf.o \ - $(BUILD_DIR)/asm/gd/GDBase.o \ - $(BUILD_DIR)/asm/gd/GDGeometry.o \ - $(BUILD_DIR)/asm/clib.o + $(BUILD_DIR)/asm/rodata/rodata_Z2EnvSeMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2EnvSeMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2EnvSeMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2WolfHowlMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2WolfHowlMgr.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2SpeechMgr2.o \ + $(BUILD_DIR)/asm/sdata2/Z2SpeechMgr2.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2SpeechMgr2.o \ + $(BUILD_DIR)/asm/rodata/rodata_Z2AudioMgr.o \ + $(BUILD_DIR)/asm/sdata2/Z2AudioMgr.o \ + $(BUILD_DIR)/libs/Z2AudioLib/Z2AudioMgr.o \ + $(BUILD_DIR)/asm/gf/GFGeometry.o \ + $(BUILD_DIR)/asm/gf/GFLight.o \ + $(BUILD_DIR)/asm/sdata2/GFPixel.o \ + $(BUILD_DIR)/asm/gf/GFPixel.o \ + $(BUILD_DIR)/asm/gf/GFTev.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRHeap.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRExpHeap.o \ + $(BUILD_DIR)/asm/sdata2/JKRExpHeap.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRExpHeap.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRSolidHeap.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAssertHeap.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDisposer.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRThread.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRThread.o \ + $(BUILD_DIR)/asm/JKernel/JKRThread.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAram.o \ + $(BUILD_DIR)/asm/JKernel/JKRAram.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramHeap.o \ + $(BUILD_DIR)/asm/JKernel/JKRAramHeap.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramBlock.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramPiece.o \ + $(BUILD_DIR)/asm/JKernel/JKRAramPiece.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRAramStream.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramStream.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRFileLoader.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileLoader.o \ + $(BUILD_DIR)/asm/JKernel/JKRFileLoader.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileFinder.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRFileCache.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRFileCache.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRArchivePub.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRArchivePri.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRMemArchive.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRMemArchive.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRAramArchive.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRAramArchive.o \ + $(BUILD_DIR)/asm/JKernel/JKRAramArchive.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRDvdArchive.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdArchive.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRCompArchive.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRCompArchive.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRFile.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRDvdFile.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdFile.o \ + $(BUILD_DIR)/asm/JKernel/JKRDvdFile.o \ + $(BUILD_DIR)/asm/rodata/rodata_JKRDvdRipper.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdRipper.o \ + $(BUILD_DIR)/asm/JKernel/JKRDvdRipper.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDvdAramRipper.o \ + $(BUILD_DIR)/asm/JKernel/JKRDvdAramRipper.o \ + $(BUILD_DIR)/libs/JSystem/JKernel/JKRDecomp.o \ + $(BUILD_DIR)/libs/JSystem/JSupport/JSUList.o \ + $(BUILD_DIR)/asm/JSupport/JSUInputStream.o \ + $(BUILD_DIR)/asm/JSupport/JSUMemoryStream.o \ + $(BUILD_DIR)/asm/JSupport/JSUFileStream.o \ + $(BUILD_DIR)/libs/JSystem/JGadget/binary.o \ + $(BUILD_DIR)/libs/JSystem/JGadget/linklist.o \ + $(BUILD_DIR)/asm/JGadget/linklist.o \ + $(BUILD_DIR)/libs/JSystem/JGadget/std-vector.o \ + $(BUILD_DIR)/asm/JGadget/std-vector.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTCacheFont.o \ + $(BUILD_DIR)/asm/sdata2/JUTCacheFont.o \ + $(BUILD_DIR)/asm/JUtility/JUTCacheFont.o \ + $(BUILD_DIR)/asm/JUtility/JUTResource.o \ + $(BUILD_DIR)/asm/sdata2/JUTTexture.o \ + $(BUILD_DIR)/asm/JUtility/JUTTexture.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTPalette.o \ + $(BUILD_DIR)/asm/JUtility/JUTPalette.o \ + $(BUILD_DIR)/asm/JUtility/JUTNameTab.o \ + $(BUILD_DIR)/asm/JUtility/JUTGraphFifo.o \ + $(BUILD_DIR)/libs/JSystem/JUtility/JUTFont.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTResFont.o \ + $(BUILD_DIR)/asm/sdata2/JUTResFont.o \ + $(BUILD_DIR)/libs/JSystem/JUtility/JUTResFont.o \ + $(BUILD_DIR)/asm/sdata2/JUTDbPrint.o \ + $(BUILD_DIR)/asm/JUtility/JUTDbPrint.o \ + $(BUILD_DIR)/asm/sdata2/JUTGamePad.o \ + $(BUILD_DIR)/libs/JSystem/JUtility/JUTGamePad.o \ + $(BUILD_DIR)/asm/JUtility/JUTGamePad.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTException.o \ + $(BUILD_DIR)/asm/sdata2/JUTException.o \ + $(BUILD_DIR)/asm/JUtility/JUTException.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTDirectPrint.o \ + $(BUILD_DIR)/asm/sdata2/JUTDirectPrint.o \ + $(BUILD_DIR)/asm/JUtility/JUTDirectPrint.o \ + $(BUILD_DIR)/asm/sdata2/JUTAssert.o \ + $(BUILD_DIR)/asm/JUtility/JUTAssert.o \ + $(BUILD_DIR)/asm/JUtility/JUTVideo.o \ + $(BUILD_DIR)/libs/JSystem/JUtility/JUTXfb.o \ + $(BUILD_DIR)/asm/sdata2/JUTFader.o \ + $(BUILD_DIR)/asm/JUtility/JUTFader.o \ + $(BUILD_DIR)/asm/sdata2/JUTProcBar.o \ + $(BUILD_DIR)/asm/JUtility/JUTProcBar.o \ + $(BUILD_DIR)/asm/rodata/rodata_JUTConsole.o \ + $(BUILD_DIR)/asm/sdata2/JUTConsole.o \ + $(BUILD_DIR)/asm/JUtility/JUTConsole.o \ + $(BUILD_DIR)/asm/JUtility/JUTDirectFile.o \ + $(BUILD_DIR)/asm/sdata2/J2DGrafContext.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DGrafContext.o \ + $(BUILD_DIR)/asm/sdata2/J2DOrthoGraph.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DOrthoGraph.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DTevs.o \ + $(BUILD_DIR)/asm/sdata2/J2DTevs.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DTevs.o \ + $(BUILD_DIR)/asm/sdata2/J2DMaterial.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DMaterial.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DMatBlock.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DMatBlock.o \ + $(BUILD_DIR)/asm/sdata2/J2DMaterialFactory.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DMaterialFactory.o \ + $(BUILD_DIR)/asm/sdata2/J2DPrint.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DPrint.o \ + $(BUILD_DIR)/asm/sdata2/J2DPane.o \ + $(BUILD_DIR)/libs/JSystem/J2DGraph/J2DPane.o \ + $(BUILD_DIR)/asm/sdata2/J2DScreen.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DScreen.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DWindow.o \ + $(BUILD_DIR)/asm/sdata2/J2DWindow.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DWindow.o \ + $(BUILD_DIR)/asm/sdata2/J2DPicture.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DPicture.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DTextBox.o \ + $(BUILD_DIR)/asm/sdata2/J2DTextBox.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DTextBox.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DWindowEx.o \ + $(BUILD_DIR)/asm/sdata2/J2DWindowEx.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DWindowEx.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DPictureEx.o \ + $(BUILD_DIR)/asm/sdata2/J2DPictureEx.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DPictureEx.o \ + $(BUILD_DIR)/asm/rodata/rodata_J2DTextBoxEx.o \ + $(BUILD_DIR)/asm/sdata2/J2DTextBoxEx.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DTextBoxEx.o \ + $(BUILD_DIR)/asm/sdata2/J2DAnmLoader.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DAnmLoader.o \ + $(BUILD_DIR)/asm/sdata2/J2DAnimation.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DAnimation.o \ + $(BUILD_DIR)/asm/J2DGraph/J2DManage.o \ + $(BUILD_DIR)/asm/sdata2/J3DGD.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DGD.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DSys.o \ + $(BUILD_DIR)/asm/sdata2/J3DSys.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DSys.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DVertex.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DTransform.o \ + $(BUILD_DIR)/asm/sdata2/J3DTransform.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DTransform.o \ + $(BUILD_DIR)/asm/sdata2/J3DTexture.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DTexture.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DPacket.o \ + $(BUILD_DIR)/asm/sdata2/J3DShapeMtx.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DShapeMtx.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DShapeDraw.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DShape.o \ + $(BUILD_DIR)/asm/sdata2/J3DShape.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DShape.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DMaterial.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DMatBlock.o \ + $(BUILD_DIR)/asm/sdata2/J3DMatBlock.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DMatBlock.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DTevs.o \ + $(BUILD_DIR)/asm/sdata2/J3DTevs.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DTevs.o \ + $(BUILD_DIR)/asm/sdata2/J3DDrawBuffer.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DDrawBuffer.o \ + $(BUILD_DIR)/asm/sdata2/J3DStruct.o \ + $(BUILD_DIR)/asm/J3DGraphBase/J3DStruct.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DShapeTable.o \ + $(BUILD_DIR)/asm/sdata2/J3DJointTree.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DJointTree.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DModelData.o \ + $(BUILD_DIR)/asm/sdata2/J3DMtxBuffer.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMtxBuffer.o \ + $(BUILD_DIR)/asm/sdata2/J3DModel.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DModel.o \ + $(BUILD_DIR)/asm/sdata2/J3DAnimation.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DAnimation.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMaterialAnm.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DSkinDeform.o \ + $(BUILD_DIR)/asm/sdata2/J3DSkinDeform.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DSkinDeform.o \ + $(BUILD_DIR)/asm/sdata2/J3DCluster.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DCluster.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DJoint.o \ + $(BUILD_DIR)/asm/sdata2/J3DJoint.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DJoint.o \ + $(BUILD_DIR)/asm/J3DGraphAnimator/J3DMaterialAttach.o \ + $(BUILD_DIR)/asm/sdata2/J3DMaterialFactory.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DMaterialFactory.o \ + $(BUILD_DIR)/asm/sdata2/J3DMaterialFactory_v21.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DMaterialFactory/J3DMaterialFactory_v21.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DClusterLoader.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DClusterLoader.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DModelLoader.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DModelLoader.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DModelLoaderCalcSize.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DModelLoaderCalcSize.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DJointFactory.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DShapeFactory.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DShapeFactory.o \ + $(BUILD_DIR)/asm/rodata/rodata_J3DAnmLoader.o \ + $(BUILD_DIR)/asm/sdata2/J3DAnmLoader.o \ + $(BUILD_DIR)/asm/J3DGraphLoader/J3DAnmLoader.o \ + $(BUILD_DIR)/asm/sdata2/JMath.o \ + $(BUILD_DIR)/asm/JMath/JMath.o \ + $(BUILD_DIR)/libs/JSystem/JMath/random.o \ + $(BUILD_DIR)/asm/sdata2/JMATrigonometric.o \ + $(BUILD_DIR)/asm/JMath/JMATrigonometric.o \ + $(BUILD_DIR)/asm/base/PPCArch.o \ + $(BUILD_DIR)/asm/os/OS.o \ + $(BUILD_DIR)/asm/os/OSAlarm.o \ + $(BUILD_DIR)/asm/os/OSAlloc.o \ + $(BUILD_DIR)/asm/os/OSArena.o \ + $(BUILD_DIR)/asm/os/OSAudioSystem.o \ + $(BUILD_DIR)/asm/os/OSCache.o \ + $(BUILD_DIR)/asm/os/OSContext.o \ + $(BUILD_DIR)/asm/os/OSError.o \ + $(BUILD_DIR)/asm/os/OSExec.o \ + $(BUILD_DIR)/asm/os/OSFont.o \ + $(BUILD_DIR)/asm/os/OSInterrupt.o \ + $(BUILD_DIR)/asm/os/OSLink.o \ + $(BUILD_DIR)/asm/os/OSMessage.o \ + $(BUILD_DIR)/asm/os/OSMemory.o \ + $(BUILD_DIR)/asm/os/OSMutex.o \ + $(BUILD_DIR)/asm/os/OSReboot.o \ + $(BUILD_DIR)/asm/os/OSReset.o \ + $(BUILD_DIR)/asm/os/OSResetSW.o \ + $(BUILD_DIR)/asm/os/OSRtc.o \ + $(BUILD_DIR)/asm/os/OSSync.o \ + $(BUILD_DIR)/asm/os/OSThread.o \ + $(BUILD_DIR)/asm/os/OSTime.o \ + $(BUILD_DIR)/asm/os///ppc/eabi/__ppc_eabi_init.o \ + $(BUILD_DIR)/asm/exi/EXIBios.o \ + $(BUILD_DIR)/asm/exi/EXIUart.o \ + $(BUILD_DIR)/asm/si/SIBios.o \ + $(BUILD_DIR)/asm/si/SISamplingRate.o \ + $(BUILD_DIR)/asm/db/db.o \ + $(BUILD_DIR)/asm/sdata2/mtx.o \ + $(BUILD_DIR)/asm/mtx/mtx.o \ + $(BUILD_DIR)/asm/mtx/mtxvec.o \ + $(BUILD_DIR)/asm/sdata2/mtx44.o \ + $(BUILD_DIR)/asm/mtx/mtx44.o \ + $(BUILD_DIR)/asm/sdata2/vec.o \ + $(BUILD_DIR)/asm/mtx/vec.o \ + $(BUILD_DIR)/asm/sdata2/quat.o \ + $(BUILD_DIR)/asm/mtx/quat.o \ + $(BUILD_DIR)/asm/dvd/dvdlow.o \ + $(BUILD_DIR)/asm/dvd/dvdfs.o \ + $(BUILD_DIR)/asm/dvd/dvd.o \ + $(BUILD_DIR)/asm/dvd/dvdqueue.o \ + $(BUILD_DIR)/asm/dvd/dvderror.o \ + $(BUILD_DIR)/asm/dvd/dvdidutils.o \ + $(BUILD_DIR)/asm/dvd/dvdFatal.o \ + $(BUILD_DIR)/asm/dvd/fstload.o \ + $(BUILD_DIR)/asm/vi/vi.o \ + $(BUILD_DIR)/asm/sdata2/Padclamp.o \ + $(BUILD_DIR)/asm/pad/Padclamp.o \ + $(BUILD_DIR)/asm/pad/Pad.o \ + $(BUILD_DIR)/asm/ai/ai.o \ + $(BUILD_DIR)/asm/ar/ar.o \ + $(BUILD_DIR)/asm/ar/arq.o \ + $(BUILD_DIR)/asm/dsp/dsp.o \ + $(BUILD_DIR)/asm/dsp/dsp/dsp_debug.o \ + $(BUILD_DIR)/asm/dsp/dsp/dsp_task.o \ + $(BUILD_DIR)/asm/card/CARDBios.o \ + $(BUILD_DIR)/asm/card/CARDUnlock.o \ + $(BUILD_DIR)/asm/card/CARDRdwr.o \ + $(BUILD_DIR)/asm/card/CARDBlock.o \ + $(BUILD_DIR)/asm/card/CARDDir.o \ + $(BUILD_DIR)/asm/card/CARDCheck.o \ + $(BUILD_DIR)/asm/card/CARDMount.o \ + $(BUILD_DIR)/asm/card/CARDFormat.o \ + $(BUILD_DIR)/asm/card/CARDOpen.o \ + $(BUILD_DIR)/asm/card/CARDCreate.o \ + $(BUILD_DIR)/asm/card/CARDRead.o \ + $(BUILD_DIR)/asm/card/CARDWrite.o \ + $(BUILD_DIR)/asm/card/CARDStat.o \ + $(BUILD_DIR)/asm/card/CARDNet.o \ + $(BUILD_DIR)/asm/sdata2/GXInit.o \ + $(BUILD_DIR)/asm/gx/GXInit.o \ + $(BUILD_DIR)/asm/gx/GXFifo.o \ + $(BUILD_DIR)/asm/gx/GXAttr.o \ + $(BUILD_DIR)/asm/gx/GXMisc.o \ + $(BUILD_DIR)/asm/gx/GXGeometry.o \ + $(BUILD_DIR)/asm/sdata2/GXFrameBuf.o \ + $(BUILD_DIR)/asm/gx/GXFrameBuf.o \ + $(BUILD_DIR)/asm/sdata2/GXLight.o \ + $(BUILD_DIR)/asm/gx/GXLight.o \ + $(BUILD_DIR)/asm/sdata2/GXTexture.o \ + $(BUILD_DIR)/asm/gx/GXTexture.o \ + $(BUILD_DIR)/asm/sdata2/GXBump.o \ + $(BUILD_DIR)/asm/gx/GXBump.o \ + $(BUILD_DIR)/asm/gx/GXTev.o \ + $(BUILD_DIR)/asm/sdata2/GXPixel.o \ + $(BUILD_DIR)/asm/gx/GXPixel.o \ + $(BUILD_DIR)/asm/gx/GXDisplayList.o \ + $(BUILD_DIR)/asm/sdata2/GXTransform.o \ + $(BUILD_DIR)/asm/gx/GXTransform.o \ + $(BUILD_DIR)/asm/gx/GXPerf.o \ + $(BUILD_DIR)/asm/gd/GDBase.o \ + $(BUILD_DIR)/asm/gd/GDGeometry.o \ + $(BUILD_DIR)/asm/clib.o CTORS_O_FILES := \ $(BUILD_DIR)/asm/ctors.o @@ -627,11 +1108,35 @@ CTORS_O_FILES := \ DTORS_O_FILES := \ $(BUILD_DIR)/asm/dtors.o -RODATA_O_FILES := \ - $(BUILD_DIR)/asm/rodata.o +RODATA_O_FILES := \ + $(BUILD_DIR)/asm/rodata/rodata_Padclamp.o \ + $(BUILD_DIR)/asm/rodata/rodata_ptmf.o \ + $(BUILD_DIR)/asm/rodata/rodata_runtime.o \ + $(BUILD_DIR)/asm/rodata/rodata_GCN_mem_alloc.o \ + $(BUILD_DIR)/asm/rodata/rodata_alloc.o \ + $(BUILD_DIR)/asm/rodata/rodata_ansi_fp.o \ + $(BUILD_DIR)/asm/rodata/rodata_printf.o \ + $(BUILD_DIR)/asm/rodata/rodata_e_exp.o \ + $(BUILD_DIR)/asm/rodata/rodata_e_fmod.o \ + $(BUILD_DIR)/asm/rodata/rodata_e_pow.o \ + $(BUILD_DIR)/asm/rodata/rodata_e_rem_pio2.o \ + $(BUILD_DIR)/asm/rodata/rodata_k_rem_pio2.o \ + $(BUILD_DIR)/asm/rodata/rodata_k_tan.o \ + $(BUILD_DIR)/asm/rodata/rodata_s_atan.o \ + $(BUILD_DIR)/asm/rodata/rodata_nubinit.o \ + $(BUILD_DIR)/asm/rodata/rodata_msg.o \ + $(BUILD_DIR)/asm/rodata/rodata_msgbuf.o \ + $(BUILD_DIR)/asm/rodata/rodata_serpoll.o \ + $(BUILD_DIR)/asm/rodata/rodata_dispatch.o \ + $(BUILD_DIR)/asm/rodata/rodata_msghndlr.o \ + $(BUILD_DIR)/asm/rodata/rodata_support.o \ + $(BUILD_DIR)/asm/rodata/rodata_targimpl.o \ + $(BUILD_DIR)/asm/rodata/rodata_main_TRK.o \ + $(BUILD_DIR)/asm/rodata/rodata_dolphin_trk_glue.o \ + $(BUILD_DIR)/asm/rodata/rodata_main.o DATA_O_FILES := \ - $(BUILD_DIR)/asm/data.o \ + $(BUILD_DIR)/asm/data.o BSS_O_FILES := \ $(BUILD_DIR)/asm/bss.o @@ -642,8 +1147,29 @@ SDATA_O_FILES := \ SBSS_O_FILES := \ $(BUILD_DIR)/asm/sbss.o -SDATA2_O_FILES := \ - $(BUILD_DIR)/asm/sdata2.o +SDATA2_O_FILES := \ + $(BUILD_DIR)/asm/sdata2/ansi_fp.o \ + $(BUILD_DIR)/asm/sdata2/mbstring.o \ + $(BUILD_DIR)/asm/sdata2/printf.o \ + $(BUILD_DIR)/asm/sdata2/e_acos.o \ + $(BUILD_DIR)/asm/sdata2/e_asin.o \ + $(BUILD_DIR)/asm/sdata2/e_atan2.o \ + $(BUILD_DIR)/asm/sdata2/e_exp.o \ + $(BUILD_DIR)/asm/sdata2/e_pow.o \ + $(BUILD_DIR)/asm/sdata2/e_rem_pio2.o \ + $(BUILD_DIR)/asm/sdata2/k_cos.o \ + $(BUILD_DIR)/asm/sdata2/k_rem_pio2.o \ + $(BUILD_DIR)/asm/sdata2/k_sin.o \ + $(BUILD_DIR)/asm/sdata2/k_tan.o \ + $(BUILD_DIR)/asm/sdata2/s_atan.o \ + $(BUILD_DIR)/asm/sdata2/s_ceil.o \ + $(BUILD_DIR)/asm/sdata2/s_cos.o \ + $(BUILD_DIR)/asm/sdata2/s_floor.o \ + $(BUILD_DIR)/asm/sdata2/s_frexp.o \ + $(BUILD_DIR)/asm/sdata2/s_ldexp.o \ + $(BUILD_DIR)/asm/sdata2/s_sin.o \ + $(BUILD_DIR)/asm/sdata2/s_tan.o \ + $(BUILD_DIR)/asm/sdata2/e_sqrt.o SBSS2_O_FILES := \ $(BUILD_DIR)/asm/sbss2.o diff --git a/src/f/f_pc/f_pc_base.cpp b/src/f/f_pc/f_pc_base.cpp index a8a74026e5..c3d62385a2 100644 --- a/src/f/f_pc/f_pc_base.cpp +++ b/src/f/f_pc/f_pc_base.cpp @@ -1,5 +1,7 @@ #include "f/f_pc/f_pc_base.h" +#include "SComponent/c_malloc.h" #include "SComponent/c_phase.h" +#include "SStandard/s_basic.h" #include "dolphin/types.h" #include "f/f_pc/f_pc_delete_tag.h" #include "f/f_pc/f_pc_layer.h" @@ -18,8 +20,6 @@ extern s32 lbl_80450D00; // f_pc_base::g_fpcBs_type extern "C" { -extern void sBs_ClearArea(void* pPtr, s32 pSize); - BOOL fpcBs_Is_JustOfType(s32 pType1, s32 pType2) { return checkEqual(pType1, pType2); } @@ -54,7 +54,7 @@ s32 fpcBs_Execute(base_process_class* pProc) { void fpcBs_DeleteAppend(base_process_class* pProc) { if (pProc->mpUserData != NULL) { - free__3cMlFPv(pProc->mpUserData); + cMl::free(pProc->mpUserData); pProc->mpUserData = NULL; } } @@ -73,7 +73,7 @@ s32 fpcBs_Delete(base_process_class* pProc) { if (deleteResult == 1) { fpcBs_DeleteAppend(pProc); pProc->mBsType = 0; - free__3cMlFPv(pProc); + cMl::free(pProc); } return deleteResult; } @@ -81,11 +81,11 @@ s32 fpcBs_Delete(base_process_class* pProc) { base_process_class* fpcBs_Create(s16 pProcTypeID, u32 pProcID, void* pData) { process_profile_definition* procProfDef; base_process_class* procClass; - s32 size; + u32 size; procProfDef = fpcPf_Get(pProcTypeID); size = procProfDef->mSize + procProfDef->mSizeOther; - procClass = (base_process_class*)memalignB__3cMlFiUl(-4, size); + procClass = (base_process_class*)cMl::memalignB(-4, size); if (procClass == NULL) { return NULL; } else { diff --git a/src/f/f_pc/f_pc_create_req.cpp b/src/f/f_pc/f_pc_create_req.cpp index d828558d6e..753d7459ed 100644 --- a/src/f/f_pc/f_pc_create_req.cpp +++ b/src/f/f_pc/f_pc_create_req.cpp @@ -1,5 +1,6 @@ #include "dolphin/types.h" +#include "SComponent/c_malloc.h" #include "SComponent/c_phase.h" #include "f/f_pc/f_pc_base.h" #include "f/f_pc/f_pc_create_iter.h" @@ -32,8 +33,6 @@ void fpcCtRq_ToCreateQ(create_request* pReq) { fpcCtTg_ToCreateQ(&pReq->mBase.mBase); } -extern void free__3cMlFPv(void* pPtr); - BOOL fpcCtRq_Delete(create_request* pReq) { fpcCtRq_CreateQTo(pReq); if (pReq->mpCtRqMtd != NULL && fpcMtd_Method(pReq->mpCtRqMtd->mpDelete, pReq) == 0) { @@ -42,7 +41,7 @@ BOOL fpcCtRq_Delete(create_request* pReq) { if (pReq->mpRes) { pReq->mpRes->mpCtRq = NULL; } - free__3cMlFPv(pReq); + cMl::free(pReq); return 1; } } @@ -105,7 +104,7 @@ void fpcCtRq_Handler(void) { } create_request* fpcCtRq_Create(layer_class* pLayer, u32 size, create_request_method_class* pMthd) { - create_request* pReq = (create_request*)memalignB__3cMlFiUl(-4, size); + create_request* pReq = (create_request*)cMl::memalignB(-4, size); if (pReq != NULL) { fpcCtTg_Init(&pReq->mBase, pReq); diff --git a/src/f/f_pc/f_pc_node_req.cpp b/src/f/f_pc/f_pc_node_req.cpp index 1490a50cf9..8d3b0808bd 100644 --- a/src/f/f_pc/f_pc_node_req.cpp +++ b/src/f/f_pc/f_pc_node_req.cpp @@ -1,4 +1,6 @@ #include "f/f_pc/f_pc_node_req.h" +#include "SComponent/c_malloc.h" +#include "SStandard/s_basic.h" #include "dolphin/types.h" #include "f/f_pc/f_pc_base.h" #include "f/f_pc/f_pc_create_req.h" @@ -6,6 +8,7 @@ #include "f/f_pc/f_pc_deletor.h" #include "f/f_pc/f_pc_executor.h" #include "f/f_pc/f_pc_layer.h" +#include "f/f_pc/f_pc_stdcreate_req.h" // f_pc_node_req::l_fpcNdRq_Queue extern node_list_class lbl_803A3A38; @@ -23,9 +26,6 @@ extern s8 lbl_80450D4C; extern "C" { -extern s32 fpcSCtRq_Request(layer_class*, s16, process_method_func, void*, void*); -extern void sBs_ClearArea(void* pPtr, s32 pSize); - void fpcNdRq_RequestQTo(node_create_request* pNodeCreateReq) { fpcLy_CreatedMesg(pNodeCreateReq->mpLayerClass); fpcLy_CancelQTo(&pNodeCreateReq->mProcMthCls); @@ -49,8 +49,8 @@ s32 fpcNdRq_phase_IsCreated(node_create_request* pNodeCreateReq) { s32 fpcNdRq_phase_Create(node_create_request* pNodeCreateReq) { pNodeCreateReq->mCreatingID = fpcSCtRq_Request(pNodeCreateReq->mpLayerClass, pNodeCreateReq->mProcName, - pNodeCreateReq->mpNodeCrReqMthCls->mpPostMethodFunc, pNodeCreateReq, - pNodeCreateReq->mpUserData); + (stdCreateFunc)pNodeCreateReq->mpNodeCrReqMthCls->mpPostMethodFunc, + pNodeCreateReq, pNodeCreateReq->mpUserData); return pNodeCreateReq->mCreatingID == -1 ? 3 : 2; } @@ -104,7 +104,7 @@ s32 fpcNdRq_Delete(node_create_request* pNodeCreateReq) { fpcMtd_Method(pNodeCreateReq->mpNodeCrReqMthCls->mpUnkFunc, pNodeCreateReq) == 0) { return 0; } - free__3cMlFPv(pNodeCreateReq); + cMl::free(pNodeCreateReq); return 1; } @@ -175,8 +175,8 @@ s32 fpcNdRq_IsIng(process_node_class* pProcNode) { return 0; } -node_create_request* fpcNdRq_Create(s32 pRequestSize) { - node_create_request* req = (node_create_request*)memalignB__3cMlFiUl(-4, pRequestSize); +node_create_request* fpcNdRq_Create(u32 pRequestSize) { + node_create_request* req = (node_create_request*)cMl::memalignB(-4, pRequestSize); if (req != NULL) { if (lbl_80450D4C == 0) { lbl_80450D48 = 0; @@ -184,19 +184,6 @@ node_create_request* fpcNdRq_Create(s32 pRequestSize) { } sBs_ClearArea(req, pRequestSize); *req = lbl_803A3A44; - // req->mCreateTag = lbl_803A3A44.mCreateTag; - // req->mProcMthCls = lbl_803A3A44.mProcMthCls; - // req->mReqPhsProc = lbl_803A3A44.mReqPhsProc; - // req->mpPhsHandler = lbl_803A3A44.mpPhsHandler; - // req->mpNodeCrReqMthCls = lbl_803A3A44.mpNodeCrReqMthCls; - // req->mParameter = lbl_803A3A44.mParameter; - // req->mRequestId = lbl_803A3A44.mRequestId; - // req->mNodeProc = lbl_803A3A44.mNodeProc; - // req->mpLayerClass = lbl_803A3A44.mpLayerClass; - // req->mCreatingID = lbl_803A3A44.mCreatingID; - // req->mProcName = lbl_803A3A44.mProcName; - // req->mpUserData = lbl_803A3A44.mpUserData; - // req->unk_0x60 = lbl_803A3A44.unk_0x60; cTg_Create(&req->mCreateTag, req); fpcMtdTg_Init(&req->mProcMthCls, (process_method_tag_func)fpcNdRq_Cancel, req); req->mRequestId = lbl_80450D48++; diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp index 7001ca9f9a..cb53568629 100644 --- a/src/m_Do/m_Do_main.cpp +++ b/src/m_Do/m_Do_main.cpp @@ -11,13 +11,24 @@ #include "m_Do/m_Do_machine/m_Do_machine.h" #include "m_Do/m_Do_reset/m_Do_reset.h" +extern u8 lbl_80451A00; +extern u8 lbl_80451A04; +extern u8 lbl_80451A08; +extern u8 lbl_80451A0C; +extern u8 lbl_80451A10; +extern u8 lbl_80451A18; +// extern char lbl_803739A0[0x310]; + +extern char lbl_803739A0; + void version_check(void) { - if ((!strcmp((char*)lbl_803739A0, (char*)lbl_803739A0)) && - (!strcmp(((char*)lbl_803739A0 + 0xA), ((char*)lbl_803739A0 + 0xA)))) { + if ((!strcmp("20Apr2004", "20Apr2004")) && (!strcmp("Patch2", "Patch2"))) { return; } - OSReport_Error((char*)lbl_803739A0 + 0x11); + OSReport_Error((char*)"\x53\x44\x4B\x82\xCC\x83\x6F\x81\x5B\x83\x57\x83\x87\x83\x93\x82\xAA\x88" + "\xEA\x92\x76\x82\xB5\x82\xDC\x82\xB9\x82\xF1\x81\x42\x92\xE2\x8E\x7E\x82" + "\xB5\x82\xDC\x82\xB7\x0A"); do { } while (true); } @@ -93,24 +104,46 @@ void HeapCheck::heapDisplay(void) const { s32 heap_total_free_size = heap->getTotalFreeSize(); s32 heap_free_size = heap->getFreeSize(); - JUTReport__FiiPCce(0x64, 0xd4, lbl_803739A0 + 0x3C, names[0]); - JUTReport__FiiPCce(0x64, 0xe3, lbl_803739A0 + 0x45, heap_size1); - JUTReport__FiiPCce(0x64, 0xf0, lbl_803739A0 + 0x5B, heap_size); - JUTReport__FiiPCce(0x64, 0xfd, lbl_803739A0 + 0x71, heap_total_free_size - heap_size2); - JUTReport__FiiPCce(0x64, 0x10a, lbl_803739A0 + 0x87, heap_free_size - heap_size2); - JUTReport__FiiPCce(0x64, 0x117, lbl_803739A0 + 0x9D, heap_total_used_size); - JUTReport__FiiPCce(0x64, 0x124, lbl_803739A0 + 0xB3, + JUTReport__FiiPCce(0x64, 0xd4, "[%sName]", names[0]); + JUTReport__FiiPCce(0x64, 0xe3, "HeapSize %8ld", heap_size1); + JUTReport__FiiPCce(0x64, 0xf0, "TargetHeapSize %8ld", heap_size); + JUTReport__FiiPCce(0x64, 0xfd, "TotalFree %8ld", heap_total_free_size - heap_size2); + JUTReport__FiiPCce(0x64, 0x10a, "FreeSize %8ld", heap_free_size - heap_size2); + JUTReport__FiiPCce(0x64, 0x117, "TotalUsedSize %8ld", heap_total_used_size); + JUTReport__FiiPCce(0x64, 0x124, "TotalUsedRate %3ld%%", (int)(heap_total_used_size * 0x64) / (int)heap_size); - JUTReport__FiiPCce(0x64, 0x131, lbl_803739A0 + 0xCF, max_total_used_size); - JUTReport__FiiPCce(0x64, 0x13e, lbl_803739A0 + 0xE5, + JUTReport__FiiPCce(0x64, 0x131, "MaxTotalUsedSize %8ld", max_total_used_size); + JUTReport__FiiPCce(0x64, 0x13e, "MaxTotalUsedRate %3ld%%", (max_total_used_size * 0x64) / (int)heap_size); - JUTReport__FiiPCce(0x64, 0x14b, lbl_803739A0 + 0x101, max_total_free_size - heap_size2); - JUTReport__FiiPCce(0x64, 0x158, lbl_803739A0 + 0x117, + JUTReport__FiiPCce(0x64, 0x14b, "MinFreeSize %8ld", max_total_free_size - heap_size2); + JUTReport__FiiPCce(0x64, 0x158, "MinFreeRate %3ld%%", ((max_total_free_size - heap_size2) * 0x64) / (int)heap_size); heap_size2 = countUsed(heap); - JUTReport__FiiPCce(0x64, 0x165, lbl_803739A0 + 0x133, heap_size2); + JUTReport__FiiPCce(0x64, 0x165, "UsedCount %3ld%", heap_size2); } +const char* lbl_80373AEF = ""; +const char* lbl_80373AF0 = "TotalFree"; +const char* lbl_80373AFA = "MaxUsed "; +const char* lbl_80373B04 = "Used "; +const char* lbl_80373B0E = "RelUsed "; +const char* lbl_80373B18 = "/ MaxFree"; +const char* lbl_80373B22 = "/HeapSize"; +const char* lbl_80373B2C = "Blk/Bytes"; +const char* lbl_80373B36 = "ARAM Free"; +const char* lbl_80373B40 = "%d"; +const char* lbl_80373B43 = "%s"; +const char* lbl_80373B46 = " [%s]"; +const char* lbl_80373B4C = "%10d"; +const char* lbl_80373B51 = "Press X+Y+START to CLEAR console."; +const char* lbl_80373B73 = "3DStick UP/Down to scroll"; +const char* lbl_80373B8D = "Press A to output terminal from console."; +const char* lbl_80373BB6 = + "\x53\x43\x52\x4F\x4C\x4C\x81\x46\x25\x33\x64\x20\x25\x33\x64\x20\x25\x33\x64\x20\x4F\x75\x74" + "\x70\x75\x74\x3D\x25\x31\x78"; /* undecodable string */ +const char* lbl_80373BD5 = "Press L+R trigger to control console."; +const char* lbl_80373BFB = "Press [Z] trigger to close this window."; + asm void debugDisplay(void) { nofralloc #include "m_Do\m_Do_main\asm\func_80005AD8.s" @@ -122,30 +155,42 @@ asm void Debug_console(u32) { } #ifdef NONMATCHING - -extern void memcpy(void*, void*, int); - void LOAD_COPYDATE(void*) { - s32 dvd_status; - char buffer[32]; DVDFileInfo file_info; - dvd_status = DVDOpen((const char*)lbl_803739A0[0x283], &file_info); - + s32 dvd_status = DVDOpen("/str/Final/Release/COPYDATE", &file_info); if (dvd_status) { + char buffer[32]; DVDReadPrio(&file_info, buffer, 32, 0, 2); memcpy(lbl_803A2EE0, buffer, 17); DVDClose(&file_info); } - return; } #else +const char* lbl_80373C23 = "/str/Final/Release/COPYDATE"; asm void LOAD_COPYDATE(void*) { nofralloc #include "m_Do\m_Do_main\asm\func_8000614C.s" } #endif +const char* lbl_80373C3F = "Root"; +const char* lbl_80373C44 = "\x83\x8B\x81\x5B\x83\x67"; /* undecodable string */ +const char* lbl_80373C4B = "System"; +const char* lbl_80373C52 = "\x83\x56\x83\x58\x83\x65\x83\x80"; /* undecodable string */ +const char* lbl_80373C5B = "Zelda"; +const char* lbl_80373C61 = "\x83\x5B\x83\x8B\x83\x5F"; /* undecodable string */ +const char* lbl_80373C68 = "Game"; +const char* lbl_80373C6D = "\x83\x51\x81\x5B\x83\x80"; /* undecodable string */ +const char* lbl_80373C74 = "Archive"; +const char* lbl_80373C7C = "\x83\x41\x81\x5B\x83\x4A\x83\x43\x83\x75"; /* undecodable string */ +const char* lbl_80373C87 = "J2d"; +const char* lbl_80373C8B = "J2D"; +const char* lbl_80373C8F = "Hostio"; +const char* lbl_80373C96 = "\x83\x7A\x83\x58\x83\x67\x49\x4F"; /* undecodable string */ +const char* lbl_80373C9F = "Command"; +const char* lbl_80373CA7 = "\x83\x52\x83\x7D\x83\x93\x83\x68"; /* undecodable string */ + void debug(void) { if (lbl_80450580[0]) { if (lbl_80450B1A[0]) { diff --git a/tools/section2cpp.py b/tools/section2cpp.py new file mode 100644 index 0000000000..1187abc8fa --- /dev/null +++ b/tools/section2cpp.py @@ -0,0 +1,612 @@ +#!/usr/bin/env python3 +# PYTHON_ARGCOMPLETE_OK + +""" + +This script will extract literals and strings data +from sections located in the baserom.dol. +Useful when trying to match .rodata and .sdata2. + +Usage: +./tools/section2cpp.py --section .rodata --string --object JKRSolidHeap.o + +""" + +import argparse +import sys +import os +import struct +from decimal import getcontext, Decimal +from pathlib import Path, PurePath, PureWindowsPath +from typing import ( + Any, + Dict, + List, + Match, + NamedTuple, + NoReturn, + Optional, + Set, + Tuple, + Union, + Callable, + Pattern, +) + +try: + import numpy +except: + print("error: missing numpy") + sys.exit(1) + + +try: + import argcomplete # type: ignore +except ModuleNotFoundError: + argcomplete = None + +parser = argparse.ArgumentParser(description="Extract section data and generate C++ code.") + +parser.add_argument( + "--section", + dest="section", + type=str, + metavar="SECTION", + help="SECTION to extract data from.", + required=True +) + +parser.add_argument( + "--file-offset", + dest="file_offset", + type=lambda x: int(x,0), + metavar="OFFSET", + help="OFFSET in the baserom for the SECTION." +) + +parser.add_argument( + "--object", + dest="object_name", + type=str, + metavar="OBJECT", + help="OBJECT filename to extract data from. (e.g. JKRSolidHeap.o)" +) + +parser.add_argument( + "--map", + dest="map_path", + type=str, + metavar="MAP", + help="frameworkF.map path", + default="frameworkF.map" +) + +parser.add_argument( + "--baserom", + dest="baserom", + type=str, + metavar="DOL", + help="baserom.dol path", + default="baserom.dol" +) + +parser.add_argument( + "--string", + dest="as_string", + action="store_true", + help="Print arrays as strings" +) + +parser.add_argument( + "--array", + dest="as_array", + action="store_true", + help="Print everything as u8 arrays" +) + +parser.add_argument( + "--shift-jis", + dest="shift_jis", + action="store_true", + help="Convert shift-jis to utf-8" +) + + +# +# +# + +def _itersplit(l, splitters): + current = [] + for item in l: + if item in splitters: + yield current + current = [] + else: + current.append(item) + yield current + +def magicsplit(l, *splitters): + return [subl for subl in _itersplit(l, splitters) ] + +def str_encoding(data): + if data[-1] != 0: + return None + + try: + data.decode("utf-8") + return "utf-8" + except: + pass + + try: + data.decode("shift_jisx0213") + return "shift-jis" + except: + pass + + return None + +def encoding_char_list(encoding, data): + if args.shift_jis and encoding == "shift-jis": + try: + return escape(data.decode("shift_jisx0213")) + except: + pass + return [ str(bytes([x]))[2:-1].replace("\"", "\\\"") for x in data ] + +def raw_string(data): + return "".join(data) + +def raw_array(data): + return ",".join([hex(x) for x in list(data)]) + +def escape_char(v): + if v == "\n": + return "\\n" + elif v == "\t": + return "\\t" + elif v == "\v": + return "\\v" + elif v == "\b": + return "\\b" + elif v == "\r": + return "\\r" + elif v == "\f": + return "\\f" + elif v == "\a": + return "\\a" + elif v == "\\": + return "\\\\" + elif v == "\"": + return "\\\"" + elif ord(v) < 32 and ord(v) > 127: + return "\\x" + hex(v)[2:].upper().rjust(2, '0') + else: + return v + +def escape(v): + return "".join([ escape_char(x) for x in list(v) ]) + +def bytes2float32(data): + if len(data) < 4: + return None + result = numpy.frombuffer(data[0:4][::-1], dtype='float32') + if result: + return result[0] + else: + return None + +def bytes2float64(data): + if len(data) < 8: + return None + result = numpy.frombuffer(data[0:8][::-1], dtype='float64') + if result: + return result[0] + else: + return None + +def is_nice_float32(f): + try: + if int(f*1000) == f*1000: + return True + if int(f*100) == f*100: + return True + if int(f*10) == f*10: + return True + if int(f) == f: + return True + except: + return False + return False + +def is_nice_float64(f): + try: + if int(f*1000) == f*1000: + return True + if int(f*100) == f*100: + return True + if int(f*10) == f*10: + return True + if int(f) == f: + return True + except: + return False + return False + +float32_exact: Dict[numpy.float32, Tuple[int,int]] = {} +float64_exact: Dict[numpy.float64, Tuple[int,int]] = {} + +getcontext().prec = 64 +for i in range(1,32): + for j in range(1,32): + if i%j == 0: + continue + d = Decimal(i)/Decimal(j) + f = numpy.float32(d) + if str(f) != str(d): + if not f in float32_exact: + float32_exact[f] = (i,j) + +for i in range(1,32): + for j in range(1,32): + if i%j == 0: + continue + d = Decimal(i)/Decimal(j) + f = numpy.float64(d) + if str(f) != str(d): + if not f in float64_exact: + float64_exact[f] = (i,j) + +class Symbol: + def __init__(self, name, addr, size): + self.name = name + self.addr = addr + self.size = size + self.padding = 0 + + def __str__(self): + return " %s %s %s+%s %s" % (self.name.ljust(40, ' '), hex(self.addr), hex(self.addr + self.size), hex(self.padding), hex(self.size)) + +class ObjectFile: + def __init__(self, path): + self.path = path + self.symbols = [] + self.start = 0 + self.end = 0 + self.mk = False + + def addSymbol(self, name, str_addr, str_size): + addr = int(str_addr, base=16) + size = int(str_size, base=16) + + symbol = Symbol(name, addr, size) + if not self.symbols: + self.start = symbol.addr + else: + last_symbol = self.symbols[-1] + last_addr = last_symbol.addr + last_symbol.size + if last_addr != addr: + last_symbol.padding += addr - last_addr + self.symbols += [ symbol ] + + def setEnd(self, end): + self.end = end + last_symbol = self.symbols[-1] + last_symbol.padding = self.end - (last_symbol.addr + last_symbol.size) + +def find_symbols(): + file = map_path.open('r') + lines = file.readlines() + + in_section = False + last_obj = None + for line in lines: + data = [ x.strip() for x in line.strip().split(" ") ] + data = [ x for x in data if len(x) > 0 ] + + if len(data) == 3: + in_section = False + if data[0] == section: + in_section = True + continue + + if not in_section: + continue + if len(data) < 6 or len(data) > 7: + continue + + # get object filename + obj = data[5] + if len(data) > 6: + obj = data[6] + + # remove path from object filename + obj = obj.split("\\")[-1] + if last_obj != obj: + assert obj not in object_map + object_map[obj] = ObjectFile(obj) + last_obj = obj + + # add symbol + size = data[1] + addr = data[2] + name = data[4] + object_map[obj].addSymbol(name, addr, size) + + keys = list(object_map.keys()) + for i,_ in enumerate(keys[:-1]): + obj = object_map[keys[i]] + next_obj = object_map[keys[i + 1]] + obj.setEnd(next_obj.start) + + # total size of rodata must be aligned to 0x20 + obj = object_map[keys[-1]] + last_symbol = obj.symbols[-1] + last_addr = last_symbol.addr + last_symbol.size + last_symbol.padding = ((last_addr + 31) & ~31) - last_addr + file.close() + +def chunks(lst, n): + for i in range(0, len(lst), n): + yield lst[i:i + n] + +def data_as_string(data): + return ", ".join([ "0x" + hex(x)[2:].rjust(2, '0') for x in data ]) + + +class Literal: + def __init__(self, name, type, value, comment=None): + self.name = name + self.type = type + self.value = value + self.comment = comment + + def format(self): + return str(self.value) + + def lines(self): + line = "static const %s %s = %s;" % (self.type, self.name, self.format()) + if self.comment: + line = line.ljust(90, ' ') + " // " + self.comment + return [ line ] + + def __str__(self): + return "\n".join(self.lines()) + +class Label(Literal): + def __init__(self, name): + super().__init__(name, "", None, None) + + def lines(self): + return [ "", "", "// " + self.name ] + +class Float32Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "float", value, comment) + + def format(self): + return "%sf" % self.value + +class Float64Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "double", value, comment) + +class FractionFloat32Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "float", value, comment) + + def format(self): + return "%i.0f / %i.0f" % self.value + +class FractionFloat64Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "double", value, comment) + + def format(self): + return "%i.0 / %i.0" % self.value + +class U32Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "u32", value, comment) + +class S32Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "s32", value, comment) + +class S64Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "s64", value, comment) + +class U64Literal(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "u64", value, comment) + +class ArrayLiteral(Literal): + def __init__(self, name, value, comment=None): + super().__init__(name, "u8", value, comment) + + def lines(self): + one_line = "static const %s %s[%i] = { %s };" % (self.type, self.name, len(self.value), data_as_string(self.value)) + + lines = [] + if len(one_line) < 90: + lines += [ one_line ] + else: + lines += [ "static const %s %s[%i] = {" % (self.type, self.name, len(self.value)) ] + data_chunks = chunks(list(self.value), 16) + for chunk in data_chunks: + lines += [ " " + data_as_string(chunk) ] + lines += [ "};" ] + + if lines and self.comment: + lines[0] = lines[0].ljust(90, ' ') + " // " + self.comment + return lines + +class StringLiteral(Literal): + def __init__(self, name, encoding, value, comment=None): + assert value[-1] == 0 + super().__init__(name, "char", value[:-1], comment) + self.encoding = encoding + + def lines(self): + char_list = encoding_char_list(self.encoding, self.value) + one_line = "static const %s %s = \"%s\";" % (self.type, self.name, raw_string(char_list)) + + lines = [] + if len(one_line) < 90: + lines += [ one_line ] + else: + lines += [ "static const %s %s = " % (self.type, self.name) ] + data_chunks = chunks(char_list, 16) + for chunk in data_chunks: + lines += [ " \"%s\"" % raw_string(chunk) ] + lines[-1] += ";" + + if lines and self.comment: + lines[0] = lines[0].ljust(90, ' ') + " // " + self.comment + return lines + +def output_cpp(): + object_names = [] + if object_name: + if not object_name in object_map: + print("error: %s object file not found!" % object_name) + sys.exit(1) + object_names += [ object_name ] + else: + object_names = [*object_map.keys()] + + br = baserom.open("rb") + br.seek(0, os.SEEK_END) + br_size = br.tell() + br.seek(0, os.SEEK_SET) + + literals = [] + for obj_name in object_names: + literals += [ Label(obj_name) ] + + obj = object_map[obj_name] + for symbol in obj.symbols: + label = "lbl_%s" % (hex(symbol.addr).upper()[2:]) + + symbol_file_offset = symbol.addr - file_offset + symbol_file_size = symbol.size + symbol.padding + + if symbol_file_offset + symbol_file_size > br_size: + print("error: reading outside baserom file. (%i, %i)" % (symbol_file_offset + symbol_file_size, br_size)) + + br.seek(symbol_file_offset, os.SEEK_SET) + data = br.read(symbol.size) + padding = br.read(symbol.padding) + + if args.as_string: + offset = 0 + str_segments = [ x for x in magicsplit(data, 0) ] + for segment in str_segments[:-1]: + str_data = bytes(segment + [0]) + encoding = str_encoding(str_data) + + str_label = "lbl_%s" % (hex(symbol.addr + offset).upper()[2:]) + if encoding == "shift-jis": + literals += [ StringLiteral(str_label, "shift-jis", str_data, "TODO: shift-jis strings in Metrowerks") ] + elif encoding == "utf-8": + literals += [ StringLiteral(str_label, "utf-8", str_data) ] + else: + literals += [ ArrayLiteral(str_label, str_data, "undecodable string") ] + offset += len(str_data) + + if padding: + padding_label = "lbl_%s" % (hex(symbol.addr + symbol.size).upper()[2:]) + literals += [ StringLiteral(padding_label, None, padding, "padding") ] + padding = None + elif args.as_array: + literals += [ ArrayLiteral(label, data) ] + else: + lit = None + if len(data) == 4: + u32_data = struct.unpack('>I', data)[0] + s32_data = struct.unpack('>i', data)[0] + float_data = bytes2float32(data) + + if s32_data == 0 or (s32_data >= -4096 and s32_data <= 4096): + lit = S32Literal(label, s32_data) + elif u32_data == 0 or (u32_data < 4096): + lit = U32Literal(label, u32_data) + elif float_data in float32_exact: + lit = FractionFloat32Literal(label, float32_exact[float_data], "%sf %s" % (float_data, hex(u32_data))) + elif is_nice_float32(float_data): + lit = Float32Literal(label, float_data, hex(u32_data)) + + elif len(data) == 8: + u64_data = struct.unpack('>Q', data)[0] + s64_data = struct.unpack('>q', data)[0] + double_data = bytes2float64(data) + + if u64_data == 0x4330000000000000: + lit = Float64Literal(label, double_data, "%s | u32 to float (compiler-generated)" % hex(u64_data)) + elif u64_data == 0x4330000080000000: + lit = Float64Literal(label, double_data, "%s | s32 to float (compiler-generated)" % hex(u64_data)) + elif s64_data == 0 or (s64_data >= -4096 and s64_data <= 4096): + lit = S64Literal(label, s64_data) + elif u64_data == 0 or (u64_data < 4096): + lit = U64Literal(label, u64_data) + elif double_data in float64_exact: + lit = FractionFloat64Literal(label, float64_exact[double_data], "%s %s" % (double_data, hex(u64_data))) + elif is_nice_float64(double_data): + lit = Float64Literal(label, double_data, hex(u64_data)) + + if not lit: + lit = ArrayLiteral(label, data) + literals += [ lit ] + + if padding: + padding_label = "lbl_%s" % (hex(symbol.addr + symbol.size).upper()[2:]) + literals += [ ArrayLiteral(padding_label, padding, "padding") ] + + for lit in literals: + print(lit) + + br.close() + +# +# +# + +try: + args = parser.parse_args() +except: + parser.print_help() + sys.exit(0) + +section = args.section +object_name = args.object_name +file_offset: Optional[int] = args.file_offset +baserom = Path(args.baserom) +map_path = Path(args.map_path) + +file_offsets = { + ".rodata": 0x80003000, + ".sdata": 0x800802A0, + ".sdata2": 0x800811A0, +} + +if not file_offset: + if not section in file_offsets: + print("error: missing --file-offset") + sys.exit(1) + else: + file_offset = file_offsets[section] + +if not baserom.exists(): + print("error: baserom '%s' not found!" % args.baserom) + sys.exit(1) + +if not map_path.exists(): + print("error: frameworkF.map '%s' not found!" % args.map_path) + sys.exit(1) + +object_map: Dict[str,ObjectFile] = {} + +find_symbols() +output_cpp()