Clean up some data, using macros for multiline list entries

audio/engine_1.asm

@@ -1346,12 +1346,12 @@ Audio1_PlaySound::
  ld [wMusicTempo + 1], a
  ld [wMusicWaveInstrument], a
  ld [wSfxWaveInstrument], a
- ld d, $8
+ ld d, NUM_CHANNELS
  ld hl, wChannelReturnAddresses
  call .FillMem
  ld hl, wChannelCommandPointers
  call .FillMem
- ld d, $4
+ ld d, NUM_MUSIC_CHANS
  ld hl, wChannelSoundIDs
  call .FillMem
  ld hl, wChannelFlags1

audio/engine_2.asm

@@ -1409,12 +1409,12 @@ Audio2_PlaySound::
  ld [wMusicTempo + 1], a
  ld [wMusicWaveInstrument], a
  ld [wSfxWaveInstrument], a
- ld d, $8
+ ld d, NUM_CHANNELS
  ld hl, wChannelReturnAddresses
  call .FillMem
  ld hl, wChannelCommandPointers
  call .FillMem
- ld d, $4
+ ld d, NUM_MUSIC_CHANS
  ld hl, wChannelSoundIDs
  call .FillMem
  ld hl, wChannelFlags1

audio/engine_3.asm

@@ -1346,12 +1346,12 @@ Audio3_PlaySound::
  ld [wMusicTempo + 1], a
  ld [wMusicWaveInstrument], a
  ld [wSfxWaveInstrument], a
- ld d, $8
+ ld d, NUM_CHANNELS
  ld hl, wChannelReturnAddresses
  call .FillMem
  ld hl, wChannelCommandPointers
  call .FillMem
- ld d, $4
+ ld d, NUM_MUSIC_CHANS
  ld hl, wChannelSoundIDs
  call .FillMem
  ld hl, wChannelFlags1

constants/audio_constants.asm

@@ -1,4 +1,5 @@
 ; pitch
+; Audio[1|2|3]_Pitches indexes (see audio/notes.asm)
  const_def
  const C_ ; 0
  const C# ; 1
@@ -14,15 +15,20 @@
  const B_ ; B
 
 ; channel
+; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks,
+; and Audio[1|2|3]_HWChannelEnableMasks indexes (see audio/engine_[1|2|3].asm)
  const_def
  const Ch1 ; 0
  const Ch2 ; 1
  const Ch3 ; 2
  const Ch4 ; 3
+NUM_MUSIC_CHANS EQU const_value
  const Ch5 ; 4
  const Ch6 ; 5
  const Ch7 ; 6
  const Ch8 ; 7
+NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS
+NUM_CHANNELS EQU const_value
 
 ; HW sound channel register base addresses
 HW_CH1_BASE EQU LOW(rNR10)

constants/menu_constants.asm

@@ -58,25 +58,27 @@ CHOSE_SECOND_ITEM EQU 2
  const PARTY_TO_DAYCARE ; 3
 
 ; party menu types
+; PartyMenuMessagePointers indexes
  const_def
- const NORMAL_PARTY_MENU ; 0
- const USE_ITEM_PARTY_MENU ; 1
- const BATTLE_PARTY_MENU ; 2
- const TMHM_PARTY_MENU ; 3
- const SWAP_MONS_PARTY_MENU ; 4
- const EVO_STONE_PARTY_MENU ; 5
-
+ const NORMAL_PARTY_MENU ; $00
+ const USE_ITEM_PARTY_MENU ; $01
+ const BATTLE_PARTY_MENU ; $02
+ const TMHM_PARTY_MENU ; $03
+ const SWAP_MONS_PARTY_MENU ; $04
+ const EVO_STONE_PARTY_MENU ; $05
 ; party menu message IDs
- const_def $F0
- const ANTIDOTE_MSG ; $F0
- const BURN_HEAL_MSG ; $F1
- const ICE_HEAL_MSG ; $F2
- const AWAKENING_MSG ; $F3
- const PARALYZ_HEAL_MSG ; $F4
- const POTION_MSG ; $F5
- const FULL_HEAL_MSG ; $F6
- const REVIVE_MSG ; $F7
- const RARE_CANDY_MSG ; $F8
+; PartyMenuItemUseMessagePointers indexes
+ const_next $F0
+FIRST_PARTY_MENU_TEXT_ID EQU const_value
+ const ANTIDOTE_MSG ; $F0
+ const BURN_HEAL_MSG ; $F1
+ const ICE_HEAL_MSG ; $F2
+ const AWAKENING_MSG ; $F3
+ const PARALYZ_HEAL_MSG ; $F4
+ const POTION_MSG ; $F5
+ const FULL_HEAL_MSG ; $F6
+ const REVIVE_MSG ; $F7
+ const RARE_CANDY_MSG ; $F8
 
 ; naming screen types
  const_def

