Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-30 12:26:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

name all map constants

Browse Source
This commit is contained in:
red031000
2024-12-15 12:52:47 +00:00
parent 14dee78ddc
commit 4b6740a6a0
5 changed files with 1208 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
arm9/asm/unk_020603B0.s
View File

@@ -7,35 +7,35 @@
.global UNK_020F7460
UNK_020F7460: ; 0x020F7460
.word MAP_R201
.word MAP_R202
.word MAP_R203
.word MAP_R204A
.word MAP_R204B
.word MAP_R205A
.word MAP_R205B
.word MAP_R206
.word MAP_R207
.word MAP_R208
.word MAP_R209
.word MAP_R210A
.word MAP_R210B
.word MAP_R211A
.word MAP_R211B
.word MAP_R212A
.word MAP_R212B
.word MAP_R213
.word MAP_R214
.word MAP_R215
.word MAP_R216
.word MAP_R217
.word MAP_R218
.word MAP_R219
.word MAP_W220
.word MAP_R221
.word MAP_R222
.word MAP_D02
.word MAP_D04
.word MAP_ROUTE_201
.word MAP_ROUTE_202
.word MAP_ROUTE_203
.word MAP_ROUTE_204_SOUTH
.word MAP_ROUTE_204_NORTH
.word MAP_ROUTE_205_SOUTH
.word MAP_ROUTE_205_NORTH
.word MAP_ROUTE_206
.word MAP_ROUTE_207
.word MAP_ROUTE_208
.word MAP_ROUTE_209
.word MAP_ROUTE_210_SOUTH
.word MAP_ROUTE_210_NORTH
.word MAP_ROUTE_211_WEST
.word MAP_ROUTE_211_EAST
.word MAP_ROUTE_212_NORTH
.word MAP_ROUTE_212_SOUTH
.word MAP_ROUTE_213
.word MAP_ROUTE_214
.word MAP_ROUTE_215
.word MAP_ROUTE_216
.word MAP_ROUTE_217
.word MAP_ROUTE_218
.word MAP_ROUTE_219
.word MAP_ROUTE_220
.word MAP_ROUTE_221
.word MAP_ROUTE_222
.word MAP_VALLEY_WINDWORKS_EXTERIOR
.word MAP_FUEGO_IRONWORKS_EXTERIOR
.global UNK_020F74D4
UNK_020F74D4: ; 0x020F74D4

2
arm9/src/blackout.c
View File

@@ -106,7 +106,7 @@ static void Blackout_DrawMessage(FieldSystem *fieldSystem, TaskManager *taskMana
AddWindow(env->bgConfig, &env->window, &sBlackoutWindowTemplate);
BufferPlayersName(env->msgFmt, 0, Save_PlayerData_GetProfileAddr(FieldSystem_GetSaveData(fieldSystem)));
if (fieldSystem->location->mapId == MAP_T01R0201) {
if (fieldSystem->location->mapId == MAP_TWINLEAF_RIVAL_HOUSE_1F) {
// {STRVAR_1 3, 0} scurried back home, protecting the exhausted and fainted Pokémon from further harm...
Blackout_PrintMessage(env, narc_0328_00004, 0, 0);
} else {

1192
arm9/src/map_header.c
View File

File diff suppressed because it is too large Load Diff

46
arm9/src/unk_0205EC84.c
View File

@@ -179,60 +179,60 @@ BOOL sub_0205EEB8(struct SaveVarsFlags *state, u32 a1) {
s32 sub_0205EF20(struct SaveVarsFlags *state, s32 a1) {
s32 ret = 0;
switch (a1) {
case MAP_D28R0101:
case MAP_LAKE_VALOR_GALACTIC:
if (_flag_check(state, 0x984) == TRUE) {
ret = SEQ_D_LAKE;
}
break;
case MAP_D28R0103:
case MAP_VALOR_CAVERN:
if (_flag_check(state, 0x984) == TRUE) {
ret = SEQ_D_RYAYHY;
}
break;
case MAP_D27R0102:
case MAP_LAKE_VERITY_GALACTIC:
if (_flag_check(state, 0x98E) == TRUE) {
ret = SEQ_D_LAKE;
}
break;
case MAP_D29R0102:
case MAP_LAKE_ACUITY_GALACTIC:
if (_flag_check(state, 0x98F) == TRUE) {
ret = SEQ_D_LAKE;
}
break;
case MAP_D10R0101:
case MAP_PAL_PARK:
if (_flag_check(state, 0x995) == TRUE) {
ret = SEQ_D_SAFARI;
}
break;
case MAP_T02R0101:
case MAP_SANDGEM_ROWANS_LAB:
if (_flag_check(state, 0x993) == TRUE) {
ret = SEQ_OPENING2;
}
break;
case MAP_D26R0101:
case MAP_D26R0102:
case MAP_D26R0103:
case MAP_D26R0104:
case MAP_D26R0105:
case MAP_D26R0106:
case MAP_D26R0107:
case MAP_D26R0108:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_1F:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_2F:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_3F:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_4F_1:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_B1F:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_B2F:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_4F_BACK:
case MAP_VEILSTONE_GALACTIC_HEADQUARTERS_4F_2:
if (_flag_check(state, 0x985) == TRUE) {
if (!IsNighttime()) {
ret = SEQ_CITY07_D;
} else {
ret = SEQ_CITY07_N;
}
} else if (a1 == MAP_D26R0101) {
} else if (a1 == MAP_VEILSTONE_GALACTIC_HEADQUARTERS_1F) {
if (_flag_check(state, 0x986) == TRUE) {
ret = SEQ_D_AGITO;
}
}
break;
case MAP_C04R0201:
case MAP_C04R0202:
case MAP_C04R0203:
case MAP_C04R0204:
case MAP_ETERNA_GALACTIC_BUILDING_1F:
case MAP_ETERNA_GALACTIC_BUILDING_2F:
case MAP_ETERNA_GALACTIC_BUILDING_3F:
case MAP_ETERNA_GALACTIC_BUILDING_4F:
if (_flag_check(state, 0x987) == TRUE) {
if (!IsNighttime()) {
ret = SEQ_CITY04_D;
@@ -241,7 +241,7 @@ s32 sub_0205EF20(struct SaveVarsFlags *state, s32 a1) {
}
}
break;
case MAP_D02R0101:
case MAP_VALLEY_WINDWORKS_INTERIOR:
if (_flag_check(state, 0x988) == TRUE) {
if (!IsNighttime()) {
ret = SEQ_ROAD_C_D;
@@ -250,7 +250,7 @@ s32 sub_0205EF20(struct SaveVarsFlags *state, s32 a1) {
}
}
break;
case MAP_D13R0101:
case MAP_FLOAROMA_MEADOW:
if (_flag_check(state, 0x989) == TRUE) {
if (!IsNighttime()) {
ret = SEQ_TOWN03_D;
@@ -259,7 +259,7 @@ s32 sub_0205EF20(struct SaveVarsFlags *state, s32 a1) {
}
}
break;
case MAP_R224:
case MAP_ROUTE_224:
if (_flag_check(state, 0x98A) == TRUE) {
if (!IsNighttime()) {
ret = SEQ_TOWN03_D;
@@ -268,7 +268,7 @@ s32 sub_0205EF20(struct SaveVarsFlags *state, s32 a1) {
}
}
break;
case MAP_C10R0111:
case MAP_POKEMON_LEAGUE_CYNTHIA_ROOM:
if (_flag_check(state, 0x98B) == TRUE) {
ret = SEQ_SILENCE_FIELD;
}

1118
include/constants/maps.h
View File

File diff suppressed because it is too large Load Diff