summaryrefslogtreecommitdiff
path: root/maps/UndergroundWarehouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/UndergroundWarehouse.asm')
-rw-r--r--maps/UndergroundWarehouse.asm53
1 files changed, 31 insertions, 22 deletions
diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm
index 1f04c7d82..84db4ed32 100644
--- a/maps/UndergroundWarehouse.asm
+++ b/maps/UndergroundWarehouse.asm
@@ -1,3 +1,12 @@
+const_value set 2
+ const UNDERGROUNDWAREHOUSE_ROCKET1
+ const UNDERGROUNDWAREHOUSE_ROCKET2
+ const UNDERGROUNDWAREHOUSE_ROCKET3
+ const UNDERGROUNDWAREHOUSE_GENTLEMAN
+ const UNDERGROUNDWAREHOUSE_POKE_BALL1
+ const UNDERGROUNDWAREHOUSE_POKE_BALL2
+ const UNDERGROUNDWAREHOUSE_POKE_BALL3
+
UndergroundWarehouse_MapScriptHeader:
.MapTriggers:
db 0
@@ -33,63 +42,63 @@ TrainerGruntM24:
trainer EVENT_BEAT_ROCKET_GRUNTM_24, GRUNTM, 24, GruntM24SeenText, GruntM24BeatenText, 0, GruntM24Script
GruntM24Script:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x7da48
+ waitbutton
closetext
- loadmovesprites
end
TrainerGruntM14:
trainer EVENT_BEAT_ROCKET_GRUNTM_14, GRUNTM, 14, GruntM14SeenText, GruntM14BeatenText, 0, GruntM14Script
GruntM14Script:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x7db01
+ waitbutton
closetext
- loadmovesprites
end
TrainerGruntM15:
trainer EVENT_BEAT_ROCKET_GRUNTM_15, GRUNTM, 15, GruntM15SeenText, GruntM15BeatenText, 0, GruntM15Script
GruntM15Script:
- talkaftercancel
- loadfont
+ end_if_just_battled
+ opentext
writetext UnknownText_0x7db8e
+ waitbutton
closetext
- loadmovesprites
end
GentlemanScript_0x7d9bf:
faceplayer
- loadfont
+ opentext
checkevent EVENT_RECEIVED_CARD_KEY
iftrue UnknownScript_0x7d9de
writetext UnknownText_0x7dbc6
- keeptextopen
+ buttonsound
verbosegiveitem CARD_KEY
setevent EVENT_RECEIVED_CARD_KEY
setevent EVENT_WAREHOUSE_LAYOUT_1
clearevent EVENT_WAREHOUSE_LAYOUT_2
clearevent EVENT_WAREHOUSE_LAYOUT_3
writetext UnknownText_0x7dc5b
- keeptextopen
+ buttonsound
UnknownScript_0x7d9de:
writetext UnknownText_0x7dc8d
+ waitbutton
closetext
- loadmovesprites
end
-ItemFragment_0x7d9e4:
- db MAX_ETHER, 1
+UndergroundWarehouseMaxEther:
+ itemball MAX_ETHER
-ItemFragment_0x7d9e6:
- db TM_SLEEP_TALK, 1
+UndergroundWarehouseTMSleepTalk:
+ itemball TM_SLEEP_TALK
-ItemFragment_0x7d9e8:
- db ULTRA_BALL, 1
+UndergroundWarehouseUltraBall:
+ itemball ULTRA_BALL
GruntM24SeenText:
text "How did you get"
@@ -226,6 +235,6 @@ UndergroundWarehouse_MapEventHeader:
person_event SPRITE_ROCKET, 15, 8, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_ROCKET, 3, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
person_event SPRITE_GENTLEMAN, 8, 12, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e4, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
- person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e6, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
- person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d9e8, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL
+ person_event SPRITE_POKE_BALL, 15, 18, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseMaxEther, EVENT_UNDERGROUND_WAREHOUSE_MAX_ETHER
+ person_event SPRITE_POKE_BALL, 9, 13, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseTMSleepTalk, EVENT_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
+ person_event SPRITE_POKE_BALL, 1, 2, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, UndergroundWarehouseUltraBall, EVENT_UNDERGROUND_WAREHOUSE_ULTRA_BALL