Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rename D_800A0948 to gLoadedFromFileSelect #1080

Merged
merged 5 commits into from
Jul 15, 2023
Merged

rename D_800A0948 to gLoadedFromFileSelect #1080

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d19de79
name D_800A0948 to gMapLoadFrom
Rainchus Jul 8, 2023
be227a2
replace comparison of 0 with LOAD_FROM_MAP
Rainchus Jul 8, 2023
fbcef12
update gLoadingDemoMap to gLoadedFromFileSelect
Rainchus Jul 15, 2023
4f5f045
up jp and ique versions
Rainchus Jul 15, 2023
2a7966e
update if statement
Rainchus Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/variables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ extern s16 D_800A0932[1];
extern s16 gMapTransitionFadeRate;
extern s16 gMapTransitionState;
extern s16 gMapTransitionStateTime;
extern s16 D_800A0948;
extern s16 gMapLoadFrom;
extern s16 D_800A0954;
extern s16 D_800A0956;
extern s16 D_800A0958;
Expand Down
6 changes: 3 additions & 3 deletions src/111f0_len_860.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ void set_map_change_fade_rate(s16 fadeRate) {
}

void state_init_enter_demo(void) {
D_800A0948 = 0;
gMapLoadFrom = LOAD_FROM_MAP;
init_enter_world_shared();
}

void state_init_enter_world(void) {
D_800A0948 = 1;
gMapLoadFrom = LOAD_FROM_FILE_SELECT;
set_map_transition_effect(TRANSITION_ENTER_WORLD);
init_enter_world_shared();
}
Expand All @@ -37,7 +37,7 @@ void state_step_enter_world(void) {
gGameStatusPtr->isBattle = FALSE;
gGameStatusPtr->disableScripts = FALSE;

if (D_800A0948 == 0) {
if (gMapLoadFrom == LOAD_FROM_MAP) {
ethteck marked this conversation as resolved.
Show resolved Hide resolved
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_MAP);
} else {
load_map_by_IDs(gGameStatusPtr->areaID, gGameStatusPtr->mapID, LOAD_FROM_FILE_SELECT);
Expand Down
2 changes: 1 addition & 1 deletion ver/us/asm/bss.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ dlabel gMapTransitionState
dlabel gMapTransitionStateTime
.space 2

dlabel D_800A0948
dlabel gMapLoadFrom
.space 4

dlabel D_800A094C
Expand Down
2 changes: 1 addition & 1 deletion ver/us/symbol_addrs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
gMapLoadFrom = 0x800A0948; // rom:0x7BD48
D_800A094C = 0x800A094C; // rom:0x7BD4C
D_800A0950 = 0x800A0950; // rom:0x7BD50
D_800A0954 = 0x800A0954; // rom:0x7BD54
Expand Down