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_60
+	const ENGINE_BUENAS_PASSWORD
+	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_88
-	const ENGINE_89
-	const ENGINE_8A
-	const ENGINE_8B
-	const ENGINE_8C
-	const ENGINE_8D
-	const ENGINE_8E
-	const ENGINE_8F
-	const ENGINE_90
-	const ENGINE_91
-	const ENGINE_92
-	const ENGINE_93
-	const ENGINE_94
-	const ENGINE_95
-	const ENGINE_96
-	const ENGINE_97
-	const ENGINE_98
-	const ENGINE_99
-	const ENGINE_9A
-	const ENGINE_9B
-	const ENGINE_9C
-	const ENGINE_9D
-	const ENGINE_9E
+	const ENGINE_JACK_MONDAY_MORNING
+	const ENGINE_HUEY_WEDNESDAY_NIGHT
+	const ENGINE_GAVEN_THURSDAY_MORNING
+	const ENGINE_BETH_FRIDAY_AFTERNOON
+	const ENGINE_JOSE_SATURDAY_NIGHT
+	const ENGINE_REENA_SUNDAY_MORNING
+	const ENGINE_JOEY_MONDAY_AFTERNOON
+	const ENGINE_WADE_TUESDAY_NIGHT
+	const ENGINE_RALPH_WEDNESDAY_MORNING
+	const ENGINE_LIZ_THURSDAY_AFTERNOON ; 90
+	const ENGINE_ANTHONY_FRIDAY_NIGHT
+	const ENGINE_TODD_SATURDAY_MORNING
+	const ENGINE_GINA_SUNDAY_AFTERNOON
+	const ENGINE_ARNIE_TUESDAY_MORNING
+	const ENGINE_ALAN_WEDNESDAY_AFTERNOON
+	const ENGINE_DANA_THURSDAY_NIGHT
+	const ENGINE_CHAD_FRIDAY_MORNING
+	const ENGINE_TULLY_SUNDAY_NIGHT
+	const ENGINE_BRENT_MONDAY_MORNING
+	const ENGINE_TIFFANY_TUESDAY_AFTERNOON
+	const ENGINE_VANCE_WEDNESDAY_NIGHT
+	const ENGINE_WILTON_THRUSDAY_MORNING
+	const ENGINE_PARRY_FRIDAY_AFTERNOON
+	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
-	const EVENT_001
-	const EVENT_002
-	const EVENT_003
-	const EVENT_004
-	const EVENT_005
-	const EVENT_006
-	const EVENT_007
+; These first eight flags are reset upon reloading the map.
+	const EVENT_GAVE_KURT_APRICORNS ; 000
+	const EVENT_RECEIVED_BALLS_FROM_KURT
+	const EVENT_DRAGON_SHRINE_QUESTION_2
+	const EVENT_DRAGON_SHRINE_QUESTION_3
+	const EVENT_DRAGON_SHRINE_QUESTION_4
+	const EVENT_DRAGON_SHRINE_QUESTION_5
+	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_031
-	const EVENT_032
-	const EVENT_033
-	const EVENT_034
-	const EVENT_035
+	const EVENT_FAST_SHIP_FIRST_TIME
+	const EVENT_FAST_SHIP_HAS_ARRIVED
+	const EVENT_FAST_SHIP_FOUND_GIRL
+	const EVENT_FAST_SHIP_LAZY_SAILOR
+	const EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
+	const EVENT_KURT_GAVE_YOU_LURE_BALL
 	const EVENT_INITIALIZED_EVENTS
 	const EVENT_JASMINE_EXPLAINED_AMPHYS_SICKNESS
-	const EVENT_038
-	const EVENT_039
-	const EVENT_03A
+	const EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
+	const EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
+	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
+	const EVENT_BURNED_TOWER_1F_HIDDEN_ETHER ; 080
 	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_101
-	const EVENT_102
-	const EVENT_103
-	const EVENT_104
+	const EVENT_GINA_GAVE_LEAF_STONE
+	const EVENT_ALAN_GAVE_FIRE_STONE
+	const EVENT_DANA_GAVE_THUNDERSTONE
+	const EVENT_TULLY_GAVE_WATER_STONE
+	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
-	const EVENT_259
-	const EVENT_25A
-	const EVENT_25B
-	const EVENT_25C
-	const EVENT_25D
-	const EVENT_25E
+; Kurt events
+	const EVENT_GAVE_KURT_RED_APRICORN
+	const EVENT_GAVE_KURT_BLU_APRICORN
+	const EVENT_GAVE_KURT_YLW_APRICORN
+	const EVENT_GAVE_KURT_GRN_APRICORN
+	const EVENT_GAVE_KURT_WHT_APRICORN
+	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
-	const EVENT_2A1
-	const EVENT_2A2
-	const EVENT_2A3
+; Ruins Of Alph puzzles
+	const EVENT_SOLVED_HO_OH_PUZZLE ; 2a0
+	const EVENT_SOLVED_KABUTO_PUZZLE
+	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_6F6
-	const EVENT_6F7
+	const EVENT_CHARCOAL_KILN_FARFETCH_D
+	const EVENT_CHARCOAL_KILN_APPRENTICE
+	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 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
+	add_n_times hl, de, 7
 	
 	call Fish
 	
@@ -52,8 +42,7 @@ Fish: ; 9241a
 	inc hl
 	ld e, b
 	ld d, 0
-	add hl, de
-	add hl, de
+	add_n_times hl, de, 2
 	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 wdc1e, %00000010
-	dwb wdc1e, %00000100 ; special wilddata?
-	dwb wdc1e, %00001000 ; time capsule (24h wait)
-	dwb wdc1e, %00010000 ; all fruit trees
-	dwb wdc1e, %00100000 ; shuckle given
-	dwb wdc1e, %01000000 ; goldenrod underground merchant closed
-	dwb wdc1e, %10000000 ; fought in trainer hall today
+	dwb DailyFlags, %00000001 ; kurt making balls  ; $50
+	dwb DailyFlags, %00000010
+	dwb DailyFlags, %00000100 ; special wilddata?
+	dwb DailyFlags, %00001000 ; time capsule (24h wait)
+	dwb DailyFlags, %00010000 ; all fruit trees
+	dwb DailyFlags, %00100000 ; shuckle given
+	dwb DailyFlags, %01000000 ; goldenrod underground merchant closed
+	dwb DailyFlags, %10000000 ; fought in trainer hall today
 
-	dwb wdc1f, %00000001 ; mt moon square clefairy  ; $58
-	dwb wdc1f, %00000010 ; union cave lapras
-	dwb wdc1f, %00000100 ; goldenrod underground haircut used
-	dwb wdc1f, %00001000 ; goldenrod mall happiness event floor05 person07
-	dwb wdc1f, %00010000 ; tea in blues house
-	dwb wdc1f, %00100000 ; indigo plateau rival fight
-	dwb wdc1f, %01000000
-	dwb wdc1f, %10000000
+	dwb WeeklyFlags, %00000001 ; mt moon square clefairy  ; $58
+	dwb WeeklyFlags, %00000010 ; union cave lapras
+	dwb WeeklyFlags, %00000100 ; goldenrod underground haircut used
+	dwb WeeklyFlags, %00001000 ; goldenrod mall happiness event floor05 person07
+	dwb WeeklyFlags, %00010000 ; tea in blues house
+	dwb WeeklyFlags, %00100000 ; indigo plateau rival fight
+	dwb WeeklyFlags, %01000000
+	dwb WeeklyFlags, %10000000
 
-	dwb wdc20, %00000001 ; $60
-	dwb wdc20, %00000010 ; goldenrod dept store sale is on
+	dwb SwarmFlags, %00000001 ; $60
+	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 wdc20, %00001000 ; yanma swarm
+	dwb SwarmFlags, %00000100 ; dunsparce swarm   ; $a0
+	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
-	call c, Function57d9
+	callba CheckWarpCollision
+	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(DisableLCD), DisableLCD
-	dbw BANK(SoundRestart), SoundRestart
-	dbw BANK(PlayMapMusic), PlayMapMusic
-	dbw BANK(RestartMapMusic), RestartMapMusic
-	dbw BANK(FadeToMapMusic), FadeToMapMusic
-	dbw BANK(Function15574), Function15574
-	dbw BANK(EnterMapMusic), EnterMapMusic
-	dbw BANK(Function15587), Function15587
-	dbw BANK(Function3cae), Function3cae
-	dbw BANK(Function24cd), Function24cd
-	dbw BANK(Function28e3), Function28e3
-	dbw BANK(Function289d), Function289d
-	dbw BANK(BufferScreen), BufferScreen
-	dbw BANK(Function1047cf), Function1047cf
-	dbw BANK(LoadTilesetHeader), LoadTilesetHeader
-	dbw BANK(Function104750), Function104750
-	dbw BANK(Function1047eb), Function1047eb
-	dbw BANK(Function29ff8), Function29ff8
-	dbw BANK(Function1047f0), Function1047f0
-	dbw BANK(Function1045b0), Function1045b0
-	dbw BANK(Function1045c4), Function1045c4
-	dbw BANK(Function154d7), Function154d7
-	dbw BANK(LoadSpawnPoint), LoadSpawnPoint
-	dbw BANK(EnterMapConnection), EnterMapConnection
-	dbw BANK(Function1046c6), Function1046c6
-	dbw BANK(Function2309), Function2309
-	dbw BANK(Function2317), Function2317
-	dbw BANK(WhiteBGMap), WhiteBGMap
-	dbw BANK(Function8c084), Function8c084
-	dbw BANK(Function8c079), Function8c079
-	dbw BANK(Function10486d), Function10486d
-	dbw BANK(Function248a), Function248a
-	dbw BANK(Function57d9), Function57d9
-	dbw BANK(Function8029), Function8029
-	dbw BANK(Function80b8), Function80b8
-	dbw BANK(Function154eb), Function154eb
-	dbw BANK(Function154f1), Function154f1
-	dbw BANK(Function2a30d), Function2a30d
-	dbw BANK(Function2a394), Function2a394
-	dbw BANK(Function15567), Function15567
-	dbw BANK(Function154cf), Function154cf
-	dbw BANK(Function154d3), Function154d3
-	dbw BANK(Function1556d), Function1556d
-	dbw BANK(Function154ca), Function154ca
-	dbw BANK(Functionb8000), Functionb8000
+	dbw BANK(EnableLCD), EnableLCD ; 00
+	dbw BANK(DisableLCD), DisableLCD ; 01
+	dbw BANK(SoundRestart), SoundRestart ; 02
+	dbw BANK(PlayMapMusic), PlayMapMusic ; 03
+	dbw BANK(RestartMapMusic), RestartMapMusic ; 04
+	dbw BANK(FadeToMapMusic), FadeToMapMusic ; 05
+	dbw BANK(FadeOutMapAndMusic), FadeOutMapAndMusic ; 06
+	dbw BANK(EnterMapMusic), EnterMapMusic ; 07
+	dbw BANK(ForceMapMusic), ForceMapMusic ; 08
+	dbw BANK(CrankUpTheVolume), CrankUpTheVolume ; 09
+	dbw BANK(LoadBlockData), LoadBlockData ; 0a
+	dbw BANK(LoadNeighboringBlockData), LoadNeighboringBlockData ; 0b
+	dbw BANK(SaveScreen), SaveScreen ; 0c
+	dbw BANK(BufferScreen), BufferScreen ; 0d
+	dbw BANK(LoadGraphics), LoadGraphics ; 0e
+	dbw BANK(LoadTilesetHeader), LoadTilesetHeader ; 0f
+	dbw BANK(LoadMapTimeOfDay), LoadMapTimeOfDay ; 10
+	dbw BANK(LoadMapPalettes), LoadMapPalettes ; 11
+	dbw BANK(LoadWildMonData), LoadWildMonData ; 12
+	dbw BANK(RefreshMapSprites), RefreshMapSprites ; 13
+	dbw BANK(RunCallback_05_03), RunCallback_05_03 ; 14
+	dbw BANK(RunCallback_03), RunCallback_03 ; 15
+	dbw BANK(LoadObjectsRunCallback_02), LoadObjectsRunCallback_02 ; 16
+	dbw BANK(LoadSpawnPoint), LoadSpawnPoint ; 17
+	dbw BANK(EnterMapConnection), EnterMapConnection ; 18
+	dbw BANK(LoadWarpData), LoadWarpData ; 19
+	dbw BANK(LoadMapAttributes), LoadMapAttributes ; 1a
+	dbw BANK(LoadMapAttributes_IgnoreHidden), LoadMapAttributes_IgnoreHidden ; 1b
+	dbw BANK(WhiteBGMap), WhiteBGMap ; 1c
+	dbw BANK(FadeBlackBGMap), FadeBlackBGMap ; 1d
+	dbw BANK(FadeInBGMap), FadeInBGMap ; 1e
+	dbw BANK(GetCoordOfUpperLeftCorner), GetCoordOfUpperLeftCorner ; 1f
+	dbw BANK(RestoreFacingAfterWarp), RestoreFacingAfterWarp ; 20
+	dbw BANK(SpawnInFacingDown), SpawnInFacingDown ; 21
+	dbw BANK(GetSpawnCoord), GetSpawnCoord ; 22
+	dbw BANK(RefreshPlayerCoords), RefreshPlayerCoords ; 23
+	dbw BANK(DelayClearingOldSprites), DelayClearingOldSprites ; 24
+	dbw BANK(DelayLoadingNewSprites), DelayLoadingNewSprites ; 25
+	dbw BANK(UpdateRoamMons), UpdateRoamMons ; 26
+	dbw BANK(RestoreRoamMons), RestoreRoamMons ; 27
+	dbw BANK(FadeOldMapMusic), FadeOldMapMusic ; 28
+	dbw BANK(ActivateMapAnims), ActivateMapAnims ; 29
+	dbw BANK(SuspendMapAnims), SuspendMapAnims ; 2a
+	dbw BANK(RetainOldPalettes), RetainOldPalettes ; 2b
+	dbw BANK(DontScrollText), DontScrollText ; 2c
+	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
-	jr z, .asm_1554c
-	cp $2
-	jr z, .asm_1554c
-	cp $4
-	jr z, .asm_15545
-	cp $8
-	jr z, .asm_15545
+	cp PLAYER_NORMAL
+	jr z, .nope
+	cp PLAYER_SLIP
+	jr z, .nope
+	cp PLAYER_SURF
+	jr z, .surfing
+	cp PLAYER_SURF_PIKA
+	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 .asm_1554c
-.asm_1553e
+	jr z, .checkbiking
+	jr .nope
+.checkbiking
 	ld a, [PlayerState]
