Trainer data structure and field move functions

Trainer data in map scripts is now a macro-defined structure.

Field move functions in main.asm are now nearly completely annotated, with local references.

Trailing white space deleted.

battle/ai/scoring.asm

@@ -151,7 +151,7 @@ AI_Setup: ; 385e0
 AI_Types: ; 38635
 ; Dismiss any move that the player is immune to.
 ; Encourage super-effective moves.
-; Discourage not very effective moves unless 
+; Discourage not very effective moves unless
 ; all damaging moves are of the same type.
 
 	ld hl, Buffer1 - 1
@@ -963,9 +963,9 @@ AI_Smart_Bide: ; 38a1e
 AI_Smart_Whirlwind: ; 38a2a
 ; Whirlwind, Roar.
 
-; Discourage this move if the player has not shown 
+; Discourage this move if the player has not shown
 ; a super-effective move against the enemy.
-; Consider player's type(s) if its moves are unknown. 
+; Consider player's type(s) if its moves are unknown.
 
 	push hl
 	callab Function3484e
@@ -1231,7 +1231,7 @@ AI_Smart_Paralyze: ; 38b26
 	call AICheckPlayerQuarterHP
 	jr nc, .asm_38b3a
 	
-; 80% chance to greatly encourage this move 
+; 80% chance to greatly encourage this move
 ; if enemy is slower than player and its HP is above 25%.	
 	call AICompareSpeed
 	ret c
@@ -1879,7 +1879,7 @@ AI_Smart_MeanLook: ; 38dfb
 	bit SUBSTATUS_TOXIC, a
 	jr nz, .asm_38e26
 
-; 80% chance to greatly encourage this move if the player is either 
+; 80% chance to greatly encourage this move if the player is either
 ; in love, identified, stuck in Rollout, or has a Nightmare.	
 	ld a, [PlayerSubStatus1]
 	and 1<<SUBSTATUS_IN_LOVE | 1<<SUBSTATUS_ROLLOUT | 1<<SUBSTATUS_IDENTIFIED | 1<<SUBSTATUS_NIGHTMARE
@@ -3292,7 +3292,7 @@ AI_Aggressive: ; 39369
 	call AIGetEnemyMove
 
 ; Ignore this move if its power is 0 or 1.
-; Moves such as Seismic Toss, Hidden Power, 
+; Moves such as Seismic Toss, Hidden Power,
 ; Counter and Fissure have a base power of 1.	
 	ld a, [wEnemyMoveStruct + MOVE_POWER]
 	cp 2

constants/battle_constants.asm

@@ -96,54 +96,54 @@ const_value SET 3
 
 ; substatus
 	enum_start 7, -1
-	enum SUBSTATUS_IN_LOVE     
+	enum SUBSTATUS_IN_LOVE
-	enum SUBSTATUS_ROLLOUT     
+	enum SUBSTATUS_ROLLOUT
-	enum SUBSTATUS_ENDURE      
+	enum SUBSTATUS_ENDURE
-	enum SUBSTATUS_PERISH      
+	enum SUBSTATUS_PERISH
-	enum SUBSTATUS_IDENTIFIED  
+	enum SUBSTATUS_IDENTIFIED
-	enum SUBSTATUS_PROTECT     
+	enum SUBSTATUS_PROTECT
-	enum SUBSTATUS_CURSE       
+	enum SUBSTATUS_CURSE
-	enum SUBSTATUS_NIGHTMARE   
+	enum SUBSTATUS_NIGHTMARE
 
 SUBSTATUS_CURLED       EQU 0
 
 	enum_start 7, -1
-	enum SUBSTATUS_CONFUSED    
+	enum SUBSTATUS_CONFUSED
-	enum SUBSTATUS_FLYING      
+	enum SUBSTATUS_FLYING
-	enum SUBSTATUS_UNDERGROUND 
+	enum SUBSTATUS_UNDERGROUND
-	enum SUBSTATUS_CHARGED     
+	enum SUBSTATUS_CHARGED
-	enum SUBSTATUS_FLINCHED    
+	enum SUBSTATUS_FLINCHED
-	enum SUBSTATUS_IN_LOOP     
+	enum SUBSTATUS_IN_LOOP
-	enum SUBSTATUS_RAMPAGE     
+	enum SUBSTATUS_RAMPAGE
-	enum SUBSTATUS_BIDE        
+	enum SUBSTATUS_BIDE
 
 	enum_start 7, -1
-	enum SUBSTATUS_LEECH_SEED  
+	enum SUBSTATUS_LEECH_SEED
-	enum SUBSTATUS_RAGE        
+	enum SUBSTATUS_RAGE
-	enum SUBSTATUS_RECHARGE    
+	enum SUBSTATUS_RECHARGE
-	enum SUBSTATUS_SUBSTITUTE  
+	enum SUBSTATUS_SUBSTITUTE
-	enum SUBSTATUS_UNKNOWN_1                     
+	enum SUBSTATUS_UNKNOWN_1
 	enum SUBSTATUS_FOCUS_ENERGY
-	enum SUBSTATUS_MIST        
+	enum SUBSTATUS_MIST
-	enum SUBSTATUS_X_ACCURACY  
+	enum SUBSTATUS_X_ACCURACY
 
 	enum_start 7, -1
-	enum SUBSTATUS_CANT_RUN    
+	enum SUBSTATUS_CANT_RUN
 	enum SUBSTATUS_DESTINY_BOND
-	enum SUBSTATUS_LOCK_ON     
+	enum SUBSTATUS_LOCK_ON
-	enum SUBSTATUS_ENCORED     
+	enum SUBSTATUS_ENCORED
-	enum SUBSTATUS_TRANSFORMED 
+	enum SUBSTATUS_TRANSFORMED
-	enum SUBSTATUS_UNKNOWN_2   
+	enum SUBSTATUS_UNKNOWN_2
-	enum SUBSTATUS_UNKNOWN_3                    
+	enum SUBSTATUS_UNKNOWN_3
-	enum SUBSTATUS_TOXIC       
+	enum SUBSTATUS_TOXIC
 
 ; environmental
 	enum_start 4, -1
-	enum SCREENS_REFLECT     
+	enum SCREENS_REFLECT
 	enum SCREENS_LIGHT_SCREEN
-	enum SCREENS_SAFEGUARD   
+	enum SCREENS_SAFEGUARD
 	enum SCREENS_UNUSED
-	enum SCREENS_SPIKES      
+	enum SCREENS_SPIKES
 
 ; weather
 	const_def
@@ -158,160 +158,160 @@ SUBSTATUS_CURLED       EQU 0
 
 ; move effects
 	const_def
