dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #144 from PikalaxALT/dism_more_data

Browse Source 
Dump battle scripts and several rfu3 strings
This commit is contained in:
PikalaxALT
2019-11-07 11:23:15 -05:00
committed by GitHub
parent 994b9cdbad 2b521f243a
commit d833c0ba01
18 changed files with 7180 additions and 1624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_main.c
+9 -9
View File
@@ -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,
@@ -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);
}
}
}
@@ -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;
@@ -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))
{
@@ -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;
src/battle_script_commands.c
+12 -12
View File
@@ -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);
@@ -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);
@@ -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;
@@ -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;
}
@@ -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
@@ -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)
@@ -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;
@@ -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]]))
{
@@ -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
{
src/battle_util.c
+2 -2
View File
@@ -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;
}