-	cp $1
-	jr nz, .asm_1554c
-.asm_15545
-	ld a, $0
+	cp PLAYER_BIKE
+	jr nz, .nope
+.surfing
+	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
-	jr z, .asm_15563
-	cp $8
-	jr z, .asm_15563
-	ld a, $4
+	cp PLAYER_SURF
+	jr z, .surfing
+	cp PLAYER_SURF_PIKA
+	jr z, .surfing
+	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
-	jr nz, .asm_15596
+	cp PLAYER_BIKE
+	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

home/map.asm

@@ -150,9 +150,7 @@ Function2198:: ; 2198
 	add a
 	ld l, a
 	ld h, 0
-	add hl, hl
-	add hl, hl
-	add hl, hl
+	add_n_times hl, hl, 3
 	ld a, [TilesetBlocksAddress]
 	add l
 	ld l, a
@@ -387,7 +385,7 @@ Function2300:: ; 2300
 ; 2309
 
 
-Function2309:: ; 2309
+LoadMapAttributes:: ; 2309
 	call Function2326
 	call SwitchToMapScriptHeaderBank
 	call Function234f
@@ -396,7 +394,7 @@ Function2309:: ; 2309
 	ret
 ; 2317
 
-Function2317:: ; 2317
+LoadMapAttributes_IgnoreHidden:: ; 2317
 	call Function2326
 	call SwitchToMapScriptHeaderBank
 	call Function234f
@@ -664,7 +662,7 @@ Function2471:: ; 2471
 	ret
 ; 248a
 
-Function248a:: ; 248a
+RestoreFacingAfterWarp:: ; 248a
 	call GetMapScriptHeaderBank
 	rst Bankswitch
 
@@ -691,7 +689,7 @@ Function248a:: ; 248a
 	call Function24ba
 
 .asm_24b3
-	callba Function10486d
+	callba GetCoordOfUpperLeftCorner
 	ret
 ; 24ba
 
@@ -705,7 +703,7 @@ Function24ba:: ; 24ba
 	ret
 ; 24cd
 
-Function24cd:: ; 24cd
+LoadBlockData:: ; 24cd
 	ld hl, OverworldMap
 	ld bc, OverworldMapEnd - OverworldMap
 	ld a, 0
@@ -713,7 +711,7 @@ Function24cd:: ; 24cd
 	call ChangeMap
 	call FillMapConnections
 	ld a, $1
-	call Function263b
+	call RunMapCallback
 	ret
 ; 24e4
 
@@ -976,7 +974,8 @@ Function2631:: ; 2631
 	jr CallScript
 ; 263b
 
-Function263b:: ; 263b
+RunMapCallback:: ; 263b
+; Will run the first callback found in the map header with execution index equal to a.
 	ld b, a
 	ld a, [hROMBank]
 	push af
@@ -988,7 +987,7 @@ Function263b:: ; 263b
 	ld b, a
 	ld d, h
 	ld e, l
-	call Function2674
+	call ExecuteCallbackScript
 
 .done
 	pop af
@@ -1007,18 +1006,18 @@ Function2653:: ; 2653
 	ld l, a
 	or h
 	ret z
-	ld de, $0003
-.asm_2664
+	ld de, 3
+.loop
 	ld a, [hl]
 	cp b
-	jr z, .asm_266e
+	jr z, .done
 	add hl, de
 	dec c
-	jr nz, .asm_2664
+	jr nz, .loop
 	xor a
 	ret
 
-.asm_266e
+.done
 	inc hl
 	ld a, [hli]
 	ld h, [hl]
@@ -1027,7 +1026,7 @@ Function2653:: ; 2653
 	ret
 ; 2674
 
-Function2674:: ; 2674
+ExecuteCallbackScript:: ; 2674
 	callba Function974f3
 	ld a, [ScriptMode]
 	push af
@@ -1449,7 +1448,7 @@ BufferScreen:: ; 2879
 	ret
 ; 289d
 
-Function289d:: ; 289d
+SaveScreen:: ; 289d
 	ld hl, wd194
 	ld a, [hli]
 	ld h, [hl]
@@ -1499,7 +1498,7 @@ Function289d:: ; 289d
 	jr Function28f7
 
 
-Function28e3:: ; 28e3
+LoadNeighboringBlockData:: ; 28e3
 	ld hl, wd194
 	ld a, [hli]
 	ld h, [hl]
@@ -1947,7 +1946,7 @@ FadeToMenu:: ; 2b29
 	xor a
 	ld [hBGMapMode], a
 	call Function1d6e
-	callba Function8c084
+	callba FadeBlackBGMap
 	call ClearSprites
 	call Function2ed3
 	ret
@@ -1976,7 +1975,7 @@ Function2b5c:: ; 2b5c
 	call GetSGBLayout
 	callba Function49409
 	call Function3200
-	callba Function8c079
+	callba FadeInBGMap
 	call Function2ee4
 	ret
 ; 2b74
@@ -2308,23 +2307,23 @@ RADIO_TOWER_MUSIC EQU 7
 	jr .done
 ; 2cff
 
-Function2cff:: ; 2cff
-	call Function2d0d
+GetMapHeaderTimeOfDayNybble:: ; 2cff
+	call GetPhoneServiceTimeOfDayByte
 	and $f
 	ret
 ; 2d05
 
-Function2d05:: ; 2d05
-	call Function2d0d
+GetMapHeaderPhoneServiceNybble:: ; 2d05
+	call GetPhoneServiceTimeOfDayByte
 	and $f0
 	swap a
 	ret
 ; 2d0d
 
-Function2d0d:: ; 2d0d
+GetPhoneServiceTimeOfDayByte:: ; 2d0d
 	push hl
 	push bc
-	ld de, $0007
+	ld de, 7 ; phone service and time of day
 	call GetMapHeaderMember
 	ld a, c
 	pop bc
@@ -2336,7 +2335,7 @@ Function2d19:: ; 2d19
 	push de
 	push hl
 	push bc
-	ld de, $0008
+	ld de, 8 ; fishing group
 	call GetMapHeaderMember
 	ld a, c
 	pop bc

home/menu.asm

@@ -67,7 +67,7 @@ MenuDataHeader_0x1d75:: ; 1d75
 ; 1d7d
 
 Function1d7d:: ; 1d7d
-	call Function1c07
+	call ExitMenu
 	ret
 ; 1d81
 
@@ -541,7 +541,7 @@ PlayClickSFX:: ; 2009
 Function2012:: ; 2012
 	call MenuTextBox
 	call CloseText
-	call Function1c07
+	call ExitMenu
 	ret
 ; 201c
 

home/movement.asm

@@ -193,7 +193,7 @@ Function1c00:: ; 1c00
 	ret
 ; 1c07
 
-Function1c07:: ; 0x1c07
+ExitMenu:: ; 0x1c07
 	push af
 	callab Function243e8
 	pop af
@@ -205,7 +205,7 @@ Function1c10:: ; 0x1c10
 
 WriteBackup:: ; 0x1c17
 	push af
-	call Function1c07
+	call ExitMenu
 	call Function321c
 	call DrawOnMap
 	pop af

home/window.asm

@@ -41,7 +41,7 @@ Function2de2:: ; 2de2
 	ld a, $90
 	ld [hWY], a
 	call Functione4a
-	callba Functionb8000
+	callba ReturnFromMapSetupScript
 	callba Function106594
 	ret
 ; 2e08

items/item_effects.asm

@@ -603,7 +603,7 @@ ParkBall: ; e8a2
 	ld b, 0
 	callba Function116c1
 
-	call Function4b6
+	call FadeToWhite
 
 	call Functione51
 
@@ -685,7 +685,7 @@ ParkBall: ; e8a2
 	ld hl, UnknownText_0xedeb
 	call PrintText
 
-	call Function4b6
+	call FadeToWhite
 	call Functione51
 	jr .asm_ebe2
 

macros.asm

@@ -40,6 +40,11 @@ dbbw: MACRO
 	dw \3
 	ENDM
 
+dbww: MACRO
+	db \1
+	dw \2, \3
+	ENDM
+
 dbwww: MACRO
 	db \1
 	dw \2, \3, \4

macros/map.asm

@@ -67,7 +67,7 @@ warp_def: macro
 
 
 map_header: MACRO
-	; label, tileset, permission, location, music, time of day, fishing group
+	; label, tileset, permission, location, music, phone service flag, time of day, fishing group
 \1_MapHeader:
 	db BANK(\1_SecondMapHeader), \2, \3
 	dw \1_SecondMapHeader

macros/predef.asm

@@ -1,7 +1,6 @@
 add_predef: MACRO
 \1Predef::
-	dw \1
-	db BANK(\1)
+	dwb \1, BANK(\1)
 ENDM
 
 predef_id: MACRO

maps/BattleTowerBattleRoom.asm

@@ -31,7 +31,7 @@ UnknownScript_0x9f425:
 	keeptextopen
 	loadmovesprites
 	special Function170215
-	special Function8c084
+	special FadeBlackBGMap
 	reloadmap
 	if_not_equal $0, UnknownScript_0x9f4c2
 	copybytetovar wcf64
@@ -46,10 +46,10 @@ UnknownScript_0x9f425:
 	closetext
 	loadmovesprites
 	playmusic MUSIC_HEAL
-	special Function8c084
-	special Function1047eb
+	special FadeBlackBGMap
+	special LoadMapPalettes
 	pause 60
-	special Function8c079
+	special FadeInBGMap
 	special RestartMapMusic
 	loadfont
 	writetext UnknownText_0x9eebc
@@ -73,7 +73,7 @@ UnknownScript_0x9f483:
 	special Function170687
 	playsound SFX_SAVE
 	waitbutton
-	special Function8c084
+	special FadeBlackBGMap
 	special Reset
 UnknownScript_0x9f4a3:
 	writetext UnknownText_0x9efbf
@@ -84,7 +84,7 @@ UnknownScript_0x9f4a3:
 	writebyte $6
 	special Function170687
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	warpfacing $1, GROUP_BATTLE_TOWER_1F, MAP_BATTLE_TOWER_1F, $7, $7
 	loadfont
 	jump UnknownScript_0x9e4b0

maps/BillsHouse.asm

@@ -8,7 +8,7 @@ BillsHouse_MapScriptHeader:
 GrampsScript_0x189538:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x1896ba
 	checkevent EVENT_GOT_THUNDERSTONE_FROM_BILLS_GRANDPA
 	iftrue UnknownScript_0x1896c0
@@ -120,7 +120,7 @@ UnknownScript_0x18963b:
 	verbosegiveitem EVERSTONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -131,7 +131,7 @@ UnknownScript_0x189652:
 	verbosegiveitem LEAF_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_LEAF_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -142,7 +142,7 @@ UnknownScript_0x189669:
 	verbosegiveitem WATER_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_WATER_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 
@@ -153,7 +153,7 @@ UnknownScript_0x189680:
 	verbosegiveitem FIRE_STONE, 1
 	iffalse UnknownScript_0x1896cc
 	setevent EVENT_GOT_FIRE_STONE_FROM_BILLS_GRANDPA
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	loadmovesprites
 	end
 

maps/BluesHouse.asm

@@ -30,10 +30,10 @@ UnknownScript_0x19b0de:
 	writetext UnknownText_0x19b266
 	closetext
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	playmusic MUSIC_HEAL
 	pause 60
-	special Function8c079
+	special FadeInBGMap
 	special RestartMapMusic
 	loadfont
 	writetext UnknownText_0x19b296

