More label updates, moved predefs to new file

Also named most of the engine and event flag constants.

battle/core.asm

@@ -469,13 +469,13 @@ Function3c314: ; 3c314
 	cp $2
 	jr z, .asm_3c341
 	call BattleRandom
-	cp $80
+	cp 1 + (50 percent)
 	jp c, .asm_3c3f1
 	jp Function3c3f3
 
 .asm_3c341
 	call BattleRandom
-	cp $80
+	cp 1 + (50 percent)
 	jp c, Function3c3f3
 	jp .asm_3c3f1
 
@@ -555,13 +555,13 @@ Function3c314: ; 3c314
 	cp $2
 	jr z, .asm_3c3e9
 	call BattleRandom
-	cp $80
+	cp 1 + (50 percent)
 	jp c, .asm_3c3f1
 	jp Function3c3f3
 
 .asm_3c3e9
 	call BattleRandom
-	cp $80
+	cp 1 + (50 percent)
 	jp c, Function3c3f3
 .asm_3c3f1
 	scf
@@ -798,7 +798,7 @@ Function3c543: ; 3c543
 
 	call BattleRandom
 	ld b, a
-	cp $80
+	cp 1 + (50 percent)
 	jr nc, .Stay
 
 	push bc
@@ -810,7 +810,7 @@ Function3c543: ; 3c543
 	jr c, .Flee
 
 	ld a, b
-	cp $1a
+	cp 1 + (10 percent)
 	jr nc, .Stay
 
 	ld a, [TempEnemyMonSpecies]
@@ -1607,7 +1607,7 @@ Function3ca8f: ; 3ca8f
 	and a
 	ret nz
 	call BattleRandom
-	cp $19
+	cp 10 percent
 	ret nc
 	xor a
 	ld [BattleMonStatus], a
@@ -1628,7 +1628,7 @@ Function3ca8f: ; 3ca8f
 	and a
 	ret nz
 	call BattleRandom
-	cp $19
+	cp 10 percent
 	ret nc
 	xor a
 	ld [EnemyMonStatus], a
@@ -2882,7 +2882,7 @@ Function3d227: ; 3d227
 	call ClearSprites
 	call WhiteBGMap
 	call Function3eda6
-	call Function1c07
+	call ExitMenu
 	call Function309d
 	call WaitBGMap
 	call ClearSGB
@@ -3685,7 +3685,7 @@ Function3d74b: ; 3d74b
 Function3d7a0: ; 3d7a0
 	xor a
 	ld [hBGMapMode], a
-	call Function1c07
+	call ExitMenu
 	call ClearSprites
 	hlcoord 1, 0
 	lb bc, 4, 10
@@ -5211,7 +5211,7 @@ BattleMenu_Pack: ; 3e1c7
 	call Function3ed9f
 	call Function3f43d
 	call Function3f47c
-	call Function1c07
+	call ExitMenu
 	call WaitBGMap
 	call Function3ee27
 	call Function309d
@@ -5248,7 +5248,7 @@ Function3e234: ; 3e234
 	call Function3f47c
 	ld a, $1
 	ld [wcfa9], a
-	call Function1c07
+	call ExitMenu
 	call Function3df2c
 	call WaitBGMap
 	call Function309d
@@ -5272,7 +5272,7 @@ Function3e234: ; 3e234
 BattleMenu_PKMN: ; 3e28d
 	call Function1d6e
 Function3e290:
-	call Function1c07
+	call ExitMenu
 	call Function1d6e
 	call WhiteBGMap
 Function3e299:
@@ -6255,13 +6255,13 @@ LoadEnemyMon: ; 3e8eb
 
 ; 25% chance of getting an item
 	call BattleRandom
-	cp a, $c0
+	cp a, 1 + (75 percent)
 	ld a, NO_ITEM
 	jr c, .UpdateItem
 	
 ; From there, an 8% chance for Item2
 	call BattleRandom
-	cp a, $14 ; 8% of 25% = 2% Item2
+	cp a, 8 percent ; 8% of 25% = 2% Item2
 	ld a, [BaseItems]
 	jr nc, .UpdateItem
 	ld a, [BaseItems+1]
@@ -8990,7 +8990,7 @@ Function3f998: ; 3f998
 	ret nz
 
 .asm_3f9ca
-	callab Function2a30d
+	callab UpdateRoamMons
 	ret
 ; 3f9d1
 

constants/engine_flags.asm

@@ -16,13 +16,13 @@
 	const ENGINE_POKERUS
 	const ENGINE_ROCKET_SIGNAL_ON_CH20
 	const ENGINE_CREDITS_SKIP
-	const ENGINE_BUG_CONTEST_ON
+	const ENGINE_BUG_CONTEST_ON ; 10
 	const ENGINE_BUG_CONTEST_TIMER
 	const ENGINE_12
 	const ENGINE_ROCKETS_IN_RADIO_TOWER
 	const ENGINE_BIKE_SHOP_CALL_ENABLED
 	const ENGINE_GIVE_POKERUS
-	const ENGINE_16
+	const ENGINE_FLORIA
 	const ENGINE_ROCKETS_IN_MAHOGANY
 	const ENGINE_STRENGTH_ACTIVE
 	const ENGINE_ALWAYS_ON_BIKE
@@ -32,7 +32,7 @@
 	const ENGINE_PLAINBADGE
 	const ENGINE_FOGBADGE
 	const ENGINE_MINERALBADGE
-	const ENGINE_STORMBADGE
+	const ENGINE_STORMBADGE ; 20
 	const ENGINE_GLACIERBADGE
 	const ENGINE_RISINGBADGE
 	const ENGINE_BOULDERBADGE
@@ -48,7 +48,7 @@
 	const ENGINE_UNLOCKED_UNOWNS_3
 	const ENGINE_UNLOCKED_UNOWNS_4
 	const ENGINE_UNLOCKED_UNOWNS_5
-	const ENGINE_UNLOCKED_UNOWNS_6
+	const ENGINE_UNLOCKED_UNOWNS_6 ; 30
 	const ENGINE_UNLOCKED_UNOWNS_7
 	const ENGINE_UNLOCKED_UNOWNS_8
 	const ENGINE_FLYPOINT_KRISS_HOUSE
@@ -64,7 +64,7 @@
 	const ENGINE_FLYPOINT_CELADON
 	const ENGINE_FLYPOINT_FUCHSIA
 	const ENGINE_FLYPOINT_CINNABAR
-	const ENGINE_FLYPOINT_INDIGO_PLATEAU
+	const ENGINE_FLYPOINT_INDIGO_PLATEAU ; 40
 	const ENGINE_FLYPOINT_NEW_BARK
 	const ENGINE_FLYPOINT_CHERRYGROVE
 	const ENGINE_FLYPOINT_VIOLET
@@ -80,7 +80,7 @@
 	const ENGINE_FLYPOINT_UNUSED
 	const ENGINE_LUCKY_NUMBER_SHOW
 	const ENGINE_4F
-	const ENGINE_KURT_MAKING_BALLS
+	const ENGINE_KURT_MAKING_BALLS ; 50
 	const ENGINE_DAILY_BUG_CONTEST
 	const ENGINE_SPECIAL_WILDDATA
 	const ENGINE_TIME_CAPSULE
@@ -95,8 +95,8 @@
 	const ENGINE_TEA_IN_BLUES_HOUSE
 	const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
 	const ENGINE_DAILY_MOVE_TUTOR
-	const ENGINE_5F
+	const ENGINE_BUENAS_PASSWORD
-	const ENGINE_60
+	const ENGINE_BUENAS_PASSWORD_2 ; 60
 	const ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
 	const ENGINE_62
 	const ENGINE_PLAYER_IS_FEMALE
