diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index cde50b4d6..771c391c1 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -37,6 +37,12 @@ DEF MOVE_ACC rb DEF MOVE_PP rb DEF MOVE_LENGTH EQU _RS +; battle classes (wIsInBattle values) + const_def 1 + const WILD_BATTLE + const TRAINER_BATTLE +DEF LOST_BATTLE EQU $FF + ; battle type constants (wBattleType values) const_def const BATTLE_TYPE_NORMAL ; 0 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 4486d8209..edc471ee5 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -699,7 +699,7 @@ DoBallTossSpecialEffects: call PlaySound .skipPlayingSound ld a, [wIsInBattle] - cp 2 ; is it a trainer battle? + cp TRAINER_BATTLE jr z, .isTrainerBattle ld a, [wPokeBallAnimData] cp $10 ; is the enemy pokemon the Ghost Marowak? @@ -2581,8 +2581,8 @@ BattleAnimCopyTileMapToVRAM: TossBallAnimation: ld a, [wIsInBattle] - cp 2 - jr z, .BlockBall ; if in trainer battle, play different animation + cp TRAINER_BATTLE + jr z, .BlockBall ld a, [wPokeBallAnimData] ld b, a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9f2f34f22..7a5d617dc 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6004,7 +6004,7 @@ LoadEnemyMonData: ld b, [hl] jr nz, .storeDVs ld a, [wIsInBattle] - cp $2 ; is it a trainer battle? + cp TRAINER_BATTLE ; fixed DVs for trainer mon ld a, ATKDEFDV_TRAINER ld b, SPDSPCDV_TRAINER @@ -6027,7 +6027,7 @@ LoadEnemyMonData: call CalcStats pop hl ld a, [wIsInBattle] - cp $2 ; is it a trainer battle? + cp TRAINER_BATTLE jr z, .copyHPAndStatusFromPartyData ld a, [wEnemyBattleStatus3] bit TRANSFORMED, a ; is enemy mon transformed? @@ -6070,7 +6070,7 @@ LoadEnemyMonData: ld [de], a inc de ld a, [wIsInBattle] - cp $2 ; is it a trainer battle? + cp TRAINER_BATTLE jr nz, .copyStandardMoves ; if it's a trainer battle, copy moves from enemy party data ld hl, wEnemyMon1Moves @@ -6688,12 +6688,12 @@ InitBattleCommon: predef CopyUncompressedPicToTilemap ld a, $ff ld [wEnemyMonPartyPos], a - ld a, $2 + ld a, TRAINER_BATTLE ld [wIsInBattle], a jp _InitBattleCommon InitWildBattle: - ld a, $1 + ld a, WILD_BATTLE ld [wIsInBattle], a call LoadEnemyMonData call DoBattleTransitionAndInitBattleVariables diff --git a/home/overworld.asm b/home/overworld.asm index a49cf63bd..fa91fe203 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -352,7 +352,7 @@ OverworldLoopLessDelay:: call DelayFrames jp EnterMap .allPokemonFainted - ld a, $ff + ld a, LOST_BATTLE ld [wIsInBattle], a call RunMapScript jp HandleBlackOut diff --git a/home/trainers.asm b/home/trainers.asm index 17aea30de..985455e40 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -185,7 +185,7 @@ EndTrainerBattle:: ld hl, wMiscFlags res BIT_SEEN_BY_TRAINER, [hl] ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetButtonPressedAndMapScript ld a, TRAINER_EVENT_FLAG_POINTER call ReadTrainerHeaderInfo diff --git a/scripts/AgathasRoom.asm b/scripts/AgathasRoom.asm index 548f78bfa..27ba1c176 100644 --- a/scripts/AgathasRoom.asm +++ b/scripts/AgathasRoom.asm @@ -108,7 +108,7 @@ AgathasRoomPlayerIsMovingScript: AgathasRoomAgathaEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetAgathaScript ld a, TEXT_AGATHASROOM_AGATHA ldh [hTextID], a diff --git a/scripts/BrunosRoom.asm b/scripts/BrunosRoom.asm index 1f8ff4cf7..081fdef0c 100644 --- a/scripts/BrunosRoom.asm +++ b/scripts/BrunosRoom.asm @@ -108,7 +108,7 @@ BrunosRoomPlayerIsMovingScript: BrunosRoomBrunoEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetBrunoScript ld a, TEXT_BRUNOSROOM_BRUNO ldh [hTextID], a diff --git a/scripts/CeladonGym.asm b/scripts/CeladonGym.asm index 2e9e197b3..a307f5935 100644 --- a/scripts/CeladonGym.asm +++ b/scripts/CeladonGym.asm @@ -38,7 +38,7 @@ CeladonGym_ScriptPointers: CeladonGymErikaPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CeladonGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index cbd609366..e44944241 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -22,7 +22,7 @@ CeruleanCity_ScriptPointers: CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CeruleanCityClearScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a @@ -167,7 +167,7 @@ CeruleanCityRivalBattleScript: CeruleanCityRivalDefeatedScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CeruleanCityClearScripts call CeruleanCityFaceRivalScript ld a, PAD_CTRL_PAD diff --git a/scripts/CeruleanGym.asm b/scripts/CeruleanGym.asm index 752891f9e..1b1aa0e75 100644 --- a/scripts/CeruleanGym.asm +++ b/scripts/CeruleanGym.asm @@ -38,7 +38,7 @@ CeruleanGym_ScriptPointers: CeruleanGymMistyPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CeruleanGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 752a0a31c..427b74452 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -92,7 +92,7 @@ ChampionsRoomRivalReadyToBattleScript: ChampionsRoomRivalDefeatedScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetRivalScript call UpdateSprites SetEvent EVENT_BEAT_CHAMPION_RIVAL diff --git a/scripts/CinnabarGym.asm b/scripts/CinnabarGym.asm index a4fc3c9df..29cc7bf09 100644 --- a/scripts/CinnabarGym.asm +++ b/scripts/CinnabarGym.asm @@ -96,7 +96,7 @@ CinnabarGymFlagAction: CinnabarGymOpenGateScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CinnabarGymResetScripts ld a, [wTrainerHeaderFlagBit] ldh [hGymGateIndex], a @@ -138,7 +138,7 @@ CinnabarGymOpenGateScript: CinnabarGymBlainePostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, CinnabarGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/FightingDojo.asm b/scripts/FightingDojo.asm index cf822d1fa..4df46ecaa 100644 --- a/scripts/FightingDojo.asm +++ b/scripts/FightingDojo.asm @@ -55,7 +55,7 @@ FightingDojoDefaultScript: FightingDojoKarateMasterPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, FightingDojoResetScripts ld a, [wSavedCoordIndex] and a ; nz if the player was at (4, 3), left of the Karate Master diff --git a/scripts/FuchsiaGym.asm b/scripts/FuchsiaGym.asm index 79b3e4ef2..817426956 100644 --- a/scripts/FuchsiaGym.asm +++ b/scripts/FuchsiaGym.asm @@ -40,7 +40,7 @@ FuchsiaGym_ScriptPointers: FuchsiaGymKogaPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, FuchsiaGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 94625d2a6..3c4bd0d4d 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -53,7 +53,7 @@ GameCornerDefaultScript: GameCornerRocketBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, GameCornerReenterMapAfterPlayerLoss ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/LancesRoom.asm b/scripts/LancesRoom.asm index 0a040ea69..fcfe2982f 100644 --- a/scripts/LancesRoom.asm +++ b/scripts/LancesRoom.asm @@ -87,7 +87,7 @@ LanceTriggerMovementCoords: LancesRoomLanceEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetLanceScript ld a, TEXT_LANCESROOM_LANCE ldh [hTextID], a diff --git a/scripts/LoreleisRoom.asm b/scripts/LoreleisRoom.asm index ada3b5836..ff06dcd28 100644 --- a/scripts/LoreleisRoom.asm +++ b/scripts/LoreleisRoom.asm @@ -110,7 +110,7 @@ LoreleisRoomPlayerIsMovingScript: LoreleisRoomLoreleiEndBattleScript: call EndTrainerBattle ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ResetLoreleiScript ld a, TEXT_LORELEISROOM_LORELEI ldh [hTextID], a diff --git a/scripts/MtMoonB2F.asm b/scripts/MtMoonB2F.asm index d3c7e57a2..e83d29717 100644 --- a/scripts/MtMoonB2F.asm +++ b/scripts/MtMoonB2F.asm @@ -75,7 +75,7 @@ MtMoonB2FCheckGotAFossil: MtMoonB2FDefeatedSuperNerdScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, MtMoonB2FResetScripts call UpdateSprites call Delay3 diff --git a/scripts/PewterGym.asm b/scripts/PewterGym.asm index 40a04d731..90f9d2071 100644 --- a/scripts/PewterGym.asm +++ b/scripts/PewterGym.asm @@ -38,7 +38,7 @@ PewterGym_ScriptPointers: PewterGymBrockPostBattle: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, PewterGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index 1888e511f..1d11f7aec 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -65,7 +65,7 @@ PokemonTower2FRivalEncounterEventCoords: PokemonTower2FDefeatedRivalScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, PokemonTower2FResetRivalEncounter ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm index ad71ad6df..6c5aa20fd 100644 --- a/scripts/PokemonTower6F.asm +++ b/scripts/PokemonTower6F.asm @@ -48,7 +48,7 @@ PokemonTower6FMarowakCoords: PokemonTower6FMarowakBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, PokemonTower6FSetDefaultScript ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/PokemonTower7F.asm b/scripts/PokemonTower7F.asm index 908e089ee..5830ce6db 100644 --- a/scripts/PokemonTower7F.asm +++ b/scripts/PokemonTower7F.asm @@ -26,7 +26,7 @@ PokemonTower7FEndBattleScript: ld hl, wMiscFlags res BIT_SEEN_BY_TRAINER, [hl] ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, PokemonTower7FSetDefaultScript call EndTrainerBattle ld a, PAD_CTRL_PAD diff --git a/scripts/RocketHideoutB4F.asm b/scripts/RocketHideoutB4F.asm index 7bc3ec31a..56621fefb 100644 --- a/scripts/RocketHideoutB4F.asm +++ b/scripts/RocketHideoutB4F.asm @@ -46,7 +46,7 @@ RocketHideoutB4F_ScriptPointers: RocketHideoutB4FBeatGiovanniScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, RocketHideoutB4FSetDefaultScript call UpdateSprites ld a, PAD_CTRL_PAD diff --git a/scripts/Route12.asm b/scripts/Route12.asm index a6984f872..c658ce115 100644 --- a/scripts/Route12.asm +++ b/scripts/Route12.asm @@ -44,7 +44,7 @@ Route12DefaultScript: Route12SnorlaxPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jr z, Route12ResetScripts call UpdateSprites ld a, [wBattleResult] diff --git a/scripts/Route16.asm b/scripts/Route16.asm index a1eb6e85f..712ede16c 100644 --- a/scripts/Route16.asm +++ b/scripts/Route16.asm @@ -45,7 +45,7 @@ Route16DefaultScript: Route16SnorlaxPostBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, Route16ResetScripts call UpdateSprites ld a, [wBattleResult] diff --git a/scripts/Route22.asm b/scripts/Route22.asm index bef226653..d609e65b0 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -148,7 +148,7 @@ Route22Rival1StartBattleScript: Route22Rival1AfterBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, Route22SetDefaultScript ld a, [wSpritePlayerStateData1FacingDirection] and a ; cp SPRITE_FACING_DOWN @@ -303,7 +303,7 @@ Route22Rival2StartBattleScript: Route22Rival2AfterBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, Route22SetDefaultScript ld a, ROUTE22_RIVAL2 ldh [hSpriteIndex], a diff --git a/scripts/Route24.asm b/scripts/Route24.asm index b66e6703d..56c70777a 100644 --- a/scripts/Route24.asm +++ b/scripts/Route24.asm @@ -61,7 +61,7 @@ Route24PlayerMovingScript: Route24AfterRocketBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, Route24SetDefaultScript call UpdateSprites ld a, PAD_CTRL_PAD diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index 32ea70d19..a4a2a4b6b 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -123,7 +123,7 @@ SSAnne2FRivalStartBattleScript: SSAnne2FRivalAfterBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, SSAnne2FResetScripts call SSAnne2FSetFacingDirectionScript ld a, PAD_CTRL_PAD diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 46ebf2c66..6ee24b1d1 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -38,7 +38,7 @@ SaffronGym_ScriptPointers: SaffronGymSabrinaPostBattle: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, SaffronGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/SeafoamIslandsB4F.asm b/scripts/SeafoamIslandsB4F.asm index 40ecee0ae..39bcde6eb 100644 --- a/scripts/SeafoamIslandsB4F.asm +++ b/scripts/SeafoamIslandsB4F.asm @@ -21,7 +21,7 @@ SeafoamIslandsB4F_ScriptPointers: SeafoamIslandsB4FObjectMoving3Script: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jr z, SeafoamIslandsB4FResetScript call EndTrainerBattle ld a, SCRIPT_SEAFOAMISLANDSB4F_DEFAULT diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index c47a935bd..334b68063 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -207,7 +207,7 @@ SilphCo11FSetPlayerAndSpriteFacingDirectionScript: SilphCo11FGiovanniAfterBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, SilphCo11FResetCurScript ld a, [wSavedCoordIndex] cp 1 ; index of second, upper-right entry in SilphCo11FDefaultScript.PlayerCoordsArray diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 6b640fd4b..0d877ea96 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -205,7 +205,7 @@ SilphCo7FRivalStartBattleScript: SilphCo7FRivalAfterBattleScript: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, SilphCo7FSetDefaultScript ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/VermilionGym.asm b/scripts/VermilionGym.asm index 19b2e202b..9e5cb084f 100644 --- a/scripts/VermilionGym.asm +++ b/scripts/VermilionGym.asm @@ -57,7 +57,7 @@ VermilionGym_ScriptPointers: VermilionGymLTSurgeAfterBattleScript: ld a, [wIsInBattle] - cp $ff ; did we lose? + cp LOST_BATTLE jp z, VermilionGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a diff --git a/scripts/ViridianGym.asm b/scripts/ViridianGym.asm index c2b8c362f..099d473b6 100644 --- a/scripts/ViridianGym.asm +++ b/scripts/ViridianGym.asm @@ -130,7 +130,7 @@ ViridianGymPlayerSpinningScript: ViridianGymGiovanniPostBattle: ld a, [wIsInBattle] - cp $ff + cp LOST_BATTLE jp z, ViridianGymResetScripts ld a, PAD_CTRL_PAD ld [wJoyIgnore], a