From cc460a17b0b99208592ca31de99f526fce2bf5ad Mon Sep 17 00:00:00 2001 From: Rangi Date: Wed, 17 Jun 2020 17:03:38 -0400 Subject: Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM) To do: engine/{menus, overworld} --- engine/overworld/scripting.asm | 2 +- engine/overworld/time.asm | 4 ++-- engine/overworld/variables.asm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/overworld') diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 9291192d7..c933c610c 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -2450,7 +2450,7 @@ Script_warpfacing: set PLAYERSPRITESETUP_CUSTOM_FACING_F, a or c ld [wPlayerSpriteSetupFlags], a -; fall through +; fallthrough Script_warp: ; script command 0x3c diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index afc7d3b2d..da6d6745a 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -244,7 +244,7 @@ _CheckLuckyNumberShowFlag: DoMysteryGiftIfDayHasPassed: ld a, BANK(sMysteryGiftTimer) - call GetSRAMBank + call OpenSRAM ld hl, sMysteryGiftTimer ld a, [hli] ld [wBuffer1], a @@ -262,7 +262,7 @@ DoMysteryGiftIfDayHasPassed: .not_timed_out ld a, BANK(sMysteryGiftTimer) - call GetSRAMBank + call OpenSRAM ld hl, wBuffer1 ld a, [hli] ld [sMysteryGiftTimer], a diff --git a/engine/overworld/variables.asm b/engine/overworld/variables.asm index c98b9cc56..329a2f9f2 100644 --- a/engine/overworld/variables.asm +++ b/engine/overworld/variables.asm @@ -126,7 +126,7 @@ _GetVarAction:: .BoxFreeSpace: ; Remaining slots in the current box. ld a, BANK(sBoxCount) - call GetSRAMBank + call OpenSRAM ld hl, sBoxCount ld a, MONS_PER_BOX sub [hl] -- cgit v1.2.3