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

rename town/city vars

Browse Source
This commit is contained in:
GriffinR
2019-08-05 11:23:45 -04:00
committed by GitHub
parent 0f5d96e5f5
commit c2bf668fdd
43 changed files with 210 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/RustboroCity/map.json
+22 -22
View File
@@ -331,7 +331,7 @@
"x": 23,
"y": 20,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1",
"script": "RustboroCity_EventScript_1E095A"
},
@@ -340,7 +340,7 @@
"x": 23,
"y": 21,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1",
"script": "RustboroCity_EventScript_1E0971"
},
@@ -349,7 +349,7 @@
"x": 23,
"y": 22,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1",
"script": "RustboroCity_EventScript_1E0988"
},
@@ -358,7 +358,7 @@
"x": 23,
"y": 23,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1",
"script": "RustboroCity_EventScript_1E099F"
},
@@ -367,7 +367,7 @@
"x": 23,
"y": 24,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "1",
"script": "RustboroCity_EventScript_1E09B6"
},
@@ -376,7 +376,7 @@
"x": 30,
"y": 9,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2",
"script": "RustboroCity_EventScript_1E0AFE"
},
@@ -385,7 +385,7 @@
"x": 29,
"y": 10,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2",
"script": "RustboroCity_EventScript_1E0B0A"
},
@@ -394,7 +394,7 @@
"x": 30,
"y": 11,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2",
"script": "RustboroCity_EventScript_1E0B16"
},
@@ -403,7 +403,7 @@
"x": 30,
"y": 12,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "2",
"script": "RustboroCity_EventScript_1E0B22"
},
@@ -412,7 +412,7 @@
"x": 30,
"y": 9,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4",
"script": "RustboroCity_EventScript_1E0C2B"
},
@@ -421,7 +421,7 @@
"x": 31,
"y": 10,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4",
"script": "RustboroCity_EventScript_1E0C37"
},
@@ -430,7 +430,7 @@
"x": 30,
"y": 11,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4",
"script": "RustboroCity_EventScript_1E0C43"
},
@@ -439,7 +439,7 @@
"x": 30,
"y": 12,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "4",
"script": "RustboroCity_EventScript_1E0C4F"
},
@@ -448,7 +448,7 @@
"x": 12,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0DF3"
},
@@ -457,7 +457,7 @@
"x": 13,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0E33"
},
@@ -466,7 +466,7 @@
"x": 14,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0E73"
},
@@ -475,7 +475,7 @@
"x": 15,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0EB3"
},
@@ -484,7 +484,7 @@
"x": 16,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0EF3"
},
@@ -493,7 +493,7 @@
"x": 17,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0F33"
},
@@ -502,7 +502,7 @@
"x": 18,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0F73"
},
@@ -511,7 +511,7 @@
"x": 19,
"y": 53,
"elevation": 3,
"var": "VAR_RUSTBORO_STATE",
"var": "VAR_RUSTBORO_CITY_STATE",
"var_value": "7",
"script": "RustboroCity_EventScript_1E0FB3"
}
@@ -598,4 +598,4 @@
"script": "RustboroCity_EventScript_1E0919"
}
]
}
}
data/maps/RustboroCity/scripts.inc
+9 -9
View File
@@ -6,10 +6,10 @@ RustboroCity_MapScripts:: @ 81E06BD
RustboroCity_OnTransition: @ 81E06C8
setflag FLAG_VISITED_RUSTBORO_CITY
call Common_EventScript_SetupRivalGender
compare VAR_RUSTBORO_STATE, 6
compare VAR_RUSTBORO_CITY_STATE, 6
call_if_eq RustboroCity_EventScript_1E0707
getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_RUSTBORO_STATE, 6
compare VAR_RUSTBORO_CITY_STATE, 6
goto_if_eq RustboroCity_EventScript_1E06EC
end
@@ -28,7 +28,7 @@ RustboroCity_EventScript_1E0707:: @ 81E0707
return
RustboroCity_MapScript2_1E070B: @ 81E070B
map_script_2 VAR_RUSTBORO_STATE, 6, RustboroCity_EventScript_1E0715
map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_1E0715
.2byte 0
RustboroCity_EventScript_1E0715:: @ 81E0715
@@ -99,7 +99,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
playse SE_KAIDAN
removeobject 15
setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
setvar VAR_RUSTBORO_STATE, 7
setvar VAR_RUSTBORO_CITY_STATE, 7
clearflag FLAG_HIDE_MAP_NAME_POPUP
releaseall
end
@@ -302,7 +302,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD
setobjectxyperm 9, 30, 10
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setflag FLAG_DEVON_GOODS_STOLEN
setvar VAR_RUSTBORO_STATE, 2
setvar VAR_RUSTBORO_CITY_STATE, 2
setvar VAR_RUSTURF_TUNNEL_STATE, 2
setvar VAR_ROUTE116_STATE, 1
clearflag FLAG_HIDE_ROUTE_116_MR_BRINEY
@@ -493,7 +493,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
compare VAR_TEMP_1, 3
call_if_eq RustboroCity_EventScript_1E0BF3
setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN
setvar VAR_RUSTBORO_STATE, 3
setvar VAR_RUSTBORO_CITY_STATE, 3
moveobjectoffscreen 9
msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT
releaseall
@@ -596,7 +596,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B
closemessage
setflag FLAG_RETURNED_DEVON_GOODS
setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1
setvar VAR_RUSTBORO_STATE, 5
setvar VAR_RUSTBORO_CITY_STATE, 5
delay 30
warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
waitstate
@@ -840,7 +840,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
setvar VAR_RUSTBORO_STATE, 8
setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2
setvar VAR_0x8008, 0
msgbox RustboroCity_Text_1E1AFA, MSGBOX_YESNO
@@ -911,7 +911,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114
closemessage
delay 30
setflag FLAG_ENABLE_RIVAL_MATCH_CALL
setvar VAR_RUSTBORO_STATE, 8
setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2
msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO
compare VAR_RESULT, 1