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_11F/map.json
+4 -4
View File
@@ -141,28 +141,28 @@
"x": 5,
"y": 16,
"elevation": 3,
"script": "SilphCo_11F_EventScript_1A8B09"
"script": "SilphCo_11F_EventScript_Door"
},
{
"type": "bg_event_type_0",
"x": 5,
"y": 17,
"elevation": 3,
"script": "SilphCo_11F_EventScript_1A8B09"
"script": "SilphCo_11F_EventScript_Door"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 16,
"elevation": 3,
"script": "SilphCo_11F_EventScript_1A8B09"
"script": "SilphCo_11F_EventScript_Door"
},
{
"type": "bg_event_type_0",
"x": 6,
"y": 17,
"elevation": 3,
"script": "SilphCo_11F_EventScript_1A8B09"
"script": "SilphCo_11F_EventScript_Door"
},
{
"type": "hidden_item",
data/maps/SilphCo_11F/scripts.inc
+6 -6
View File
@@ -4,7 +4,7 @@ SilphCo_11F_MapScripts:: @ 8161DEE
SilphCo_11F_MapScript1_161DF4:: @ 8161DF4
checkflag FLAG_SILPH_11F_DOOR
call_if FALSE, EventScript_1A8504
call_if FALSE, EventScript_Close11FDoor
end
SilphCo_11F_EventScript_161DFE:: @ 8161DFE
@@ -13,12 +13,12 @@ SilphCo_11F_EventScript_161DFE:: @ 8161DFE
checkflag FLAG_GOT_MASTER_BALL_FROM_SILPH
goto_if TRUE, EventScript_161E75
checkplayergender
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
call_if eq, EventScript_161E59
compare_var_to_value VAR_RESULT, 1
compare VAR_RESULT, 1
call_if eq, EventScript_161E62
checkitemspace ITEM_MASTER_BALL, 1
compare_var_to_value VAR_RESULT, 0
compare VAR_RESULT, 0
goto_if eq, EventScript_161E6B
additem ITEM_MASTER_BALL, 1
giveitemfanfaremsg gUnknown_8176FBD, ITEM_MASTER_BALL, 1, MUS_FAN5
@@ -72,9 +72,9 @@ EventScript_161EA0:: @ 8161EA0
delay 25
msgbox gUnknown_8177108
closemessage
compare_var_to_value VAR_0x4001, 0
compare VAR_0x4001, 0
call_if eq, EventScript_161F00
compare_var_to_value VAR_0x4001, 1
compare VAR_0x4001, 1
call_if eq, EventScript_161F12
setvar VAR_LAST_TALKED, 3
trainerbattle TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT, TRAINER_BOSS_GIOVANNI_2, 0, Text_1771AB