dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix swapped cycling road entrances

Browse Source
This commit is contained in:
GriffinR
2024-08-31 01:54:25 -04:00
parent 4d74dd5e33
commit 04197b4912
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1 -1
View File
@@ -563,8 +563,8 @@ gStdScripts_End::
.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_SeasideCyclingRoadNorthEntrance/scripts.inc"
.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc" .include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/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"
data/maps/Route110/map.json
+4 -4
View File
@@ -518,28 +518,28 @@
"x": 15, "x": 15,
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
"dest_warp_id": "0" "dest_warp_id": "0"
}, },
{ {
"x": 18, "x": 18,
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE", "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE",
"dest_warp_id": "2" "dest_warp_id": "2"
}, },
{ {
"x": 16, "x": 16,
"y": 88, "y": 88,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
"dest_warp_id": "0" "dest_warp_id": "0"
}, },
{ {
"x": 19, "x": 19,
"y": 88, "y": 88,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE", "dest_map": "MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE",
"dest_warp_id": "2" "dest_warp_id": "2"
} }
], ],
data/maps/Route110_SeasideCyclingRoadNorthEntrance/map.json
+4 -4
View File
@@ -34,28 +34,28 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "4" "dest_warp_id": "2"
}, },
{ {
"x": 2, "x": 2,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "4" "dest_warp_id": "2"
}, },
{ {
"x": 12, "x": 12,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "5" "dest_warp_id": "3"
}, },
{ {
"x": 13, "x": 13,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "5" "dest_warp_id": "3"
} }
], ],
"coord_events": [ "coord_events": [
data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
+16
View File
@@ -1,6 +1,16 @@
Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: Route110_SeasideCyclingRoadNorthEntrance_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadNorthEntrance_OnTransition
.byte 0 .byte 0
Route110_SeasideCyclingRoadNorthEntrance_OnTransition:
call_if_eq VAR_CYCLING_CHALLENGE_STATE, 3, Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge
call_if_eq VAR_CYCLING_CHALLENGE_STATE, 2, Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge
end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_RestartChallenge::
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk:: Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk::
lock lock
faceplayer faceplayer
@@ -11,12 +21,17 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk::
Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck::
lockall lockall
specialvar VAR_RESULT, GetPlayerAvatarBike specialvar VAR_RESULT, GetPlayerAvatarBike
call_if_eq VAR_RESULT, 2, Route110_SeasideCyclingRoadNorthEntrance_EventScript_OnMachBike
goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike
setflag FLAG_SYS_CYCLING_ROAD setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
releaseall releaseall
end end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_OnMachBike::
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike::
msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
closemessage closemessage
@@ -31,6 +46,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter:
Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad:: Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad::
lockall lockall
setvar VAR_CYCLING_CHALLENGE_STATE, 0
clearflag FLAG_SYS_CYCLING_ROAD clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
releaseall releaseall
data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.json
+4 -4
View File
@@ -34,28 +34,28 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "2" "dest_warp_id": "4"
}, },
{ {
"x": 2, "x": 2,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "2" "dest_warp_id": "4"
}, },
{ {
"x": 12, "x": 12,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "3" "dest_warp_id": "5"
}, },
{ {
"x": 13, "x": 13,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE110", "dest_map": "MAP_ROUTE110",
"dest_warp_id": "3" "dest_warp_id": "5"
} }
], ],
"coord_events": [ "coord_events": [
data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
-16
View File
@@ -1,16 +1,6 @@
Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: Route110_SeasideCyclingRoadSouthEntrance_MapScripts::
map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_OnTransition
.byte 0 .byte 0
Route110_SeasideCyclingRoadSouthEntrance_OnTransition:
call_if_eq VAR_CYCLING_CHALLENGE_STATE, 3, Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
call_if_eq VAR_CYCLING_CHALLENGE_STATE, 2, Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge::
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk:: Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk::
lock lock
faceplayer faceplayer
@@ -21,17 +11,12 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk::
Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck::
lockall lockall
specialvar VAR_RESULT, GetPlayerAvatarBike specialvar VAR_RESULT, GetPlayerAvatarBike
call_if_eq VAR_RESULT, 2, Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike
goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike goto_if_eq VAR_RESULT, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike
setflag FLAG_SYS_CYCLING_ROAD setflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
releaseall releaseall
end end
Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike::
setvar VAR_CYCLING_CHALLENGE_STATE, 1
return
Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike::
msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
closemessage closemessage
@@ -46,7 +31,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter:
Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad::
lockall lockall
setvar VAR_CYCLING_CHALLENGE_STATE, 0
clearflag FLAG_SYS_CYCLING_ROAD clearflag FLAG_SYS_CYCLING_ROAD
setvar VAR_TEMP_1, 0 setvar VAR_TEMP_1, 0
releaseall releaseall
data/maps/map_groups.json
+2 -2
View File
@@ -604,8 +604,8 @@
"Route110_TrickHousePuzzle6", "Route110_TrickHousePuzzle6",
"Route110_TrickHousePuzzle7", "Route110_TrickHousePuzzle7",
"Route110_TrickHousePuzzle8", "Route110_TrickHousePuzzle8",
"Route110_SeasideCyclingRoadNorthEntrance", "Route110_SeasideCyclingRoadSouthEntrance",
"Route110_SeasideCyclingRoadSouthEntrance" "Route110_SeasideCyclingRoadNorthEntrance"
], ],
"gMapGroup_IndoorRoute113": [ "gMapGroup_IndoorRoute113": [
"Route113_GlassWorkshop" "Route113_GlassWorkshop"
src/field_specials.c
+1 -1
View File
@@ -263,7 +263,7 @@ u16 GetRecordedCyclingRoadResults(void)
void UpdateCyclingRoadState(void) void UpdateCyclingRoadState(void)
{ {
if (gLastUsedWarp.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE)) if (gLastUsedWarp.mapNum == MAP_NUM(ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE) && gLastUsedWarp.mapGroup == MAP_GROUP(ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE))
return; return;
if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3) if (VarGet(VAR_CYCLING_CHALLENGE_STATE) == 2 || VarGet(VAR_CYCLING_CHALLENGE_STATE) == 3)