Merge pull request #320 from PikalaxALT/master

More labels, including fns responsible for partymon generation

4 files changed, 133 insertions, 18 deletions

diff --git a/constants/deco_constants.asm b/constants/deco_constants.asm
index de8edb652..6f15b5f35 100644
--- a/constants/deco_constants.asm
+++ b/constants/deco_constants.asm
@@ -51,35 +51,36 @@ const_value = 1
 	const SET_UP_ORNAMENT
 	const PUT_AWAY_ORNAMENT
 
-const_value = 2
+const_value = 1
+	const DECO_01
 	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_06
 	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_0B
 	const DECO_MAGNAPLANT ; c
 	const DECO_TROPICPLANT ; d
 	const DECO_JUMBOPLANT ; e
-const_value = const_value + 1
+	const DECO_0F
 	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_14
 	const DECO_FAMICOM ; 15
 	const DECO_SNES ; 16
 	const DECO_N64 ; 17
 	const DECO_VIRTUAL_BOY ; 18
-const_value = const_value + 1
+	const DECO_19
 	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_1D
 	const DECO_PIKACHU_DOLL ; 1e
 	const DECO_SURF_PIKACHU_DOLL ; 1f
 	const DECO_CLEFAIRY_DOLL ; 20
diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm
index 425801e8e..9678faf8a 100644
--- a/constants/misc_constants.asm
+++ b/constants/misc_constants.asm
@@ -113,3 +113,36 @@ BATTLETOWER_NROFPKMNS EQU 3
 BATTLETOWER_TRAINERDATALENGTH EQU $24
 BATTLETOWER_NROFTRAINERS EQU 7
 
+NUM_WILDMONS_PER_AREA_TIME_OF_DAY EQU 7
+WILDMON_GRASS_STRUCTURE_LENGTH EQU 2 + 3 * (1 + 2 * NUM_WILDMONS_PER_AREA_TIME_OF_DAY)
+
+
+PRINTNUM_MONEY_F        EQU 5
+PRINTNUM_RIGHTALIGN_F   EQU 6
+PRINTNUM_LEADINGZEROS_F EQU 7
+
+PRINTNUM_MONEY          EQU 1 << PRINTNUM_MONEY_F
+PRINTNUM_RIGHTALIGN     EQU 1 << PRINTNUM_RIGHTALIGN_F
+PRINTNUM_LEADINGZEROS   EQU 1 << PRINTNUM_LEADINGZEROS_F
+
+const_value = 1
+	const HAPPINESS_GAINLEVEL         ; 01
+	const HAPPINESS_USEDITEM          ; 02
+	const HAPPINESS_USEDXITEM         ; 03
+	const HAPPINESS_GYMBATTLE         ; 04
+	const HAPPINESS_LEARNMOVE         ; 05
+	const HAPPINESS_FAINTED           ; 06
+	const HAPPINESS_POISONFAINT       ; 07
+	const HAPPINESS_BEATENBYSTRONGFOE ; 08
+	const HAPPINESS_YOUNGCUT1         ; 09
+	const HAPPINESS_YOUNGCUT2         ; 0a
+	const HAPPINESS_YOUNGCUT3         ; 0b
+	const HAPPINESS_OLDERCUT1         ; 0c
+	const HAPPINESS_OLDERCUT2         ; 0d
+	const HAPPINESS_OLDERCUT3         ; 0e
+	const HAPPINESS_BITTERPOWDER      ; 0f
+	const HAPPINESS_ENERGYROOT        ; 10
+	const HAPPINESS_REVIVALHERB       ; 11
+	const HAPPINESS_MASSAGE           ; 12
+	const HAPPINESS_GAINLEVELATHOME   ; 13
+	
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm
index 76b48b1e7..46341c305 100644
--- a/constants/radio_constants.asm
+++ b/constants/radio_constants.asm
@@ -1,15 +1,92 @@
 	const_def
