Item effects, post-battle, and decoration flags

This commit is contained in:
PikalaxALT
2015-12-29 16:44:37 -05:00
parent 9bbb65166e
commit 2a263629a4
7 changed files with 136 additions and 126 deletions

View File

@@ -207,7 +207,7 @@ DecoBedMenu: ; 268b5
FindOwnedBeds: ; 268bd
ld hl, .beds
ld c, DECO_BEDS
ld c, BEDS
jp FindOwnedDecosInCategory
; 268c5
@@ -228,7 +228,7 @@ DecoCarpetMenu: ; 268ca
FindOwnedCarpets: ; 268d2
ld hl, .carpets
ld c, DECO_CARPETS
ld c, CARPETS
jp FindOwnedDecosInCategory
; 268da
@@ -249,7 +249,7 @@ DecoPlantMenu: ; 268df
FindOwnedPlants: ; 268e7
ld hl, .plants
ld c, DECO_0B
ld c, PLANTS
jp FindOwnedDecosInCategory
; 268ef
@@ -269,7 +269,7 @@ DecoPosterMenu: ; 268f3
FindOwnedPosters: ; 268fb
ld hl, .posters
ld c, DECO_POSTERS
ld c, POSTERS
jp FindOwnedDecosInCategory
; 26903
@@ -290,7 +290,7 @@ DecoConsoleMenu: ; 26908
FindOwnedConsoles: ; 26910
ld hl, .consoles
ld c, DECO_CONSOLES
ld c, CONSOLES
jp FindOwnedDecosInCategory
; 26918
@@ -311,7 +311,7 @@ DecoOrnamentMenu: ; 2691d
FindOwnedOrnaments: ; 26925
ld hl, .ornaments
ld c, DECO_DOLLS
ld c, DOLLS
jp FindOwnedDecosInCategory
; 2692d
@@ -351,7 +351,7 @@ DecoBigDollMenu: ; 26945
FindOwnedBigDolls: ; 2694d
ld hl, .big_dolls
ld c, DECO_BIG_DOLLS
ld c, BIG_DOLLS
jp FindOwnedDecosInCategory
; 26955

View File

@@ -187,41 +187,41 @@ MysteryGiftItems: ; 2c725
; 2c74a
MysteryGiftDecos: ; 2c74a
db DECO_SNES
db DECO_BIG_SNORLAX_DOLL
db DECO_BIG_ONIX_DOLL
db DECO_BIG_LAPRAS_DOLL
db DECO_DOLLS
db DECO_PIKACHU_DOLL
db DECO_SURF_PIKACHU_DOLL
db DECO_CLEFAIRY_DOLL
db DECO_JIGGLYPUFF_DOLL
db DECO_BULBASAUR_DOLL
db DECO_TROPICPLANT
db DECO_JUMBOPLANT
db DECO_TOWN_MAP
db DECO_CHARMANDER_DOLL
db DECO_POLIWAG_DOLL
db DECO_DIGLETT_DOLL
db DECO_BLUE_CARPET
db DECO_YELLOW_CARPET
db DECO_POSTERS
db DECO_PIKACHU_POSTER
db DECO_N64
db DECO_BIG_DOLLS
db DECO_BEDS
db DECO_FEATHERY_BED
db DECO_POLKADOT_BED
db DECO_PIKACHU_BED
db DECO_CARPETS
db DECO_RED_CARPET
db DECO_GREEN_CARPET
db DECO_CLEFAIRY_POSTER
db DECO_ODDISH_DOLL
db DECO_MAGNAPLANT
db DECO_GENGAR_DOLL
db DECO_CONSOLES
db DECO_PINK_BED
db DECO_SQUIRTLE_DOLL
db DECO_STARMIE_DOLL
db DECOFLAG_PIKACHU_DOLL
db DECOFLAG_BULBASAUR_DOLL
db DECOFLAG_CHARMANDER_DOLL
db DECOFLAG_SQUIRTLE_DOLL
db DECOFLAG_POLIWAG_DOLL
db DECOFLAG_DIGLETT_DOLL
db DECOFLAG_STARMIE_DOLL
db DECOFLAG_MAGIKARP_DOLL
db DECOFLAG_ODDISH_DOLL
db DECOFLAG_GENGAR_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_MAGNAPLANT
db DECOFLAG_TROPICPLANT
db DECOFLAG_FAMICOM
db DECOFLAG_N64
db DECOFLAG_SURF_PIKACHU_DOLL
db DECOFLAG_JIGGLYPUFF_DOLL
db DECOFLAG_PINK_BED
db DECOFLAG_POLKADOT_BED
db DECOFLAG_RED_CARPET
db DECOFLAG_BLUE_CARPET
db DECOFLAG_YELLOW_CARPET
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_BED
db DECOFLAG_GRIMER_DOLL
db DECOFLAG_UNOWN_DOLL
; 2c76f