maps/CharcoalKiln.asm

@@ -163,6 +163,6 @@ CharcoalKiln_MapEventHeader:
 
 	; people-events
 	db 3
-	person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_6F7
-	person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_6F6
-	person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_6F5
+	person_event SPRITE_BLACK_BELT, 7, 6, OW_DOWN | $3, $0, -1, -1, $0, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
+	person_event SPRITE_YOUNGSTER, 7, 9, OW_DOWN | $2, $11, -1, -1, $0, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
+	person_event SPRITE_MOLTRES, 10, 9, OW_UP | $12, $22, -1, -1, (PAL_OW_BROWN << 4) | $80, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D

maps/Colosseum.asm

@@ -83,5 +83,5 @@ Colosseum_MapEventHeader:
 
 	; people-events
 	db 2
-	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
-	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
+	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
+	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT

maps/CopycatsHouse2F.asm

@@ -41,7 +41,7 @@ Copycat:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .Part2
-	special Function14209
+	special RunCallback_04
 	checkevent EVENT_RETURNED_MACHINE_PART
 	iftrue .Part7
 	loadfont
@@ -65,7 +65,7 @@ Copycat:
 .Part6
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 	loadfont
 	writetext UnknownText_0x18b028
 	closetext
@@ -94,7 +94,7 @@ Copycat:
 .Part11
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 	loadfont
 	writetext UnknownText_0x18b116
 	closetext
@@ -137,7 +137,7 @@ Copycat:
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_KRIS
 .Part17
-	special Function14209
+	special RunCallback_04
 	loadfont
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Part18
@@ -159,7 +159,7 @@ Copycat:
 .Part21
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 	loadfont
 	writetext UnknownText_0x18b2f5
 	closetext

maps/DragonShrine.asm

@@ -23,7 +23,7 @@ DragonShrineTestScript:
 	writetext UnknownText_0x18d2ea
 	keeptextopen
 .Question1:
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	writetext UnknownText_0x18d3bc
 	keeptextopen
 	loadmenudata MenuDataHeader_0x18d215
@@ -35,7 +35,7 @@ DragonShrineTestScript:
 	end
 
 .Question2:
-	setevent EVENT_002
+	setevent EVENT_DRAGON_SHRINE_QUESTION_2
 	writetext UnknownText_0x18d3d3
 	keeptextopen
 	loadmenudata MenuDataHeader_0x18d234
@@ -45,7 +45,7 @@ DragonShrineTestScript:
 	if_equal $2, .RightAnswer
 	if_equal $3, .WrongAnswer
 .Question3:
-	setevent EVENT_003
+	setevent EVENT_DRAGON_SHRINE_QUESTION_3
 	writetext UnknownText_0x18d3f3
 	keeptextopen
 	loadmenudata MenuDataHeader_0x18d258
@@ -55,7 +55,7 @@ DragonShrineTestScript:
 	if_equal $2, .RightAnswer
 	if_equal $3, .RightAnswer
 .Question4:
-	setevent EVENT_004
+	setevent EVENT_DRAGON_SHRINE_QUESTION_4
 	writetext UnknownText_0x18d420
 	keeptextopen
 	loadmenudata MenuDataHeader_0x18d283
@@ -65,7 +65,7 @@ DragonShrineTestScript:
 	if_equal $2, .WrongAnswer
 	if_equal $3, .RightAnswer
 .Question5:
-	setevent EVENT_005
+	setevent EVENT_DRAGON_SHRINE_QUESTION_5
 	writetext UnknownText_0x18d44a
 	keeptextopen
 	loadmenudata MenuDataHeader_0x18d2a5
@@ -75,17 +75,17 @@ DragonShrineTestScript:
 	if_equal $2, .RightAnswer
 	if_equal $3, .WrongAnswer
 .RightAnswer:
-	checkevent EVENT_005
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_5
 	iftrue .PassedTheTest
 	writetext UnknownText_0x18d82d
 	keeptextopen
-	checkevent EVENT_004
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_4
 	iftrue .Question5
-	checkevent EVENT_003
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_3
 	iftrue .Question4
-	checkevent EVENT_002
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
 	iftrue .Question3
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue .Question2
 .WrongAnswer:
 	loadmovesprites
@@ -101,15 +101,15 @@ DragonShrineTestScript:
 	loadmovesprites
 	setevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
 	loadfont
-	checkevent EVENT_005
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_5
 	iftrue .Question5
-	checkevent EVENT_004
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_4
 	iftrue .Question4
-	checkevent EVENT_003
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_3
 	iftrue .Question3
-	checkevent EVENT_002
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
 	iftrue .Question2
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue .Question1
 .PassedTheTest:
 	writetext UnknownText_0x18d47c
@@ -184,15 +184,15 @@ DragonShrineTestScript:
 	playsound SFX_ENTER_DOOR
 	disappear $5
 	waitbutton
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	end
 
 ElderScript_0x18d1a5:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue .DontGiveDratiniYet
-	checkevent EVENT_006
+	checkevent EVENT_JUST_RECEIVED_DRATINI
 	iftrue .ReceivedDratini
 	checkevent EVENT_GOT_DRATINI
 	iffalse .GiveDratini
@@ -215,7 +215,7 @@ ElderScript_0x18d1a5:
 	checkevent EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG
 	special SpecialDratini
 	setevent EVENT_GOT_DRATINI
-	setevent EVENT_006
+	setevent EVENT_JUST_RECEIVED_DRATINI
 	writetext UnknownText_0x18d6ca
 	closetext
 	loadmovesprites
@@ -681,7 +681,7 @@ DragonShrine_MapEventHeader:
 
 	; people-events
 	db 4
-	person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_000
-	person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_000
-	person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_000
+	person_event SPRITE_ELDER, 5, 9, OW_UP | $2, $0, -1, -1, $0, 0, ElderScript_0x18d1a5, EVENT_GAVE_KURT_APRICORNS
+	person_event SPRITE_ELDER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, ElderScript_0x18d205, EVENT_GAVE_KURT_APRICORNS
+	person_event SPRITE_ELDER, 8, 11, OW_LEFT | $0, $0, -1, -1, $0, 0, ElderScript_0x18d20d, EVENT_GAVE_KURT_APRICORNS
 	person_event SPRITE_CLAIR, 12, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, ObjectEvent, EVENT_DRAGON_SHRINE_CLAIR

maps/DragonsDenB1F.asm

@@ -148,12 +148,12 @@ SilverScript_0x18c97e:
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x18c995
 	writetext UnknownText_0x18cc83
 	closetext
 	loadmovesprites
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	special RestartMapMusic
 	end
 

maps/EcruteakGym.asm

@@ -84,7 +84,7 @@ UnknownScript_0x99dc6:
 	follow $0, $8
 	applymovement $0, MovementData_0x99e5f
 	stopfollow
-	special Function8c084
+	special FadeBlackBGMap
 	playsound SFX_ENTER_DOOR
 	waitbutton
 	warp GROUP_ECRUTEAK_CITY, MAP_ECRUTEAK_CITY, $6, $1b

maps/EcruteakHouse.asm

@@ -86,7 +86,7 @@ SageScript_0x98062:
 .CheckForClearBell:
 	checkevent EVENT_KOJI_ALLOWS_YOU_PASSAGE_TO_TIN_TOWER
 	iftrue .AllowedThrough
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue .Event000
 	checkitem CLEAR_BELL
 	iftrue .RingClearBell
@@ -102,7 +102,7 @@ SageScript_0x98062:
 	dotrigger $1
 	setevent EVENT_RANG_CLEAR_BELL_2
 	clearevent EVENT_RANG_CLEAR_BELL_1
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	end
 
 .AllowedThrough:

maps/FastShip1F.asm

@@ -3,24 +3,24 @@ FastShip1F_MapScriptHeader:
 	db 3
 
 	; triggers
-	dw UnknownScript_0x75135, $0000
-	dw UnknownScript_0x75136, $0000
-	dw UnknownScript_0x7513a, $0000
+	dw .Trigger1, $0000
+	dw .Trigger2, $0000
+	dw .Trigger3, $0000
 
 	; callback count
 	db 0
 
-UnknownScript_0x75135:
+.Trigger1:
 	end
 
-UnknownScript_0x75136:
-	priorityjump UnknownScript_0x7513b
+.Trigger2:
+	priorityjump .PriorityJump2
 	end
 
-UnknownScript_0x7513a:
+.Trigger3:
 	end
 
-UnknownScript_0x7513b:
+.PriorityJump2:
 	applymovement $2, MovementData_0x7520e
 	applymovement $0, MovementData_0x75217
 	applymovement $2, MovementData_0x75211
@@ -28,21 +28,21 @@ UnknownScript_0x7513b:
 	playsound SFX_BOAT
 	earthquake 30
 	blackoutmod GROUP_FAST_SHIP_CABINS_SW_SSW_NW, MAP_FAST_SHIP_CABINS_SW_SSW_NW
-	clearevent EVENT_031
-	checkevent EVENT_030
-	iftrue UnknownScript_0x7515d
+	clearevent EVENT_FAST_SHIP_HAS_ARRIVED
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
+	iftrue .Vermilion
 	dotrigger $2
 	end
 
-UnknownScript_0x7515d:
+.Vermilion:
 	dotrigger $0
 	end
 
 SailorScript_0x75160:
 	faceplayer
 	loadfont
-	checkevent EVENT_031
-	iftrue UnknownScript_0x7517a
+	checkevent EVENT_FAST_SHIP_HAS_ARRIVED
+	iftrue .Arrived
 	checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
 	iftrue .Olivine
 	writetext UnknownText_0x7523b
@@ -56,42 +56,42 @@ SailorScript_0x75160:
 	loadmovesprites
 	end
 
-UnknownScript_0x7517a:
+.Arrived:
 	checkevent EVENT_FAST_SHIP_DESTINATION_OLIVINE
-	iftrue .Olivine
+	iftrue ._Olivine
 	writetext UnknownText_0x754be
 	closetext
 	loadmovesprites
-	scall UnknownScript_0x751b8
+	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
 	domaptrigger GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $1
 	warp GROUP_VERMILION_PORT, MAP_VERMILION_PORT, $7, $11
 	end
 
-.Olivine
+._Olivine
 	writetext UnknownText_0x7548d
 	closetext
 	loadmovesprites
-	scall UnknownScript_0x751b8
+	scall .LetThePlayerOut
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	setevent EVENT_OLIVINE_PORT_SAILOR_AT_GANGWAY
 	domaptrigger GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $1
 	warp GROUP_OLIVINE_PORT, MAP_OLIVINE_PORT, $7, $17
 	end
 
-UnknownScript_0x751b8:
+.LetThePlayerOut:
 	checkcode VAR_FACING
-	if_equal $3, UnknownScript_0x751c7
+	if_equal RIGHT, .YouAreFacingRight
 	applymovement $2, MovementData_0x7520e
 	applymovement $0, MovementData_0x75235
 	end
 
-UnknownScript_0x751c7:
+.YouAreFacingRight:
 	applymovement $2, MovementData_0x75214
 	applymovement $0, MovementData_0x75238
 	end
@@ -99,14 +99,14 @@ UnknownScript_0x751c7:
 SailorScript_0x751d0:
 	faceplayer
 	loadfont
-	checkevent EVENT_030
-	iftrue UnknownScript_0x751de
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
+	iftrue .Vermilion
 	writetext UnknownText_0x752f9
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x751de:
+.Vermilion:
 	writetext UnknownText_0x7534f
 	closetext
 	loadmovesprites

maps/FastShipB1F.asm

@@ -41,16 +41,16 @@ UnknownScript_0x76766:
 SailorScript_0x76767:
 	faceplayer
 	loadfont
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue UnknownScript_0x767a0
-	checkevent EVENT_033
+	checkevent EVENT_FAST_SHIP_LAZY_SAILOR
 	iftrue UnknownScript_0x7678d
-	checkevent EVENT_034
+	checkevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
 	iftrue UnknownScript_0x76787
 	writetext UnknownText_0x7687b
 	closetext
 	loadmovesprites
-	setevent EVENT_034
+	setevent EVENT_FAST_SHIP_INFORMED_ABOUT_LAZY_SAILOR
 	clearevent EVENT_FAST_SHIP_CABINS_NNW_NNE_NE_SAILOR
 	end
 
@@ -62,7 +62,7 @@ UnknownScript_0x76787:
 
 UnknownScript_0x7678d:
 	writetext UnknownText_0x7692e
-	checkevent EVENT_032
+	checkevent EVENT_FAST_SHIP_FOUND_GIRL
 	iffalse UnknownScript_0x76799
 	closetext
 	loadmovesprites

maps/FastShipCabins_NNW_NNE_NE.asm

@@ -88,7 +88,7 @@ SailorScript_0x755f1:
 	writetext UnknownText_0x758b1
 	closetext
 	loadmovesprites
-	setevent EVENT_033
+	setevent EVENT_FAST_SHIP_LAZY_SAILOR
 	domaptrigger GROUP_FAST_SHIP_B1F, MAP_FAST_SHIP_B1F, $1
 	checkcode VAR_FACING
 	if_equal $3, UnknownScript_0x75629

maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

@@ -11,7 +11,7 @@ UnknownScript_0x75ea6:
 CaptainScript_0x75ea7:
 	faceplayer
 	loadfont
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue UnknownScript_0x75eb5
 	writetext UnknownText_0x76012
 	closetext
@@ -98,8 +98,8 @@ UnknownScript_0x75f44:
 	loadfont
 	writetext UnknownText_0x76645
 	closetext
-	setevent EVENT_031
-	setevent EVENT_032
+	setevent EVENT_FAST_SHIP_HAS_ARRIVED
+	setevent EVENT_FAST_SHIP_FOUND_GIRL
 	loadmovesprites
 	end
 

maps/FastShipCabins_SW_SSW_NW.asm

@@ -75,11 +75,11 @@ FastShipBed:
 	writetext FastShipBedText2
 	closetext
 	loadmovesprites
-	checkevent EVENT_031
+	checkevent EVENT_FAST_SHIP_HAS_ARRIVED
 	iftrue UnknownScript_0x75ae1
-	checkevent EVENT_032
+	checkevent EVENT_FAST_SHIP_FOUND_GIRL
 	iftrue UnknownScript_0x75ae2
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue UnknownScript_0x75ae2
 UnknownScript_0x75ae1:
 	end
@@ -93,7 +93,7 @@ UnknownScript_0x75ae2:
 	writetext FastShipArrivedVermilionText
 	closetext
 	loadmovesprites
-	setevent EVENT_031
+	setevent EVENT_FAST_SHIP_HAS_ARRIVED
 	end
 
 UnknownScript_0x75af7:
@@ -101,7 +101,7 @@ UnknownScript_0x75af7:
 	writetext FastShipArrivedOlivineText
 	closetext
 	loadmovesprites
-	setevent EVENT_031
+	setevent EVENT_FAST_SHIP_HAS_ARRIVED
 	end
 
 FastShipCabinsNorthwestCabinTrashcan:

maps/FuchsiaGym.asm

@@ -27,7 +27,7 @@ JanineScript_0x195db9:
 	variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
 	variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
 	variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
-	special Function14209
+	special RunCallback_04
 	loadfont
 	writetext UnknownText_0x195feb
 	playsound SFX_GET_BADGE
@@ -57,7 +57,7 @@ FuschiaGym1Script_0x195e1b:
 	applymovement $3, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 UnknownScript_0x195e2c:
 	faceplayer
 	loadfont
@@ -91,7 +91,7 @@ FuschiaGym2Script_0x195e55:
 	applymovement $4, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 UnknownScript_0x195e66:
 	faceplayer
 	loadfont
@@ -125,7 +125,7 @@ FuschiaGym3Script_0x195e8f:
 	applymovement $5, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_3, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 UnknownScript_0x195ea0:
 	faceplayer
 	loadfont
@@ -159,7 +159,7 @@ FuschiaGym4Script_0x195ec9:
 	applymovement $6, MovementData_0x195f27
 	faceplayer
 	variablesprite SPRITE_FUCHSIA_GYM_4, SPRITE_YOUNGSTER
-	special Function14209
+	special RunCallback_04
 UnknownScript_0x195eda:
 	faceplayer
 	loadfont

maps/FuchsiaPokeCenter1F.asm

@@ -29,7 +29,7 @@ JanineImpersonatorScript_0x196462:
 	applymovement $5, MovementData_0x196486
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_JANINE
-	special Function14209
+	special RunCallback_04
 	loadfont
 	writetext UnknownText_0x19654e
 	closetext
@@ -37,7 +37,7 @@ JanineImpersonatorScript_0x196462:
 	applymovement $5, MovementData_0x196486
 	faceplayer
 	variablesprite SPRITE_JANINE_IMPERSONATOR, SPRITE_LASS
-	special Function14209
+	special RunCallback_04
 	end
 
 MovementData_0x196486:

maps/GoldenrodCity.asm

@@ -11,7 +11,7 @@ GoldenrodCity_MapScriptHeader:
 
 .FlyPointAndFloria
 	setflag ENGINE_FLYPOINT_GOLDENROD
-	setflag ENGINE_16
+	setflag ENGINE_FLORIA
 	checkevent EVENT_MET_FLORIA
 	iftrue .FloriaDone
 	clearevent EVENT_FLORIA_AT_SUDOWOODO

maps/GoldenrodDeptStoreB1F.asm

@@ -12,7 +12,7 @@ GoldenrodDeptStoreB1F_MapScriptHeader:
 	dbw 5, UnknownScript_0x7d7ac
 
 UnknownScript_0x7d781:
-	checkevent EVENT_04A
+	checkevent EVENT_RECEIVED_CARD_KEY
 	iftrue UnknownScript_0x7d78a
 	jump UnknownScript_0x7d791
 

maps/GoldenrodFlowerShop.asm

@@ -12,7 +12,7 @@ TeacherScript_0x5535d:
 	iftrue UnknownScript_0x55399
 	checkevent EVENT_MET_FLORIA
 	iffalse UnknownScript_0x5539f
-	checkevent EVENT_0BA
+	checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
 	iffalse UnknownScript_0x5538f
 	checkflag ENGINE_PLAINBADGE
 	iffalse UnknownScript_0x5539c
@@ -54,7 +54,7 @@ LassScript_0x553a2:
 	writetext UnknownText_0x55561
 	closetext
 	loadmovesprites
-	setevent EVENT_0BA
+	setevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
 	setevent EVENT_FLORIA_AT_FLOWER_SHOP
 	clearevent EVENT_FLORIA_AT_SUDOWOODO
 	end

maps/IcePath1F.asm

@@ -33,6 +33,6 @@ IcePath1F_MapEventHeader:
 
 	; people-events
 	db 3
-	person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_ICE_PATH_1F_HM_WATERFALL
+	person_event SPRITE_POKE_BALL, 11, 35, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e472, EVENT_GOT_HM07_WATERFALL
 	person_event SPRITE_POKE_BALL, 27, 36, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e474, EVENT_ICE_PATH_1F_PP_UP
 	person_event SPRITE_POKE_BALL, 13, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7e476, EVENT_ICE_PATH_1F_PROTEIN

maps/IlexForest.asm

@@ -293,7 +293,7 @@ UnknownScript_0x6ed50:
 	appear $2
 	loadvar FarfetchdPosition, $a
 	appear $4
-	setevent EVENT_6F7
+	setevent EVENT_CHARCOAL_KILN_BOSS
 	setevent EVENT_HERDED_FARFETCHD
 	end
 
@@ -347,9 +347,9 @@ BlackBeltScript_0x6edae:
 	setevent EVENT_ILEX_FOREST_FARFETCHD
 	setevent EVENT_ILEX_FOREST_APPRENTICE
 	setevent EVENT_ILEX_FOREST_CHARCOAL_MASTER
-	clearevent EVENT_6F5
-	clearevent EVENT_6F6
-	clearevent EVENT_6F7
+	clearevent EVENT_CHARCOAL_KILN_FARFETCH_D
+	clearevent EVENT_CHARCOAL_KILN_APPRENTICE
+	clearevent EVENT_CHARCOAL_KILN_BOSS
 	end
 
 UnknownScript_0x6edd8:

maps/IndigoPlateauPokeCenter1F.asm

@@ -154,7 +154,7 @@ TeleportGuyScript:
 	closetext
 	loadmovesprites
 	playsound SFX_WARP_TO
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	warp GROUP_NEW_BARK_TOWN, MAP_NEW_BARK_TOWN, $d, $6
 	end

maps/KrissHouse1F.asm

@@ -16,13 +16,13 @@ UnknownScript_0x7a4d7:
 	end
 
 UnknownScript_0x7a4d8:
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 
 UnknownScript_0x7a4db:
 	playmusic MUSIC_MOM
 	showemote EMOTE_SHOCK, $2, 15
 	spriteface $0, LEFT
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x7a4f2
 	applymovement $2, MovementData_0x7a5fc
 	jump UnknownScript_0x7a4f6
@@ -77,9 +77,9 @@ UnknownScript_0x7a549:
 	writetext UnknownText_0x7a850
 	closetext
 	loadmovesprites
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x7a55d
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iffalse UnknownScript_0x7a564
 	jump UnknownScript_0x7a56b
 
@@ -109,11 +109,11 @@ UnknownScript_0x7a57e:
 
 MomScript_0x7a582:
 	faceplayer
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	checktriggers
 	iffalse UnknownScript_0x7a572
 	loadfont
-	checkevent EVENT_076
+	checkevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 	iftrue UnknownScript_0x7a5af
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	iftrue UnknownScript_0x7a5b8
@@ -139,7 +139,7 @@ UnknownScript_0x7a5af:
 	end
 
 UnknownScript_0x7a5b5:
-	setevent EVENT_076
+	setevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 UnknownScript_0x7a5b8:
 	setevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	special Function16218

maps/KrissHouse2F.asm

@@ -16,7 +16,7 @@ KrissHouse2F_MapScriptHeader:
 
 .InitializeRoom:
 	special ToggleDecorationsVisibility
-	setevent EVENT_007
+	setevent EVENT_IN_YOUR_ROOM
 	checkevent EVENT_INITIALIZED_EVENTS
 	iftrue .SkipInizialization
 	jumpstd initializeevents

maps/KurtsHouse.asm

@@ -33,17 +33,17 @@ UnknownScript_0x18e177:
 KurtScript_0x18e178:
 	faceplayer
 	loadfont
-	checkevent EVENT_035
-	iftrue UnknownScript_0x18e1cc
+	checkevent EVENT_KURT_GAVE_YOU_LURE_BALL
+	iftrue .GotLureBall
 	checkevent EVENT_CLEARED_SLOWPOKE_WELL
-	iftrue UnknownScript_0x18e1bf
+	iftrue .ClearedSlowpokeWell
 	writetext UnknownText_0x18e473
 	closetext
 	loadmovesprites
 	special Functionc48f
 	setevent EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET
 	checkcode VAR_FACING
-	if_equal $1, UnknownScript_0x18e1ab
+	if_equal UP, .RunAround
 	spriteface $0, DOWN
 	playsound SFX_FLY
 	applymovement $2, MovementData_0x18e466
@@ -53,7 +53,7 @@ KurtScript_0x18e178:
 	special RestartMapMusic
 	end
 
-UnknownScript_0x18e1ab:
+.RunAround:
 	spriteface $0, DOWN
 	playsound SFX_FLY
 	applymovement $2, MovementData_0x18e46c
@@ -63,211 +63,205 @@ UnknownScript_0x18e1ab:
 	special RestartMapMusic
 	end
 
-UnknownScript_0x18e1bf:
+.ClearedSlowpokeWell:
 	writetext UnknownText_0x18e615
 	keeptextopen
 	verbosegiveitem LURE_BALL, 1
-	iffalse UnknownScript_0x18e2b2
-	setevent EVENT_035
-UnknownScript_0x18e1cc:
-	checkevent EVENT_000
-	iftrue UnknownScript_0x18e29f
-	checkevent EVENT_258
-	iftrue UnknownScript_0x18e2b4
-	checkevent EVENT_259
-	iftrue UnknownScript_0x18e2ca
-	checkevent EVENT_25A
-	iftrue UnknownScript_0x18e2e0
-	checkevent EVENT_25B
-	iftrue UnknownScript_0x18e2f6
-	checkevent EVENT_25C
-	iftrue UnknownScript_0x18e30c
-	checkevent EVENT_25D
-	iftrue UnknownScript_0x18e322
-	checkevent EVENT_25E
-	iftrue UnknownScript_0x18e338
+	iffalse .NoRoomForBall
+	setevent EVENT_KURT_GAVE_YOU_LURE_BALL
+.GotLureBall:
+	checkevent EVENT_GAVE_KURT_APRICORNS
+	iftrue .WaitForApricorns
+	checkevent EVENT_GAVE_KURT_RED_APRICORN
+	iftrue .GiveLevelBall
+	checkevent EVENT_GAVE_KURT_BLU_APRICORN
+	iftrue .GiveLureBall
+	checkevent EVENT_GAVE_KURT_YLW_APRICORN
+	iftrue .GiveMoonBall
+	checkevent EVENT_GAVE_KURT_GRN_APRICORN
+	iftrue .GiveFriendBall
+	checkevent EVENT_GAVE_KURT_WHT_APRICORN
+	iftrue .GiveFastBall
+	checkevent EVENT_GAVE_KURT_BLK_APRICORN
+	iftrue .GiveHeavyBall
+	checkevent EVENT_GAVE_KURT_PNK_APRICORN
+	iftrue .GiveLoveBall
 	checkevent EVENT_CAN_GIVE_GS_BALL_TO_KURT
-	iftrue UnknownScript_0x18e34e
-UnknownScript_0x18e202:
-	checkevent EVENT_001
-	iftrue UnknownScript_0x18e212
-	checkevent EVENT_002
-	iftrue UnknownScript_0x18e212
+	iftrue .CanGiveGSBallToKurt
+.NoGSBall:
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	iftrue .CheckApricorns
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	iftrue .CheckApricorns
 	writetext UnknownText_0x18e6c9
 	closetext
