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/stats_screen.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/stats_screen.asm')
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 72f895269..d0004a47a 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -23,10 +23,10 @@ _MobileStatsScreenInit: jr StatsScreenInit_gotaddress StatsScreenInit_gotaddress: - ld a, [hMapAnims] + ldh a, [hMapAnims] push af xor a - ld [hMapAnims], a ; disable overworld tile animations + ldh [hMapAnims], a ; disable overworld tile animations ld a, [wBoxAlignment] ; whether sprite is to be mirrorred push af ld a, [wJumptableIndex] @@ -54,7 +54,7 @@ StatsScreenInit_gotaddress: pop af ld [wBoxAlignment], a pop af - ld [hMapAnims], a + ldh [hMapAnims], a ret StatsScreenMain: @@ -264,7 +264,7 @@ StatsScreen_GetJoypad: jr .clear_flags .notbreedmon - ld a, [hJoyPressed] + ldh a, [hJoyPressed] .clear_flags and a ret @@ -375,7 +375,7 @@ StatsScreen_JoypadAction: StatsScreen_InitUpperHalf: call .PlaceHPBar xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld a, [wBaseDexNo] ld [wDeciramBuffer], a ld [wCurSpecies], a @@ -486,7 +486,7 @@ StatsScreen_LoadGFX: ld [wTempSpecies], a ld [wCurSpecies], a xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a call .ClearBox call .PageTilemap call .LoadPals @@ -636,15 +636,15 @@ StatsScreen_LoadGFX: farcall CalcExpAtLevel ld hl, wTempMonExp + 2 ld hl, wTempMonExp + 2 - ld a, [hQuotient + 2] + ldh a, [hQuotient + 2] sub [hl] dec hl ld [wBuffer3], a - ld a, [hQuotient + 1] + ldh a, [hQuotient + 1] sbc [hl] dec hl ld [wBuffer2], a - ld a, [hQuotient] + ldh a, [hQuotient] sbc [hl] ld [wBuffer1], a ret @@ -926,16 +926,16 @@ StatsScreen_LoadTextBoxSpaceGFX: push bc push af call DelayFrame - ld a, [rVBK] + ldh a, [rVBK] push af ld a, $1 - ld [rVBK], a + ldh [rVBK], a ld de, TextBoxSpaceGFX lb bc, BANK(TextBoxSpaceGFX), 1 ld hl, vTiles2 tile " " call Get2bpp pop af - ld [rVBK], a + ldh [rVBK], a pop af pop bc pop de @@ -948,7 +948,7 @@ Unreferenced_4e32a: EggStatsScreen: xor a - ld [hBGMapMode], a + ldh [hBGMapMode], a ld hl, wCurHPPal call SetHPPal ld b, SCGB_STATS_SCREEN_HP_PALS |