@@ -112,7 +112,7 @@
 	const ENGINE_RALPH
 	const ENGINE_LIZ
 	const ENGINE_ANTHONY
-	const ENGINE_TODD
+	const ENGINE_TODD ; 70
 	const ENGINE_GINA
 	const ENGINE_ARNIE
 	const ENGINE_ALAN
@@ -128,37 +128,37 @@
 	const ENGINE_BEVERLY_HAS_NUGGET
 	const ENGINE_JOSE_HAS_STAR_PIECE
 	const ENGINE_WADE_HAS_ITEM
-	const ENGINE_GINA_HAS_LEAF_STONE
+	const ENGINE_GINA_HAS_LEAF_STONE ; 80
 	const ENGINE_ALAN_HAS_FIRE_STONE
-	const ENGINE_LIZ_HAS_THUNDERSTONE
+	const ENGINE_DANA_HAS_THUNDERSTONE
 	const ENGINE_DEREK_HAS_NUGGET
 	const ENGINE_TULLY_HAS_WATER_STONE
 	const ENGINE_TIFFANY_HAS_PINK_BOW
 	const ENGINE_WILTON_HAS_ITEM
-	const ENGINE_87
+	const ENGINE_JACK_MONDAY_MORNING
-	const ENGINE_88
+	const ENGINE_HUEY_WEDNESDAY_NIGHT
-	const ENGINE_89
+	const ENGINE_GAVEN_THURSDAY_MORNING
-	const ENGINE_8A
+	const ENGINE_BETH_FRIDAY_AFTERNOON
-	const ENGINE_8B
+	const ENGINE_JOSE_SATURDAY_NIGHT
-	const ENGINE_8C
+	const ENGINE_REENA_SUNDAY_MORNING
-	const ENGINE_8D
+	const ENGINE_JOEY_MONDAY_AFTERNOON
-	const ENGINE_8E
+	const ENGINE_WADE_TUESDAY_NIGHT
-	const ENGINE_8F
+	const ENGINE_RALPH_WEDNESDAY_MORNING
-	const ENGINE_90
+	const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
-	const ENGINE_91
+	const ENGINE_ANTHONY_FRIDAY_NIGHT
-	const ENGINE_92
+	const ENGINE_TODD_SATURDAY_MORNING
-	const ENGINE_93
+	const ENGINE_GINA_SUNDAY_AFTERNOON
-	const ENGINE_94
+	const ENGINE_ARNIE_TUESDAY_MORNING
-	const ENGINE_95
+	const ENGINE_ALAN_WEDNESDAY_AFTERNOON
-	const ENGINE_96
+	const ENGINE_DANA_THURSDAY_NIGHT
-	const ENGINE_97
+	const ENGINE_CHAD_FRIDAY_MORNING
-	const ENGINE_98
+	const ENGINE_TULLY_SUNDAY_NIGHT
-	const ENGINE_99
+	const ENGINE_BRENT_MONDAY_MORNING
-	const ENGINE_9A
+	const ENGINE_TIFFANY_TUESDAY_AFTERNOON
-	const ENGINE_9B
+	const ENGINE_VANCE_WEDNESDAY_NIGHT
-	const ENGINE_9C
+	const ENGINE_WILTON_THRUSDAY_MORNING
-	const ENGINE_9D
+	const ENGINE_PARRY_FRIDAY_AFTERNOON
-	const ENGINE_9E
+	const ENGINE_ERIN_SATURDAY_NIGHT
 	const ENGINE_KRIS_IN_CABLE_CLUB
-	const ENGINE_DUNSPARCE_SWARM
+	const ENGINE_DUNSPARCE_SWARM ; a0
 	const ENGINE_YANMA_SWARM

constants/event_flags.asm

@@ -1,14 +1,16 @@
 
 	const_def
 
-	const EVENT_000
+; These first eight flags are reset upon reloading the map.
-	const EVENT_001
+	const EVENT_GAVE_KURT_APRICORNS ; 000
-	const EVENT_002
+	const EVENT_RECEIVED_BALLS_FROM_KURT
-	const EVENT_003
+	const EVENT_DRAGON_SHRINE_QUESTION_2
-	const EVENT_004
+	const EVENT_DRAGON_SHRINE_QUESTION_3
-	const EVENT_005
+	const EVENT_DRAGON_SHRINE_QUESTION_4
-	const EVENT_006
+	const EVENT_DRAGON_SHRINE_QUESTION_5
-	const EVENT_007
+	const EVENT_JUST_RECEIVED_DRATINI
+	const EVENT_IN_YOUR_ROOM
+; Johto story events
 	const EVENT_GOT_TM31_MUD_SLAP
 	const EVENT_GOT_TM49_FURY_CUTTER
 	const EVENT_GOT_TM01_DYNAMICPUNCH
@@ -49,23 +51,23 @@
 	const EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
 	const EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	const EVENT_FAST_SHIP_DESTINATION_OLIVINE
-	const EVENT_030
+	const EVENT_FAST_SHIP_FIRST_TIME
-	const EVENT_031
+	const EVENT_FAST_SHIP_HAS_ARRIVED
-	const EVENT_032
+	const EVENT_FAST_SHIP_FOUND_GIRL
-	const EVENT_033
+	const EVENT_FAST_SHIP_LAZY_SAILOR
-	const EVENT_034
+	const EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
-	const EVENT_035
+	const EVENT_KURT_GAVE_YOU_LURE_BALL
 	const EVENT_INITIALIZED_EVENTS
 	const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-	const EVENT_038
+	const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
-	const EVENT_039
+	const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
-	const EVENT_03A
+	const EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	const EVENT_03B
 	const EVENT_03C
 	const EVENT_HEALED_MOOMOO
 	const EVENT_GOT_TM13_SNORE_FROM_MOOMOO_FARM
 	const EVENT_TALKED_TO_FARMER_ABOUT_MOOMOO
-	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
+	const EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST ; 040
 	const EVENT_DUDE_TALKED_TO_YOU
 	const EVENT_LEARNED_TO_CATCH_POKEMON
 	const EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
@@ -75,13 +77,13 @@
 	const EVENT_GOT_SUNNY_DAY_FROM_RADIO_TOWER
 	const EVENT_GOT_PINK_BOW_FROM_MARY
 	const EVENT_USED_BASEMENT_KEY
-	const EVENT_04A
+	const EVENT_RECEIVED_CARD_KEY
 	const EVENT_GOT_TM08_ROCK_SMASH
-	const EVENT_04C
+	const EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	const EVENT_GOT_MYSTIC_WATER_IN_CHERRYGROVE
 	const EVENT_GOT_TM05_ROAR
 	const EVENT_GOT_EEVEE
-	const EVENT_GOT_KENYA
+	const EVENT_GOT_KENYA ; 050
 	const EVENT_GAVE_KENYA
 	const EVENT_GOT_HP_UP_FROM_RANDY
 	const EVENT_GOT_TM50_NIGHTMARE
@@ -97,7 +99,7 @@
 	const EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
 	const EVENT_GOT_CHARCOAL_IN_CHARCOAL_KILN
 	const EVENT_GOT_TM02_HEADBUTT
-	const EVENT_DECIDED_TO_HELP_LANCE
+	const EVENT_DECIDED_TO_HELP_LANCE ; 060
 	const EVENT_GOT_TYROGUE_FROM_KIYO
 	const EVENT_MET_FRIEDA_OF_FRIDAY
 	const EVENT_GOT_POISON_BARB_FROM_FRIEDA
@@ -112,25 +114,25 @@
 	const EVENT_MET_SANTOS_OF_SATURDAY
 	const EVENT_GOT_SPELL_TAG_FROM_SANTOS
 	const EVENT_MET_MONICA_OF_MONDAY
