diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-03-04 23:32:12 -0600 |
| commit | d12fd5c5ce574dd920a968794591afe7d42659fb (patch) | |
| tree | 95a469d0243864473d13cd19082827cc89fe1a69 /asm/rotating_gate.s | |
| parent | 56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff) | |
| parent | 83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff) | |
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/rotating_gate.s')
| -rw-r--r-- | asm/rotating_gate.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/rotating_gate.s b/asm/rotating_gate.s index a2bb34cf1..b10e27e65 100644 --- a/asm/rotating_gate.s +++ b/asm/rotating_gate.s @@ -8,7 +8,7 @@ thumb_func_start GetCurrentMapRotatingGatePuzzleType GetCurrentMapRotatingGatePuzzleType: @ 80FB7E8 push {lr} - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r0, [r0] ldrh r1, [r0, 0x4] movs r0, 0x86 @@ -190,7 +190,7 @@ sub_80FB928: @ 80FB928 lsls r1, 16 lsrs r1, 16 mov r10, r1 - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r2, [r0] ldrh r1, [r2] subs r0, r1, 0x2 @@ -557,7 +557,7 @@ sub_80FBC10: @ 80FBC10 mov r6, r9 mov r5, r8 push {r5-r7} - ldr r0, =gUnknown_03005D8C + ldr r0, =gSaveBlock1Ptr ldr r2, [r0] ldrh r1, [r2] subs r0, r1, 0x2 |