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

Name several vars, document some related events

Browse Source
This commit is contained in:
Phlosioneer
2019-02-27 20:25:09 -05:00
parent 648fc3d4f3
commit e77e7844ea
42 changed files with 103 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/SlateportCity/map.json
View File

@@ -571,7 +571,7 @@
"x": 10,
"y": 13,
"elevation": 3,
"var": "VAR_0x40D2",
"var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE",
"var_value": "2",
"script": "SlateportCity_EventScript_1DD5DC"
}

12
data/maps/SlateportCity/scripts.inc
View File

@@ -8,7 +8,7 @@ SlateportCity_MapScript1_1DCC6C: @ 81DCC6C
call SlateportCity_EventScript_1DCC8D
compare VAR_SLATEPORT_STATE, 1
call_if_eq SlateportCity_EventScript_1DCC99
compare VAR_0x40D2, 1
compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
call_if_eq SlateportCity_EventScript_1DCCE7
end
@@ -50,7 +50,7 @@ SlateportCity_EventScript_1DCD06:: @ 81DCD06
return
SlateportCity_MapScript2_1DCD12: @ 81DCD12
map_script_2 VAR_0x40D2, 1, SlateportCity_EventScript_1DCD1C
map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C
.2byte 0
SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
@@ -84,8 +84,8 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
setobjectxyperm 35, 10, 12
setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x40D2, 2
addvar VAR_0x40D1, 1
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
addvar VAR_SCOTT_STATE, 1
releaseall
end
@@ -901,8 +901,8 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
applymovement 35, SlateportCity_Movement_1DD63A
waitmovement 0
removeobject 35
addvar VAR_0x40D1, 1
setvar VAR_0x40D2, 3
addvar VAR_SCOTT_STATE, 1
setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 3
releaseall
end