diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 17:03:38 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 17:03:38 -0400 |
| commit | cc460a17b0b99208592ca31de99f526fce2bf5ad (patch) | |
| tree | fb9c860aa0a578e43e8ccf56c16fcef40101ee04 /engine/pokemon/stats_screen.asm | |
| parent | be93ab33a752fe0360c3b23dd4f33e1b0a05bf0e (diff) | |
Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM)
To do: engine/{menus, overworld}
Diffstat (limited to 'engine/pokemon/stats_screen.asm')
| -rw-r--r-- | engine/pokemon/stats_screen.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 62db2e851..3a150c434 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -224,7 +224,7 @@ StatsScreenWaitCry: StatsScreen_CopyToTempMon: ld a, [wMonType] cp TEMPMON - jr nz, .breedmon + jr nz, .not_tempmon ld a, [wBufferMonSpecies] ld [wCurSpecies], a call GetBaseData @@ -234,7 +234,7 @@ StatsScreen_CopyToTempMon: call CopyBytes jr .done -.breedmon +.not_tempmon farcall CopyMonToTempMon ld a, [wCurPartySpecies] cp EGG @@ -251,7 +251,7 @@ StatsScreen_GetJoypad: call GetJoypad ld a, [wMonType] cp TEMPMON - jr nz, .notbreedmon + jr nz, .not_tempmon push hl push de push bc @@ -263,11 +263,11 @@ StatsScreen_GetJoypad: and D_DOWN | D_UP jr nz, .set_carry ld a, [wMenuJoypad] - jr .clear_flags + jr .clear_carry -.notbreedmon +.not_tempmon ldh a, [hJoyPressed] -.clear_flags +.clear_carry and a ret @@ -532,11 +532,11 @@ StatsScreen_LoadGFX: .Jumptable: ; entries correspond to *_PAGE constants - dw .PinkPage - dw .GreenPage - dw .BluePage + dw LoadPinkPage + dw LoadGreenPage + dw LoadBluePage -.PinkPage: +LoadPinkPage: hlcoord 0, 9 ld b, $0 predef DrawPlayerHP @@ -678,7 +678,7 @@ StatsScreen_LoadGFX: .PkrsStr: db "#RUS@" -.GreenPage: +LoadGreenPage: ld de, .Item hlcoord 0, 8 call PlaceString @@ -723,17 +723,17 @@ StatsScreen_LoadGFX: .Move: db "MOVE@" -.BluePage: +LoadBluePage: call .PlaceOTInfo hlcoord 10, 8 ld de, SCREEN_WIDTH ld b, 10 ld a, $31 ; vertical divider -.BluePageVerticalDivider: +.vertical_divider ld [hl], a add hl, de dec b - jr nz, .BluePageVerticalDivider + jr nz, .vertical_divider hlcoord 11, 8 ld bc, 6 predef PrintTempMonStats @@ -890,7 +890,7 @@ StatsScreen_GetAnimationParam: ld b, h ld c, l ld a, BANK(sBoxMons) - call GetSRAMBank + call OpenSRAM call .CheckEggFaintedFrzSlp push af call CloseSRAM @@ -1095,7 +1095,7 @@ CopyNickname: cp BOXMON jr nz, .partymon ld a, BANK(sBoxMonNicknames) - call GetSRAMBank + call OpenSRAM push de call CopyBytes pop de |