diff options
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/buy_sell_toss.asm | 14 | ||||
| -rw-r--r-- | engine/items/item_effects.asm | 54 | ||||
| -rw-r--r-- | engine/items/mart.asm | 6 | ||||
| -rw-r--r-- | engine/items/pack.asm | 18 | ||||
| -rw-r--r-- | engine/items/tmhm.asm | 8 |
5 files changed, 50 insertions, 50 deletions
diff --git a/engine/items/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm index 3303f4319..1ed31ada2 100644 --- a/engine/items/buy_sell_toss.asm +++ b/engine/items/buy_sell_toss.asm @@ -157,13 +157,13 @@ DisplaySellingPrice: BuySell_MultiplyPrice: xor a - ld [hMultiplicand + 0], a + ldh [hMultiplicand + 0], a ld a, [wBuffer1] - ld [hMultiplicand + 1], a + ldh [hMultiplicand + 1], a ld a, [wBuffer2] - ld [hMultiplicand + 2], a + ldh [hMultiplicand + 2], a ld a, [wItemQuantityChangeBuffer] - ld [hMultiplier], a + ldh [hMultiplier], a push hl call Multiply pop hl @@ -187,11 +187,11 @@ Sell_HalvePrice: BuySell_DisplaySubtotal: push hl ld hl, hMoneyTemp - ld a, [hProduct + 1] + ldh a, [hProduct + 1] ld [hli], a - ld a, [hProduct + 2] + ldh a, [hProduct + 2] ld [hli], a - ld a, [hProduct + 3] + ldh a, [hProduct + 3] ld [hl], a pop hl inc hl diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index e751b42e6..8e167281f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -258,7 +258,7 @@ PokeBallEffect: jp z, .skip_hp_calc ld a, b - ld [hMultiplicand + 2], a + ldh [hMultiplicand + 2], a ld hl, wEnemyMonHP ld b, [hl] @@ -300,20 +300,20 @@ PokeBallEffect: push bc ld a, b sub c - ld [hMultiplier], a + ldh [hMultiplier], a xor a - ld [hDividend + 0], a - ld [hMultiplicand + 0], a - ld [hMultiplicand + 1], a + ldh [hDividend + 0], a + ldh [hMultiplicand + 0], a + ldh [hMultiplicand + 1], a call Multiply pop bc ld a, b - ld [hDivisor], a + ldh [hDivisor], a ld b, $4 call Divide - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] and a jr nz, .statuscheck ld a, 1 @@ -389,7 +389,7 @@ PokeBallEffect: ld a, d ld [wFXAnimID + 1], a xor a - ld [hBattleTurn], a + ldh [hBattleTurn], a ld [wBuffer2], a ld [wNumHits], a predef PlayBattleAnim @@ -1313,11 +1313,11 @@ RareCandyEffect: ld a, MON_EXP call GetPartyParamLocation - ld a, [hMultiplicand] + ldh a, [hMultiplicand] ld [hli], a - ld a, [hMultiplicand + 1] + ldh a, [hMultiplicand + 1] ld [hli], a - ld a, [hMultiplicand + 2] + ldh a, [hMultiplicand + 2] ld [hl], a ld a, MON_MAXHP @@ -1628,7 +1628,7 @@ BitterBerryEffect: res SUBSTATUS_CONFUSED, [hl] xor a - ld [hBattleTurn], a + ldh [hBattleTurn], a call UseItemText ld hl, ConfusedNoMoreText @@ -1770,7 +1770,7 @@ ItemActionText: ItemActionTextWaitButton: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a hlcoord 0, 0 ld bc, wTileMapEnd - wTileMap ld a, " " @@ -1778,7 +1778,7 @@ ItemActionTextWaitButton: ld a, [wPartyMenuActionText] call ItemActionText ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ld c, 50 call DelayFrames jp WaitPressAorB_BlinkCursor @@ -1956,16 +1956,16 @@ GetOneFifthMaxHP: ld a, MON_MAXHP call GetPartyParamLocation ld a, [hli] - ld [hDividend + 0], a + ldh [hDividend + 0], a ld a, [hl] - ld [hDividend + 1], a + ldh [hDividend + 1], a ld a, 5 - ld [hDivisor], a + ldh [hDivisor], a ld b, 2 call Divide - ld a, [hQuotient + 1] + ldh a, [hQuotient + 1] ld d, a - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] ld e, a pop bc ret @@ -2156,7 +2156,7 @@ XItemEffect: inc hl ld b, [hl] xor a - ld [hBattleTurn], a + ldh [hBattleTurn], a ld [wAttackMissed], a ld [wEffectFailed], a farcall RaiseStat @@ -2624,7 +2624,7 @@ UseBallInTrainerBattle: ld [wFXAnimID + 1], a xor a ld [wBattleAnimParam], a - ld [hBattleTurn], a + ldh [hBattleTurn], a ld [wNumHits], a predef PlayBattleAnim ld hl, BlockedTheBallText @@ -2788,13 +2788,13 @@ ComputeMaxPP: push bc ; Divide the base PP by 5. ld a, [de] - ld [hDividend + 3], a + ldh [hDividend + 3], a xor a - ld [hDividend], a - ld [hDividend + 1], a - ld [hDividend + 2], a + ldh [hDividend], a + ldh [hDividend + 1], a + ldh [hDividend + 2], a ld a, 5 - ld [hDivisor], a + ldh [hDivisor], a ld b, 4 call Divide ; Get the number of PP, which are bits 6 and 7 of the PP value stored in RAM. @@ -2814,7 +2814,7 @@ ComputeMaxPP: ; Since this would overflow into bit 6, we prevent that from happening ; by decreasing the extra amount of PP each PP Up provides, resulting ; in a maximum of 61. - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] cp $8 jr c, .okay ld a, $7 diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 8afae541a..94e3376a2 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -536,11 +536,11 @@ BargainShopAskPurchaseQuantity: add hl, de inc hl ld a, [hli] - ld [hMoneyTemp + 2], a + ldh [hMoneyTemp + 2], a ld a, [hl] - ld [hMoneyTemp + 1], a + ldh [hMoneyTemp + 1], a xor a - ld [hMoneyTemp], a + ldh [hMoneyTemp], a and a ret 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 diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 14e481248..c81851def 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -1,9 +1,9 @@ TMHMPocket: ld a, $1 - ld [hInMenu], a + ldh [hInMenu], a call TMHM_PocketLoop ld a, $0 - ld [hInMenu], a + ldh [hInMenu], a ret nc call PlaceHollowCursor call WaitBGMap @@ -188,7 +188,7 @@ Text_TMHMNotCompatible: TMHM_PocketLoop: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call TMHM_DisplayPocketItems ld a, 2 ld [w2DMenuCursorInitY], a @@ -227,7 +227,7 @@ TMHM_JoypadLoop: dec a ld [wTMHMPocketCursor], a xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld a, [w2DMenuFlags2] bit 7, a jp nz, TMHM_ScrollPocket |