-UnknownScript_0x18e212:
+.CheckApricorns:
 	checkitem RED_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem BLU_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem YLW_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem GRN_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem WHT_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem BLK_APRICORN
-	iftrue UnknownScript_0x18e249
+	iftrue .AskApricorn
 	checkitem PNK_APRICORN
-	iftrue UnknownScript_0x18e249
-	checkevent EVENT_001
-	iftrue UnknownScript_0x18e2ae
-	checkevent EVENT_002
-	iftrue UnknownScript_0x18e243
+	iftrue .AskApricorn
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
+	iftrue .ThatTurnedOutGreat
+	checkevent EVENT_DRAGON_SHRINE_QUESTION_2
+	iftrue .IMakeBallsFromApricorns
 	loadmovesprites
 	end
 
-UnknownScript_0x18e243:
+.IMakeBallsFromApricorns:
 	writetext UnknownText_0x18e6c9
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x18e249:
+.AskApricorn:
 	writetext UnknownText_0x18e736
 	keeptextopen
-	setevent EVENT_002
+	setevent EVENT_DRAGON_SHRINE_QUESTION_2
 	special Function88018
-	if_equal $0, UnknownScript_0x18e2a5
-	if_equal $59, UnknownScript_0x18e275
-	if_equal $5c, UnknownScript_0x18e27b
-	if_equal $5d, UnknownScript_0x18e281
-	if_equal $61, UnknownScript_0x18e287
-	if_equal $63, UnknownScript_0x18e28d
-	if_equal $65, UnknownScript_0x18e293
-	setevent EVENT_258
-	jump UnknownScript_0x18e299
+	if_equal $0, .Cancel
+	if_equal BLU_APRICORN, .Blu
+	if_equal YLW_APRICORN, .Ylw
+	if_equal GRN_APRICORN, .Grn
+	if_equal WHT_APRICORN, .Wht
+	if_equal BLK_APRICORN, .Blk
+	if_equal PNK_APRICORN, .Pnk
+; .Red
+	setevent EVENT_GAVE_KURT_RED_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e275:
-	setevent EVENT_259
-	jump UnknownScript_0x18e299
+.Blu:
+	setevent EVENT_GAVE_KURT_BLU_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e27b:
-	setevent EVENT_25A
-	jump UnknownScript_0x18e299
+.Ylw:
+	setevent EVENT_GAVE_KURT_YLW_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e281:
-	setevent EVENT_25B
-	jump UnknownScript_0x18e299
+.Grn:
+	setevent EVENT_GAVE_KURT_GRN_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e287:
-	setevent EVENT_25C
-	jump UnknownScript_0x18e299
+.Wht:
+	setevent EVENT_GAVE_KURT_WHT_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e28d:
-	setevent EVENT_25D
-	jump UnknownScript_0x18e299
+.Blk:
+	setevent EVENT_GAVE_KURT_BLK_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e293:
-	setevent EVENT_25E
-	jump UnknownScript_0x18e299
+.Pnk:
+	setevent EVENT_GAVE_KURT_PNK_APRICORN
+	jump .GaveKurtApricorns
 
-UnknownScript_0x18e299:
-	setevent EVENT_000
+.GaveKurtApricorns:
+	setevent EVENT_GAVE_KURT_APRICORNS
 	setflag ENGINE_KURT_MAKING_BALLS
-UnknownScript_0x18e29f:
+.WaitForApricorns:
 	writetext UnknownText_0x18e779
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x18e2a5:
+.Cancel:
 	writetext UnknownText_0x18e7bc
 	closetext
 	loadmovesprites
 	end
 
-UnknownScript_0x18e2ab:
-	setevent EVENT_001
-UnknownScript_0x18e2ae:
+._ThatTurnedOutGreat:
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+.ThatTurnedOutGreat:
 	writetext UnknownText_0x18e82a
 	closetext
-UnknownScript_0x18e2b2:
+.NoRoomForBall:
 	loadmovesprites
 	end
 
-UnknownScript_0x18e2b4:
+.GiveLevelBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 LEVEL_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2c4:
-	clearevent EVENT_258
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_RED_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e2ca:
+.GiveLureBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 LURE_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2da:
-	clearevent EVENT_259
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_BLU_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e2e0:
+.GiveMoonBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 MOON_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e2f0:
-	clearevent EVENT_25A
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_YLW_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e2f6:
+.GiveFriendBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 FRIEND_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e306:
-	clearevent EVENT_25B
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_GRN_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e30c:
+.GiveFastBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 FAST_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e31c:
-	clearevent EVENT_25C
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_WHT_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e322:
+.GiveHeavyBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 HEAVY_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e332:
-	clearevent EVENT_25D
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_BLK_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e338:
+.GiveLoveBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iftrue UnknownScript_0x18e3c5
+	iftrue KurtMakingBallsScript
 	writetext UnknownText_0x18e7fb
 	keeptextopen
 	verbosegiveitem2 LOVE_BALL, $16
-	iffalse UnknownScript_0x18e2b2
-UnknownScript_0x18e348:
-	clearevent EVENT_25E
-	jump UnknownScript_0x18e2ab
+	iffalse .NoRoomForBall
+	clearevent EVENT_GAVE_KURT_PNK_APRICORN
+	jump ._ThatTurnedOutGreat
 
-UnknownScript_0x18e34e:
+.CanGiveGSBallToKurt:
 	checkevent EVENT_GAVE_GS_BALL_TO_KURT
-	iftrue UnknownScript_0x18e368
+	iftrue .GaveGSBallToKurt
 	checkitem GS_BALL
-	iffalse UnknownScript_0x18e202
+	iffalse .NoGSBall
 	writetext UnknownText_0x18e8ab
 	closetext
 	loadmovesprites
@@ -276,9 +270,9 @@ UnknownScript_0x18e34e:
 	setflag ENGINE_KURT_MAKING_BALLS
 	end
 
-UnknownScript_0x18e368:
+.GaveGSBallToKurt:
 	checkflag ENGINE_KURT_MAKING_BALLS
-	iffalse UnknownScript_0x18e378
+	iffalse .NotMakingBalls
 	writetext UnknownText_0x18e934
 	closetext
 	writetext UnknownText_0x18e949
@@ -286,7 +280,7 @@ UnknownScript_0x18e368:
 	loadmovesprites
 	end
 
-UnknownScript_0x18e378:
+.NotMakingBalls:
 	writetext UnknownText_0x18e95c
 	closetext
 	loadmovesprites
@@ -297,17 +291,17 @@ UnknownScript_0x18e378:
 	pause 20
 	showemote EMOTE_SHOCK, $2, 30
 	checkcode VAR_FACING
-	if_equal $1, UnknownScript_0x18e3a2
+	if_equal UP, .GSBallRunAround
 	spriteface $0, DOWN
 	playsound SFX_FLY
 	applymovement $2, MovementData_0x18e466
-	jump UnknownScript_0x18e3ac
+	jump .KurtHasLeftTheBuilding
 
-UnknownScript_0x18e3a2:
+.GSBallRunAround:
 	spriteface $0, DOWN
 	playsound SFX_FLY
 	applymovement $2, MovementData_0x18e46c
-UnknownScript_0x18e3ac:
+.KurtHasLeftTheBuilding:
 	playsound SFX_EXIT_BUILDING
 	disappear $2
 	clearevent EVENT_AZALEA_TOWN_KURT
@@ -320,17 +314,17 @@ KurtScript_0x18e3bd:
 	faceplayer
 	loadfont
 	checkevent EVENT_GAVE_GS_BALL_TO_KURT
-	iftrue UnknownScript_0x18e3e0
-UnknownScript_0x18e3c5:
+	iftrue KurtScript_ImCheckingItNow
+KurtMakingBallsScript:
 	checkevent EVENT_BUGGING_KURT_TOO_MUCH
-	iffalse UnknownScript_0x18e3d4
+	iffalse Script_FirstTimeBuggingKurt
 	writetext UnknownText_0x18e7d8
 	closetext
 	loadmovesprites
 	spriteface $5, UP
 	end
 
-UnknownScript_0x18e3d4:
+Script_FirstTimeBuggingKurt:
 	writetext UnknownText_0x18e863
 	closetext
 	loadmovesprites
@@ -338,7 +332,7 @@ UnknownScript_0x18e3d4:
 	setevent EVENT_BUGGING_KURT_TOO_MUCH
 	end
 
-UnknownScript_0x18e3e0:
+KurtScript_ImCheckingItNow:
 	writetext UnknownText_0x18e934
 	closetext
 	spriteface $5, UP
@@ -349,13 +343,13 @@ UnknownScript_0x18e3e0:
 
 KurtsGranddaughter1:
 	faceplayer
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue KurtsGranddaughter2Subscript
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue KurtsGranddaughterFunScript
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iftrue .Lonely
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iftrue .Dad
 	checkevent EVENT_CLEARED_SLOWPOKE_WELL
 	iftrue .SlowpokeBack

maps/LakeofRageMagikarpHouse.asm

@@ -8,18 +8,18 @@ LakeofRageMagikarpHouse_MapScriptHeader:
 FishingGuruScript_0x19a6ae:
 	faceplayer
 	loadfont
-	checkevent EVENT_03A
+	checkevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	iftrue UnknownScript_0x19a6fe
-	checkevent EVENT_039
+	checkevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
 	iftrue UnknownScript_0x19a6e0
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue UnknownScript_0x19a6d7
-	checkevent EVENT_038
+	checkevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
 	iftrue UnknownScript_0x19a6d1
 	writetext UnknownText_0x19a72e
 	closetext
 	loadmovesprites
-	setevent EVENT_038
+	setevent EVENT_LAKE_OF_RAGE_EXPLAINED_WEIRD_MAGIKARP
 	end
 
 UnknownScript_0x19a6d1:
@@ -32,7 +32,7 @@ UnknownScript_0x19a6d7:
 	writetext UnknownText_0x19a890
 	closetext
 	loadmovesprites
-	setevent EVENT_039
+	setevent EVENT_LAKE_OF_RAGE_ASKED_FOR_MAGIKARP
 	end
 
 UnknownScript_0x19a6e0:
@@ -55,12 +55,12 @@ UnknownScript_0x19a6fe:
 	writetext UnknownText_0x19a9c3
 	closetext
 	loadmovesprites
-	clearevent EVENT_03A
+	clearevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	end
 
 UnknownScript_0x19a711:
 	loadmovesprites
-	setevent EVENT_03A
+	setevent EVENT_LAKE_OF_RAGE_ELIXIR_ON_STANDBY
 	end
 
 UnknownScript_0x19a716:

maps/LancesRoom.asm

@@ -125,7 +125,7 @@ LanceScript_0x180e7b:
 	pause 30
 	loadmovesprites
 	applymovement $3, MovementData_0x180f5b
-	special Function8c084
+	special FadeBlackBGMap
 	pause 15
 	warpfacing $1, GROUP_HALL_OF_FAME, MAP_HALL_OF_FAME, $4, $d
 	end

maps/MobileBattleRoom.asm

@@ -35,11 +35,11 @@ MapMobileBattleRoomSignpost0Script:
 	writetext MobileBattleRoom_HealText
 	pause 20
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	playmusic MUSIC_HEAL
-	special Function1047eb
+	special LoadMapPalettes
 	pause 60
-	special Function8c079
+	special FadeInBGMap
 	special RestartMapMusic
 	refreshscreen $0
 .two_:

maps/NewBarkTown.asm

@@ -20,7 +20,7 @@ NewBarkTown_MapScriptHeader:
 
 .FlyPoint
 	setflag ENGINE_FLYPOINT_NEW_BARK
-	clearevent EVENT_076
+	clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM
 	return
 
 UnknownScript_0x1a8016:

maps/OlivineCity.asm

@@ -43,7 +43,7 @@ UnknownScript_0x1a8833:
 	disappear $5
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
-	special Function14209
+	special RunCallback_04
 	end
 
 UnknownScript_0x1a886b:
@@ -67,7 +67,7 @@ UnknownScript_0x1a886b:
 	dotrigger $1
 	special RestartMapMusic
 	variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SWIMMER_GUY
-	special Function14209
+	special RunCallback_04
 	end
 
 SailorScript_0x1a88a3:

maps/OlivineLighthouse6F.asm

@@ -42,9 +42,9 @@ UnknownScript_0x60bab:
 	loadmovesprites
 	special RestartMapMusic
 	cry AMPHAROS
-	special Function8c084
+	special FadeBlackBGMap
 	pause 10
-	special Function8c079
+	special FadeInBGMap
 	loadfont
 	writetext UnknownText_0x60f3d
 	closetext
@@ -116,10 +116,10 @@ UnknownScript_0x60c51:
 	cry AMPHAROS
 	closetext
 	loadmovesprites
