diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
| commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
| tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /data/scripts/mauville_man.inc | |
| parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
| parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'data/scripts/mauville_man.inc')
| -rw-r--r-- | data/scripts/mauville_man.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index 2791e5d9f..0ab47ea80 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -43,8 +43,8 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4 end MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113 - setvar VAR_0x8004, 6 - call MauvilleCity_PokemonCenter_1F_EventScript_271E7C + setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG + call Common_ShowEasyChatScreen lock faceplayer compare VAR_RESULT, 0 |