-	const EVENT_GOT_SHARP_BEAK_FROM_MONICA
+	const EVENT_GOT_SHARP_BEAK_FROM_MONICA ; 070
 	const EVENT_GOT_SOFT_SAND_FROM_KATE
 	const EVENT_GOT_METAL_COAT_FROM_GRANDPA_ON_SS_AQUA
 	const EVENT_GOT_BLACKGLASSES_IN_DARK_CAVE
 	const EVENT_GOT_KINGS_ROCK_IN_SLOWPOKE_WELL
 	const EVENT_GOT_TM47_STEEL_WING
 	const EVENT_GOT_TM37_SANDSTORM
-	const EVENT_076
+	const EVENT_FIRST_TIME_BANKING_WITH_MOM
 	const EVENT_TOLD_ELM_ABOUT_TOGEPI_OVER_THE_PHONE
 	const EVENT_GOT_CLEAR_BELL
 	const EVENT_GOT_SILVER_WING
 	const EVENT_GOT_TM12_SWEET_SCENT
 	const EVENT_RELEASED_THE_BEASTS
 	const EVENT_GOT_MASTER_BALL_FROM_ELM
+; Johto Signpost Items
 	const EVENT_TIN_TOWER_4F_HIDDEN_MAX_POTION
 	const EVENT_TIN_TOWER_5F_HIDDEN_FULL_RESTORE
 	const EVENT_TIN_TOWER_5F_HIDDEN_CARBOS
-; Signpost items
+	const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER ; 080
-	const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER
 	const EVENT_081
 	const EVENT_082
 	const EVENT_083
@@ -187,8 +189,9 @@
 	const EVENT_LAKE_OF_RAGE_HIDDEN_RARE_CANDY
 	const EVENT_LAKE_OF_RAGE_HIDDEN_MAX_POTION
 	const EVENT_SILVER_CAVE_OUTSIDE_HIDDEN_FULL_RESTORE
+; Crystal-exclusive events in Johto
 	const EVENT_MET_FLORIA
-	const EVENT_0BA
+	const EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
 	const EVENT_BUGGING_KURT_TOO_MUCH
 	const EVENT_TALKED_TO_RUINS_COWARD
 	const EVENT_GOT_DRATINI
@@ -202,6 +205,7 @@
 	const EVENT_0C5
 	const EVENT_0C6
 	const EVENT_0C7
+; Kanto story events
 	const EVENT_GOT_NUGGET_FROM_GUY
 	const EVENT_RETURNED_MACHINE_PART
 	const EVENT_MET_MANAGER_AT_POWER_PLANT
@@ -230,6 +234,7 @@
 	const EVENT_TALKED_TO_OAK_IN_KANTO
 	const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
 	const EVENT_GOT_TM29_PSYCHIC
+; Kanto Signpost Items
 	const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
 	const EVENT_UNDERGROUND_HIDDEN_FULL_RESTORE
 	const EVENT_UNDERGROUND_HIDDEN_X_SPECIAL
@@ -258,11 +263,12 @@
 	const EVENT_CELADON_CITY_HIDDEN_PP_UP
 	const EVENT_CINNABAR_ISLAND_HIDDEN_RARE_CANDY
 	const EVENT_BURNED_TOWER_1F_HIDDEN_ULTRA_BALL
-	const EVENT_100
+	const EVENT_GINA_GAVE_LEAF_STONE
-	const EVENT_101
+	const EVENT_ALAN_GAVE_FIRE_STONE
-	const EVENT_102
+	const EVENT_DANA_GAVE_THUNDERSTONE
-	const EVENT_103
+	const EVENT_TULLY_GAVE_WATER_STONE
-	const EVENT_104
+	const EVENT_TIFFANY_GAVE_PINK_BOW
+; ???
 	const EVENT_105
 	const EVENT_106
 	const EVENT_107
@@ -602,13 +608,15 @@
 	const EVENT_255
 	const EVENT_256
 	const EVENT_257
-	const EVENT_258
+; Kurt events
-	const EVENT_259
+	const EVENT_GAVE_KURT_RED_APRICORN
-	const EVENT_25A
+	const EVENT_GAVE_KURT_BLU_APRICORN
-	const EVENT_25B
+	const EVENT_GAVE_KURT_YLW_APRICORN
-	const EVENT_25C
+	const EVENT_GAVE_KURT_GRN_APRICORN
-	const EVENT_25D
+	const EVENT_GAVE_KURT_WHT_APRICORN
-	const EVENT_25E
+	const EVENT_GAVE_KURT_BLK_APRICORN
+	const EVENT_GAVE_KURT_PNK_APRICORN
+; Phone events
 	const EVENT_JACK_ASKED_FOR_PHONE_NUMBER
 	const EVENT_260
 	const EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
@@ -620,7 +628,7 @@
 	const EVENT_GOT_CARBOS_FROM_VANCE
 	const EVENT_GOT_IRON_FROM_PARRY
 	const EVENT_GOT_CALCIUM_FROM_ERIN
-	const EVENT_26A
+	const EVENT_KENJI_ON_BREAK
 	const EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_26C
 	const EVENT_BETH_ASKED_FOR_PHONE_NUMBER
@@ -674,10 +682,12 @@
 	const EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
 	const EVENT_BUENA_OFFERED_HER_PHONE_NUMBER_NO_BLUE_CARD
 	const EVENT_29F
-	const EVENT_2A0 ; 2a0
+; Ruins Of Alph puzzles
-	const EVENT_2A1
+	const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0
-	const EVENT_2A2
+	const EVENT_SOLVED_KABUTO_PUZZLE
-	const EVENT_2A3
+	const EVENT_SOLVED_OMANYTE_PUZZLE
+	const EVENT_SOLVED_AERODACTYL_PUZZLE
+; Decorations
 	const EVENT_DECO_BED_1
 	const EVENT_DECO_BED_2
 	const EVENT_DECO_BED_3
@@ -724,7 +734,8 @@
 	const EVENT_DECO_BIG_SNORLAX_DOLL
 	const EVENT_DECO_BIG_ONIX_DOLL ; 2d0
 	const EVENT_DECO_BIG_LAPRAS_DOLL
-	const EVENT_2D2
+; More Johto events
+	const EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	const EVENT_SWITCH_1
 	const EVENT_SWITCH_2
 	const EVENT_SWITCH_3
@@ -807,6 +818,7 @@
 	const EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
 	const EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
+; More Crystal-specific events
 	const EVENT_LISTENED_TO_INITIAL_RADIO
 	const EVENT_WALL_OPENED_IN_HO_OH_CHAMBER
 	const EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
@@ -835,6 +847,7 @@
 	const EVENT_GOT_ODD_EGG
 	const EVENT_33F
 	const EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
+; ???
 	const EVENT_341
 	const EVENT_342
 	const EVENT_343
@@ -1533,6 +1546,7 @@
 	const EVENT_BEAT_SAGE_GAKU
 	const EVENT_BEAT_SAGE_MASA
 	const EVENT_BEAT_SAGE_KOJI
+; ???
 	const EVENT_5CC
 	const EVENT_5CD
 	const EVENT_5CE
@@ -1725,7 +1739,7 @@
 	const EVENT_MOUNT_MORTAR_2F_INSIDE_ESCAPE_ROPE
 	const EVENT_MOUNT_MORTAR_B1F_HYPER_POTION
 	const EVENT_MOUNT_MORTAR_B1F_CARBOS
-	const EVENT_ICE_PATH_1F_HM_WATERFALL
+	const EVENT_GOT_HM07_WATERFALL
 	const EVENT_ICE_PATH_1F_PP_UP
 	const EVENT_ICE_PATH_B1F_IRON
 	const EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL
