From 69edfecc16f040a56376c4cd55bb91b15cf6a340 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 12:56:03 -0500 Subject: Update battle scripts with more defines --- src/battle_script_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index a7d8cb6fa..8442ebfc5 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -3773,7 +3773,7 @@ static void atk45_playanimation(void) if (gBattlescriptCurrInstr[2] == B_ANIM_STATS_CHANGE || gBattlescriptCurrInstr[2] == B_ANIM_SNATCH_MOVE || gBattlescriptCurrInstr[2] == B_ANIM_SUBSTITUTE_FADE - || gBattlescriptCurrInstr[2] == B_ANIM_x19) + || gBattlescriptCurrInstr[2] == B_ANIM_SILPH_SCOPED) { BtlController_EmitBattleAnimation(0, gBattlescriptCurrInstr[2], *argumentPtr); MarkBattlerForControllerExec(gActiveBattler); @@ -6236,7 +6236,7 @@ static void atk76_various(void) gBattleCommunication[5] = 1; } break; - case VARIOUS_CASE_12: + case VARIOUS_WAIT_FANFARE: if (!IsFanfareTaskInactive()) return; break; -- cgit v1.2.3 From 629cb532d8886ba5874b137cab6f148e29a1e753 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 15:05:04 -0500 Subject: Update macros for battle_scripts_2 --- src/battle_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 8442ebfc5..d8ea3cdc7 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -6183,7 +6183,7 @@ static void atk76_various(void) } } break; - case VARIOUS_CASE_11: + case VARIOUS_CHECK_POKEFLUTE: gBattleCommunication[MULTISTRING_CHOOSER] = 0; monToCheck = 0; for (i = 0; i < gBattlersCount; ++i) -- cgit v1.2.3 From d97eb6353d7f21c28983642dc94033e04bfb488b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 15:52:58 -0500 Subject: Sync battle script documentation with Emerald, 1 --- src/battle_main.c | 2 +- src/battle_script_commands.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index 9104bc381..abeea3acf 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2910,7 +2910,7 @@ void BattleTurnPassed(void) TurnValuesCleanUp(FALSE); gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING); gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE); - gHitMarker &= ~(HITMARKER_x400000); + gHitMarker &= ~(HITMARKER_PLAYER_FAINTED); gHitMarker &= ~(HITMARKER_x100000); gBattleScripting.animTurn = 0; gBattleScripting.animTargetsHit = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index d8ea3cdc7..7be47d762 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2833,7 +2833,7 @@ static void atk19_tryfaintmon(void) gBattlescriptCurrInstr = BS_ptr; if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { - gHitMarker |= HITMARKER_x400000; + gHitMarker |= HITMARKER_PLAYER_FAINTED; if (gBattleResults.playerFaintCounter < 0xFF) ++gBattleResults.playerFaintCounter; AdjustFriendshipOnBattleFaint(gActiveBattler); @@ -4738,11 +4738,11 @@ static void atk50_openpartyscreen(void) } else { - if (gBattlescriptCurrInstr[1] & 0x80) + if (gBattlescriptCurrInstr[1] & OPEN_PARTY_ALLOW_CANCEL) hitmarkerFaintBits = PARTY_CHOOSE_MON; // Used here as the caseId for the EmitChoose function. else hitmarkerFaintBits = PARTY_MUST_CHOOSE_MON; - battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(0x80)); + battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(OPEN_PARTY_ALLOW_CANCEL)); if (gSpecialStatuses[battlerId].flag40) { gBattlescriptCurrInstr += 6; @@ -6146,12 +6146,12 @@ static void atk76_various(void) *choicedMove = MOVE_NONE; } break; - case VARIOUS_CASE_7: + case VARIOUS_RESET_PLAYER_FAINTED_FLAG: if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE)) && gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattleMons[0].hp != 0 && gBattleMons[1].hp != 0) - gHitMarker &= ~(HITMARKER_x400000); + gHitMarker &= ~(HITMARKER_PLAYER_FAINTED); break; case VARIOUS_CASE_8: i = 0; // redundant -- cgit v1.2.3 From 60b75e85c91a87e70dda2695bf5c5c66d61a0c17 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 18:15:43 -0500 Subject: Finish documentation of battle_scripts_1 --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index abeea3acf..a7cd989ed 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3675,7 +3675,7 @@ static void HandleEndTurn_BattleWon(void) { BattleStopLowHpSound(); PlayBGM(MUS_WIN_TRE); - gBattlescriptCurrInstr = gUnknown_81D88D7; + gBattlescriptCurrInstr = BattleScript_BattleTowerTrainerBattleWon; } else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_LINK)) { -- cgit v1.2.3 From f14f13b31269d4e0a537b20c53c766314bab0f86 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 18:25:36 -0500 Subject: Document battle_scripts_2.s --- src/battle_main.c | 12 ++++++------ src/battle_script_commands.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index a7cd989ed..8852fa188 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -66,8 +66,8 @@ static void HandleAction_UseItem(void); static void HandleAction_Run(void); static void HandleAction_WatchesCarefully(void); static void HandleAction_SafariZoneBallThrow(void); -static void HandleAction_ThrowPokeblock(void); -static void HandleAction_GoNear(void); +static void HandleAction_ThrowBait(void); +static void HandleAction_ThrowRock(void); static void HandleAction_SafariZoneRun(void); static void HandleAction_OldManBallThrow(void); static void HandleAction_TryFinish(void); @@ -582,8 +582,8 @@ static void (*const sTurnActionsFuncsTable[])(void) = [B_ACTION_RUN] = HandleAction_Run, [B_ACTION_SAFARI_WATCH_CAREFULLY] = HandleAction_WatchesCarefully, [B_ACTION_SAFARI_BALL] = HandleAction_SafariZoneBallThrow, - [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowPokeblock, - [B_ACTION_SAFARI_GO_NEAR] = HandleAction_GoNear, + [B_ACTION_SAFARI_POKEBLOCK] = HandleAction_ThrowBait, + [B_ACTION_SAFARI_GO_NEAR] = HandleAction_ThrowRock, [B_ACTION_SAFARI_RUN] = HandleAction_SafariZoneRun, [B_ACTION_OLDMAN_THROW] = HandleAction_OldManBallThrow, [B_ACTION_EXEC_SCRIPT] = HandleAction_RunBattleScript, @@ -4313,7 +4313,7 @@ static void HandleAction_SafariZoneBallThrow(void) gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; } -static void HandleAction_ThrowPokeblock(void) +static void HandleAction_ThrowBait(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; @@ -4329,7 +4329,7 @@ static void HandleAction_ThrowPokeblock(void) gCurrentActionFuncId = B_ACTION_EXEC_SCRIPT; } -static void HandleAction_GoNear(void) +static void HandleAction_ThrowRock(void) { gBattlerAttacker = gBattlerByTurnOrder[gCurrentTurnActionNumber]; gBattle_BG0_X = 0; diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 7be47d762..0eba68f29 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -9441,7 +9441,7 @@ static void atkEF_handleballthrow(void) { BtlController_EmitBallThrowAnim(0, BALL_3_SHAKES_SUCCESS); MarkBattlerForControllerExec(gActiveBattler); - gBattlescriptCurrInstr = gUnknown_81D9A88; + gBattlescriptCurrInstr = BattleScript_OldMan_Pokedude_CaughtMessage; } else { -- cgit v1.2.3 From 4cad26157e132753b9024dcc4b1cdc1d65f548f8 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 6 Nov 2019 18:32:17 -0500 Subject: Rename ghost battle scripts --- src/battle_main.c | 2 +- src/battle_util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/battle_main.c b/src/battle_main.c index 8852fa188..14b191e52 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -2677,7 +2677,7 @@ static void BattleIntroPrintWildMonAttacked(void) if ((gBattleTypeFlags & (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) == (BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_GHOST)) { gBattleScripting.battler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); - BattleScriptExecute(gUnknown_81D91A1); + BattleScriptExecute(BattleScript_SilphScopeUnveiled); } } } diff --git a/src/battle_util.c b/src/battle_util.c index de6419ecf..b415f6550 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1385,9 +1385,9 @@ u8 AtkCanceller_UnableToUseMove(void) if ((gBattleTypeFlags & (BATTLE_TYPE_GHOST | BATTLE_TYPE_LEGENDARY)) == BATTLE_TYPE_GHOST) { if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) - gBattlescriptCurrInstr = gUnknown_81D9180; + gBattlescriptCurrInstr = BattleScript_TooScaredToMove; else - gBattlescriptCurrInstr = gUnknown_81D9192; + gBattlescriptCurrInstr = BattleScript_GhostGetOutGetOut; gBattleCommunication[MULTISTRING_CHOOSER] = 0; effect = 1; } -- cgit v1.2.3 From 64485f5cd106285e6ed7ec461db49e02b6308d8a Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 7 Nov 2019 09:23:21 -0500 Subject: TRAINER_SECRET_BASE propagation --- src/battle_script_commands.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0eba68f29..181f59b09 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5176,7 +5176,7 @@ static void atk5D_getmoneyreward(void) // The whole function is using wrong registers. if (gBattleOutcome == B_OUTCOME_WON) { - if (gTrainerBattleOpponent_A == 0x400) + if (gTrainerBattleOpponent_A == TRAINER_SECRET_BASE) { moneyReward = 20 * gBattleResources->secretBase->party.levels[0] * gBattleStruct->moneyMultiplier; } @@ -8810,7 +8810,7 @@ static void atkD2_tryswapitems(void) // trick if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_TOWER || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) - && gTrainerBattleOpponent_A != 0x400)) + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE)) { gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1); } @@ -8821,7 +8821,7 @@ static void atkD2_tryswapitems(void) // trick // you can't swap items if they were knocked off in regular battles if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)) - && gTrainerBattleOpponent_A != 0x400 + && gTrainerBattleOpponent_A != TRAINER_SECRET_BASE && (gWishFutureKnock.knockedOffMons[sideAttacker] & gBitTable[gBattlerPartyIndexes[gBattlerAttacker]] || gWishFutureKnock.knockedOffMons[sideTarget] & gBitTable[gBattlerPartyIndexes[gBattlerTarget]])) { -- cgit v1.2.3