diff options
author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
---|---|---|
committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:25:14 +0000 |
commit | a3ebca4d814adcf245212cb549f72812f2cf39c6 (patch) | |
tree | 88fddcd03a5f19cf84b6199863f95fd06f1954bf /data/scripts | |
parent | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (diff) | |
parent | a0ff38d0be4f618822d96cc7833e7c331ee78b5f (diff) |
Fix merge conflicts
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 a198b0774..eb29ef6e0 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 |