@@ -1835,9 +1849,9 @@
 	const EVENT_6F2
 	const EVENT_ILEX_FOREST_APPRENTICE
 	const EVENT_ILEX_FOREST_CHARCOAL_MASTER
-	const EVENT_6F5
+	const EVENT_CHARCOAL_KILN_FARFETCH_D
-	const EVENT_6F6
+	const EVENT_CHARCOAL_KILN_APPRENTICE
-	const EVENT_6F7
+	const EVENT_CHARCOAL_KILN_BOSS
 	const EVENT_ROUTE_36_SUDOWOODO
 	const EVENT_AZALEA_TOWN_SLOWPOKES
 	const EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
@@ -1943,7 +1957,7 @@
 	const EVENT_ROUTE_40_MONICA_OF_MONDAY
 	const EVENT_LANCES_ROOM_OAK_AND_MARY
 	const EVENT_UNION_CAVE_B2F_LAPRAS ; 760
-	const EVENT_761
+	const EVENT_TEAM_ROCKET_DISBANDED
 	const EVENT_RED_IN_MT_SILVER
 	const EVENT_GOLDENROD_DEPT_STORE_5F_HAPPINESS_EVENT_LADY
 	const EVENT_BURNED_TOWER_MORTY

constants/trainer_constants.asm

@@ -1,22 +1,22 @@
 ; trainer groups
 	enum_start 1
-	trainerclass FALKNER
+	trainerclass FALKNER ; 1
 
-	trainerclass WHITNEY
+	trainerclass WHITNEY ; 2
 
-	trainerclass BUGSY
+	trainerclass BUGSY ; 3
 
-	trainerclass MORTY
+	trainerclass MORTY ; 4
 
-	trainerclass PRYCE
+	trainerclass PRYCE ; 5
 
-	trainerclass JASMINE
+	trainerclass JASMINE ; 6
 
-	trainerclass CHUCK
+	trainerclass CHUCK ; 7
 
-	trainerclass CLAIR
+	trainerclass CLAIR ; 8
 
-	trainerclass RIVAL1
+	trainerclass RIVAL1 ; 9
 	const RIVAL1_1
 	const RIVAL1_2
 	const RIVAL1_3
@@ -33,40 +33,40 @@
 	const RIVAL1_14
 	const RIVAL1_15
 
-	trainerclass POKEMON_PROF
+	trainerclass POKEMON_PROF ; a
 
-	trainerclass WILL
+	trainerclass WILL ; b
 
-	trainerclass CAL
+	trainerclass CAL ; c
 	const CAL1
 	const CAL2
 	const CAL3
 
-	trainerclass BRUNO
+	trainerclass BRUNO ; d
 
-	trainerclass KAREN
+	trainerclass KAREN ; e
 
-	trainerclass KOGA
+	trainerclass KOGA ; f
 
-	trainerclass CHAMPION
+	trainerclass CHAMPION ; 10
 	const LANCE
 
-	trainerclass BROCK
+	trainerclass BROCK ; 11
 
-	trainerclass MISTY
+	trainerclass MISTY ; 12
 
-	trainerclass LT_SURGE
+	trainerclass LT_SURGE ; 13
 
-	trainerclass SCIENTIST
+	trainerclass SCIENTIST ; 14
 	const ROSS
 	const MITCH
 	const JED
 	const MARC
 	const RICH
 
-	trainerclass ERIKA
+	trainerclass ERIKA ; 15
 
-	trainerclass YOUNGSTER
+	trainerclass YOUNGSTER ; 16
 	const JOEY1
 	const MIKEY
 	const ALBERT
@@ -82,7 +82,7 @@
 	const JOEY4
 	const JOEY5
 
-	trainerclass SCHOOLBOY
+	trainerclass SCHOOLBOY ; 17
 	const JACK1
 	const KIPP
 	const ALAN1
@@ -108,7 +108,7 @@
 	const CHAD4
 	const CHAD5
 
-	trainerclass BIRD_KEEPER
+	trainerclass BIRD_KEEPER ; 18
 	const ROD
 	const ABE
 	const BRYAN
@@ -129,7 +129,7 @@
 	const VANCE2
 	const VANCE3
 
-	trainerclass LASS
+	trainerclass LASS ; 19
 	const CARRIE
 	const BRIDGET
 	const ALICE
@@ -148,9 +148,9 @@
 	const DANA4
 	const DANA5
 
-	trainerclass JANINE
+	trainerclass JANINE ; 1a
 
-	trainerclass COOLTRAINERM
+	trainerclass COOLTRAINERM ; 1b
 	const NICK
 	const AARON
 	const PAUL
@@ -172,7 +172,7 @@
 	const ALLEN
 	const DARIN
 
-	trainerclass COOLTRAINERF
+	trainerclass COOLTRAINERF ; 1c
 	const GWEN
 	const LOIS
 	const FRAN
@@ -195,7 +195,7 @@
 	const REENA3
 	const CARA
 
-	trainerclass BEAUTY
+	trainerclass BEAUTY ; 1d
 	const VICTORIA
 	const SAMANTHA
 	const JULIE
@@ -214,7 +214,7 @@
 	const VALERIE
 	const OLIVIA
 
-	trainerclass POKEMANIAC
+	trainerclass POKEMANIAC ; 1e
 	const LARRY
 	const ANDREW
 	const CALVIN
@@ -231,27 +231,27 @@
 	const BRENT4
 	const MILLER
 
-	trainerclass GRUNTM
+	trainerclass GRUNTM ; 1f
 
-	trainerclass GENTLEMAN
+	trainerclass GENTLEMAN ; 20
 	const PRESTON
 	const EDWARD
 	const GREGORY
 	const VIRGIL
 	const ALFRED
 
-	trainerclass SKIER
+	trainerclass SKIER ; 21
 	const ROXANNE
 	const CLARISSA
 
-	trainerclass TEACHER
+	trainerclass TEACHER ; 22
 	const COLETTE
 	const HILLARY
 	const SHIRLEY
 
-	trainerclass SABRINA
+	trainerclass SABRINA ; 23
 
-	trainerclass BUG_CATCHER
+	trainerclass BUG_CATCHER ; 24
 	const DON
 	const ROB
 	const ED
@@ -272,7 +272,7 @@
 	const ARNIE5
 	const WAYNE
 
-	trainerclass FISHER
+	trainerclass FISHER ; 25
 	const JUSTIN
 	const RALPH1
 	const ARNOLD
@@ -299,7 +299,7 @@
 	const RALPH5
 	const TULLY4
 
-	trainerclass SWIMMERM
+	trainerclass SWIMMERM ; 26
 	const HAROLD
 	const SIMON
 	const RANDALL
@@ -322,7 +322,7 @@
 	const LEWIS
 	const PARKER
 
-	trainerclass SWIMMERF
+	trainerclass SWIMMERF ; 27
 	const ELAINE
 	const PAULA
 	const KAYLEE
@@ -343,7 +343,7 @@
 	const DIANA
 	const BRIANA
 
-	trainerclass SAILOR
+	trainerclass SAILOR ; 28
 	const EUGENE
 	const HUEY1
 	const TERRELL
@@ -358,7 +358,7 @@
 	const HUEY3
 	const HUEY4
 
-	trainerclass SUPER_NERD
+	trainerclass SUPER_NERD ; 29
 	const STAN
 	const ERIC
 	const GREGG
@@ -374,13 +374,13 @@
 	const HUGH
 	const MARKUS
 
-	trainerclass RIVAL2
+	trainerclass RIVAL2 ; 2a
 
-	trainerclass GUITARIST
+	trainerclass GUITARIST ; 2b
 	const CLYDE
 	const VINCENT
 