-	const OAKS_POKEMON_TALK
-	const POKEDEX_SHOW
-	const POKEMON_MUSIC
-	const LUCKY_CHANNEL
-	const BUENAS_PASSWORD
-	const PLACES_AND_PEOPLE
-	const LETS_ALL_SING
-	const ROCKET_RADIO
-	const POKE_FLUTE_RADIO
-	const UNOWN_RADIO
-	const EVOLUTION_RADIO
+	const OAKS_POKEMON_TALK      ; $00
+	const POKEDEX_SHOW           ; $01  
+	const POKEMON_MUSIC          ; $02
+	const LUCKY_CHANNEL          ; $03
+	const BUENAS_PASSWORD        ; $04
+	const PLACES_AND_PEOPLE      ; $05
+	const LETS_ALL_SING          ; $06
+	const ROCKET_RADIO           ; $07
+	const POKE_FLUTE_RADIO       ; $08
+	const UNOWN_RADIO            ; $09
+	const EVOLUTION_RADIO        ; $0a
+	const OAKS_POKEMON_TALK_2    ; $0b
+	const OAKS_POKEMON_TALK_3    ; $0c
+	const OAKS_POKEMON_TALK_4    ; $0d
+	const OAKS_POKEMON_TALK_5    ; $0e
+	const OAKS_POKEMON_TALK_6    ; $0f
+	const OAKS_POKEMON_TALK_7    ; $10
+	const OAKS_POKEMON_TALK_8    ; $11
+	const OAKS_POKEMON_TALK_9    ; $12
+	const POKEDEX_SHOW_2         ; $13
+	const POKEDEX_SHOW_3         ; $14
+	const POKEDEX_SHOW_4         ; $15
+	const POKEDEX_SHOW_5         ; $16
+	const POKEMON_MUSIC_2        ; $17
+	const POKEMON_MUSIC_3        ; $18
+	const POKEMON_MUSIC_4        ; $19
+	const POKEMON_MUSIC_5        ; $1a
+	const POKEMON_MUSIC_6        ; $1b
+	const POKEMON_MUSIC_7        ; $1c
+	const LETS_ALL_SING_2        ; $1d
+	const LUCKY_NUMBER_SHOW_2    ; $1e
+	const LUCKY_NUMBER_SHOW_3    ; $1f
+	const LUCKY_NUMBER_SHOW_4    ; $20
+	const LUCKY_NUMBER_SHOW_5    ; $21
+	const LUCKY_NUMBER_SHOW_6    ; $22
+	const LUCKY_NUMBER_SHOW_7    ; $23
+	const LUCKY_NUMBER_SHOW_8    ; $24
+	const LUCKY_NUMBER_SHOW_9    ; $25
+	const LUCKY_NUMBER_SHOW_10   ; $26
+	const LUCKY_NUMBER_SHOW_11   ; $27
+	const LUCKY_NUMBER_SHOW_12   ; $28
+	const LUCKY_NUMBER_SHOW_13   ; $29
+	const LUCKY_NUMBER_SHOW_14   ; $2a
+	const LUCKY_NUMBER_SHOW_15   ; $2b
+	const PLACES_AND_PEOPLE_2    ; $2c
+	const PLACES_AND_PEOPLE_3    ; $2d
+	const PLACES_AND_PEOPLE_4    ; $2e
+	const PLACES_AND_PEOPLE_5    ; $2f
+	const PLACES_AND_PEOPLE_6    ; $30
+	const PLACES_AND_PEOPLE_7    ; $31
+	const ROCKET_RADIO_2         ; $32
+	const ROCKET_RADIO_3         ; $33
+	const ROCKET_RADIO_4         ; $34
+	const ROCKET_RADIO_5         ; $35
+	const ROCKET_RADIO_6         ; $36
+	const ROCKET_RADIO_7         ; $37
+	const ROCKET_RADIO_8         ; $38
+	const ROCKET_RADIO_9         ; $39
+	const ROCKET_RADIO_10        ; $3a
+	const OAKS_POKEMON_TALK_10   ; $3b
+	const OAKS_POKEMON_TALK_11   ; $3c
+	const OAKS_POKEMON_TALK_12   ; $3d
+	const OAKS_POKEMON_TALK_13   ; $3e
+	const OAKS_POKEMON_TALK_14   ; $3f
+	const BUENAS_PASSWORD_2      ; $40
+	const BUENAS_PASSWORD_3      ; $41
+	const BUENAS_PASSWORD_4      ; $42
+	const BUENAS_PASSWORD_5      ; $43
+	const BUENAS_PASSWORD_6      ; $44
+	const BUENAS_PASSWORD_7      ; $45
+	const BUENAS_PASSWORD_8      ; $46
+	const BUENAS_PASSWORD_9      ; $47
+	const BUENAS_PASSWORD_10     ; $48
+	const BUENAS_PASSWORD_11     ; $49
+	const BUENAS_PASSWORD_12     ; $4a
+	const BUENAS_PASSWORD_13     ; $4b
+	const BUENAS_PASSWORD_14     ; $4c
+	const BUENAS_PASSWORD_15     ; $4d
+	const BUENAS_PASSWORD_16     ; $4e
+	const BUENAS_PASSWORD_17     ; $4f
+	const BUENAS_PASSWORD_18     ; $50
+	const BUENAS_PASSWORD_19     ; $51
+	const BUENAS_PASSWORD_20     ; $52
+	const BUENAS_PASSWORD_21     ; $53
+	const RADIO_SCROLL           ; $54
+	const POKEDEX_SHOW_6         ; $55
+	const POKEDEX_SHOW_7         ; $56
+	const POKEDEX_SHOW_8         ; $57
 
 	const_def
 	const BUENA_MON
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index cb368ee0a..9bb72b2a2 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -72,3 +72,7 @@ PLAYER_SURF_PIKA EQU 8
 
 OBJECT_STRUCT_LENGTH EQU 40
 NUM_OBJECT_STRUCTS EQU 13
+
+; After-Champion Spawn
+SPAWN_LANCE EQU 1
+SPAWN_RED EQU 2