summaryrefslogtreecommitdiff
path: root/maps/AzaleaGym.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/AzaleaGym.asm')
-rw-r--r--maps/AzaleaGym.asm42
1 files changed, 21 insertions, 21 deletions
diff --git a/maps/AzaleaGym.asm b/maps/AzaleaGym.asm
index 54f9432d1..63ff63218 100644
--- a/maps/AzaleaGym.asm
+++ b/maps/AzaleaGym.asm
@@ -91,35 +91,35 @@ TrainerTwinsAmyandmay2:
closetext
end
-TrainerBug_catcherbenny:
- trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherbennySeenText, Bug_catcherbennyBeatenText, 0, .AfterScript
+TrainerBugCatcherbenny:
+ trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, BugCatcherbennySeenText, BugCatcherbennyBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
opentext
- writetext Bug_catcherbennyAfterBattleText
+ writetext BugCatcherbennyAfterBattleText
waitbutton
closetext
end
-TrainerBug_catcherAl:
- trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, 0, .AfterScript
+TrainerBugCatcherAl:
+ trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, BugCatcherAlSeenText, BugCatcherAlBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
opentext
- writetext Bug_catcherAlAfterBattleText
+ writetext BugCatcherAlAfterBattleText
waitbutton
closetext
end
-TrainerBug_catcherJosh:
- trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, 0, .AfterScript
+TrainerBugCatcherJosh:
+ trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, BugCatcherJoshSeenText, BugCatcherJoshBeatenText, 0, .AfterScript
.AfterScript:
end_if_just_battled
opentext
- writetext Bug_catcherJoshAfterBattleText
+ writetext BugCatcherJoshAfterBattleText
waitbutton
closetext
end
@@ -232,7 +232,7 @@ BugsyText_BugMonsAreDeep:
line "ites thoroughly."
done
-Bug_catcherbennySeenText:
+BugCatcherbennySeenText:
text "Bug #MON evolve"
line "young. So they get"
@@ -240,18 +240,18 @@ Bug_catcherbennySeenText:
line "faster."
done
-Bug_catcherbennyBeatenText:
+BugCatcherbennyBeatenText:
text "Just evolving"
line "isn't enough!"
done
-Bug_catcherbennyAfterBattleText:
+BugCatcherbennyAfterBattleText:
text "#MON become"
line "stronger if they"
cont "evolve. Really!"
done
-Bug_catcherAlSeenText:
+BugCatcherAlSeenText:
text "Bug #MON are"
line "cool and tough!"
@@ -259,12 +259,12 @@ Bug_catcherAlSeenText:
line "you!"
done
-Bug_catcherAlBeatenText:
+BugCatcherAlBeatenText:
text "You proved how"
line "tough you are…"
done
-Bug_catcherAlAfterBattleText:
+BugCatcherAlAfterBattleText:
text "They're so cool,"
line "but most girls"
@@ -274,7 +274,7 @@ Bug_catcherAlAfterBattleText:
para "I don't know why…"
done
-Bug_catcherJoshSeenText:
+BugCatcherJoshSeenText:
text "You saved all the"
line "SLOWPOKE? Whew,"
cont "you're mighty!"
@@ -284,11 +284,11 @@ Bug_catcherJoshSeenText:
cont "tough too!"
done
-Bug_catcherJoshBeatenText:
+BugCatcherJoshBeatenText:
text "Urrgggh!"
done
-Bug_catcherJoshAfterBattleText:
+BugCatcherJoshAfterBattleText:
text "I guess I should"
line "teach them better"
cont "moves…"
@@ -381,9 +381,9 @@ AzaleaGym_MapEventHeader:
.ObjectEvents:
db 7
object_event SPRITE_BUGSY, 7, 5, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, AzaleaGymBugsyScript, -1
- object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBug_catcherbenny, -1
- object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherAl, -1
- object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBug_catcherJosh, -1
+ object_event SPRITE_BUG_CATCHER, 3, 5, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherbenny, -1
+ object_event SPRITE_BUG_CATCHER, 8, 8, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherAl, -1
+ object_event SPRITE_BUG_CATCHER, 2, 0, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherJosh, -1
object_event SPRITE_TWIN, 10, 4, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay1, -1
object_event SPRITE_TWIN, 10, 5, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsAmyandmay2, -1
object_event SPRITE_GYM_GUY, 13, 7, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, AzaleaGymGuyScript, -1