diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-31 02:30:30 -0600 |
| commit | d004ce065c9cc6425df6f567dff39eb831f84875 (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /data/scripts | |
| parent | ec780bb2098be75e591b212e85947f88c91d4e37 (diff) | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald into trade
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/players_house.inc | 8 | ||||
| -rw-r--r-- | data/scripts/safari_zone.inc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f9c6cf24e..166134abf 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -68,9 +68,9 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F playse SE_KAIDAN removeobject VAR_0x8008 @@ -438,9 +438,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 lockall checkplayergender - compare VAR_RESULT, 0 + compare VAR_RESULT, MALE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76 - compare VAR_RESULT, 1 + compare VAR_RESULT, FEMALE call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86 compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08 diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc index 2932401e1..1fcf5d166 100644 --- a/data/scripts/safari_zone.inc +++ b/data/scripts/safari_zone.inc @@ -40,7 +40,7 @@ EventScript_2A4B9B:: @ 82A4B9B releaseall goto EventScript_2A4B5D -EventScript_2A4BAC:: @ 82A4BAC +EventScript_PokeBlockFeeder:: @ 82A4BAC lockall special GetPokeblockFeederInFront compare VAR_RESULT, 65535 |