diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-09-10 06:31:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-10 00:31:11 -0400 |
| commit | d237b01cfb241f417567c964e0df0658cf921570 (patch) | |
| tree | 799e92e48259443aa6cf4c553ed7adf38bd442d4 /engine/events/pokecenter.asm | |
| parent | Merge branch 'master' of https://github.com/pret/pokered (diff) | |
| download | pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.gz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.tar.xz pokeyellow-d237b01cfb241f417567c964e0df0658cf921570.zip | |
Misc. naming and cleanup (#139)
* Name some printer/diploma routines
* Name `wd434`
* Name `NAME_LENGTH_JP`
* Rename `callabd`/`calladb` to `farcall`/`callfar`
Diffstat (limited to 'engine/events/pokecenter.asm')
| -rw-r--r-- | engine/events/pokecenter.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm index 6cb93a02..6b8c584c 100644 --- a/engine/events/pokecenter.asm +++ b/engine/events/pokecenter.asm @@ -25,7 +25,7 @@ DisplayPokemonCenterDialogue_:: and a jp nz, .declinedHealing ; if the player chose No call SetLastBlackoutMap - callfar IsStarterPikachuInOurParty + callfar IsStarterPikachuAliveInOurParty jr nc, .notHealingPlayerPikachu call CheckPikachuFollowingPlayer jr nz, .notHealingPlayerPikachu @@ -41,7 +41,7 @@ DisplayPokemonCenterDialogue_:: call CheckPikachuFollowingPlayer jr nz, .playerPikachuNotOnScreen call DisablePikachuOverworldSpriteDrawing - callfar IsStarterPikachuInOurParty + callfar IsStarterPikachuAliveInOurParty call c, Func_6eaa .playerPikachuNotOnScreen lb bc, 1, 8 @@ -60,7 +60,7 @@ DisplayPokemonCenterDialogue_:: call PlaySound call CheckPikachuFollowingPlayer jr nz, .doNotReturnPikachu - callfar IsStarterPikachuInOurParty + callfar IsStarterPikachuAliveInOurParty call c, Func_6eaa ld a, $5 ld [wPikachuSpawnState], a @@ -70,7 +70,7 @@ DisplayPokemonCenterDialogue_:: call Func_6ebb ld hl, PokemonFightingFitText call PrintText - callfar IsStarterPikachuInOurParty + callfar IsStarterPikachuAliveInOurParty jr nc, .notInParty lb bc, 15, 0 call Func_6ebb |