-	special Function8c084
-	special Function8c079
-	special Function8c084
-	special Function8c079
+	special FadeBlackBGMap
+	special FadeInBGMap
+	special FadeBlackBGMap
+	special FadeInBGMap
 	end
 
 ItemFragment_0x60c66:

maps/OlivinePort.asm

@@ -20,14 +20,14 @@ UnknownScript_0x748b1:
 	applymovement $0, MovementData_0x74a32
 	appear $2
 	dotrigger $0
-	setevent EVENT_000
+	setevent EVENT_GAVE_KURT_APRICORNS
 	blackoutmod GROUP_OLIVINE_CITY, MAP_OLIVINE_CITY
 	end
 
 SailorScript_0x748c0:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x74919
 	writetext UnknownText_0x74a55
 	closetext
@@ -39,9 +39,9 @@ SailorScript_0x748c0:
 	waitbutton
 	applymovement $0, MovementData_0x74a30
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7490a
 	clearevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	setevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
@@ -69,13 +69,13 @@ UnknownScript_0x74919:
 
 UnknownScript_0x7491f:
 	spriteface $4, RIGHT
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x7498b
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue UnknownScript_0x7498b
 	spriteface $0, LEFT
 	loadfont
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x7494e
 	checkcode VAR_WEEKDAY
 	if_equal SUNDAY, UnknownScript_0x74977
@@ -94,7 +94,7 @@ UnknownScript_0x7494e:
 	writetext UnknownText_0x74b11
 	closetext
 	loadmovesprites
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	applymovement $0, MovementData_0x74a37
 	jump SailorScript_0x748c0
 
@@ -138,9 +138,9 @@ UnknownScript_0x74992:
 SailorScript_0x7499c:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x74919
-	checkevent EVENT_030
+	checkevent EVENT_FAST_SHIP_FIRST_TIME
 	iffalse UnknownScript_0x749c0
 	checkcode VAR_WEEKDAY
 	if_equal SUNDAY, UnknownScript_0x749f2
@@ -159,7 +159,7 @@ UnknownScript_0x749c0:
 	writetext UnknownText_0x74b11
 	closetext
 	loadmovesprites
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	checkcode VAR_FACING
 	if_equal $3, UnknownScript_0x749e5
 	applymovement $0, MovementData_0x74a3f

maps/PokeCenter2F.asm

@@ -17,7 +17,7 @@ PokeCenter2F_MapScriptHeader:
 	special Special_CheckMysteryGift
 	if_equal $0, .Trigger1Done
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue .Trigger1Done
 	priorityjump PokeCenter2F_AppearMysteryGiftDeliveryGuy
 
@@ -46,7 +46,7 @@ PokeCenter2F_MapScriptHeader:
 
 PokeCenter2F_AppearMysteryGiftDeliveryGuy:
 	appear $5
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	end
 
 Script_TradeCenterClosed:

maps/RadioTower2F.asm

@@ -92,16 +92,16 @@ Buena:
 	iftrue UnknownScript_0x5d865
 	checkevent EVENT_MET_BUENA
 	iffalse UnknownScript_0x5d800
-	checkflag ENGINE_60
+	checkflag ENGINE_BUENAS_PASSWORD_2
 	iftrue UnknownScript_0x5d82f
 	checkcode VAR_HOUR
-	if_less_than $12, UnknownScript_0x5d893
-	checkflag ENGINE_5F
+	if_less_than 18, UnknownScript_0x5d893
+	checkflag ENGINE_BUENAS_PASSWORD
 	iffalse UnknownScript_0x5d80a
 	checkitem BLUE_CARD
 	iffalse UnknownScript_0x5d86b
 	checkcode VAR_BLUECARDBALANCE
-	if_equal $1e, UnknownScript_0x5d87f
+	if_equal 30, UnknownScript_0x5d87f
 	playmusic MUSIC_BUENAS_PASSWORD
 	writetext UnknownText_0x5de35
 	special Function4ae12
@@ -133,7 +133,7 @@ UnknownScript_0x5d7be:
 	writevarcode VAR_BLUECARDBALANCE
 	waitbutton
 	playsound SFX_TRANSACTION
-	setflag ENGINE_60
+	setflag ENGINE_BUENAS_PASSWORD_2
 	pause 20
 	spriteface $b, RIGHT
 	loadfont
@@ -188,7 +188,7 @@ UnknownScript_0x5d83f:
 	end
 
 UnknownScript_0x5d845:
-	setflag ENGINE_60
+	setflag ENGINE_BUENAS_PASSWORD_2
 	loadfont
 	writetext UnknownText_0x5e01c
 	closetext

maps/RadioTower5F.asm

@@ -124,7 +124,7 @@ UnknownScript_0x6006e:
 	dotrigger $2
 	domaptrigger GROUP_ECRUTEAK_HOUSE, MAP_ECRUTEAK_HOUSE, $0
 	setevent EVENT_GOT_CLEAR_BELL
-	setevent EVENT_761
+	setevent EVENT_TEAM_ROCKET_DISBANDED
 	jump UnknownScript_0x600f1
 
 UnknownScript_0x600f1:

maps/Route34.asm

@@ -296,7 +296,7 @@ UnknownScript_0x78213:
 	verbosegiveitem LEAF_STONE, 1
 	iffalse UnknownScript_0x78225
 	clearflag ENGINE_GINA_HAS_LEAF_STONE
-	setevent EVENT_100
+	setevent EVENT_GINA_GAVE_LEAF_STONE
 	jump UnknownScript_0x78234
 
 UnknownScript_0x78225:

maps/Route35NationalParkgate.asm

@@ -75,7 +75,7 @@ Route35NationalParkgate_GoBackIn:
 	loadmovesprites
 	scall Route35NationalParkgate_EnterContest
 	playsound SFX_ENTER_DOOR
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f
 	end
@@ -112,7 +112,7 @@ Route35NationalParkgate_OkayToProceed:
 	special Special_GiveParkBalls
 	scall Route35NationalParkgate_EnterContest
 	playsound SFX_ENTER_DOOR
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	special Special_SelectRandomBugContestContestants
 	warpfacing $1, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $a, $2f

maps/Route36.asm

@@ -89,14 +89,14 @@ UnknownScript_0x19407b:
 	applymovement $4, MovementData_0x19424b
 	disappear $4
 	variablesprite SPRITE_WEIRD_TREE, SPRITE_TWIN
-	special Function14209
+	special RunCallback_04
 	special Function14168
 	end
 
 LassScript_0x19408c:
 	faceplayer
 	loadfont
-	checkevent EVENT_0BA
+	checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
 	iftrue UnknownScript_0x1940b3
 	setevent EVENT_MET_FLORIA
 	writetext UnknownText_0x1942f1
@@ -257,7 +257,7 @@ UnknownScript_0x1941b4:
 	verbosegiveitem FIRE_STONE, 1
 	iffalse UnknownScript_0x1941c6
 	clearflag ENGINE_ALAN_HAS_FIRE_STONE
-	setevent EVENT_101
+	setevent EVENT_ALAN_GAVE_FIRE_STONE
 	jump UnknownScript_0x1941d5
 
 UnknownScript_0x1941c6:

maps/Route36NationalParkgate.asm

@@ -37,7 +37,7 @@ UnknownScript_0x6ab20:
 	return
 
 UnknownScript_0x6ab23:
-	checkevent EVENT_2D2
+	checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
 	iftrue UnknownScript_0x6ab46
 	checkcode VAR_WEEKDAY
 	if_equal TUESDAY, UnknownScript_0x6ab42
@@ -83,7 +83,7 @@ UnknownScript_0x6ab76:
 	loadmovesprites
 	spriteface $0, LEFT
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
 	end
@@ -166,7 +166,7 @@ UnknownScript_0x6ac10:
 	special Special_GiveParkBalls
 	spriteface $0, LEFT
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	special Special_SelectRandomBugContestContestants
 	warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
@@ -300,7 +300,7 @@ UnknownScript_0x6ad02:
 YoungsterScript_0x6ad06:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad14
 	writetext UnknownText_0x6b399
 	closetext
@@ -316,7 +316,7 @@ UnknownScript_0x6ad14:
 YoungsterScript_0x6ad1a:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad28
 	writetext UnknownText_0x6b40f
 	closetext
@@ -332,7 +332,7 @@ UnknownScript_0x6ad28:
 RockerScript_0x6ad2e:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad3c
 	writetext UnknownText_0x6b462
 	closetext
@@ -348,7 +348,7 @@ UnknownScript_0x6ad3c:
 PokefanMScript_0x6ad42:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad50
 	writetext UnknownText_0x6b4da
 	closetext
@@ -364,7 +364,7 @@ UnknownScript_0x6ad50:
 YoungsterScript_0x6ad56:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad64
 	writetext UnknownText_0x6b54e
 	closetext
@@ -380,7 +380,7 @@ UnknownScript_0x6ad64:
 YoungsterScript_0x6ad6a:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad78
 	writetext UnknownText_0x6b5b0
 	closetext
@@ -396,7 +396,7 @@ UnknownScript_0x6ad78:
 LassScript_0x6ad7e:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ad8c
 	writetext UnknownText_0x6b64b
 	closetext
@@ -412,7 +412,7 @@ UnknownScript_0x6ad8c:
 YoungsterScript_0x6ad92:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6ada0
 	writetext UnknownText_0x6b6b8
 	closetext
@@ -428,7 +428,7 @@ UnknownScript_0x6ada0:
 YoungsterScript_0x6ada6:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6adb4
 	writetext UnknownText_0x6b71b
 	closetext
@@ -444,7 +444,7 @@ UnknownScript_0x6adb4:
 YoungsterScript_0x6adba:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iffalse UnknownScript_0x6adc8
 	writetext UnknownText_0x6b76f
 	closetext

maps/Route38.asm

@@ -36,7 +36,7 @@ LassDana1Script:
 	loadfont
 	checkflag ENGINE_DANA
 	iftrue UnknownScript_0x1a1d82
-	checkflag ENGINE_LIZ_HAS_THUNDERSTONE
+	checkflag ENGINE_DANA_HAS_THUNDERSTONE
 	iftrue UnknownScript_0x1a1df6
 	checkcellnum PHONE_LASS_DANA
 	iftrue UnknownScript_0x1a1e17
@@ -122,8 +122,8 @@ UnknownScript_0x1a1df6:
 	scall UnknownScript_0x1a1e27
 	verbosegiveitem THUNDERSTONE, 1
 	iffalse UnknownScript_0x1a1e08
-	clearflag ENGINE_LIZ_HAS_THUNDERSTONE
-	setevent EVENT_102
+	clearflag ENGINE_DANA_HAS_THUNDERSTONE
+	setevent EVENT_DANA_GAVE_THUNDERSTONE
 	jump UnknownScript_0x1a1e17
 
 UnknownScript_0x1a1e08:

maps/Route42.asm

@@ -111,7 +111,7 @@ UnknownScript_0x1a92dc:
 	verbosegiveitem WATER_STONE, 1
 	iffalse UnknownScript_0x1a92ee
 	clearflag ENGINE_TULLY_HAS_WATER_STONE
-	setevent EVENT_103
+	setevent EVENT_TULLY_GAVE_WATER_STONE
 	jump UnknownScript_0x1a92fd
 
 UnknownScript_0x1a92ee:

maps/Route43.asm

@@ -254,7 +254,7 @@ UnknownScript_0x19d21e:
 	verbosegiveitem PINK_BOW, 1
 	iffalse UnknownScript_0x19d230
 	clearflag ENGINE_TIFFANY_HAS_PINK_BOW
-	setevent EVENT_104
+	setevent EVENT_TIFFANY_GAVE_PINK_BOW
 	jump UnknownScript_0x19d245
 
 UnknownScript_0x19d230:

maps/Route45.asm

@@ -40,12 +40,12 @@ UnknownScript_0x19e0e4:
 	iftrue UnknownScript_0x19e10c
 	checknite
 	iftrue UnknownScript_0x19e112
-	checkevent EVENT_26A
+	checkevent EVENT_KENJI_ON_BREAK
 	iffalse UnknownScript_0x19e127
 	scall UnknownScript_0x19e137
 	verbosegiveitem PP_UP, 1
 	iffalse UnknownScript_0x19e118
-	clearevent EVENT_26A
+	clearevent EVENT_KENJI_ON_BREAK
 	special Function11485
 	jump UnknownScript_0x19e127
 

maps/RuinsofAlphAerodactylChamber.asm

@@ -30,7 +30,7 @@ UnknownScript_0x58db9:
 	iftrue UnknownScript_0x58dc3
 	changeblock $4, $0, $2e
 UnknownScript_0x58dc3:
-	checkevent EVENT_2A3
+	checkevent EVENT_SOLVED_AERODACTYL_PUZZLE
 	iffalse UnknownScript_0x58dca
 	return
 
@@ -62,7 +62,7 @@ MapRuinsofAlphAerodactylChamberSignpost2Script:
 
 UnknownScript_0x58df7:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	setevent EVENT_2A3
+	setevent EVENT_SOLVED_AERODACTYL_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_3
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30

maps/RuinsofAlphHoOhChamber.asm

