summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c69
1 files changed, 35 insertions, 34 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 2ad57e961..a7da9905a 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -32,6 +32,7 @@
#include "constants/opponents.h"
#include "constants/songs.h"
#include "constants/species.h"
+#include "constants/items.h"
extern u16 gSpecialVar_Result;
@@ -39,7 +40,7 @@ extern void (*gFieldCallback)(void);
EWRAM_DATA static u16 sTrainerBattleMode = 0;
EWRAM_DATA u16 gTrainerBattleOpponent = 0;
-EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0;
+EWRAM_DATA static u16 sTrainerObjectEventLocalId = 0;
EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL;
EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL;
EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL;
@@ -51,7 +52,7 @@ extern u16 gBattleTypeFlags;
extern u16 gSpecialVar_LastTalked;
extern u8 gBattleOutcome;
-extern struct EventObject gEventObjects[];
+extern struct ObjectEvent gObjectEvents[];
extern u8 gUnknown_0819F818[];
extern u8 gUnknown_0819F840[];
@@ -100,7 +101,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -112,7 +113,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -124,7 +125,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -136,7 +137,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerIntroSpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
{&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -148,7 +149,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
{
{&sTrainerBattleMode, TRAINER_PARAM_LOAD_VAL_8BIT},
{&gTrainerBattleOpponent, TRAINER_PARAM_LOAD_VAL_16BIT},
- {&sTrainerEventObjectLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
+ {&sTrainerObjectEventLocalId, TRAINER_PARAM_LOAD_VAL_16BIT},
{&sTrainerIntroSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerDefeatSpeech, TRAINER_PARAM_LOAD_VAL_32BIT},
{&sTrainerVictorySpeech, TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -515,7 +516,7 @@ void BattleSetup_StartWildBattle(void)
static void DoStandardWildBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_80597F4();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = 0;
@@ -527,7 +528,7 @@ static void DoStandardWildBattle(void)
void BattleSetup_StartRoamerBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_80597F4();
gMain.savedCallback = CB2_EndWildBattle;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -539,7 +540,7 @@ void BattleSetup_StartRoamerBattle(void)
static void DoSafariBattle(void)
{
ScriptContext2_Enable();
- FreezeEventObjects();
+ FreezeObjectEvents();
sub_80597F4();
gMain.savedCallback = sub_80C824C;
gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -558,7 +559,7 @@ void ScrSpecial_StartWallyTutorialBattle(void)
{
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
ScriptContext2_Enable();
- gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music;
+ gMain.savedCallback = CB2_ReturnToFieldContinueScriptPlayMapMusic;
gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
CreateBattleStartTask(B_TRANSITION_SLICE, 0);
}
@@ -640,7 +641,7 @@ void CB2_EndScriptedWildBattle(void)
if (IsPlayerDefeated(gBattleOutcome) == TRUE)
SetMainCallback2(CB2_WhiteOut);
else
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
s8 BattleSetup_GetTerrain(void)
@@ -871,7 +872,7 @@ static void CB2_GiveStarter(void)
*GetVarPointer(VAR_STARTER_MON) = gSpecialVar_Result;
starterPoke = GetStarterPokemon(gSpecialVar_Result);
- ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0);
+ ScriptGiveMon(starterPoke, 5, ITEM_NONE, 0, 0, 0);
ResetTasks();
sub_80408BC();
SetMainCallback2(CB2_StartFirstBattle);
@@ -898,7 +899,7 @@ static void CB2_StartFirstBattle(void)
static void CB2_EndFirstBattle(void)
{
Overworld_ClearSavedMusic();
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
// why not just use the macros? maybe its because they didnt want to uncast const every time?
@@ -926,14 +927,14 @@ static bool32 IsPlayerDefeated(u32 battleOutcome)
{
switch (battleOutcome)
{
- case BATTLE_LOST:
- case BATTLE_DREW:
+ case B_OUTCOME_LOST:
+ case B_OUTCOME_DREW:
return TRUE;
- case BATTLE_WON:
- case BATTLE_RAN:
- case BATTLE_PLAYER_TELEPORTED:
- case BATTLE_POKE_FLED:
- case BATTLE_CAUGHT:
+ case B_OUTCOME_WON:
+ case B_OUTCOME_RAN:
+ case B_OUTCOME_PLAYER_TELEPORTED:
+ case B_OUTCOME_MON_FLED:
+ case B_OUTCOME_CAUGHT:
return FALSE;
default:
return FALSE;
@@ -944,7 +945,7 @@ static void ResetTrainerOpponentIds(void)
{
sTrainerBattleMode = 0;
gTrainerBattleOpponent = 0;
- sTrainerEventObjectLocalId = 0;
+ sTrainerObjectEventLocalId = 0;
sTrainerIntroSpeech = 0;
sTrainerDefeatSpeech = 0;
sTrainerVictorySpeech = 0;
@@ -990,10 +991,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
static void SetMapVarsToTrainer(void)
{
- if (sTrainerEventObjectLocalId)
+ if (sTrainerObjectEventLocalId)
{
- gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
- gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+ gSpecialVar_LastTalked = sTrainerObjectEventLocalId;
+ gSelectedObjectEvent = GetObjectEventIdByLocalIdAndMap(sTrainerObjectEventLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
}
}
@@ -1038,10 +1039,10 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
}
}
-void TrainerWantsBattle(u8 trainerEventObjId, const u8 *trainerScript)
+void TrainerWantsBattle(u8 trainerObjEventId, const u8 *trainerScript)
{
- gSelectedEventObject = trainerEventObjId;
- gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId;
+ gSelectedObjectEvent = trainerObjEventId;
+ gSpecialVar_LastTalked = gObjectEvents[trainerObjEventId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(gUnknown_0819F80B);
ScriptContext2_Enable();
@@ -1055,9 +1056,9 @@ bool32 GetTrainerFlagFromScriptPointer(const u8 *data)
void sub_8082524(void)
{
- struct EventObject *eventObject = &gEventObjects[gSelectedEventObject];
+ struct ObjectEvent *objectEvent = &gObjectEvents[gSelectedObjectEvent];
- SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
+ SetTrainerMovementType(objectEvent, GetTrainerFacingDirectionMovementType(objectEvent->facingDirection));
}
u8 ScrSpecial_GetTrainerBattleMode(void)
@@ -1107,7 +1108,7 @@ void CB2_EndTrainerBattle(void)
{
if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT)
{
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
{
@@ -1115,7 +1116,7 @@ void CB2_EndTrainerBattle(void)
}
else
{
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
SetCurrentTrainerBattledFlag();
}
}
@@ -1124,7 +1125,7 @@ void CB2_EndTrainerEyeRematchBattle(void)
{
if (gTrainerBattleOpponent == SECRET_BASE_OPPONENT)
{
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
}
else if (IsPlayerDefeated(gBattleOutcome) == TRUE)
{
@@ -1132,7 +1133,7 @@ void CB2_EndTrainerEyeRematchBattle(void)
}
else
{
- SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
+ SetMainCallback2(CB2_ReturnToFieldContinueScriptPlayMapMusic);
SetCurrentTrainerBattledFlag();
SetTrainerFlagsAfterTrainerEyeRematch();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 13:20:16 +0000