diff options
| -rw-r--r-- | asm/data.s | 17 | ||||
| -rw-r--r-- | asm/sdata.s | 15 | ||||
| -rw-r--r-- | asm/text_1.s | 18 |
3 files changed, 46 insertions, 4 deletions
@@ -151,7 +151,22 @@ lbl_80405F54: .balign 8, 0 .global lbl_80405F60 lbl_80405F60: - .incbin "baserom.dol", 0x402060, 0x60 + .4byte lbl_8063D300 + + .balign 8, 0 + .global lbl_80405F68 +lbl_80405F68: + .4byte func_8000AACC, func_8000AAD8, func_8000AAE4, DrawableCharacter_GetAnimController + .4byte func_8000AAF0, func_8000AAFC, func_8000AB18 + + .global lbl_80405F84 +lbl_80405F84: + .asciz "PBRFloor" + + .balign 4, 0 + .global lbl_80405F90 +lbl_80405F90: + .incbin "baserom.dol", 0x402090, 0x30 .global lbl_80405FC0 lbl_80405FC0: diff --git a/asm/sdata.s b/asm/sdata.s index 92a96c4..2342e3f 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -36,21 +36,30 @@ lbl_8063D2E0: lbl_8063D2E8: .4byte lbl_80405EE4, lbl_80405EF8 + .balign 4, 0 .global lbl_8063D2F0 lbl_8063D2F0: - .incbin "baserom.dol", 0x471030, 0x8 + .4byte lbl_80405F04 + .balign 8, 0 .global lbl_8063D2F8 lbl_8063D2F8: - .incbin "baserom.dol", 0x471038, 0x10 + .4byte lbl_80405F44, lbl_80405F54 + + .balign 4, 0 + .global lbl_8063D300 +lbl_8063D300: + .4byte lbl_80405F84, lbl_80405F90 + .balign 4, 0 .global lbl_8063D308 lbl_8063D308: .incbin "baserom.dol", 0x471048, 0x10 -.global lbl_8063D318 + .global lbl_8063D318 lbl_8063D318: .incbin "baserom.dol", 0x471058, 0x4 + .global lbl_8063D31C lbl_8063D31C: .incbin "baserom.dol", 0x47105C, 0x4 diff --git a/asm/text_1.s b/asm/text_1.s index 45e5bb1..9dceb1f 100644 --- a/asm/text_1.s +++ b/asm/text_1.s @@ -4759,18 +4759,33 @@ func_8000AAA4: func_8000AAC4: /* 8000AAC4 00006724 90 83 00 04 */ stw r4, 4(r3) /* 8000AAC8 00006728 4E 80 00 20 */ blr + +.global func_8000AACC +func_8000AACC: /* 8000AACC 0000672C 80 63 00 04 */ lwz r3, 4(r3) /* 8000AAD0 00006730 88 63 00 05 */ lbz r3, 5(r3) /* 8000AAD4 00006734 4E 80 00 20 */ blr + +.global func_8000AAD8 +func_8000AAD8: /* 8000AAD8 00006738 80 63 00 04 */ lwz r3, 4(r3) /* 8000AADC 0000673C 80 63 00 08 */ lwz r3, 8(r3) /* 8000AAE0 00006740 4E 80 00 20 */ blr + +.global func_8000AAE4 +func_8000AAE4: /* 8000AAE4 00006744 80 63 00 04 */ lwz r3, 4(r3) /* 8000AAE8 00006748 80 63 00 08 */ lwz r3, 8(r3) /* 8000AAEC 0000674C 4E 80 00 20 */ blr + +.global func_8000AAF0 +func_8000AAF0: /* 8000AAF0 00006750 80 63 00 04 */ lwz r3, 4(r3) /* 8000AAF4 00006754 A0 63 00 06 */ lhz r3, 6(r3) /* 8000AAF8 00006758 4E 80 00 20 */ blr + +.global func_8000AAFC +func_8000AAFC: /* 8000AAFC 0000675C 80 63 00 04 */ lwz r3, 4(r3) /* 8000AB00 00006760 80 03 00 10 */ lwz r0, 0x10(r3) /* 8000AB04 00006764 54 03 0F FE */ srwi r3, r0, 0x1f @@ -4781,6 +4796,9 @@ DrawableCharacter_GetAnimController: /* 8000AB0C 0000676C 80 63 00 04 */ lwz r3, 4(r3) /* 8000AB10 00006770 80 63 00 0C */ lwz r3, 0xc(r3) /* 8000AB14 00006774 4E 80 00 20 */ blr + +.global func_8000AB18 +func_8000AB18: /* 8000AB18 00006778 80 63 00 04 */ lwz r3, 4(r3) /* 8000AB1C 0000677C 88 63 00 02 */ lbz r3, 2(r3) /* 8000AB20 00006780 4E 80 00 20 */ blr |