summaryrefslogtreecommitdiff
path: root/data/event_scripts.s
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-09-09 02:26:54 -0400
committerProjectRevoTPP <projectrevotpp@hotmail.com>2017-09-09 02:26:54 -0400
commit753a09f3c7b33c10ed80d514d90f6b646fb1becb (patch)
tree82306d1734104cbb970caa986242e4dc6c050494 /data/event_scripts.s
parentf9259ba70d93fdd758075a3c79fd0fe9b65bf185 (diff)
parent99dc97f6aa48646c90def102ce2632be8c45eab9 (diff)
merge
Diffstat (limited to 'data/event_scripts.s')
-rw-r--r--data/event_scripts.s11
1 files changed, 1 insertions, 10 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index d6702745a..33bb39308 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -4744,16 +4744,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
.include "data/scripts/gabby_and_ty.inc"
- .include "data/scripts/bard.inc"
- .include "data/scripts/hipster.inc"
- .include "data/text/trader.inc"
- .include "data/scripts/trader.inc"
- .include "data/text/storyteller.inc"
- .include "data/scripts/storyteller.inc"
- .include "data/text/giddy.inc"
- .include "data/scripts/giddy.inc"
- .include "data/text/bard.inc"
- .include "data/text/hipster.inc"
+ .include "data/scripts/mauville_man.inc"
.include "data/field_move_scripts.inc"
.include "data/item_ball_scripts.inc"