-	const EFFECT_NORMAL_HIT         
+	const EFFECT_NORMAL_HIT
-	const EFFECT_SLEEP              
+	const EFFECT_SLEEP
-	const EFFECT_POISON_HIT         
+	const EFFECT_POISON_HIT
-	const EFFECT_LEECH_HIT          
+	const EFFECT_LEECH_HIT
-	const EFFECT_BURN_HIT           
+	const EFFECT_BURN_HIT
-	const EFFECT_FREEZE_HIT         
+	const EFFECT_FREEZE_HIT
-	const EFFECT_PARALYZE_HIT       
+	const EFFECT_PARALYZE_HIT
-	const EFFECT_EXPLOSION          
+	const EFFECT_EXPLOSION
-	const EFFECT_DREAM_EATER        
+	const EFFECT_DREAM_EATER
-	const EFFECT_MIRROR_MOVE        
+	const EFFECT_MIRROR_MOVE
-	const EFFECT_ATTACK_UP          
+	const EFFECT_ATTACK_UP
-	const EFFECT_DEFENSE_UP         
+	const EFFECT_DEFENSE_UP
-	const EFFECT_SPEED_UP           
+	const EFFECT_SPEED_UP
-	const EFFECT_SP_ATK_UP          
+	const EFFECT_SP_ATK_UP
-	const EFFECT_SP_DEF_UP          
+	const EFFECT_SP_DEF_UP
-	const EFFECT_ACCURACY_UP        
+	const EFFECT_ACCURACY_UP
-	const EFFECT_EVASION_UP         
+	const EFFECT_EVASION_UP
-	const EFFECT_ALWAYS_HIT         
+	const EFFECT_ALWAYS_HIT
-	const EFFECT_ATTACK_DOWN        
+	const EFFECT_ATTACK_DOWN
-	const EFFECT_DEFENSE_DOWN       
+	const EFFECT_DEFENSE_DOWN
-	const EFFECT_SPEED_DOWN         
+	const EFFECT_SPEED_DOWN
-	const EFFECT_SP_ATK_DOWN        
+	const EFFECT_SP_ATK_DOWN
-	const EFFECT_SP_DEF_DOWN        
+	const EFFECT_SP_DEF_DOWN
-	const EFFECT_ACCURACY_DOWN      
+	const EFFECT_ACCURACY_DOWN
-	const EFFECT_EVASION_DOWN       
+	const EFFECT_EVASION_DOWN
-	const EFFECT_HAZE               
+	const EFFECT_HAZE
-	const EFFECT_BIDE               
+	const EFFECT_BIDE
-	const EFFECT_RAMPAGE            
+	const EFFECT_RAMPAGE
-	const EFFECT_WHIRLWIND          
+	const EFFECT_WHIRLWIND
-	const EFFECT_MULTI_HIT          
+	const EFFECT_MULTI_HIT
-	const EFFECT_CONVERSION         
+	const EFFECT_CONVERSION
-	const EFFECT_FLINCH_HIT         
+	const EFFECT_FLINCH_HIT
-	const EFFECT_HEAL               
+	const EFFECT_HEAL
-	const EFFECT_TOXIC              
+	const EFFECT_TOXIC
-	const EFFECT_PAY_DAY            
+	const EFFECT_PAY_DAY
-	const EFFECT_LIGHT_SCREEN       
+	const EFFECT_LIGHT_SCREEN
-	const EFFECT_TRI_ATTACK         
+	const EFFECT_TRI_ATTACK
-	const EFFECT_UNUSED_25          
+	const EFFECT_UNUSED_25
-	const EFFECT_OHKO               
+	const EFFECT_OHKO
-	const EFFECT_RAZOR_WIND         
+	const EFFECT_RAZOR_WIND
-	const EFFECT_SUPER_FANG         
+	const EFFECT_SUPER_FANG
-	const EFFECT_STATIC_DAMAGE      
+	const EFFECT_STATIC_DAMAGE
-	const EFFECT_BIND               
+	const EFFECT_BIND
-	const EFFECT_UNUSED_2B          
+	const EFFECT_UNUSED_2B
-	const EFFECT_DOUBLE_HIT         
+	const EFFECT_DOUBLE_HIT
-	const EFFECT_JUMP_KICK          
+	const EFFECT_JUMP_KICK
-	const EFFECT_MIST               
+	const EFFECT_MIST
-	const EFFECT_FOCUS_ENERGY       
+	const EFFECT_FOCUS_ENERGY
-	const EFFECT_RECOIL_HIT         
+	const EFFECT_RECOIL_HIT
-	const EFFECT_CONFUSE            
+	const EFFECT_CONFUSE
-	const EFFECT_ATTACK_UP_2        
+	const EFFECT_ATTACK_UP_2
-	const EFFECT_DEFENSE_UP_2       
+	const EFFECT_DEFENSE_UP_2
-	const EFFECT_SPEED_UP_2         
+	const EFFECT_SPEED_UP_2
-	const EFFECT_SP_ATK_UP_2        
+	const EFFECT_SP_ATK_UP_2
-	const EFFECT_SP_DEF_UP_2        
+	const EFFECT_SP_DEF_UP_2
-	const EFFECT_ACCURACY_UP_2      
+	const EFFECT_ACCURACY_UP_2
-	const EFFECT_EVASION_UP_2       
+	const EFFECT_EVASION_UP_2
-	const EFFECT_TRANSFORM          
+	const EFFECT_TRANSFORM
-	const EFFECT_ATTACK_DOWN_2      
+	const EFFECT_ATTACK_DOWN_2
-	const EFFECT_DEFENSE_DOWN_2     
+	const EFFECT_DEFENSE_DOWN_2
-	const EFFECT_SPEED_DOWN_2       
+	const EFFECT_SPEED_DOWN_2
-	const EFFECT_SP_ATK_DOWN_2      
+	const EFFECT_SP_ATK_DOWN_2
-	const EFFECT_SP_DEF_DOWN_2      
+	const EFFECT_SP_DEF_DOWN_2
-	const EFFECT_ACCURACY_DOWN_2    
+	const EFFECT_ACCURACY_DOWN_2
-	const EFFECT_EVASION_DOWN_2     
+	const EFFECT_EVASION_DOWN_2
-	const EFFECT_REFLECT            
+	const EFFECT_REFLECT
-	const EFFECT_POISON             
+	const EFFECT_POISON
-	const EFFECT_PARALYZE           
+	const EFFECT_PARALYZE
-	const EFFECT_ATTACK_DOWN_HIT    
+	const EFFECT_ATTACK_DOWN_HIT
-	const EFFECT_DEFENSE_DOWN_HIT   
+	const EFFECT_DEFENSE_DOWN_HIT
-	const EFFECT_SPEED_DOWN_HIT     
+	const EFFECT_SPEED_DOWN_HIT
-	const EFFECT_SP_ATK_DOWN_HIT    
+	const EFFECT_SP_ATK_DOWN_HIT
-	const EFFECT_SP_DEF_DOWN_HIT    
+	const EFFECT_SP_DEF_DOWN_HIT
-	const EFFECT_ACCURACY_DOWN_HIT  
+	const EFFECT_ACCURACY_DOWN_HIT
-	const EFFECT_EVASION_DOWN_HIT   
+	const EFFECT_EVASION_DOWN_HIT
-	const EFFECT_SKY_ATTACK         
+	const EFFECT_SKY_ATTACK
-	const EFFECT_CONFUSE_HIT        
+	const EFFECT_CONFUSE_HIT
-	const EFFECT_TWINEEDLE          
+	const EFFECT_TWINEEDLE
-	const EFFECT_UNUSED_4E          
+	const EFFECT_UNUSED_4E
-	const EFFECT_SUBSTITUTE         
+	const EFFECT_SUBSTITUTE
-	const EFFECT_HYPER_BEAM         
+	const EFFECT_HYPER_BEAM
-	const EFFECT_RAGE               
+	const EFFECT_RAGE
-	const EFFECT_MIMIC              
+	const EFFECT_MIMIC
-	const EFFECT_METRONOME          
+	const EFFECT_METRONOME
-	const EFFECT_LEECH_SEED         
+	const EFFECT_LEECH_SEED
-	const EFFECT_SPLASH             
+	const EFFECT_SPLASH
-	const EFFECT_DISABLE            
+	const EFFECT_DISABLE
-	const EFFECT_LEVEL_DAMAGE       
+	const EFFECT_LEVEL_DAMAGE
-	const EFFECT_PSYWAVE            
+	const EFFECT_PSYWAVE
-	const EFFECT_COUNTER            
+	const EFFECT_COUNTER
-	const EFFECT_ENCORE             
+	const EFFECT_ENCORE
-	const EFFECT_PAIN_SPLIT         
+	const EFFECT_PAIN_SPLIT
-	const EFFECT_SNORE              
+	const EFFECT_SNORE
-	const EFFECT_CONVERSION2        
+	const EFFECT_CONVERSION2
-	const EFFECT_LOCK_ON            
+	const EFFECT_LOCK_ON
-	const EFFECT_SKETCH             
+	const EFFECT_SKETCH
-	const EFFECT_DEFROST_OPPONENT   
+	const EFFECT_DEFROST_OPPONENT
-	const EFFECT_SLEEP_TALK         
+	const EFFECT_SLEEP_TALK
-	const EFFECT_DESTINY_BOND       
+	const EFFECT_DESTINY_BOND
-	const EFFECT_REVERSAL           
+	const EFFECT_REVERSAL
-	const EFFECT_SPITE              
+	const EFFECT_SPITE
-	const EFFECT_FALSE_SWIPE        
+	const EFFECT_FALSE_SWIPE
-	const EFFECT_HEAL_BELL          
+	const EFFECT_HEAL_BELL
-	const EFFECT_PRIORITY_HIT       
+	const EFFECT_PRIORITY_HIT
-	const EFFECT_TRIPLE_KICK        
+	const EFFECT_TRIPLE_KICK
-	const EFFECT_THIEF              
+	const EFFECT_THIEF
-	const EFFECT_MEAN_LOOK          
+	const EFFECT_MEAN_LOOK
-	const EFFECT_NIGHTMARE          
+	const EFFECT_NIGHTMARE
-	const EFFECT_FLAME_WHEEL        
+	const EFFECT_FLAME_WHEEL
-	const EFFECT_CURSE              
+	const EFFECT_CURSE
-	const EFFECT_UNUSED_6E          
+	const EFFECT_UNUSED_6E
-	const EFFECT_PROTECT            
+	const EFFECT_PROTECT
-	const EFFECT_SPIKES             
+	const EFFECT_SPIKES
-	const EFFECT_FORESIGHT          
+	const EFFECT_FORESIGHT
-	const EFFECT_PERISH_SONG        
+	const EFFECT_PERISH_SONG
-	const EFFECT_SANDSTORM          
+	const EFFECT_SANDSTORM
-	const EFFECT_ENDURE             
+	const EFFECT_ENDURE
-	const EFFECT_ROLLOUT            
+	const EFFECT_ROLLOUT
-	const EFFECT_SWAGGER            
+	const EFFECT_SWAGGER
-	const EFFECT_FURY_CUTTER        
+	const EFFECT_FURY_CUTTER
-	const EFFECT_ATTRACT            
+	const EFFECT_ATTRACT
-	const EFFECT_RETURN             
+	const EFFECT_RETURN
-	const EFFECT_PRESENT            
+	const EFFECT_PRESENT
-	const EFFECT_FRUSTRATION        
+	const EFFECT_FRUSTRATION
-	const EFFECT_SAFEGUARD          
+	const EFFECT_SAFEGUARD
-	const EFFECT_SACRED_FIRE        
+	const EFFECT_SACRED_FIRE
-	const EFFECT_MAGNITUDE          
+	const EFFECT_MAGNITUDE
-	const EFFECT_BATON_PASS         
+	const EFFECT_BATON_PASS
-	const EFFECT_PURSUIT            
+	const EFFECT_PURSUIT
-	const EFFECT_RAPID_SPIN         
+	const EFFECT_RAPID_SPIN
-	const EFFECT_UNUSED_82          
+	const EFFECT_UNUSED_82
-	const EFFECT_UNUSED_83          
+	const EFFECT_UNUSED_83
-	const EFFECT_MORNING_SUN        
+	const EFFECT_MORNING_SUN
-	const EFFECT_SYNTHESIS          
+	const EFFECT_SYNTHESIS
-	const EFFECT_MOONLIGHT          
+	const EFFECT_MOONLIGHT
-	const EFFECT_HIDDEN_POWER       
+	const EFFECT_HIDDEN_POWER
-	const EFFECT_RAIN_DANCE         
+	const EFFECT_RAIN_DANCE
-	const EFFECT_SUNNY_DAY          
+	const EFFECT_SUNNY_DAY
-	const EFFECT_STEEL_WING         
+	const EFFECT_STEEL_WING
-	const EFFECT_METAL_CLAW         
+	const EFFECT_METAL_CLAW
-	const EFFECT_ANCIENTPOWER       
+	const EFFECT_ANCIENTPOWER
-	const EFFECT_FAKE_OUT           
+	const EFFECT_FAKE_OUT
-	const EFFECT_BELLY_DRUM         
+	const EFFECT_BELLY_DRUM
-	const EFFECT_PSYCH_UP           
+	const EFFECT_PSYCH_UP
-	const EFFECT_MIRROR_COAT        
+	const EFFECT_MIRROR_COAT
-	const EFFECT_SKULL_BASH         
+	const EFFECT_SKULL_BASH
-	const EFFECT_TWISTER            
+	const EFFECT_TWISTER
-	const EFFECT_EARTHQUAKE         
+	const EFFECT_EARTHQUAKE
-	const EFFECT_FUTURE_SIGHT       
+	const EFFECT_FUTURE_SIGHT
-	const EFFECT_GUST               
+	const EFFECT_GUST
-	const EFFECT_STOMP              
+	const EFFECT_STOMP
-	const EFFECT_SOLARBEAM          
+	const EFFECT_SOLARBEAM
-	const EFFECT_THUNDER            
+	const EFFECT_THUNDER
-	const EFFECT_TELEPORT           
+	const EFFECT_TELEPORT
-	const EFFECT_BEAT_UP            
+	const EFFECT_BEAT_UP
-	const EFFECT_FLY                
+	const EFFECT_FLY
-	const EFFECT_DEFENSE_CURL       
+	const EFFECT_DEFENSE_CURL

