summaryrefslogtreecommitdiff
path: root/maps/GoldenrodUndergroundWarehouse.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodUndergroundWarehouse.asm')
-rw-r--r--maps/GoldenrodUndergroundWarehouse.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index 054139331..b650ac975 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -66,11 +66,11 @@ TrainerGruntM15:
closetext
end
-GentlemanScript_0x7d9bf:
+GoldenrodUndergroundWarehouseDirectorScript:
faceplayer
opentext
checkevent EVENT_RECEIVED_CARD_KEY
- iftrue UnknownScript_0x7d9de
+ iftrue .GotCardKey
writetext UnknownText_0x7dbc6
buttonsound
verbosegiveitem CARD_KEY
@@ -80,7 +80,7 @@ GentlemanScript_0x7d9bf:
clearevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
writetext UnknownText_0x7dc5b
buttonsound
-UnknownScript_0x7d9de:
+.GotCardKey:
writetext UnknownText_0x7dc8d
waitbutton
closetext
@@ -224,7 +224,7 @@ GoldenrodUndergroundWarehouse_MapEvents:
object_event 9, 8, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM24, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 8, 15, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerGruntM14, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 14, 3, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerGruntM15, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
- object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GentlemanScript_0x7d9bf, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
+ object_event 12, 8, SPRITE_GENTLEMAN, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundWarehouseDirectorScript, EVENT_RADIO_TOWER_ROCKET_TAKEOVER
object_event 18, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseMaxEther, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_MAX_ETHER
object_event 13, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseTMSleepTalk, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_TM_SLEEP_TALK
object_event 2, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundWarehouseUltraBall, EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_ULTRA_BALL