-	trainerclass HIKER
+	trainerclass HIKER ; 2c
 	const ANTHONY1
 	const RUSSELL
 	const PHILLIP
@@ -404,7 +404,7 @@
 	const ANTHONY4
 	const ANTHONY5
 
-	trainerclass BIKER
+	trainerclass BIKER ; 2d
 	const BIKER_BENNY
 	const KAZU
 	const DWAYNE
@@ -415,14 +415,14 @@
 	const JOEL
 	const GLENN
 
-	trainerclass BLAINE
+	trainerclass BLAINE ; 2e
 
-	trainerclass BURGLAR
+	trainerclass BURGLAR ; 2f
 	const DUNCAN
 	const EDDIE
 	const COREY
 
-	trainerclass FIREBREATHER
+	trainerclass FIREBREATHER ; 30
 	const OTIS
 	const DICK
 	const NED
@@ -432,7 +432,7 @@
 	const RAY
 	const LYLE
 
-	trainerclass JUGGLER
+	trainerclass JUGGLER ; 31
 	const IRWIN1
 	const FRITZ
 	const HORTON
@@ -440,7 +440,7 @@
 	const IRWIN3
 	const IRWIN4
 
-	trainerclass BLACKBELT_T
+	trainerclass BLACKBELT_T ; 32
 	const KENJI1
 	const YOSHI
 	const KENJI2
@@ -451,9 +451,9 @@
 	const KENJI3
 	const WAI
 
-	trainerclass EXECUTIVEM
+	trainerclass EXECUTIVEM ; 33
 
-	trainerclass PSYCHIC_T
+	trainerclass PSYCHIC_T ; 34
 	const NATHAN
 	const FRANKLIN
 	const HERMAN
@@ -467,7 +467,7 @@
 	const JARED
 	const RODNEY
 
-	trainerclass PICNICKER
+	trainerclass PICNICKER ; 35
 	const LIZ1
 	const GINA1
 	const BROOKE
@@ -495,7 +495,7 @@
 	const GINA5
 	const TIFFANY4
 
-	trainerclass CAMPER
+	trainerclass CAMPER ; 36
 	const ROLAND
 	const TODD1
 	const IVAN
@@ -519,9 +519,9 @@
 	const TODD5
 	const QUENTIN
 
-	trainerclass EXECUTIVEF
+	trainerclass EXECUTIVEF ; 37
 
-	trainerclass SAGE
+	trainerclass SAGE ; 38
 	const CHOW
 	const NICO
 	const JIN
@@ -535,7 +535,7 @@
 	const MASA
 	const KOJI
 
-	trainerclass MEDIUM
+	trainerclass MEDIUM ; 39
 	const MARTHA
 	const GRACE
 	const BETHANY
@@ -544,12 +544,12 @@
 	const REBECCA
 	const DORIS
 
-	trainerclass BOARDER
+	trainerclass BOARDER ; 3a
 	const RONALD
 	const BRAD
 	const DOUGLAS
 
-	trainerclass POKEFANM
+	trainerclass POKEFANM ; 3b
 	const WILLIAM
 	const DEREK1
 	const ROBERT
@@ -565,7 +565,7 @@
 	const REX
 	const ALLAN
 
-	trainerclass KIMONO_GIRL
+	trainerclass KIMONO_GIRL ; 3c
 	const NAOKO1
 	const NAOKO2
 	const SAYO
@@ -573,7 +573,7 @@
 	const KUNI
 	const MIKI
 
-	trainerclass TWINS
+	trainerclass TWINS ; 3d
 	const AMYANDMAY1
 	const ANNANDANNE1
 	const ANNANDANNE2
@@ -585,7 +585,7 @@
 	const LEAANDPIA1
 	const LEAANDPIA2
 
-	trainerclass POKEFANF
+	trainerclass POKEFANF ; 3e
 	const BEVERLY1
 	const RUTH
 	const BEVERLY2
@@ -593,17 +593,17 @@
 	const GEORGIA
 	const JAIME
 
-	trainerclass RED
+	trainerclass RED ; 3f
 
-	trainerclass BLUE
+	trainerclass BLUE ; 40
 
-	trainerclass OFFICER
+	trainerclass OFFICER ; 41
 	const KEITH
 	const DIRK
 
-	trainerclass GRUNTF
+	trainerclass GRUNTF ; 42
 
-	trainerclass MYSTICALMAN
+	trainerclass MYSTICALMAN ; 43
 	const EUSINE
 
 NUM_TRAINER_CLASSES EQU __enum__

data/wild/fish.asm

@@ -12,17 +12,7 @@ FishAction: ; 92402
 	call GetFishGroupHeader
 	
 	ld hl, FishGroupHeaders
-	; encounter chance
+	add_n_times hl, de, 7
-	add hl, de
-	; pointer to old rod data
-	add hl, de
-	add hl, de
-	; pointer to good rod data
-	add hl, de
-	add hl, de
-	; pointer to super rod data
-	add hl, de
-	add hl, de
 	
 	call Fish
 	
@@ -52,8 +42,7 @@ Fish: ; 9241a
 	inc hl
 	ld e, b
 	ld d, 0
-	add hl, de
+	add_n_times hl, de, 2
-	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -122,7 +111,7 @@ GetFishGroupHeader: ; 9245b
 ; Return fishing encounter group header d in de.
 
 	push hl
-	ld hl, wdc1e
+	ld hl, DailyFlags
 	bit 2, [hl]
 	pop hl
 	jr z, .end

engine/engine_flags.asm

@@ -100,26 +100,26 @@
 	dwb wdc9d, %00000001 ; lucky number show
 	dwb StatusFlags2, %00001000
 
-	dwb wdc1e, %00000001 ; kurt making balls  ; $50
+	dwb DailyFlags, %00000001 ; kurt making balls  ; $50
-	dwb wdc1e, %00000010
+	dwb DailyFlags, %00000010
-	dwb wdc1e, %00000100 ; special wilddata?
+	dwb DailyFlags, %00000100 ; special wilddata?
-	dwb wdc1e, %00001000 ; time capsule (24h wait)
+	dwb DailyFlags, %00001000 ; time capsule (24h wait)
-	dwb wdc1e, %00010000 ; all fruit trees
+	dwb DailyFlags, %00010000 ; all fruit trees
-	dwb wdc1e, %00100000 ; shuckle given
+	dwb DailyFlags, %00100000 ; shuckle given
-	dwb wdc1e, %01000000 ; goldenrod underground merchant closed
+	dwb DailyFlags, %01000000 ; goldenrod underground merchant closed
-	dwb wdc1e, %10000000 ; fought in trainer hall today
+	dwb DailyFlags, %10000000 ; fought in trainer hall today
 
-	dwb wdc1f, %00000001 ; mt moon square clefairy  ; $58
+	dwb WeeklyFlags, %00000001 ; mt moon square clefairy  ; $58
-	dwb wdc1f, %00000010 ; union cave lapras
+	dwb WeeklyFlags, %00000010 ; union cave lapras
-	dwb wdc1f, %00000100 ; goldenrod underground haircut used
+	dwb WeeklyFlags, %00000100 ; goldenrod underground haircut used
-	dwb wdc1f, %00001000 ; goldenrod mall happiness event floor05 person07
+	dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
-	dwb wdc1f, %00010000 ; tea in blues house
+	dwb WeeklyFlags, %00010000 ; tea in blues house
-	dwb wdc1f, %00100000 ; indigo plateau rival fight
+	dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
-	dwb wdc1f, %01000000
+	dwb WeeklyFlags, %01000000
-	dwb wdc1f, %10000000
+	dwb WeeklyFlags, %10000000
 
