ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix map constants

Browse Source
This commit is contained in:
Marcus Huderle 2018-06-20 17:42:01 -05:00
parent ed8b006e67
commit 5e00c0bfcf
28 changed files with 224 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@ -767,8 +767,8 @@ SecretBase_RedCave1_Text_23B759: @ 823B759
.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc" .include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc" .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc" .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
.include "data/maps/Route113_GlassWorkshop/scripts.inc" .include "data/maps/Route113_GlassWorkshop/scripts.inc"
.include "data/maps/Route123_BerryMastersHouse/scripts.inc" .include "data/maps/Route123_BerryMastersHouse/scripts.inc"
.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc" .include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"

4
data/map_events.s
View File

@ -518,8 +518,8 @@
.include "data/maps/Route110_TrickHousePuzzle6/events.inc" .include "data/maps/Route110_TrickHousePuzzle6/events.inc"
.include "data/maps/Route110_TrickHousePuzzle7/events.inc" .include "data/maps/Route110_TrickHousePuzzle7/events.inc"
.include "data/maps/Route110_TrickHousePuzzle8/events.inc" .include "data/maps/Route110_TrickHousePuzzle8/events.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc" .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc" .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc"
.include "data/maps/Route113_GlassWorkshop/events.inc" .include "data/maps/Route113_GlassWorkshop/events.inc"
.include "data/maps/Route123_BerryMastersHouse/events.inc" .include "data/maps/Route123_BerryMastersHouse/events.inc"
.include "data/maps/Route119_WeatherInstitute_1F/events.inc" .include "data/maps/Route119_WeatherInstitute_1F/events.inc"

2
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc
View File

@ -1,6 +1,6 @@
CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64
warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F
warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74
map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc
View File

@ -1,6 +1,6 @@
CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88
warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1
warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3
CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98
map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0

2
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc
View File

@ -1,5 +1,5 @@
CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC
warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2
warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F
CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC

2
data/maps/EverGrandeCity_ChampionsRoom/events.inc
View File

@ -4,7 +4,7 @@ EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921 object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921
EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748
warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4
warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758

4
data/maps/EverGrandeCity_DrakesRoom/events.inc
View File

@ -2,8 +2,8 @@ EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4
object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0
EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC
warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3
warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4
EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC
map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0

4
data/maps/EverGrandeCity_GlaciasRoom/events.inc
View File

@ -2,8 +2,8 @@ EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688
object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0
EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0
warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2
warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3
EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0
map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0

4
data/maps/EverGrandeCity_PhoebesRoom/events.inc
View File

@ -2,8 +2,8 @@ EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C
object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0
EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664
warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1
warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2
EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674
map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0

4
data/maps/EverGrandeCity_PokemonLeague_1F/events.inc
View File

@ -7,8 +7,8 @@ EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860
EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0
warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY
warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5
warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5
warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F
EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8

4
data/maps/EverGrandeCity_SidneysRoom/events.inc
View File

@ -2,8 +2,8 @@ EverGrandeCity_SidneysRoom_EventObjects: @ 8533610
object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0
EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628
warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5
warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1
EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638
map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0

8
data/maps/Route110/events.inc
View File

@ -39,10 +39,10 @@ Route110_EventObjects: @ 8528CF0
Route110_MapWarps: @ 8529050 Route110_MapWarps: @ 8529050
warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
Route110_MapCoordEvents: @ 8529080 Route110_MapCoordEvents: @ 8529080
coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661 coord_event 28, 92, 3, 0, VAR_0x40A9, 2, 0, Route110_EventScript_1EF661

16
data/maps/Route110_SeasideCyclingRoadEntrance1/events.inc
View File

@ -1,16 +0,0 @@
Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0
object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0
Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8
warp_def 1, 5, 0, 4, MAP_ROUTE110
warp_def 2, 5, 0, 4, MAP_ROUTE110
warp_def 12, 5, 0, 5, MAP_ROUTE110
warp_def 13, 5, 0, 5, MAP_ROUTE110
Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8
coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84
coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6
Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8
map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0

15
data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc
View File

@ -1,15 +0,0 @@
Route110_SeasideCyclingRoadEntrance1: @ 8485C80
.4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadEntrance1_MapEvents
.4byte Route110_SeasideCyclingRoadEntrance1_MapScripts
.4byte 0x0
.2byte MUS_FINECITY
.2byte 256
.byte 25
.byte 0
.byte 0
.byte 8
.2byte 0
.byte 1
.byte 0

50
data/maps/Route110_SeasideCyclingRoadEntrance1/scripts.inc
View File

