diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-09-09 17:41:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 17:41:58 -0400 |
| commit | 8c435054a0c5c8d3a0ad49f42790c492583caef5 (patch) | |
| tree | 90185ca2b5d8a799bde7fc790809bafa7815f3f3 /engine/overworld | |
| parent | 84cfbc70fac02032d1608f89e9f551ab3d987315 (diff) | |
| parent | bb4a6e5f550c2bde42541aa201aaa720cd461005 (diff) | |
Merge pull request #562 from Rangi42/master
Curr → Cur
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/events.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/variables.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/wildmons.asm | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index 15a03df30..b3dfc1983 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -401,7 +401,7 @@ Dummy_CheckScriptFlags3Bit5: ret RunSceneScript: - ld a, [wCurrMapSceneScriptCount] + ld a, [wCurMapSceneScriptCount] and a jr z, .nope @@ -412,7 +412,7 @@ RunSceneScript: ld e, a ld d, 0 - ld hl, wCurrMapSceneScriptsPointer + ld hl, wCurMapSceneScriptsPointer ld a, [hli] ld h, [hl] ld l, a diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index da4b18812..c98b9cc56 100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm @@ -61,7 +61,7 @@ _GetVarAction:: dwb wSpecialPhoneCallID, RETVAR_STRBUF2 dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2 dwb wKurtApricornQuantity, RETVAR_STRBUF2 - dwb wCurrentCaller, RETVAR_ADDR_DE + dwb wCurCaller, RETVAR_ADDR_DE dwb wBlueCardBalance, RETVAR_ADDR_DE dwb wBuenasPassword, RETVAR_ADDR_DE dwb wKenjiBreakTimer, RETVAR_STRBUF2 diff --git a/engine/overworld/wildmons.asm b/engine/overworld/wildmons.asm index d88e5908f..aa93cdaad 100644 --- a/engine/overworld/wildmons.asm +++ b/engine/overworld/wildmons.asm @@ -738,14 +738,14 @@ JumpRoamMon: ret _BackUpMapIndices: - ld a, [wRoamMons_CurrentMapNumber] + ld a, [wRoamMons_CurMapNumber] ld [wRoamMons_LastMapNumber], a - ld a, [wRoamMons_CurrentMapGroup] + ld a, [wRoamMons_CurMapGroup] ld [wRoamMons_LastMapGroup], a ld a, [wMapNumber] - ld [wRoamMons_CurrentMapNumber], a + ld [wRoamMons_CurMapNumber], a ld a, [wMapGroup] - ld [wRoamMons_CurrentMapGroup], a + ld [wRoamMons_CurMapGroup], a ret INCLUDE "data/wild/roammon_maps.asm" |