summaryrefslogtreecommitdiff
path: root/maps/SproutTower2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/SproutTower2F.asm')
-rw-r--r--maps/SproutTower2F.asm23
1 files changed, 14 insertions, 9 deletions
diff --git a/maps/SproutTower2F.asm b/maps/SproutTower2F.asm
index bdf50309b..621693f99 100644
--- a/maps/SproutTower2F.asm
+++ b/maps/SproutTower2F.asm
@@ -1,3 +1,8 @@
+const_value set 2
+ const SPROUTTOWER2F_SAGE1
+ const SPROUTTOWER2F_SAGE2
+ const SPROUTTOWER2F_POKE_BALL
+
SproutTower2F_MapScriptHeader:
.MapTriggers:
db 0
@@ -9,29 +14,29 @@ TrainerSageNico:
trainer EVENT_BEAT_SAGE_NICO, SAGE, NICO, SageNicoSeenText, SageNicoBeatenText, 0, SageNicoScript
SageNicoScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x1847ff
+ waitbutton
closetext
- loadmovesprites
end
TrainerSageEdmond:
trainer EVENT_BEAT_SAGE_EDMOND, SAGE, EDMOND, SageEdmondSeenText, SageEdmondBeatenText, 0, SageEdmondScript
SageEdmondScript:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x18486f
+ waitbutton
closetext
- loadmovesprites
end
MapSproutTower2FSignpost0Script:
jumptext UnknownText_0x1848c8
-ItemFragment_0x1847a7:
- db X_ACCURACY, 1
+SproutTower2FXAccuracy:
+ itemball X_ACCURACY
SageNicoSeenText:
text "However hard we"
@@ -101,4 +106,4 @@ SproutTower2F_MapEventHeader:
db 3
person_event SPRITE_SAGE, 3, 12, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 4, TrainerSageNico, -1
person_event SPRITE_SAGE, 14, 9, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_TRAINER, 5, TrainerSageEdmond, -1
- person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x1847a7, EVENT_SPROUT_TOWER2F_X_ACCURACY
+ person_event SPRITE_POKE_BALL, 1, 3, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, SproutTower2FXAccuracy, EVENT_SPROUT_TOWER2F_X_ACCURACY