constants/event_flags.asm

@@ -718,11 +718,11 @@
 	const EVENT_2C9
 	const EVENT_2CA
 	const EVENT_2CB
-	const EVENT_2CC
+	const EVENT_KRISS_ROOM_POSTER
 	const EVENT_2CD
 	const EVENT_2CE
 	const EVENT_2CF
-	const EVENT_2D0
+	const EVENT_2D0 ; 2d0
 	const EVENT_2D1
 	const EVENT_2D2
 	const EVENT_SWITCH_1
@@ -738,7 +738,7 @@
 	const EVENT_SWITCH_10
 	const EVENT_SWITCH_11
 	const EVENT_SWITCH_12
-	const EVENT_SWITCH_13
+	const EVENT_SWITCH_13 ; 2e0
 	const EVENT_SWITCH_14
 	const EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
 	const EVENT_TURNED_OFF_SECURITY_CAMERAS
@@ -754,7 +754,7 @@
 	const EVENT_EXPLODING_TRAP_5
 	const EVENT_EXPLODING_TRAP_6
 	const EVENT_EXPLODING_TRAP_7
-	const EVENT_EXPLODING_TRAP_8
+	const EVENT_EXPLODING_TRAP_8 ; 2f0
 	const EVENT_EXPLODING_TRAP_9
 	const EVENT_EXPLODING_TRAP_10
 	const EVENT_EXPLODING_TRAP_11
@@ -770,7 +770,7 @@
 	const EVENT_EXPLODING_TRAP_21
 	const EVENT_EXPLODING_TRAP_22
 	const EVENT_LEARNED_HAIL_GIOVANNI
-	const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
+	const EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER ; 300
 	const EVENT_LEARNED_SLOWPOKETAIL
 	const EVENT_LEARNED_RATICATE_TAIL
 	const EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
@@ -786,7 +786,7 @@
 	const EVENT_BRUNOS_ROOM_ENTRANCE_CLOSED
 	const EVENT_BRUNOS_ROOM_EXIT_OPEN
 	const EVENT_KARENS_ROOM_ENTRANCE_CLOSED
-	const EVENT_KARENS_ROOM_EXIT_OPEN
+	const EVENT_KARENS_ROOM_EXIT_OPEN ; 310
 	const EVENT_LANCES_ROOM_ENTRANCE_CLOSED
 	const EVENT_LANCES_ROOM_EXIT_OPEN
 	const EVENT_CONTEST_OFFICER_HAS_SUN_STONE
@@ -802,7 +802,7 @@
 	const EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
 	const EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
 	const EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
-	const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
+	const EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA ; 320
 	const EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
@@ -1910,7 +1910,7 @@
 	const EVENT_WHIRL_ISLAND_LUGIA_CHAMBER_LUGIA
 	const EVENT_KURTS_HOUSE_KURT_1
 	const EVENT_KURTS_HOUSE_KURT_2
-	const EVENT_SLOWPOKE_WELL_KURT
+	const EVENT_SLOWPOKE_WELL_KURT ; 740
 	const EVENT_KRISS_HOUSE_2F_CONSOLE
 	const EVENT_KRISS_HOUSE_2F_DOLL_1
 	const EVENT_KRISS_HOUSE_2F_DOLL_2
@@ -1926,7 +1926,7 @@
 	const EVENT_BLACKTHORN_CITY_GRAMPS_NOT_BLOCKING_DRAGONS_DEN
 	const EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
 	const EVENT_OPENED_MT_SILVER
-	const EVENT_FOUGHT_SNORLAX
+	const EVENT_FOUGHT_SNORLAX ; 750
 	const EVENT_LAKE_OF_RAGE_RED_GYARADOS
 	const EVENT_WAREHOUSE_ENTRANCE_GRANNY
 	const EVENT_WAREHOUSE_ENTRANCE_GRAMPS
