summaryrefslogtreecommitdiff
path: root/data/maps
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps')
-rw-r--r--data/maps/FortreeCity_DecorationShop/scripts.inc44
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc29
-rw-r--r--data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc105
-rw-r--r--data/maps/Route104_PrettyPetalFlowerShop/scripts.inc19
-rw-r--r--data/maps/SlateportCity/scripts.inc44
5 files changed, 119 insertions, 122 deletions
diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 5274daeda..3b0021cf3 100644
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -14,22 +14,22 @@ FortreeCity_DecorationShop_EventScript_218020:: @ 8218020
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218038
+ pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Desks
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-FortreeCity_DecorationShop_PokemartDecor_218038: @ 8218038
- .2byte 1
- .2byte 2
- .2byte 3
- .2byte 4
- .2byte 5
- .2byte 7
- .2byte 8
- .2byte 9
- .2byte 0
+FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
+ .2byte DECOR_SMALL_DESK
+ .2byte DECOR_POKEMON_DESK
+ .2byte DECOR_HEAVY_DESK
+ .2byte DECOR_RAGGED_DESK
+ .2byte DECOR_COMFORT_DESK
+ .2byte DECOR_BRICK_DESK
+ .2byte DECOR_CAMP_DESK
+ .2byte DECOR_HARD_DESK
+ .2byte DECOR_NONE
release
end
@@ -38,22 +38,22 @@ FortreeCity_DecorationShop_EventScript_21804C:: @ 821804C
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_218064
+ pokemartdecoration FortreeCity_DecorationShop_PokemartDecor_Chairs
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-FortreeCity_DecorationShop_PokemartDecor_218064: @ 8218064
- .2byte 10
- .2byte 11
- .2byte 12
- .2byte 15
- .2byte 14
- .2byte 16
- .2byte 17
- .2byte 18
- .2byte 0
+FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
+ .2byte DECOR_SMALL_CHAIR
+ .2byte DECOR_POKEMON_CHAIR
+ .2byte DECOR_HEAVY_CHAIR
+ .2byte DECOR_RAGGED_CHAIR
+ .2byte DECOR_COMFORT_CHAIR
+ .2byte DECOR_BRICK_CHAIR
+ .2byte DECOR_CAMP_CHAIR
+ .2byte DECOR_HARD_CHAIR
+ .2byte DECOR_NONE
release
end
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 2b6aee854..6e9de9be5 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -30,20 +30,20 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22022F:: @ 822022F
.align 2
LilycoveCity_DepartmentStoreRooftop_PokemartDecor_220248: @ 8220248
- .2byte 39
- .2byte 35
- .2byte 36
- .2byte 37
- .2byte 40
- .2byte 33
- .2byte 41
- .2byte 38
- .2byte 34
- .2byte 45
- .2byte 46
- .2byte 47
- .2byte 117
- .2byte 112
+ .2byte DECOR_MUD_BALL
+ .2byte DECOR_FENCE_LENGTH
+ .2byte DECOR_FENCE_WIDTH
+ .2byte DECOR_TIRE
+ .2byte DECOR_BREAKABLE_DOOR
+ .2byte DECOR_SOLID_BOARD
+ .2byte DECOR_SAND_ORNAMENT
+ .2byte DECOR_STAND
+ .2byte DECOR_SLIDE
+ .2byte DECOR_TV
+ .2byte DECOR_ROUND_TV
+ .2byte DECOR_CUTE_TV
+ .2byte DECOR_WAILMER_DOLL
+ .2byte DECOR_RHYDON_DOLL
.2byte 0
release
end
@@ -235,4 +235,3 @@ LilycoveCity_DepartmentStoreRooftop_Text_2205F1: @ 82205F1
LilycoveCity_DepartmentStoreRooftop_Text_220603: @ 8220603
.string "Decided against buying a drink.$"
-
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 7cab0f1fa..8dd40f4b3 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -18,26 +18,26 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFA6:: @ 821FFA6
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0
+ pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_21FFC0: @ 821FFC0
- .2byte ITEM_X_DEFEND
- .2byte ITEM_X_SPEED
- .2byte ITEM_X_ACCURACY
- .2byte ITEM_SUPER_REPEL
- .2byte 91
- .2byte 92
- .2byte ITEM_SUN_STONE
- .2byte ITEM_MOON_STONE
- .2byte ITEM_FIRE_STONE
- .2byte ITEM_THUNDER_STONE
- .2byte ITEM_WATER_STONE
- .2byte ITEM_LEAF_STONE
- .2byte ITEM_NONE
+LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
+ .2byte DECOR_PICHU_DOLL
+ .2byte DECOR_PIKACHU_DOLL
+ .2byte DECOR_MARILL_DOLL
+ .2byte DECOR_JIGGLYPUFF_DOLL
+ .2byte DECOR_DUSKULL_DOLL
+ .2byte DECOR_WYNAUT_DOLL
+ .2byte DECOR_BALTOY_DOLL
+ .2byte DECOR_KECLEON_DOLL
+ .2byte DECOR_AZURILL_DOLL
+ .2byte DECOR_SKITTY_DOLL
+ .2byte DECOR_SWABLU_DOLL
+ .2byte DECOR_GULPIN_DOLL
+ .2byte DECOR_NONE
release
end
@@ -46,23 +46,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_21FFDC:: @ 821FFDC
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4
+ pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Cushions
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_21FFF4: @ 821FFF4
- .2byte 101
- .2byte 102
- .2byte ITEM_BIG_MUSHROOM
- .2byte 105
- .2byte ITEM_PEARL
- .2byte ITEM_BIG_PEARL
- .2byte ITEM_STARDUST
- .2byte ITEM_STAR_PIECE
- .2byte ITEM_NUGGET
- .2byte ITEM_NONE
+LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
+ .2byte DECOR_PIKA_CUSHION
+ .2byte DECOR_ROUND_CUSHION
+ .2byte DECOR_ZIGZAG_CUSHION
+ .2byte DECOR_SPIN_CUSHION
+ .2byte DECOR_DIAMOND_CUSHION
+ .2byte DECOR_BALL_CUSHION
+ .2byte DECOR_GRASS_CUSHION
+ .2byte DECOR_FIRE_CUSHION
+ .2byte DECOR_WATER_CUSHION
+ .2byte DECOR_NONE
release
end
@@ -71,23 +71,23 @@ LilycoveCity_DepartmentStore_5F_EventScript_22000A:: @ 822000A
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220024
+ pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Posters
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_220024: @ 8220024
- .2byte ITEM_CARBOS
- .2byte ITEM_CALCIUM
- .2byte ITEM_RARE_CANDY
- .2byte ITEM_PP_UP
- .2byte ITEM_ZINC
- .2byte ITEM_PP_MAX
- .2byte 72
- .2byte ITEM_GUARD_SPEC
- .2byte ITEM_DIRE_HIT
- .2byte ITEM_NONE
+LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
+ .2byte DECOR_BALL_POSTER
+ .2byte DECOR_GREEN_POSTER
+ .2byte DECOR_RED_POSTER
+ .2byte DECOR_BLUE_POSTER
+ .2byte DECOR_CUTE_POSTER
+ .2byte DECOR_PIKA_POSTER
+ .2byte DECOR_LONG_POSTER
+ .2byte DECOR_SEA_POSTER
+ .2byte DECOR_SKY_POSTER
+ .2byte DECOR_NONE
release
end
@@ -96,24 +96,24 @@ LilycoveCity_DepartmentStore_5F_EventScript_22003A:: @ 822003A
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_220054
+ pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Pokemart_Mats
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_220054: @ 8220054
- .2byte 59
- .2byte 60
- .2byte 61
- .2byte 62
- .2byte ITEM_HP_UP
- .2byte ITEM_PROTEIN
- .2byte ITEM_IRON
- .2byte ITEM_RED_SHARD
- .2byte ITEM_BLUE_SHARD
- .2byte ITEM_YELLOW_SHARD
- .2byte ITEM_NONE
+LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
+ .2byte DECOR_SURF_MAT
+ .2byte DECOR_THUNDER_MAT
+ .2byte DECOR_FIRE_BLAST_MAT
+ .2byte DECOR_POWDER_SNOW_MAT
+ .2byte DECOR_ATTRACT_MAT
+ .2byte DECOR_FISSURE_MAT
+ .2byte DECOR_SPIKES_MAT
+ .2byte DECOR_GLITTER_MAT
+ .2byte DECOR_JUMP_MAT
+ .2byte DECOR_SPIN_MAT
+ .2byte DECOR_NONE
release
end
@@ -167,4 +167,3 @@ LilycoveCity_DepartmentStore_5F_Text_22016B: @ 822016B
LilycoveCity_DepartmentStore_5F_Text_2201C4: @ 82201C4
.string "I think they closed the rooftop\n"
.string "because the weather is wild today.$"
-
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 2a8a8b88e..b4d10cf0f 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -48,20 +48,20 @@ Route104_PrettyPetalFlowerShop_EventScript_22A3DB:: @ 822A3DB
Route104_PrettyPetalFlowerShop_EventScript_22A3E4:: @ 822A3E4
message gUnknown_08272A52
waitmessage
- pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_22A3FC
+ pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC
- .2byte ITEM_FULL_RESTORE
- .2byte ITEM_MAX_POTION
- .2byte ITEM_HYPER_POTION
- .2byte ITEM_SUPER_POTION
- .2byte ITEM_FULL_HEAL
- .2byte ITEM_REVIVE
- .2byte ITEM_NONE
+Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
+ .2byte DECOR_RED_PLANT
+ .2byte DECOR_TROPICAL_PLANT
+ .2byte DECOR_PRETTY_FLOWERS
+ .2byte DECOR_COLORFUL_PLANT
+ .2byte DECOR_BIG_PLANT
+ .2byte DECOR_GORGEOUS_PLANT
+ .2byte DECOR_NONE
release
end
@@ -101,4 +101,3 @@ Route104_PrettyPetalFlowerShop_EventScript_22A482:: @ 822A482
msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT
release
end
-
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 175d25416..d25a0fbfa 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -491,17 +491,17 @@ SlateportCity_EventScript_1DD16A:: @ 81DD16A
faceplayer
message gUnknown_08272A21
waitmessage
- pokemartdecoration SlateportCity_PokemartDecor_1DD184
+ pokemartdecoration SlateportCity_PokemartDecor_Dolls
msgbox gUnknown_08272A3F, MSGBOX_DEFAULT
release
end
.align 2
-SlateportCity_PokemartDecor_1DD184: @ 81DD184
- .2byte 95
- .2byte 78
- .2byte 96
- .2byte 0
+SlateportCity_PokemartDecor_Dolls: @ 81DD184
+ .2byte DECOR_AZURILL_DOLL
+ .2byte DECOR_MARILL_DOLL
+ .2byte DECOR_SKITTY_DOLL
+ .2byte DECOR_NONE
release
end
@@ -522,21 +522,21 @@ SlateportCity_EventScript_1DD198:: @ 81DD198
end
SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
- .2byte 25
- .2byte 27
- .2byte 26
- .2byte 28
- .2byte 29
- .2byte 30
- .2byte 51
- .2byte 52
- .2byte 53
- .2byte 54
- .2byte 55
- .2byte 56
- .2byte 57
- .2byte 58
- .2byte 0
+ .2byte DECOR_RED_BRICK
+ .2byte DECOR_BLUE_BRICK
+ .2byte DECOR_YELLOW_BRICK
+ .2byte DECOR_RED_BALLOON
+ .2byte DECOR_BLUE_BALLOON
+ .2byte DECOR_YELLOW_BALLOON
+ .2byte DECOR_C_LOW_NOTE_MAT
+ .2byte DECOR_D_NOTE_MAT
+ .2byte DECOR_E_NOTE_MAT
+ .2byte DECOR_F_NOTE_MAT
+ .2byte DECOR_G_NOTE_MAT
+ .2byte DECOR_A_NOTE_MAT
+ .2byte DECOR_B_NOTE_MAT
+ .2byte DECOR_C_HIGH_NOTE_MAT
+ .2byte DECOR_NONE
release
end
@@ -1372,4 +1372,4 @@ SlateportCity_Text_1DF28C: @ 81DF28C
.string "That's a really great idea!\p"
.string "After all, a tough TRAINER is\n"
.string "the perfect fit for the BATTLE TENT!\p"
- .string "Give it your best effort!$"
+ .string "Give it your best effort!$" \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 13:30:39 +0000