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_4F/map.json
+8 -8
View File
@@ -176,56 +176,56 @@
"x": 3,
"y": 16,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A8983"
"script": "SilphCo_4F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 4,
"y": 16,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A8983"
"script": "SilphCo_4F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 3,
"y": 17,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A8983"
"script": "SilphCo_4F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 4,
"y": 17,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A8983"
"script": "SilphCo_4F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 15,
"y": 11,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A899D"
"script": "SilphCo_4F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 14,
"y": 11,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A899D"
"script": "SilphCo_4F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 14,
"y": 12,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A899D"
"script": "SilphCo_4F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 15,
"y": 12,
"elevation": 0,
"script": "SilphCo_4F_EventScript_1A899D"
"script": "SilphCo_4F_EventScript_Door2"
},
{
"type": "hidden_item",
data/maps/SilphCo_4F/scripts.inc
+3 -3
View File
@@ -4,15 +4,15 @@ SilphCo_4F_MapScripts:: @ 8161736
SilphCo_4F_MapScript1_16173C:: @ 816173C
checkflag FLAG_SILPH_4F_DOOR_1
call_if FALSE, EventScript_1A8213
call_if FALSE, EventScript_Close4FDoor1
checkflag FLAG_SILPH_4F_DOOR_2
call_if FALSE, EventScript_1A8241
call_if FALSE, EventScript_Close4FDoor2
end
SilphCo_4F_EventScript_16174F:: @ 816174F
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_161766
msgbox gUnknown_81759F5
release