Finished the decoration attributes table

Interpretation of the Decoration Attributes table is complete.

Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
This commit is contained in:
PikalaxALT
2015-07-19 04:58:31 -04:00
parent 60cd04b023
commit 94129b6b45
364 changed files with 1961 additions and 1899 deletions

View File

@@ -0,0 +1,105 @@
const_value = 1
const DECO_PLANT
const DECO_BED
const DECO_CARPET
const DECO_POSTER
const DECO_DOLL
const DECO_BIGDOLL
const_value = 1
const PUT_IT_AWAY
const MAGNAPLANT
const TROPICPLANT
const JUMBOPLANT
const TOWN_MAP_D
const FAMICOM
const SUPER_NES
const NINTENDO_64
const VIRTUAL_BOY
const GOLD_TROPHY
const SILVER_TROPHY
const SURF_PIKA_DOLL
const _BED
const _CARPET
const _POSTER
const _DOLL
const BIG_
const FEATHERY_BED
const PIKACHU_BED
const PINK_BED
const POLKADOT_BED
const RED_CARPET
const BLUE_CARPET
const YELLOW_CARPET
const GREEN_CARPET
const_value = 1
const SET_UP_BED
const PUT_AWAY_BED
const SET_UP_CARPET
const PUT_AWAY_CARPET
const SET_UP_PLANT
const PUT_AWAY_PLANT
const SET_UP_POSTER
const PUT_AWAY_POSTER
const SET_UP_CONSOLE
const PUT_AWAY_CONSOLE
const SET_UP_BIG_DOLL
const PUT_AWAY_BIG_DOLL
const SET_UP_DOLL
const PUT_AWAY_DOLL
const SET_UP_ORNAMENT
const PUT_AWAY_ORNAMENT
const_value = 2
const DECO_FEATHERY_BED ; 2
const DECO_PINK_BED ; 3
const DECO_POLKADOT_BED ; 4
const DECO_PIKACHU_BED ; 5
const_value = const_value + 1
const DECO_RED_CARPET ; 7
const DECO_BLUE_CARPET ; 8
const DECO_YELLOW_CARPET ; 9
const DECO_GREEN_CARPET ; a
const_value = const_value + 1
const DECO_MAGNAPLANT ; c
const DECO_TROPICPLANT ; d
const DECO_JUMBOPLANT ; e
const_value = const_value + 1
const DECO_TOWN_MAP ; 10
const DECO_PIKACHU_POSTER ; 11
const DECO_CLEFAIRY_POSTER ; 12
const DECO_JIGGLYPUFF_POSTER ; 13
const_value = const_value + 1
const DECO_FAMICOM ; 15
const DECO_SNES ; 16
const DECO_N64 ; 17
const DECO_VIRTUAL_BOY ; 18
const_value = const_value + 1
const DECO_BIG_SNORLAX_DOLL ; 1a
const DECO_BIG_ONIX_DOLL ; 1b
const DECO_BIG_LAPRAS_DOLL ; 1c
const_value = const_value + 1
const DECO_PIKACHU_DOLL ; 1e
const DECO_SURF_PIKACHU_DOLL ; 1f
const DECO_CLEFAIRY_DOLL ; 20
const DECO_JIGGLYPUFF_DOLL ; 21
const DECO_BULBASAUR_DOLL ; 22
const DECO_CHARMANDER_DOLL ; 23
const DECO_SQUIRTLE_DOLL ; 24
const DECO_POLIWAG_DOLL ; 25
const DECO_DIGLETT_DOLL ; 26
const DECO_STARMIE_DOLL ; 27
const DECO_MAGIKARP_DOLL ; 28
const DECO_ODDISH_DOLL ; 29
const DECO_GENGAR_DOLL ; 2a
const DECO_SHELLDER_DOLL ; 2b
const DECO_GRIMER_DOLL ; 2c
const DECO_VOLTORB_DOLL ; 2d
const DECO_WEEDLE_DOLL ; 2e
const DECO_UNOWN_DOLL ; 2f
const DECO_GEODUDE_DOLL ; 30
const DECO_MACHOP_DOLL ; 31
const DECO_TENTACOOL_DOLL ; 32
const DECO_GOLD_TROPHY_DOLL ; 33
const DECO_SILVER_TROPHY_DOLL ; 34

View File

