summaryrefslogtreecommitdiff
path: root/maps/GoldenrodDeptStoreB1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/GoldenrodDeptStoreB1F.asm')
-rw-r--r--maps/GoldenrodDeptStoreB1F.asm38
1 files changed, 24 insertions, 14 deletions
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index e726755da..3fd4b6e97 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -1,3 +1,13 @@
+const_value set 2
+ const GOLDENRODDEPTSTOREB1F_POKE_BALL1
+ const GOLDENRODDEPTSTOREB1F_POKE_BALL2
+ const GOLDENRODDEPTSTOREB1F_POKE_BALL3
+ const GOLDENRODDEPTSTOREB1F_POKE_BALL4
+ const GOLDENRODDEPTSTOREB1F_BLACK_BELT1
+ const GOLDENRODDEPTSTOREB1F_BLACK_BELT2
+ const GOLDENRODDEPTSTOREB1F_BLACK_BELT3
+ const GOLDENRODDEPTSTOREB1F_MACHOP
+
GoldenrodDeptStoreB1F_MapScriptHeader:
.MapTriggers:
db 0
@@ -50,24 +60,24 @@ BlackBeltScript_0x7d7b6:
jumptextfaceplayer UnknownText_0x7d875
MachopScript_0x7d7b9:
- loadfont
+ opentext
writetext UnknownText_0x7d8bb
cry MACHOKE
+ waitbutton
closetext
- loadmovesprites
end
-ItemFragment_0x7d7c3:
- db ETHER, 1
+GoldenrodDeptStoreB1FEther:
+ itemball ETHER
-ItemFragment_0x7d7c5:
- db AMULET_COIN, 1
+GoldenrodDeptStoreB1FAmuletCoin:
+ itemball AMULET_COIN
-ItemFragment_0x7d7c7:
- db BURN_HEAL, 1
+GoldenrodDeptStoreB1FBurnHeal:
+ itemball BURN_HEAL
-ItemFragment_0x7d7c9:
- db ULTRA_BALL, 1
+GoldenrodDeptStoreB1FUltraBall:
+ itemball ULTRA_BALL
UnknownText_0x7d7cb:
text "Hey, kid! You're"
@@ -121,10 +131,10 @@ GoldenrodDeptStoreB1F_MapEventHeader:
.PersonEvents:
db 8
- person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c3, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
- person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c5, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
- person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c7, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
- person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMFRAGMENT, 0, ItemFragment_0x7d7c9, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
+ person_event SPRITE_POKE_BALL, 15, 10, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FEther, EVENT_GOLDENROD_DEPT_STORE_B1F_ETHER
+ person_event SPRITE_POKE_BALL, 2, 14, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FAmuletCoin, EVENT_GOLDENROD_DEPT_STORE_B1F_AMULET_COIN
+ person_event SPRITE_POKE_BALL, 3, 6, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FBurnHeal, EVENT_GOLDENROD_DEPT_STORE_B1F_BURN_HEAL
+ person_event SPRITE_POKE_BALL, 15, 15, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, PERSONTYPE_ITEMBALL, 0, GoldenrodDeptStoreB1FUltraBall, EVENT_GOLDENROD_DEPT_STORE_B1F_ULTRA_BALL
person_event SPRITE_BLACK_BELT, 10, 9, SPRITEMOVEDATA_WALK_UP_DOWN, 1, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b0, -1
person_event SPRITE_BLACK_BELT, 8, 4, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b3, -1
person_event SPRITE_BLACK_BELT, 13, 6, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, BlackBeltScript_0x7d7b6, -1