summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-12-17 23:45:27 +0100
committerDizzyEggg <jajkodizzy@wp.pl>2017-12-17 23:45:27 +0100
commit314b96af46db86b74203f67f7bdf2d68ff4d4e68 (patch)
tree8986642f6ccff1680ecad18c9f156fb4f64c0239
parent6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff)
static names given s prefix
Diffstat
-rw-r--r--include/data/region_map/region_map_entries.h820
-rw-r--r--src/battle_controller_player.c2
-rw-r--r--src/battle_controller_player_partner.c2
-rw-r--r--src/battle_message.c6
-rw-r--r--src/berry_fix_program.c44
-rw-r--r--src/hall_of_fame.c30
-rw-r--r--src/lilycove_lady.c30
-rw-r--r--src/palette.c56
-rw-r--r--src/region_map.c20
-rwxr-xr-xsrc/save_failed_screen.c8
-rw-r--r--src/sprite.c10
-rw-r--r--src/unk_text_util_2.c14
-rw-r--r--src/wallclock.c20
13 files changed, 531 insertions, 531 deletions
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/src/battle_controller_player.c b/src/battle_controller_player.c
index e497dbfe2..08c666d11 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -234,7 +234,7 @@ static void (*const sPlayerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
static const u8 sTargetIdentities[] = {IDENTITY_PLAYER_MON1, IDENTITY_PLAYER_MON2, IDENTITY_OPPONENT_MON2, IDENTITY_OPPONENT_MON1};
// unknown unused data
-static const u8 gUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
+static const u8 sUnknown_0831C5FC[] = {0x48, 0x48, 0x20, 0x5a, 0x50, 0x50, 0x50, 0x58};
void nullsub_21(void)
{
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index eb57297da..dc4a213cc 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -198,7 +198,7 @@ static void (*const sPlayerPartnerBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
};
// unknown unused data
-static const u8 gUnknown_08617254[] =
+static const u8 sUnknown_08617254[] =
{
0x83, 0x4d, 0xf3, 0x5f, 0x6f, 0x4f, 0xeb, 0x3e,
0x67, 0x2e, 0x10, 0x46, 0x8c, 0x3d, 0x28, 0x35,
diff --git a/src/battle_message.c b/src/battle_message.c
index ec1cfd626..bd8b0fca5 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1367,7 +1367,7 @@ static const u16 sUnknownMoveTable[] =
static const u8 sDummyWeirdStatusString[] = {EOS, EOS, EOS, EOS, EOS, EOS, EOS, EOS, 0, 0};
-static const u8 gUnknown_085CD42C[] =
+static const u8 sUnknown_085CD42C[] =
{
0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1392,7 +1392,7 @@ static const u8 gUnknown_085CD42C[] =
0x6, 0x0, 0x0, 0x0, 0x1, 0xFF, 0x1, 0x0, 0x0, 0x0, 0x1, 0x0, 0x6, 0x0, 0x0
};
-static const u8 gUnknown_085CD54C[] =
+static const u8 sUnknown_085CD54C[] =
{
0xFF, 0x1, 0x0, 0x1, 0x0, 0x0, 0x1, 0x1, 0xF, 0x6, 0x0, 0x0, 0xFF, 0x1,
0x1, 0x1, 0x0, 0x0, 0x0, 0x1, 0xF, 0x6, 0x0, 0x0, 0xEE, 0x1, 0x0, 0x1, 0x0,
@@ -1419,7 +1419,7 @@ static const u8 gUnknown_085CD54C[] =
static const u8 * const gUnknown_085CD660[] =
{
- gUnknown_085CD42C, gUnknown_085CD54C
+ sUnknown_085CD42C, sUnknown_085CD54C
};
static const u8 sRecordedBattleTextSpeeds[] = {8, 4, 1, 0};
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index bba39c3eb..195490543 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -35,9 +35,9 @@ static void berry_fix_bg_hide(void);
// .rodata
-static const u8 gUnknown_08617E78[] = _("Berry Program Update");
-static const u8 gUnknown_08617E8D[] = _("Ruby/Sapphire");
-static const u8 gUnknown_08617E9B[] = _("Emerald");
+static const u8 sUnknown_08617E78[] = _("Berry Program Update");
+static const u8 sUnknown_08617E8D[] = _("Ruby/Sapphire");
+static const u8 sUnknown_08617E9B[] = _("Emerald");
static const u8 Unknown_08617EA3[] = _("The Berry Program on your POKéMON\nRuby/Sapphire Game Pak will be updated.\n{COLOR RED}{SHADOW LIGHT_RED}Press the A Button.");
static const u8 Unknown_08617F07[] = _("Please ensure the connection of your\nGame Boy Advance system matches this.\n{COLOR RED}{SHADOW LIGHT_RED}YES: Press the A Button.\nNO: Turn off the power and try again.");
@@ -62,15 +62,15 @@ static const struct WindowTemplate gUnknown_08618110[] = {
{-1}
};
-static const u16 gUnknown_08618138[] = {
+static const u16 sUnknown_08618138[] = {
0x7fff, 0x7fff, 0x318c, 0x675a,
0x043c, 0x3aff, 0x0664, 0x4bd2,
0x6546, 0x7b14, 0x7fff, 0x318c,
0x675a, 0x0000, 0x0000, 0x0000
};
-static const u8 gUnknown_08618158[] = {10, 11, 12};
-static const u8 gUnknown_0861815B[] = { 0, 10, 13};
+static const u8 sUnknown_08618158[] = {10, 11, 12};
+static const u8 sUnknown_0861815B[] = { 0, 10, 13};
static const u8 *const gUnknown_08618160[] = {
Unknown_08617F07,
@@ -243,21 +243,21 @@ static void berry_fix_gpu_set(void)
InitWindows(gUnknown_08618110);
DeactivateAllTextPrinters();
- DmaCopy32(3, gUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
+ DmaCopy32(3, sUnknown_08618138, BG_PLTT + 0x1E0, 0x20);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_1D_MAP);
FillWindowPixelBuffer(2, 0);
FillWindowPixelBuffer(3, 0);
FillWindowPixelBuffer(0, 0xAA);
// This block is a meme among memes
- width = (0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2;
- box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E9B);
- width = (s32)(0x78 - GetStringWidth(0, gUnknown_08617E9B, 0)) / 2 + 0x78;
- box_print(2, 0, width, 3, gUnknown_0861815B, -1, gUnknown_08617E8D);
- width = (0x70 - GetStringWidth(0, gUnknown_08617E8D, 0)) / 2;
- box_print(3, 0, width, 0, gUnknown_0861815B, -1, gUnknown_08617E8D);
- width = (0xd0 - GetStringWidth(1, gUnknown_08617E78, 0)) / 2;
- box_print(0, 1, width, 2, gUnknown_08618158, -1, gUnknown_08617E78);
+ width = (0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2;
+ box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E9B);
+ width = (s32)(0x78 - GetStringWidth(0, sUnknown_08617E9B, 0)) / 2 + 0x78;
+ box_print(2, 0, width, 3, sUnknown_0861815B, -1, sUnknown_08617E8D);
+ width = (0x70 - GetStringWidth(0, sUnknown_08617E8D, 0)) / 2;
+ box_print(3, 0, width, 0, sUnknown_0861815B, -1, sUnknown_08617E8D);
+ width = (0xd0 - GetStringWidth(1, sUnknown_08617E78, 0)) / 2;
+ box_print(0, 1, width, 2, sUnknown_08618158, -1, sUnknown_08617E78);
CopyWindowToVram(2, 2);
CopyWindowToVram(3, 2);
@@ -346,7 +346,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tldr r0, =gUnknown_08618110\n"
"\tbl InitWindows\n"
"\tbl DeactivateAllTextPrinters\n"
- "\tldr r0, =gUnknown_08618138\n"
+ "\tldr r0, =sUnknown_08618138\n"
"\tstr r0, [r4]\n"
"\tldr r0, =0x050001e0\n"
"\tstr r0, [r4, 0x4]\n"
@@ -365,7 +365,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tmovs r0, 0\n"
"\tmovs r1, 0xAA\n"
"\tbl FillWindowPixelBuffer\n"
- "\tldr r5, =gUnknown_08617E9B\n"
+ "\tldr r5, =sUnknown_08617E9B\n"
"\tmovs r0, 0\n"
"\tadds r1, r5, 0\n"
"\tmovs r2, 0\n"
@@ -378,7 +378,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tasrs r0, 1\n"
"\tlsls r2, r0, 24\n"
"\tlsrs r2, 24\n"
- "\tldr r6, =gUnknown_0861815B\n"
+ "\tldr r6, =sUnknown_0861815B\n"
"\tstr r6, [sp]\n"
"\tmovs r0, 0x1\n"
"\tnegs r0, r0\n"
@@ -389,7 +389,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tmovs r1, 0\n"
"\tmovs r3, 0x3\n"
"\tbl box_print\n"
- "\tldr r5, =gUnknown_08617E8D\n"
+ "\tldr r5, =sUnknown_08617E8D\n"
"\tmovs r0, 0\n"
"\tadds r1, r5, 0\n"
"\tmovs r2, 0\n"
@@ -431,7 +431,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tmovs r1, 0\n"
"\tmovs r3, 0\n"
"\tbl box_print\n"
- "\tldr r4, =gUnknown_08617E78\n"
+ "\tldr r4, =sUnknown_08617E78\n"
"\tmovs r0, 0x1\n"
"\tadds r1, r4, 0\n"
"\tmovs r2, 0\n"
@@ -444,7 +444,7 @@ __attribute__((naked)) static void berry_fix_gpu_set(void)
"\tasrs r0, 1\n"
"\tlsls r2, r0, 24\n"
"\tlsrs r2, 24\n"
- "\tldr r0, =gUnknown_08618158\n"
+ "\tldr r0, =sUnknown_08618158\n"
"\tstr r0, [sp]\n"
"\tmov r0, r8\n"
"\tstr r0, [sp, 0x4]\n"
@@ -496,7 +496,7 @@ static void berry_fix_text_print(int scene)
{
FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 32, 32);
FillWindowPixelBuffer(1, 0xAA);
- box_print(1, 1, 0, 0, gUnknown_08618158, -1, gUnknown_08618160[scene]);
+ box_print(1, 1, 0, 0, sUnknown_08618158, -1, gUnknown_08618160[scene]);
PutWindowTilemap(1);
CopyWindowToVram(1, 2);
switch (scene)
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 52babe346..239c5d690 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -187,9 +187,9 @@ static const struct BgTemplate sHof_BgTemplates[] =
static const struct WindowTemplate sHof_WindowTemplate = {0, 2, 2, 0xE, 6, 0xE, 1};
-static const u8 gUnknown_085E5388[] = {0, 1, 2, 0};
+static const u8 sUnknown_085E5388[] = {0, 1, 2, 0};
-static const u8 gUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
+static const u8 sUnknown_085E538C[] = {0, 2, 3, 0, 4, 5, 0, 0};
static const struct CompressedSpriteSheet sHallOfFame_ConfettiSpriteSheet =
{
@@ -1137,7 +1137,7 @@ static void HallOfFame_PrintWelcomeText(u8 unusedPossiblyWindowId, u8 unused2)
{
FillWindowPixelBuffer(0, 0);
PutWindowTilemap(0);
- box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, gUnknown_085E5388, 0, gText_WelcomeToHOF);
+ box_print(0, 1, GetStringCenterAlignXOffset(1, gText_WelcomeToHOF, 0xD0), 1, sUnknown_085E5388, 0, gText_WelcomeToHOF);
CopyWindowToVram(0, 3);
}
@@ -1173,7 +1173,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
*(stringPtr)++ = CHAR_QUESTION_MARK;
}
stringPtr[0] = EOS;
- box_print(0, 1, 0x10, 1, gUnknown_085E5388, -1, text);
+ box_print(0, 1, 0x10, 1, sUnknown_085E5388, -1, text);
}
// nick, species names, gender and level
@@ -1182,13 +1182,13 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
if (currMon->species == SPECIES_EGG)
{
width = GetStringCenterAlignXOffset(1, text, 0xD0);
- box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+ box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
CopyWindowToVram(0, 3);
}
else
{
width = GetStringRightAlignXOffset(1, text, 0x80);
- box_print(0, 1, width, 1, gUnknown_085E5388, -1, text);
+ box_print(0, 1, width, 1, sUnknown_085E5388, -1, text);
text[0] = CHAR_SLASH;
stringPtr = StringCopy(text + 1, gSpeciesNames[currMon->species]);
@@ -1209,15 +1209,15 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
}
stringPtr[0] = EOS;
- box_print(0, 1, 0x80, 1, gUnknown_085E5388, -1, text);
+ box_print(0, 1, 0x80, 1, sUnknown_085E5388, -1, text);
stringPtr = StringCopy(text, gText_Level);
ConvertIntToDecimalStringN(stringPtr, currMon->lvl, STR_CONV_MODE_LEFT_ALIGN, 3);
- box_print(0, 1, 0x24, 0x11, gUnknown_085E5388, -1, text);
+ box_print(0, 1, 0x24, 0x11, sUnknown_085E5388, -1, text);
stringPtr = StringCopy(text, gText_IDNumber);
ConvertIntToDecimalStringN(stringPtr, (u16)(currMon->tid), STR_CONV_MODE_LEADING_ZEROS, 5);
- box_print(0, 1, 0x68, 0x11, gUnknown_085E5388, -1, text);
+ box_print(0, 1, 0x68, 0x11, sUnknown_085E5388, -1, text);
CopyWindowToVram(0, 3);
}
@@ -1232,13 +1232,13 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
FillWindowPixelBuffer(1, 0x11);
PutWindowTilemap(1);
SetWindowBorderStyle(1, FALSE, 0x21D, 0xD);
- box_print(1, 1, 0, 1, gUnknown_085E538C, -1, gText_Name);
+ box_print(1, 1, 0, 1, sUnknown_085E538C, -1, gText_Name);
width = GetStringRightAlignXOffset(1, gSaveBlock2Ptr->playerName, 0x70);
- box_print(1, 1, width, 1, gUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
+ box_print(1, 1, width, 1, sUnknown_085E538C, -1, gSaveBlock2Ptr->playerName);
trainerId = (gSaveBlock2Ptr->playerTrainerId[0]) | (gSaveBlock2Ptr->playerTrainerId[1] << 8);
- box_print(1, 1, 0, 0x11, gUnknown_085E538C, 0, gText_IDNumber);
+ box_print(1, 1, 0, 0x11, sUnknown_085E538C, 0, gText_IDNumber);
text[0] = (trainerId % 100000) / 10000 + CHAR_0;
text[1] = (trainerId % 10000) / 1000 + CHAR_0;
text[2] = (trainerId % 1000) / 100 + CHAR_0;
@@ -1246,9 +1246,9 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
text[4] = (trainerId % 10) / 1 + CHAR_0;
text[5] = EOS;
width = GetStringRightAlignXOffset(1, text, 0x70);
- box_print(1, 1, width, 0x11, gUnknown_085E538C, -1, text);
+ box_print(1, 1, width, 0x11, sUnknown_085E538C, -1, text);
- box_print(1, 1, 0, 0x21, gUnknown_085E538C, -1, gText_MainMenuTime);
+ box_print(1, 1, 0, 0x21, sUnknown_085E538C, -1, gText_MainMenuTime);
text[0] = (gSaveBlock2Ptr->playTimeHours / 100) + CHAR_0;
text[1] = (gSaveBlock2Ptr->playTimeHours % 100) / 10 + CHAR_0;
text[2] = (gSaveBlock2Ptr->playTimeHours % 10) + CHAR_0;
@@ -1264,7 +1264,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
text[6] = EOS;
width = GetStringRightAlignXOffset(1, text, 0x70);
- box_print(1, 1, width, 0x21, gUnknown_085E538C, -1, text);
+ box_print(1, 1, width, 0x21, sUnknown_085E538C, -1, text);
CopyWindowToVram(1, 3);
}
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 95270974a..18fbdd64c 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -29,10 +29,10 @@ static u8 sub_818E258(const u8 *);
extern const u8 gText_Lady2[];
-static const u16 gUnknown_0860B074[] = {
+static const u16 sUnknown_0860B074[] = {
0x62, 0xcb, 0xdc, 0xcc, 0xd1
};
-static const u16 gUnknown_0860B07E[] = {
+static const u16 sUnknown_0860B07E[] = {
0x1a, 0x14, 0x0a
};
@@ -119,11 +119,11 @@ static const u16 *const gUnknown_0860B1A4[] = {
Unknown_0860B192
};
-static const u16 gUnknown_0860B1E4[] = {
+static const u16 sUnknown_0860B1E4[] = {
0x0210, 0x0400, 0x0212, 0x1a26, 0x0208, 0x045d, 0x040a, 0x0411, 0x0464, 0x020e, 0x1a25, 0x181b, 0x1a24, 0x0420, 0x0410, 0x0400
};
-static const u16 gUnknown_0860B204[] = {
+static const u16 sUnknown_0860B204[] = {
0x007b, 0x007f, 0x0081, 0x0023, 0x0023, 0x0023, 0x00a5, 0x00a7, 0x00a6, 0x000b, 0x012f, 0x006b, 0x006d, 0x0044, 0x0044, 0x000c
};
@@ -176,7 +176,7 @@ static const u16 *const gUnknown_0860B2EC[] = {
Unknown_0860B2D6
};
-static const u16 gUnknown_0860B304[] = {
+static const u16 sUnknown_0860B304[] = {
0x0b, 0x6e, 0x40, 0x6f, 0x44, 0x47
};
@@ -218,7 +218,7 @@ static const u8 *const gUnknown_0860B338[] = {
gUnknown_085EADE7
};
-static const u16 gUnknown_0860B34C[] = {
+static const u16 sUnknown_0860B34C[] = {
0x0120, 0x013b, 0x011e, 0x013d, 0x0019
};
@@ -237,11 +237,11 @@ void sub_818D9C0(void)
{
LilycoveLady *lilycoveLady;
- VarSet(VAR_0x4010, gUnknown_0860B07E[GetLilycoveLadyId()]);
+ VarSet(VAR_0x4010, sUnknown_0860B07E[GetLilycoveLadyId()]);
if (GetLilycoveLadyId() == LILYCOVE_LADY_CONTEST)
{
lilycoveLady = &gSaveBlock1Ptr->lilycoveLady;
- VarSet(VAR_0x4011, gUnknown_0860B074[lilycoveLady->contest.category]);
+ VarSet(VAR_0x4011, sUnknown_0860B074[lilycoveLady->contest.category]);
gSpecialVar_Result = TRUE;
}
else
@@ -481,7 +481,7 @@ u16 sub_818DEA0(void)
u16 itemId;
gUnknown_0203CD64 = &gSaveBlock1Ptr->lilycoveLady.favour;
- itemId = gUnknown_0860B304[gUnknown_0203CD64->unk_00c];
+ itemId = sUnknown_0860B304[gUnknown_0203CD64->unk_00c];
sub_818DE88(itemId);
gUnknown_0203CD64->phase = 2;
return itemId;
@@ -508,8 +508,8 @@ static void sub_818DF00(void)
{
gUnknown_0203CD68->unk_002[i] = gUnknown_0860B1A4[v0][i];
}
- gUnknown_0203CD68->unk_014 = gUnknown_0860B1E4[v0];
- gUnknown_0203CD68->itemId = gUnknown_0860B204[v0];
+ gUnknown_0203CD68->unk_014 = sUnknown_0860B1E4[v0];
+ gUnknown_0203CD68->itemId = sUnknown_0860B204[v0];
gUnknown_0203CD68->unk_02b = v0;
gUnknown_0203CD68->playerName[0] = EOS;
}
@@ -581,13 +581,13 @@ u8 sub_818E06C(void)
{
i = 0;
}
- } while (sub_811F8D8(gUnknown_0860B1E4[i]) == 0);
+ } while (sub_811F8D8(sUnknown_0860B1E4[i]) == 0);
for (j = 0; j < 9; j ++)
{
quiz->unk_002[j] = gUnknown_0860B1A4[i][j];
}
- quiz->unk_014 = gUnknown_0860B1E4[i];
- quiz->itemId = gUnknown_0860B204[i];
+ quiz->unk_014 = sUnknown_0860B1E4[i];
+ quiz->itemId = sUnknown_0860B204[i];
quiz->unk_02b = i;
quiz->playerName[0] = EOS;
}
@@ -1091,7 +1091,7 @@ void sub_818E940(void)
void sub_818E960(void)
{
gUnknown_0203CD6C = &gSaveBlock1Ptr->lilycoveLady.contest;
- gSpecialVar_0x8005 = gUnknown_0860B34C[gUnknown_0203CD6C->category];
+ gSpecialVar_0x8005 = sUnknown_0860B34C[gUnknown_0203CD6C->category];
}
u8 sub_818E990(void)
diff --git a/src/palette.c b/src/palette.c
index d4bb593da..6d8abbde6 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -65,7 +65,7 @@ static const struct PaletteStructTemplate gDummyPaletteStructTemplate = {
.uid = 0xFFFF,
.pst_field_B_5 = 1
};
-static const u8 gUnknown_0852489C[] = {
+static const u8 sUnknown_0852489C[] = {
0, 0, 0, 0, 0,
5, 5, 5, 5, 5,
11, 11, 11, 11, 11,
@@ -849,13 +849,13 @@ void TintPalette_GrayScale(u16 *palette, u16 count)
r = *palette & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
-
+
r *= 0x4C;
r += g * 0x97;
r += b * 0x1D;
-
+
gray = r >> 8;
-
+
*palette++ = gray << 10 | gray << 5 | gray;
}
return;
@@ -874,18 +874,18 @@ void TintPalette_GrayScale2(u16 *palette, u16 count)
r = *palette & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
-
+
r *= 0x4C;
r += g * 0x97;
r += b * 0x1D;
-
+
gray = r >> 8;
-
+
if ((u32)gray > 0x1F)
gray = 0x1F;
-
- gray = gUnknown_0852489C[gray];
-
+
+ gray = sUnknown_0852489C[gray];
+
*palette++ = gray << 10 | gray << 5 | gray;
}
return;
@@ -902,31 +902,31 @@ void TintPalette_SepiaTone(u16 *palette, u16 count)
s8 r2;
s8 g2;
s8 b2;
-
+
int i;
for (i = 0; i < count; i++)
{
r = *palette & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
-
+
r *= 0x4C;
r += g * 0x97;
r += b * 0x1D;
-
+
gray = (s32)(r >> 8);
-
+
sepia = (gray * 0x133);
-
+
r2 = (u16)sepia >> 8;
-
+
g2 = gray;
-
+
b2 = (gray * 15);
-
+
if (r2 > 0x1F)
r2 = 0x1F;
-
+
*palette++ = b2 << 10 | g2 << 5 | r2;
}
return;
@@ -1011,28 +1011,28 @@ void sub_80A2BAC(u16 *palette, u16 count, u16 a3, u16 a4, u16 a5)
r = *palette & 0x1F;
g = (*palette >> 5) & 0x1F;
b = (*palette >> 10) & 0x1F;
-
+
r *= 0x4C;
r += g * 0x97;
r += b * 0x1D;
-
+
gray = r >> 8;
-
+
r2 = (u16)(gray * a3) >> 8;
-
+
g2 = (u16)(gray * a4) >> 8;
-
+
b2 = (u16)(gray * a5) >> 8;
-
+
if (r2 > 0x1F)
r2 = 0x1F;
-
+
if (g2 > 0x1F)
g2 = 0x1F;
-
+
if (b2 > 0x1F)
b2 = 0x1F;
-
+
*palette++ = b2 << 10 | g2 << 5 | r2;
}
return;
diff --git a/src/region_map.c b/src/region_map.c
index b7fc625ca..f28f07d52 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -239,9 +239,9 @@ static const u8 sRegionMapFrameTilemapLZ[] = INCBIN_U8("graphics/pokenav/map_fra
static const u16 Unknown_085A1D48[] = INCBIN_U16("graphics/pokenav/fly_target_icons.gbapal");
-static const u8 gUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
+static const u8 sUnknown_085A1D68[] = INCBIN_U8("graphics/pokenav/fly_target_icons.4bpp.lz");
-static const u8 gUnknown_085A1E3C[][3] = {
+static const u8 sUnknown_085A1E3C[][3] = {
{MAP_GROUP(LITTLEROOT_TOWN), MAP_NUM(LITTLEROOT_TOWN), 1},
{MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), 14},
{MAP_GROUP(DEWFORD_TOWN), MAP_NUM(DEWFORD_TOWN), 15},
@@ -326,7 +326,7 @@ static const struct SpritePalette gUnknown_085A1F10 = {
Unknown_085A1D48, 2
};
-static const u16 gUnknown_085A1F18[][2] = {
+static const u16 sUnknown_085A1F18[][2] = {
{FLAG_UNLOCK_BATTLE_FRONTIER, MAPSEC_BATTLE_FRONTIER},
{-1, MAPSEC_NONE}
};
@@ -1738,7 +1738,7 @@ static void sub_8124A70(void)
{
struct SpriteSheet sheet;
- LZ77UnCompWram(gUnknown_085A1D68, gUnknown_0203A148->unk_88c);
+ LZ77UnCompWram(sUnknown_085A1D68, gUnknown_0203A148->unk_88c);
sheet.data = gUnknown_0203A148->unk_88c;
sheet.size = 0x1c0;
sheet.tag = 2;
@@ -1806,11 +1806,11 @@ static void sub_8124BE4(void)
u16 mapSecId;
u8 spriteId;
- for (i = 0; gUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
+ for (i = 0; sUnknown_085A1F18[i][1] != MAPSEC_NONE; i++)
{
- if (FlagGet(gUnknown_085A1F18[i][0]))
+ if (FlagGet(sUnknown_085A1F18[i][0]))
{
- mapSecId = gUnknown_085A1F18[i][1];
+ mapSecId = sUnknown_085A1F18[i][1];
sub_8124630(mapSecId, &x, &y, &width, &height);
x = (x + MAPCURSOR_X_MIN) * 8;
y = (y + MAPCURSOR_Y_MIN) * 8;
@@ -1919,13 +1919,13 @@ static void sub_8124E0C(void)
sub_8084CCC(FlagGet(FLAG_SYS_POKEMON_LEAGUE_FLY) && gUnknown_0203A148->regionMap.posWithinMapSec == 0 ? 0x14 : 0x0B);
break;
default:
- if (gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
+ if (sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2] != 0)
{
- sub_8084CCC(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
+ sub_8084CCC(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][2]);
}
else
{
- warp1_set_2(gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], gUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
+ warp1_set_2(sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][0], sUnknown_085A1E3C[gUnknown_0203A148->regionMap.mapSecId][1], -1);
}
break;
}
diff --git a/src/save_failed_screen.c b/src/save_failed_screen.c
index ef01f0293..218ef68d7 100755
--- a/src/save_failed_screen.c
+++ b/src/save_failed_screen.c
@@ -154,8 +154,8 @@ static const u8 sClockFrames[8][3] =
{ 5, 1, 0 },
};
-static const u8 gSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
-static const u8 gSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
+static const u8 sSaveFailedClockPal[] = INCBIN_U8("graphics/misc/clock_small.gbapal");
+static const u8 sSaveFailedClockGfx[] = INCBIN_U8("graphics/misc/clock_small.4bpp.lz");
static void CB2_SaveFailedScreen(void);
static void CB2_WipeSave(void);
@@ -221,7 +221,7 @@ static void CB2_SaveFailedScreen(void)
LZ77UnCompVram(gBirchHelpGfx, (void *)VRAM);
LZ77UnCompVram(gBirchBagTilemap, (void *)(VRAM + 0x7000));
LZ77UnCompVram(gBirchGrassTilemap, (void *)(VRAM + 0x7800));
- LZ77UnCompVram(gSaveFailedClockGfx, (void *)(VRAM + 0x10020));
+ LZ77UnCompVram(sSaveFailedClockGfx, (void *)(VRAM + 0x10020));
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gUnknown_085EFD88, 3);
SetBgTilemapBuffer(0, (void *)&gDecompressionBuffer[0x2000]);
@@ -238,7 +238,7 @@ static void CB2_SaveFailedScreen(void)
ResetTasks();
ResetPaletteFade();
LoadPalette(gBirchBagGrassPal, 0, 0x40);
- LoadPalette(gSaveFailedClockPal, 0x100, 0x20);
+ LoadPalette(sSaveFailedClockPal, 0x100, 0x20);
LoadPalette(gUnknown_0850FEFC, 0xE0, 0x20);
LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
SetWindowBorderStyle(gSaveFailedWindowIds[TEXT_WIN_ID], FALSE, 0x214, 0xE);
diff --git a/src/sprite.c b/src/sprite.c
index 9db61d2e9..6d76b9854 100644
--- a/src/sprite.c
+++ b/src/sprite.c
@@ -240,7 +240,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
AffineAnimCmd_frame,
};
-static const s32 gUnknown_082EC6F4[24] =
+static const s32 sUnknown_082EC6F4[24] =
{
8, 8, 0x10, 0x10, 0x20, 0x20,
0x40, 0x40, 0x10, 8, 0x20, 8,
@@ -1214,14 +1214,14 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
u8 matrixNum = sprite->oam.matrixNum;
if (a1 != 0x800)
{
- var0 = gUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
+ var0 = sUnknown_082EC6F4[sprite->oam.size * 8 + sprite->oam.shape * 32];
var1 = var0 << 8;
var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
sprite->pos2.x = sub_8007E28(var1, var2, a1);
}
if (a2 != 0x800)
{
- var0 = gUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
+ var0 = sUnknown_082EC6F4[4 + (sprite->oam.size * 8 + sprite->oam.shape * 32)];
var1 = var0 << 8;
var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
sprite->pos2.y = sub_8007E28(var1, var2, a2);
@@ -1247,7 +1247,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
mov r9, r0\n\
cmp r6, r9\n\
beq _08007EA2\n\
- ldr r2, =gUnknown_082EC6F4\n\
+ ldr r2, =sUnknown_082EC6F4\n\
lsrs r1, 6\n\
lsls r1, 3\n\
ldrb r0, [r5, 0x1]\n\
@@ -1272,7 +1272,7 @@ void obj_update_pos2(struct Sprite* sprite, s32 a1, s32 a2)
_08007EA2:\n\
cmp r8, r9\n\
beq _08007EDA\n\
- ldr r2, =gUnknown_082EC6F4\n\
+ ldr r2, =sUnknown_082EC6F4\n\
ldrb r1, [r5, 0x3]\n\
lsrs r1, 6\n\
lsls r1, 3\n\
diff --git a/src/unk_text_util_2.c b/src/unk_text_util_2.c
index d88af611f..8eaab32b6 100644
--- a/src/unk_text_util_2.c
+++ b/src/unk_text_util_2.c
@@ -4,8 +4,8 @@
#include "text.h"
#include "sound.h"
-static const u8 gUnknown_08616124[] = {1, 2, 4};
-static const u16 gFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
+static const u8 sUnknown_08616124[] = {1, 2, 4};
+static const u16 sFont6BrailleGlyphs[] = INCBIN_U16("data/graphics/fonts/font6.fwjpnfont");
static void DecompressGlyphFont6(u16);
@@ -13,7 +13,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
{
u16 char_;
struct TextPrinterSubStruct *sub;
-
+
sub = &textPrinter->sub_union.sub;
switch (textPrinter->state)
{
@@ -163,15 +163,15 @@ u16 Font6Func(struct TextPrinter *textPrinter)
case 4:
if (textPrinter->scrollDistance)
{
- if (textPrinter->scrollDistance < gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
+ if (textPrinter->scrollDistance < sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed])
{
ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
textPrinter->scrollDistance = 0;
}
else
{
- ScrollWindow(textPrinter->subPrinter.windowId, 0, gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
- textPrinter->scrollDistance -= gUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
+ ScrollWindow(textPrinter->subPrinter.windowId, 0, sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed], textPrinter->subPrinter.bgColor | (textPrinter->subPrinter.bgColor << 4));
+ textPrinter->scrollDistance -= sUnknown_08616124[gSaveBlock2Ptr->optionsTextSpeed];
}
CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
}
@@ -204,7 +204,7 @@ static void DecompressGlyphFont6(u16 glyph)
{
const u16 *glyphs;
- glyphs = gFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
+ glyphs = sFont6BrailleGlyphs + 0x100 * (glyph / 8) + 0x10 * (glyph % 8);
DecompressGlyphTile(glyphs, (u16 *)gUnknown_03002F90);
DecompressGlyphTile(glyphs + 0x8, (u16 *)(gUnknown_03002F90 + 0x20));
DecompressGlyphTile(glyphs + 0x80, (u16 *)(gUnknown_03002F90 + 0x40));
diff --git a/src/wallclock.c b/src/wallclock.c
index 892ef3f05..cd85de230 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -57,8 +57,8 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite);
// rodata
-static const u8 gUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
-static const u16 gUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
+static const u8 sUnknown_085B1F58[] = INCBIN_U8("graphics/wallclock/graphics_85b1f58.4bpp.lz");
+static const u16 sUnknown_085B21D4[] = INCBIN_U16("graphics/wallclock/palette_85b21d4.gbapal");
static const struct WindowTemplate gUnknown_085B21DC[] = {
{ 0x00, 0x03, 0x11, 0x18, 0x02, 0x0e, 0x200 },
{ 0x02, 0x18, 0x10, 0x06, 0x02, 0x0c, 0x230 },
@@ -88,7 +88,7 @@ static const struct BgTemplate gUnknown_085B21FC[] = {
}
};
static const struct CompressedSpriteSheet gUnknown_085B2208 = {
- gUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
+ sUnknown_085B1F58, 0x2000, TAG_GFX_WALL_CLOCK_HAND
};
static const u32 filler_85B2210[2] = {};
static const struct SpritePalette gUnknown_085B2218[] = {
@@ -571,7 +571,7 @@ static void LoadWallClockGraphics(void)
LoadPalette(gUnknown_08DCC03C, 0x00, 0x20);
}
LoadPalette(GetOverworldTextboxPalettePtr(), 0xe0, 0x20);
- LoadPalette(gUnknown_085B21D4, 0xc0, 0x08);
+ LoadPalette(sUnknown_085B21D4, 0xc0, 0x08);
ResetBgsAndClearDma3BusyFlags(0);
InitBgsFromTemplates(0, gUnknown_085B21FC, 3);
InitWindows(gUnknown_085B21DC);
@@ -666,27 +666,27 @@ void Cb2_ViewWallClock(void)
angle1 = 90;
angle2 = 135;
}
-
+
spriteId = CreateSprite(&gUnknown_085B2250, 0x78, 0x50, 1);
gSprites[spriteId].data[0] = taskId;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 0;
-
+
spriteId = CreateSprite(&gUnknown_085B2268, 0x78, 0x50, 0);
gSprites[spriteId].data[0] = taskId;
gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
gSprites[spriteId].oam.matrixNum = 1;
-
+
spriteId = CreateSprite(&gUnknown_085B22A0, 0x78, 0x50, 2);
gSprites[spriteId].data[0] = taskId;
gSprites[spriteId].data[1] = angle1;
-
+
spriteId = CreateSprite(&gUnknown_085B22B8, 0x78, 0x50, 2);
gSprites[spriteId].data[0] = taskId;
gSprites[spriteId].data[1] = angle2;
-
+
WallClockInit();
-
+
PrintTextOnWindow(1, 1, gText_Cancel4, 0, 1, 0, NULL);
PutWindowTilemap(1);
schedule_bg_copy_tilemap_to_vram(2);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-03 19:49:14 +0000