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_3F/map.json
+8 -8
View File
@@ -145,56 +145,56 @@
"x": 10,
"y": 12,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A894F"
"script": "SilphCo_3F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 10,
"y": 13,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A894F"
"script": "SilphCo_3F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 12,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A8969"
"script": "SilphCo_3F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 13,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A8969"
"script": "SilphCo_3F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 12,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A894F"
"script": "SilphCo_3F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 9,
"y": 13,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A894F"
"script": "SilphCo_3F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 20,
"y": 12,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A8969"
"script": "SilphCo_3F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 20,
"y": 13,
"elevation": 3,
"script": "SilphCo_3F_EventScript_1A8969"
"script": "SilphCo_3F_EventScript_Door2"
},
{
"type": "hidden_item",
data/maps/SilphCo_3F/scripts.inc
+3 -3
View File
@@ -4,15 +4,15 @@ SilphCo_3F_MapScripts:: @ 81616C5
SilphCo_3F_MapScript1_1616CB:: @ 81616CB
checkflag FLAG_SILPH_3F_DOOR_1
call_if FALSE, EventScript_1A81A5
call_if FALSE, EventScript_Close3FDoor1
checkflag FLAG_SILPH_3F_DOOR_2
call_if FALSE, EventScript_1A81DC
call_if FALSE, EventScript_Close3FDoor2
end
SilphCo_3F_EventScript_1616DE:: @ 81616DE
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_1616F5
msgbox gUnknown_81758AD
release