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_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8456
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2
goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
@@ -35,7 +35,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456
LittlerootTown_BrendansHouse_2F_EventScript_1F8457:: @ 81F8457
checkplayergender
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8464
return
@@ -49,7 +49,7 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1F846A: @ 81F846A
LittlerootTown_BrendansHouse_2F_EventScript_1F8474:: @ 81F8474
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq SecretBase_EventScript_InitDecorations
end