From 75f850c0a8958fca32d81e13dcd688dcfd25c697 Mon Sep 17 00:00:00 2001 From: z64a Date: Sun, 23 Nov 2025 18:03:48 -0500 Subject: [PATCH] pt 3 --- src/state_battle.c | 55 +++++++++++++++++++++-------------------- src/state_file_select.c | 3 ++- src/state_pause.c | 3 ++- src/world/world.c | 3 ++- ver/us/symbol_addrs.txt | 6 ++--- 5 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/state_battle.c b/src/state_battle.c index 9408040711..e3467a5023 100644 --- a/src/state_battle.c +++ b/src/state_battle.c @@ -21,9 +21,9 @@ s32 D_800778AC[] = { }; #endif -BSS s8 D_800A0900; -BSS s32 D_800A0904; -BSS s32 D_800A0908; +BSS s8 BattleTransitionDelay; +BSS s32 SavedWorldAnimFlags; +BSS s32 SavedWorldFreezeMode; #if defined(SHIFT) || VERSION_IQUE #define shim_battle_heap_create_obfuscated battle_heap_create @@ -32,29 +32,29 @@ BSS s32 D_800A0908; extern ShapeFile gMapShapeData; void state_init_battle(void) { - D_800A0900 = 5; + BattleTransitionDelay = 5; } void state_step_battle(void) { - u32 currentBattleSelection; + u32 currentBattleArea; u32 currentBattleIndex; - if (D_800A0900 == 5) { + if (BattleTransitionDelay == 5) { if (nuGfxCfb[1] != nuGfxCfb_ptr) { return; } - D_800A0900--; + BattleTransitionDelay--; gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStop(); } - if (D_800A0900 >= 0) { - if (D_800A0900 > 0) { - D_800A0900--; + if (BattleTransitionDelay >= 0) { + if (BattleTransitionDelay > 0) { + BattleTransitionDelay--; return; } - D_800A0900 = -1; + BattleTransitionDelay = -1; nuGfxSetCfb(bFrameBuffers, 2); nuContRmbForceStopEnd(); sfx_stop_env_sounds(); @@ -69,11 +69,11 @@ void state_step_battle(void) { sfx_clear_env_sounds(0); - currentBattleSelection = UNPACK_BTL_AREA(gCurrentBattleID); + currentBattleArea = UNPACK_BTL_AREA(gCurrentBattleID); currentBattleIndex = UNPACK_BTL_INDEX(gCurrentBattleID); if (gGameStatusPtr->peachFlags & PEACH_FLAG_IS_PEACH || - (currentBattleSelection == BTL_AREA_KKJ && currentBattleIndex == 0)) { + (currentBattleArea == BTL_AREA_KKJ && currentBattleIndex == 0)) { gGameStatusPtr->peachFlags |= PEACH_FLAG_IS_PEACH; spr_init_sprites(PLAYER_SPRITES_PEACH_BATTLE); } else { @@ -98,13 +98,13 @@ void state_step_battle(void) { initialize_battle(); btl_save_world_cameras(); load_battle_section(); - D_800A0904 = gPlayerStatusPtr->animFlags; + SavedWorldAnimFlags = gPlayerStatusPtr->animFlags; gPlayerStatusPtr->animFlags &= ~PA_FLAG_PULSE_STONE_VISIBLE; - D_800A0908 = get_time_freeze_mode(); + SavedWorldFreezeMode = get_time_freeze_mode(); set_time_freeze_mode(TIME_FREEZE_NONE); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; - if (D_800A0900 >= 0) { + if (BattleTransitionDelay >= 0) { return; } } @@ -120,7 +120,7 @@ void state_step_battle(void) { void state_drawUI_battle(void) { draw_encounter_ui(); - if (D_800A0900 < 0) { + if (BattleTransitionDelay < 0) { btl_draw_ui(); } } @@ -128,7 +128,7 @@ void state_drawUI_battle(void) { void state_init_end_battle(void) { gOverrideFlags |= GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStop(); - D_800A0900 = 5; + BattleTransitionDelay = 5; } void state_step_end_battle(void) { @@ -137,10 +137,10 @@ void state_step_end_battle(void) { MapSettings* mapSettings; MapConfig* mapConfig; - if (D_800A0900 >= 0) { - D_800A0900--; - if (D_800A0900 == 0) { - D_800A0900 = -1; + if (BattleTransitionDelay >= 0) { + BattleTransitionDelay--; + if (BattleTransitionDelay == 0) { + BattleTransitionDelay = -1; nuGfxSetCfb(bFrameBuffers, 3); gOverrideFlags &= ~GLOBAL_OVERRIDES_DISABLE_DRAW_FRAME; nuContRmbForceStopEnd(); @@ -170,7 +170,7 @@ void state_step_end_battle(void) { if (gGameStatusPtr->demoBattleFlags & DEMO_BTL_FLAG_ENABLED) { npc_reload_all(); - playerStatus->animFlags = D_800A0904; + playerStatus->animFlags = SavedWorldAnimFlags; set_game_mode(GAME_MODE_DEMO); } else { void* mapShape; @@ -192,16 +192,17 @@ void state_step_end_battle(void) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } mdl_load_all_textures(mapSettings->modelTreeRoot, get_asset_offset(wMapTexName, &sizeTemp), sizeTemp); mdl_calculate_model_sizes(); npc_reload_all(); - playerStatus->animFlags = D_800A0904; - if (D_800A0908 != 0) { - set_time_freeze_mode(D_800A0908); + playerStatus->animFlags = SavedWorldAnimFlags; + if (SavedWorldFreezeMode != 0) { + set_time_freeze_mode(SavedWorldFreezeMode); } set_game_mode(GAME_MODE_WORLD); } diff --git a/src/state_file_select.c b/src/state_file_select.c index 507662183b..d4e7a20d37 100644 --- a/src/state_file_select.c +++ b/src/state_file_select.c @@ -427,7 +427,8 @@ void state_step_exit_language_select(void) { if (bgHeader != nullptr) { set_background(bgHeader); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } mdl_calculate_model_sizes(); diff --git a/src/state_pause.c b/src/state_pause.c index b9cecb5706..136c5bf28a 100644 --- a/src/state_pause.c +++ b/src/state_pause.c @@ -253,7 +253,8 @@ void state_step_unpause(void) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } gGameStatusPtr->backgroundDarkness = gGameStatusPtr->savedBackgroundDarkness; diff --git a/src/world/world.c b/src/world/world.c index 30eaaf76fe..7b87cedf93 100644 --- a/src/world/world.c +++ b/src/world/world.c @@ -216,7 +216,8 @@ void load_map_by_IDs(s16 areaID, s16 mapID, s16 loadType) { if (mapSettings->background != nullptr) { set_background(mapSettings->background); } else { - set_background_size(296, 200, 12, 20); + set_background_size(SCREEN_XMAX - SCREEN_XMIN, SCREEN_YMAX - SCREEN_YMIN, + SCREEN_INSET_X, SCREEN_INSET_Y); } gCurrentCameraID = CAM_DEFAULT; diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index 071aeb1904..7b4e97be1c 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2714,9 +2714,9 @@ D_800A08E8 = 0x800A08E8; // rom:0x7BCE8 D_800A08EC = 0x800A08EC; // rom:0x7BCEC gameMode = 0x800A08F0; // rom:0x7BCF0 D_800A08F4 = 0x800A08F4; // rom:0x7BCF4 -D_800A0900 = 0x800A0900; // rom:0x7BD00 -D_800A0904 = 0x800A0904; // rom:0x7BD04 -D_800A0908 = 0x800A0908; // rom:0x7BD08 +BattleTransitionDelay = 0x800A0900; // rom:0x7BD00 +SavedWorldAnimFlags = 0x800A0904; // rom:0x7BD04 +SavedWorldFreezeMode = 0x800A0908; // rom:0x7BD08 D_800A090C = 0x800A090C; // rom:0x7BD0C gLogosImages = 0x800A0910; // rom:0x7BD10 gLogosImage3 = 0x800A0914; // rom:0x7BD14