diff options
| author | Revo <projectrevotpp@hotmail.com> | 2020-09-11 11:22:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 11:22:30 -0400 |
| commit | b5e793fb8f97b7fbb6d835b08b3d1ddc7b392cb6 (patch) | |
| tree | f675c61f99662a3bfa7876f2715188f8a32d89c1 | |
| parent | 13d40969df52dcd8cbc66467b0d462d4625110d9 (diff) | |
| parent | e35a8f1d64a1dc1a418fc1d91ac2b5d244946051 (diff) | |
Merge pull request #33 from red031000/master
some more data and sdata
| -rw-r--r-- | asm/data.s | 20 | ||||
| -rw-r--r-- | asm/sdata.s | 33 | ||||
| -rw-r--r-- | asm/text_1.s | 3 |
3 files changed, 45 insertions, 11 deletions
@@ -132,12 +132,28 @@ lbl_80405F20: .balign 8, 0 .global lbl_80405F38 lbl_80405F38: - .incbin "baserom.dol", 0x402038, 0x28 + .4byte lbl_8063D2F8 + .balign 8, 0 + .global lbl_80405F40 +lbl_80405F40: + .4byte func_8000AC44 + + .global lbl_80405F44 +lbl_80405F44: + .asciz "PBRFloorData" + + .balign 4, 0 + .global lbl_80405F54 +lbl_80405F54: + .4byte lbl_8063D308, 0x00000000 + + .balign 8, 0 .global lbl_80405F60 lbl_80405F60: .incbin "baserom.dol", 0x402060, 0x60 -.global lbl_80405FC0 + + .global lbl_80405FC0 lbl_80405FC0: .incbin "baserom.dol", 0x4020C0, 0x34 .global lbl_80405FF4 diff --git a/asm/sdata.s b/asm/sdata.s index 9dfab90..92a96c4 100644 --- a/asm/sdata.s +++ b/asm/sdata.s @@ -14,24 +14,39 @@ lbl_8063D2C8: .balign 4, 0 .global lbl_8063D2D0 lbl_8063D2D0: - .incbin "baserom.dol", 0x471010, 0x8 -.global lbl_8063D2D8 + .4byte lbl_80405D88 + + .balign 8, 0 + .global lbl_8063D2D8 lbl_8063D2D8: - .incbin "baserom.dol", 0x471018, 0x4 -.global lbl_8063D2DC + .2byte 0x4364 + + .balign 4, 0 + .global lbl_8063D2DC lbl_8063D2DC: - .incbin "baserom.dol", 0x47101C, 0x4 -.global lbl_8063D2E0 + .2byte 0x43CC + + .balign 4, 0 + .global lbl_8063D2E0 lbl_8063D2E0: - .incbin "baserom.dol", 0x471020, 0x8 + .asciz "main" + .balign 4, 0 .global lbl_8063D2E8 lbl_8063D2E8: - .incbin "baserom.dol", 0x471028, 0x8 + .4byte lbl_80405EE4, lbl_80405EF8 .global lbl_8063D2F0 lbl_8063D2F0: - .incbin "baserom.dol", 0x471030, 0x28 + .incbin "baserom.dol", 0x471030, 0x8 + + .global lbl_8063D2F8 +lbl_8063D2F8: + .incbin "baserom.dol", 0x471038, 0x10 + + .global lbl_8063D308 +lbl_8063D308: + .incbin "baserom.dol", 0x471048, 0x10 .global lbl_8063D318 lbl_8063D318: diff --git a/asm/text_1.s b/asm/text_1.s index 806a8ff..776cc46 100644 --- a/asm/text_1.s +++ b/asm/text_1.s @@ -4871,6 +4871,9 @@ lbl_8000AC34: /* 8000AC38 00006898 38 84 5F 60 */ addi r4, r4, lbl_80405F60@l /* 8000AC3C 0000689C 90 83 00 00 */ stw r4, 0(r3) /* 8000AC40 000068A0 4E 80 00 20 */ blr + +.global func_8000AC44 +func_8000AC44: /* 8000AC44 000068A4 80 A3 00 04 */ lwz r5, 4(r3) /* 8000AC48 000068A8 38 C0 00 00 */ li r6, 0 /* 8000AC4C 000068AC 80 E3 00 08 */ lwz r7, 8(r3) |