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/pokemon | |
| 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/pokemon')
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 10 | ||||
| -rw-r--r-- | engine/pokemon/evos_moves.asm | 2 | ||||
| -rw-r--r-- | engine/pokemon/status_screen.asm | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index e5c0211d..c6908409 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -225,7 +225,7 @@ BillsPCDeposit: ld hl, wPartyCount call DisplayMonListMenu jp c, BillsPCMenu - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .asm_215ad call CheckPikachuFollowingPlayer jr z, .asm_215ad @@ -235,7 +235,7 @@ BillsPCDeposit: .asm_215ad call DisplayDepositWithdrawMenu jp nc, BillsPCMenu - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .asm_215c9 ldpikacry e, PikachuCry28 callfar PlayPikachuSoundClip @@ -244,7 +244,7 @@ BillsPCDeposit: ld a, [wCurPartySpecies] call PlayCry .asm_215cf - callabd_ModifyPikachuHappiness PIKAHAPPY_DEPOSITED + farcall_ModifyPikachuHappiness PIKAHAPPY_DEPOSITED ld a, PARTY_TO_BOX ld [wMoveMonType], a call MoveMon @@ -298,7 +298,7 @@ BillsPCWithdraw: ld a, [wWhichPokemon] ld hl, wBoxMonNicks call GetPartyMonName - callfar IsThisPartymonStarterPikachu_Box + callfar IsThisBoxMonStarterPikachu jr nc, .asm_21660 ldpikacry e, PikachuCry35 callfar PlayPikachuSoundClip @@ -329,7 +329,7 @@ BillsPCRelease: ld hl, wBoxCount call DisplayMonListMenu jp c, BillsPCMenu - callfar IsThisPartymonStarterPikachu_Box + callfar IsThisBoxMonStarterPikachu jr c, .asm_216cb ld hl, OnceReleasedText call PrintText diff --git a/engine/pokemon/evos_moves.asm b/engine/pokemon/evos_moves.asm index 25a4d0a1..8fe004e4 100644 --- a/engine/pokemon/evos_moves.asm +++ b/engine/pokemon/evos_moves.asm @@ -364,7 +364,7 @@ LearnMoveFromLevelUp: ld a, b and a jr z, .done - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .done ld a, [wMoveNum] cp THUNDERBOLT diff --git a/engine/pokemon/status_screen.asm b/engine/pokemon/status_screen.asm index ec8cf1ee..90dd8523 100644 --- a/engine/pokemon/status_screen.asm +++ b/engine/pokemon/status_screen.asm @@ -175,11 +175,11 @@ StatusScreen: jr z, .playRegularCry cp BOX_DATA jr z, .checkBoxData - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .playRegularCry jr .playPikachuSoundClip .checkBoxData - callfar IsThisPartymonStarterPikachu_Box + callfar IsThisBoxMonStarterPikachu jr nc, .playRegularCry .playPikachuSoundClip ldpikacry e, PikachuCry17 |