-	dwb wdc20, %00000001 ; $60
+	dwb SwarmFlags, %00000001 ; $60
-	dwb wdc20, %00000010 ; goldenrod dept store sale is on
+	dwb SwarmFlags, %00000010 ; goldenrod dept store sale is on
 
 	dwb GameTimerPause, %10000000 ; $62
 
@@ -194,5 +194,5 @@
 
 	dwb wd45b, %00000100 ; female player has been transformed into male
 
-	dwb wdc20, %00000100 ; dunsparce swarm   ; $a0
+	dwb SwarmFlags, %00000100 ; dunsparce swarm   ; $a0
-	dwb wdc20, %00001000 ; yanma swarm
+	dwb SwarmFlags, %00001000 ; yanma swarm

engine/events_2.asm

@@ -275,7 +275,7 @@ Function97db5: ; 97db5
 	ld a, [PlayerState]
 	cp 1
 	jr nz, .NoCall
-	call Function2d05
+	call GetMapHeaderPhoneServiceNybble
 	and a
 	jr nz, .NoCall
 	ld hl, wdca1 + 1

engine/fruit_trees.asm

@@ -43,7 +43,7 @@ GetCurTreeFruit: ; 44041
 ; 4404c
 
 TryResetFruitTrees: ; 4404c
-	ld hl, wdc1e
+	ld hl, DailyFlags
 	bit 4, [hl]
 	ret nz
 	jp ResetFruitTrees
@@ -70,7 +70,7 @@ ResetFruitTrees: ; 4406a
 	ld [hli], a
 	ld [hli], a
 	ld [hl], a
-	ld hl, wdc1e
+	ld hl, DailyFlags
 	set 4, [hl]
 	ret
 ; 44078

engine/map_objects.asm

@@ -3051,8 +3051,8 @@ Function579d: ; 579d
 	ld [wd04e], a
 	ld [wd4e2], a
 	call Function57bc
-	callba Function149c6
+	callba CheckWarpCollision
-	call c, Function57d9
+	call c, SpawnInFacingDown
 	call Function57ca
 	ret
 ; 57bc
@@ -3080,7 +3080,7 @@ Function57ca: ; 57ca
 	jr Function57db
 ; 57d9
 
-Function57d9: ; 57d9
+SpawnInFacingDown: ; 57d9
 	ld a, 0
 	; fallthrough
 ; 57db

engine/map_setup.asm

@@ -293,76 +293,76 @@ ReadMapSetupScript: ; 1541d
 ; 15440
 
 MapSetupCommands: ; 15440
-	dbw BANK(EnableLCD), EnableLCD
+	dbw BANK(EnableLCD), EnableLCD ; 00
-	dbw BANK(DisableLCD), DisableLCD
+	dbw BANK(DisableLCD), DisableLCD ; 01
-	dbw BANK(SoundRestart), SoundRestart
+	dbw BANK(SoundRestart), SoundRestart ; 02
-	dbw BANK(PlayMapMusic), PlayMapMusic
+	dbw BANK(PlayMapMusic), PlayMapMusic ; 03
-	dbw BANK(RestartMapMusic), RestartMapMusic
+	dbw BANK(RestartMapMusic), RestartMapMusic ; 04
-	dbw BANK(FadeToMapMusic), FadeToMapMusic
+	dbw BANK(FadeToMapMusic), FadeToMapMusic ; 05
-	dbw BANK(Function15574), Function15574
+	dbw BANK(FadeOutMapAndMusic), FadeOutMapAndMusic ; 06
-	dbw BANK(EnterMapMusic), EnterMapMusic
+	dbw BANK(EnterMapMusic), EnterMapMusic ; 07
-	dbw BANK(Function15587), Function15587
+	dbw BANK(ForceMapMusic), ForceMapMusic ; 08
-	dbw BANK(Function3cae), Function3cae
+	dbw BANK(CrankUpTheVolume), CrankUpTheVolume ; 09
-	dbw BANK(Function24cd), Function24cd
+	dbw BANK(LoadBlockData), LoadBlockData ; 0a
-	dbw BANK(Function28e3), Function28e3
+	dbw BANK(LoadNeighboringBlockData), LoadNeighboringBlockData ; 0b
-	dbw BANK(Function289d), Function289d
+	dbw BANK(SaveScreen), SaveScreen ; 0c
-	dbw BANK(BufferScreen), BufferScreen
+	dbw BANK(BufferScreen), BufferScreen ; 0d
-	dbw BANK(Function1047cf), Function1047cf
+	dbw BANK(LoadGraphics), LoadGraphics ; 0e
-	dbw BANK(LoadTilesetHeader), LoadTilesetHeader
+	dbw BANK(LoadTilesetHeader), LoadTilesetHeader ; 0f
-	dbw BANK(Function104750), Function104750
+	dbw BANK(LoadMapTimeOfDay), LoadMapTimeOfDay ; 10
-	dbw BANK(Function1047eb), Function1047eb
+	dbw BANK(LoadMapPalettes), LoadMapPalettes ; 11
-	dbw BANK(Function29ff8), Function29ff8
+	dbw BANK(LoadWildMonData), LoadWildMonData ; 12
-	dbw BANK(Function1047f0), Function1047f0
+	dbw BANK(RefreshMapSprites), RefreshMapSprites ; 13
-	dbw BANK(Function1045b0), Function1045b0
+	dbw BANK(RunCallback_05_03), RunCallback_05_03 ; 14
-	dbw BANK(Function1045c4), Function1045c4
+	dbw BANK(RunCallback_03), RunCallback_03 ; 15
-	dbw BANK(Function154d7), Function154d7
+	dbw BANK(LoadObjectsRunCallback_02), LoadObjectsRunCallback_02 ; 16
-	dbw BANK(LoadSpawnPoint), LoadSpawnPoint
+	dbw BANK(LoadSpawnPoint), LoadSpawnPoint ; 17
-	dbw BANK(EnterMapConnection), EnterMapConnection
+	dbw BANK(EnterMapConnection), EnterMapConnection ; 18
-	dbw BANK(Function1046c6), Function1046c6
+	dbw BANK(LoadWarpData), LoadWarpData ; 19
-	dbw BANK(Function2309), Function2309
+	dbw BANK(LoadMapAttributes), LoadMapAttributes ; 1a
-	dbw BANK(Function2317), Function2317
+	dbw BANK(LoadMapAttributes_IgnoreHidden), LoadMapAttributes_IgnoreHidden ; 1b
-	dbw BANK(WhiteBGMap), WhiteBGMap
+	dbw BANK(WhiteBGMap), WhiteBGMap ; 1c
-	dbw BANK(Function8c084), Function8c084
+	dbw BANK(FadeBlackBGMap), FadeBlackBGMap ; 1d
-	dbw BANK(Function8c079), Function8c079
+	dbw BANK(FadeInBGMap), FadeInBGMap ; 1e
-	dbw BANK(Function10486d), Function10486d
+	dbw BANK(GetCoordOfUpperLeftCorner), GetCoordOfUpperLeftCorner ; 1f
-	dbw BANK(Function248a), Function248a
+	dbw BANK(RestoreFacingAfterWarp), RestoreFacingAfterWarp ; 20
-	dbw BANK(Function57d9), Function57d9
+	dbw BANK(SpawnInFacingDown), SpawnInFacingDown ; 21
-	dbw BANK(Function8029), Function8029
+	dbw BANK(GetSpawnCoord), GetSpawnCoord ; 22
-	dbw BANK(Function80b8), Function80b8
+	dbw BANK(RefreshPlayerCoords), RefreshPlayerCoords ; 23
-	dbw BANK(Function154eb), Function154eb
+	dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
-	dbw BANK(Function154f1), Function154f1
+	dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
-	dbw BANK(Function2a30d), Function2a30d
+	dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
-	dbw BANK(Function2a394), Function2a394
+	dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27
-	dbw BANK(Function15567), Function15567
+	dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
-	dbw BANK(Function154cf), Function154cf
+	dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
-	dbw BANK(Function154d3), Function154d3
+	dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
-	dbw BANK(Function1556d), Function1556d
+	dbw BANK(RetainOldPalettes), RetainOldPalettes ; 2b
-	dbw BANK(Function154ca), Function154ca
+	dbw BANK(DontScrollText), DontScrollText ; 2c
-	dbw BANK(Functionb8000), Functionb8000
+	dbw BANK(ReturnFromMapSetupScript), ReturnFromMapSetupScript ; 2d
 ; 154ca
 
 