@@ -1942,7 +1942,7 @@
 	const EVENT_BLACKTHORN_CITY_SANTOS_OF_SATURDAY
 	const EVENT_ROUTE_40_MONICA_OF_MONDAY
 	const EVENT_LANCES_ROOM_OAK_AND_MARY
-	const EVENT_UNION_CAVE_B2F_LAPRAS
+	const EVENT_UNION_CAVE_B2F_LAPRAS ; 760
 	const EVENT_761
 	const EVENT_RED_IN_MT_SILVER
 	const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
@@ -1959,7 +1959,7 @@
 	const EVENT_CERULEAN_GYM_ROCKET
 	const EVENT_ROUTE_25_MISTY_BOYFRIEND
 	const EVENT_TRAINERS_IN_CERULEAN_GYM
-	const EVENT_VERMILION_CITY_SNORLAX
+	const EVENT_VERMILION_CITY_SNORLAX ; 770
 	const EVENT_ROUTE_5_6_POKEFAN_M_BLOCKS_UNDERGROUND_PATH
 	const EVENT_SAFFRON_TRAIN_STATION_POPULATION
 	const EVENT_COPYCATS_HOUSE_2F_DOLL
@@ -1975,7 +1975,7 @@
 	const EVENT_PICKED_UP_FOCUS_BAND
 	const EVENT_ROCK_TUNNEL_1F_ELIXER
 	const EVENT_ROCK_TUNNEL_1F_TM_STEEL_WING
-	const EVENT_ROCK_TUNNEL_B1F_IRON
+	const EVENT_ROCK_TUNNEL_B1F_IRON ; 780
 	const EVENT_ROCK_TUNNEL_B1F_PP_UP
 	const EVENT_ROCK_TUNNEL_B1F_REVIVE
 	const EVENT_ROUTE_2_DIRE_HIT
@@ -1992,7 +1992,7 @@
 	const EVENT_KURTS_HOUSE_GRANDDAUGHTER_2
 	const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_FISHER
 	const EVENT_RUINS_OF_ALPH_OUTSIDE_TOURIST_YOUNGSTERS
-	const EVENT_DRAGON_SHRINE_CLAIR
+	const EVENT_DRAGON_SHRINE_CLAIR ; 790
 	const EVENT_BATTLE_TOWER_BATTLE_ROOM_YOUNGSTER
 	const EVENT_KRISS_HOUSE_1F_NEIGHBOR
 	const EVENT_KRISS_NEIGHBORS_HOUSE_NEIGHBOR
@@ -2008,7 +2008,7 @@
 	const EVENT_PICKED_UP_MYSTIC_WATER_FROM_OMANYTE_ITEM_ROOM
 	const EVENT_PICKED_UP_STARDUST_FROM_OMANYTE_ITEM_ROOM
 	const EVENT_PICKED_UP_STAR_PIECE_FROM_OMANYTE_ITEM_ROOM
-	const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM
+	const EVENT_PICKED_UP_GOLD_BERRY_FROM_AERODACTYL_ITEM_ROOM ; 7a0
 	const EVENT_PICKED_UP_MOON_STONE_FROM_AERODACTYL_ITEM_ROOM
 	const EVENT_PICKED_UP_HEAL_POWDER_FROM_AERODACTYL_ITEM_ROOM
 	const EVENT_PICKED_UP_ENERGY_ROOT_FROM_AERODACTYL_ITEM_ROOM
@@ -2024,7 +2024,7 @@
 	const EVENT_CIANWOOD_CITY_EUSINE
 	const EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY
 	const EVENT_SAW_SUICUNE_ON_ROUTE_42
-	const EVENT_SAW_SUICUNE_ON_ROUTE_36
+	const EVENT_SAW_SUICUNE_ON_ROUTE_36 ; 7b0
 	const EVENT_ECRUTEAK_HOUSE_WANDERING_SAGE
 	const EVENT_TIN_TOWER_1F_SUICUNE
 	const EVENT_TIN_TOWER_1F_ENTEI
@@ -2040,7 +2040,7 @@
 	const EVENT_ROUTE_44_MAX_REPEL
 	const EVENT_ICE_PATH_1F_PROTEIN
 	const EVENT_DRAGONS_DEN_B1F_CALCIUM
-	const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER
+	const EVENT_DRAGONS_DEN_B1F_MAX_ELIXER ; 7c0
 	const EVENT_SILVER_CAVE_ROOM_1_ULTRA_BALL
 	const EVENT_SILVER_CAVE_ROOM_2_CALCIUM
 	const EVENT_SILVER_CAVE_ROOM_2_ULTRA_BALL
@@ -2056,5 +2056,4 @@
 	const EVENT_RADIO_TOWER_5F_ULTRA_BALL
 	const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
 	const EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-
+NUM_EVENTS EQU const_value ; 7d0
-NUM_EVENTS EQU const_value

constants/item_constants.asm

@@ -354,3 +354,13 @@ const_value SET 70
 	const HELD_BRIGHTPOWDER
 	const HELD_4E
 	const HELD_FOCUS_BAND
+
+	const_def
+	const ITEMATTR_PRICE
+	const ITEMATTR_PRICE_HI
+	const ITEMATTR_EFFECT
+	const ITEMATTR_PARAM
+	const ITEMATTR_PERMISSIONS
+	const ITEMATTR_POCKET
+	const ITEMATTR_HELP
+NUM_ITEMATTRS EQU const_value

constants/phone_constants.asm

@@ -1,34 +1,43 @@
 
-PHONE_SCHOOLBOY_JACK EQU $05
+	const_def
-PHONE_POKEFAN_BEVERLY EQU $06
+	const PHONE_00
-PHONE_SAILOR_HUEY EQU $07
+	const PHONE_MOM
-
+	const PHONE_OAK
-PHONE_COOLTRAINERM_GAVEN EQU $0b
+	const PHONE_BILL
-PHONE_COOLTRAINERF_BETH EQU $0c
+	const PHONE_ELM
-PHONE_BIRDKEEPER_JOSE EQU $0d
+	const PHONE_SCHOOLBOY_JACK
-PHONE_COOLTRAINERF_REENA EQU $0e
+	const PHONE_POKEFAN_BEVERLY
-PHONE_YOUNGSTER_JOEY EQU $0f
+	const PHONE_SAILOR_HUEY
-PHONE_BUG_CATCHER_WADE EQU $10
+	const PHONE_08
-PHONE_FISHER_RALPH EQU $11
+	const PHONE_09
-PHONE_PICNICKER_LIZ EQU $12
+	const PHONE_0A
-PHONE_HIKER_ANTHONY EQU $13
+	const PHONE_COOLTRAINERM_GAVEN
-PHONE_CAMPER_TODD EQU $14
+	const PHONE_COOLTRAINERF_BETH
-PHONE_PICNICKER_GINA EQU $15
+	const PHONE_BIRDKEEPER_JOSE
-PHONE_JUGGLER_IRWIN EQU $16
+	const PHONE_COOLTRAINERF_REENA
-PHONE_BUG_CATCHER_ARNIE EQU $17
+	const PHONE_YOUNGSTER_JOEY
-PHONE_SCHOOLBOY_ALAN EQU $18
+	const PHONE_BUG_CATCHER_WADE
-
+	const PHONE_FISHER_RALPH
-PHONE_LASS_DANA EQU $1a
+	const PHONE_PICNICKER_LIZ
-PHONE_SCHOOLBOY_CHAD EQU $1b
+	const PHONE_HIKER_ANTHONY
-PHONE_POKEFANM_DEREK EQU $1c
+	const PHONE_CAMPER_TODD
-PHONE_FISHER_TULLY EQU $1d
+	const PHONE_PICNICKER_GINA
-PHONE_POKEMANIAC_BRENT EQU $1e
+	const PHONE_JUGGLER_IRWIN
-PHONE_PICNICKER_TIFFANY EQU $1f
+	const PHONE_BUG_CATCHER_ARNIE
-PHONE_BIRDKEEPER_VANCE EQU $20
+	const PHONE_SCHOOLBOY_ALAN
-PHONE_FISHER_WILTON EQU $21
+	const PHONE_19
-PHONE_BLACKBELT_KENJI EQU $22
+	const PHONE_LASS_DANA
-PHONE_HIKER_PARRY EQU $23
+	const PHONE_SCHOOLBOY_CHAD
-PHONE_PICNICKER_ERIN EQU $24
+	const PHONE_POKEFANM_DEREK
+	const PHONE_FISHER_TULLY
+	const PHONE_POKEMANIAC_BRENT
+	const PHONE_PICNICKER_TIFFANY
+	const PHONE_BIRDKEEPER_VANCE
+	const PHONE_FISHER_WILTON
+	const PHONE_BLACKBELT_KENJI
+	const PHONE_HIKER_PARRY
+	const PHONE_PICNICKER_ERIN
+	const PHONE_BUENA
 
 	const_def
 	const ELMCALL_NONE

