diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /data/event_scripts.s | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index f75442912..c07f400a1 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -9706,7 +9706,7 @@ EventScript_1BC13A:: @ 81BC13A goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 0 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F @@ -9726,7 +9726,7 @@ EventScript_1BC184:: @ 81BC184 goto_if eq, EventScript_1BC2A6 msgbox gUnknown_81BD059 setvar VAR_0x8005, 1 - special sub_8127888 + special ChooseMonForWirelessMinigame waitstate compare_var_to_value VAR_0x8004, 6 goto_if ge, EventScript_1BB83F @@ -13968,7 +13968,7 @@ EventScript_1C4F26:: @ 81C4F26 end EventScript_1C4F30:: @ 81C4F30 - special sub_812781C + special ChooseMonForMoveTutor waitstate lock faceplayer |