-Function154ca: ; 154ca
+DontScrollText: ; 154ca
 	xor a
 	ld [wc2d7], a
 	ret
 ; 154cf
 
-Function154cf: ; 154cf
+ActivateMapAnims: ; 154cf
 	ld a, $1
 	ld [$ffde], a
 	ret
 ; 154d3
 
-Function154d3: ; 154d3
+SuspendMapAnims: ; 154d3
 	xor a
 	ld [$ffde], a
 	ret
 ; 154d7
 
-Function154d7: ; 154d7
+LoadObjectsRunCallback_02: ; 154d7
 	ld a, $2
-	call Function263b
+	call RunMapCallback
 	callba Function2454f
 	callba Function8177
 	ret
@@ -372,13 +372,13 @@ Function154ea: ; 154ea
 	ret
 ; 154eb
 
-Function154eb: ; 154eb
+DelayClearingOldSprites: ; 154eb
 	ld hl, wd45b
 	set 7, [hl]
 	ret
 ; 154f1
 
-Function154f1: ; 154f1
+DelayLoadingNewSprites: ; 154f1
 	ld hl, wd45b
 	set 6, [hl]
 	ret
@@ -386,13 +386,13 @@ Function154f1: ; 154f1
 Function154f7: ; 154f7
 	nop
 	call Function1550c
-	jr c, .asm_15508
+	jr c, .ok
 	call Function1554e
-	jr c, .asm_15508
+	jr c, .ok
 	call Function1551a
-	jr c, .asm_15508
+	jr c, .ok
 	ret
-.asm_15508
+.ok
 	call Functione4a
 	ret
 
@@ -401,89 +401,89 @@ Function1550c: ; 1550c (5:550c)
 	ld hl, BikeFlags
 	bit 1, [hl]
 	ret z
-	ld a, $1
+	ld a, PLAYER_BIKE
 	ld [PlayerState], a
 	scf
 	ret
 
 Function1551a: ; 1551a (5:551a)
 	ld a, [PlayerState]
-	cp $0
+	cp PLAYER_NORMAL
-	jr z, .asm_1554c
+	jr z, .nope
-	cp $2
+	cp PLAYER_SLIP
-	jr z, .asm_1554c
+	jr z, .nope
-	cp $4
+	cp PLAYER_SURF
-	jr z, .asm_15545
+	jr z, .surfing
-	cp $8
+	cp PLAYER_SURF_PIKA
-	jr z, .asm_15545
+	jr z, .surfing
 	call GetMapPermission
 	cp $3
-	jr z, .asm_1553e
+	jr z, .checkbiking
 	cp $5
-	jr z, .asm_1553e
+	jr z, .checkbiking
 	cp $7
-	jr z, .asm_1553e
+	jr z, .checkbiking
-	jr .asm_1554c
+	jr .nope
-.asm_1553e
+.checkbiking
 	ld a, [PlayerState]
-	cp $1
+	cp PLAYER_BIKE
-	jr nz, .asm_1554c
+	jr nz, .nope
-.asm_15545
+.surfing
-	ld a, $0
+	ld a, PLAYER_NORMAL
 	ld [PlayerState], a
 	scf
 	ret
-.asm_1554c
+.nope
 	and a
 	ret
 
 Function1554e: ; 1554e (5:554e)
 	call Function1852
-	jr nz, .asm_15565
+	jr nz, .ret_nc
 	ld a, [PlayerState]
-	cp $4
+	cp PLAYER_SURF
-	jr z, .asm_15563
+	jr z, .surfing
-	cp $8
+	cp PLAYER_SURF_PIKA
-	jr z, .asm_15563
+	jr z, .surfing
-	ld a, $4
+	ld a, PLAYER_SURF
 	ld [PlayerState], a
-.asm_15563
+.surfing
 	scf
 	ret
-.asm_15565
+.ret_nc
 	and a
 	ret
 ; 15567
 
-Function15567: ; 15567
+FadeOldMapMusic: ; 15567
 	ld a, 6
 	call SkipMusic
 	ret
 ; 1556d
 
-Function1556d: ; 1556d
+RetainOldPalettes: ; 1556d
 	callba _UpdateTimePals
 	ret
 
-Function15574: ; 15574
+FadeOutMapAndMusic: ; 15574
 	ld e, 0
 	ld a, [MusicFadeIDLo]
 	ld d, 0
 	ld a, [MusicFadeIDHi]
 	ld a, $4
 	ld [MusicFade], a
-	call Function4b6
+	call FadeToWhite
 	ret
 ; 15587
 
-Function15587: ; 15587
+ForceMapMusic: ; 15587
 	ld a, [PlayerState]
-	cp $1
+	cp PLAYER_BIKE
-	jr nz, .asm_15596
+	jr nz, .notbiking
 	call VolumeOff
 	ld a, $88
 	ld [MusicFade], a
-.asm_15596
+.notbiking
 	call Function3d2f
 	ret
 ; 1559a

engine/more_phone_scripts.asm

@@ -1476,7 +1476,7 @@ UnknownScript_0xa0a08:
 	iftrue UnknownScript_0xa0a1d
 	checknite
 	iftrue UnknownScript_0xa0a25
-	setevent EVENT_26A
+	setevent EVENT_KENJI_ON_BREAK
 	farwritetext UnknownText_0x66f11
 	keeptextopen
 	jump UnknownScript_0xa0484

engine/pack.asm

@@ -138,7 +138,7 @@ Function100e8: ; 100e8 (4:40e8)
 	push de
 	call LoadMenuDataHeader
 	call InterpretMenu2
-	call Function1c07
+	call ExitMenu
 	pop hl
 	ret c
 	ld a, [wcfa9]
@@ -290,7 +290,7 @@ Function101c5: ; 101c5 (4:41c5)
 	push de
 	call LoadMenuDataHeader
 	call InterpretMenu2
-	call Function1c07
+	call ExitMenu
 	pop hl
 	ret c
 	ld a, [wcfa9]
@@ -495,7 +495,7 @@ Function10364: ; 10364
 	call Function10889
 	callba Function24fbf
 	push af
-	call Function1c07
+	call ExitMenu
 	pop af
 	jr c, .asm_1039c
 	call Function10a1d
@@ -503,7 +503,7 @@ Function10364: ; 10364
 	call MenuTextBox
 	call YesNoBox
 	push af
-	call Function1c07
+	call ExitMenu
 	pop af
 	jr c, .asm_1039c
 	ld hl, NumItems
@@ -822,7 +822,7 @@ Function105dc: ; 105dc (4:45dc)
 	push de
 	call LoadMenuDataHeader
 	call InterpretMenu2
-	call Function1c07
+	call ExitMenu
 	pop hl
 	ret c
 	ld a, [wcfa9]

engine/predef.asm

