Skip to content

Commit 669e40c

Browse files
garakmongarakmon
committed
sync region map data formats with pokeemerald
1 parent e8b149e commit 669e40c

16 files changed

+398
-340
lines changed

‎graphics-de/pokenav/map_squares.png ‎graphics-de/pokenav/zoom_tiles.png

File renamed without changes.

‎graphics/pokenav/region_map_section_layout.bin

420 Bytes
Binary file not shown.

‎graphics/pokenav/map_squares.png ‎graphics/pokenav/zoom_tiles.png

File renamed without changes.

‎include/constants/region_map_sections.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,6 @@
8989
#define MAPSEC_SKY_PILLAR 0x55
9090
#define MAPSEC_SECRET_BASE 0x56
9191
#define MAPSEC_DYNAMIC 0x57
92-
#define MAPSEC_NOTHING 0x58
92+
#define MAPSEC_NONE 0x58
9393

9494
#endif // GUARD_REGIONMAPSEC_H

‎include/heated_rock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
u16 sub_80D5940(u8 spriteId);
88
void sub_80D5994(struct Sprite *sprite, s16 x, s16 y);
99

10-
#endif // GUARD_HEATED_ROCK_H
10+
#endif // GUARD_HEATED_ROCK_H

‎include/region_map.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,6 @@ void debug_sub_8110F28(void);
8080
u16 GetRegionMapSectionAt_(u16 x, u16 y);
8181
void sub_80FBF94(void);
8282

83-
extern const struct RegionMapLocation gRegionMapLocations[];
83+
extern const struct RegionMapLocation gRegionMapEntries[];
8484

8585
#endif // GUARD_REGION_MAP_H

‎src/data/battle_tower/level_100_mons.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3900,4 +3900,4 @@ const struct BattleTowerPokemon gBattleTowerLevel100Mons[] =
39003900
.evSpread = F_EV_SPREAD_SPEED | F_EV_SPREAD_ATTACK,
39013901
.nature = NATURE_HARDY,
39023902
},
3903-
};
3903+
};

