summaryrefslogtreecommitdiff
path: root/src/battle/battle_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle/battle_setup.c')
-rw-r--r--src/battle/battle_setup.c287
1 files changed, 149 insertions, 138 deletions
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 40949ed38..f71aad090 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -11,21 +11,21 @@
#include "field_player_avatar.h"
#include "field_weather.h"
#include "fieldmap.h"
-#include "fldeff_80C5CD4.h"
+#include "fldeff_poison.h"
#include "main.h"
-#include "map_constants.h"
+#include "constants/maps.h"
#include "metatile_behavior.h"
-#include "opponent_constants.h"
+#include "constants/opponents.h"
#include "palette.h"
-#include "rng.h"
+#include "random.h"
#include "overworld.h"
#include "safari_zone.h"
#include "script.h"
#include "script_pokemon_80C4.h"
#include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
#include "sound.h"
-#include "species.h"
+#include "constants/species.h"
#include "starter_choose.h"
#include "string_util.h"
#include "strings.h"
@@ -33,7 +33,7 @@
#include "text.h"
#include "trainer.h"
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
extern void (*gFieldCallback)(void);
@@ -48,7 +48,7 @@ EWRAM_DATA static u8 *sTrainerBattleScriptRetAddr = NULL;
EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
extern u16 gBattleTypeFlags;
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
extern u8 gBattleOutcome;
extern struct MapObject gMapObjects[];
@@ -161,287 +161,297 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] =
{
{
{OPPONENT_ROSE_1, OPPONENT_ROSE_2, OPPONENT_ROSE_3, OPPONENT_ROSE_4, OPPONENT_ROSE_5},
- MAP_GROUP_ROUTE118,
- MAP_ID_ROUTE118,
+ MAP_GROUP(ROUTE118),
+ MAP_NUM(ROUTE118),
},
{
{OPPONENT_DUSTY_1, OPPONENT_DUSTY_2, OPPONENT_DUSTY_3, OPPONENT_DUSTY_4, OPPONENT_DUSTY_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_LOLA_1, OPPONENT_LOLA_2, OPPONENT_LOLA_3, OPPONENT_LOLA_4, OPPONENT_LOLA_5},
- MAP_GROUP_ROUTE109,
- MAP_ID_ROUTE109,
+ MAP_GROUP(ROUTE109),
+ MAP_NUM(ROUTE109),
},
{
{OPPONENT_RICKY_1, OPPONENT_RICKY_2, OPPONENT_RICKY_3, OPPONENT_RICKY_4, OPPONENT_RICKY_5},
- MAP_GROUP_ROUTE109,
- MAP_ID_ROUTE109,
+ MAP_GROUP(ROUTE109),
+ MAP_NUM(ROUTE109),
},
{
{OPPONENT_RITA_AND_SAM_1, OPPONENT_RITA_AND_SAM_2, OPPONENT_RITA_AND_SAM_3, OPPONENT_RITA_AND_SAM_4, OPPONENT_RITA_AND_SAM_5},
- MAP_GROUP_ROUTE124,
- MAP_ID_ROUTE124,
+ MAP_GROUP(ROUTE124),
+ MAP_NUM(ROUTE124),
},
{
{OPPONENT_BROOKE_1, OPPONENT_BROOKE_2, OPPONENT_BROOKE_3, OPPONENT_BROOKE_4, OPPONENT_BROOKE_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_WILTON_1, OPPONENT_WILTON_2, OPPONENT_WILTON_3, OPPONENT_WILTON_4, OPPONENT_WILTON_5},
- MAP_GROUP_ROUTE111,
- MAP_ID_ROUTE111,
+ MAP_GROUP(ROUTE111),
+ MAP_NUM(ROUTE111),
},
{
{OPPONENT_VALERIE_1, OPPONENT_VALERIE_2, OPPONENT_VALERIE_3, OPPONENT_VALERIE_4, OPPONENT_VALERIE_5},
- MAP_GROUP_MT_PYRE_6F,
- MAP_ID_MT_PYRE_6F,
+ MAP_GROUP(MT_PYRE_6F),
+ MAP_NUM(MT_PYRE_6F),
},
{
{OPPONENT_CINDY_1, OPPONENT_CINDY_3, OPPONENT_CINDY_4, OPPONENT_CINDY_5, OPPONENT_CINDY_6},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_JESSICA_1, OPPONENT_JESSICA_2, OPPONENT_JESSICA_3, OPPONENT_JESSICA_4, OPPONENT_JESSICA_5},
- MAP_GROUP_ROUTE121,
- MAP_ID_ROUTE121,
+ MAP_GROUP(ROUTE121),
+ MAP_NUM(ROUTE121),
},
{
{OPPONENT_WINSTON_1, OPPONENT_WINSTON_2, OPPONENT_WINSTON_3, OPPONENT_WINSTON_4, OPPONENT_WINSTON_5},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_STEVE_1, OPPONENT_STEVE_2, OPPONENT_STEVE_3, OPPONENT_STEVE_4, OPPONENT_STEVE_5},
- MAP_GROUP_ROUTE114,
- MAP_ID_ROUTE114,
+ MAP_GROUP(ROUTE114),
+ MAP_NUM(ROUTE114),
},
{
{OPPONENT_TONY_1, OPPONENT_TONY_2, OPPONENT_TONY_3, OPPONENT_TONY_4, OPPONENT_TONY_5},
- MAP_GROUP_ROUTE107,
- MAP_ID_ROUTE107,
+ MAP_GROUP(ROUTE107),
+ MAP_NUM(ROUTE107),
},
{
{OPPONENT_NOB_1, OPPONENT_NOB_2, OPPONENT_NOB_3, OPPONENT_NOB_4, OPPONENT_NOB_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_DALTON_1, OPPONENT_DALTON_2, OPPONENT_DALTON_3, OPPONENT_DALTON_4, OPPONENT_DALTON_5},
- MAP_GROUP_ROUTE118,
- MAP_ID_ROUTE118,
+ MAP_GROUP(ROUTE118),
+ MAP_NUM(ROUTE118),
},
{
{OPPONENT_BERNIE_1, OPPONENT_BERNIE_2, OPPONENT_BERNIE_3, OPPONENT_BERNIE_4, OPPONENT_BERNIE_5},
- MAP_GROUP_ROUTE114,
- MAP_ID_ROUTE114,
+ MAP_GROUP(ROUTE114),
+ MAP_NUM(ROUTE114),
},
{
{OPPONENT_ETHAN_1, OPPONENT_ETHAN_2, OPPONENT_ETHAN_3, OPPONENT_ETHAN_4, OPPONENT_ETHAN_5},
- MAP_GROUP_JAGGED_PASS,
- MAP_ID_JAGGED_PASS,
+ MAP_GROUP(JAGGED_PASS),
+ MAP_NUM(JAGGED_PASS),
},
{
{OPPONENT_JOHN_AND_JAY_1, OPPONENT_JOHN_AND_JAY_2, OPPONENT_JOHN_AND_JAY_3, OPPONENT_JOHN_AND_JAY_4, OPPONENT_JOHN_AND_JAY_5},
- MAP_GROUP_METEOR_FALLS_1F_2R,
- MAP_ID_METEOR_FALLS_1F_2R,
+ MAP_GROUP(METEOR_FALLS_1F_2R),
+ MAP_NUM(METEOR_FALLS_1F_2R),
},
{
{OPPONENT_BRANDON_1, OPPONENT_BRANDON_2, OPPONENT_BRANDON_3, OPPONENT_BRANDON_4, OPPONENT_BRANDON_5},
- MAP_GROUP_ROUTE120,
- MAP_ID_ROUTE120,
+ MAP_GROUP(ROUTE120),
+ MAP_NUM(ROUTE120),
},
{
{OPPONENT_CAMERON_1, OPPONENT_CAMERON_2, OPPONENT_CAMERON_3, OPPONENT_CAMERON_4, OPPONENT_CAMERON_5},
- MAP_GROUP_ROUTE123,
- MAP_ID_ROUTE123,
+ MAP_GROUP(ROUTE123),
+ MAP_NUM(ROUTE123),
},
{
{OPPONENT_JACKI_1, OPPONENT_JACKI_2, OPPONENT_JACKI_3, OPPONENT_JACKI_4, OPPONENT_JACKI_5},
- MAP_GROUP_ROUTE123,
- MAP_ID_ROUTE123,
+ MAP_GROUP(ROUTE123),
+ MAP_NUM(ROUTE123),
},
{
{OPPONENT_WALTER_1, OPPONENT_WALTER_2, OPPONENT_WALTER_3, OPPONENT_WALTER_4, OPPONENT_WALTER_5},
- MAP_GROUP_ROUTE121,
- MAP_ID_ROUTE121,
+ MAP_GROUP(ROUTE121),
+ MAP_NUM(ROUTE121),
},
{
{OPPONENT_KAREN_1, OPPONENT_KAREN_2, OPPONENT_KAREN_3, OPPONENT_KAREN_4, OPPONENT_KAREN_5},
- MAP_GROUP_ROUTE116,
- MAP_ID_ROUTE116,
+ MAP_GROUP(ROUTE116),
+ MAP_NUM(ROUTE116),
},
{
{OPPONENT_JERRY_1, OPPONENT_JERRY_2, OPPONENT_JERRY_3, OPPONENT_JERRY_4, OPPONENT_JERRY_5},
- MAP_GROUP_ROUTE116,
- MAP_ID_ROUTE116,
+ MAP_GROUP(ROUTE116),
+ MAP_NUM(ROUTE116),
},
{
{OPPONENT_ANNA_AND_MEG_1, OPPONENT_ANNA_AND_MEG_2, OPPONENT_ANNA_AND_MEG_3, OPPONENT_ANNA_AND_MEG_4, OPPONENT_ANNA_AND_MEG_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_ISABEL_1, OPPONENT_ISABEL_2, OPPONENT_ISABEL_3, OPPONENT_ISABEL_4, OPPONENT_ISABEL_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_MIGUEL_1, OPPONENT_MIGUEL_2, OPPONENT_MIGUEL_3, OPPONENT_MIGUEL_4, OPPONENT_MIGUEL_5},
- MAP_GROUP_ROUTE103,
- MAP_ID_ROUTE103,
+ MAP_GROUP(ROUTE103),
+ MAP_NUM(ROUTE103),
},
{
{OPPONENT_TIMOTHY_1, OPPONENT_TIMOTHY_2, OPPONENT_TIMOTHY_3, OPPONENT_TIMOTHY_4, OPPONENT_TIMOTHY_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_SHELBY_1, OPPONENT_SHELBY_2, OPPONENT_SHELBY_3, OPPONENT_SHELBY_4, OPPONENT_SHELBY_5},
- MAP_GROUP_MT_CHIMNEY,
- MAP_ID_MT_CHIMNEY,
+ MAP_GROUP(MT_CHIMNEY),
+ MAP_NUM(MT_CHIMNEY),
},
{
{OPPONENT_CALVIN_1, OPPONENT_CALVIN_2, OPPONENT_CALVIN_3, OPPONENT_CALVIN_4, OPPONENT_CALVIN_5},
- MAP_GROUP_ROUTE102,
- MAP_ID_ROUTE102,
+ MAP_GROUP(ROUTE102),
+ MAP_NUM(ROUTE102),
},
{
{OPPONENT_ELLIOT_1, OPPONENT_ELLIOT_2, OPPONENT_ELLIOT_3, OPPONENT_ELLIOT_4, OPPONENT_ELLIOT_5},
- MAP_GROUP_ROUTE106,
- MAP_ID_ROUTE106,
+ MAP_GROUP(ROUTE106),
+ MAP_NUM(ROUTE106),
},
{
{OPPONENT_ABIGAIL_1, OPPONENT_ABIGAIL_2, OPPONENT_ABIGAIL_3, OPPONENT_ABIGAIL_4, OPPONENT_ABIGAIL_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_BENJAMIN_1, OPPONENT_BENJAMIN_2, OPPONENT_BENJAMIN_3, OPPONENT_BENJAMIN_4, OPPONENT_BENJAMIN_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_ISAIAH_1, OPPONENT_ISAIAH_2, OPPONENT_ISAIAH_3, OPPONENT_ISAIAH_4, OPPONENT_ISAIAH_5},
- MAP_GROUP_ROUTE128,
- MAP_ID_ROUTE128,
+ MAP_GROUP(ROUTE128),
+ MAP_NUM(ROUTE128),
},
{
{OPPONENT_KATELYN_1, OPPONENT_KATELYN_2, OPPONENT_KATELYN_3, OPPONENT_KATELYN_4, OPPONENT_KATELYN_5},
- MAP_GROUP_ROUTE128,
- MAP_ID_ROUTE128,
+ MAP_GROUP(ROUTE128),
+ MAP_NUM(ROUTE128),
},
{
{OPPONENT_MARIA_1, OPPONENT_MARIA_2, OPPONENT_MARIA_3, OPPONENT_MARIA_4, OPPONENT_MARIA_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_DYLAN_1, OPPONENT_DYLAN_2, OPPONENT_DYLAN_3, OPPONENT_DYLAN_4, OPPONENT_DYLAN_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_NICOLAS_1, OPPONENT_NICOLAS_2, OPPONENT_NICOLAS_3, OPPONENT_NICOLAS_4, OPPONENT_NICOLAS_5},
- MAP_GROUP_METEOR_FALLS_1F_2R,
- MAP_ID_METEOR_FALLS_1F_2R,
+ MAP_GROUP(METEOR_FALLS_1F_2R),
+ MAP_NUM(METEOR_FALLS_1F_2R),
},
{
{OPPONENT_ROBERT_1, OPPONENT_ROBERT_2, OPPONENT_ROBERT_3, OPPONENT_ROBERT_4, OPPONENT_ROBERT_5},
- MAP_GROUP_ROUTE120,
- MAP_ID_ROUTE120,
+ MAP_GROUP(ROUTE120),
+ MAP_NUM(ROUTE120),
},
{
{OPPONENT_LAO_1, OPPONENT_LAO_2, OPPONENT_LAO_3, OPPONENT_LAO_4, OPPONENT_LAO_5},
- MAP_GROUP_ROUTE113,
- MAP_ID_ROUTE113,
+ MAP_GROUP(ROUTE113),
+ MAP_NUM(ROUTE113),
},
{
{OPPONENT_CYNDY_1, OPPONENT_CYNDY_2, OPPONENT_CYNDY_3, OPPONENT_CYNDY_4, OPPONENT_CYNDY_5},
- MAP_GROUP_ROUTE115,
- MAP_ID_ROUTE115,
+ MAP_GROUP(ROUTE115),
+ MAP_NUM(ROUTE115),
},
{
{OPPONENT_MADELINE_1, OPPONENT_MADELINE_2, OPPONENT_MADELINE_3, OPPONENT_MADELINE_4, OPPONENT_MADELINE_5},
- MAP_GROUP_ROUTE113,
- MAP_ID_ROUTE113,
+ MAP_GROUP(ROUTE113),
+ MAP_NUM(ROUTE113),
},
{
{OPPONENT_JENNY_1, OPPONENT_JENNY_2, OPPONENT_JENNY_3, OPPONENT_JENNY_4, OPPONENT_JENNY_5},
- MAP_GROUP_ROUTE124,
- MAP_ID_ROUTE124,
+ MAP_GROUP(ROUTE124),
+ MAP_NUM(ROUTE124),
},
{
{OPPONENT_DIANA_1, OPPONENT_DIANA_2, OPPONENT_DIANA_3, OPPONENT_DIANA_4, OPPONENT_DIANA_5},
- MAP_GROUP_JAGGED_PASS,
- MAP_ID_JAGGED_PASS,
+ MAP_GROUP(JAGGED_PASS),
+ MAP_NUM(JAGGED_PASS),
},
{
{OPPONENT_AMY_AND_LIV_1, OPPONENT_AMY_AND_LIV_2, OPPONENT_AMY_AND_LIV_4, OPPONENT_AMY_AND_LIV_5, OPPONENT_AMY_AND_LIV_6},
- MAP_GROUP_ROUTE103,
- MAP_ID_ROUTE103,
+ MAP_GROUP(ROUTE103),
+ MAP_NUM(ROUTE103),
},
{
{OPPONENT_ERNEST_1, OPPONENT_ERNEST_2, OPPONENT_ERNEST_3, OPPONENT_ERNEST_4, OPPONENT_ERNEST_5},
- MAP_GROUP_ROUTE125,
- MAP_ID_ROUTE125,
+ MAP_GROUP(ROUTE125),
+ MAP_NUM(ROUTE125),
},
{
{OPPONENT_EDWIN_1, OPPONENT_EDWIN_2, OPPONENT_EDWIN_3, OPPONENT_EDWIN_4, OPPONENT_EDWIN_5},
- MAP_GROUP_ROUTE110,
- MAP_ID_ROUTE110,
+ MAP_GROUP(ROUTE110),
+ MAP_NUM(ROUTE110),
},
{
{OPPONENT_LYDIA_1, OPPONENT_LYDIA_2, OPPONENT_LYDIA_3, OPPONENT_LYDIA_4, OPPONENT_LYDIA_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_ISAAC_1, OPPONENT_ISAAC_2, OPPONENT_ISAAC_3, OPPONENT_ISAAC_4, OPPONENT_ISAAC_5},
- MAP_GROUP_ROUTE117,
- MAP_ID_ROUTE117,
+ MAP_GROUP(ROUTE117),
+ MAP_NUM(ROUTE117),
},
{
{OPPONENT_CATHERINE_1, OPPONENT_CATHERINE_2, OPPONENT_CATHERINE_3, OPPONENT_CATHERINE_4, OPPONENT_CATHERINE_5},
- MAP_GROUP_ROUTE119,
- MAP_ID_ROUTE119,
+ MAP_GROUP(ROUTE119),
+ MAP_NUM(ROUTE119),
},
{
{OPPONENT_JACKSON_1, OPPONENT_JACKSON_2, OPPONENT_JACKSON_3, OPPONENT_JACKSON_4, OPPONENT_JACKSON_5},
- MAP_GROUP_ROUTE119,
- MAP_ID_ROUTE119,
+ MAP_GROUP(ROUTE119),
+ MAP_NUM(ROUTE119),
},
{
{OPPONENT_HALEY_1, OPPONENT_HALEY_2, OPPONENT_HALEY_3, OPPONENT_HALEY_4, OPPONENT_HALEY_5},
- MAP_GROUP_ROUTE104,
- MAP_ID_ROUTE104,
+ MAP_GROUP(ROUTE104),
+ MAP_NUM(ROUTE104),
},
{
{OPPONENT_JAMES_1, OPPONENT_JAMES_2, OPPONENT_JAMES_3, OPPONENT_JAMES_4, OPPONENT_JAMES_5},
- MAP_GROUP_PETALBURG_WOODS,
- MAP_ID_PETALBURG_WOODS,
+ MAP_GROUP(PETALBURG_WOODS),
+ MAP_NUM(PETALBURG_WOODS),
},
{
{OPPONENT_TRENT_1, OPPONENT_TRENT_2, OPPONENT_TRENT_3, OPPONENT_TRENT_4, OPPONENT_TRENT_5},
- MAP_GROUP_ROUTE112,
- MAP_ID_ROUTE112,
+ MAP_GROUP(ROUTE112),
+ MAP_NUM(ROUTE112),
},
{
{OPPONENT_LOIS_AND_HAL_1, OPPONENT_LOIS_AND_HAL_2, OPPONENT_LOIS_AND_HAL_3, OPPONENT_LOIS_AND_HAL_4, OPPONENT_LOIS_AND_HAL_5},
- MAP_GROUP_ABANDONED_SHIP_ROOMS2_1F,
- MAP_ID_ABANDONED_SHIP_ROOMS2_1F,
+ MAP_GROUP(ABANDONED_SHIP_ROOMS2_1F),
+ MAP_NUM(ABANDONED_SHIP_ROOMS2_1F),
},
{
{OPPONENT_WALLY_3, OPPONENT_WALLY_4, OPPONENT_WALLY_5, OPPONENT_WALLY_6, OPPONENT_NONE},
- MAP_GROUP_VICTORY_ROAD_1F,
- MAP_ID_VICTORY_ROAD_1F,
+ MAP_GROUP(VICTORY_ROAD_1F),
+ MAP_NUM(VICTORY_ROAD_1F),
},
};
-static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET};
+static const u16 sBadgeFlags[] =
+{
+ FLAG_BADGE01_GET,
+ FLAG_BADGE02_GET,
+ FLAG_BADGE03_GET,
+ FLAG_BADGE04_GET,
+ FLAG_BADGE05_GET,
+ FLAG_BADGE06_GET,
+ FLAG_BADGE07_GET,
+ FLAG_BADGE08_GET,
+};
static void DoStandardWildBattle(void);
static void DoSafariBattle(void);
@@ -682,7 +692,7 @@ s8 BattleSetup_GetTerrain(void)
if (MetatileBehavior_IsBridge(tileBehavior) == TRUE)
return BATTLE_TERRAIN_WATER;
}
- if (gSaveBlock1.location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1.location.mapNum == MAP_ID_ROUTE113)
+ if (gSaveBlock1.location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1.location.mapNum == MAP_NUM(ROUTE113))
return BATTLE_TERRAIN_SAND;
if (GetSav1Weather() == 8)
return BATTLE_TERRAIN_SAND;
@@ -848,8 +858,8 @@ static void CB2_GiveStarter(void)
{
u16 starterPoke;
- *GetVarPointer(0x4023) = gScriptResult;
- starterPoke = GetStarterPokemon(gScriptResult);
+ *GetVarPointer(0x4023) = gSpecialVar_Result;
+ starterPoke = GetStarterPokemon(gSpecialVar_Result);
ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0);
ResetTasks();
sub_80408BC();
@@ -880,19 +890,20 @@ static void CB2_EndFirstBattle(void)
SetMainCallback2(c2_exit_to_overworld_1_continue_scripts_restart_music);
}
+// why not just use the macros? maybe its because they didnt want to uncast const every time?
static u32 TrainerBattleLoadArg32(const u8 *ptr)
{
- return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24);
+ return T1_READ_32(ptr);
}
static u16 TrainerBattleLoadArg16(const u8 *ptr)
{
- return ptr[0] | (ptr[1] << 8);
+ return T1_READ_16(ptr);
}
static u8 TrainerBattleLoadArg8(const u8 *ptr)
{
- return ptr[0];
+ return T1_READ_8(ptr);
}
static u16 CurrentOpponentTrainerFlag(void)
@@ -969,7 +980,7 @@ static void battle_80801F0(void)
{
if (sTrainerMapObjectLocalId)
{
- gScriptLastTalked = sTrainerMapObjectLocalId;
+ gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
}
}
@@ -1018,7 +1029,7 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
{
gSelectedMapObject = trainerMapObjId;
- gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
+ gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
ScriptContext1_SetupScript(gUnknown_0819F80B);
ScriptContext2_Enable();
@@ -1123,8 +1134,8 @@ void ScrSpecial_StartTrainerEyeRematch(void)
ScriptContext1_Stop();
}
-static u8 *GetTrainerIntroSpeech(void);
-static u8 *GetTrainerNonBattlingSpeech(void);
+static const u8 *GetTrainerIntroSpeech(void);
+static const u8 *GetTrainerNonBattlingSpeech(void);
void ScrSpecial_ShowTrainerIntroSpeech(void)
{
@@ -1207,22 +1218,22 @@ void PlayTrainerEncounterMusic(void)
}
//Returns an empty string if a null pointer was passed, otherwise returns str
-static u8 *SanitizeString(const u8 *str)
+static const u8 *SanitizeString(const u8 *str)
{
if (str)
- return (u8 *) str;
+ return str;
else
- return (u8 *) gOtherText_CancelWithTerminator;
+ return gOtherText_CancelWithTerminator;
}
-static u8 *GetTrainerIntroSpeech(void)
+static const u8 *GetTrainerIntroSpeech(void)
{
return SanitizeString(sTrainerIntroSpeech);
}
u8 *sub_8082830(void)
{
- u8 *str;
+ const u8 *str;
if (gTrainerBattleOpponent == 1024)
str = sub_80BCCE8();
@@ -1233,12 +1244,12 @@ u8 *sub_8082830(void)
return gStringVar4;
}
-u8 *unref_sub_808286C(void)
+const u8 *unref_sub_808286C(void)
{
return SanitizeString(sTrainerVictorySpeech);
}
-static u8 *GetTrainerNonBattlingSpeech(void)
+static const u8 *GetTrainerNonBattlingSpeech(void)
{
return SanitizeString(sTrainerCannotBattleSpeech);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 21:53:16 +0000