Merge branch 'master' into document-eventscripts

This commit is contained in:
GriffinR
2019-09-17 00:10:23 -04:00
committed by GitHub
161 changed files with 12548 additions and 11791 deletions
@@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD
LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
checkplayergender
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9309
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
@@ -36,7 +36,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9309:: @ 81F9309
LittlerootTown_MaysHouse_2F_EventScript_1F930A:: @ 81F930A
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9317
return
@@ -50,7 +50,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_1F931D: @ 81F931D
LittlerootTown_MaysHouse_2F_EventScript_1F9327:: @ 81F9327
checkplayergender
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq SecretBase_EventScript_InitDecorations
end