Skip to content

Commit

Permalink
name all map constants
Browse files Browse the repository at this point in the history
  • Loading branch information
red031000 committed Dec 15, 2024
1 parent 14dee78 commit 4b6740a
Show file tree
Hide file tree
Showing 5 changed files with 1,208 additions and 1,208 deletions.
58 changes: 29 additions & 29 deletions arm9/asm/unk_020603B0.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arm9/src/blackout.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 4b6740a

Please sign in to comment.