‎src/data/graphics.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1058,9 +1058,9 @@ const u16 gPokenavMenuOptions2_Pal[] = INCBIN_U16("graphics/pokenav/pokenav2.gba
10581058
const u16 gPokenavMenuOptions3_Pal[] = INCBIN_U16("graphics/pokenav/pokenav3.gbapal");
10591059
const u8 gPokenavHoennMapHeader_Gfx[] = INCBIN_U8("graphics/pokenav/map_header.4bpp.lz");
10601060
const u8 gPokenavHoennMapMisc_Gfx[] = INCBIN_U8("graphics/pokenav/map_misc2.4bpp.lz");
1061-
const u8 gPokenavHoennMapSquares_Gfx[] = INCBIN_U8("graphics/pokenav/map_squares.4bpp.lz");
1061+
const u8 gPokenavHoennMapSquares_Gfx[] = INCBIN_U8("graphics/pokenav/zoom_tiles.4bpp.lz");
10621062
const u16 gPokenavHoennMap1_Pal[] = INCBIN_U16("graphics/pokenav/map_menu.gbapal");
1063-
const u8 gPokenavHoennMapSquares_Pal[] = INCBIN_U8("graphics/pokenav/map_squares.gbapal");
1063+
const u8 gPokenavHoennMapSquares_Pal[] = INCBIN_U8("graphics/pokenav/zoom_tiles.gbapal");
10641064
const u8 gPokenavConditionMenu_Gfx[] = INCBIN_U8("graphics/pokenav/condition_menu.4bpp.lz");
10651065
const u16 gPokenavConditionMenu_Pal[] = INCBIN_U16("graphics/pokenav/condition1.gbapal");
10661066
const u8 gPokenavConditionMenuHeader_Gfx[] = INCBIN_U8("graphics/pokenav/condition_menu_header.4bpp.lz");

‎src/data/region_map/region_map_entries.h

+175
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
#ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
2+
#define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H
3+
4+
static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT{NAME_END} TOWN");
5+
static const u8 sMapName_OldaleTown[] = _("OLDALE{NAME_END} TOWN");
6+
static const u8 sMapName_DewfordTown[] = _("DEWFORD{NAME_END} TOWN");
7+
static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE{NAME_END} TOWN");
8+
static const u8 sMapName_FallarborTown[] = _("FALLARBOR{NAME_END} TOWN");
9+
static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF{NAME_END} TOWN");
10+
static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG{NAME_END} TOWN");
11+
static const u8 sMapName_PetalburgCity[] = _("PETALBURG{NAME_END} CITY");
12+
static const u8 sMapName_SlateportCity[] = _("SLATEPORT{NAME_END} CITY");
13+
static const u8 sMapName_MauvilleCity[] = _("MAUVILLE{NAME_END} CITY");
14+
static const u8 sMapName_RustboroCity[] = _("RUSTBORO{NAME_END} CITY");
15+
static const u8 sMapName_FortreeCity[] = _("FORTREE{NAME_END} CITY");
16+
static const u8 sMapName_LilycoveCity[] = _("LILYCOVE{NAME_END} CITY");
17+
static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP{NAME_END} CITY");
18+
static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS{NAME_END} CITY");
19+
static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE{NAME_END} CITY");
20+
static const u8 sMapName_Route101[] = _("ROUTE 101");
21+
static const u8 sMapName_Route102[] = _("ROUTE 102");
22+
static const u8 sMapName_Route103[] = _("ROUTE 103");
23+
static const u8 sMapName_Route104[] = _("ROUTE 104");
24+
static const u8 sMapName_Route105[] = _("ROUTE 105");
25+
static const u8 sMapName_Route106[] = _("ROUTE 106");
26+
static const u8 sMapName_Route107[] = _("ROUTE 107");
27+
static const u8 sMapName_Route108[] = _("ROUTE 108");
28+
static const u8 sMapName_Route109[] = _("ROUTE 109");
29+
static const u8 sMapName_Route110[] = _("ROUTE 110");
30+
static const u8 sMapName_Route111[] = _("ROUTE 111");
31+
static const u8 sMapName_Route112[] = _("ROUTE 112");
32+
static const u8 sMapName_Route113[] = _("ROUTE 113");
33+
static const u8 sMapName_Route114[] = _("ROUTE 114");
34+
static const u8 sMapName_Route115[] = _("ROUTE 115");
35+
static const u8 sMapName_Route116[] = _("ROUTE 116");
36+
static const u8 sMapName_Route117[] = _("ROUTE 117");
37+
static const u8 sMapName_Route118[] = _("ROUTE 118");
38+
static const u8 sMapName_Route119[] = _("ROUTE 119");
39+
static const u8 sMapName_Route120[] = _("ROUTE 120");
40+
static const u8 sMapName_Route121[] = _("ROUTE 121");
41+
static const u8 sMapName_Route122[] = _("ROUTE 122");
42+
static const u8 sMapName_Route123[] = _("ROUTE 123");
43+
static const u8 sMapName_Route124[] = _("ROUTE 124");
44+
static const u8 sMapName_Route125[] = _("ROUTE 125");
45+
static const u8 sMapName_Route126[] = _("ROUTE 126");
46+
static const u8 sMapName_Route127[] = _("ROUTE 127");
47+
static const u8 sMapName_Route128[] = _("ROUTE 128");
48+
static const u8 sMapName_Route129[] = _("ROUTE 129");
49+
static const u8 sMapName_Route130[] = _("ROUTE 130");
50+
static const u8 sMapName_Route131[] = _("ROUTE 131");
51+
static const u8 sMapName_Route132[] = _("ROUTE 132");
52+
static const u8 sMapName_Route133[] = _("ROUTE 133");
53+
static const u8 sMapName_Route134[] = _("ROUTE 134");
54+
static const u8 sMapName_Underwater[] = _("UNDERWATER");
55+
static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE");
56+
static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY");
57+
static const u8 sMapName_SafariZone[] = _("SAFARI ZONE");
58+
static const u8 sMapName_BattleTower[] = _("BATTLE TOWER");
59+
static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS");
60+
static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL");
61+
static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP");
62+
static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE");
63+
static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS");
64+
static const u8 sMapName_MtPyre[] = _("MT. PYRE");
65+
static const u8 sMapName_EvilTeamHideout[] = _("{EVIL_TEAM} HIDEOUT");
66+
static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE");
67+
static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN");
68+
static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD");
69+
static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND");
70+
static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN");
71+
static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND");
72+
static const u8 sMapName_FieryPath[] = _("FIERY PATH");
73+
static const u8 sMapName_JaggedPass[] = _("JAGGED PASS");
74+
static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER");
75+
static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB");
76+
static const u8 sMapName_IslandCave[] = _("ISLAND CAVE");
77+
static const u8 sMapName_DesertRuins[] = _("DESERT RUINS");
78+
static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB");
79+
static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK");
80+
static const u8 sMapName_SkyPillar[] = _("SKY PILLAR");
81+
static const u8 sMapName_SecretBase[] = _("SECRET BASE");
82+
static const u8 sMapName_None[] = _("");
83+
84+
const struct RegionMapLocation gRegionMapEntries[] = {
85+
[MAPSEC_LITTLEROOT_TOWN] = { 4, 11, 1, 1, sMapName_LittlerootTown},
86+
[MAPSEC_OLDALE_TOWN] = { 4, 9, 1, 1, sMapName_OldaleTown},
87+
[MAPSEC_DEWFORD_TOWN] = { 2, 14, 1, 1, sMapName_DewfordTown},
88+
[MAPSEC_LAVARIDGE_TOWN] = { 5, 3, 1, 1, sMapName_LavaridgeTown},
89+
[MAPSEC_FALLARBOR_TOWN] = { 3, 0, 1, 1, sMapName_FallarborTown},
90+
[MAPSEC_VERDANTURF_TOWN] = { 4, 6, 1, 1, sMapName_VerdanturfTown},
91+
[MAPSEC_PACIFIDLOG_TOWN] = {17, 10, 1, 1, sMapName_PacifidlogTown},
92+
[MAPSEC_PETALBURG_CITY] = { 1, 9, 1, 1, sMapName_PetalburgCity},
93+
[MAPSEC_SLATEPORT_CITY] = { 8, 10, 1, 2, sMapName_SlateportCity},
94+
[MAPSEC_MAUVILLE_CITY] = { 8, 6, 2, 1, sMapName_MauvilleCity},
95+
[MAPSEC_RUSTBORO_CITY] = { 0, 5, 1, 2, sMapName_RustboroCity},
96+
[MAPSEC_FORTREE_CITY] = {12, 0, 1, 1, sMapName_FortreeCity},
97+
[MAPSEC_LILYCOVE_CITY] = {18, 3, 2, 1, sMapName_LilycoveCity},
98+
[MAPSEC_MOSSDEEP_CITY] = {24, 5, 2, 1, sMapName_MossdeepCity},
99+
[MAPSEC_SOOTOPOLIS_CITY] = {21, 7, 1, 1, sMapName_SootopolisCity},
100+
[MAPSEC_EVER_GRANDE_CITY] = {27, 8, 1, 2, sMapName_EverGrandeCity},
101+
[MAPSEC_ROUTE_101] = { 4, 10, 1, 1, sMapName_Route101},
102+
[MAPSEC_ROUTE_102] = { 2, 9, 2, 1, sMapName_Route102},
103+
[MAPSEC_ROUTE_103] = { 4, 8, 4, 1, sMapName_Route103},
104+
[MAPSEC_ROUTE_104] = { 0, 7, 1, 3, sMapName_Route104},
105+
[MAPSEC_ROUTE_105] = { 0, 10, 1, 3, sMapName_Route105},
106+
[MAPSEC_ROUTE_106] = { 0, 13, 2, 1, sMapName_Route106},
107+
[MAPSEC_ROUTE_107] = { 3, 14, 3, 1, sMapName_Route107},
108+
[MAPSEC_ROUTE_108] = { 6, 14, 2, 1, sMapName_Route108},
109+
[MAPSEC_ROUTE_109] = { 8, 12, 1, 3, sMapName_Route109},
110+
[MAPSEC_ROUTE_110] = { 8, 7, 1, 3, sMapName_Route110},
111+
[MAPSEC_ROUTE_111] = { 8, 0, 1, 6, sMapName_Route111},
112+
[MAPSEC_ROUTE_112] = { 6, 3, 2, 1, sMapName_Route112},
113+
[MAPSEC_ROUTE_113] = { 4, 0, 4, 1, sMapName_Route113},
114+
[MAPSEC_ROUTE_114] = { 1, 0, 2, 3, sMapName_Route114},
115+
[MAPSEC_ROUTE_115] = { 0, 2, 1, 3, sMapName_Route115},
116+
[MAPSEC_ROUTE_116] = { 1, 5, 4, 1, sMapName_Route116},
117+
[MAPSEC_ROUTE_117] = { 5, 6, 3, 1, sMapName_Route117},
118+
[MAPSEC_ROUTE_118] = {10, 6, 2, 1, sMapName_Route118},
119+
[MAPSEC_ROUTE_119] = {11, 0, 1, 6, sMapName_Route119},
120+
[MAPSEC_ROUTE_120] = {13, 0, 1, 4, sMapName_Route120},
121+
[MAPSEC_ROUTE_121] = {14, 3, 4, 1, sMapName_Route121},
122+
[MAPSEC_ROUTE_122] = {16, 4, 1, 2, sMapName_Route122},
123+
[MAPSEC_ROUTE_123] = {12, 6, 5, 1, sMapName_Route123},
124+
[MAPSEC_ROUTE_124] = {20, 3, 4, 3, sMapName_Route124},
125+
[MAPSEC_ROUTE_125] = {24, 3, 2, 2, sMapName_Route125},
126+
[MAPSEC_ROUTE_126] = {20, 6, 3, 3, sMapName_Route126},
127+
[MAPSEC_ROUTE_127] = {23, 6, 3, 3, sMapName_Route127},
128+
[MAPSEC_ROUTE_128] = {23, 9, 4, 1, sMapName_Route128},
129+
[MAPSEC_ROUTE_129] = {24, 10, 2, 1, sMapName_Route129},
130+
[MAPSEC_ROUTE_130] = {21, 10, 3, 1, sMapName_Route130},
131+
[MAPSEC_ROUTE_131] = {18, 10, 3, 1, sMapName_Route131},
132+
[MAPSEC_ROUTE_132] = {15, 10, 2, 1, sMapName_Route132},
133+
[MAPSEC_ROUTE_133] = {12, 10, 3, 1, sMapName_Route133},
134+
[MAPSEC_ROUTE_134] = { 9, 10, 3, 1, sMapName_Route134},
135+
[MAPSEC_UNDERWATER_124] = {20, 3, 4, 3, sMapName_Underwater},
136+
[MAPSEC_UNDERWATER_125] = {20, 6, 3, 3, sMapName_Underwater},
137+
[MAPSEC_UNDERWATER_126] = {23, 6, 3, 3, sMapName_Underwater},
138+
[MAPSEC_UNDERWATER_127] = {23, 9, 4, 1, sMapName_Underwater},
139+
[MAPSEC_UNDERWATER_SOOTOPOLIS] = {21, 7, 1, 1, sMapName_Underwater},
140+
[MAPSEC_GRANITE_CAVE] = { 1, 13, 1, 1, sMapName_GraniteCave},
141+
[MAPSEC_MT_CHIMNEY] = { 6, 2, 1, 1, sMapName_MtChimney},
142+
[MAPSEC_SAFARI_ZONE] = {16, 2, 1, 1, sMapName_SafariZone},
143+
[MAPSEC_BATTLE_TOWER] = {22, 12, 1, 1, sMapName_BattleTower},
144+
[MAPSEC_PETALBURG_WOODS] = { 0, 8, 1, 1, sMapName_PetalburgWoods},
145+
[MAPSEC_RUSTURF_TUNNEL] = { 2, 5, 1, 1, sMapName_RusturfTunnel},
146+
[MAPSEC_ABANDONED_SHIP] = { 6, 14, 1, 1, sMapName_AbandonedShip},
147+
[MAPSEC_NEW_MAUVILLE] = { 8, 7, 1, 1, sMapName_NewMauville},
148+
[MAPSEC_METEOR_FALLS] = { 0, 3, 1, 1, sMapName_MeteorFalls},
149+
[MAPSEC_METEOR_FALLS_2] = { 1, 2, 1, 1, sMapName_MeteorFalls},
150+
[MAPSEC_MT_PYRE] = {16, 4, 1, 1, sMapName_MtPyre},
151+
[MAPSEC_EVIL_TEAM_HIDEOUT] = {19, 3, 1, 1, sMapName_EvilTeamHideout},
152+
[MAPSEC_SHOAL_CAVE] = {24, 4, 1, 1, sMapName_ShoalCave},
153+
[MAPSEC_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_SeafloorCavern},
154+
[MAPSEC_UNDERWATER_128] = {24, 9, 1, 1, sMapName_Underwater},
155+
[MAPSEC_VICTORY_ROAD] = {27, 9, 1, 1, sMapName_VictoryRoad},
156+
[MAPSEC_MIRAGE_ISLAND] = {17, 10, 1, 1, sMapName_MirageIsland},
157+
[MAPSEC_CAVE_OF_ORIGIN] = {21, 7, 1, 1, sMapName_CaveOfOrigin},
158+
[MAPSEC_SOUTHERN_ISLAND] = {12, 14, 1, 1, sMapName_SouthernIsland},
159+
[MAPSEC_FIERY_PATH] = { 6, 3, 1, 1, sMapName_FieryPath},
160+
[MAPSEC_FIERY_PATH_2] = { 7, 3, 1, 1, sMapName_FieryPath},
161+
[MAPSEC_JAGGED_PASS] = { 6, 3, 1, 1, sMapName_JaggedPass},
162+
[MAPSEC_JAGGED_PASS_2] = { 7, 2, 1, 1, sMapName_JaggedPass},
163+
[MAPSEC_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_SealedChamber},
164+
[MAPSEC_UNDERWATER_SEALED_CHAMBER] = {11, 10, 1, 1, sMapName_Underwater},
165+
[MAPSEC_SCORCHED_SLAB] = {13, 0, 1, 1, sMapName_ScorchedSlab},
166+
[MAPSEC_ISLAND_CAVE] = { 0, 10, 1, 1, sMapName_IslandCave},
167+
[MAPSEC_DESERT_RUINS] = { 8, 3, 1, 1, sMapName_DesertRuins},
168+
[MAPSEC_ANCIENT_TOMB] = {13, 2, 1, 1, sMapName_AncientTomb},
169+
[MAPSEC_INSIDE_OF_TRUCK] = { 0, 0, 1, 1, sMapName_InsideOfTruck},
170+
[MAPSEC_SKY_PILLAR] = {19, 10, 1, 1, sMapName_SkyPillar},
171+
[MAPSEC_SECRET_BASE] = { 0, 0, 1, 1, sMapName_SecretBase},
172+
[MAPSEC_DYNAMIC] = { 0, 0, 1, 1, sMapName_None},
173+
};
174+
175+
#endif // GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H

0 commit comments

Comments
 (0)