@@ -31,7 +31,7 @@ UnknownScript_0x5857c:
 	iftrue UnknownScript_0x58586
 	changeblock $4, $0, $2e
 UnknownScript_0x58586:
-	checkevent EVENT_2A0
+	checkevent EVENT_SOLVED_HO_OH_PUZZLE
 	iffalse UnknownScript_0x5858d
 	return
 
@@ -63,7 +63,7 @@ MapRuinsofAlphHoOhChamberSignpost2Script:
 
 UnknownScript_0x585ba:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	setevent EVENT_2A0
+	setevent EVENT_SOLVED_HO_OH_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_4
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30

maps/RuinsofAlphKabutoChamber.asm

@@ -32,7 +32,7 @@ UnknownScript_0x58737:
 	iftrue UnknownScript_0x58741
 	changeblock $4, $0, $2e
 UnknownScript_0x58741:
-	checkevent EVENT_2A1
+	checkevent EVENT_SOLVED_KABUTO_PUZZLE
 	iffalse UnknownScript_0x58748
 	return
 
@@ -67,7 +67,7 @@ MapRuinsofAlphKabutoChamberSignpost2Script:
 
 UnknownScript_0x58778:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	setevent EVENT_2A1
+	setevent EVENT_SOLVED_KABUTO_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_1
 	setevent EVENT_RUINS_OF_ALPH_KABUTO_CHAMBER_RECEPTIONIST
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
@@ -92,7 +92,7 @@ ScientistScript_0x587a8:
 	if_equal 26, UnknownScript_0x587cf
 	checkevent EVENT_WALL_OPENED_IN_KABUTO_CHAMBER
 	iftrue UnknownScript_0x587c9
-	checkevent EVENT_2A1
+	checkevent EVENT_SOLVED_KABUTO_PUZZLE
 	iffalse UnknownScript_0x587c0
 	writetext UnknownText_0x589b8
 	keeptextopen

maps/RuinsofAlphOmanyteChamber.asm

@@ -31,7 +31,7 @@ UnknownScript_0x58bf8:
 	iftrue UnknownScript_0x58c02
 	changeblock $4, $0, $2e
 UnknownScript_0x58c02:
-	checkevent EVENT_2A2
+	checkevent EVENT_SOLVED_OMANYTE_PUZZLE
 	iffalse UnknownScript_0x58c09
 	return
 
@@ -63,7 +63,7 @@ MapRuinsofAlphOmanyteChamberSignpost2Script:
 
 UnknownScript_0x58c36:
 	setevent EVENT_RUINS_OF_ALPH_INNER_CHAMBER_TOURISTS
-	setevent EVENT_2A2
+	setevent EVENT_SOLVED_OMANYTE_PUZZLE
 	setflag ENGINE_UNLOCKED_UNOWNS_2
 	domaptrigger GROUP_RUINS_OF_ALPH_INNER_CHAMBER, MAP_RUINS_OF_ALPH_INNER_CHAMBER, $1
 	earthquake 30

maps/SlowpokeWellB1F.asm

@@ -49,14 +49,14 @@ GruntM1Script:
 	domaptrigger GROUP_AZALEA_TOWN, MAP_AZALEA_TOWN, $1
 	clearevent EVENT_ILEX_FOREST_APPRENTICE
 	clearevent EVENT_ILEX_FOREST_FARFETCHD
-	setevent EVENT_6F5
-	setevent EVENT_6F6
+	setevent EVENT_CHARCOAL_KILN_FARFETCH_D
+	setevent EVENT_CHARCOAL_KILN_APPRENTICE
 	setevent EVENT_SLOWPOKE_WELL_SLOWPOKES
 	setevent EVENT_SLOWPOKE_WELL_KURT
 	clearevent EVENT_AZALEA_TOWN_SLOWPOKES
 	clearevent EVENT_KURTS_HOUSE_SLOWPOKE
 	clearevent EVENT_KURTS_HOUSE_KURT_1
-	special Function8c084
+	special FadeBlackBGMap
 	special HealParty
 	pause 15
 	warp GROUP_KURTS_HOUSE, MAP_KURTS_HOUSE, $3, $3

maps/TeamRocketBaseB1F.asm

@@ -445,9 +445,9 @@ ExplodingTrap22:
 	end
 
 VoltorbExplodingTrap:
-	special Function8c084
+	special FadeBlackBGMap
 	cry VOLTORB
-	special Function8c079
+	special FadeInBGMap
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadpokedata VOLTORB, 23
@@ -455,9 +455,9 @@ VoltorbExplodingTrap:
 	end
 
 GeodudeExplodingTrap:
-	special Function8c084
+	special FadeBlackBGMap
 	cry GEODUDE
-	special Function8c079
+	special FadeInBGMap
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadpokedata GEODUDE, 21
@@ -465,9 +465,9 @@ GeodudeExplodingTrap:
 	end
 
 KoffingExplodingTrap:
-	special Function8c084
+	special FadeBlackBGMap
 	cry KOFFING
-	special Function8c079
+	special FadeInBGMap
 	setlasttalked $ff
 	writecode VAR_BATTLETYPE, BATTLETYPE_TRAP
 	loadpokedata KOFFING, 21

maps/TeamRocketBaseB2F.asm

@@ -155,19 +155,19 @@ UnknownScript_0x6d091:
 	writetext UnknownText_0x6da97
 	closetext
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	special Mobile_HealParty
 	playsound SFX_FULL_HEAL
 	special HealParty
-	special Function8c079
+	special FadeInBGMap
 	loadfont
 	writetext UnknownText_0x6daf7
 	closetext
 	loadmovesprites
 	dotrigger $1
-	setevent EVENT_04C
+	setevent EVENT_LANCE_HEALED_YOU_IN_TEAM_ROCKET_BASE
 	checkcode VAR_FACING
-	if_equal $3, UnknownScript_0x6d0be
+	if_equal RIGHT, UnknownScript_0x6d0be
 	applymovement $4, MovementData_0x6d212
 	disappear $4
 	end

maps/TimeCapsule.asm

@@ -73,5 +73,5 @@ TimeCapsule_MapEventHeader:
 
 	; people-events
 	db 2
-	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_000
-	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_001
+	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_GAVE_KURT_APRICORNS
+	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x19351a, EVENT_RECEIVED_BALLS_FROM_KURT

maps/TradeCenter.asm

@@ -73,5 +73,5 @@ TradeCenter_MapEventHeader:
 
 	; people-events
 	db 2
-	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_000
-	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_001
+	person_event SPRITE_CHRIS, 8, 7, OW_LEFT | $1, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_GAVE_KURT_APRICORNS
+	person_event SPRITE_CHRIS, 8, 10, OW_LEFT | $0, $0, -1, -1, $0, 0, ChrisScript_0x193499, EVENT_RECEIVED_BALLS_FROM_KURT

maps/UndergroundWarehouse.asm

@@ -65,12 +65,12 @@ GruntM15Script:
 GentlemanScript_0x7d9bf:
 	faceplayer
 	loadfont
-	checkevent EVENT_04A
+	checkevent EVENT_RECEIVED_CARD_KEY
 	iftrue UnknownScript_0x7d9de
 	writetext UnknownText_0x7dbc6
 	keeptextopen
 	verbosegiveitem CARD_KEY, 1
-	setevent EVENT_04A
+	setevent EVENT_RECEIVED_CARD_KEY
 	setevent EVENT_WAREHOUSE_LAYOUT_1
 	clearevent EVENT_WAREHOUSE_LAYOUT_2
 	clearevent EVENT_WAREHOUSE_LAYOUT_3

maps/VermilionPort.asm

@@ -31,15 +31,15 @@ UnknownScript_0x74da6:
 	setevent EVENT_FAST_SHIP_CABINS_SE_SSE_GENTLEMAN
 	setevent EVENT_FAST_SHIP_PASSENGERS_FIRST_TRIP
 	clearevent EVENT_OLIVINE_PORT_PASSAGE_POKEFAN_M
-	setevent EVENT_030
-	setevent EVENT_000
+	setevent EVENT_FAST_SHIP_FIRST_TIME
+	setevent EVENT_GAVE_KURT_APRICORNS
 	blackoutmod GROUP_VERMILION_CITY, MAP_VERMILION_CITY
 	end
 
 SailorScript_0x74dc4:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x74e1a
 	writetext UnknownText_0x74f06
 	closetext
@@ -51,7 +51,7 @@ SailorScript_0x74dc4:
 	waitbutton
 	applymovement $0, MovementData_0x74ef1
 	playsound SFX_EXIT_BUILDING
-	special Function8c084
+	special FadeBlackBGMap
 	waitbutton
 	setevent EVENT_FAST_SHIP_PASSENGERS_EASTBOUND
 	clearevent EVENT_FAST_SHIP_PASSENGERS_WESTBOUND
@@ -79,9 +79,9 @@ UnknownScript_0x74e1a:
 
 UnknownScript_0x74e20:
 	spriteface $3, RIGHT
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x74e86
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue UnknownScript_0x74e86
 	spriteface $0, LEFT
 	loadfont
@@ -101,7 +101,7 @@ UnknownScript_0x74e20:
 	writetext UnknownText_0x74fc2
 	closetext
 	loadmovesprites
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	applymovement $0, MovementData_0x74ef8
 	jump SailorScript_0x74dc4
 
@@ -145,7 +145,7 @@ UnknownScript_0x74e8d:
 SailorScript_0x74e97:
 	faceplayer
 	loadfont
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x74e1a
 	checkcode VAR_WEEKDAY
 	if_equal MONDAY, UnknownScript_0x74eda
@@ -163,7 +163,7 @@ SailorScript_0x74e97:
 	writetext UnknownText_0x74fc2
 	closetext
 	loadmovesprites
-	setevent EVENT_001
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
 	applymovement $0, MovementData_0x74efe
 	jump SailorScript_0x74dc4
 

maps/WarehouseEntrance.asm

@@ -203,21 +203,21 @@ OlderHaircutBrotherScript:
 	jump .else
 
 .two:
-	setevent EVENT_000
-	clearevent EVENT_001
-	clearevent EVENT_002
+	setevent EVENT_GAVE_KURT_APRICORNS
+	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
+	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .three:
-	clearevent EVENT_000
-	setevent EVENT_001
-	clearevent EVENT_002
+	clearevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .else:
-	clearevent EVENT_000
-	clearevent EVENT_001
-	setevent EVENT_002
+	clearevent EVENT_GAVE_KURT_APRICORNS
+	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .then:
@@ -226,17 +226,17 @@ OlderHaircutBrotherScript:
 	writetext UnknownText_0x7c6b8
 	closetext
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	playmusic MUSIC_HEAL
 	pause 60
-	special Function8c079
+	special FadeInBGMap
 	special RestartMapMusic
 	loadfont
 	writetext UnknownText_0x7c6d8
 	closetext
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x7c2bb
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue UnknownScript_0x7c2c4
 	jump UnknownScript_0x7c2cd
 
@@ -286,21 +286,21 @@ YoungerHaircutBrotherScript:
 	jump .else
 
 .two:
-	setevent EVENT_000
-	clearevent EVENT_001
-	clearevent EVENT_002
+	setevent EVENT_GAVE_KURT_APRICORNS
+	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
+	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .three:
-	clearevent EVENT_000
-	setevent EVENT_001
-	clearevent EVENT_002
+	clearevent EVENT_GAVE_KURT_APRICORNS
+	setevent EVENT_RECEIVED_BALLS_FROM_KURT
+	clearevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .else:
-	clearevent EVENT_000
-	clearevent EVENT_001
-	setevent EVENT_002
+	clearevent EVENT_GAVE_KURT_APRICORNS
+	clearevent EVENT_RECEIVED_BALLS_FROM_KURT
+	setevent EVENT_DRAGON_SHRINE_QUESTION_2
 	jump .then
 
 .then:
@@ -309,17 +309,17 @@ YoungerHaircutBrotherScript:
 	writetext UnknownText_0x7c80e
 	closetext
 	loadmovesprites
-	special Function8c084
+	special FadeBlackBGMap
 	playmusic MUSIC_HEAL
 	pause 60
-	special Function8c079
+	special FadeInBGMap
 	special RestartMapMusic
 	loadfont
 	writetext UnknownText_0x7c82a
 	closetext
-	checkevent EVENT_000
+	checkevent EVENT_GAVE_KURT_APRICORNS
 	iftrue UnknownScript_0x7c2bb
-	checkevent EVENT_001
+	checkevent EVENT_RECEIVED_BALLS_FROM_KURT
 	iftrue UnknownScript_0x7c2c4
 	jump UnknownScript_0x7c2cd
 

misc/crystal_misc.asm

@@ -249,7 +249,7 @@ Function17a81a: ; 17a81a (5e:681a)
 	ld a, [hJoyPressed] ; $ff00+$a7
 	and $3
 	ret z
-	call Function1c07
+	call ExitMenu
 	call Function17ac1d
 	call Function17ac2a
 	ld hl, $d088

misc/mobile_40.asm

