summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-09-11 14:47:47 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-09-11 14:47:47 -0400
commit921f389e4e036768faada597bd07e44290a1eb43 (patch)
tree794b92faa769ec307ac5e46fe4d9e6c9b2572a47
parentc0987169ddc1a8cea52f4d07dfc7673c7684ec1a (diff)
Fix Rusboro and Lavarige typos
-rw-r--r--data/scripts/set_gym_trainers.inc4
-rw-r--r--src/data/region_map/city_map_entries.h2
-rw-r--r--src/data/region_map/city_map_tilemaps.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc
index 1f5535805..c263e42d4 100644
--- a/data/scripts/set_gym_trainers.inc
+++ b/data/scripts/set_gym_trainers.inc
@@ -1,6 +1,6 @@
Common_EventScript_SetGymTrainers:: @ 8271F43
switch VAR_0x8008
- case 1, RusboroCity_Gym_SetGymTrainers
+ case 1, RustboroCity_Gym_SetGymTrainers
case 2, DewfordTown_Gym_SetGymTrainers
case 3, MauvilleCity_Gym_SetGymTrainers
case 4, LavaridgeTown_Gym_SetGymTrainers
@@ -10,7 +10,7 @@ Common_EventScript_SetGymTrainers:: @ 8271F43
case 8, SootopolisCity_Gym_SetGymTrainers
end
-RusboroCity_Gym_SetGymTrainers:: @ 8271FA1
+RustboroCity_Gym_SetGymTrainers:: @ 8271FA1
settrainerflag TRAINER_JOSH
settrainerflag TRAINER_TOMMY
settrainerflag TRAINER_MARC
diff --git a/src/data/region_map/city_map_entries.h b/src/data/region_map/city_map_entries.h
index 09689da5b..d5478c7b4 100644
--- a/src/data/region_map/city_map_entries.h
+++ b/src/data/region_map/city_map_entries.h
@@ -18,7 +18,7 @@ static const struct CityMapEntry sPokenavCityMaps[NUM_CITY_MAPS] =
{
.mapSecId = MAPSEC_LAVARIDGE_TOWN,
.index = 0,
- .tilemap = gPokenavCityMap_Lavarige_0,
+ .tilemap = gPokenavCityMap_Lavaridge_0,
},
{
.mapSecId = MAPSEC_FALLARBOR_TOWN,
diff --git a/src/data/region_map/city_map_tilemaps.h b/src/data/region_map/city_map_tilemaps.h
index 8a8a931f9..fed158935 100644
--- a/src/data/region_map/city_map_tilemaps.h
+++ b/src/data/region_map/city_map_tilemaps.h
@@ -1,4 +1,4 @@
-const u32 gPokenavCityMap_Lavarige_0[] = INCBIN_U32("graphics/pokenav/city_maps/lavaridge_0.bin.lz");
+const u32 gPokenavCityMap_Lavaridge_0[] = INCBIN_U32("graphics/pokenav/city_maps/lavaridge_0.bin.lz");
const u32 gPokenavCityMap_Fallarbor_0[] = INCBIN_U32("graphics/pokenav/city_maps/fallarbor_0.bin.lz");
const u32 gPokenavCityMap_Fortree_0[] = INCBIN_U32("graphics/pokenav/city_maps/fortree_0.bin.lz");
const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_0.bin.lz");