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/pokemon/mon_menu.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/pokemon/mon_menu.asm')
| -rw-r--r-- | engine/pokemon/mon_menu.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index 985546845..de3e0f382 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -757,19 +757,19 @@ MonMenu_Softboiled_MilkDrink: 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, MON_HP + 1 call GetPartyParamLocation - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] sub [hl] dec hl - ld a, [hQuotient + 1] + ldh a, [hQuotient + 1] sbc [hl] ret @@ -1103,7 +1103,7 @@ SetUpMoveScreenBG: call ClearTileMap call ClearSprites xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a farcall LoadStatsScreenPageTilesGFX farcall ClearSpriteAnims2 ld a, [wCurPartyMon] @@ -1147,7 +1147,7 @@ SetUpMoveScreenBG: SetUpMoveList: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld [wMoveSwapBuffer], a ld [wMonType], a predef CopyMonToTempMon @@ -1189,7 +1189,7 @@ PrepareToPlaceMoveData: PlaceMoveData: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a hlcoord 0, 10 ld de, String_MoveType_Top call PlaceString @@ -1227,7 +1227,7 @@ PlaceMoveData: hlcoord 1, 14 predef PrintMoveDesc ld a, $1 - ld [hBGMapMode], a + ldh [hBGMapMode], a ret String_MoveType_Top: |