constants/sfx_constants.asm

@@ -1,210 +1,210 @@
 	const_def
 
-	const SFX_DEX_FANFARE_50_79          
+	const SFX_DEX_FANFARE_50_79
-	const SFX_ITEM                       
+	const SFX_ITEM
-	const SFX_CAUGHT_MON                 
+	const SFX_CAUGHT_MON
-	const SFX_POKEBALLS_PLACED_ON_TABLE  
+	const SFX_POKEBALLS_PLACED_ON_TABLE
-	const SFX_POTION                     
+	const SFX_POTION
-	const SFX_FULL_HEAL                  
+	const SFX_FULL_HEAL
-	const SFX_MENU                       
+	const SFX_MENU
-	const SFX_READ_TEXT                  
+	const SFX_READ_TEXT
-	const SFX_READ_TEXT_2                
+	const SFX_READ_TEXT_2
-	const SFX_DEX_FANFARE_20_49          
+	const SFX_DEX_FANFARE_20_49
-	const SFX_DEX_FANFARE_80_109         
+	const SFX_DEX_FANFARE_80_109
-	const SFX_POISON                     
+	const SFX_POISON
-	const SFX_GOT_SAFARI_BALLS           
+	const SFX_GOT_SAFARI_BALLS
-	const SFX_BOOT_PC                    
+	const SFX_BOOT_PC
-	const SFX_SHUT_DOWN_PC               
+	const SFX_SHUT_DOWN_PC
-	const SFX_CHOOSE_PC_OPTION           
+	const SFX_CHOOSE_PC_OPTION
-	const SFX_ESCAPE_ROPE                
+	const SFX_ESCAPE_ROPE
-	const SFX_PUSH_BUTTON                
+	const SFX_PUSH_BUTTON
-	const SFX_SECOND_PART_OF_ITEMFINDER  
+	const SFX_SECOND_PART_OF_ITEMFINDER
-	const SFX_WARP_TO                    
+	const SFX_WARP_TO
-	const SFX_WARP_FROM                  
+	const SFX_WARP_FROM
-	const SFX_CHANGE_DEX_MODE            
+	const SFX_CHANGE_DEX_MODE
-	const SFX_JUMP_OVER_LEDGE            
+	const SFX_JUMP_OVER_LEDGE
-	const SFX_GRASS_RUSTLE               
+	const SFX_GRASS_RUSTLE
-	const SFX_FLY                        
+	const SFX_FLY
-	const SFX_WRONG                      
+	const SFX_WRONG
-	const SFX_SQUEAK                     
+	const SFX_SQUEAK
-	const SFX_STRENGTH                   
+	const SFX_STRENGTH
-	const SFX_BOAT                       
+	const SFX_BOAT
-	const SFX_WALL_OPEN                  
+	const SFX_WALL_OPEN
-	const SFX_PLACE_PUZZLE_PIECE_DOWN    
+	const SFX_PLACE_PUZZLE_PIECE_DOWN
-	const SFX_ENTER_DOOR                 
+	const SFX_ENTER_DOOR
-	const SFX_SWITCH_POKEMON             
+	const SFX_SWITCH_POKEMON
-	const SFX_TALLY                      
+	const SFX_TALLY
-	const SFX_TRANSACTION                
+	const SFX_TRANSACTION
-	const SFX_EXIT_BUILDING              
+	const SFX_EXIT_BUILDING
-	const SFX_BUMP                       
+	const SFX_BUMP
-	const SFX_SAVE                       
+	const SFX_SAVE
-	const SFX_POKEFLUTE                  
+	const SFX_POKEFLUTE
-	const SFX_ELEVATOR_END               
+	const SFX_ELEVATOR_END
-	const SFX_THROW_BALL                 
+	const SFX_THROW_BALL
-	const SFX_BALL_POOF                  
+	const SFX_BALL_POOF
-	const SFX_UNKNOWN_2A                 
+	const SFX_UNKNOWN_2A
-	const SFX_RUN                        
+	const SFX_RUN
-	const SFX_SLOT_MACHINE_START         
+	const SFX_SLOT_MACHINE_START
-	const SFX_FANFARE                    
+	const SFX_FANFARE
-	const SFX_PECK                       
+	const SFX_PECK
-	const SFX_KINESIS                    
+	const SFX_KINESIS
-	const SFX_LICK                       
+	const SFX_LICK
-	const SFX_POUND                      
+	const SFX_POUND
-	const SFX_MOVE_PUZZLE_PIECE          
+	const SFX_MOVE_PUZZLE_PIECE
-	const SFX_COMET_PUNCH                
+	const SFX_COMET_PUNCH
-	const SFX_MEGA_PUNCH                 
+	const SFX_MEGA_PUNCH
-	const SFX_SCRATCH                    
+	const SFX_SCRATCH
-	const SFX_VICEGRIP                   
+	const SFX_VICEGRIP
-	const SFX_RAZOR_WIND                 
+	const SFX_RAZOR_WIND
-	const SFX_CUT                        
+	const SFX_CUT
-	const SFX_WING_ATTACK                
+	const SFX_WING_ATTACK
-	const SFX_WHIRLWIND                  
+	const SFX_WHIRLWIND
-	const SFX_BIND                       
+	const SFX_BIND
-	const SFX_VINE_WHIP                  
+	const SFX_VINE_WHIP
-	const SFX_DOUBLE_KICK                
+	const SFX_DOUBLE_KICK
-	const SFX_MEGA_KICK                  
+	const SFX_MEGA_KICK
-	const SFX_HEADBUTT                   
+	const SFX_HEADBUTT
-	const SFX_HORN_ATTACK                
+	const SFX_HORN_ATTACK
-	const SFX_TACKLE                     
+	const SFX_TACKLE
-	const SFX_POISON_STING               
+	const SFX_POISON_STING
-	const SFX_POWDER                     
+	const SFX_POWDER
-	const SFX_DOUBLESLAP                 
+	const SFX_DOUBLESLAP
-	const SFX_BITE                       
+	const SFX_BITE
-	const SFX_JUMP_KICK                  
+	const SFX_JUMP_KICK
-	const SFX_STOMP                      
+	const SFX_STOMP
-	const SFX_TAIL_WHIP                  
+	const SFX_TAIL_WHIP
-	const SFX_KARATE_CHOP                
+	const SFX_KARATE_CHOP
-	const SFX_SUBMISSION                 
+	const SFX_SUBMISSION
-	const SFX_WATER_GUN                  
+	const SFX_WATER_GUN
-	const SFX_SWORDS_DANCE               
+	const SFX_SWORDS_DANCE
-	const SFX_THUNDER                    
+	const SFX_THUNDER
-	const SFX_SUPERSONIC                 
+	const SFX_SUPERSONIC
-	const SFX_LEER                       
+	const SFX_LEER
-	const SFX_EMBER                      
+	const SFX_EMBER
-	const SFX_BUBBLEBEAM                 
+	const SFX_BUBBLEBEAM
-	const SFX_HYDRO_PUMP                 
+	const SFX_HYDRO_PUMP
-	const SFX_SURF                       
+	const SFX_SURF
-	const SFX_PSYBEAM                    
+	const SFX_PSYBEAM
-	const SFX_CHARGE                     
+	const SFX_CHARGE
-	const SFX_THUNDERSHOCK               
+	const SFX_THUNDERSHOCK
-	const SFX_PSYCHIC                    
+	const SFX_PSYCHIC
-	const SFX_SCREECH                    
+	const SFX_SCREECH
-	const SFX_BONE_CLUB                  
+	const SFX_BONE_CLUB
-	const SFX_SHARPEN                    
+	const SFX_SHARPEN
-	const SFX_EGG_BOMB                   
+	const SFX_EGG_BOMB
-	const SFX_SING                       
+	const SFX_SING
-	const SFX_HYPER_BEAM                 
+	const SFX_HYPER_BEAM
-	const SFX_SHINE                      
+	const SFX_SHINE
-	const SFX_UNKNOWN_5F                 
+	const SFX_UNKNOWN_5F
-	const SFX_UNKNOWN_60                 
+	const SFX_UNKNOWN_60
-	const SFX_UNKNOWN_61                 
+	const SFX_UNKNOWN_61
-	const SFX_UNKNOWN_62                 
+	const SFX_UNKNOWN_62
-	const SFX_UNKNOWN_63                 
+	const SFX_UNKNOWN_63
-	const SFX_BURN                       
+	const SFX_BURN
-	const SFX_TITLE_SCREEN_ENTRANCE      
+	const SFX_TITLE_SCREEN_ENTRANCE
-	const SFX_UNKNOWN_66                 
+	const SFX_UNKNOWN_66
-	const SFX_GET_COIN_FROM_SLOTS        
+	const SFX_GET_COIN_FROM_SLOTS
-	const SFX_PAY_DAY                    
+	const SFX_PAY_DAY
-	const SFX_METRONOME                  
+	const SFX_METRONOME
-	const SFX_CALL                       
+	const SFX_CALL
-	const SFX_HANG_UP                    
+	const SFX_HANG_UP
-	const SFX_NO_SIGNAL                  
+	const SFX_NO_SIGNAL
-	const SFX_SANDSTORM                  
+	const SFX_SANDSTORM
-	const SFX_ELEVATOR                   
+	const SFX_ELEVATOR
-	const SFX_PROTECT                    
+	const SFX_PROTECT
-	const SFX_SKETCH                     
+	const SFX_SKETCH
-	const SFX_RAIN_DANCE                 
+	const SFX_RAIN_DANCE
-	const SFX_AEROBLAST                  
+	const SFX_AEROBLAST
-	const SFX_SPARK                      
+	const SFX_SPARK
-	const SFX_CURSE                      
+	const SFX_CURSE
-	const SFX_RAGE                       
+	const SFX_RAGE
-	const SFX_THIEF                      
+	const SFX_THIEF
-	const SFX_THIEF_2                    
+	const SFX_THIEF_2
-	const SFX_SPIDER_WEB                 
+	const SFX_SPIDER_WEB
-	const SFX_MIND_READER                
+	const SFX_MIND_READER
-	const SFX_NIGHTMARE                  
+	const SFX_NIGHTMARE
-	const SFX_SNORE                      
+	const SFX_SNORE
-	const SFX_SWEET_KISS                 
+	const SFX_SWEET_KISS
-	const SFX_SWEET_KISS_2               
+	const SFX_SWEET_KISS_2
-	const SFX_BELLY_DRUM                 
+	const SFX_BELLY_DRUM
-	const SFX_UNKNOWN_7F                 
+	const SFX_UNKNOWN_7F
-	const SFX_SLUDGE_BOMB                
+	const SFX_SLUDGE_BOMB
-	const SFX_FORESIGHT                  
+	const SFX_FORESIGHT
-	const SFX_SPITE                      
+	const SFX_SPITE
-	const SFX_OUTRAGE                    
+	const SFX_OUTRAGE
-	const SFX_PERISH_SONG                
+	const SFX_PERISH_SONG
-	const SFX_GIGA_DRAIN                 
+	const SFX_GIGA_DRAIN
-	const SFX_ATTRACT                    
+	const SFX_ATTRACT
-	const SFX_KINESIS_2                  
+	const SFX_KINESIS_2
-	const SFX_ZAP_CANNON                 
+	const SFX_ZAP_CANNON
-	const SFX_MEAN_LOOK                  
+	const SFX_MEAN_LOOK
-	const SFX_HEAL_BELL                  
+	const SFX_HEAL_BELL
-	const SFX_RETURN                     
+	const SFX_RETURN
-	const SFX_EXP_BAR                    
+	const SFX_EXP_BAR
-	const SFX_MILK_DRINK                 
+	const SFX_MILK_DRINK
-	const SFX_PRESENT                    
+	const SFX_PRESENT
-	const SFX_MORNING_SUN                
+	const SFX_MORNING_SUN
-	const SFX_LEVEL_UP                   
+	const SFX_LEVEL_UP
-	const SFX_KEY_ITEM                   
+	const SFX_KEY_ITEM
-	const SFX_FANFARE_2                  
+	const SFX_FANFARE_2
-	const SFX_REGISTER_PHONE_NUMBER      
+	const SFX_REGISTER_PHONE_NUMBER
-	const SFX_3RD_PLACE                  
+	const SFX_3RD_PLACE
-	const SFX_GET_EGG_FROM_DAYCARE_MAN   
+	const SFX_GET_EGG_FROM_DAYCARE_MAN
-	const SFX_GET_EGG_FROM_DAYCARE_LADY  
+	const SFX_GET_EGG_FROM_DAYCARE_LADY
-	const SFX_MOVE_DELETED               
+	const SFX_MOVE_DELETED
-	const SFX_2ND_PLACE                  
+	const SFX_2ND_PLACE
-	const SFX_1ST_PLACE                  
+	const SFX_1ST_PLACE
-	const SFX_CHOOSE_A_CARD              
+	const SFX_CHOOSE_A_CARD
-	const SFX_GET_TM                     
+	const SFX_GET_TM
-	const SFX_GET_BADGE                  
+	const SFX_GET_BADGE
-	const SFX_QUIT_SLOTS                 
+	const SFX_QUIT_SLOTS
-	const SFX_EGG_CRACK                  
+	const SFX_EGG_CRACK
-	const SFX_DEX_FANFARE_LESS_THAN_20   
+	const SFX_DEX_FANFARE_LESS_THAN_20
-	const SFX_DEX_FANFARE_140_169        
+	const SFX_DEX_FANFARE_140_169
-	const SFX_DEX_FANFARE_170_199        
+	const SFX_DEX_FANFARE_170_199
-	const SFX_DEX_FANFARE_200_229        
+	const SFX_DEX_FANFARE_200_229
-	const SFX_DEX_FANFARE_230_PLUS       
+	const SFX_DEX_FANFARE_230_PLUS
-	const SFX_EVOLVED                    
+	const SFX_EVOLVED
-	const SFX_MASTER_BALL                
+	const SFX_MASTER_BALL
-	const SFX_EGG_HATCH                  
+	const SFX_EGG_HATCH
 	const SFX_GS_INTRO_CHARIZARD_FIREBALL