@ -1,50 +0,0 @@
Route110_SeasideCyclingRoadEntrance1_MapScripts:: @ 826EA77
.byte 0
Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78:: @ 826EA78
lock
faceplayer
msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EAC1, 4
release
end
Route110_SeasideCyclingRoadEntrance1_EventScript_26EA84:: @ 826EA84
lockall
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 0
goto_eq Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F
setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1
releaseall
end
Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F
msgbox Route110_SeasideCyclingRoadEntrance1_Text_26EB48, 4
closemessage
applymovement 255, Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4
waitmovement 0
releaseall
end
Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4
walk_left
step_end
Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6
lockall
clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0
releaseall
end
Route110_SeasideCyclingRoadEntrance1_Text_26EAC1: @ 826EAC1
.string "On CYCLING ROAD, you can go all out\n"
.string "and cycle as fast as you’d like.\p"
.string "It feels great to go that fast, but try\n"
.string "not to crash into anyone!$"
Route110_SeasideCyclingRoadEntrance1_Text_26EB48: @ 826EB48
.string "Sorry, you can’t walk on CYCLING\n"
.string "ROAD. It’s too dangerous.\p"
.string "Please come back with a BIKE.$"

16
data/maps/Route110_SeasideCyclingRoadEntrance2/events.inc
View File

@ -1,16 +0,0 @@
Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C
object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0
Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24
warp_def 1, 5, 0, 2, MAP_ROUTE110
warp_def 2, 5, 0, 2, MAP_ROUTE110
warp_def 12, 5, 0, 3, MAP_ROUTE110
warp_def 13, 5, 0, 3, MAP_ROUTE110
Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44
coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0
coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13
Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64
map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0

15
data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc
View File

@ -1,15 +0,0 @@
Route110_SeasideCyclingRoadEntrance2: @ 8485C9C
.4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadEntrance2_MapEvents
.4byte Route110_SeasideCyclingRoadEntrance2_MapScripts
.4byte 0x0
.2byte MUS_FINECITY
.2byte 256
.byte 25
.byte 0
.byte 0
.byte 8
.2byte 0
.byte 1
.byte 0

69
data/maps/Route110_SeasideCyclingRoadEntrance2/scripts.inc
View File

@ -1,69 +0,0 @@
Route110_SeasideCyclingRoadEntrance2_MapScripts:: @ 826EBA1
map_script 3, Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7
.byte 0
Route110_SeasideCyclingRoadEntrance2_MapScript1_26EBA7: @ 826EBA7
compare VAR_0x40A9, 3
call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE
compare VAR_0x40A9, 2
call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE
end
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBBE:: @ 826EBBE
setvar VAR_0x40A9, 1
return
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4:: @ 826EBC4
lock
faceplayer
msgbox Route110_SeasideCyclingRoadEntrance2_Text_26EC23, 4
release
end
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBD0:: @ 826EBD0
lockall
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 2
call_if 1, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6
compare VAR_RESULT, 0
goto_eq Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC
setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1
releaseall
end
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBF6:: @ 826EBF6
setvar VAR_0x40A9, 1
return
Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC
msgbox Route110_SeasideCyclingRoadEntrance2_Text_26ECAA, 4
closemessage
applymovement 255, Route110_SeasideCyclingRoadEntrance2_Movement_26EC11
waitmovement 0
releaseall
end
Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11
walk_left
step_end
Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13
lockall
setvar VAR_0x40A9, 0
clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0
releaseall
end
Route110_SeasideCyclingRoadEntrance2_Text_26EC23: @ 826EC23
.string "On CYCLING ROAD, you can go all out\n"
.string "and cycle as fast as you’d like.\p"
.string "It feels great to go that fast, but try\n"
.string "not to crash into anyone!$"
Route110_SeasideCyclingRoadEntrance2_Text_26ECAA: @ 826ECAA
.string "Sorry, you can’t walk on CYCLING\n"
.string "ROAD. It’s too dangerous.\p"
.string "Please come back with a BIKE.$"

16
data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc Normal file
View File

@ -0,0 +1,16 @@
Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0
object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0
Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8
warp_def 1, 5, 0, 4, MAP_ROUTE110
warp_def 2, 5, 0, 4, MAP_ROUTE110
warp_def 12, 5, 0, 5, MAP_ROUTE110
warp_def 13, 5, 0, 5, MAP_ROUTE110
Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8
coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84
coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6
Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8
map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0

15
data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc Normal file
View File

@ -0,0 +1,15 @@
Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80
.4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
.4byte 0x0
.2byte MUS_FINECITY
.2byte 256
.byte 25
.byte 0
.byte 0
.byte 8
.2byte 0
.byte 1
.byte 0

