diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-02 12:40:00 -0400 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-10-02 12:40:00 -0400 |
| commit | 2ac3ad3e607c0c54d28223825b39b9e695022b5c (patch) | |
| tree | 3bff8424909b1038b72ca4b310f12f9e0835088b /data/maps/Route104/scripts.inc | |
| parent | 67152b92424419a470ed2bb0cf5e5f8a8ced38de (diff) | |
| parent | cb528cb543ab98a58ba2b5a78524c3542ed80f62 (diff) | |
Review changes for #819 and merge
Diffstat (limited to 'data/maps/Route104/scripts.inc')
| -rw-r--r-- | data/maps/Route104/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 74a7e3ddf..0eaf5d487 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -870,8 +870,8 @@ Route104_EventScript_1ED38D:: @ 81ED38D specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED424 - setvar VAR_0x8004, 604 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_HALEY_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED3F8 msgbox Route104_Text_295689, MSGBOX_DEFAULT @@ -913,8 +913,8 @@ Route104_EventScript_1ED43B:: @ 81ED43B specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED4D2 - setvar VAR_0x8004, 136 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_WINSTON_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED4A6 msgbox Route104_Text_2958C1, MSGBOX_DEFAULT @@ -956,8 +956,8 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq Route104_EventScript_1ED580 - setvar VAR_0x8004, 114 - specialvar VAR_RESULT, sub_813B4E0 + setvar VAR_0x8004, TRAINER_CINDY_1 + specialvar VAR_RESULT, IsTrainerRegistered compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_1ED554 msgbox Route104_Text_295AC3, MSGBOX_DEFAULT |