dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync compare macros, some event_scripts.s doc, begin map_scripts constants

Browse Source
This commit is contained in:
GriffinR
2020-01-08 18:09:24 -05:00
parent 26f7ba4823
commit 31d31d3260
194 changed files with 1933 additions and 1942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SilphCo_5F/map.json
+12 -12
View File
@@ -199,84 +199,84 @@
"x": 8,
"y": 9,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89B7"
"script": "SilphCo_5F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 10,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89B7"
"script": "SilphCo_5F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 18,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89D1"
"script": "SilphCo_5F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 8,
"y": 19,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89D1"
"script": "SilphCo_5F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 19,
"y": 13,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89EB"
"script": "SilphCo_5F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 19,
"y": 14,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89EB"
"script": "SilphCo_5F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 9,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89B7"
"script": "SilphCo_5F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 10,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89B7"
"script": "SilphCo_5F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 19,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89D1"
"script": "SilphCo_5F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 7,
"y": 18,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89D1"
"script": "SilphCo_5F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 18,
"y": 13,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89EB"
"script": "SilphCo_5F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 18,
"y": 14,
"elevation": 0,
"script": "SilphCo_5F_EventScript_1A89EB"
"script": "SilphCo_5F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
data/maps/SilphCo_5F/scripts.inc
+4 -4
View File
@@ -4,17 +4,17 @@ SilphCo_5F_MapScripts:: @ 81617BE
SilphCo_5F_MapScript1_1617C4:: @ 81617C4
checkflag FLAG_SILPH_5F_DOOR_1
call_if FALSE, EventScript_1A826F
call_if FALSE, EventScript_Close5FDoor1
checkflag FLAG_SILPH_5F_DOOR_2
call_if FALSE, EventScript_1A82A6
call_if FALSE, EventScript_Close5FDoor2
checkflag FLAG_SILPH_5F_DOOR_3
call_if FALSE, EventScript_1A82DD
call_if FALSE, EventScript_Close5FDoor3
end
SilphCo_5F_EventScript_1617E0:: @ 81617E0
lock
faceplayer
compare_var_to_value VAR_MAP_SCENE_SILPH_CO_11F, 1
compare VAR_MAP_SCENE_SILPH_CO_11F, 1
goto_if ge, EventScript_1617F7
msgbox gUnknown_8175B70
release