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/items | |
| 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/items')
| -rw-r--r-- | engine/items/item_effects.asm | 18 | ||||
| -rw-r--r-- | engine/items/town_map.asm | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index bf43293e..1bbb4cf9 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -809,7 +809,7 @@ ItemUseEvoStone: ld [wCurPartySpecies], a call Func_d85d jr nc, .noEffect - callfar IsThisPartymonStarterPikachu_Party + callfar IsThisPartyMonStarterPikachu jr nc, .notPlayerPikachu ldpikacry e, PikachuCry28 callfar PlayPikachuSoundClip @@ -938,7 +938,7 @@ ItemUseMedicine: jr nc, .noHappinessBoost push hl push de - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDITEM + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDITEM pop de pop hl .noHappinessBoost @@ -1537,7 +1537,7 @@ ItemUseMedicine: xor a ld [wForceEvolution], a - callabd_ModifyPikachuHappiness PIKAHAPPY_LEVELUP + farcall_ModifyPikachuHappiness PIKAHAPPY_LEVELUP ld a, [wWhichPokemon] push af ld a, [wUsedItemOnWhichPokemon] @@ -1691,7 +1691,7 @@ ItemUseXAccuracy: jp z, ItemUseNotTime ld hl, wPlayerBattleStatus2 set USING_X_ACCURACY, [hl] ; X Accuracy bit - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM jp PrintItemUseTextAndRemoveItem ; This function is bugged and never works. It always jumps to ItemUseNotTime. @@ -1769,7 +1769,7 @@ ItemUseGuardSpec: push af ld a, [wPlayerMonNumber] ld [wWhichPokemon], a - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a @@ -1794,7 +1794,7 @@ ItemUseDireHit: push af ld a, [wPlayerMonNumber] ld [wWhichPokemon], a - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a @@ -1834,7 +1834,7 @@ ItemUseXStat: push af ld a, [wPlayerMonNumber] ld [wWhichPokemon], a - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDXITEM pop af ld [wWhichPokemon], a @@ -2497,8 +2497,8 @@ ItemUseTMHM: push af ld a, d ld [wWhichPokemon], a - callabd_ModifyPikachuHappiness PIKAHAPPY_USEDTMHM - callfar IsThisPartymonStarterPikachu_Party + farcall_ModifyPikachuHappiness PIKAHAPPY_USEDTMHM + callfar IsThisPartyMonStarterPikachu jr nc, .notTeachingThunderboltOrThunderToPikachu ld a, [wCurItem] cp TM_THUNDERBOLT ; are we teaching thunderbolt to the player pikachu? diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index 96f6769c..3cf68aea 100644 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -193,7 +193,7 @@ LoadTownMap_Fly:: ld c, 15 call DelayFrames hlcoord 18, 0 - ld [hl], "▶" + ld [hl], "▲" hlcoord 19, 0 ld [hl], "▼" pop hl |