diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-25 22:23:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-25 22:23:45 -0400 |
| commit | 3eacab563d0e1ab5557c2443556a7a5e58d14cad (patch) | |
| tree | 3d747166409fdc94f0fd1aa760693a7ee5bd2156 /engine/items/pack.asm | |
| parent | 89681d231611938a791f4256e602c88c2f9aa3e1 (diff) | |
| parent | b2adcd6d6ff91efc764a6ecc65147be7b9cda9e8 (diff) | |
Merge pull request #555 from Rangi42/ldh
Use real labels for HRAM instead of constants, and the ldh instruction
Diffstat (limited to 'engine/items/pack.asm')
| -rw-r--r-- | engine/items/pack.asm | 18 |
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 |