50
data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc Normal file
View File

@ -0,0 +1,50 @@
Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77
.byte 0
Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78:: @ 826EA78
lock
faceplayer
msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1, 4
release
end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84:: @ 826EA84
lockall
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 0
goto_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F
setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1
releaseall
end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA9F:: @ 826EA9F
msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48, 4
closemessage
applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4
waitmovement 0
releaseall
end
Route110_SeasideCyclingRoadNorthEntrance_Movement_26EAB4: @ 826EAB4
walk_left
step_end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6:: @ 826EAB6
lockall
clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0
releaseall
end
Route110_SeasideCyclingRoadNorthEntrance_Text_26EAC1: @ 826EAC1
.string "On CYCLING ROAD, you can go all out\n"
.string "and cycle as fast as you’d like.\p"
.string "It feels great to go that fast, but try\n"
.string "not to crash into anyone!$"
Route110_SeasideCyclingRoadNorthEntrance_Text_26EB48: @ 826EB48
.string "Sorry, you can’t walk on CYCLING\n"
.string "ROAD. It’s too dangerous.\p"
.string "Please come back with a BIKE.$"

16
data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc Normal file
View File

@ -0,0 +1,16 @@
Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C
object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0
Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24
warp_def 1, 5, 0, 2, MAP_ROUTE110
warp_def 2, 5, 0, 2, MAP_ROUTE110
warp_def 12, 5, 0, 3, MAP_ROUTE110
warp_def 13, 5, 0, 3, MAP_ROUTE110
Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44
coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0
coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13
Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64
map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0

15
data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc Normal file
View File

@ -0,0 +1,15 @@
Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C
.4byte Route110_SeasideCyclingRoadEntrance_Layout
.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
.4byte 0x0
.2byte MUS_FINECITY
.2byte 256
.byte 25
.byte 0
.byte 0
.byte 8
.2byte 0
.byte 1
.byte 0

69
data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc Normal file
View File

@ -0,0 +1,69 @@
Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
map_script 3, Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7
.byte 0
Route110_SeasideCyclingRoadSouthEntrance_MapScript1_26EBA7: @ 826EBA7
compare VAR_0x40A9, 3
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
compare VAR_0x40A9, 2
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBBE:: @ 826EBBE
setvar VAR_0x40A9, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4:: @ 826EBC4
lock
faceplayer
msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23, 4
release
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0:: @ 826EBD0
lockall
specialvar VAR_RESULT, GetPlayerAvatarBike
compare VAR_RESULT, 2
call_if 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6
compare VAR_RESULT, 0
goto_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC
setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1
releaseall
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBF6:: @ 826EBF6
setvar VAR_0x40A9, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBFC:: @ 826EBFC
msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA, 4
closemessage
applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11
waitmovement 0
releaseall
end
Route110_SeasideCyclingRoadSouthEntrance_Movement_26EC11: @ 826EC11
walk_left
step_end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13:: @ 826EC13
lockall
setvar VAR_0x40A9, 0
clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0
releaseall
end
Route110_SeasideCyclingRoadSouthEntrance_Text_26EC23: @ 826EC23
.string "On CYCLING ROAD, you can go all out\n"
.string "and cycle as fast as you’d like.\p"
.string "It feels great to go that fast, but try\n"
.string "not to crash into anyone!$"
Route110_SeasideCyclingRoadSouthEntrance_Text_26ECAA: @ 826ECAA
.string "Sorry, you can’t walk on CYCLING\n"
.string "ROAD. It’s too dangerous.\p"
.string "Please come back with a BIKE.$"

4
data/maps/groups.inc
View File

@ -567,8 +567,8 @@ gMapGroup29: @ 848652C
.4byte Route110_TrickHousePuzzle6 .4byte Route110_TrickHousePuzzle6
.4byte Route110_TrickHousePuzzle7 .4byte Route110_TrickHousePuzzle7
.4byte Route110_TrickHousePuzzle8 .4byte Route110_TrickHousePuzzle8
.4byte Route110_SeasideCyclingRoadEntrance1 .4byte Route110_SeasideCyclingRoadNorthEntrance
.4byte Route110_SeasideCyclingRoadEntrance2 .4byte Route110_SeasideCyclingRoadSouthEntrance
gMapGroup30: @ 8486560 gMapGroup30: @ 8486560
.4byte Route113_GlassWorkshop .4byte Route113_GlassWorkshop

4
data/maps/headers.inc
View File