@@ -0,0 +1,106 @@
+GetPredefPointer:: ; 854b
+; Return the bank and address of PredefID in a and PredefAddress.
+
+; Save hl for later (back in Predef)
+	ld a, h
+	ld [PredefTemp], a
+	ld a, l
+	ld [PredefTemp + 1], a
+
+	push de
+	ld a, [PredefID]
+	ld e, a
+	ld d, 0
+	ld hl, PredefPointers
+	add_n_times hl, de, 3
+	pop de
+
+	ld a, [hli]
+	ld [PredefAddress + 1], a
+	ld a, [hli]
+	ld [PredefAddress], a
+	ld a, [hl]
+
+	ret
+; 856b
+
+PredefPointers:: ; 856b
+; $4b Predef pointers
+; address, bank
+
+	add_predef LearnMove ; $0
+	add_predef Predef1
+	add_predef HealParty
+	add_predef FlagPredef
+	add_predef Functionc699
+	add_predef FillPP
+	add_predef Functiond88c
+	add_predef Functionda96
+	add_predef Functiondb3f ; $8
+	add_predef Functionde6e
+	add_predef GiveEgg
+	add_predef Functionc6e0
+	add_predef Functione167
+	add_predef Functione17b
+	add_predef CanLearnTMHMMove
+	add_predef GetTMHMMove
+	add_predef Function28eef ; $ 10
+	add_predef PrintMoveDesc
+	add_predef UpdatePlayerHUD
+	add_predef FillBox
+	add_predef Function3d873
+	add_predef UpdateEnemyHUD
+	add_predef StartBattle
+	add_predef FillInExpBar
+	add_predef Function3f43d ; $18
+	add_predef Function3f47c
+	add_predef LearnLevelMoves
+	add_predef FillMoves
+	add_predef Function421e6
+	add_predef Function28f63
+	add_predef Function28f24
+	add_predef Function5084a
+	add_predef ListMoves ; $20
+	add_predef Function50d2e
+	add_predef Function50cdb
+	add_predef Function50c50
+	add_predef GetGender
+	add_predef StatsScreenInit
+	add_predef DrawPlayerHP
+	add_predef DrawEnemyHP
+	add_predef PrintTempMonStats ; $28
+	add_predef GetTypeName
+	add_predef PrintMoveType
+	add_predef PrintType
+	add_predef PrintMonTypes
+	add_predef GetUnownLetter
+	add_predef Functioncbcdd
+	add_predef Predef2F
+	add_predef Function9853 ; $30
+	add_predef Function864c
+	add_predef Function91d11
+	add_predef CheckContestMon
+	add_predef Function8c20f
+	add_predef Function8c000
+	add_predef Function8c000_2
+	add_predef PlayBattleAnim
+	add_predef Predef38 ; $38
+	add_predef Predef39
+	add_predef Functionfd1d0
+	add_predef PartyMonItemName
+	add_predef GetFrontpic
+	add_predef GetBackpic
+	add_predef Function5108b
+	add_predef GetTrainerPic
+	add_predef DecompressPredef ; $40
+	add_predef Function347d3
+	add_predef ConvertMon_1to2
+	add_predef Functionfb877
+	add_predef Functiond0000
+	add_predef Function50d0a
+	add_predef Functiond00a3
+	add_predef Functiond008e
+	add_predef Functiond0669 ; $48
+	add_predef Functiond066e
+	dbw $ff, Function2d43 ; ????
+; 864c

engine/scripting.asm

@@ -2124,7 +2124,7 @@ ConvertMemToText: ; 0x976c0
 
 CopyConvertedText: ; 976c8
 	ld hl, StringBuffer3
-	ld bc, 19
+	ld bc, StringBuffer4 - StringBuffer3
 	call AddNTimes
 	call CopyName2
 	ret
@@ -2200,7 +2200,7 @@ Script_name: ; 0x97716
 	call GetScriptByte
 	ld [wcf61], a
 
-Unknown_9771c: ; 0x9771c
+ContinueToGetName: ; 0x9771c
 	call GetScriptByte
 	ld [CurSpecies], a
 	call GetName
@@ -2216,7 +2216,7 @@ Script_trainerclassname: ; 0x9772b
 
 	ld a, TRAINER_NAME
 	ld [wcf61], a
-	jr Unknown_9771c ; 0x97730 $ea
+	jr ContinueToGetName ; 0x97730 $ea
 ; 0x97732
 
 Script_readmoney: ; 0x97732

engine/specials.asm

@@ -46,7 +46,7 @@ SpecialsPointers:: ; c029
 	add_special Special_CheckMagikarpLength
 	add_special Functionfbcd2
 	add_special HealParty
-	add_special Function1559a
+	add_special PokemonCenterPC
 	add_special Functionc2e7
 	add_special Function166d6
 	add_special Function1672a
@@ -64,10 +64,10 @@ SpecialsPointers:: ; c029
 	add_special Functionc380
 	add_special Functionc38d
 	add_special Functionc3db
-	add_special Function8c084
+	add_special FadeBlackBGMap
 	add_special Function8c092
 	add_special Function8c0b6
-	add_special Function8c079
+	add_special FadeInBGMap
 	add_special Function8c0ab
 	add_special Functiond91
 	add_special WhiteBGMap
@@ -112,7 +112,7 @@ SpecialsPointers:: ; c029
 	add_special Function2a4ab
 	add_special Function2a51f
 	add_special RandomPhoneMon
-	add_special Function14209
+	add_special RunCallback_04
 	add_special Functionfb841
 	add_special SpecialSnorlaxAwake
 	add_special Function7413
@@ -182,7 +182,7 @@ SpecialsPointers:: ; c029
 	add_special Function103780
 	add_special Function10387b
 	add_special Function4ae12
-	add_special Function1047eb
+	add_special LoadMapPalettes
 	add_special Function4a927
 	add_special Function90a54
 	add_special Function90a88

engine/std_scripts.asm

@@ -221,7 +221,7 @@ TrashCanScript: ; 0xbc1a5
 
 PCScript:
 	loadfont
-	special Function1559a
+	special PokemonCenterPC
 	loadmovesprites
 	end
 
@@ -306,13 +306,13 @@ BugContestResultsWarpScript:
 	scall BugContestResults_CopyContestantsToResults
 	setevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
 	clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
-	setevent EVENT_2D2
+	setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
 	applymovement $0, Movement_ContestResults_WalkAfterWarp
 
 BugContestResultsScript:
 	clearflag ENGINE_BUG_CONTEST_TIMER
-	clearevent EVENT_2D2
+	clearevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
 	clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
 	clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
@@ -383,7 +383,7 @@ BugContestResults_CleanUp
 ; 0xbc31e
 
 BugContestResults_FirstPlace ; 0xbc31e
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	itemtotext SUN_STONE, $1
 	farwritetext ContestResults_PlayerWonAPrizeText
 	closetext

home.asm

@@ -836,7 +836,12 @@ NamesPointers:: ; 33ab
 	dbw 0, PartyMonOT
 	dbw 0, OTPartyMonOT
 	dbw BANK(TrainerClassNames), TrainerClassNames
-	dbw $04, MoveDescriptions ; ????
+; 33c0
+
+Function33c0:
+	inc b
+	ld d, d
+	ld c, e
 ; 33c3
 
 GetName:: ; 33c3

home/audio.asm

@@ -321,7 +321,7 @@ Function3ca8:: ; 3ca8
 	ret
 ; 3cae
 
-Function3cae:: ; 3cae
+CrankUpTheVolume:: ; 3cae
 	ld a, 4 | 1 << 7
 	ld [MusicFade], a
 	ret

home/fade.asm

@@ -36,7 +36,7 @@ Function4a3:: ; 4a3
 	jr FadeOut
 ; 4b6
 
-Function4b6:: ; 4b6
+FadeToWhite:: ; 4b6
 	ld a, [hCGB]
 	and a
 	jr z, .asm_4c2