falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #178 from Ibot02/pointer-fix 

Add missing JP pointers
This commit is contained in:
notyourav 2021-10-24 18:17:17 -07:00 committed by GitHub
parent e65b27be08 f180caeb6f
commit f04116cbf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/code_0801D79C.s
View File

@ -2202,14 +2202,14 @@ _0801E8BC:
bl sub_0801E810 bl sub_0801E810
cmp r0, #0 cmp r0, #0
bne _0801E93A bne _0801E93A
ldr r1, _0801E8F4 @ =0x080C9A5C ldr r1, _0801E8F4 @ =gUnk_080FC3E4
lsls r0, r4, #3 lsls r0, r4, #3
adds r0, r0, r1 adds r0, r0, r1
ldrb r1, [r0, #4] ldrb r1, [r0, #4]
lsls r0, r1, #2 lsls r0, r1, #2
adds r0, r0, r1 adds r0, r0, r1
lsls r0, r0, #2 lsls r0, r0, #2
ldr r1, _0801E8F8 @ =0x080FDFD0 ldr r1, _0801E8F8 @ =gUnk_080FE320
adds r2, r0, r1 adds r2, r0, r1
ldrb r0, [r2, #0x10] ldrb r0, [r2, #0x10]
cmp r0, #4 cmp r0, #4
@ -2220,8 +2220,8 @@ _0801E8BC:
ldr r0, [r0] ldr r0, [r0]
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_0801E8F4: .4byte 0x080C9A5C _0801E8F4: .4byte gUnk_080C9CBC
_0801E8F8: .4byte 0x080FDFD0 _0801E8F8: .4byte gUnk_080FE320
_0801E8FC: .4byte _0801E900 _0801E8FC: .4byte _0801E900
_0801E900: @ jump table _0801E900: @ jump table
.4byte _0801E914 @ case 0 .4byte _0801E914 @ case 0

4
asm/figurineDevice.s
View File

@ -1098,7 +1098,7 @@ sub_08088160: @ 0x08088160
push {r4, lr} push {r4, lr}
adds r2, r0, #0 adds r2, r0, #0
lsls r1, r1, #3 lsls r1, r1, #3
ldr r0, _08087FB0 @ =0x080FC094 ldr r0, _08087FB0 @ =gUnk_080FC3E4
adds r1, r1, r0 adds r1, r1, r0
movs r4, #0 movs r4, #0
adds r0, r2, #0 adds r0, r2, #0
@ -1116,7 +1116,7 @@ sub_08088160: @ 0x08088160
beq _08087FBC beq _08087FBC
b _0808806A b _0808806A
.align 2, 0 .align 2, 0
_08087FB0: .4byte 0x080FC094 _08087FB0: .4byte gUnk_080FC3E4
_08087FB4: _08087FB4:
cmp r0, #0x20 cmp r0, #0x20
beq _08087FCA beq _08087FCA

4
asm/windTribeTeleporter.s
View File

@ -201,12 +201,12 @@ _080A0E50:
lsls r0, r1, #2 lsls r0, r1, #2
adds r0, r0, r1 adds r0, r0, r1
lsls r0, r0, #2 lsls r0, r0, #2
ldr r1, _080A0E70 @ =0x0813AA18 ldr r1, _080A0E70 @ =gUnk_0813ADEC
adds r0, r0, r1 adds r0, r0, r1
bl DoExitTransition bl DoExitTransition
b _080A0E8C b _080A0E8C
.align 2, 0 .align 2, 0
_080A0E70: .4byte 0x0813AA18 _080A0E70: .4byte gUnk_0813ADEC
_080A0E74: _080A0E74:
ldr r0, _080A0E90 @ =0x030010A0 ldr r0, _080A0E90 @ =0x030010A0
ldr r0, [r0] ldr r0, [r0]