@@ -55,7 +55,7 @@
const EVENT_033
const EVENT_034
const EVENT_035
const EVENT_036
const EVENT_INITIALIZED_EVENTS
const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
const EVENT_038
const EVENT_039
@@ -642,7 +642,7 @@
const EVENT_TODD_ASKED_FOR_PHONE_NUMBER
const EVENT_27E
const EVENT_GINA_ASKED_FOR_PHONE_NUMBER
const EVENT_280
const EVENT_280 ; 280
const EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
const EVENT_282
const EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
@@ -658,7 +658,7 @@
const EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
const EVENT_28E
const EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
const EVENT_290
const EVENT_290 ; 290
const EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
const EVENT_292
const EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
@@ -674,56 +674,56 @@
const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
const EVENT_29F
const EVENT_2A0
const EVENT_2A0 ; 2a0
const EVENT_2A1
const EVENT_2A2
const EVENT_2A3
const EVENT_2A4
const EVENT_2A5
const EVENT_2A6
const EVENT_2A7
const EVENT_2A8
const EVENT_2A9
const EVENT_2AA
const EVENT_2AB
const EVENT_2AC
const EVENT_2AD
const EVENT_2AE
const EVENT_2AF
const EVENT_2B0
const EVENT_2B1
const EVENT_2B2
const EVENT_2B3
const EVENT_2B4
const EVENT_2B5
const EVENT_2B6
const EVENT_2B7
const EVENT_2B8
const EVENT_2B9
const EVENT_2BA
const EVENT_2BB
const EVENT_2BC
const EVENT_2BD
const EVENT_2BE
const EVENT_2BF
const EVENT_2C0
const EVENT_2C1
const EVENT_2C2
const EVENT_2C3
const EVENT_2C4
const EVENT_2C5
const EVENT_2C6
const EVENT_2C7
const EVENT_2C8
const EVENT_2C9
const EVENT_2CA
const EVENT_2CB
const EVENT_DECO_BED_1
const EVENT_DECO_BED_2
const EVENT_DECO_BED_3
const EVENT_DECO_BED_4
const EVENT_DECO_CARPET_1
const EVENT_DECO_CARPET_2
const EVENT_DECO_CARPET_3
const EVENT_DECO_CARPET_4
const EVENT_DECO_PLANT_1
const EVENT_DECO_PLANT_2
const EVENT_DECO_PLANT_3
const EVENT_DECO_PLANT_4
const EVENT_DECO_POSTER_1 ; 2b0
const EVENT_DECO_POSTER_2
const EVENT_DECO_POSTER_3
const EVENT_DECO_FAMICOM
const EVENT_DECO_SNES
const EVENT_DECO_N64
const EVENT_DECO_VIRTUAL_BOY
const EVENT_DECO_PIKACHU_DOLL
const EVENT_DECO_SURFING_PIKACHU_DOLL
const EVENT_DECO_CLEFAIRY_DOLL
const EVENT_DECO_JIGGLYPUFF_DOLL
const EVENT_DECO_BULBASAUR_DOLL
const EVENT_DECO_CHARMANDER_DOLL
const EVENT_DECO_SQUIRTLE_DOLL
const EVENT_DECO_POLIWAG_DOLL
const EVENT_DECO_DIGLETT_DOLL
const EVENT_DECO_STARMIE_DOLL ; 2c0
const EVENT_DECO_MAGIKARP_DOLL
const EVENT_DECO_ODDISH_DOLL
const EVENT_DECO_GENGAR_DOLL
const EVENT_DECO_SHELLDER_DOLL
const EVENT_DECO_GRIMER_DOLL
const EVENT_DECO_VOLTORB_DOLL
const EVENT_DECO_WEEDLE_DOLL
const EVENT_DECO_UNOWN_DOLL
const EVENT_DECO_GEODUDE_DOLL
const EVENT_DECO_MACHOP_DOLL
const EVENT_DECO_TENTACOOL_DOLL
const EVENT_KRISS_ROOM_POSTER
const EVENT_2CD
const EVENT_2CE
const EVENT_2CF
const EVENT_2D0 ; 2d0
const EVENT_2D1
const EVENT_DECO_GOLD_TROPHY
const EVENT_DECO_SILVER_TROPHY
const EVENT_DECO_BIG_SNORLAX_DOLL
const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
const EVENT_DECO_BIG_LAPRAS_DOLL
const EVENT_2D2
const EVENT_SWITCH_1
const EVENT_SWITCH_2

View File

@@ -718,17 +718,16 @@ const_value SET 1
const MAPOBJECT_FLAG_HI ; d
const MAPOBJECT_E ; unused
const MAPOBJECT_F ; unused
MAPOBJECT_NOT_VISIBLE EQU -1
MAPOBJECT_SCREEN_HEIGHT EQU 11
MAPOBJECT_SCREEN_WIDTH EQU 12
OBJECT_STRUCT_3_DATA_WIDTH EQU 6
OBJECT_STRUCT_3_DATA_HEIGHT EQU 37
OW_DOWN EQU $0
OW_RIGHT EQU $4
OW_UP EQU $8
OW_LEFT EQU $c
OW_UP EQU $4
OW_LEFT EQU $8
OW_RIGHT EQU $c
const_def
const EMOTE_SHOCK ; 0

View File

@@ -103,66 +103,3 @@ const_value = 1
const MOM_ITEM
const MOM_DOLL
const_def
const DECO_BED
const DECO_CARPET
const DECO_PLANT
const DECO_POSTER
const DECO_CONSOLE
const DECO_ORNAMENT
const DECO_BIGDOLL
const_def
const CARPET_00
const CARPET_01
const PLANT_02
const PLANT_03
const PLANT_04
const PLANT_05
const CARPET_06
const POSTER_07
const POSTER_08
const POSTER_09
const POSTER_0A
const CARPET_0B
const CARPET_0C
const CARPET_0D
const CARPET_0E
const CARPET_0F
const CARPET_10
const CONSOLE_11
const CONSOLE_12
const CONSOLE_13
const CARPET_14
const CARPET_FAMICOM
const CONSTENT_SNES
const CARPET_N64
const CARPET_VIRTUAL_BOY
const CARPET_19
const BIGDOLL_SNORLAX
const BIGDOLL_ONIX
const BIGDOLL_LAPRAS
const CARPET_1D
const DOLL_PIKACHU
const DOLL_SURFING_PIKACHU
const DOLL_CLEFAIRY
const DOLL_JIGGLYPUFF
const DOLL_BULBASAUR
const DOLL_CHARMANDER
const DOLL_SQUIRTLE
const DOLL_POLIWAG
const DOLL_DIGLETT
const DOLL_STARMIE
const DOLL_MAGIKARP
const DOLL_ODDISH
const DOLL_GENGAR
const DOLL_SHELLDER
const DOLL_GRIMER
const DOLL_VOLTORM
const DOLL_WEEDLE
const DOLL_UNOWN
const DOLL_GEODUDE
const DOLL_MACHOP
const DOLL_TENTACOOL
const CARPET_GOLD_TROPHY
const CARPET_SILVER_TROPHY