summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/rom_810CBB4.s4
-rw-r--r--include/main.h2
-rw-r--r--include/wallclock.h2
-rw-r--r--src/battle_setup.c26
-rw-r--r--src/clock.c2
-rw-r--r--src/main_menu.c2
-rw-r--r--src/option_menu.c2
-rw-r--r--src/rom4.c2
-rw-r--r--src/start_menu.c4
-rw-r--r--src/starter_choose.c2
-rw-r--r--src/wallclock.c6
11 files changed, 27 insertions, 27 deletions
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index 986b6ce79..9289078b3 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -1453,7 +1453,7 @@ sub_810D6B8: @ 810D6B8
ldr r0, _0810D6D0 @ =gMain
ldr r1, _0810D6D4 @ =c2_exit_to_overworld_2_switch
str r1, [r0, 0x8]
- ldr r0, _0810D6D8 @ =Cb2_ViewWallClock
+ ldr r0, _0810D6D8 @ =CB2_ViewWallClock
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
@@ -1461,7 +1461,7 @@ sub_810D6B8: @ 810D6B8
.align 2, 0
_0810D6D0: .4byte gMain
_0810D6D4: .4byte c2_exit_to_overworld_2_switch
-_0810D6D8: .4byte Cb2_ViewWallClock
+_0810D6D8: .4byte CB2_ViewWallClock
thumb_func_end sub_810D6B8
thumb_func_start ResetCyclingRoadChallengeData
diff --git a/include/main.h b/include/main.h
index eca0e7f96..aef55a182 100644
--- a/include/main.h
+++ b/include/main.h
@@ -12,7 +12,7 @@ struct Main
/*0x000*/ MainCallback callback1;
/*0x004*/ MainCallback callback2;
- /*0x008*/ MainCallback field_8;
+ /*0x008*/ MainCallback savedCallback;
/*0x00C*/ IntrCallback vblankCallback;
/*0x010*/ IntrCallback hblankCallback;
diff --git a/include/wallclock.h b/include/wallclock.h
index a0971ee1d..c869e3941 100644
--- a/include/wallclock.h
+++ b/include/wallclock.h
@@ -4,7 +4,7 @@
#include "sprite.h"
void CB2_StartWallClock(void);
-void Cb2_ViewWallClock(void);
+void CB2_ViewWallClock(void);
void sub_810B05C(struct Sprite *sprite);
void sub_810B0F4(struct Sprite *sprite);
diff --git a/src/battle_setup.c b/src/battle_setup.c
index fa0bf4ba1..5296f1923 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -164,7 +164,7 @@ void StartBattle_StandardWild(void)
ScriptContext2_Enable();
FreezeMapObjects();
sub_80597F4();
- gMain.field_8 = HandleWildBattleEnd;
+ gMain.savedCallback = HandleWildBattleEnd;
gBattleTypeFlags = 0;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
@@ -176,7 +176,7 @@ void StartBattle_Roamer(void)
ScriptContext2_Enable();
FreezeMapObjects();
sub_80597F4();
- gMain.field_8 = HandleWildBattleEnd;
+ gMain.savedCallback = HandleWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_ROAMER;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
@@ -188,7 +188,7 @@ void StartBattle_Safari(void)
ScriptContext2_Enable();
FreezeMapObjects();
sub_80597F4();
- gMain.field_8 = sub_80C824C;
+ gMain.savedCallback = sub_80C824C;
gBattleTypeFlags = BATTLE_TYPE_SAFARI;
task_add_01_battle_start(GetWildBattleTransition(), 0);
}
@@ -205,7 +205,7 @@ void StartBattle_WallyTutorial(void)
{
CreateMaleMon(&gEnemyParty[0], SPECIES_RALTS, 5);
ScriptContext2_Enable();
- gMain.field_8 = c2_exit_to_overworld_1_continue_scripts_restart_music;
+ gMain.savedCallback = c2_exit_to_overworld_1_continue_scripts_restart_music;
gBattleTypeFlags = BATTLE_TYPE_WALLY_TUTORIAL;
task_add_01_battle_start(8, 0);
}
@@ -213,7 +213,7 @@ void StartBattle_WallyTutorial(void)
void StartBattle_ScriptedWild(void)
{
ScriptContext2_Enable();
- gMain.field_8 = HandleScriptedWildBattleEnd;
+ gMain.savedCallback = HandleScriptedWildBattleEnd;
gBattleTypeFlags = 0;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
@@ -223,7 +223,7 @@ void StartBattle_ScriptedWild(void)
void StartBattle_SouthernIsland(void)
{
ScriptContext2_Enable();
- gMain.field_8 = HandleScriptedWildBattleEnd;
+ gMain.savedCallback = HandleScriptedWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
task_add_01_battle_start(GetWildBattleTransition(), 0);
sav12_xor_increment(7);
@@ -233,7 +233,7 @@ void StartBattle_SouthernIsland(void)
void StartBattle_Rayquaza(void)
{
ScriptContext2_Enable();
- gMain.field_8 = HandleScriptedWildBattleEnd;
+ gMain.savedCallback = HandleScriptedWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY;
task_add_01_battle_start(0, BGM_BATTLE34);
sav12_xor_increment(7);
@@ -243,7 +243,7 @@ void StartBattle_Rayquaza(void)
void StartBattle_GroudonKyogre(void)
{
ScriptContext2_Enable();
- gMain.field_8 = HandleScriptedWildBattleEnd;
+ gMain.savedCallback = HandleScriptedWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_KYOGRE_GROUDON;
if (gGameVersion == 2)
task_add_01_battle_start(0xB, BGM_BATTLE34); // KYOGRE
@@ -256,7 +256,7 @@ void StartBattle_GroudonKyogre(void)
void StartBattle_Regi(void)
{
ScriptContext2_Enable();
- gMain.field_8 = HandleScriptedWildBattleEnd;
+ gMain.savedCallback = HandleScriptedWildBattleEnd;
gBattleTypeFlags = BATTLE_TYPE_LEGENDARY | BATTLE_TYPE_REGI;
task_add_01_battle_start(0xA, BGM_BATTLE36);
sav12_xor_increment(7);
@@ -500,7 +500,7 @@ u8 GetBattleTowerBattleTransition(void)
void ChooseStarter(void)
{
SetMainCallback2(CB2_ChooseStarter);
- gMain.field_8 = CB2_GiveStarter;
+ gMain.savedCallback = CB2_GiveStarter;
}
void CB2_GiveStarter(void)
@@ -524,7 +524,7 @@ void CB2_StartFirstBattle(void)
if (sub_811AAE8() == TRUE)
{
gBattleTypeFlags = BATTLE_TYPE_FIRST_BATTLE;
- gMain.field_8 = HandleFirstBattleEnd;
+ gMain.savedCallback = HandleFirstBattleEnd;
SetMainCallback2(sub_800E7C4);
prev_quest_postbuffer_cursor_backup_reset();
overworld_poison_timer_set();
@@ -734,7 +734,7 @@ void trainer_flag_clear(u16 flag)
void sub_80825E4(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
- gMain.field_8 = sub_808260C;
+ gMain.savedCallback = sub_808260C;
task_add_01_battle_start_with_music_and_stats();
ScriptContext1_Stop();
}
@@ -777,7 +777,7 @@ void do_choose_name_or_words_screen(void)
void sub_80826B0(void)
{
gBattleTypeFlags = BATTLE_TYPE_TRAINER;
- gMain.field_8 = do_choose_name_or_words_screen;
+ gMain.savedCallback = do_choose_name_or_words_screen;
task_add_01_battle_start_with_music_and_stats();
ScriptContext1_Stop();
}
diff --git a/src/clock.c b/src/clock.c
index 997a14c1c..e660abdd3 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -88,5 +88,5 @@ static void ReturnFromStartWallClock(void)
void StartWallClock(void)
{
SetMainCallback2(CB2_StartWallClock);
- gMain.field_8 = ReturnFromStartWallClock;
+ gMain.savedCallback = ReturnFromStartWallClock;
}
diff --git a/src/main_menu.c b/src/main_menu.c
index bbdae24fe..7adbda096 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -582,7 +582,7 @@ void Task_MainMenuPressedA(u8 taskId)
DestroyTask(taskId);
break;
case OPTION:
- gMain.field_8 = CB2_InitMainMenuFromOptions;
+ gMain.savedCallback = CB2_InitMainMenuFromOptions;
SetMainCallback2(CB2_InitOptionMenu);
DestroyTask(taskId);
break;
diff --git a/src/option_menu.c b/src/option_menu.c
index 6d6310b46..f597429c1 100644
--- a/src/option_menu.c
+++ b/src/option_menu.c
@@ -310,7 +310,7 @@ static void Task_OptionMenuFadeOut(u8 taskId)
if(!gPaletteFade.active)
{
DestroyTask(taskId);
- SetMainCallback2(gMain.field_8);
+ SetMainCallback2(gMain.savedCallback);
}
}
diff --git a/src/rom4.c b/src/rom4.c
index 95d5ec2fd..e7c28f474 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -1135,7 +1135,7 @@ void CB2_LoadMap(void)
ScriptContext2_Disable();
set_callback1(NULL);
SetMainCallback2(sub_810CC80);
- gMain.field_8 = CB2_LoadMap2;
+ gMain.savedCallback = CB2_LoadMap2;
}
void CB2_LoadMap2(void)
diff --git a/src/start_menu.c b/src/start_menu.c
index 0d9e8af2c..d0e552591 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -399,7 +399,7 @@ u8 StartMenu_OptionCallback(void)
{
PlayRainSoundEffect();
SetMainCallback2(CB2_InitOptionMenu);
- gMain.field_8 = sub_805469C;
+ gMain.savedCallback = sub_805469C;
return 1;
}
return 0;
@@ -826,7 +826,7 @@ static void Task_8071B64(u8 taskId)
(*step)++;
break;
case 4:
- SetMainCallback2(gMain.field_8);
+ SetMainCallback2(gMain.savedCallback);
DestroyTask(taskId);
break;
}
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 2750705b8..68e644353 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -266,7 +266,7 @@ static void Task_StarterChoose5(u8 taskId)
case 0: //YES
//Return the starter choice and exit.
gScriptResult = gTasks[taskId].data[TD_STARTERSELECTION];
- SetMainCallback2(gMain.field_8);
+ SetMainCallback2(gMain.savedCallback);
break;
case 1: //NO
case -1: //B button
diff --git a/src/wallclock.c b/src/wallclock.c
index fc749e7e3..147a68d31 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -189,7 +189,7 @@ void CB2_StartWallClock(void)
}
//View, but don't set, the clock
-void Cb2_ViewWallClock(void)
+void CB2_ViewWallClock(void)
{
u8 taskId;
s16 angle1;
@@ -332,7 +332,7 @@ static void Task_SetClock5(u8 taskId)
static void Task_SetClock6(u8 taskId)
{
if(!gPaletteFade.active)
- SetMainCallback2((MainCallback)gMain.field_8);
+ SetMainCallback2((MainCallback)gMain.savedCallback);
}
static void Task_ViewClock1(u8 taskId)
@@ -358,7 +358,7 @@ static void Task_ViewClock3(u8 taskId)
static void Task_ViewClock4(u8 taskId)
{
if(!gPaletteFade.active)
- SetMainCallback2((MainCallback)gMain.field_8);
+ SetMainCallback2((MainCallback)gMain.savedCallback);
}
static u8 CalcMinHandDelta(u16 speed)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 18:00:28 +0000