diff --git a/include/variables.h b/include/variables.h index ce286768da..1158659e28 100644 --- a/include/variables.h +++ b/include/variables.h @@ -91,7 +91,7 @@ extern s16 D_800A0932[1]; extern s16 gMapTransitionFadeRate; extern s16 gMapTransitionState; extern s16 gMapTransitionStateTime; -extern s16 D_800A0948; +extern s16 gLoadedFromFileSelect; extern s16 D_800A0954; extern s16 D_800A0956; extern s16 D_800A0958; diff --git a/src/111f0_len_860.c b/src/111f0_len_860.c index eac24d8f41..b1e10c29ba 100644 --- a/src/111f0_len_860.c +++ b/src/111f0_len_860.c @@ -6,12 +6,12 @@ void set_map_change_fade_rate(s16 fadeRate) { } void state_init_enter_demo(void) { - D_800A0948 = 0; + gLoadedFromFileSelect = FALSE; init_enter_world_shared(); } void state_init_enter_world(void) { - D_800A0948 = 1; + gLoadedFromFileSelect = TRUE; set_map_transition_effect(TRANSITION_ENTER_WORLD); init_enter_world_shared(); } @@ -37,7 +37,7 @@ void state_step_enter_world(void) { gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->disableScripts = FALSE; - if (D_800A0948 == 0) { + if (!gLoadedFromFileSelect) { load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP); } else { load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT); diff --git a/ver/ique/asm/bss.s b/ver/ique/asm/bss.s index eb18f7e44b..241b1cc8fb 100644 --- a/ver/ique/asm/bss.s +++ b/ver/ique/asm/bss.s @@ -355,7 +355,7 @@ dlabel gMapTransitionState dlabel gMapTransitionStateTime .space 2 -dlabel D_800A0948 +dlabel gLoadedFromFileSelect .space 4 dlabel D_800A094C diff --git a/ver/jp/asm/main.bss.s b/ver/jp/asm/main.bss.s index 4c1fb0d9af..22fe7ad157 100644 --- a/ver/jp/asm/main.bss.s +++ b/ver/jp/asm/main.bss.s @@ -280,7 +280,7 @@ dlabel gMapTransitionState dlabel gMapTransitionStateTime .space 2 -dlabel D_800A0948 +dlabel gLoadedFromFileSelect .space 8 dlabel D_800A0950 diff --git a/ver/us/asm/bss.s b/ver/us/asm/bss.s index 08784cb5f2..7095d3fbe0 100644 --- a/ver/us/asm/bss.s +++ b/ver/us/asm/bss.s @@ -347,7 +347,7 @@ dlabel gMapTransitionState dlabel gMapTransitionStateTime .space 2 -dlabel D_800A0948 +dlabel gLoadedFromFileSelect .space 4 dlabel D_800A094C diff --git a/ver/us/symbol_addrs.txt b/ver/us/symbol_addrs.txt index d18b309423..07203759f2 100644 --- a/ver/us/symbol_addrs.txt +++ b/ver/us/symbol_addrs.txt @@ -2735,7 +2735,7 @@ gMapTransitionAlpha = 0x800A0940; // rom:0x7BD40 gMapTransitionFadeRate = 0x800A0942; // rom:0x7BD42 gMapTransitionState = 0x800A0944; // rom:0x7BD44 gMapTransitionStateTime = 0x800A0946; // rom:0x7BD46 -D_800A0948 = 0x800A0948; // rom:0x7BD48 +gLoadedFromFileSelect = 0x800A0948; // rom:0x7BD48 D_800A094C = 0x800A094C; // rom:0x7BD4C D_800A0950 = 0x800A0950; // rom:0x7BD50 D_800A0954 = 0x800A0954; // rom:0x7BD54