constants/move_effect_constants.asm

@@ -5,7 +5,7 @@
 
  const_def
  const NO_ADDITIONAL_EFFECT ; $00
- const_skip   ; $01
+ const EFFECT_01 ; $01 unused
  const POISON_SIDE_EFFECT1 ; $02
  const DRAIN_HP_EFFECT ; $03
  const BURN_SIDE_EFFECT1 ; $04
@@ -34,7 +34,7 @@
  const THRASH_PETAL_DANCE_EFFECT ; $1B
  const SWITCH_AND_TELEPORT_EFFECT ; $1C
  const TWO_TO_FIVE_ATTACKS_EFFECT ; $1D
- const_skip   ; $1E
+ const EFFECT_1E ; $1E unused
  const FLINCH_SIDE_EFFECT1 ; $1F
  const SLEEP_EFFECT ; $20
  const POISON_SIDE_EFFECT2 ; $21

constants/pokemon_data_constants.asm

@@ -28,3 +28,14 @@ HOF_TEAM_CAPACITY EQU 50
 
 MAX_EVOLUTIONS EQU 3
 EVOLUTION_SIZE EQU 4
+
+
+; wMonHGrowthRate values
+; GrowthRateTable indexes (see data/growth_rates.asm)
+ const_def
+ const GROWTH_MEDIUM_FAST
+ const GROWTH_SLIGHTLY_FAST
+ const GROWTH_SLIGHTLY_SLOW
+ const GROWTH_MEDIUM_SLOW
+ const GROWTH_FAST
+ const GROWTH_SLOW

constants/script_constants.asm

@@ -11,3 +11,22 @@ SLOTSCHERRY EQU $0A08
 SLOTSFISH EQU $0E0C
 SLOTSBIRD EQU $1210
 SLOTSMOUSE EQU $1614
+
+; in game trade dialog sets
+ const_def
+ const TRADE_DIALOGSET_CASUAL
+ const TRADE_DIALOGSET_POLITE
+ const TRADE_DIALOGSET_HAPPY
+
+; badges
+; wObtainedBadges and wBeatGymFlags bits
+ const_def
+ const BIT_BOULDERBADGE ; 0
+ const BIT_CASCADEBADGE ; 1
+ const BIT_THUNDERBADGE ; 2
+ const BIT_RAINBOWBADGE ; 3
+ const BIT_SOULBADGE ; 4
+ const BIT_MARSHBADGE ; 5
+ const BIT_VOLCANOBADGE ; 6
+ const BIT_EARTHBADGE ; 7
+NUM_BADGES EQU const_value

data/battle/always_happen_effects.asm

@@ -5,9 +5,9 @@ AlwaysHappenSideEffects:
  db DREAM_EATER_EFFECT
  db PAY_DAY_EFFECT
  db TWO_TO_FIVE_ATTACKS_EFFECT
- db $1E
+ db EFFECT_1E
  db ATTACK_TWICE_EFFECT
  db RECOIL_EFFECT
  db TWINEEDLE_EFFECT
  db RAGE_EFFECT
- db -1
+ db -1 ; end

data/battle/critical_hit_moves.asm

@@ -3,4 +3,4 @@ HighCriticalMoves:
  db RAZOR_LEAF
  db CRABHAMMER
  db SLASH
- db $FF
+ db -1 ; end

data/battle/residual_effects_1.asm

@@ -17,4 +17,4 @@ ResidualEffects1:
  db MIMIC_EFFECT
  db LEECH_SEED_EFFECT
  db SPLASH_EFFECT
- db -1
+ db -1 ; end

data/battle/residual_effects_2.asm

@@ -2,7 +2,7 @@ ResidualEffects2:
 ; non-side effects not included in ResidualEffects1
 ; stat-affecting moves, sleep-inflicting moves, and Bide
 ; e.g., Meditate, Bide, Hypnosis
- db $01
+ db EFFECT_01
  db ATTACK_UP1_EFFECT
  db DEFENSE_UP1_EFFECT
  db SPEED_UP1_EFFECT
@@ -29,4 +29,4 @@ ResidualEffects2:
  db SPECIAL_DOWN2_EFFECT
  db ACCURACY_DOWN2_EFFECT
  db EVASION_DOWN2_EFFECT
- db -1
+ db -1 ; end

data/battle/set_damage_effects.asm

@@ -3,4 +3,4 @@ SetDamageEffects:
 ; e.g., Super Fang, Psywave
  db SUPER_FANG_EFFECT
  db SPECIAL_DAMAGE_EFFECT
