pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename D_800A0948 to gLoadedFromFileSelect (#1080)

Browse Source 
* name D_800A0948 to gMapLoadFrom

* replace comparison of 0 with LOAD_FROM_MAP

* update gLoadingDemoMap to gLoadedFromFileSelect

* up jp and ique versions

* update if statement
This commit is contained in:
Rainchus 2023-07-15 00:26:29 -05:00 committed by GitHub
parent f91fe539a4
commit c2c5f15a2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/variables.h
View File

@ -91,7 +91,7 @@ extern s16 D_800A0932[1];
extern s16 gMapTransitionFadeRate; extern s16 gMapTransitionFadeRate;
extern s16 gMapTransitionState; extern s16 gMapTransitionState;
extern s16 gMapTransitionStateTime; extern s16 gMapTransitionStateTime;
extern s16 D_800A0948; extern s16 gLoadedFromFileSelect;
extern s16 D_800A0954; extern s16 D_800A0954;
extern s16 D_800A0956; extern s16 D_800A0956;
extern s16 D_800A0958; extern s16 D_800A0958;

6
src/111f0_len_860.c
View File

@ -6,12 +6,12 @@ void set_map_change_fade_rate(s16 fadeRate) {
} }
void state_init_enter_demo(void) { void state_init_enter_demo(void) {
D_800A0948 = 0; gLoadedFromFileSelect = FALSE;
init_enter_world_shared(); init_enter_world_shared();
} }
void state_init_enter_world(void) { void state_init_enter_world(void) {
D_800A0948 = 1; gLoadedFromFileSelect = TRUE;
set_map_transition_effect(TRANSITION_ENTER_WORLD); set_map_transition_effect(TRANSITION_ENTER_WORLD);
init_enter_world_shared(); init_enter_world_shared();
} }
@ -37,7 +37,7 @@ void state_step_enter_world(void) {
gGameStatusPtr->isBattle = FALSE; gGameStatusPtr->isBattle = FALSE;
gGameStatusPtr->disableScripts = FALSE; gGameStatusPtr->disableScripts = FALSE;
if (D_800A0948 == 0) { if (!gLoadedFromFileSelect) {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP); load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP);
} else { } else {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT); load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT);

2
ver/ique/asm/bss.s
View File

@ -355,7 +355,7 @@ dlabel gMapTransitionState
dlabel gMapTransitionStateTime dlabel gMapTransitionStateTime
.space 2 .space 2
dlabel D_800A0948 dlabel gLoadedFromFileSelect
.space 4 .space 4
dlabel D_800A094C dlabel D_800A094C

2
ver/jp/asm/main.bss.s
View File

@ -280,7 +280,7 @@ dlabel gMapTransitionState
dlabel gMapTransitionStateTime dlabel gMapTransitionStateTime
.space 2 .space 2
dlabel D_800A0948 dlabel gLoadedFromFileSelect
.space 8 .space 8
dlabel D_800A0950 dlabel D_800A0950

2
ver/us/asm/bss.s
View File

@ -347,7 +347,7 @@ dlabel gMapTransitionState
dlabel gMapTransitionStateTime dlabel gMapTransitionStateTime
.space 2 .space 2
dlabel D_800A0948 dlabel gLoadedFromFileSelect
.space 4 .space 4
dlabel D_800A094C dlabel D_800A094C

2
ver/us/symbol_addrs.txt
View File

@ -2735,7 +2735,7 @@ gMapTransitionAlpha = 0x800A0940; // rom:0x7BD40
gMapTransitionFadeRate = 0x800A0942; // rom:0x7BD42 gMapTransitionFadeRate = 0x800A0942; // rom:0x7BD42
gMapTransitionState = 0x800A0944; // rom:0x7BD44 gMapTransitionState = 0x800A0944; // rom:0x7BD44
gMapTransitionStateTime = 0x800A0946; // rom:0x7BD46 gMapTransitionStateTime = 0x800A0946; // rom:0x7BD46
D_800A0948 = 0x800A0948; // rom:0x7BD48 gLoadedFromFileSelect = 0x800A0948; // rom:0x7BD48
D_800A094C = 0x800A094C; // rom:0x7BD4C D_800A094C = 0x800A094C; // rom:0x7BD4C
D_800A0950 = 0x800A0950; // rom:0x7BD50 D_800A0950 = 0x800A0950; // rom:0x7BD50
D_800A0954 = 0x800A0954; // rom:0x7BD54 D_800A0954 = 0x800A0954; // rom:0x7BD54