diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-02 19:38:05 +0100 |
| commit | 9828e0e97b8403a7614f4bec127af9233ae923cb (patch) | |
| tree | 7a2b5d14e654e6f8171548692dc5f241de8cb748 /data/maps/BattleFrontier_Mart/scripts.inc | |
| parent | a42bfd7a0eeff5bd0cf0014ab133ef5ff4b5becf (diff) | |
| parent | c123b8d6f1787abce2d1e3920d40192811b5fa39 (diff) | |
Merge with master
Diffstat (limited to 'data/maps/BattleFrontier_Mart/scripts.inc')
| -rw-r--r-- | data/maps/BattleFrontier_Mart/scripts.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc index 0b7f5b767..f3708b565 100644 --- a/data/maps/BattleFrontier_Mart/scripts.inc +++ b/data/maps/BattleFrontier_Mart/scripts.inc @@ -7,7 +7,7 @@ BattleFrontier_Mart_EventScript_267ACC:: @ 8267ACC message gUnknown_08272A21 waitmessage pokemart BattleFrontier_Mart_Pokemart_267AE4 - msgbox gUnknown_08272A3F, 4 + msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release end @@ -31,19 +31,19 @@ BattleFrontier_Mart_Pokemart_267AE4: @ 8267AE4 end BattleFrontier_Mart_EventScript_267B02:: @ 8267B02 - msgbox BattleFrontier_Mart_Text_267B29, 2 + msgbox BattleFrontier_Mart_Text_267B29, MSGBOX_NPC end BattleFrontier_Mart_EventScript_267B0B:: @ 8267B0B lock applymovement 2, BattleFrontier_Mart_Movement_2725B0 waitmovement 0 - msgbox BattleFrontier_Mart_Text_267B8F, 4 + msgbox BattleFrontier_Mart_Text_267B8F, MSGBOX_DEFAULT release end BattleFrontier_Mart_EventScript_267B20:: @ 8267B20 - msgbox BattleFrontier_Mart_Text_267C01, 2 + msgbox BattleFrontier_Mart_Text_267C01, MSGBOX_NPC end BattleFrontier_Mart_Text_267B29: @ 8267B29 |