-	const SFX_GS_INTRO_POKEMON_APPEARS   
+	const SFX_GS_INTRO_POKEMON_APPEARS
-	const SFX_FLASH                      
+	const SFX_FLASH
-	const SFX_GAME_FREAK_LOGO_GS         
+	const SFX_GAME_FREAK_LOGO_GS
-	const SFX_NOT_VERY_EFFECTIVE         
+	const SFX_NOT_VERY_EFFECTIVE
-	const SFX_DAMAGE                     
+	const SFX_DAMAGE
-	const SFX_SUPER_EFFECTIVE            
+	const SFX_SUPER_EFFECTIVE
-	const SFX_BALL_BOUNCE                
+	const SFX_BALL_BOUNCE
-	const SFX_MOONLIGHT                  
+	const SFX_MOONLIGHT
-	const SFX_ENCORE                     
+	const SFX_ENCORE
-	const SFX_BEAT_UP                    
+	const SFX_BEAT_UP
-	const SFX_BATON_PASS                 
+	const SFX_BATON_PASS
-	const SFX_BALL_WIGGLE                
+	const SFX_BALL_WIGGLE
-	const SFX_SWEET_SCENT                
+	const SFX_SWEET_SCENT
-	const SFX_SWEET_SCENT_2              
+	const SFX_SWEET_SCENT_2
-	const SFX_HIT_END_OF_EXP_BAR         
+	const SFX_HIT_END_OF_EXP_BAR
-	const SFX_GIVE_TRADEMON              
+	const SFX_GIVE_TRADEMON
-	const SFX_GET_TRADEMON               
+	const SFX_GET_TRADEMON
-	const SFX_TRAIN_ARRIVED              
+	const SFX_TRAIN_ARRIVED
-	const SFX_STOP_SLOT                  
+	const SFX_STOP_SLOT
-	const SFX_2_BOOPS                    
+	const SFX_2_BOOPS
-	const SFX_GLASS_TING                 
+	const SFX_GLASS_TING
-	const SFX_GLASS_TING_2               
+	const SFX_GLASS_TING_2
 
