From b0ddb0758dd86950ad3c504aa09a4e3e2dffd495 Mon Sep 17 00:00:00 2001 From: Tiddlywinks Date: Sat, 15 Jul 2023 10:38:22 -0500 Subject: [PATCH] 1) Fix DECOFLAG order. 2) The doll is Staryu, not Starmie (and the sprite can be either) --- constants/deco_constants.asm | 149 +++++++++++++++--------- constants/event_flags.asm | 2 +- data/decorations/attributes.asm | 2 +- data/decorations/decorations.asm | 2 +- data/decorations/mystery_gift_decos.asm | 26 ++--- engine/overworld/decorations.asm | 2 +- 6 files changed, 111 insertions(+), 72 deletions(-) diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm index f877276f6bb..3d8ffefae42 100644 --- a/constants/deco_constants.asm +++ b/constants/deco_constants.asm @@ -65,77 +65,116 @@ DEF NUM_DECO_NAMES EQU const_value const PUT_AWAY_DOLL DEF NUM_DECO_ACTIONS EQU const_value - 1 -DEF __deco_value__ = 0 - -MACRO deco - const DECO_\1 - DEF DECOFLAG_\1 EQU __deco_value__ - DEF __deco_value__ += 1 -ENDM +; DecorationIDs indexes (see data/decorations/decorations.asm) + const_def + const DECOFLAG_FEATHERY_BED + const DECOFLAG_PINK_BED + const DECOFLAG_POLKADOT_BED + const DECOFLAG_PIKACHU_BED + const DECOFLAG_RED_CARPET + const DECOFLAG_BLUE_CARPET + const DECOFLAG_YELLOW_CARPET + const DECOFLAG_GREEN_CARPET + const DECOFLAG_MAGNAPLANT + const DECOFLAG_TROPICPLANT + const DECOFLAG_JUMBOPLANT + const DECOFLAG_TOWN_MAP + const DECOFLAG_PIKACHU_POSTER + const DECOFLAG_CLEFAIRY_POSTER + const DECOFLAG_JIGGLYPUFF_POSTER + const DECOFLAG_FAMICOM + const DECOFLAG_SNES + const DECOFLAG_N64 + const DECOFLAG_VIRTUAL_BOY + const DECOFLAG_PIKACHU_DOLL + const DECOFLAG_SURF_PIKACHU_DOLL + const DECOFLAG_CLEFAIRY_DOLL + const DECOFLAG_JIGGLYPUFF_DOLL + const DECOFLAG_BULBASAUR_DOLL + const DECOFLAG_CHARMANDER_DOLL + const DECOFLAG_SQUIRTLE_DOLL + const DECOFLAG_POLIWAG_DOLL + const DECOFLAG_DIGLETT_DOLL + const DECOFLAG_STARYU_DOLL + const DECOFLAG_MAGIKARP_DOLL + const DECOFLAG_ODDISH_DOLL + const DECOFLAG_GENGAR_DOLL + const DECOFLAG_SHELLDER_DOLL + const DECOFLAG_GRIMER_DOLL + const DECOFLAG_VOLTORB_DOLL + const DECOFLAG_WEEDLE_DOLL + const DECOFLAG_UNOWN_DOLL + const DECOFLAG_GEODUDE_DOLL + const DECOFLAG_MACHOP_DOLL + const DECOFLAG_TENTACOOL_DOLL + const DECOFLAG_BIG_SNORLAX_DOLL + const DECOFLAG_BIG_ONIX_DOLL + const DECOFLAG_BIG_LAPRAS_DOLL +DEF NUM_NON_TROPHY_DECOS EQU const_value + const DECOFLAG_GOLD_TROPHY_DOLL + const DECOFLAG_SILVER_TROPHY_DOLL +DEF NUM_DECOS EQU const_value ; decorations: ; - DecorationAttributes (see data/decorations/attributes.asm) -; - DecorationIDs (see data/decorations/decorations.asm) const_def 1 ; FindOwnedBeds.beds values (see engine/overworld/decorations.asm) const BEDS - deco FEATHERY_BED - deco PINK_BED - deco POLKADOT_BED - deco PIKACHU_BED + const DECO_FEATHERY_BED + const DECO_PINK_BED + const DECO_POLKADOT_BED + const DECO_PIKACHU_BED ; FindOwnedCarpets.carpets values (see engine/overworld/decorations.asm) const CARPETS - deco RED_CARPET - deco BLUE_CARPET - deco YELLOW_CARPET - deco GREEN_CARPET + const DECO_RED_CARPET + const DECO_BLUE_CARPET + const DECO_YELLOW_CARPET + const DECO_GREEN_CARPET ; FindOwnedPlants.plants values (see engine/overworld/decorations.asm) const PLANTS - deco MAGNAPLANT - deco TROPICPLANT - deco JUMBOPLANT + const DECO_MAGNAPLANT + const DECO_TROPICPLANT + const DECO_JUMBOPLANT ; FindOwnedPosters.posters values (see engine/overworld/decorations.asm) const POSTERS - deco TOWN_MAP - deco PIKACHU_POSTER - deco CLEFAIRY_POSTER - deco JIGGLYPUFF_POSTER + const DECO_TOWN_MAP + const DECO_PIKACHU_POSTER + const DECO_CLEFAIRY_POSTER + const DECO_JIGGLYPUFF_POSTER ; FindOwnedConsoles.consoles values (see engine/overworld/decorations.asm) const CONSOLES - deco FAMICOM - deco SNES - deco N64 - deco VIRTUAL_BOY + const DECO_FAMICOM + const DECO_SNES + const DECO_N64 + const DECO_VIRTUAL_BOY ; FindOwnedBigDolls.big_dolls values (see engine/overworld/decorations.asm) const BIG_DOLLS - deco BIG_SNORLAX_DOLL - deco BIG_ONIX_DOLL - deco BIG_LAPRAS_DOLL + const DECO_BIG_SNORLAX_DOLL + const DECO_BIG_ONIX_DOLL + const DECO_BIG_LAPRAS_DOLL ; FindOwnedOrnaments.ornaments values (see engine/overworld/decorations.asm) const DOLLS - deco PIKACHU_DOLL - deco SURF_PIKACHU_DOLL - deco CLEFAIRY_DOLL - deco JIGGLYPUFF_DOLL - deco BULBASAUR_DOLL - deco CHARMANDER_DOLL - deco SQUIRTLE_DOLL - deco POLIWAG_DOLL - deco DIGLETT_DOLL - deco STARMIE_DOLL - deco MAGIKARP_DOLL - deco ODDISH_DOLL - deco GENGAR_DOLL - deco SHELLDER_DOLL - deco GRIMER_DOLL - deco VOLTORB_DOLL - deco WEEDLE_DOLL - deco UNOWN_DOLL - deco GEODUDE_DOLL - deco MACHOP_DOLL - deco TENTACOOL_DOLL -DEF NUM_NON_TROPHY_DECOS EQU __deco_value__ - deco GOLD_TROPHY_DOLL - deco SILVER_TROPHY_DOLL -DEF NUM_DECOS EQU __deco_value__ + const DECO_PIKACHU_DOLL + const DECO_SURF_PIKACHU_DOLL + const DECO_CLEFAIRY_DOLL + const DECO_JIGGLYPUFF_DOLL + const DECO_BULBASAUR_DOLL + const DECO_CHARMANDER_DOLL + const DECO_SQUIRTLE_DOLL + const DECO_POLIWAG_DOLL + const DECO_DIGLETT_DOLL + const DECO_STARYU_DOLL + const DECO_MAGIKARP_DOLL + const DECO_ODDISH_DOLL + const DECO_GENGAR_DOLL + const DECO_SHELLDER_DOLL + const DECO_GRIMER_DOLL + const DECO_VOLTORB_DOLL + const DECO_WEEDLE_DOLL + const DECO_UNOWN_DOLL + const DECO_GEODUDE_DOLL + const DECO_MACHOP_DOLL + const DECO_TENTACOOL_DOLL + const DECO_GOLD_TROPHY_DOLL + const DECO_SILVER_TROPHY_DOLL DEF NUM_DECO_CATEGORIES EQU const_value - 1 - NUM_DECOS diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c4512521e34..792052199fc 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -379,7 +379,7 @@ const EVENT_DECO_SQUIRTLE_DOLL const EVENT_DECO_POLIWAG_DOLL const EVENT_DECO_DIGLETT_DOLL - const EVENT_DECO_STARMIE_DOLL + const EVENT_DECO_STARYU_DOLL const EVENT_DECO_MAGIKARP_DOLL const EVENT_DECO_ODDISH_DOLL const EVENT_DECO_GENGAR_DOLL diff --git a/data/decorations/attributes.asm b/data/decorations/attributes.asm index 88f6dc212cf..b3f9494674d 100644 --- a/data/decorations/attributes.asm +++ b/data/decorations/attributes.asm @@ -47,7 +47,7 @@ DecorationAttributes: decoration DECO_DOLL, SQUIRTLE, SET_UP_DOLL, EVENT_DECO_SQUIRTLE_DOLL, SPRITE_SQUIRTLE decoration DECO_DOLL, POLIWAG, SET_UP_DOLL, EVENT_DECO_POLIWAG_DOLL, SPRITE_POLIWAG decoration DECO_DOLL, DIGLETT, SET_UP_DOLL, EVENT_DECO_DIGLETT_DOLL, SPRITE_DIGLETT - decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARMIE_DOLL, SPRITE_STARMIE + decoration DECO_DOLL, STARYU, SET_UP_DOLL, EVENT_DECO_STARYU_DOLL, SPRITE_STARMIE decoration DECO_DOLL, MAGIKARP, SET_UP_DOLL, EVENT_DECO_MAGIKARP_DOLL, SPRITE_MAGIKARP decoration DECO_DOLL, ODDISH, SET_UP_DOLL, EVENT_DECO_ODDISH_DOLL, SPRITE_ODDISH decoration DECO_DOLL, GENGAR, SET_UP_DOLL, EVENT_DECO_GENGAR_DOLL, SPRITE_GENGAR diff --git a/data/decorations/decorations.asm b/data/decorations/decorations.asm index 9cd24d1fcce..00d0b09d1fa 100644 --- a/data/decorations/decorations.asm +++ b/data/decorations/decorations.asm @@ -35,7 +35,7 @@ DecorationIDs: db DECO_SQUIRTLE_DOLL ; 24 db DECO_POLIWAG_DOLL ; 25 db DECO_DIGLETT_DOLL ; 26 - db DECO_STARMIE_DOLL ; 27 + db DECO_STARYU_DOLL ; 27 db DECO_MAGIKARP_DOLL ; 28 db DECO_ODDISH_DOLL ; 29 db DECO_GENGAR_DOLL ; 2a diff --git a/data/decorations/mystery_gift_decos.asm b/data/decorations/mystery_gift_decos.asm index 3b75c0a5868..f773a9ffbba 100644 --- a/data/decorations/mystery_gift_decos.asm +++ b/data/decorations/mystery_gift_decos.asm @@ -1,26 +1,26 @@ MysteryGiftDecos: - db DECOFLAG_PIKACHU_DOLL - db DECOFLAG_BULBASAUR_DOLL - db DECOFLAG_CHARMANDER_DOLL - db DECOFLAG_SQUIRTLE_DOLL + db DECOFLAG_JIGGLYPUFF_DOLL db DECOFLAG_POLIWAG_DOLL db DECOFLAG_DIGLETT_DOLL - db DECOFLAG_STARMIE_DOLL + db DECOFLAG_STARYU_DOLL db DECOFLAG_MAGIKARP_DOLL db DECOFLAG_ODDISH_DOLL db DECOFLAG_GENGAR_DOLL + db DECOFLAG_SHELLDER_DOLL + db DECOFLAG_GRIMER_DOLL + db DECOFLAG_VOLTORB_DOLL db DECOFLAG_CLEFAIRY_POSTER db DECOFLAG_JIGGLYPUFF_POSTER db DECOFLAG_SNES - db DECOFLAG_SHELLDER_DOLL - db DECOFLAG_VOLTORB_DOLL db DECOFLAG_WEEDLE_DOLL + db DECOFLAG_GEODUDE_DOLL + db DECOFLAG_MACHOP_DOLL db DECOFLAG_MAGNAPLANT db DECOFLAG_TROPICPLANT db DECOFLAG_FAMICOM db DECOFLAG_N64 - db DECOFLAG_SURF_PIKACHU_DOLL - db DECOFLAG_JIGGLYPUFF_DOLL + db DECOFLAG_BULBASAUR_DOLL + db DECOFLAG_SQUIRTLE_DOLL db DECOFLAG_PINK_BED db DECOFLAG_POLKADOT_BED db DECOFLAG_RED_CARPET @@ -29,11 +29,11 @@ MysteryGiftDecos: db DECOFLAG_GREEN_CARPET db DECOFLAG_JUMBOPLANT db DECOFLAG_VIRTUAL_BOY - db DECOFLAG_MACHOP_DOLL - db DECOFLAG_PIKACHU_POSTER - db DECOFLAG_TENTACOOL_DOLL db DECOFLAG_BIG_ONIX_DOLL + db DECOFLAG_PIKACHU_POSTER + db DECOFLAG_BIG_LAPRAS_DOLL + db DECOFLAG_SURF_PIKACHU_DOLL db DECOFLAG_PIKACHU_BED - db DECOFLAG_GRIMER_DOLL db DECOFLAG_UNOWN_DOLL + db DECOFLAG_TENTACOOL_DOLL .End diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index 23978d049da..38e256b4cbf 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -303,7 +303,7 @@ FindOwnedOrnaments: db DECO_SQUIRTLE_DOLL ; 24 db DECO_POLIWAG_DOLL ; 25 db DECO_DIGLETT_DOLL ; 26 - db DECO_STARMIE_DOLL ; 27 + db DECO_STARYU_DOLL ; 27 db DECO_MAGIKARP_DOLL ; 28 db DECO_ODDISH_DOLL ; 29 db DECO_GENGAR_DOLL ; 2a