diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/BillsHouse.asm | 2 | ||||
| -rw-r--r-- | scripts/CeladonMansion1F_2.asm | 2 | ||||
| -rw-r--r-- | scripts/Daycare.asm | 4 | ||||
| -rw-r--r-- | scripts/PewterPokecenter_2.asm | 2 | ||||
| -rw-r--r-- | scripts/PokemonFanClub.asm | 2 | ||||
| -rw-r--r-- | scripts/VictoryRoad1F.asm | 2 | ||||
| -rw-r--r-- | scripts/VictoryRoad2F.asm | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/scripts/BillsHouse.asm b/scripts/BillsHouse.asm index 17bea71a..cb1afbdd 100644 --- a/scripts/BillsHouse.asm +++ b/scripts/BillsHouse.asm @@ -42,7 +42,7 @@ BillsHouseScript0: ld a, [wd471] bit 7, a jr z, .asm_1e0d2 - callfar CheckPikachuFaintedOrStatused + callfar CheckPikachuStatusCondition jr c, .asm_1e0d2 callfar Func_f24d5 .asm_1e0d2 diff --git a/scripts/CeladonMansion1F_2.asm b/scripts/CeladonMansion1F_2.asm index 7fe8409f..ab366e7d 100644 --- a/scripts/CeladonMansion1F_2.asm +++ b/scripts/CeladonMansion1F_2.asm @@ -3,7 +3,7 @@ CeladonMansion1FPrintGrannyText:: ld [wDoNotWaitForButtonPressAfterDisplayingText], a ld hl, CeladonMansion1Text_f1e96 call PrintText - callfar IsStarterPikachuInOurParty + callfar IsStarterPikachuAliveInOurParty ret nc ld hl, CeladonMansionText_f1e9c call PrintText diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm index a39361d5..f9c41edf 100644 --- a/scripts/Daycare.asm +++ b/scripts/Daycare.asm @@ -51,7 +51,7 @@ DaycareGentlemanText: ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon - callfar IsThisPartymonStarterPikachu + callfar IsThisPartyMonStarterPikachu push af xor a ld [wRemoveMonFromBox], a @@ -211,7 +211,7 @@ DaycareGentlemanText: ld a, [wPartyCount] dec a ld [wWhichPokemon], a - callfar IsThisPartymonStarterPikachu + callfar IsThisPartyMonStarterPikachu jr c, .withdrewPikachuFromDayCare ld a, [wCurPartySpecies] call PlayCry diff --git a/scripts/PewterPokecenter_2.asm b/scripts/PewterPokecenter_2.asm index d52b06af..2aeb23f7 100644 --- a/scripts/PewterPokecenter_2.asm +++ b/scripts/PewterPokecenter_2.asm @@ -62,7 +62,7 @@ PewterJigglypuff:: ld a, [wd471] bit 7, a ret z - callfar CheckPikachuFaintedOrStatused + callfar CheckPikachuStatusCondition ret c call DisablePikachuFollowingPlayer ret diff --git a/scripts/PokemonFanClub.asm b/scripts/PokemonFanClub.asm index f9814f23..4c8acd39 100644 --- a/scripts/PokemonFanClub.asm +++ b/scripts/PokemonFanClub.asm @@ -37,7 +37,7 @@ PokemonFanClubScript_59a44: ld a, [wd471] bit 7, a ret z - callfar CheckPikachuFaintedOrStatused + callfar CheckPikachuStatusCondition ret c ld a, SCRIPT_POKEMONFANCLUB_SCRIPT1 ld [wPokemonFanClubCurScript], a diff --git a/scripts/VictoryRoad1F.asm b/scripts/VictoryRoad1F.asm index b7f7a56b..1ba1a069 100644 --- a/scripts/VictoryRoad1F.asm +++ b/scripts/VictoryRoad1F.asm @@ -31,7 +31,7 @@ VictoryRoad1FDefaultScript: call CheckBoulderCoords jp nc, CheckFightingMapTrainers ldh a, [hSpriteIndex] - cp $f + cp PIKACHU_SPRITE_INDEX jp z, CheckFightingMapTrainers ld hl, wCurrentMapScriptFlags set BIT_CUR_MAP_LOADED_1, [hl] diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index 66340503..0d91ce33 100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -47,7 +47,7 @@ VictoryRoad2FDefaultScript: call CheckBoulderCoords jp nc, CheckFightingMapTrainers ldh a, [hSpriteIndex] - cp $f + cp PIKACHU_SPRITE_INDEX jp z, CheckFightingMapTrainers EventFlagAddress hl, EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH1 ld a, [wCoordIndex] |