From 9cb321732f578057aae9eca3b23ded8887ee6f5f Mon Sep 17 00:00:00 2001 From: z64a Date: Thu, 30 May 2024 01:49:49 -0400 Subject: [PATCH] more consistent name --- src/game_modes.c | 2 +- src/game_modes.h | 2 +- src/main_loop.c | 2 +- ver/jp/symbol_addrs.txt | 2 +- ver/us/symbol_addrs.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/game_modes.c b/src/game_modes.c index 367cb5380..04e55027c 100644 --- a/src/game_modes.c +++ b/src/game_modes.c @@ -147,7 +147,7 @@ void set_game_mode(s32 modeID) { CurGameMode.init(); } -void init_game_mode(void) { +void clear_game_mode(void) { CurGameMode.flags = MODE_FLAG_NONE; } diff --git a/src/game_modes.h b/src/game_modes.h index 76f40474c..937b1ce1d 100644 --- a/src/game_modes.h +++ b/src/game_modes.h @@ -26,7 +26,7 @@ void set_game_mode(s32 mode); s32 get_game_mode(void); void set_game_mode_render_frontUI(void (*fn)(void)); -void init_game_mode(void); +void clear_game_mode(void); void step_game_mode(void); void render_game_mode_backUI(void); void render_game_mode_frontUI(void); diff --git a/src/main_loop.c b/src/main_loop.c index 03276a134..5db98ebac 100644 --- a/src/main_loop.c +++ b/src/main_loop.c @@ -322,7 +322,7 @@ void load_engine_data(void) { reset_background_settings(); clear_character_set(); clear_printers(); - init_game_mode(); + clear_game_mode(); clear_npcs(); hud_element_clear_cache(); clear_trigger_data(); diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt index 4c12d8a89..388d72a15 100644 --- a/ver/jp/symbol_addrs.txt +++ b/ver/jp/symbol_addrs.txt @@ -261,7 +261,7 @@ spr_render_init = 0x801115B0; update_entities = 0x801148E0; render_entities = 0x801150C4; clear_entity_data = 0x80115EC8; -init_game_mode = 0x80117DA8; +clear_game_mode = 0x80117DA8; step_game_mode = 0x80118088; render_game_mode_backUI = 0x80118168; render_game_mode_frontUI = 0x801181D4; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index ca439d977..c2442a9ae 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -3945,7 +3945,7 @@ set_npc_shadow_scale = 0x80112900; // type:func rom:0xA9000 set_peach_shadow_scale = 0x801129D4; // type:func rom:0xA90D4 is_block_on_ground = 0x80112B20; // type:func rom:0xA9220 game_mode_nop = 0x80112B90; // type:func rom:0xA9290 -init_game_mode = 0x80112B98; // type:func rom:0xA9298 +clear_game_mode = 0x80112B98; // type:func rom:0xA9298 set_next_game_mode = 0x80112BBC; // type:func rom:0xA92BC set_game_mode_slot = 0x80112CA8; // type:func rom:0xA93A8 set_game_mode_render_frontUI = 0x80112D84; // type:func rom:0xA9484