@ -508,8 +508,8 @@
.include "data/maps/Route110_TrickHousePuzzle6/header.inc" .include "data/maps/Route110_TrickHousePuzzle6/header.inc"
.include "data/maps/Route110_TrickHousePuzzle7/header.inc" .include "data/maps/Route110_TrickHousePuzzle7/header.inc"
.include "data/maps/Route110_TrickHousePuzzle8/header.inc" .include "data/maps/Route110_TrickHousePuzzle8/header.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance1/header.inc" .include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc"
.include "data/maps/Route110_SeasideCyclingRoadEntrance2/header.inc" .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc"
.include "data/maps/Route113_GlassWorkshop/header.inc" .include "data/maps/Route113_GlassWorkshop/header.inc"
.include "data/maps/Route123_BerryMastersHouse/header.inc" .include "data/maps/Route123_BerryMastersHouse/header.inc"
.include "data/maps/Route119_WeatherInstitute_1F/header.inc" .include "data/maps/Route119_WeatherInstitute_1F/header.inc"

20
include/constants/maps.h
View File

@ -250,11 +250,11 @@
#define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_GLACIAS_ROOM (2 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_DRAKES_ROOM (3 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM (4 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CORRIDOR1 (5 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL1 (5 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CORRIDOR2 (6 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL2 (6 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CORRIDOR3 (7 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL3 (7 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CORRIDOR4 (8 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL4 (8 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_CORRIDOR5 (9 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL5 (9 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F (10 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_HALL_OF_FAME (11 | (16 << 8))
#define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8)) #define MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F (12 | (16 << 8))
@ -327,9 +327,9 @@
#define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8)) #define MAP_SEAFLOOR_CAVERN_ROOM9 (36 | (24 << 8))
#define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_ENTRANCE (37 | (24 << 8))
#define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_1F (38 | (24 << 8))
#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B1F (39 | (24 << 8)) // #define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 (39 | (24 << 8)) //
#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B2F (40 | (24 << 8)) // Ruby/Sapphire leftovers #define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 (40 | (24 << 8)) // Ruby/Sapphire leftovers
#define MAP_CAVE_OF_ORIGIN_UNUSED_RS_B3F (41 | (24 << 8)) // #define MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 (41 | (24 << 8)) //
#define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8)) #define MAP_CAVE_OF_ORIGIN_B1F (42 | (24 << 8))
#define MAP_VICTORY_ROAD_1F (43 | (24 << 8)) #define MAP_VICTORY_ROAD_1F (43 | (24 << 8))
#define MAP_VICTORY_ROAD_B1F (44 | (24 << 8)) #define MAP_VICTORY_ROAD_B1F (44 | (24 << 8))
@ -570,8 +570,8 @@
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE6 (8 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 (9 | (29 << 8))
#define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8)) #define MAP_ROUTE110_TRICK_HOUSE_PUZZLE8 (10 | (29 << 8))
#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (11 | (29 << 8)) #define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (11 | (29 << 8))
#define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE (12 | (29 << 8)) #define MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE (12 | (29 << 8))
// Map Group 30 // Map Group 30
#define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8)) #define MAP_ROUTE113_GLASS_WORKSHOP (0 | (30 << 8))

12
src/wild_encounter.c
View File

@ -3821,24 +3821,24 @@ const struct WildPokemonHeader gWildMonHeaders[] =
.fishingMonsInfo = NULL, .fishingMonsInfo = NULL,
}, },
{ {
.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B1F), .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B1F), .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1),
.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo, .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap1_LandMonsInfo,
.waterMonsInfo = NULL, .waterMonsInfo = NULL,
.rockSmashMonsInfo = NULL, .rockSmashMonsInfo = NULL,
.fishingMonsInfo = NULL, .fishingMonsInfo = NULL,
}, },
{ {
.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B2F), .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B2F), .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2),
.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo, .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap2_LandMonsInfo,
.waterMonsInfo = NULL, .waterMonsInfo = NULL,
.rockSmashMonsInfo = NULL, .rockSmashMonsInfo = NULL,
.fishingMonsInfo = NULL, .fishingMonsInfo = NULL,
}, },
{ {
.mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RS_B3F), .mapGroup = MAP_GROUP(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
.mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RS_B3F), .mapNum = MAP_NUM(CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3),
.landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo, .landMonsInfo = &gCaveOfOrigin_UnusedRubySapphireMap3_LandMonsInfo,
.waterMonsInfo = NULL, .waterMonsInfo = NULL,
.rockSmashMonsInfo = NULL, .rockSmashMonsInfo = NULL,