- db -1
+ db -1 ; end

data/battle/special_effects.asm

@@ -8,17 +8,17 @@ SpecialEffects:
  db PAY_DAY_EFFECT
  db SWIFT_EFFECT
  db TWO_TO_FIVE_ATTACKS_EFFECT
- db $1E
+ db EFFECT_1E
  db CHARGE_EFFECT
  db SUPER_FANG_EFFECT
  db SPECIAL_DAMAGE_EFFECT
  db FLY_EFFECT
  db ATTACK_TWICE_EFFECT
  db JUMP_KICK_EFFECT
  db RECOIL_EFFECT
- ; fallthrough to Next EffectsArray
+ ; fallthrough
 SpecialEffectsCont:
 ; damaging moves whose effect is executed prior to damage calculation
  db THRASH_PETAL_DANCE_EFFECT
  db TRAPPING_EFFECT
- db -1
+ db -1 ; end

data/battle/unused_critical_hit_moves.asm

@@ -3,4 +3,4 @@ UnusedHighCriticalMoves:
  db RAZOR_LEAF
  db CRABHAMMER
  db SLASH
- db $FF
+ db -1 ; end

data/events/hidden_coins.asm

@@ -1,14 +1,19 @@
+hidden_coin: MACRO
+ db \1, \3, \2
+ENDM
+
 HiddenCoinCoords:
- db GAME_CORNER,$08,$00
- db GAME_CORNER,$10,$01
- db GAME_CORNER,$0b,$03
- db GAME_CORNER,$0e,$03
- db GAME_CORNER,$0c,$04
- db GAME_CORNER,$0c,$09
- db GAME_CORNER,$0f,$09
- db GAME_CORNER,$0e,$10
- db GAME_CORNER,$10,$0a
- db GAME_CORNER,$07,$0b
- db GAME_CORNER,$08,$0f
- db GAME_CORNER,$0f,$0c
- db $ff
+; map id, x, y
+ hidden_coin GAME_CORNER, 0, 8
+ hidden_coin GAME_CORNER, 1, 16
+ hidden_coin GAME_CORNER, 3, 11
+ hidden_coin GAME_CORNER, 3, 14
+ hidden_coin GAME_CORNER, 4, 12
+ hidden_coin GAME_CORNER, 9, 12
+ hidden_coin GAME_CORNER, 9, 15
+ hidden_coin GAME_CORNER, 16, 14
+ hidden_coin GAME_CORNER, 10, 16
+ hidden_coin GAME_CORNER, 11, 7
+ hidden_coin GAME_CORNER, 15, 8
+ hidden_coin GAME_CORNER, 12, 15
+ db -1 ; end

data/events/hidden_item_coords.asm

@@ -1,57 +1,61 @@
+hidden_item: MACRO
+ db \1, \3, \2
+ENDM
+
 HiddenItemCoords:
