diff options
| -rw-r--r-- | asm/ctors.s | 3 | ||||
| -rw-r--r-- | asm/data.s | 36 | ||||
| -rw-r--r-- | asm/rodata.s | 16 | ||||
| -rw-r--r-- | asm/sdata.s | 14 | ||||
| -rw-r--r-- | asm/text_1.s | 42 |
5 files changed, 94 insertions, 17 deletions
diff --git a/asm/ctors.s b/asm/ctors.s index 61a9da1..57f0327 100644 --- a/asm/ctors.s +++ b/asm/ctors.s @@ -8,4 +8,5 @@ lbl_803E1E60: .4byte func_8000A7A4, func_8000AAA4, func_8000AD5C, func_80024900 .4byte func_80025370, func_80028490, func_8002A8F0, func_8002ABC8 .4byte func_8002BB24, func_8002CAE0, func_8002DE0C, func_80030114 - .incbin "baserom.dol", 0x3DDFA0, 0x400 + .4byte func_80030300, func_80030B80, func_800310B8, func_80031524 + .incbin "baserom.dol", 0x3DDFB0, 0x3F0 @@ -166,21 +166,41 @@ lbl_80405F84: .balign 4, 0 .global lbl_80405F90 lbl_80405F90: - .incbin "baserom.dol", 0x402090, 0x30 + .4byte lbl_8063D310, 0x00000000, 0x00000000 + .balign 4, 0 + .global lbl_80405F9C +lbl_80405F9C: + .asciz "gsapi::GSfloorData" + + .balign 4, 0 + .global lbl_80405FB0 +lbl_80405FB0: + .asciz "gsapi::GSfloor" + + .balign 4, 0 .global lbl_80405FC0 lbl_80405FC0: - .incbin "baserom.dol", 0x4020C0, 0x34 -.global lbl_80405FF4 + .asciz "## CHECK ## FLAGID_ColosseumXX_WL is not found.\n" + + .balign 4, 0 + .global lbl_80405FF4 lbl_80405FF4: - .incbin "baserom.dol", 0x4020F4, 0x28 -.global lbl_8040601C + .4byte lbl_8000C3B4, lbl_8000C3D0, lbl_8000C3EC, lbl_8000C408 + .4byte lbl_8000C424, lbl_8000C440, lbl_8000C470, lbl_8000C48C + .4byte lbl_8000C4BC, lbl_8000C4D8 + + .balign 4, 0 + .global lbl_8040601C lbl_8040601C: - .incbin "baserom.dol", 0x40211C, 0x38 -.global lbl_80406054 + .asciz "## CHECK ## FLAGID_ColosseumXX_second is not found.\n" + + .balign 4, 0 + .global lbl_80406054 lbl_80406054: .incbin "baserom.dol", 0x402154, 0x166 -.global lbl_804061BA + + .global lbl_804061BA lbl_804061BA: .incbin "baserom.dol", 0x4022BA, 0xFA .global lbl_804062B4 diff --git a/asm/rodata.s b/asm/rodata.s index d4db54f..7cc1535 100644 --- a/asm/rodata.s +++ b/asm/rodata.s @@ -2,18 +2,24 @@ .section .rodata, "wa" # 0x803E22C0 - 0x80405D60 -.global lbl_803E22C0 + .global lbl_803E22C0 lbl_803E22C0: - .incbin "baserom.dol", 0x3DE3C0, 0x18 -.global lbl_803E22D8 + .2byte 0x21, 0x19, 0x11, 0x21, 0x19, 0x11, 0x19, 0x11 + .2byte 0x19, 0x11 + + .balign 8, 0 + .global lbl_803E22D8 lbl_803E22D8: .incbin "baserom.dol", 0x3DE3D8, 0x10 -.global lbl_803E22E8 + + .global lbl_803E22E8 lbl_803E22E8: .incbin "baserom.dol", 0x3DE3E8, 0x4550 -.global lbl_803E6838 + + .global lbl_803E6838 lbl_803E6838: .incbin "baserom.dol", 0x3E2938, 0x8748 + .global lbl_803EEF80 lbl_803EEF80: .incbin "baserom.dol", 0x3EB080, 0xA1F0 diff --git a/asm/sdata.s b/asm/sdata.s index 2342e3f..742ff88 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -54,18 +54,26 @@ lbl_8063D300: .balign 4, 0 .global lbl_8063D308 lbl_8063D308: - .incbin "baserom.dol", 0x471048, 0x10 + .4byte lbl_80405F9C + .balign 8, 0 + .global lbl_8063D310 +lbl_8063D310: + .4byte lbl_80405FB0 + + .balign 8, 0 .global lbl_8063D318 lbl_8063D318: .incbin "baserom.dol", 0x471058, 0x4 -.global lbl_8063D31C + .global lbl_8063D31C lbl_8063D31C: .incbin "baserom.dol", 0x47105C, 0x4 -.global lbl_8063D320 + + .global lbl_8063D320 lbl_8063D320: .incbin "baserom.dol", 0x471060, 0x4 + .global lbl_8063D324 lbl_8063D324: .incbin "baserom.dol", 0x471064, 0x4 diff --git a/asm/text_1.s b/asm/text_1.s index 1f766c4..ea756cd 100644 --- a/asm/text_1.s +++ b/asm/text_1.s @@ -6674,6 +6674,9 @@ func_8000C378: /* 8000C3A8 00008008 7C 84 00 2E */ lwzx r4, r4, r0 /* 8000C3AC 0000800C 7C 89 03 A6 */ mtctr r4 /* 8000C3B0 00008010 4E 80 04 20 */ bctr + +.global lbl_8000C3B4 +lbl_8000C3B4: /* 8000C3B4 00008014 88 03 00 14 */ lbz r0, 0x14(r3) /* 8000C3B8 00008018 2C 00 00 00 */ cmpwi r0, 0 /* 8000C3BC 0000801C 40 82 00 0C */ bne lbl_8000C3C8 @@ -6682,6 +6685,9 @@ func_8000C378: lbl_8000C3C8: /* 8000C3C8 00008028 38 A0 01 B1 */ li r5, 0x1b1 /* 8000C3CC 0000802C 48 00 01 24 */ b lbl_8000C4F0 + +.global lbl_8000C3D0 +lbl_8000C3D0: /* 8000C3D0 00008030 A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C3D4 00008034 28 00 00 01 */ cmplwi r0, 1 /* 8000C3D8 00008038 40 82 00 0C */ bne lbl_8000C3E4 @@ -6690,6 +6696,9 @@ lbl_8000C3C8: lbl_8000C3E4: /* 8000C3E4 00008044 38 A0 01 B2 */ li r5, 0x1b2 /* 8000C3E8 00008048 48 00 01 08 */ b lbl_8000C4F0 + +.global lbl_8000C3EC +lbl_8000C3EC: /* 8000C3EC 0000804C A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C3F0 00008050 28 00 00 01 */ cmplwi r0, 1 /* 8000C3F4 00008054 40 82 00 0C */ bne lbl_8000C400 @@ -6698,6 +6707,9 @@ lbl_8000C3E4: lbl_8000C400: /* 8000C400 00008060 38 A0 01 B3 */ li r5, 0x1b3 /* 8000C404 00008064 48 00 00 EC */ b lbl_8000C4F0 + +.global lbl_8000C408 +lbl_8000C408: /* 8000C408 00008068 A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C40C 0000806C 28 00 00 01 */ cmplwi r0, 1 /* 8000C410 00008070 40 82 00 0C */ bne lbl_8000C41C @@ -6706,6 +6718,9 @@ lbl_8000C400: lbl_8000C41C: /* 8000C41C 0000807C 38 A0 01 B4 */ li r5, 0x1b4 /* 8000C420 00008080 48 00 00 D0 */ b lbl_8000C4F0 + +.global lbl_8000C424 +lbl_8000C424: /* 8000C424 00008084 A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C428 00008088 28 00 00 01 */ cmplwi r0, 1 /* 8000C42C 0000808C 40 82 00 0C */ bne lbl_8000C438 @@ -6714,6 +6729,9 @@ lbl_8000C41C: lbl_8000C438: /* 8000C438 00008098 38 A0 01 B5 */ li r5, 0x1b5 /* 8000C43C 0000809C 48 00 00 B4 */ b lbl_8000C4F0 + +.global lbl_8000C440 +lbl_8000C440: /* 8000C440 000080A0 88 03 00 14 */ lbz r0, 0x14(r3) /* 8000C444 000080A4 28 00 00 06 */ cmplwi r0, 6 /* 8000C448 000080A8 40 82 00 20 */ bne lbl_8000C468 @@ -6728,6 +6746,9 @@ lbl_8000C460: lbl_8000C468: /* 8000C468 000080C8 38 A0 01 B7 */ li r5, 0x1b7 /* 8000C46C 000080CC 48 00 00 84 */ b lbl_8000C4F0 + +.global lbl_8000C470 +lbl_8000C470: /* 8000C470 000080D0 A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C474 000080D4 28 00 00 01 */ cmplwi r0, 1 /* 8000C478 000080D8 40 82 00 0C */ bne lbl_8000C484 @@ -6736,6 +6757,9 @@ lbl_8000C468: lbl_8000C484: /* 8000C484 000080E4 38 A0 01 B8 */ li r5, 0x1b8 /* 8000C488 000080E8 48 00 00 68 */ b lbl_8000C4F0 + +.global lbl_8000C48C +lbl_8000C48C: /* 8000C48C 000080EC 88 03 00 14 */ lbz r0, 0x14(r3) /* 8000C490 000080F0 28 00 00 0A */ cmplwi r0, 0xa /* 8000C494 000080F4 40 82 00 20 */ bne lbl_8000C4B4 @@ -6750,6 +6774,9 @@ lbl_8000C4AC: lbl_8000C4B4: /* 8000C4B4 00008114 38 A0 01 BA */ li r5, 0x1ba /* 8000C4B8 00008118 48 00 00 38 */ b lbl_8000C4F0 + +.global lbl_8000C4BC +lbl_8000C4BC: /* 8000C4BC 0000811C A0 03 00 9A */ lhz r0, 0x9a(r3) /* 8000C4C0 00008120 28 00 00 01 */ cmplwi r0, 1 /* 8000C4C4 00008124 40 82 00 0C */ bne lbl_8000C4D0 @@ -6758,6 +6785,9 @@ lbl_8000C4B4: lbl_8000C4D0: /* 8000C4D0 00008130 38 A0 01 BB */ li r5, 0x1bb /* 8000C4D4 00008134 48 00 00 1C */ b lbl_8000C4F0 + +.global lbl_8000C4D8 +lbl_8000C4D8: /* 8000C4D8 00008138 38 60 00 39 */ li r3, 0x39 /* 8000C4DC 0000813C 48 15 65 B5 */ bl func_80162A90 /* 8000C4E0 00008140 2C 03 00 00 */ cmpwi r3, 0 @@ -47614,6 +47644,9 @@ lbl_800302DC: /* 800302F4 0002BF54 7C 08 03 A6 */ mtlr r0 /* 800302F8 0002BF58 38 21 00 20 */ addi r1, r1, 0x20 /* 800302FC 0002BF5C 4E 80 00 20 */ blr + +.global func_80030300 +func_80030300: /* 80030300 0002BF60 38 A0 00 01 */ li r5, 1 /* 80030304 0002BF64 38 6D 97 48 */ addi r3, r13, lbl_8063EA08-_SDA_BASE_ /* 80030308 0002BF68 38 80 00 04 */ li r4, 4 @@ -48268,6 +48301,9 @@ lbl_80030B50: /* 80030B74 0002C7D4 7C 08 03 A6 */ mtlr r0 /* 80030B78 0002C7D8 38 21 00 70 */ addi r1, r1, 0x70 /* 80030B7C 0002C7DC 4E 80 00 20 */ blr + +.global func_80030B80 +func_80030B80: /* 80030B80 0002C7E0 38 A0 00 01 */ li r5, 1 /* 80030B84 0002C7E4 38 6D 97 50 */ addi r3, r13, lbl_8063EA10-_SDA_BASE_ /* 80030B88 0002C7E8 38 80 00 04 */ li r4, 4 @@ -48664,6 +48700,9 @@ lbl_80031098: /* 800310AC 0002CD0C 7C 08 03 A6 */ mtlr r0 /* 800310B0 0002CD10 38 21 00 F0 */ addi r1, r1, 0xf0 /* 800310B4 0002CD14 4E 80 00 20 */ blr + +.global func_800310B8 +func_800310B8: /* 800310B8 0002CD18 38 A0 00 01 */ li r5, 1 /* 800310BC 0002CD1C 38 6D 97 58 */ addi r3, r13, lbl_8063EA18-_SDA_BASE_ /* 800310C0 0002CD20 38 80 00 04 */ li r4, 4 @@ -48979,6 +49018,9 @@ lbl_8003150C: /* 80031518 0002D178 7C 08 03 A6 */ mtlr r0 /* 8003151C 0002D17C 38 21 00 B0 */ addi r1, r1, 0xb0 /* 80031520 0002D180 4E 80 00 20 */ blr + +.global func_80031524 +func_80031524: /* 80031524 0002D184 38 A0 00 01 */ li r5, 1 /* 80031528 0002D188 38 6D 97 60 */ addi r3, r13, lbl_8063EA20-_SDA_BASE_ /* 8003152C 0002D18C 38 80 00 04 */ li r4, 4 |