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_2F/map.json
+8 -8
View File
@@ -137,56 +137,56 @@
"x": 5,
"y": 8,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A891B"
"script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 8,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A891B"
"script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 9,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A891B"
"script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 9,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A891B"
"script": "SilphCo_2F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 15,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A8935"
"script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 15,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A8935"
"script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 16,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A8935"
"script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 16,
"elevation": 0,
"script": "SilphCo_2F_EventScript_1A8935"
"script": "SilphCo_2F_EventScript_Door2"
},
{
"type": "hidden_item",
data/maps/SilphCo_2F/scripts.inc
+2 -2
View File
@@ -4,9 +4,9 @@ SilphCo_2F_MapScripts:: @ 8161641
SilphCo_2F_MapScript1_161647:: @ 8161647
checkflag FLAG_SILPH_2F_DOOR_1
call_if FALSE, EventScript_1A8149
call_if FALSE, EventScript_Close2FDoor1
checkflag FLAG_SILPH_2F_DOOR_2
call_if FALSE, EventScript_1A8177
call_if FALSE, EventScript_Close2FDoor2
end
SilphCo_2F_EventScript_16165A:: @ 816165A