ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1184 from GriffinRichards/fix-typos

Browse Source 
Fix Rusboro and Lavarige typos
This commit is contained in:
GriffinR 2020-09-11 14:53:56 -04:00 committed by GitHub
commit 58a2b62bae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts/set_gym_trainers.inc
View File

@ -1,6 +1,6 @@
Common_EventScript_SetGymTrainers:: @ 8271F43 Common_EventScript_SetGymTrainers:: @ 8271F43
switch VAR_0x8008 switch VAR_0x8008
case 1, RusboroCity_Gym_SetGymTrainers case 1, RustboroCity_Gym_SetGymTrainers
case 2, DewfordTown_Gym_SetGymTrainers case 2, DewfordTown_Gym_SetGymTrainers
case 3, MauvilleCity_Gym_SetGymTrainers case 3, MauvilleCity_Gym_SetGymTrainers
case 4, LavaridgeTown_Gym_SetGymTrainers case 4, LavaridgeTown_Gym_SetGymTrainers
@ -10,7 +10,7 @@ Common_EventScript_SetGymTrainers:: @ 8271F43
case 8, SootopolisCity_Gym_SetGymTrainers case 8, SootopolisCity_Gym_SetGymTrainers
end end
RusboroCity_Gym_SetGymTrainers:: @ 8271FA1 RustboroCity_Gym_SetGymTrainers:: @ 8271FA1
settrainerflag TRAINER_JOSH settrainerflag TRAINER_JOSH
settrainerflag TRAINER_TOMMY settrainerflag TRAINER_TOMMY
settrainerflag TRAINER_MARC settrainerflag TRAINER_MARC

2
src/data/region_map/city_map_entries.h
View File

@ -18,7 +18,7 @@ static const struct CityMapEntry sPokenavCityMaps[NUM_CITY_MAPS] =
{ {
.mapSecId = MAPSEC_LAVARIDGE_TOWN, .mapSecId = MAPSEC_LAVARIDGE_TOWN,
.index = 0, .index = 0,
.tilemap = gPokenavCityMap_Lavarige_0, .tilemap = gPokenavCityMap_Lavaridge_0,
}, },
{ {
.mapSecId = MAPSEC_FALLARBOR_TOWN, .mapSecId = MAPSEC_FALLARBOR_TOWN,

2
src/data/region_map/city_map_tilemaps.h
View File

@ -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_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_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"); const u32 gPokenavCityMap_Slateport_0[] = INCBIN_U32("graphics/pokenav/city_maps/slateport_0.bin.lz");