diff options
| -rw-r--r-- | data/scripts/maps/FortreeCity_DecorationShop.s | 44 | ||||
| -rw-r--r-- | data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s | 34 | ||||
| -rw-r--r-- | data/scripts/maps/SlateportCity.s | 74 |
3 files changed, 76 insertions, 76 deletions
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.s b/data/scripts/maps/FortreeCity_DecorationShop.s index 47d96115c..c9d9fdd4e 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.s +++ b/data/scripts/maps/FortreeCity_DecorationShop.s @@ -14,22 +14,22 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waittext - pokemartdecor FortreeCity_DecorationShop_PokemartDecor_158284 + pokemartdecor FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end .align 2 -FortreeCity_DecorationShop_PokemartDecor_158284:: @ 8158284 - .2byte 1 - .2byte 2 - .2byte 3 - .2byte 4 - .2byte 5 - .2byte 7 - .2byte 8 - .2byte 9 - .2byte 0 +FortreeCity_DecorationShop_Decorations1:: @ 8158284 + .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,21 +38,21 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waittext - pokemartdecor FortreeCity_DecorationShop_PokemartDecor_1582B0 + pokemartdecor FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end .align 2 -FortreeCity_DecorationShop_PokemartDecor_1582B0:: @ 81582B0 - .2byte 10 - .2byte 11 - .2byte 12 - .2byte 15 - .2byte 14 - .2byte 16 - .2byte 17 - .2byte 18 - .2byte 0 +FortreeCity_DecorationShop_Decorations2:: @ 81582B0 + .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/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s index da00a0ec5..f84c84201 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.s @@ -23,28 +23,28 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 waittext - pokemartdecor LilycoveCity_DepartmentStoreRooftop_PokemartDecor_15A180 + pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release end .align 2 -LilycoveCity_DepartmentStoreRooftop_PokemartDecor_15A180:: @ 815A180 - .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 0 +LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 + .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 DECOR_NONE release end diff --git a/data/scripts/maps/SlateportCity.s b/data/scripts/maps/SlateportCity.s index d89490b14..19f9af2eb 100644 --- a/data/scripts/maps/SlateportCity.s +++ b/data/scripts/maps/SlateportCity.s @@ -388,17 +388,17 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 faceplayer message SlateportCity_Text_1A0BE4 waittext - pokemartdecor SlateportCity_PokemartDecor_14BE0C + pokemartdecor SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release end .align 2 -SlateportCity_PokemartDecor_14BE0C:: @ 814BE0C - .2byte 95 - .2byte 78 - .2byte 96 - .2byte 0 +SlateportCity_Decorations1:: @ 814BE0C + .2byte DECOR_AZURILL_DOLL + .2byte DECOR_MARILL_DOLL + .2byte DECOR_SKITTY_DOLL + .2byte DECOR_NONE release end @@ -414,28 +414,28 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 jumpif 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext - pokemartdecor SlateportCity_PokemartDecor_14BE40 + pokemartdecor SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release end .align 2 -SlateportCity_PokemartDecor_14BE40:: @ 814BE40 - .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 +SlateportCity_Decorations2:: @ 814BE40 + .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 @@ -446,25 +446,25 @@ SlateportCity_PokemartDecor_14BE40:: @ 814BE40 jumpif 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext - pokemartdecor SlateportCity_PokemartDecor_14BE80 + pokemartdecor SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release end .align 2 -SlateportCity_PokemartDecor_14BE80:: @ 814BE80 - .2byte 39 - .2byte 34 - .2byte 35 - .2byte 36 - .2byte 37 - .2byte 40 - .2byte 33 - .2byte 38 - .2byte 45 - .2byte 46 - .2byte 47 - .2byte 0 +SlateportCity_Decorations3:: @ 814BE80 + .2byte DECOR_MUD_BALL + .2byte DECOR_SLIDE + .2byte DECOR_FENCE_LENGTH + .2byte DECOR_FENCE_WIDTH + .2byte DECOR_TIRE + .2byte DECOR_BREAKABLE_DOOR + .2byte DECOR_SOLID_BOARD + .2byte DECOR_STAND + .2byte DECOR_TV + .2byte DECOR_ROUND_TV + .2byte DECOR_CUTE_TV + .2byte DECOR_NONE release end |