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/PetalburgCity/map.json
+5 -5
View File
@@ -193,7 +193,7 @@
"x": 8,
"y": 10,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
"var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0",
"script": "PetalburgCity_EventScript_1DC49A"
},
@@ -202,7 +202,7 @@
"x": 8,
"y": 11,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
"var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0",
"script": "PetalburgCity_EventScript_1DC4A6"
},
@@ -211,7 +211,7 @@
"x": 8,
"y": 12,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
"var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0",
"script": "PetalburgCity_EventScript_1DC4B2"
},
@@ -220,7 +220,7 @@
"x": 8,
"y": 13,
"elevation": 3,
"var": "VAR_PETALBURG_STATE",
"var": "VAR_PETALBURG_CITY_STATE",
"var_value": "0",
"script": "PetalburgCity_EventScript_1DC4BE"
},
@@ -327,4 +327,4 @@
"flag": "FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY"
}
]
}
}
data/maps/PetalburgCity/scripts.inc
+6 -6
View File
@@ -5,11 +5,11 @@ PetalburgCity_MapScripts::
PetalburgCity_OnTransition: @ 81DC2D7
setflag FLAG_VISITED_PETALBURG_CITY
compare VAR_PETALBURG_STATE, 0
compare VAR_PETALBURG_CITY_STATE, 0
call_if_eq PetalburgCity_EventScript_1DC307
compare VAR_PETALBURG_STATE, 2
compare VAR_PETALBURG_CITY_STATE, 2
call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_PETALBURG_STATE, 4
compare VAR_PETALBURG_CITY_STATE, 4
call_if_eq PetalburgCity_EventScript_1DC30F
compare VAR_PETALBURG_GYM_STATE, 8
call_if_eq PetalburgCity_EventScript_1DC316
@@ -29,8 +29,8 @@ PetalburgCity_EventScript_1DC316:: @ 81DC316
return
PetalburgCity_MapScript2_1DC31C: @ 81DC31C
map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_1DC32E
map_script_2 VAR_PETALBURG_STATE, 4, PetalburgCity_EventScript_1DC390
map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_1DC32E
map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_1DC390
.2byte 0
PetalburgCity_EventScript_1DC32E:: @ 81DC32E
@@ -49,7 +49,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage
clearflag FLAG_HIDE_MAP_NAME_POPUP
setvar VAR_PETALBURG_STATE, 3
setvar VAR_PETALBURG_CITY_STATE, 3
fadedefaultbgm
clearflag FLAG_SPECIAL_FLAG_0x4001
special LoadPlayerParty