-	const SFX_INTRO_UNOWN_1              
+	const SFX_INTRO_UNOWN_1
-	const SFX_INTRO_UNOWN_2              
+	const SFX_INTRO_UNOWN_2
-	const SFX_INTRO_UNOWN_3              
+	const SFX_INTRO_UNOWN_3
-	const SFX_DITTO_POP_UP               
+	const SFX_DITTO_POP_UP
-	const SFX_DITTO_TRANSFORM            
+	const SFX_DITTO_TRANSFORM
-	const SFX_INTRO_SUICUNE_1            
+	const SFX_INTRO_SUICUNE_1
-	const SFX_INTRO_PICHU                
+	const SFX_INTRO_PICHU
-	const SFX_INTRO_SUICUNE_2            
+	const SFX_INTRO_SUICUNE_2
-	const SFX_INTRO_SUICUNE_3            
+	const SFX_INTRO_SUICUNE_3
-	const SFX_DITTO_BOUNCE               
+	const SFX_DITTO_BOUNCE
-	const SFX_INTRO_SUICUNE_4            
+	const SFX_INTRO_SUICUNE_4
-	const SFX_GAME_FREAK_PRESENTS        
+	const SFX_GAME_FREAK_PRESENTS
-	const SFX_TINGLE                     
+	const SFX_TINGLE
-	const SFX_UNKNOWN_CB                 
+	const SFX_UNKNOWN_CB
-	const SFX_TWO_PC_BEEPS               
+	const SFX_TWO_PC_BEEPS
-	const SFX_4_NOTE_DITTY               
+	const SFX_4_NOTE_DITTY
-	const SFX_TWINKLE                    
+	const SFX_TWINKLE

engine/events_2.asm

@@ -1,7 +1,7 @@
 ; More overworld event handling.
 
 
-WarpToLastSpawn:: ; 97c28
+WarpToSpawnPoint:: ; 97c28
 	ld hl, StatusFlags2
 	res 1, [hl]
 	res 2, [hl]

engine/map_objects.asm

@@ -2446,19 +2446,19 @@ Function503d: ; 503d
 ; 5041
 
 Function5041: ; 5041
-	call Function5055
+	call CopyMovementPointer
 .loop
 	xor a
 	ld [wc2ea], a
-	call Function505e
+	call GetMovementByte
-	call Function506b
+	call DoMovementFunction
 	ld a, [wc2ea]
 	and a
 	jr nz, .loop
 	ret
 ; 5055
 
-Function5055: ; 5055
+CopyMovementPointer: ; 5055
 	ld a, l
 	ld [wc2eb], a
 	ld a, h
@@ -2466,7 +2466,7 @@ Function5055: ; 5055
 	ret
 ; 505e
 
-Function505e: ; 505e
+GetMovementByte: ; 505e
 	ld hl, wc2eb
 	ld a, [hli]
 	ld h, [hl]
@@ -2480,7 +2480,7 @@ Function5065: ; 5065
 	ret
 ; 506b
 
-Function506b: ; 506b
+DoMovementFunction: ; 506b
 	push af
 	call Function54b8
 	pop af

engine/movement.asm

@@ -130,7 +130,7 @@ Movement_step_wait5: ; 5145
 	ld hl, $000b
 	add hl, bc
 	ld [hl], $4
-	call Function505e
+	call GetMovementByte
 	ld hl, $000a
 	add hl, bc
 	ld [hl], a
@@ -150,7 +150,7 @@ Function516a: ; 516a
 	ld hl, $000c
 	add hl, bc
 	ld [hl], a
-	call Function505e
+	call GetMovementByte
 	ld hl, $000a
 	add hl, bc
 	ld [hl], a
@@ -174,7 +174,7 @@ Function5189: ; 5189
 ; 5196
 
 Function5196: ; 5196
-	call Function505e
+	call GetMovementByte
 	ld hl, $000a
 	add hl, bc
 	ld [hl], a
@@ -228,7 +228,7 @@ Function51db: ; 51db
 	ld hl, $001b
 	add hl, bc
 	ld [hl], $0
-	call Function505e
+	call GetMovementByte
 	ld hl, $000a
 	add hl, bc
 	ld [hl], a
@@ -302,7 +302,7 @@ Movement_step_sleep: ; 5242
 ; parameters:
 ;	duration (DecimalParam)
 
-	call Function505e
+	call GetMovementByte
 	jr Function5247
 
 Function5247: ; 5247
@@ -411,7 +411,7 @@ Movement_step_shake: ; 52d5
 ; parameters:
 ;	displacement (DecimalParam)
 
-	call Function505e
+	call GetMovementByte
 	call Function5565
 	jp Function5065
 ; 52de

engine/pack.asm

@@ -500,7 +500,7 @@ Function10364: ; 10364
 	jr c, .asm_1039c
 	call Function10a1d
 	ld hl, UnknownText_0x10ae9
-	call Function1d4f
+	call MenuTextBox
 	call YesNoBox
 	push af
 	call Function1c07
@@ -1673,7 +1673,7 @@ UnknownText_0x10b07: ; 0x10b07
 ; 0x10b0c
 
 UnknownText_0x10b0c: ; 0x10b0c
-	; 
+	;
 	text_jump UnknownText_0x1c0c83
 	db "@"
 ; 0x10b11

engine/scripting.asm

@@ -912,12 +912,12 @@ Script_winlosstext: ; 0x9714c
 ;     win_text_pointer (TextPointerLabelParam)
 ;     loss_text_pointer (TextPointerLabelParam)
 
-	ld hl, WalkingTile
+	ld hl, wWinTextPointer ; d047
 	call GetScriptByte
 	ld [hli], a
 	call GetScriptByte
 	ld [hli], a
-	ld hl, wd048 + 1
+	ld hl, wLossTextPointer ; d049; this is unnecessary
 	call GetScriptByte
 	ld [hli], a
 	call GetScriptByte
@@ -2675,7 +2675,7 @@ Script_setevent: ; 0x97988
 	ld e, a
 	call GetScriptByte
 	ld d, a
-	ld b, 1 ; set
+	ld b, SET_FLAG
 	call EventFlagAction
 	ret
 ; 0x97996
@@ -2689,7 +2689,7 @@ Script_clearevent: ; 0x97996
 	ld e, a
 	call GetScriptByte
 	ld d, a
-	ld b, 0 ; clear
+	ld b, RESET_FLAG
 	call EventFlagAction
 	ret
 ; 0x979a4
@@ -2703,7 +2703,7 @@ Script_checkevent: ; 0x979a4
 	ld e, a
 	call GetScriptByte
 	ld d, a
-	ld b, 2 ; check
+	ld b, CHECK_FLAG
 	call EventFlagAction
 	ld a, c
 	and a

engine/spawn_points.asm

@@ -41,10 +41,10 @@ ENDM
 	spawn BLACKTHORN,  BLACKTHORN_CITY,            21, 30
 	spawn MT_SILVER,   SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP,   FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
+NUM_SPAWNS EQU const_value
 const_value = -1
 	spawn N_A,         N_A,                        -1, -1
 
-NUM_SPAWNS EQU const_value
 
 
 LoadSpawnPoint: ; 1531f

engine/specials.asm

@@ -14,7 +14,7 @@ Special:: ; c01b
 ; c029
 
 SpecialsPointers:: ; c029
-	add_special WarpToLastSpawn
+	add_special WarpToSpawnPoint
 
 ; Communications
 	add_special Special_SetBitsForLinkTradeRequest
@@ -58,7 +58,7 @@ SpecialsPointers:: ; c029
 	add_special Function90913
 	add_special Functionc2c0
 	add_special Functionc2cd
-	add_special Functionc355
+	add_special MapRadio
 	add_special Functionc360
 	add_special Functionc373
 	add_special Functionc380