-; map ID, then coords
- db VIRIDIAN_FOREST,$12,$01
- db VIRIDIAN_FOREST,$2a,$10
- db MT_MOON_B2F,$0c,$12
- db ROUTE_25,$03,$26
- db ROUTE_9,$07,$0e
- db SS_ANNE_KITCHEN,$09,$0d
- db SS_ANNE_B1F_ROOMS,$01,$03
- db ROUTE_10,$11,$09
- db ROUTE_10,$35,$10
- db ROCKET_HIDEOUT_B1F,$0f,$15
- db ROCKET_HIDEOUT_B3F,$11,$1b
- db ROCKET_HIDEOUT_B4F,$01,$19
- db POKEMON_TOWER_5F,$0c,$04
- db ROUTE_13,$0e,$01
- db ROUTE_13,$0d,$10
- db POKEMON_MANSION_B1F,$09,$01
- db SAFARI_ZONE_GATE,$01,$0a
- db SAFARI_ZONE_WEST,$05,$06
- db SILPH_CO_5F,$03,$0c
- db SILPH_CO_9F,$0f,$02
- db COPYCATS_HOUSE_2F,$01,$01
- db CERULEAN_CAVE_1F,$0b,$0e
- db CERULEAN_CAVE_B1F,$03,$1b
- db POWER_PLANT,$10,$11
- db POWER_PLANT,$01,$0c
- db SEAFOAM_ISLANDS_B2F,$0f,$0f
- db SEAFOAM_ISLANDS_B4F,$11,$19
- db POKEMON_MANSION_1F,$10,$08
- db POKEMON_MANSION_3F,$09,$01
- db ROUTE_23,$2c,$09
- db ROUTE_23,$46,$13
- db ROUTE_23,$5a,$08
- db VICTORY_ROAD_2F,$02,$05
- db VICTORY_ROAD_2F,$07,$1a
- db UNUSED_MAP_6F,$0b,$0e
- db VIRIDIAN_CITY,$04,$0e
- db ROUTE_11,$05,$30
- db ROUTE_12,$3f,$02
- db ROUTE_17,$0e,$0f
- db ROUTE_17,$2d,$08
- db ROUTE_17,$48,$11
- db ROUTE_17,$5b,$04
- db ROUTE_17,$79,$08
- db UNDERGROUND_PATH_NORTH_SOUTH,$04,$03
- db UNDERGROUND_PATH_NORTH_SOUTH,$22,$04
- db UNDERGROUND_PATH_WEST_EAST,$02,$0c
- db UNDERGROUND_PATH_WEST_EAST,$05,$15
- db CELADON_CITY,$0f,$30
- db ROUTE_25,$01,$0a
- db MT_MOON_B2F,$09,$21
- db SEAFOAM_ISLANDS_B3F,$10,$09
- db VERMILION_CITY,$0b,$0e
- db CERULEAN_CITY,$08,$0f
- db ROUTE_4,$03,$28
- db $ff
+; map id, x, y
+ hidden_item VIRIDIAN_FOREST, 1, 18
+ hidden_item VIRIDIAN_FOREST, 16, 42
+ hidden_item MT_MOON_B2F, 18, 12
+ hidden_item ROUTE_25, 38, 3
+ hidden_item ROUTE_9, 14, 7
+ hidden_item SS_ANNE_KITCHEN, 13, 9
+ hidden_item SS_ANNE_B1F_ROOMS, 3, 1
+ hidden_item ROUTE_10, 9, 17
+ hidden_item ROUTE_10, 16, 53
+ hidden_item ROCKET_HIDEOUT_B1F, 21, 15
+ hidden_item ROCKET_HIDEOUT_B3F, 27, 17
+ hidden_item ROCKET_HIDEOUT_B4F, 25, 1
+ hidden_item POKEMON_TOWER_5F, 4, 12
+ hidden_item ROUTE_13, 1, 14
+ hidden_item ROUTE_13, 16, 13
+ hidden_item POKEMON_MANSION_B1F, 1, 9
+ hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible
+ hidden_item SAFARI_ZONE_WEST, 6, 5
+ hidden_item SILPH_CO_5F, 12, 3
+ hidden_item SILPH_CO_9F, 2, 15
+ hidden_item COPYCATS_HOUSE_2F, 1, 1
+ hidden_item CERULEAN_CAVE_1F, 14, 11
+ hidden_item CERULEAN_CAVE_B1F, 27, 3
+ hidden_item POWER_PLANT, 17, 16
+ hidden_item POWER_PLANT, 12, 1
+ hidden_item SEAFOAM_ISLANDS_B2F, 15, 15
+ hidden_item SEAFOAM_ISLANDS_B4F, 25, 17
+ hidden_item POKEMON_MANSION_1F, 8, 16
+ hidden_item POKEMON_MANSION_3F, 1, 9
+ hidden_item ROUTE_23, 9, 44
+ hidden_item ROUTE_23, 19, 70
+ hidden_item ROUTE_23, 8, 90
+ hidden_item VICTORY_ROAD_2F, 5, 2
+ hidden_item VICTORY_ROAD_2F, 26, 7
+ hidden_item UNUSED_MAP_6F, 14, 11
+ hidden_item VIRIDIAN_CITY, 14, 4
+ hidden_item ROUTE_11, 48, 5
+ hidden_item ROUTE_12, 2, 63
+ hidden_item ROUTE_17, 15, 14
+ hidden_item ROUTE_17, 8, 45
+ hidden_item ROUTE_17, 17, 72
+ hidden_item ROUTE_17, 4, 91
+ hidden_item ROUTE_17, 8, 121
+ hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 3, 4
+ hidden_item UNDERGROUND_PATH_NORTH_SOUTH, 4, 34
+ hidden_item UNDERGROUND_PATH_WEST_EAST, 12, 2
+ hidden_item UNDERGROUND_PATH_WEST_EAST, 21, 5
+ hidden_item CELADON_CITY, 48, 15
+ hidden_item ROUTE_25, 10, 1
+ hidden_item MT_MOON_B2F, 33, 9
+ hidden_item SEAFOAM_ISLANDS_B3F, 9, 16
+ hidden_item VERMILION_CITY, 14, 11
+ hidden_item CERULEAN_CITY, 15, 8
+ hidden_item ROUTE_4, 40, 3
+ db -1 ; end