diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 11 | ||||
| -rw-r--r-- | include/battle_bg.h | 13 | ||||
| -rw-r--r-- | include/data/region_map/region_map_entries.h | 820 | ||||
| -rw-r--r-- | include/gba/types.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 2 | ||||
| -rw-r--r-- | include/graphics.h | 78 | ||||
| -rw-r--r-- | include/new_menu_helpers.h | 1 | ||||
| -rw-r--r-- | include/strings.h | 3 |
8 files changed, 508 insertions, 422 deletions
diff --git a/include/battle.h b/include/battle.h index 71dbe9a57..602d3eb53 100644 --- a/include/battle.h +++ b/include/battle.h @@ -8,6 +8,7 @@ #include "battle_ai_switch_items.h" #include "battle_gfx_sfx_util.h" #include "battle_util2.h" +#include "battle_bg.h" /* Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. @@ -863,16 +864,6 @@ struct BattleScripting extern struct BattleScripting gBattleScripting; -// functions - -// battle_1 -void LoadBattleTextboxAndBackground(void); -void LoadBattleEntryBackground(void); -void ApplyPlayerChosenFrameToBattleMenu(void); -bool8 LoadChosenBattleElement(u8 caseId); -void DrawMainBattleBackground(void); -void task00_0800F6FC(u8 taskId); - enum { BACK_PIC_BRENDAN, diff --git a/include/battle_bg.h b/include/battle_bg.h new file mode 100644 index 000000000..7fc09fbf7 --- /dev/null +++ b/include/battle_bg.h @@ -0,0 +1,13 @@ +#ifndef GUARD_BATTLE_BG_H +#define GUARD_BATTLE_BG_H + +void sub_8035658(void); +void sub_80356D0(void); +void ApplyPlayerChosenFrameToBattleMenu(void); +void DrawMainBattleBackground(void); +void LoadBattleTextboxAndBackground(void); +void sub_8035D74(u8 taskId); +void LoadBattleEntryBackground(void); +bool8 LoadChosenBattleElement(u8 caseId); + +#endif // GUARD_BATTLE_BG_H diff --git a/include/data/region_map/region_map_entries.h b/include/data/region_map/region_map_entries.h index 73599c704..9c7e3f2fc 100644 --- a/include/data/region_map/region_map_entries.h +++ b/include/data/region_map/region_map_entries.h @@ -1,421 +1,421 @@ #ifndef GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H #define GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H -static const u8 gMapName_LittlerootTown[] = _("LITTLEROOT TOWN"); -static const u8 gMapName_OldaleTown[] = _("OLDALE TOWN"); -static const u8 gMapName_DewfordTown[] = _("DEWFORD TOWN"); -static const u8 gMapName_LavaridgeTown[] = _("LAVARIDGE TOWN"); -static const u8 gMapName_FallarborTown[] = _("FALLARBOR TOWN"); -static const u8 gMapName_VerdanturfTown[] = _("VERDANTURF TOWN"); -static const u8 gMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN"); -static const u8 gMapName_PetalburgCity[] = _("PETALBURG CITY"); -static const u8 gMapName_SlateportCity[] = _("SLATEPORT CITY"); -static const u8 gMapName_MauvilleCity[] = _("MAUVILLE CITY"); -static const u8 gMapName_RustboroCity[] = _("RUSTBORO CITY"); -static const u8 gMapName_FortreeCity[] = _("FORTREE CITY"); -static const u8 gMapName_LilycoveCity[] = _("LILYCOVE CITY"); -static const u8 gMapName_MossdeepCity[] = _("MOSSDEEP CITY"); -static const u8 gMapName_SootopolisCity[] = _("SOOTOPOLIS CITY"); -static const u8 gMapName_EverGrandeCity[] = _("EVER GRANDE CITY"); -static const u8 gMapName_Route101[] = _("ROUTE 101"); -static const u8 gMapName_Route102[] = _("ROUTE 102"); -static const u8 gMapName_Route103[] = _("ROUTE 103"); -static const u8 gMapName_Route104[] = _("ROUTE 104"); -static const u8 gMapName_Route105[] = _("ROUTE 105"); -static const u8 gMapName_Route106[] = _("ROUTE 106"); -static const u8 gMapName_Route107[] = _("ROUTE 107"); -static const u8 gMapName_Route108[] = _("ROUTE 108"); -static const u8 gMapName_Route109[] = _("ROUTE 109"); -static const u8 gMapName_Route110[] = _("ROUTE 110"); -static const u8 gMapName_Route111[] = _("ROUTE 111"); -static const u8 gMapName_Route112[] = _("ROUTE 112"); -static const u8 gMapName_Route113[] = _("ROUTE 113"); -static const u8 gMapName_Route114[] = _("ROUTE 114"); -static const u8 gMapName_Route115[] = _("ROUTE 115"); -static const u8 gMapName_Route116[] = _("ROUTE 116"); -static const u8 gMapName_Route117[] = _("ROUTE 117"); -static const u8 gMapName_Route118[] = _("ROUTE 118"); -static const u8 gMapName_Route119[] = _("ROUTE 119"); -static const u8 gMapName_Route120[] = _("ROUTE 120"); -static const u8 gMapName_Route121[] = _("ROUTE 121"); -static const u8 gMapName_Route122[] = _("ROUTE 122"); -static const u8 gMapName_Route123[] = _("ROUTE 123"); -static const u8 gMapName_Route124[] = _("ROUTE 124"); -static const u8 gMapName_Route125[] = _("ROUTE 125"); -static const u8 gMapName_Route126[] = _("ROUTE 126"); -static const u8 gMapName_Route127[] = _("ROUTE 127"); -static const u8 gMapName_Route128[] = _("ROUTE 128"); -static const u8 gMapName_Route129[] = _("ROUTE 129"); -static const u8 gMapName_Route130[] = _("ROUTE 130"); -static const u8 gMapName_Route131[] = _("ROUTE 131"); -static const u8 gMapName_Route132[] = _("ROUTE 132"); -static const u8 gMapName_Route133[] = _("ROUTE 133"); -static const u8 gMapName_Route134[] = _("ROUTE 134"); -static const u8 gMapName_Underwater[] = _("UNDERWATER"); -static const u8 gMapName_GraniteCave[] = _("GRANITE CAVE"); -static const u8 gMapName_MtChimney[] = _("MT. CHIMNEY"); -static const u8 gMapName_SafariZone[] = _("SAFARI ZONE"); -static const u8 gMapName_BattleFrontier[] = _("BATTLE FRONTIER"); -static const u8 gMapName_PetalburgWoods[] = _("PETALBURG WOODS"); -static const u8 gMapName_RusturfTunnel[] = _("RUSTURF TUNNEL"); -static const u8 gMapName_AbandonedShip[] = _("ABANDONED SHIP"); -static const u8 gMapName_NewMauville[] = _("NEW MAUVILLE"); -static const u8 gMapName_MeteorFalls[] = _("METEOR FALLS"); -static const u8 gMapName_MtPyre[] = _("MT. PYRE"); +static const u8 sMapName_LittlerootTown[] = _("LITTLEROOT TOWN"); +static const u8 sMapName_OldaleTown[] = _("OLDALE TOWN"); +static const u8 sMapName_DewfordTown[] = _("DEWFORD TOWN"); +static const u8 sMapName_LavaridgeTown[] = _("LAVARIDGE TOWN"); +static const u8 sMapName_FallarborTown[] = _("FALLARBOR TOWN"); +static const u8 sMapName_VerdanturfTown[] = _("VERDANTURF TOWN"); +static const u8 sMapName_PacifidlogTown[] = _("PACIFIDLOG TOWN"); +static const u8 sMapName_PetalburgCity[] = _("PETALBURG CITY"); +static const u8 sMapName_SlateportCity[] = _("SLATEPORT CITY"); +static const u8 sMapName_MauvilleCity[] = _("MAUVILLE CITY"); +static const u8 sMapName_RustboroCity[] = _("RUSTBORO CITY"); +static const u8 sMapName_FortreeCity[] = _("FORTREE CITY"); +static const u8 sMapName_LilycoveCity[] = _("LILYCOVE CITY"); +static const u8 sMapName_MossdeepCity[] = _("MOSSDEEP CITY"); +static const u8 sMapName_SootopolisCity[] = _("SOOTOPOLIS CITY"); +static const u8 sMapName_EverGrandeCity[] = _("EVER GRANDE CITY"); +static const u8 sMapName_Route101[] = _("ROUTE 101"); +static const u8 sMapName_Route102[] = _("ROUTE 102"); +static const u8 sMapName_Route103[] = _("ROUTE 103"); +static const u8 sMapName_Route104[] = _("ROUTE 104"); +static const u8 sMapName_Route105[] = _("ROUTE 105"); +static const u8 sMapName_Route106[] = _("ROUTE 106"); +static const u8 sMapName_Route107[] = _("ROUTE 107"); +static const u8 sMapName_Route108[] = _("ROUTE 108"); +static const u8 sMapName_Route109[] = _("ROUTE 109"); +static const u8 sMapName_Route110[] = _("ROUTE 110"); +static const u8 sMapName_Route111[] = _("ROUTE 111"); +static const u8 sMapName_Route112[] = _("ROUTE 112"); +static const u8 sMapName_Route113[] = _("ROUTE 113"); +static const u8 sMapName_Route114[] = _("ROUTE 114"); +static const u8 sMapName_Route115[] = _("ROUTE 115"); +static const u8 sMapName_Route116[] = _("ROUTE 116"); +static const u8 sMapName_Route117[] = _("ROUTE 117"); +static const u8 sMapName_Route118[] = _("ROUTE 118"); +static const u8 sMapName_Route119[] = _("ROUTE 119"); +static const u8 sMapName_Route120[] = _("ROUTE 120"); +static const u8 sMapName_Route121[] = _("ROUTE 121"); +static const u8 sMapName_Route122[] = _("ROUTE 122"); +static const u8 sMapName_Route123[] = _("ROUTE 123"); +static const u8 sMapName_Route124[] = _("ROUTE 124"); +static const u8 sMapName_Route125[] = _("ROUTE 125"); +static const u8 sMapName_Route126[] = _("ROUTE 126"); +static const u8 sMapName_Route127[] = _("ROUTE 127"); +static const u8 sMapName_Route128[] = _("ROUTE 128"); +static const u8 sMapName_Route129[] = _("ROUTE 129"); +static const u8 sMapName_Route130[] = _("ROUTE 130"); +static const u8 sMapName_Route131[] = _("ROUTE 131"); +static const u8 sMapName_Route132[] = _("ROUTE 132"); +static const u8 sMapName_Route133[] = _("ROUTE 133"); +static const u8 sMapName_Route134[] = _("ROUTE 134"); +static const u8 sMapName_Underwater[] = _("UNDERWATER"); +static const u8 sMapName_GraniteCave[] = _("GRANITE CAVE"); +static const u8 sMapName_MtChimney[] = _("MT. CHIMNEY"); +static const u8 sMapName_SafariZone[] = _("SAFARI ZONE"); +static const u8 sMapName_BattleFrontier[] = _("BATTLE FRONTIER"); +static const u8 sMapName_PetalburgWoods[] = _("PETALBURG WOODS"); +static const u8 sMapName_RusturfTunnel[] = _("RUSTURF TUNNEL"); +static const u8 sMapName_AbandonedShip[] = _("ABANDONED SHIP"); +static const u8 sMapName_NewMauville[] = _("NEW MAUVILLE"); +static const u8 sMapName_MeteorFalls[] = _("METEOR FALLS"); +static const u8 sMapName_MtPyre[] = _("MT. PYRE"); // This was the Aqua or Magma hideout in Ruby/Sapphire, but each team has a // hideout in Emerald with their own new region map entries, and this name // doesn't seem to be used anymore. -static const u8 gMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT"); -static const u8 gMapName_ShoalCave[] = _("SHOAL CAVE"); -static const u8 gMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); -static const u8 gMapName_VictoryRoad[] = _("VICTORY ROAD"); -static const u8 gMapName_MirageIsland[] = _("MIRAGE ISLAND"); -static const u8 gMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN"); -static const u8 gMapName_SouthernIsland[] = _("SOUTHERN ISLAND"); -static const u8 gMapName_FieryPath[] = _("FIERY PATH"); -static const u8 gMapName_JaggedPass[] = _("JAGGED PASS"); -static const u8 gMapName_SealedChamber[] = _("SEALED CHAMBER"); -static const u8 gMapName_ScorchedSlab[] = _("SCORCHED SLAB"); -static const u8 gMapName_IslandCave[] = _("ISLAND CAVE"); -static const u8 gMapName_DesertRuins[] = _("DESERT RUINS"); -static const u8 gMapName_AncientTomb[] = _("ANCIENT TOMB"); -static const u8 gMapName_InsideOfTruck[] = _("INSIDE OF TRUCK"); -static const u8 gMapName_SkyPillar[] = _("SKY PILLAR"); -static const u8 gMapName_SecretBase[] = _("SECRET BASE"); -static const u8 gMapName_None[] = _(""); -static const u8 gMapName_PalletTown[] = _("PALLET TOWN"); -static const u8 gMapName_ViridianCity[] = _("VIRIDIAN CITY"); -static const u8 gMapName_PewterCity[] = _("PEWTER CITY"); -static const u8 gMapName_CeruleanCity[] = _("CERULEAN CITY"); -static const u8 gMapName_LavenderTown[] = _("LAVENDER TOWN"); -static const u8 gMapName_VermilionCity[] = _("VERMILION CITY"); -static const u8 gMapName_CeladonCity[] = _("CELADON CITY"); -static const u8 gMapName_FuchsiaCity[] = _("FUCHSIA CITY"); -static const u8 gMapName_CinnabarIsland[] = _("CINNABAR ISLAND"); -static const u8 gMapName_IndigoPlateau[] = _("INDIGO PLATEAU"); -static const u8 gMapName_SaffronCity[] = _("SAFFRON CITY"); -static const u8 gMapName_Route4[] = _("ROUTE 4"); -static const u8 gMapName_Route10[] = _("ROUTE 10"); -static const u8 gMapName_Route1[] = _("ROUTE 1"); -static const u8 gMapName_Route2[] = _("ROUTE 2"); -static const u8 gMapName_Route3[] = _("ROUTE 3"); -static const u8 gMapName_Route4_2[] = _("ROUTE 4"); -static const u8 gMapName_Route5[] = _("ROUTE 5"); -static const u8 gMapName_Route6[] = _("ROUTE 6"); -static const u8 gMapName_Route7[] = _("ROUTE 7"); -static const u8 gMapName_Route8[] = _("ROUTE 8"); -static const u8 gMapName_Route9[] = _("ROUTE 9"); -static const u8 gMapName_Route10_2[] = _("ROUTE 10"); -static const u8 gMapName_Route11[] = _("ROUTE 11"); -static const u8 gMapName_Route12[] = _("ROUTE 12"); -static const u8 gMapName_Route13[] = _("ROUTE 13"); -static const u8 gMapName_Route14[] = _("ROUTE 14"); -static const u8 gMapName_Route15[] = _("ROUTE 15"); -static const u8 gMapName_Route16[] = _("ROUTE 16"); -static const u8 gMapName_Route17[] = _("ROUTE 17"); -static const u8 gMapName_Route18[] = _("ROUTE 18"); -static const u8 gMapName_Route19[] = _("ROUTE 19"); -static const u8 gMapName_Route20[] = _("ROUTE 20"); -static const u8 gMapName_Route21[] = _("ROUTE 21"); -static const u8 gMapName_Route22[] = _("ROUTE 22"); -static const u8 gMapName_Route23[] = _("ROUTE 23"); -static const u8 gMapName_Route24[] = _("ROUTE 24"); -static const u8 gMapName_Route25[] = _("ROUTE 25"); -static const u8 gMapName_ViridianForest[] = _("VIRIDIAN FOREST"); -static const u8 gMapName_MtMoon[] = _("MT. MOON"); -static const u8 gMapName_SSAnne[] = _("S.S. ANNE"); -static const u8 gMapName_UndergroundPath[] = _("UNDERGROUND PATH"); -static const u8 gMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); -static const u8 gMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); -static const u8 gMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); -static const u8 gMapName_RocketHideout[] = _("ROCKET HIDEOUT"); -static const u8 gMapName_SilphCo[] = _("SILPH CO."); -static const u8 gMapName_PokemonMansion[] = _("POKéMON MANSION"); -static const u8 gMapName_KantoSafariZone[] = _("SAFARI ZONE"); -static const u8 gMapName_PokemonLeague[] = _("POKéMON LEAGUE"); -static const u8 gMapName_RockTunnel[] = _("ROCK TUNNEL"); -static const u8 gMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS"); -static const u8 gMapName_PokemonTower[] = _("POKéMON TOWER"); -static const u8 gMapName_CeruleanCave[] = _("CERULEAN CAVE"); -static const u8 gMapName_PowerPlant[] = _("POWER PLANT"); -static const u8 gMapName_OneIsland[] = _("ONE ISLAND"); -static const u8 gMapName_TwoIsland[] = _("TWO ISLAND"); -static const u8 gMapName_ThreeIsland[] = _("THREE ISLAND"); -static const u8 gMapName_FourIsland[] = _("FOUR ISLAND"); -static const u8 gMapName_FiveIsland[] = _("FIVE ISLAND"); -static const u8 gMapName_SevenIsland[] = _("SEVEN ISLAND"); -static const u8 gMapName_SixIsland[] = _("SIX ISLAND"); -static const u8 gMapName_KindleRoad[] = _("KINDLE ROAD"); -static const u8 gMapName_TreasureBeach[] = _("TREASURE BEACH"); -static const u8 gMapName_CapeBrink[] = _("CAPE BRINK"); -static const u8 gMapName_BondBridge[] = _("BOND BRIDGE"); -static const u8 gMapName_ThreeIslePort[] = _("THREE ISLE PORT"); -static const u8 gMapName_SeviiIsle6[] = _("SEVII ISLE 6"); -static const u8 gMapName_SeviiIsle7[] = _("SEVII ISLE 7"); -static const u8 gMapName_SeviiIsle8[] = _("SEVII ISLE 8"); -static const u8 gMapName_SeviiIsle9[] = _("SEVII ISLE 9"); -static const u8 gMapName_ResortGorgeous[] = _("RESORT GORGEOUS"); -static const u8 gMapName_WaterLabyrinth[] = _("WATER LABYRINTH"); -static const u8 gMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW"); -static const u8 gMapName_MemorialPillar[] = _("MEMORIAL PILLAR"); -static const u8 gMapName_OutcastIsland[] = _("OUTCAST ISLAND"); -static const u8 gMapName_GreenPath[] = _("GREEN PATH"); -static const u8 gMapName_WaterPath[] = _("WATER PATH"); -static const u8 gMapName_RuinValley[] = _("RUIN VALLEY"); -static const u8 gMapName_TrainerTower[] = _("TRAINER TOWER"); -static const u8 gMapName_CanyonEntrance[] = _("CANYON ENTRANCE"); -static const u8 gMapName_SevaultCanyon[] = _("SEVAULT CANYON"); -static const u8 gMapName_TanobyRuins[] = _("TANOBY RUINS"); -static const u8 gMapName_SeviiIsle22[] = _("SEVII ISLE 22"); -static const u8 gMapName_SeviiIsle23[] = _("SEVII ISLE 23"); -static const u8 gMapName_SeviiIsle24[] = _("SEVII ISLE 24"); -static const u8 gMapName_NavelRock[] = _("NAVEL ROCK"); -static const u8 gMapName_MtEmber[] = _("MT. EMBER"); -static const u8 gMapName_BerryForest[] = _("BERRY FOREST"); -static const u8 gMapName_IcefallCave[] = _("ICEFALL CAVE"); -static const u8 gMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE"); -static const u8 gMapName_TrainerTower2[] = _("TRAINER TOWER"); -static const u8 gMapName_DottedHole[] = _("DOTTED HOLE"); -static const u8 gMapName_LostCave[] = _("LOST CAVE"); -static const u8 gMapName_PatternBush[] = _("PATTERN BUSH"); -static const u8 gMapName_AlteringCave[] = _("ALTERING CAVE"); -static const u8 gMapName_TanobyChambers[] = _("TANOBY CHAMBERS"); -static const u8 gMapName_ThreeIslePath[] = _("THREE ISLE PATH"); -static const u8 gMapName_TanobyKey[] = _("TANOBY KEY"); -static const u8 gMapName_BirthIsland[] = _("BIRTH ISLAND"); -static const u8 gMapName_MoneanChamber[] = _("MONEAN CHAMBER"); -static const u8 gMapName_LiptooChamber[] = _("LIPTOO CHAMBER"); -static const u8 gMapName_WeepthChamber[] = _("WEEPTH CHAMBER"); -static const u8 gMapName_DilfordChamber[] = _("DILFORD CHAMBER"); -static const u8 gMapName_ScufibChamber[] = _("SCUFIB CHAMBER"); -static const u8 gMapName_RixyChamber[] = _("RIXY CHAMBER"); -static const u8 gMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER"); -static const u8 gMapName_EmberSpa[] = _("EMBER SPA"); -static const u8 gMapName_SpecialArea[] = _("SPECIAL AREA"); -static const u8 gMapName_AquaHideout[] = _("AQUA HIDEOUT"); -static const u8 gMapName_MagmaHideout[] = _("MAGMA HIDEOUT"); -static const u8 gMapName_MirageTower[] = _("MIRAGE TOWER"); -static const u8 gMapName_FarawayIsland[] = _("FARAWAY ISLAND"); -static const u8 gMapName_ArtisanCave[] = _("ARTISAN CAVE"); -static const u8 gMapName_MarineCave[] = _("MARINE CAVE"); -static const u8 gMapName_TerraCave[] = _("TERRA CAVE"); -static const u8 gMapName_DesertUnderpass[] = _("DESERT UNDERPASS"); -static const u8 gMapName_TrainerHill[] = _("TRAINER HILL"); +static const u8 sMapName_AquaHideoutOld[] = _("{AQUA} HIDEOUT"); +static const u8 sMapName_ShoalCave[] = _("SHOAL CAVE"); +static const u8 sMapName_SeafloorCavern[] = _("SEAFLOOR CAVERN"); +static const u8 sMapName_VictoryRoad[] = _("VICTORY ROAD"); +static const u8 sMapName_MirageIsland[] = _("MIRAGE ISLAND"); +static const u8 sMapName_CaveOfOrigin[] = _("CAVE OF ORIGIN"); +static const u8 sMapName_SouthernIsland[] = _("SOUTHERN ISLAND"); +static const u8 sMapName_FieryPath[] = _("FIERY PATH"); +static const u8 sMapName_JaggedPass[] = _("JAGGED PASS"); +static const u8 sMapName_SealedChamber[] = _("SEALED CHAMBER"); +static const u8 sMapName_ScorchedSlab[] = _("SCORCHED SLAB"); +static const u8 sMapName_IslandCave[] = _("ISLAND CAVE"); +static const u8 sMapName_DesertRuins[] = _("DESERT RUINS"); +static const u8 sMapName_AncientTomb[] = _("ANCIENT TOMB"); +static const u8 sMapName_InsideOfTruck[] = _("INSIDE OF TRUCK"); +static const u8 sMapName_SkyPillar[] = _("SKY PILLAR"); +static const u8 sMapName_SecretBase[] = _("SECRET BASE"); +static const u8 sMapName_None[] = _(""); +static const u8 sMapName_PalletTown[] = _("PALLET TOWN"); +static const u8 sMapName_ViridianCity[] = _("VIRIDIAN CITY"); +static const u8 sMapName_PewterCity[] = _("PEWTER CITY"); +static const u8 sMapName_CeruleanCity[] = _("CERULEAN CITY"); +static const u8 sMapName_LavenderTown[] = _("LAVENDER TOWN"); +static const u8 sMapName_VermilionCity[] = _("VERMILION CITY"); +static const u8 sMapName_CeladonCity[] = _("CELADON CITY"); +static const u8 sMapName_FuchsiaCity[] = _("FUCHSIA CITY"); +static const u8 sMapName_CinnabarIsland[] = _("CINNABAR ISLAND"); +static const u8 sMapName_IndigoPlateau[] = _("INDIGO PLATEAU"); +static const u8 sMapName_SaffronCity[] = _("SAFFRON CITY"); +static const u8 sMapName_Route4[] = _("ROUTE 4"); +static const u8 sMapName_Route10[] = _("ROUTE 10"); +static const u8 sMapName_Route1[] = _("ROUTE 1"); +static const u8 sMapName_Route2[] = _("ROUTE 2"); +static const u8 sMapName_Route3[] = _("ROUTE 3"); +static const u8 sMapName_Route4_2[] = _("ROUTE 4"); +static const u8 sMapName_Route5[] = _("ROUTE 5"); +static const u8 sMapName_Route6[] = _("ROUTE 6"); +static const u8 sMapName_Route7[] = _("ROUTE 7"); +static const u8 sMapName_Route8[] = _("ROUTE 8"); +static const u8 sMapName_Route9[] = _("ROUTE 9"); +static const u8 sMapName_Route10_2[] = _("ROUTE 10"); +static const u8 sMapName_Route11[] = _("ROUTE 11"); +static const u8 sMapName_Route12[] = _("ROUTE 12"); +static const u8 sMapName_Route13[] = _("ROUTE 13"); +static const u8 sMapName_Route14[] = _("ROUTE 14"); +static const u8 sMapName_Route15[] = _("ROUTE 15"); +static const u8 sMapName_Route16[] = _("ROUTE 16"); +static const u8 sMapName_Route17[] = _("ROUTE 17"); +static const u8 sMapName_Route18[] = _("ROUTE 18"); +static const u8 sMapName_Route19[] = _("ROUTE 19"); +static const u8 sMapName_Route20[] = _("ROUTE 20"); +static const u8 sMapName_Route21[] = _("ROUTE 21"); +static const u8 sMapName_Route22[] = _("ROUTE 22"); +static const u8 sMapName_Route23[] = _("ROUTE 23"); +static const u8 sMapName_Route24[] = _("ROUTE 24"); +static const u8 sMapName_Route25[] = _("ROUTE 25"); +static const u8 sMapName_ViridianForest[] = _("VIRIDIAN FOREST"); +static const u8 sMapName_MtMoon[] = _("MT. MOON"); +static const u8 sMapName_SSAnne[] = _("S.S. ANNE"); +static const u8 sMapName_UndergroundPath[] = _("UNDERGROUND PATH"); +static const u8 sMapName_UndergroundPath2[] = _("UNDERGROUND PATH"); +static const u8 sMapName_DiglettsCave[] = _("DIGLETT’S CAVE"); +static const u8 sMapName_KantoVictoryRoad[] = _("VICTORY ROAD"); +static const u8 sMapName_RocketHideout[] = _("ROCKET HIDEOUT"); +static const u8 sMapName_SilphCo[] = _("SILPH CO."); +static const u8 sMapName_PokemonMansion[] = _("POKéMON MANSION"); +static const u8 sMapName_KantoSafariZone[] = _("SAFARI ZONE"); +static const u8 sMapName_PokemonLeague[] = _("POKéMON LEAGUE"); +static const u8 sMapName_RockTunnel[] = _("ROCK TUNNEL"); +static const u8 sMapName_SeafoamIslands[] = _("SEAFOAM ISLANDS"); +static const u8 sMapName_PokemonTower[] = _("POKéMON TOWER"); +static const u8 sMapName_CeruleanCave[] = _("CERULEAN CAVE"); +static const u8 sMapName_PowerPlant[] = _("POWER PLANT"); +static const u8 sMapName_OneIsland[] = _("ONE ISLAND"); +static const u8 sMapName_TwoIsland[] = _("TWO ISLAND"); +static const u8 sMapName_ThreeIsland[] = _("THREE ISLAND"); +static const u8 sMapName_FourIsland[] = _("FOUR ISLAND"); +static const u8 sMapName_FiveIsland[] = _("FIVE ISLAND"); +static const u8 sMapName_SevenIsland[] = _("SEVEN ISLAND"); +static const u8 sMapName_SixIsland[] = _("SIX ISLAND"); +static const u8 sMapName_KindleRoad[] = _("KINDLE ROAD"); +static const u8 sMapName_TreasureBeach[] = _("TREASURE BEACH"); +static const u8 sMapName_CapeBrink[] = _("CAPE BRINK"); +static const u8 sMapName_BondBridge[] = _("BOND BRIDGE"); +static const u8 sMapName_ThreeIslePort[] = _("THREE ISLE PORT"); +static const u8 sMapName_SeviiIsle6[] = _("SEVII ISLE 6"); +static const u8 sMapName_SeviiIsle7[] = _("SEVII ISLE 7"); +static const u8 sMapName_SeviiIsle8[] = _("SEVII ISLE 8"); +static const u8 sMapName_SeviiIsle9[] = _("SEVII ISLE 9"); +static const u8 sMapName_ResortGorgeous[] = _("RESORT GORGEOUS"); +static const u8 sMapName_WaterLabyrinth[] = _("WATER LABYRINTH"); +static const u8 sMapName_FiveIsleMeadow[] = _("FIVE ISLE MEADOW"); +static const u8 sMapName_MemorialPillar[] = _("MEMORIAL PILLAR"); +static const u8 sMapName_OutcastIsland[] = _("OUTCAST ISLAND"); +static const u8 sMapName_GreenPath[] = _("GREEN PATH"); +static const u8 sMapName_WaterPath[] = _("WATER PATH"); +static const u8 sMapName_RuinValley[] = _("RUIN VALLEY"); +static const u8 sMapName_TrainerTower[] = _("TRAINER TOWER"); +static const u8 sMapName_CanyonEntrance[] = _("CANYON ENTRANCE"); +static const u8 sMapName_SevaultCanyon[] = _("SEVAULT CANYON"); +static const u8 sMapName_TanobyRuins[] = _("TANOBY RUINS"); +static const u8 sMapName_SeviiIsle22[] = _("SEVII ISLE 22"); +static const u8 sMapName_SeviiIsle23[] = _("SEVII ISLE 23"); +static const u8 sMapName_SeviiIsle24[] = _("SEVII ISLE 24"); +static const u8 sMapName_NavelRock[] = _("NAVEL ROCK"); +static const u8 sMapName_MtEmber[] = _("MT. EMBER"); +static const u8 sMapName_BerryForest[] = _("BERRY FOREST"); +static const u8 sMapName_IcefallCave[] = _("ICEFALL CAVE"); +static const u8 sMapName_RocketWarehouse[] = _("ROCKET WAREHOUSE"); +static const u8 sMapName_TrainerTower2[] = _("TRAINER TOWER"); +static const u8 sMapName_DottedHole[] = _("DOTTED HOLE"); +static const u8 sMapName_LostCave[] = _("LOST CAVE"); +static const u8 sMapName_PatternBush[] = _("PATTERN BUSH"); +static const u8 sMapName_AlteringCave[] = _("ALTERING CAVE"); +static const u8 sMapName_TanobyChambers[] = _("TANOBY CHAMBERS"); +static const u8 sMapName_ThreeIslePath[] = _("THREE ISLE PATH"); +static const u8 sMapName_TanobyKey[] = _("TANOBY KEY"); +static const u8 sMapName_BirthIsland[] = _("BIRTH ISLAND"); +static const u8 sMapName_MoneanChamber[] = _("MONEAN CHAMBER"); +static const u8 sMapName_LiptooChamber[] = _("LIPTOO CHAMBER"); +static const u8 sMapName_WeepthChamber[] = _("WEEPTH CHAMBER"); +static const u8 sMapName_DilfordChamber[] = _("DILFORD CHAMBER"); +static const u8 sMapName_ScufibChamber[] = _("SCUFIB CHAMBER"); +static const u8 sMapName_RixyChamber[] = _("RIXY CHAMBER"); +static const u8 sMapName_ViapoisChamber[] = _("VIAPOIS CHAMBER"); +static const u8 sMapName_EmberSpa[] = _("EMBER SPA"); +static const u8 sMapName_SpecialArea[] = _("SPECIAL AREA"); +static const u8 sMapName_AquaHideout[] = _("AQUA HIDEOUT"); +static const u8 sMapName_MagmaHideout[] = _("MAGMA HIDEOUT"); +static const u8 sMapName_MirageTower[] = _("MIRAGE TOWER"); +static const u8 sMapName_FarawayIsland[] = _("FARAWAY ISLAND"); +static const u8 sMapName_ArtisanCave[] = _("ARTISAN CAVE"); +static const u8 sMapName_MarineCave[] = _("MARINE CAVE"); +static const u8 sMapName_TerraCave[] = _("TERRA CAVE"); +static const u8 sMapName_DesertUnderpass[] = _("DESERT UNDERPASS"); +static const u8 sMapName_TrainerHill[] = _("TRAINER HILL"); const struct RegionMapLocation gRegionMapEntries[] = { - { 4, 11, 1, 1, gMapName_LittlerootTown}, - { 4, 9, 1, 1, gMapName_OldaleTown}, - { 2, 14, 1, 1, gMapName_DewfordTown}, - { 5, 3, 1, 1, gMapName_LavaridgeTown}, - { 3, 0, 1, 1, gMapName_FallarborTown}, - { 4, 6, 1, 1, gMapName_VerdanturfTown}, - {17, 10, 1, 1, gMapName_PacifidlogTown}, - { 1, 9, 1, 1, gMapName_PetalburgCity}, - { 8, 10, 1, 2, gMapName_SlateportCity}, - { 8, 6, 2, 1, gMapName_MauvilleCity}, - { 0, 5, 1, 2, gMapName_RustboroCity}, - {12, 0, 1, 1, gMapName_FortreeCity}, - {18, 3, 2, 1, gMapName_LilycoveCity}, - {24, 5, 2, 1, gMapName_MossdeepCity}, - {21, 7, 1, 1, gMapName_SootopolisCity}, - {27, 8, 1, 2, gMapName_EverGrandeCity}, - { 4, 10, 1, 1, gMapName_Route101}, - { 2, 9, 2, 1, gMapName_Route102}, - { 4, 8, 4, 1, gMapName_Route103}, - { 0, 7, 1, 3, gMapName_Route104}, - { 0, 10, 1, 3, gMapName_Route105}, - { 0, 13, 2, 1, gMapName_Route106}, - { 3, 14, 3, 1, gMapName_Route107}, - { 6, 14, 2, 1, gMapName_Route108}, - { 8, 12, 1, 3, gMapName_Route109}, - { 8, 7, 1, 3, gMapName_Route110}, - { 8, 0, 1, 6, gMapName_Route111}, - { 6, 3, 2, 1, gMapName_Route112}, - { 4, 0, 4, 1, gMapName_Route113}, - { 1, 0, 2, 3, gMapName_Route114}, - { 0, 2, 1, 3, gMapName_Route115}, - { 1, 5, 4, 1, gMapName_Route116}, - { 5, 6, 3, 1, gMapName_Route117}, - {10, 6, 2, 1, gMapName_Route118}, - {11, 0, 1, 6, gMapName_Route119}, - {13, 0, 1, 4, gMapName_Route120}, - {14, 3, 4, 1, gMapName_Route121}, - {16, 4, 1, 2, gMapName_Route122}, - {12, 6, 5, 1, gMapName_Route123}, - {20, 3, 4, 3, gMapName_Route124}, - {24, 3, 2, 2, gMapName_Route125}, - {20, 6, 3, 3, gMapName_Route126}, - {23, 6, 3, 3, gMapName_Route127}, - {23, 9, 4, 1, gMapName_Route128}, - {24, 10, 2, 1, gMapName_Route129}, - {21, 10, 3, 1, gMapName_Route130}, - {18, 10, 3, 1, gMapName_Route131}, - {15, 10, 2, 1, gMapName_Route132}, - {12, 10, 3, 1, gMapName_Route133}, - { 9, 10, 3, 1, gMapName_Route134}, - {20, 3, 4, 3, gMapName_Underwater}, - {20, 6, 3, 3, gMapName_Underwater}, - {23, 6, 3, 3, gMapName_Underwater}, - {23, 9, 4, 1, gMapName_Underwater}, - {21, 7, 1, 1, gMapName_Underwater}, - { 1, 13, 1, 1, gMapName_GraniteCave}, - { 6, 2, 1, 1, gMapName_MtChimney}, - {16, 2, 1, 1, gMapName_SafariZone}, - {22, 12, 1, 1, gMapName_BattleFrontier}, - { 0, 8, 1, 1, gMapName_PetalburgWoods}, - { 2, 5, 1, 1, gMapName_RusturfTunnel}, - { 6, 14, 1, 1, gMapName_AbandonedShip}, - { 8, 7, 1, 1, gMapName_NewMauville}, - { 0, 3, 1, 1, gMapName_MeteorFalls}, - { 1, 2, 1, 1, gMapName_MeteorFalls}, - {16, 4, 1, 1, gMapName_MtPyre}, - {19, 3, 1, 1, gMapName_AquaHideoutOld}, - {24, 4, 1, 1, gMapName_ShoalCave}, - {24, 9, 1, 1, gMapName_SeafloorCavern}, - {24, 9, 1, 1, gMapName_Underwater}, - {27, 9, 1, 1, gMapName_VictoryRoad}, - {17, 10, 1, 1, gMapName_MirageIsland}, - {21, 7, 1, 1, gMapName_CaveOfOrigin}, - {12, 14, 1, 1, gMapName_SouthernIsland}, - { 6, 3, 1, 1, gMapName_FieryPath}, - { 7, 3, 1, 1, gMapName_FieryPath}, - { 6, 3, 1, 1, gMapName_JaggedPass}, - { 7, 2, 1, 1, gMapName_JaggedPass}, - {11, 10, 1, 1, gMapName_SealedChamber}, - {11, 10, 1, 1, gMapName_Underwater}, - {13, 0, 1, 1, gMapName_ScorchedSlab}, - { 0, 10, 1, 1, gMapName_IslandCave}, - { 8, 3, 1, 1, gMapName_DesertRuins}, - {13, 2, 1, 1, gMapName_AncientTomb}, - { 0, 0, 1, 1, gMapName_InsideOfTruck}, - {19, 10, 1, 1, gMapName_SkyPillar}, - { 0, 0, 1, 1, gMapName_SecretBase}, - { 0, 0, 1, 1, gMapName_None}, - { 0, 0, 1, 1, gMapName_PalletTown}, - { 0, 0, 1, 1, gMapName_ViridianCity}, - { 0, 0, 1, 1, gMapName_PewterCity}, - { 0, 0, 1, 1, gMapName_CeruleanCity}, - { 0, 0, 1, 1, gMapName_LavenderTown}, - { 0, 0, 1, 1, gMapName_VermilionCity}, - { 0, 0, 1, 1, gMapName_CeladonCity}, - { 0, 0, 1, 1, gMapName_FuchsiaCity}, - { 0, 0, 1, 1, gMapName_CinnabarIsland}, - { 0, 0, 1, 1, gMapName_IndigoPlateau}, - { 0, 0, 1, 1, gMapName_SaffronCity}, - { 0, 0, 1, 1, gMapName_Route4}, - { 0, 0, 1, 1, gMapName_Route10}, - { 0, 0, 1, 1, gMapName_Route1}, - { 0, 0, 1, 1, gMapName_Route2}, - { 0, 0, 1, 1, gMapName_Route3}, - { 0, 0, 1, 1, gMapName_Route4_2}, - { 0, 0, 1, 1, gMapName_Route5}, - { 0, 0, 1, 1, gMapName_Route6}, - { 0, 0, 1, 1, gMapName_Route7}, - { 0, 0, 1, 1, gMapName_Route8}, - { 0, 0, 1, 1, gMapName_Route9}, - { 0, 0, 1, 1, gMapName_Route10_2}, - { 0, 0, 1, 1, gMapName_Route11}, - { 0, 0, 1, 1, gMapName_Route12}, - { 0, 0, 1, 1, gMapName_Route13}, - { 0, 0, 1, 1, gMapName_Route14}, - { 0, 0, 1, 1, gMapName_Route15}, - { 0, 0, 1, 1, gMapName_Route16}, - { 0, 0, 1, 1, gMapName_Route17}, - { 0, 0, 1, 1, gMapName_Route18}, - { 0, 0, 1, 1, gMapName_Route19}, - { 0, 0, 1, 1, gMapName_Route20}, - { 0, 0, 1, 1, gMapName_Route21}, - { 0, 0, 1, 1, gMapName_Route22}, - { 0, 0, 1, 1, gMapName_Route23}, - { 0, 0, 1, 1, gMapName_Route24}, - { 0, 0, 1, 1, gMapName_Route25}, - { 0, 0, 1, 1, gMapName_ViridianForest}, - { 0, 0, 1, 1, gMapName_MtMoon}, - { 0, 0, 1, 1, gMapName_SSAnne}, - { 0, 0, 1, 1, gMapName_UndergroundPath}, - { 0, 0, 1, 1, gMapName_UndergroundPath2}, - { 0, 0, 1, 1, gMapName_DiglettsCave}, - { 0, 0, 1, 1, gMapName_KantoVictoryRoad}, - { 0, 0, 1, 1, gMapName_RocketHideout}, - { 0, 0, 1, 1, gMapName_SilphCo}, - { 0, 0, 1, 1, gMapName_PokemonMansion}, - { 0, 0, 1, 1, gMapName_KantoSafariZone}, - { 0, 0, 1, 1, gMapName_PokemonLeague}, - { 0, 0, 1, 1, gMapName_RockTunnel}, - { 0, 0, 1, 1, gMapName_SeafoamIslands}, - { 0, 0, 1, 1, gMapName_PokemonTower}, - { 0, 0, 1, 1, gMapName_CeruleanCave}, - { 0, 0, 1, 1, gMapName_PowerPlant}, - { 0, 0, 1, 1, gMapName_OneIsland}, - { 0, 0, 1, 1, gMapName_TwoIsland}, - { 0, 0, 1, 1, gMapName_ThreeIsland}, - { 0, 0, 1, 1, gMapName_FourIsland}, - { 0, 0, 1, 1, gMapName_FiveIsland}, - { 0, 0, 1, 1, gMapName_SevenIsland}, - { 0, 0, 1, 1, gMapName_SixIsland}, - { 0, 0, 1, 1, gMapName_KindleRoad}, - { 0, 0, 1, 1, gMapName_TreasureBeach}, - { 0, 0, 1, 1, gMapName_CapeBrink}, - { 0, 0, 1, 1, gMapName_BondBridge}, - { 0, 0, 1, 1, gMapName_ThreeIslePort}, - { 0, 0, 1, 1, gMapName_SeviiIsle6}, - { 0, 0, 1, 1, gMapName_SeviiIsle7}, - { 0, 0, 1, 1, gMapName_SeviiIsle8}, - { 0, 0, 1, 1, gMapName_SeviiIsle9}, - { 0, 0, 1, 1, gMapName_ResortGorgeous}, - { 0, 0, 1, 1, gMapName_WaterLabyrinth}, - { 0, 0, 1, 1, gMapName_FiveIsleMeadow}, - { 0, 0, 1, 1, gMapName_MemorialPillar}, - { 0, 0, 1, 1, gMapName_OutcastIsland}, - { 0, 0, 1, 1, gMapName_GreenPath}, - { 0, 0, 1, 1, gMapName_WaterPath}, - { 0, 0, 1, 1, gMapName_RuinValley}, - { 0, 0, 1, 1, gMapName_TrainerTower}, - { 0, 0, 1, 1, gMapName_CanyonEntrance}, - { 0, 0, 1, 1, gMapName_SevaultCanyon}, - { 0, 0, 1, 1, gMapName_TanobyRuins}, - { 0, 0, 1, 1, gMapName_SeviiIsle22}, - { 0, 0, 1, 1, gMapName_SeviiIsle23}, - { 0, 0, 1, 1, gMapName_SeviiIsle24}, - { 0, 0, 1, 1, gMapName_NavelRock}, - { 0, 0, 1, 1, gMapName_MtEmber}, - { 0, 0, 1, 1, gMapName_BerryForest}, - { 0, 0, 1, 1, gMapName_IcefallCave}, - { 0, 0, 1, 1, gMapName_RocketWarehouse}, - { 0, 0, 1, 1, gMapName_TrainerTower2}, - { 0, 0, 1, 1, gMapName_DottedHole}, - { 0, 0, 1, 1, gMapName_LostCave}, - { 0, 0, 1, 1, gMapName_PatternBush}, - { 0, 0, 1, 1, gMapName_AlteringCave}, - { 0, 0, 1, 1, gMapName_TanobyChambers}, - { 0, 0, 1, 1, gMapName_ThreeIslePath}, - { 0, 0, 1, 1, gMapName_TanobyKey}, - { 0, 0, 1, 1, gMapName_BirthIsland}, - { 0, 0, 1, 1, gMapName_MoneanChamber}, - { 0, 0, 1, 1, gMapName_LiptooChamber}, - { 0, 0, 1, 1, gMapName_WeepthChamber}, - { 0, 0, 1, 1, gMapName_DilfordChamber}, - { 0, 0, 1, 1, gMapName_ScufibChamber}, - { 0, 0, 1, 1, gMapName_RixyChamber}, - { 0, 0, 1, 1, gMapName_ViapoisChamber}, - { 0, 0, 1, 1, gMapName_EmberSpa}, - { 0, 0, 1, 1, gMapName_SpecialArea}, - {19, 3, 1, 1, gMapName_AquaHideout}, - { 6, 3, 1, 1, gMapName_MagmaHideout}, - { 8, 2, 1, 1, gMapName_MirageTower}, - { 0, 0, 1, 1, gMapName_BirthIsland}, - { 0, 0, 1, 1, gMapName_FarawayIsland}, - {22, 12, 1, 1, gMapName_ArtisanCave}, - { 0, 0, 1, 1, gMapName_MarineCave}, - { 0, 0, 1, 1, gMapName_Underwater}, - { 0, 0, 1, 1, gMapName_TerraCave}, - { 0, 10, 1, 3, gMapName_Underwater}, - {24, 3, 2, 2, gMapName_Underwater}, - {24, 10, 2, 1, gMapName_Underwater}, - { 2, 0, 1, 1, gMapName_DesertUnderpass}, - { 6, 8, 1, 1, gMapName_AlteringCave}, - { 0, 0, 1, 1, gMapName_NavelRock}, - { 8, 4, 1, 1, gMapName_TrainerHill} + { 4, 11, 1, 1, sMapName_LittlerootTown}, + { 4, 9, 1, 1, sMapName_OldaleTown}, + { 2, 14, 1, 1, sMapName_DewfordTown}, + { 5, 3, 1, 1, sMapName_LavaridgeTown}, + { 3, 0, 1, 1, sMapName_FallarborTown}, + { 4, 6, 1, 1, sMapName_VerdanturfTown}, + {17, 10, 1, 1, sMapName_PacifidlogTown}, + { 1, 9, 1, 1, sMapName_PetalburgCity}, + { 8, 10, 1, 2, sMapName_SlateportCity}, + { 8, 6, 2, 1, sMapName_MauvilleCity}, + { 0, 5, 1, 2, sMapName_RustboroCity}, + {12, 0, 1, 1, sMapName_FortreeCity}, + {18, 3, 2, 1, sMapName_LilycoveCity}, + {24, 5, 2, 1, sMapName_MossdeepCity}, + {21, 7, 1, 1, sMapName_SootopolisCity}, + {27, 8, 1, 2, sMapName_EverGrandeCity}, + { 4, 10, 1, 1, sMapName_Route101}, + { 2, 9, 2, 1, sMapName_Route102}, + { 4, 8, 4, 1, sMapName_Route103}, + { 0, 7, 1, 3, sMapName_Route104}, + { 0, 10, 1, 3, sMapName_Route105}, + { 0, 13, 2, 1, sMapName_Route106}, + { 3, 14, 3, 1, sMapName_Route107}, + { 6, 14, 2, 1, sMapName_Route108}, + { 8, 12, 1, 3, sMapName_Route109}, + { 8, 7, 1, 3, sMapName_Route110}, + { 8, 0, 1, 6, sMapName_Route111}, + { 6, 3, 2, 1, sMapName_Route112}, + { 4, 0, 4, 1, sMapName_Route113}, + { 1, 0, 2, 3, sMapName_Route114}, + { 0, 2, 1, 3, sMapName_Route115}, + { 1, 5, 4, 1, sMapName_Route116}, + { 5, 6, 3, 1, sMapName_Route117}, + {10, 6, 2, 1, sMapName_Route118}, + {11, 0, 1, 6, sMapName_Route119}, + {13, 0, 1, 4, sMapName_Route120}, + {14, 3, 4, 1, sMapName_Route121}, + {16, 4, 1, 2, sMapName_Route122}, + {12, 6, 5, 1, sMapName_Route123}, + {20, 3, 4, 3, sMapName_Route124}, + {24, 3, 2, 2, sMapName_Route125}, + {20, 6, 3, 3, sMapName_Route126}, + {23, 6, 3, 3, sMapName_Route127}, + {23, 9, 4, 1, sMapName_Route128}, + {24, 10, 2, 1, sMapName_Route129}, + {21, 10, 3, 1, sMapName_Route130}, + {18, 10, 3, 1, sMapName_Route131}, + {15, 10, 2, 1, sMapName_Route132}, + {12, 10, 3, 1, sMapName_Route133}, + { 9, 10, 3, 1, sMapName_Route134}, + {20, 3, 4, 3, sMapName_Underwater}, + {20, 6, 3, 3, sMapName_Underwater}, + {23, 6, 3, 3, sMapName_Underwater}, + {23, 9, 4, 1, sMapName_Underwater}, + {21, 7, 1, 1, sMapName_Underwater}, + { 1, 13, 1, 1, sMapName_GraniteCave}, + { 6, 2, 1, 1, sMapName_MtChimney}, + {16, 2, 1, 1, sMapName_SafariZone}, + {22, 12, 1, 1, sMapName_BattleFrontier}, + { 0, 8, 1, 1, sMapName_PetalburgWoods}, + { 2, 5, 1, 1, sMapName_RusturfTunnel}, + { 6, 14, 1, 1, sMapName_AbandonedShip}, + { 8, 7, 1, 1, sMapName_NewMauville}, + { 0, 3, 1, 1, sMapName_MeteorFalls}, + { 1, 2, 1, 1, sMapName_MeteorFalls}, + {16, 4, 1, 1, sMapName_MtPyre}, + {19, 3, 1, 1, sMapName_AquaHideoutOld}, + {24, 4, 1, 1, sMapName_ShoalCave}, + {24, 9, 1, 1, sMapName_SeafloorCavern}, + {24, 9, 1, 1, sMapName_Underwater}, + {27, 9, 1, 1, sMapName_VictoryRoad}, + {17, 10, 1, 1, sMapName_MirageIsland}, + {21, 7, 1, 1, sMapName_CaveOfOrigin}, + {12, 14, 1, 1, sMapName_SouthernIsland}, + { 6, 3, 1, 1, sMapName_FieryPath}, + { 7, 3, 1, 1, sMapName_FieryPath}, + { 6, 3, 1, 1, sMapName_JaggedPass}, + { 7, 2, 1, 1, sMapName_JaggedPass}, + {11, 10, 1, 1, sMapName_SealedChamber}, + {11, 10, 1, 1, sMapName_Underwater}, + {13, 0, 1, 1, sMapName_ScorchedSlab}, + { 0, 10, 1, 1, sMapName_IslandCave}, + { 8, 3, 1, 1, sMapName_DesertRuins}, + {13, 2, 1, 1, sMapName_AncientTomb}, + { 0, 0, 1, 1, sMapName_InsideOfTruck}, + {19, 10, 1, 1, sMapName_SkyPillar}, + { 0, 0, 1, 1, sMapName_SecretBase}, + { 0, 0, 1, 1, sMapName_None}, + { 0, 0, 1, 1, sMapName_PalletTown}, + { 0, 0, 1, 1, sMapName_ViridianCity}, + { 0, 0, 1, 1, sMapName_PewterCity}, + { 0, 0, 1, 1, sMapName_CeruleanCity}, + { 0, 0, 1, 1, sMapName_LavenderTown}, + { 0, 0, 1, 1, sMapName_VermilionCity}, + { 0, 0, 1, 1, sMapName_CeladonCity}, + { 0, 0, 1, 1, sMapName_FuchsiaCity}, + { 0, 0, 1, 1, sMapName_CinnabarIsland}, + { 0, 0, 1, 1, sMapName_IndigoPlateau}, + { 0, 0, 1, 1, sMapName_SaffronCity}, + { 0, 0, 1, 1, sMapName_Route4}, + { 0, 0, 1, 1, sMapName_Route10}, + { 0, 0, 1, 1, sMapName_Route1}, + { 0, 0, 1, 1, sMapName_Route2}, + { 0, 0, 1, 1, sMapName_Route3}, + { 0, 0, 1, 1, sMapName_Route4_2}, + { 0, 0, 1, 1, sMapName_Route5}, + { 0, 0, 1, 1, sMapName_Route6}, + { 0, 0, 1, 1, sMapName_Route7}, + { 0, 0, 1, 1, sMapName_Route8}, + { 0, 0, 1, 1, sMapName_Route9}, + { 0, 0, 1, 1, sMapName_Route10_2}, + { 0, 0, 1, 1, sMapName_Route11}, + { 0, 0, 1, 1, sMapName_Route12}, + { 0, 0, 1, 1, sMapName_Route13}, + { 0, 0, 1, 1, sMapName_Route14}, + { 0, 0, 1, 1, sMapName_Route15}, + { 0, 0, 1, 1, sMapName_Route16}, + { 0, 0, 1, 1, sMapName_Route17}, + { 0, 0, 1, 1, sMapName_Route18}, + { 0, 0, 1, 1, sMapName_Route19}, + { 0, 0, 1, 1, sMapName_Route20}, + { 0, 0, 1, 1, sMapName_Route21}, + { 0, 0, 1, 1, sMapName_Route22}, + { 0, 0, 1, 1, sMapName_Route23}, + { 0, 0, 1, 1, sMapName_Route24}, + { 0, 0, 1, 1, sMapName_Route25}, + { 0, 0, 1, 1, sMapName_ViridianForest}, + { 0, 0, 1, 1, sMapName_MtMoon}, + { 0, 0, 1, 1, sMapName_SSAnne}, + { 0, 0, 1, 1, sMapName_UndergroundPath}, + { 0, 0, 1, 1, sMapName_UndergroundPath2}, + { 0, 0, 1, 1, sMapName_DiglettsCave}, + { 0, 0, 1, 1, sMapName_KantoVictoryRoad}, + { 0, 0, 1, 1, sMapName_RocketHideout}, + { 0, 0, 1, 1, sMapName_SilphCo}, + { 0, 0, 1, 1, sMapName_PokemonMansion}, + { 0, 0, 1, 1, sMapName_KantoSafariZone}, + { 0, 0, 1, 1, sMapName_PokemonLeague}, + { 0, 0, 1, 1, sMapName_RockTunnel}, + { 0, 0, 1, 1, sMapName_SeafoamIslands}, + { 0, 0, 1, 1, sMapName_PokemonTower}, + { 0, 0, 1, 1, sMapName_CeruleanCave}, + { 0, 0, 1, 1, sMapName_PowerPlant}, + { 0, 0, 1, 1, sMapName_OneIsland}, + { 0, 0, 1, 1, sMapName_TwoIsland}, + { 0, 0, 1, 1, sMapName_ThreeIsland}, + { 0, 0, 1, 1, sMapName_FourIsland}, + { 0, 0, 1, 1, sMapName_FiveIsland}, + { 0, 0, 1, 1, sMapName_SevenIsland}, + { 0, 0, 1, 1, sMapName_SixIsland}, + { 0, 0, 1, 1, sMapName_KindleRoad}, + { 0, 0, 1, 1, sMapName_TreasureBeach}, + { 0, 0, 1, 1, sMapName_CapeBrink}, + { 0, 0, 1, 1, sMapName_BondBridge}, + { 0, 0, 1, 1, sMapName_ThreeIslePort}, + { 0, 0, 1, 1, sMapName_SeviiIsle6}, + { 0, 0, 1, 1, sMapName_SeviiIsle7}, + { 0, 0, 1, 1, sMapName_SeviiIsle8}, + { 0, 0, 1, 1, sMapName_SeviiIsle9}, + { 0, 0, 1, 1, sMapName_ResortGorgeous}, + { 0, 0, 1, 1, sMapName_WaterLabyrinth}, + { 0, 0, 1, 1, sMapName_FiveIsleMeadow}, + { 0, 0, 1, 1, sMapName_MemorialPillar}, + { 0, 0, 1, 1, sMapName_OutcastIsland}, + { 0, 0, 1, 1, sMapName_GreenPath}, + { 0, 0, 1, 1, sMapName_WaterPath}, + { 0, 0, 1, 1, sMapName_RuinValley}, + { 0, 0, 1, 1, sMapName_TrainerTower}, + { 0, 0, 1, 1, sMapName_CanyonEntrance}, + { 0, 0, 1, 1, sMapName_SevaultCanyon}, + { 0, 0, 1, 1, sMapName_TanobyRuins}, + { 0, 0, 1, 1, sMapName_SeviiIsle22}, + { 0, 0, 1, 1, sMapName_SeviiIsle23}, + { 0, 0, 1, 1, sMapName_SeviiIsle24}, + { 0, 0, 1, 1, sMapName_NavelRock}, + { 0, 0, 1, 1, sMapName_MtEmber}, + { 0, 0, 1, 1, sMapName_BerryForest}, + { 0, 0, 1, 1, sMapName_IcefallCave}, + { 0, 0, 1, 1, sMapName_RocketWarehouse}, + { 0, 0, 1, 1, sMapName_TrainerTower2}, + { 0, 0, 1, 1, sMapName_DottedHole}, + { 0, 0, 1, 1, sMapName_LostCave}, + { 0, 0, 1, 1, sMapName_PatternBush}, + { 0, 0, 1, 1, sMapName_AlteringCave}, + { 0, 0, 1, 1, sMapName_TanobyChambers}, + { 0, 0, 1, 1, sMapName_ThreeIslePath}, + { 0, 0, 1, 1, sMapName_TanobyKey}, + { 0, 0, 1, 1, sMapName_BirthIsland}, + { 0, 0, 1, 1, sMapName_MoneanChamber}, + { 0, 0, 1, 1, sMapName_LiptooChamber}, + { 0, 0, 1, 1, sMapName_WeepthChamber}, + { 0, 0, 1, 1, sMapName_DilfordChamber}, + { 0, 0, 1, 1, sMapName_ScufibChamber}, + { 0, 0, 1, 1, sMapName_RixyChamber}, + { 0, 0, 1, 1, sMapName_ViapoisChamber}, + { 0, 0, 1, 1, sMapName_EmberSpa}, + { 0, 0, 1, 1, sMapName_SpecialArea}, + {19, 3, 1, 1, sMapName_AquaHideout}, + { 6, 3, 1, 1, sMapName_MagmaHideout}, + { 8, 2, 1, 1, sMapName_MirageTower}, + { 0, 0, 1, 1, sMapName_BirthIsland}, + { 0, 0, 1, 1, sMapName_FarawayIsland}, + {22, 12, 1, 1, sMapName_ArtisanCave}, + { 0, 0, 1, 1, sMapName_MarineCave}, + { 0, 0, 1, 1, sMapName_Underwater}, + { 0, 0, 1, 1, sMapName_TerraCave}, + { 0, 10, 1, 3, sMapName_Underwater}, + {24, 3, 2, 2, sMapName_Underwater}, + {24, 10, 2, 1, sMapName_Underwater}, + { 2, 0, 1, 1, sMapName_DesertUnderpass}, + { 6, 8, 1, 1, sMapName_AlteringCave}, + { 0, 0, 1, 1, sMapName_NavelRock}, + { 8, 4, 1, 1, sMapName_TrainerHill} }; #endif //GUARD_DATA_REGION_MAP_REGION_MAP_ENTRIES_H diff --git a/include/gba/types.h b/include/gba/types.h index e9a380023..9f63489aa 100644 --- a/include/gba/types.h +++ b/include/gba/types.h @@ -49,7 +49,7 @@ struct OamData u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode u32 size:2; - /*0x04*/ u16 tileNum:10; // 0x33F + /*0x04*/ u16 tileNum:10; // 0x3FF u16 priority:2; // 0x400, 0x800 -> 0xC00 u16 paletteNum:4; /*0x06*/ u16 affineParam; diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index ed5054b7d..abab1b5c4 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -39,7 +39,7 @@ enum MAP_BATTLE_SCENE_PHOEBE, // 5 MAP_BATTLE_SCENE_GLACIA, // 6 MAP_BATTLE_SCENE_DRAKE, // 7 - MAP_BATTLE_SCENE_BATTLE_TOWER, // 8 + MAP_BATTLE_SCENE_FRONTIER, // 8 }; typedef void (*TilesetCB)(void); diff --git a/include/graphics.h b/include/graphics.h index 5690eea14..0a38c9b82 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -160,4 +160,82 @@ extern const u8 gUnknown_08DDB020[]; extern const u8 gUnknown_08DDB2C4[]; extern const u16 gUnknown_08DDAFE0[]; +extern const u8 gBattleTextboxTiles[]; +extern const u8 gBattleTextboxTilemap[]; +extern const u8 gBattleTextboxPalette[]; +extern const u8 gUnknown_08D778F0[]; +extern const u8 gUnknown_08D77B0C[]; +extern const u8 gUnknown_08D77AE4[]; +extern const u8 gUnknown_08D779D8[]; +extern const u8 gUnknown_08D857A8[]; +extern const u8 gUnknown_08D85A1C[]; +extern const u8 gUnknown_08D85600[]; + +// battle terrains +extern const u8 gBattleTerrainTiles_TallGrass[]; +extern const u8 gBattleTerrainTilemap_TallGrass[]; +extern const u8 gBattleTerrainAnimTiles_TallGrass[]; +extern const u8 gBattleTerrainAnimTilemap_TallGrass[]; +extern const u8 gBattleTerrainPalette_TallGrass[]; +extern const u8 gBattleTerrainTiles_LongGrass[]; +extern const u8 gBattleTerrainTilemap_LongGrass[]; +extern const u8 gBattleTerrainAnimTiles_LongGrass[]; +extern const u8 gBattleTerrainAnimTilemap_LongGrass[]; +extern const u8 gBattleTerrainPalette_LongGrass[]; +extern const u8 gBattleTerrainTiles_Sand[]; +extern const u8 gBattleTerrainTilemap_Sand[]; +extern const u8 gBattleTerrainAnimTiles_Sand[]; +extern const u8 gBattleTerrainAnimTilemap_Sand[]; +extern const u8 gBattleTerrainPalette_Sand[]; +extern const u8 gBattleTerrainTiles_Underwater[]; +extern const u8 gBattleTerrainTilemap_Underwater[]; +extern const u8 gBattleTerrainAnimTiles_Underwater[]; +extern const u8 gBattleTerrainAnimTilemap_Underwater[]; +extern const u8 gBattleTerrainPalette_Underwater[]; +extern const u8 gBattleTerrainTiles_Water[]; +extern const u8 gBattleTerrainTilemap_Water[]; +extern const u8 gBattleTerrainAnimTiles_Water[]; +extern const u8 gBattleTerrainAnimTilemap_Water[]; +extern const u8 gBattleTerrainPalette_Water[]; +extern const u8 gBattleTerrainTiles_PondWater[]; +extern const u8 gBattleTerrainTilemap_PondWater[]; +extern const u8 gBattleTerrainAnimTiles_PondWater[]; +extern const u8 gBattleTerrainAnimTilemap_PondWater[]; +extern const u8 gBattleTerrainPalette_PondWater[]; +extern const u8 gBattleTerrainTiles_Rock[]; +extern const u8 gBattleTerrainTilemap_Rock[]; +extern const u8 gBattleTerrainAnimTiles_Rock[]; +extern const u8 gBattleTerrainAnimTilemap_Rock[]; +extern const u8 gBattleTerrainPalette_Rock[]; +extern const u8 gBattleTerrainTiles_Cave[]; +extern const u8 gBattleTerrainTilemap_Cave[]; +extern const u8 gBattleTerrainAnimTiles_Cave[]; +extern const u8 gBattleTerrainAnimTilemap_Cave[]; +extern const u8 gBattleTerrainPalette_Cave[]; +extern const u8 gBattleTerrainTiles_Building[]; +extern const u8 gBattleTerrainTilemap_Building[]; +extern const u8 gBattleTerrainAnimTiles_Building[]; +extern const u8 gBattleTerrainAnimTilemap_Building[]; +extern const u8 gBattleTerrainPalette_Building[]; +extern const u8 gBattleTerrainPalette_Plain[]; +extern const u8 gBattleTerrainPalette_Frontier[]; +extern const u8 gBattleTerrainTiles_Stadium[]; +extern const u8 gBattleTerrainTilemap_Stadium[]; +extern const u8 gBattleTerrainTiles_Rayquaza[]; +extern const u8 gBattleTerrainTilemap_Rayquaza[]; +extern const u8 gBattleTerrainAnimTiles_Rayquaza[]; +extern const u8 gBattleTerrainAnimTilemap_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Rayquaza[]; +extern const u8 gBattleTerrainPalette_Kyogre[]; +extern const u8 gBattleTerrainPalette_Groudon[]; +extern const u8 gBattleTerrainPalette_BuildingGym[]; +extern const u8 gBattleTerrainPalette_BuildingLeader[]; +extern const u8 gBattleTerrainPalette_StadiumAqua[]; +extern const u8 gBattleTerrainPalette_StadiumMagma[]; +extern const u8 gBattleTerrainPalette_StadiumSidney[]; +extern const u8 gBattleTerrainPalette_StadiumPhoebe[]; +extern const u8 gBattleTerrainPalette_StadiumGlacia[]; +extern const u8 gBattleTerrainPalette_StadiumDrake[]; +extern const u8 gBattleTerrainPalette_StadiumWallace[]; + #endif //GUARD_GRAPHICS_H diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index c52184972..dad819c51 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -14,5 +14,6 @@ void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); +void sub_81978B0(u16 arg0); #endif // GUARD_NEW_MENU_HELPERS_H diff --git a/include/strings.h b/include/strings.h index 757cc8cac..5521d828b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -107,6 +107,9 @@ extern const u8 gText_Cancel4[]; extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_PkmnFainted3[]; extern const u8 gText_Coins[]; +extern const u8 gText_Draw[]; +extern const u8 gText_Loss[]; +extern const u8 gText_Win[]; extern const u8 gText_Var1AteTheVar2[]; extern const u8 gText_Var1HappilyAteVar2[]; |