@@ -92,7 +92,7 @@ SpecialsPointers:: ; c029
 	add_special Special_SelectRandomBugContestContestants
 	add_special Functionc3fc
 	add_special Function26feb
-	add_special Function27043
+	add_special ToggleDecorationsVisibility
 	add_special SpecialGiveShuckle
 	add_special SpecialReturnShuckle
 	add_special Function73f7
@@ -150,7 +150,7 @@ SpecialsPointers:: ; c029
 	add_special Function101225
 	add_special Function101231
 	add_special Function4925b
-	add_special Function8adef
+	add_special SpecialOmanyteChamber
 	add_special Function11c1ab
 	add_special Function170687
 	add_special Function8ae68
@@ -367,10 +367,10 @@ BugContestJudging: ; c34a
 	ret
 ; c355
 
-Functionc355: ; c355
+MapRadio: ; c355
 	ld a, [ScriptVar]
 	ld e, a
-	callba Function91a53
+	callba PlayRadio
 	ret
 ; c360
 

engine/std_scripts.asm

@@ -204,7 +204,7 @@ HomepageScript:
 Radio1Script:
 	loadfont
 	writebyte $0
-	special Functionc355
+	special MapRadio
 	loadmovesprites
 	end
 
@@ -212,7 +212,7 @@ Radio2Script:
 ; Lucky Channel
 	loadfont
 	writebyte $4
-	special Functionc355
+	special MapRadio
 	loadmovesprites
 	end
 

gbhw.asm

@@ -51,7 +51,7 @@ rTAC        EQU $ff07 ; Timer Control (R/W)
 rTAC_ON        EQU 2
 rTAC_4096_HZ   EQU 0
 rTAC_262144_HZ EQU 1
-rTAC_65536_HZ  EQU 2 
+rTAC_65536_HZ  EQU 2
 rTAC_16384_HZ  EQU 3
 rIF         EQU $ff0f ; Interrupt Flag (R/W)
 rNR10       EQU $ff10 ; Channel 1 Sweep register (R/W)

home.asm

@@ -481,7 +481,7 @@ CallPointerAt:: ; 31be
 ; 31cd
 
 
-Function31cd:: ; 31cd
+ExitMenuCallScript:: ; 31cd
 ; Push pointer hl in the current bank to wd0e8.
 	ld a, [hROMBank]
 
@@ -1379,14 +1379,14 @@ CheckTrainerBattle:: ; 360d
 	push de
 
 ; Has a sprite
-	ld hl, $0001
+	ld hl, MAPOBJECT_SPRITE
 	add hl, de
 	ld a, [hl]
 	and a
 	jr z, .next
 
 ; Is a trainer
-	ld hl, $0008
+	ld hl, MAPOBJECT_COLOR
 	add hl, de
 	ld a, [hl]
 	and $f
@@ -1394,10 +1394,10 @@ CheckTrainerBattle:: ; 360d
 	jr nz, .next
 
 ; Is visible on the map
-	ld hl, $0000
+	ld hl, MAPOBJECT_OBJECT_STRUCT_ID
 	add hl, de
 	ld a, [hl]
-	cp $ff
+	cp -1
 	jr z, .next
 
 ; Is facing the player...
@@ -1406,7 +1406,7 @@ CheckTrainerBattle:: ; 360d
 	jr nc, .next
 
 ; ...within their sight range
-	ld hl, $0009
+	ld hl, MAPOBJECT_RANGE
 	add hl, de
 	ld a, [hl]
 	cp b
@@ -1415,7 +1415,7 @@ CheckTrainerBattle:: ; 360d
 ; And hasn't already been beaten
 	push bc
 	push de
-	ld hl, $000a
+	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
@@ -1429,7 +1429,7 @@ CheckTrainerBattle:: ; 360d
 	pop de
 	pop bc
 	and a
-	jr z, .asm_3666
+	jr z, .startbattle
 
 .next
 	pop de
@@ -1445,7 +1445,7 @@ CheckTrainerBattle:: ; 360d
 	xor a
 	ret
 
-.asm_3666
+.startbattle
 	pop de
 	pop af
 	ld [$ffe0], a
@@ -1457,9 +1457,9 @@ CheckTrainerBattle:: ; 360d
 ; 3674
 
 Function3674:: ; 3674
-	ld a, $1
+	ld a, 1
 	ld [CurFruit], a
-	ld a, $ff
+	ld a, -1
 	ld [wd040], a
 
 Function367e:: ; 367e
@@ -1467,7 +1467,7 @@ Function367e:: ; 367e
 	ld [EngineBuffer1], a
 	ld a, [$ffe0]
 	call GetMapObject
-	ld hl, $000a
+	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc
 	ld a, [EngineBuffer1]
 	call GetFarHalfword
@@ -1564,13 +1564,13 @@ FacingPlayerDistance:: ; 36ad
 ; 36f5
 
 
-Function36f5:: ; 36f5
+CheckTrainerFlag:: ; 36f5
 	push bc
-	ld hl, $0001
+	ld hl, OBJECT_MAP_OBJECT_INDEX
 	add hl, bc
 	ld a, [hl]
 	call GetMapObject
-	ld hl, OBJECT_STEP_DURATION
+	ld hl, MAPOBJECT_SCRIPT_POINTER
 	add hl, bc
 	ld a, [hli]
 	ld h, [hl]
@@ -1580,7 +1580,7 @@ Function36f5:: ; 36f5
 	ld d, h
 	ld e, l
 	push de
-	ld b, $2 ; check
+	ld b, CHECK_FLAG
 	call EventFlagAction
 	pop de
 	ld a, c

home/map.asm

@@ -1774,9 +1774,9 @@ Function2a3c:: ; 2a3c
 
 GetBlockLocation:: ; 2a66
 	ld a, [MapWidth]
-	add $6
+	add 6
 	ld c, a
-	ld b, $0
+	ld b, 0
 	ld hl, wc801
 	add hl, bc
 	ld a, e
@@ -1797,7 +1797,7 @@ GetBlockLocation:: ; 2a66
 .nope
 	ld c, d
 	srl c
-	ld b, $0
+	ld b, 0
 	add hl, bc
 	ret
 ; 2a8b

home/menu.asm

@@ -21,9 +21,9 @@ Function1d4b:: ; 1d4b
 ; 1d4f
 
 
-Function1d4f:: ; 1d4f
+MenuTextBox:: ; 1d4f
 	push hl
-	call Function1d58
+	call LoadMenuTextBox
 	pop hl
 	jp PrintText
 ; 1d57
@@ -32,7 +32,7 @@ Function1d57:: ; 1d57
 	ret
 ; 1d58
 
-Function1d58:: ; 1d58
+LoadMenuTextBox:: ; 1d58
 	ld hl, MenuDataHeader_0x1d5f
 	call LoadMenuDataHeader
 	ret
@@ -46,8 +46,8 @@ MenuDataHeader_0x1d5f:: ; 1d5f
 	db 0 ; default option
 ; 1d67
 
-Function1d67:: ; 1d67
+MenuTextBoxBackup:: ; 1d67
-	call Function1d4f
+	call MenuTextBox
 	call WriteBackup
 	ret
 ; 1d6e
@@ -252,7 +252,7 @@ MenuFunc_1e7f:: ; 0x1e7f
 MenuWriteText:: ; 0x1e8c
 	xor a
 	ld [hBGMapMode], a
-	call Function1ebd ; sort out the text 
+	call Function1ebd ; sort out the text
 	call Function1eda ; actually write it
 	call Function2e31
 	ld a, [hOAMUpdate]
@@ -530,7 +530,7 @@ Function1ff8:: ; 1ff8
 ; 2009
 
 
-PlayClickSFX:: ; 2009 
+PlayClickSFX:: ; 2009
 	push de
 	ld de, SFX_READ_TEXT_2
 	call PlaySFX
@@ -539,7 +539,7 @@ PlayClickSFX:: ; 2009
 ; 0x2012
 
 Function2012:: ; 2012
-	call Function1d4f
+	call MenuTextBox
 	call CloseText
 	call Function1c07
 	ret

home/vblank.asm

@@ -363,7 +363,7 @@ VBlank5:: ; 400
 ; bg map
 ; tiles
 ; joypad
-; 
+;
 
 	ld a, [hROMBank]
 	ld [hROMBankBackup], a