summaryrefslogtreecommitdiff
path: root/engine/items/pack.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-08-25 14:28:22 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2018-08-25 14:28:22 -0400
commiteb1e3636bb71509546c274bf2a5910d8e71a9600 (patch)
tree24d7742604073b2afb86c1225258f8217d1653e7 /engine/items/pack.asm
parent376c64468bab8d162da43fc6e1b6f0942943cf43 (diff)
Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
Diffstat (limited to 'engine/items/pack.asm')
-rw-r--r--engine/items/pack.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/items/pack.asm b/engine/items/pack.asm
index 67e9fe900..5bdaed37d 100644
--- a/engine/items/pack.asm
+++ b/engine/items/pack.asm
@@ -54,7 +54,7 @@ Pack:
.InitGFX:
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
ld a, [wPackJumptableIndex]
ld [wJumptableIndex], a
@@ -123,7 +123,7 @@ Pack:
call ClearPocketList
call DrawPocketName
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call WaitBGMap_DrawPackGFX
call Pack_JumptableNext
ret
@@ -205,7 +205,7 @@ Pack:
ld [wOptions], a
.declined
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
call WaitBGMap_DrawPackGFX
call Pack_InitColors
@@ -454,7 +454,7 @@ UseItem:
jr z, .NoPokemon
call DoItemEffect
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
call WaitBGMap_DrawPackGFX
call Pack_InitColors
@@ -604,7 +604,7 @@ GiveItem:
pop af
ld [wOptions], a
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
call WaitBGMap_DrawPackGFX
call Pack_InitColors
@@ -664,7 +664,7 @@ BattlePack:
.InitGFX:
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
ld a, [wPackJumptableIndex]
ld [wJumptableIndex], a
@@ -733,7 +733,7 @@ BattlePack:
call ClearPocketList
call DrawPocketName
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call WaitBGMap_DrawPackGFX
ld hl, Text_PackEmptyString
call Pack_PrintTextNoScroll
@@ -868,7 +868,7 @@ TMHMSubmenu:
and a
jr nz, .quit_run_script
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
call Pack_InitGFX
call WaitBGMap_DrawPackGFX
call Pack_InitColors
@@ -916,7 +916,7 @@ InitPackBuffers:
DepositSellInitPackBuffers:
xor a
- ld [hBGMapMode], a
+ ldh [hBGMapMode], a
ld [wJumptableIndex], a ; PACKSTATE_INITGFX
ld [wPackJumptableIndex], a ; PACKSTATE_INITGFX
ld [wCurrPocket], a ; ITEM_POCKET