@@ -308,7 +308,7 @@ Function10016f: ; 10016f
 Function10020b: ; 10020b
 	xor a
 	ld [wc303], a
-	callba Function8c084
+	callba FadeBlackBGMap
 	callba Function106464
 	call HideSprites
 	call DelayFrame
@@ -903,7 +903,7 @@ Function100597: ; 100597
 	ld [wcfa9], a
 
 .asm_1005a6
-	call Function1c07
+	call ExitMenu
 	ld a, [wcd26]
 	set 7, a
 	ld [wcd26], a
@@ -954,7 +954,7 @@ Function1005e1: ; 1005e1
 	xor a
 	ld [wcfa9], a
 .asm_1005f0
-	call Function1c07
+	call ExitMenu
 	ld a, [wcd26]
 	set 7, a
 	ld [wcd26], a
@@ -1792,7 +1792,7 @@ Function100b12: ; 100b12
 	call Function100ed4
 	ld a, [wcf88]
 	ld [wd0d2], a
-	call Function1c07
+	call ExitMenu
 	ret
 ; 100b45
 
@@ -4494,7 +4494,7 @@ Function101d95: ; 101d95
 
 Function101db2: ; 101db2
 	callba Function103302
-	call Function1c07
+	call ExitMenu
 	ld hl, wcd29
 	set 5, [hl]
 	jr c, .asm_101dca
@@ -4976,12 +4976,12 @@ Function102142: ; 102142
 	ld de, SFX_LEVEL_UP
 	call PlaySFX
 	call Functiona36
-	call Function1c07
+	call ExitMenu
 	call Function10219f
 	ld hl, UnknownText_0x1021d6
 	call MenuTextBox
 	call YesNoBox
-	call Function1c07
+	call ExitMenu
 	jr c, .asm_10217c
 	call Function1021b8
 	jr c, .asm_10217c
@@ -5053,7 +5053,7 @@ UnknownText_0x1021db: ; 1021d1
 Function1021e0: ; 1021e0
 	call MenuTextBox
 	call Functiona36
-	call Function1c07
+	call ExitMenu
 	ret
 ; 1021ea
 
@@ -6207,7 +6207,7 @@ Function102984: ; 102984
 
 Function102996: ; 102996
 	call Function1029af
-	call Function1c07
+	call ExitMenu
 	scf
 	ret
 ; 10299e
@@ -6281,7 +6281,7 @@ Function1029fe: ; 1029fe
 	and [hl]
 	ret z
 	push af
-	call Function1c07
+	call ExitMenu
 	pop af
 	ld a, [wcfa9]
 	cp $1
@@ -7774,7 +7774,7 @@ Mobile_SelectThreeMons: ; 10366e
 	ld hl, MenuDataHeader_103747
 	call LoadMenuDataHeader
 	call InterpretMenu2
-	call Function1c07
+	call ExitMenu
 	jr c, .asm_1036f4
 	ld a, [wcfa9]
 	cp $1
@@ -7815,7 +7815,7 @@ Function1036f9: ; 1036f9
 
 Function103700: ; 103700
 	ld c, $a
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	bit 4, [hl]
 	jr z, .asm_10370f
 	callba Function1008a6
@@ -7913,11 +7913,11 @@ Function103780: ; 103780
 
 Function10378c: ; 10378c
 	ld c, $0
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	bit 4, [hl]
 	jr nz, .asm_10379c
 	ld c, $1
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	set 4, [hl]
 
 .asm_10379c
@@ -7939,7 +7939,7 @@ Function10378c: ; 10378c
 	ld a, c
 	and a
 	ret z
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	res 4, [hl]
 	ret
 ; 1037c2

misc/mobile_45.asm

@@ -4330,7 +4330,7 @@ Function11581e: ; 11581e
 
 Function1158c2: ; 1158c2
 	ld a, e
-	ld [wdc20], a
+	ld [SwarmFlags], a
 	ld a, d
 	ld [wdc21], a
 	xor a
@@ -4351,7 +4351,7 @@ Function1158c2: ; 1158c2
 	ld l, c
 	ld h, b
 	xor a
-	ld [wdc1f], a
+	ld [WeeklyFlags], a
 
 .asm_1158e5
 	ld b, $3
@@ -4376,7 +4376,7 @@ Function1158c2: ; 1158c2
 	push hl
 	dec hl
 	ld a, c
-	ld [wdc1f], a
+	ld [WeeklyFlags], a
 .asm_115908
 	xor a
 	ld [hld], a
@@ -4397,7 +4397,7 @@ Function1158c2: ; 1158c2
 	ld [wdc1a], a
 	push de
 	push hl
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -4492,7 +4492,7 @@ Function1158c2: ; 1158c2
 	ld a, $a
 	ld [hli], a
 	push hl
-	ld hl, wdc20
+	ld hl, SwarmFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -4517,7 +4517,7 @@ Function1158c2: ; 1158c2
 	jp nz, .asm_1158e5
 
 .asm_1159c4
-	ld a, [wdc1f]
+	ld a, [WeeklyFlags]
 	cp $0
 	jr z, .asm_1159d8
 	push hl
@@ -4984,9 +4984,9 @@ Function115bc8: ; 115bc8
 
 Function115c49: ; 115c49
 	ld a, e
-	ld [wdc1f], a
+	ld [WeeklyFlags], a
 	ld a, d
-	ld [wdc20], a
+	ld [SwarmFlags], a
 	xor a
 	ld [de], a
 	inc de
@@ -5055,7 +5055,7 @@ Function115c49: ; 115c49
 	ld [wdc1a], a
 	push de
 	push hl
-	ld hl, wdc1f
+	ld hl, WeeklyFlags
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
@@ -5166,9 +5166,9 @@ Function115cfd: ; 115cfd
 .asm_115d38
 	push de
 	push hl
-	ld a, [wdc1f]
+	ld a, [WeeklyFlags]
 	ld l, a
-	ld a, [wdc20]
+	ld a, [SwarmFlags]
 	ld h, a
 	ld e, [hl]
 	inc hl
@@ -8021,13 +8021,13 @@ Function1178e8: ; 1178e8 (45:78e8)
 	ld a, [wcd4e]
 	and a
 	jr nz, .asm_117939
-	call Function1c07
+	call ExitMenu
 	ld a, $1
 	ld [wcd4f], a
 	jp Function117a0a
 .asm_117939
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	jp Function117a0a
 
 Function117942: ; 117942 (45:7942)
@@ -8055,7 +8055,7 @@ Function117976: ; 117976 (45:7976)
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
-	call Function1c07
+	call ExitMenu
 asm_11797e: ; 11797e (45:797e)
 	ld a, $80
 	ld [wcd49], a
@@ -8078,7 +8078,7 @@ Function1179a7: ; 1179a7 (45:79a7)
 	ld hl, wcd4e
 	dec [hl]
 	ret nz
-	call Function1c07
+	call ExitMenu
 	ld a, $1
 	ld [wcd49], a
 	ret
@@ -8285,13 +8285,13 @@ Function117b4f:
 	ld a, [wcf64]
 	and a
 	jr nz, .asm_117ba4 ; 0x117b93 $f
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	callba Function104061
 	jp Function117cdd
 .asm_117ba4
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	callba Function104061
 	ld a, $80
 	ld [wcf63], a
@@ -8395,7 +8395,7 @@ Function117c4a:
 	add hl, de
 	dec c
 	jr nz, .asm_117c71 ; 0x117c7b $f4
-	call Function4b6
+	call FadeToWhite
 	pop af
 	ld [rSVBK], a
 	ld a, $80
@@ -12896,7 +12896,7 @@ Function119f98: ; 119f98
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_119fef
-	call Function1c07
+	call ExitMenu
 	call Function11a63c
 	xor a
 	ld [ScriptVar], a
@@ -12904,7 +12904,7 @@ Function119f98: ; 119f98
 	ld a, [ScriptVar]
 	and a
 	jr z, .asm_119fd4
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	callba Function115dc3
 	ld a, [wcd33]
@@ -12927,8 +12927,8 @@ Function119f98: ; 119f98
 	ret
 
 .asm_119fef
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd45]
 	ld [wcf66], a
@@ -13003,7 +13003,7 @@ Function11a00e: ; 11a00e
 	callba Function117ab4
 	callba Function106462
 	callba Function106464
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	callba Function115d99
 	ld c, $0
@@ -13026,7 +13026,7 @@ Function11a0ca: ; 11a0ca
 	callba Function17d3f6
 	callba Function106462
 	callba Function106464
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	callba Function115d99
 	ld c, $0
@@ -13118,7 +13118,7 @@ Function11a192: ; 11a192
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a1b6
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	call Function11a63c
 	hlcoord 4, 2
@@ -13128,7 +13128,7 @@ Function11a192: ; 11a192
 	ret
 
 .asm_11a1b6
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd45]
 	ld [wcf66], a
@@ -13259,7 +13259,7 @@ Function11a235: ; 11a235
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a2c4
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd46]
 	cp $0
@@ -13281,7 +13281,7 @@ Function11a235: ; 11a235
 	call PlayClickSFX
 
 .asm_11a2c4
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	and a
 	ret
@@ -13360,7 +13360,7 @@ Function11a33a: ; 11a33a
 	ret
 
 .asm_11a346
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	callba Function115dc3
 	and a
@@ -13404,7 +13404,7 @@ Function11a38d: ; 11a38d
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a3b1
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	call Function11a63c
 	hlcoord 4, 2
@@ -13414,7 +13414,7 @@ Function11a38d: ; 11a38d
 	ret
 
 .asm_11a3b1
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd45]
 	ld [wcf66], a
@@ -13479,7 +13479,7 @@ Function11a41b: ; 11a41b
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a43f
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	call Function11a63c
 	hlcoord 4, 2
@@ -13489,7 +13489,7 @@ Function11a41b: ; 11a41b
 	ret
 
 .asm_11a43f
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, $1c
 	ld [wcf66], a
@@ -13550,7 +13550,7 @@ Function11a49e: ; 11a49e
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a4c7
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	call Function11a63c
 	hlcoord 4, 2
@@ -13562,7 +13562,7 @@ Function11a49e: ; 11a49e
 	ret
 
 .asm_11a4c7
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd46]
 	ld [wcf66], a
@@ -13597,7 +13597,7 @@ Function11a4fe: ; 11a4fe
 	ld a, [wcd44]
 	and a
 	jr nz, .asm_11a522
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	call Function11a63c
 	hlcoord 4, 2
@@ -13607,7 +13607,7 @@ Function11a4fe: ; 11a4fe
 	ret
 
 .asm_11a522
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ld a, [wcd45]
 	ld [wcf66], a
@@ -13636,7 +13636,7 @@ Function11a536: ; 11a536
 	jr z, .asm_11a562
 	call Function11a9f0
 	jr nz, .asm_11a562
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 
 .asm_11a562
@@ -14544,7 +14544,7 @@ Function11adc4:
 	call Function11ad8a
 
 .asm_11ae2e
-	call Function1c07
+	call ExitMenu
 	callba Function104061
 	ret
 ; 11ae38
@@ -14649,8 +14649,8 @@ Function11ae98:
 	call Function11ad8a
 
 .asm_11aef7
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	callba Function104061
 	ret
 ; 11af04
@@ -14740,8 +14740,8 @@ Function11af4e:
 	ld [ScriptVar], a
 
 .asm_11afaa
-	call Function1c07
-	call Function1c07
+	call ExitMenu
+	call ExitMenu
 	callba Function104061
 	ret
 ; 11afb7
@@ -23522,7 +23522,7 @@ Function170729: ; 170729 (5c:4729)
 	ret
 
 Function170737: ; 170737 (5c:4737)
-	callba Function14dbb
+	callba SaveOptionsSelection
 	ret
 
 Function17073e: ; 17073e (5c:473e)
@@ -24729,7 +24729,7 @@ Function171c2c: ; 171c2c (5c:5c2c)
 	ld hl, wcd4c
 	dec [hl]
 	ret nz
-	call Function1c07
+	call ExitMenu
 	call WhiteBGMap
 	jr asm_171c60
 

misc/mobile_5f.asm

@@ -1975,7 +1975,7 @@ Function17dcaf:
 	add hl, de
 	dec c
 	jr nz, .asm_17dcbb
-	call Function4b6
+	call FadeToWhite
 	ld a, $4
 	ld [rSVBK], a
 	ret

wram.asm

@@ -1307,6 +1307,7 @@ Options2:: ; cfd1
 	ds 1
 
 	ds 2
+OptionsEnd::
 wcfd4:: ds 1
 wcfd5:: ds 1
 wcfd6:: ds 1
@@ -2334,9 +2335,9 @@ wdc19:: ds 1
 wdc1a:: ds 1
 wdc1b:: ds 1
 wdc1c:: ds 2
-wdc1e:: ds 1
-wdc1f:: ds 1
-wdc20:: ds 1
+DailyFlags:: ds 1
+WeeklyFlags:: ds 1
+SwarmFlags:: ds 1
 wdc21:: ds 1
 wdc22:: ds 1
 wdc23:: ds 1