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_9F/map.json
+16 -16
View File
@@ -120,112 +120,112 @@
"x": 3,
"y": 10,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8A87"
"script": "SilphCo_9F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 3,
"y": 11,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8A87"
"script": "SilphCo_9F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 13,
"y": 16,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AA1"
"script": "SilphCo_9F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 13,
"y": 17,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AA1"
"script": "SilphCo_9F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 6,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8ABB"
"script": "SilphCo_9F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 6,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8ABB"
"script": "SilphCo_9F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 7,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8ABB"
"script": "SilphCo_9F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 7,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8ABB"
"script": "SilphCo_9F_EventScript_Door3"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 13,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AD5"
"script": "SilphCo_9F_EventScript_Door4"
},
{
"type": "bg_event_type_0",
"x": 21,
"y": 12,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AD5"
"script": "SilphCo_9F_EventScript_Door4"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 12,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AD5"
"script": "SilphCo_9F_EventScript_Door4"
},
{
"type": "bg_event_type_0",
"x": 22,
"y": 13,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AD5"
"script": "SilphCo_9F_EventScript_Door4"
},
{
"type": "bg_event_type_0",
"x": 2,
"y": 11,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8A87"
"script": "SilphCo_9F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 2,
"y": 10,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8A87"
"script": "SilphCo_9F_EventScript_Door1"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 16,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AA1"
"script": "SilphCo_9F_EventScript_Door2"
},
{
"type": "bg_event_type_0",
"x": 12,
"y": 17,
"elevation": 0,
"script": "SilphCo_9F_EventScript_1A8AA1"
"script": "SilphCo_9F_EventScript_Door2"
},
{
"type": "hidden_item",
data/maps/SilphCo_9F/scripts.inc
+5 -5
View File
@@ -4,19 +4,19 @@ SilphCo_9F_MapScripts:: @ 8161CDE
SilphCo_9F_MapScript1_161CE4:: @ 8161CE4
checkflag FLAG_SILPH_9F_DOOR_1
call_if FALSE, EventScript_1A840C
call_if FALSE, EventScript_Close9FDoor1
checkflag FLAG_SILPH_9F_DOOR_2
call_if FALSE, EventScript_1A8443
call_if FALSE, EventScript_Close9FDoor2
checkflag FLAG_SILPH_9F_DOOR_3
call_if FALSE, EventScript_1A847A
call_if FALSE, EventScript_Close9FDoor3
checkflag FLAG_SILPH_9F_DOOR_4
call_if FALSE, EventScript_1A84A8
call_if FALSE, EventScript_Close9FDoor4
end
SilphCo_9F_EventScript_161D09:: @ 8161D09
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_161D2E
msgbox gUnknown_8176B54
closemessage