Sync specials with pokecrystal.

2026-10-01 19:36:41 -05:00 · 2018-08-16 09:11:27 -06:00
parent 46f02aaee0
commit d3ace72a8d
11 changed files with 246 additions and 178 deletions
--- a/constants.asm
+++ b/constants.asm
@@ -41,3 +41,4 @@ INCLUDE "constants/map_data_constants.asm"
 INCLUDE "constants/input_constants.asm"
 INCLUDE "constants/sprite_data_constants.asm"
 INCLUDE "constants/serial_constants.asm"
+INCLUDE "constants/menu_constants.asm"
--- a/constants/item_constants.asm
+++ b/constants/item_constants.asm
@@ -312,28 +312,3 @@ MAIL_MAX_LENGTH EQU $20
 	const MART_MT_MOON
 	const MART_INDIGO_PLATEAU
 	const MART_UNDERGROUND
-
-; PartyMenuActionText
-	const_def
-	const PARTYMENUACTION_00
-	const PARTYMENUACTION_HEALING_ITEM
-	const PARTYMENUACTION_02
-	const PARTYMENUACTION_TEACH_TM
-	const PARTYMENUACTION_04
-	const PARTYMENUACTION_EVO_STONE
-	const PARTYMENUACTION_06
-	const PARTYMENUACTION_07
-	const PARTYMENUACTION_08
-	const PARTYMENUACTION_MOBILE
-
-const_value set $f0
-	const PARTYMENUTEXT_HEAL_PSN
-	const PARTYMENUTEXT_HEAL_BRN
-	const PARTYMENUTEXT_HEAL_FRZ
-	const PARTYMENUTEXT_HEAL_SLP
-	const PARTYMENUTEXT_HEAL_PAR
-	const PARTYMENUTEXT_HEAL_HP
-	const PARTYMENUTEXT_HEAL_ALL
-	const PARTYMENUTEXT_REVIVE
-	const PARTYMENUTEXT_LEVEL_UP
-	const PARTYMENUTEXT_HEAL_CONFUSION
--- a/constants/menu_constants.asm
+++ b/constants/menu_constants.asm
@@ -0,0 +1,95 @@
+; MenuHeader flags
+	const_def
+	shift_const MENU_RESTORE_TILES ; Will be set if MENU_BACKUP_TILES(_2) is set.
+	shift_const MENU_UNUSED_1
+	shift_const MENU_UNUSED_2
+	shift_const MENU_NO_CLICK_SFX
+	shift_const MENU_SPRITE_ANIMS
+	shift_const MENU_UNUSED_3
+	shift_const MENU_BACKUP_TILES
+	shift_const MENU_BACKUP_TILES_2
+
+; VerticalMenu/DoNthMenu/SetUpMenu/_2DMenu MenuData flags
+; Per flag the comment specifies which menus actually implement it
+	const_def
+	shift_const STATICMENU_DISABLE_B ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_ENABLE_SELECT ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_ENABLE_LEFT_RIGHT ; DoNthMenu/SetUpMenu
+	shift_const STATICMENU_ENABLE_START ; DoNthMenu/SetUpMenu
+	shift_const STATICMENU_PLACE_TITLE ; VerticalMenu
+	shift_const STATICMENU_WRAP ; All
+	shift_const STATICMENU_NO_TOP_SPACING ; VerticalMenu/_2DMenu
+	shift_const STATICMENU_CURSOR ; VerticalMenu/_2DMenu
+
+; ScrollingMenu MenuData flags
+	const_def
+	shift_const SCROLLINGMENU_CALL_FUNCTION1_CANCEL
+	shift_const SCROLLINGMENU_CALL_FUNCTION3_NO_SWITCH
+	shift_const SCROLLINGMENU_ENABLE_LEFT
+	shift_const SCROLLINGMENU_ENABLE_RIGHT
+	shift_const SCROLLINGMENU_DISPLAY_ARROWS
+	shift_const SCROLLINGMENU_ENABLE_FUNCTION3
+	shift_const SCROLLINGMENU_ENABLE_START
+	shift_const SCROLLINGMENU_ENABLE_SELECT
+
+; MonMenuOptions indexes (see data/mon_menu.asm)
+; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
+	const_def 1
+	; moves
+	const MONMENUITEM_CUT        ; 1
+	const MONMENUITEM_FLY        ; 2
+	const MONMENUITEM_SURF       ; 3
+	const MONMENUITEM_STRENGTH   ; 4
+	const MONMENUITEM_WATERFALL  ; 5
+	const MONMENUITEM_FLASH      ; 6
+	const MONMENUITEM_WHIRLPOOL  ; 7
+	const MONMENUITEM_DIG        ; 8
+	const MONMENUITEM_TELEPORT   ; 9
+	const MONMENUITEM_SOFTBOILED ; 10
+	const MONMENUITEM_HEADBUTT   ; 11
+	const MONMENUITEM_ROCKSMASH  ; 12
+	const MONMENUITEM_MILKDRINK  ; 13
+	const MONMENUITEM_SWEETSCENT ; 14
+	; options
+	const MONMENUITEM_STATS      ; 15
+	const MONMENUITEM_SWITCH     ; 16
+	const MONMENUITEM_ITEM       ; 17
+	const MONMENUITEM_CANCEL     ; 18
+	const MONMENUITEM_MOVE       ; 19
+	const MONMENUITEM_MAIL       ; 20
+	const MONMENUITEM_ERROR      ; 21
+
+; MonMenuOptions categories
+MONMENU_FIELD_MOVE EQU 0
+MONMENU_MENUOPTION EQU 1
+
+NUM_MONMENU_ITEMS EQU 8
+
+; start/select menu return values
+HMENURETURN_SCRIPT EQU %10000000
+HMENURETURN_ASM    EQU %11111111
+
+; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
+	const_def
+	const PARTYMENUACTION_CHOOSE_POKEMON
+	const PARTYMENUACTION_HEALING_ITEM
+	const PARTYMENUACTION_SWITCH
+	const PARTYMENUACTION_TEACH_TMHM
+	const PARTYMENUACTION_MOVE
+	const PARTYMENUACTION_EVO_STONE
+	const PARTYMENUACTION_GIVE_MON
+	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
+	const PARTYMENUACTION_GIVE_ITEM
+	const PARTYMENUACTION_MOBILE ; mobile
+; PrintPartyMenuActionText arguments (see engine/pokemon/party_menu.asm)
+	const_def $f0
+	const PARTYMENUTEXT_HEAL_PSN
+	const PARTYMENUTEXT_HEAL_BRN
+	const PARTYMENUTEXT_HEAL_FRZ
+	const PARTYMENUTEXT_HEAL_SLP
+	const PARTYMENUTEXT_HEAL_PAR
+	const PARTYMENUTEXT_HEAL_HP
+	const PARTYMENUTEXT_HEAL_ALL
+	const PARTYMENUTEXT_REVIVE
+	const PARTYMENUTEXT_LEVEL_UP
+	const PARTYMENUTEXT_HEAL_CONFUSION
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -316,6 +316,3 @@ const_value SET 1
 	const MONMENU_MOVE       ; 19
 	const MONMENU_MAIL       ; 20
 	const MONMENU_ERROR      ; 21
-
-MONMENU_FIELD_MOVE EQU 0
-MONMENU_MENUOPTION EQU 1
--- a/engine/overworld/player_object.asm
+++ b/engine/overworld/player_object.asm
@@ -528,7 +528,7 @@ GetTrainerPathToPlayer: ; 8931 (2:4931)
 	call ComputePathToWalkToPlayer
 	ret

-Special_SurfStartStep: ; 8969 (2:4969)
+SurfStartStep: ; 8969 (2:4969)
 	call InitMovementBuffer
 	call GetInitialSurfStep
 	call AppendToMovementBuffer
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -29,95 +29,95 @@ SpecialsPointers:
 	add_special WarpToSpawnPoint

 ; Communications
-	add_special Function29b22
-	add_special Function29b4b
-	add_special Function29bcc
-	add_special Function29c71
-	add_special Function29c8d
-	add_special Function29d01
-	add_special Function29cf9
-	add_special Function29ad9
-	add_special Function29b2b
-	add_special Function29b34
-	add_special Function29a47
-	add_special Function29ac7
-	add_special Function29ccf
-	add_special Function29ce4
-	add_special Function29cba
-	add_special Function29d4e
-	add_special Special_CheckMysteryGift
-	add_special Special_GetMysteryGiftItem
-	add_special Function2a4e7
+	add_special SetBitsForLinkTradeRequest
+	add_special WaitForLinkedFriend
+	add_special CheckLinkTimeout
+	add_special TryQuickSave
+	add_special CheckBothSelectedSameRoom
+	add_special FailedLinkToPast
+	add_special CloseLink
+	add_special WaitForOtherPlayerToExit
+	add_special SetBitsForBattleRequest
+	add_special SetBitsForTimeCapsuleRequest
+	add_special CheckTimeCapsuleCompatibility
+	add_special EnterTimeCapsule
+	add_special TradeCenter
+	add_special Colosseum
+	add_special TimeCapsule
+	add_special CableClubCheckWhichChris
+	add_special CheckMysteryGift
+	add_special GetMysteryGiftItem
+	add_special UnlockMysteryGift

 ; Map events
 	add_special BugContestJudging
-	add_special Functionc7bbf
-	add_special Function13dce
-	add_special Function13ded
-	add_special Function1399d
-	add_special Functionfbc3c
-	add_special Functionfbdd6
+	add_special CheckPartyFullAfterContest
+	add_special ContestDropOffMons
+	add_special ContestReturnMons
+	add_special GiveParkBalls
+	add_special CheckMagikarpLength
+	add_special MagikarpHouseSign
 	add_special HealParty
-	add_special Function15871
-	add_special Special_PlayerPC
-	add_special Function16935
-	add_special Function16989
-	add_special Function16b8c
-	add_special Function2c352
-	add_special Function1646d
-	add_special Function8ce7c
-	add_special Special_NameRival
-	add_special Function908dc
-	add_special Special_TownMap
-	add_special Special_UnownPrinter
+	add_special PokemonCenterPC
+	add_special PlayersHousePC
+	add_special DayCareMan
+	add_special DayCareLady
+	add_special DayCareManOutside
+	add_special MoveDeletion
+	add_special BankOfMom
+	add_special MagnetTrain
+	add_special NameRival
+	add_special SetDayOfWeek
+	add_special OverworldTownMap
+	add_special UnownPrinter
 	add_special MapRadio
-	add_special Special_UnownPuzzle
-	add_special Special_SlotMachine
-	add_special Special_CardFlip
-	add_special Special_DummyNonfunctionalGameCornerGame
-	add_special Special_ClearBGPalettesBufferScreen
-	add_special Function8c3ab
-	add_special Function8c3c4
+	add_special UnownPuzzle
+	add_special SlotMachine
+	add_special CardFlip
+	add_special DummyNonfunctionalGameCornerGame
+	add_special ClearBGPalettesBufferScreen
+	add_special FadeOutPalettes
+	add_special FadeBlackQuickly
 	add_special FadeInPalettes
-	add_special Function8c3b9
-	add_special Functiond42, $02
+	add_special FadeInQuickly
+	add_special ReloadSpritesNoPalettes, $02
 	add_special ClearBGPalettes
 	add_special UpdateTimePals
 	add_special ClearTileMap
 	add_special UpdateSprites
 	add_special ReplacePlayerSprite
-	add_special Special_GameCornerPrizeMonCheckDex
-	add_special SpecialSeenMon
+	add_special GameCornerPrizeMonCheckDex
+	add_special UnusedSetSeenMon
 	add_special WaitSFX, $03
 	add_special PlayMapMusic
 	add_special RestartMapMusic
-	add_special Function126fd
-	add_special Special_SurfStartStep
-	add_special Special_FindGreaterThanThatLevel
-	add_special Special_FindAtLeastThatHappy
-	add_special Special_FindThatSpecies
-	add_special Special_FindThatSpeciesYourTrainerID
-	add_special Special_CheckUnusedTwoDayTimer
-	add_special Function177a5
-	add_special Function177c4
-	add_special Function13d64
-	add_special Functionc556
-	add_special Function271be
-	add_special Function27216
-	add_special Function73e1
-	add_special Function7452
-	add_special Function74cb
-	add_special Functionc588
-	add_special Function24a4d
-	add_special Function24a76
-	add_special Function24a10
-	add_special Functionc7a5a
-	add_special Functionc5a3
-	add_special Functionc591
-	add_special Functionc7bad
-	add_special Functionc5bb
+	add_special HealMachineAnim
+	add_special SurfStartStep
+	add_special FindGreaterThanThatLevel
+	add_special FindAtLeastThatHappy
+	add_special FindThatSpecies
+	add_special FindThatSpeciesYourTrainerID
+	add_special UnusedCheckUnusedTwoDayTimer
+	add_special DayCareMon1
+	add_special DayCareMon2
+	add_special SelectRandomBugContestContestants
+	add_special ActivateFishingSwarm
+	add_special ToggleMaptileDecorations
+	add_special ToggleDecorationsVisibility
+	add_special GiveShuckle
+	add_special ReturnShuckle
+	add_special BillsGrandfather
+	add_special CheckPokerus
+	add_special DisplayCoinCaseBalance
+	add_special DisplayMoneyAndCoinBalance
+	add_special PlaceMoneyTopRight
+	add_special CheckForLuckyNumberWinners
+	add_special CheckLuckyNumberShowFlag
+	add_special ResetLuckyNumberShowFlag
+	add_special PrintTodaysLuckyNumber
+	add_special SelectApricornForKurt
 	add_special SpecialNameRater
-	add_special Special_DisplayLinkRecord
+	add_special DisplayLinkRecord
 	add_special GetFirstPokemonHappiness
 	add_special CheckFirstMonIsEgg
 	add_special Function2a9f7
@@ -146,7 +146,7 @@ SpecialsPointers:
 SpecialNone: ; c389
 	ret

-Special_GameCornerPrizeMonCheckDex: ; c38a
+GameCornerPrizeMonCheckDex: ; c38a
 	ld a, [wScriptVar]
 	dec a
 	call CheckCaughtMon
@@ -161,34 +161,34 @@ Special_GameCornerPrizeMonCheckDex: ; c38a
 	call ExitAllMenus
 	ret

-SpecialSeenMon: ; c3ac
+UnusedSetSeenMon: ; c3ac
 	ld a, [wScriptVar]
 	dec a
 	call SetSeenMon
 	ret

-Special_FindGreaterThanThatLevel: ; c3b4
+FindGreaterThanThatLevel: ; c3b4
 	ld a, [wScriptVar]
 	ld b, a
 	callba PartySearch_MaximumLevel ; same bank
 	jr z, asm_c3f2
 	jr asm_c3ec

-Special_FindAtLeastThatHappy: ; c3c2
+FindAtLeastThatHappy: ; c3c2
 	ld a, [wScriptVar]
 	ld b, a
 	callba PartySearch_MinimumHappiness ; same bank
 	jr z, asm_c3f2
 	jr asm_c3ec

-Special_FindThatSpecies: ; c3d0
+FindThatSpecies: ; c3d0
 	ld a, [wScriptVar]
 	ld b, a
 	callba PartySearch_SameSpecies ; same bank
 	jr z, asm_c3f2
 	jr asm_c3ec

-Special_FindThatSpeciesYourTrainerID: ; c3de
+FindThatSpeciesYourTrainerID: ; c3de
 	ld a, [wScriptVar]
 	ld b, a
 	callba PartySearch_SameSpeciesAndYourID ; same bank
@@ -205,7 +205,7 @@ asm_c3f2
 	ld [wScriptVar], a
 	ret

-Special_NameRival: ; c3f7
+NameRival: ; c3f7
 	ld b, $2
 	ld de, wRivalName
 	callba NamingScreen_
@@ -227,25 +227,25 @@ SpecialNameRater: ; c413 (3:4413)
 	callba Functionfb7f7
 	ret

-Special_TownMap: ; c41a (3:441a)
+OverworldTownMap: ; c41a (3:441a)
 	call FadeToMenu
 	callba Function9188a
 	call ExitAllMenus
 	ret

-Special_UnownPrinter: ; c427 (3:4427)
+UnownPrinter: ; c427 (3:4427)
 	call FadeToMenu
 	callba Function16e3a
 	call ExitAllMenus
 	ret

-Special_DisplayLinkRecord: ; c434 (3:4434)
+DisplayLinkRecord: ; c434 (3:4434)
 	call FadeToMenu
 	callba Function3f55d
 	call ExitAllMenus
 	ret

-Special_PlayerPC: ; c441 (3:4441)
+PlayersHousePC: ; c441 (3:4441)
 	xor a
 	ld [wScriptVar], a
 	callba Function159b0
@@ -253,7 +253,7 @@ Special_PlayerPC: ; c441 (3:4441)
 	ld [wScriptVar], a
 	ret

-Special_CheckMysteryGift: ; c450 (3:4450)
+CheckMysteryGift: ; c450 (3:4450)
 	ld a, $0
 	call OpenSRAM
 	ld a, [$abe2]
@@ -265,7 +265,7 @@ Special_CheckMysteryGift: ; c450 (3:4450)
 	call CloseSRAM
 	ret

-Special_GetMysteryGiftItem: ; c463 (3:4463)
+GetMysteryGiftItem: ; c463 (3:4463)
 	ld a, $0
 	call OpenSRAM
 	ld a, [$abe2]
@@ -309,7 +309,7 @@ MapRadio: ; c4af (3:44af)
 	callba Function919c1
 	ret

-Special_UnownPuzzle: ; c4ba (3:44ba)
+UnownPuzzle: ; c4ba (3:44ba)
 	call FadeToMenu
 	callba Functione199d
 	ld a, [wFieldMoveSucceeded]
@@ -317,7 +317,7 @@ Special_UnownPuzzle: ; c4ba (3:44ba)
 	call ExitAllMenus
 	ret

-Special_SlotMachine: ; c4cd (3:44cd)
+SlotMachine: ; c4cd (3:44cd)
 	call Functionc508
 	ret c
 	ld a, BANK(Function92c36)
@@ -325,7 +325,7 @@ Special_SlotMachine: ; c4cd (3:44cd)
 	call Functionc4f4
 	ret

-Special_CardFlip: ; c4da (3:44da)
+CardFlip: ; c4da (3:44da)
 	call Functionc508
 	ret c
 	ld a, BANK(Functione0909)
@@ -333,7 +333,7 @@ Special_CardFlip: ; c4da (3:44da)
 	call Functionc4f4
 	ret

-Special_DummyNonfunctionalGameCornerGame: ; c4e7 (3:44e7)
+DummyNonfunctionalGameCornerGame: ; c4e7 (3:44e7)
 	call Functionc508
 	ret c
 	ld a, BANK(Functione2668)
@@ -387,7 +387,7 @@ Functionc508: ; c508 (3:4508)
 	text_jump NoCoinCaseText_
 	db "@"

-Special_ClearBGPalettesBufferScreen: ; c535 (3:4535)
+ClearBGPalettesBufferScreen: ; c535 (3:4535)
 	call ClearBGPalettes
 	call BufferScreen
 	ret
@@ -403,13 +403,13 @@ Functionc53c: ; c53c (3:453c)
 	ld [wScriptVar], a
 	ret

-Special_CheckUnusedTwoDayTimer: ; c549 (3:4549)
+UnusedCheckUnusedTwoDayTimer: ; c549 (3:4549)
 	callba Function118f8
 	ld a, [wUnusedTwoDayTimer]
 	ld [wScriptVar], a
 	ret

-Functionc556: ; c556 (3:4556)
+ActivateFishingSwarm: ; c556 (3:4556)
 	ld a, [wScriptVar]
 	ld [wdd19], a
 	jr .asm_c566
@@ -439,17 +439,17 @@ Functionc56c:
 	ld [wdd18], a
 	ret

-Functionc588: ; c588 (3:4588)
+CheckPokerus: ; c588 (3:4588)
 	callba Functionc7a40
 	jp Functionc53c

-Functionc591: ; c591 (3:4591)
+ResetLuckyNumberShowFlag: ; c591 (3:4591)
 	callba Function11917
 	ClearFlag ENGINE_LUCKY_NUMBER_SHOW
 	callba LoadOrRegenerateLuckyIDNumber
 	ret

-Functionc5a3: ; c5a3 (3:45a3)
+CheckLuckyNumberShowFlag: ; c5a3 (3:45a3)
 	callba Function1192e
 	jp Functionc53c

@@ -466,7 +466,7 @@ CountUnown: ; c5ac (3:45ac)
 	jr c, .asm_c5b1
 	ret

-Functionc5bb: ; c5bb (3:45bb)
+SelectApricornForKurt: ; c5bb (3:45bb)
 	callba Function24b8d
 	ld a, c
 	ld [wScriptVar], a
--- a/event/overworld.asm
+++ b/event/overworld.asm
@@ -417,7 +417,7 @@ UsedSurfScript:
 	writevarcode VAR_MOVEMENT
 	special ReplacePlayerSprite
 	special PlayMapMusic
-	special Special_SurfStartStep
+	special SurfStartStep
 	applymovement 0, wMovementBuffer
 	end

--- a/event/special.asm
+++ b/event/special.asm
@@ -1,4 +1,4 @@
-Function73e1:
+GiveShuckle:
 	xor a
 	ld [wMonType], a
 	ld a, SHUCKLE
@@ -49,7 +49,7 @@ ManiaName:
 ShuckieName:
 	db "SHUCKIE@"

-Function7452:
+ReturnShuckle:
 	callba Function50000
 	jr c, .asm_74ba
 	ld a, [wd004]
@@ -113,7 +113,7 @@ Function7452:
 	ld [wScriptVar], a
 	ret

-Function74cb:
+BillsGrandfather:
 	callba Function50000
 	jr c, .asm_74e2
 	ld a, [wd004]
--- a/home/map.asm
+++ b/home/map.asm
@@ -2098,7 +2098,7 @@ FadeToMenu::
 	xor a
 	ld [hBGMapMode], a
 	call LoadStandardMenuDataHeader
-	callba Function8c3ab
+	callba FadeOutPalettes
 	call ClearSprites
 	call DisableSpriteUpdates
 	ret
--- a/home/palettes.asm
+++ b/home/palettes.asm
@@ -197,7 +197,7 @@ Functiond2a::
 	jr nz, .asm_d33
 	ret

-Functiond42::
+ReloadSpritesNoPalettes::
 	ld a, [hCGB]
 	and a
 	ret z
--- a/main.asm
+++ b/main.asm
@@ -642,7 +642,7 @@ INCLUDE "engine/namingscreen.asm"

 AbortBugCatchingContest::
 	dr $1269a, $126fd
-Function126fd:
+HealMachineAnim:
 	dr $126fd, $12947

 ItemfinderFunction:
@@ -652,17 +652,17 @@ PartyMonItemName::
 	dr $12e33, $12fa0
 Function12fa0:
 	dr $12fa0, $1399d
-Function1399d:
+GiveParkBalls:
 	dr $1399d, $13a5f
 Function13a5f:
 	dr $13a5f, $13d44
 ApplyPokerusTick:
 	dr $13d44, $13d64
-Function13d64:
+SelectRandomBugContestContestants:
 	dr $13d64, $13dce
-Function13dce:
+ContestDropOffMons:
 	dr $13dce, $13ded
-Function13ded:
+ContestReturnMons:
 	dr $13ded, $13e03

 SECTION "bank5", ROMX, BANK[$5]
@@ -707,17 +707,17 @@ DelayLoadingNewSprites:
 	dr $1560c, $15612
 Function15612:: ; 15612
 	dr $15612, $15871
-Function15871:
+PokemonCenterPC:
 	dr $15871, $159b0
 Function159b0:
 	dr $159b0, $1646d
-Function1646d:
+BankOfMom:
 	dr $1646d, $16935
-Function16935:
+DayCareMan:
 	dr $16935, $16989
-Function16989:
+DayCareLady:
 	dr $16989, $16b8c
-Function16b8c:
+DayCareManOutside:
 	dr $16b8c, $16e3a
 Function16e3a:
 	dr $16e3a, $16ff7
@@ -725,9 +725,9 @@ Function16ff7:
 	dr $16ff7, $171d1
 Function171d1:
 	dr $171d1, $177a5
-Function177a5:
+DayCareMon1:
 	dr $177a5, $177c4
-Function177c4:
+DayCareMon2:
 	dr $177c4, $1783e

 SECTION "bank6", ROMX, BANK[$6]
@@ -767,11 +767,11 @@ PlaceMenuItemName:
 	dr $249dc, $249eb
 PlaceMenuItemQuantity:
 	dr $249eb, $24a10
-Function24a10:
+PlaceMoneyTopRight:
 	dr $24a10, $24a4d
-Function24a4d:
+DisplayCoinCaseBalance:
 	dr $24a4d, $24a76
-Function24a76:
+DisplayMoneyAndCoinBalance:
 	dr $24a76, $24b8d
 Function24b8d:
 	dr $24b8d, $24f20
@@ -783,9 +783,9 @@ InitDecorations: ; 2692d
 	dr $2692d, $270d5
 ReceiveDecorationC:
 	dr $270d5, $271be
-Function271be:
+ToggleMaptileDecorations:
 	dr $271be, $27216
-Function27216:
+ToggleDecorationsVisibility:
 	dr $27216, $27271
 GetTrainerDVs:
 	dr $27271, $27307
@@ -803,43 +803,43 @@ TradeAnimation::

 TradeAnimationPlayer2::
 	dr $28e22, $29a47
-Function29a47:
+CheckTimeCapsuleCompatibility:
 	dr $29a47, $29ac7
-Function29ac7:
+EnterTimeCapsule:
 	dr $29ac7, $29ad9
-Function29ad9:
+WaitForOtherPlayerToExit:
 	dr $29ad9, $29b22
-Function29b22:
+SetBitsForLinkTradeRequest:
 	dr $29b22, $29b2b
-Function29b2b:
+SetBitsForBattleRequest:
 	dr $29b2b, $29b34
-Function29b34:
+SetBitsForTimeCapsuleRequest:
 	dr $29b34, $29b4b
-Function29b4b:
+WaitForLinkedFriend:
 	dr $29b4b, $29bcc
-Function29bcc:
+CheckLinkTimeout:
 	dr $29bcc, $29c71
-Function29c71:
+TryQuickSave:
 	dr $29c71, $29c8d
-Function29c8d:
+CheckBothSelectedSameRoom:
 	dr $29c8d, $29cba
-Function29cba:
+TimeCapsule:
 	dr $29cba, $29ccf
-Function29ccf:
+TradeCenter:
 	dr $29ccf, $29ce4
-Function29ce4:
+Colosseum:
 	dr $29ce4, $29cf9
-Function29cf9:
+CloseLink:
 	dr $29cf9, $29d01
-Function29d01:
+FailedLinkToPast:
 	dr $29d01, $29d4e
-Function29d4e:
+CableClubCheckWhichChris:
 	dr $29d4e, $29dff
 Function29dff:
 	dr $29dff, $2a4bf
 MysteryGift_CopyReceivedDecosToPC:
 	dr $2a4bf, $2a4e7
-Function2a4e7:
+UnlockMysteryGift:
 	dr $2a4e7, $2a4f6
 Function2a4f6:
 	dr $2a4f6, $2a7d7
@@ -856,7 +856,7 @@ Function2aab3:

 SECTION "bankb", ROMX, BANK[$b]
 	dr $2c000, $2c352
-Function2c352:
+MoveDeletion:
 	dr $2c352, $2c57a

 Pack_TMHMPocketMenu_:
@@ -1170,13 +1170,13 @@ _UpdateTimePals:: ; 8c397
 FadeInPalettes:: ; 8c3a0
 	dr $8c3a0, $8c3ab

-Function8c3ab:: ; 8c3ab
+FadeOutPalettes:: ; 8c3ab
 	dr $8c3ab, $8c3b9

-Function8c3b9:
+FadeInQuickly:
 	dr $8c3b9, $8c3c4

-Function8c3c4:
+FadeBlackQuickly:
 	dr $8c3c4, $8c3e9

 Function8c3e9:: ; 8c3e9
@@ -1203,7 +1203,7 @@ FlyFromAnimation:
 FlyToAnimation:
 	dr $8cdab, $8ce7c

-Function8ce7c:
+MagnetTrain:
 	dr $8ce7c, $8d174

 ClearAnimatedObjectBuffer:
@@ -1238,7 +1238,7 @@ SECTION "bank24", ROMX, BANK[$24]
 	dr $90000, $90641
 InitClock:
 	dr $90641, $908dc
-Function908dc:
+SetDayOfWeek:
 	dr $908dc, $90a1b
 Function90a1b:
 	dr $90a1b, $90a54
@@ -1351,11 +1351,11 @@ SECTION "bank31", ROMX, BANK[$31]
 	dr $c4000, $c7a40
 Functionc7a40:
 	dr $c7a40, $c7a5a
-Functionc7a5a:
+CheckForLuckyNumberWinners:
 	dr $c7a5a, $c7bad
-Functionc7bad:
+PrintTodaysLuckyNumber:
 	dr $c7bad, $c7bbf
-Functionc7bbf:
+CheckPartyFullAfterContest:
 	dr $c7bbf, $c7cd0
 Functionc7cd0:
 	dr $c7cd0, $c8000
@@ -1502,9 +1502,9 @@ ConvertMon_1to2::
 	dr $fba12, $fbb22
 UpdateUnownDex:
 	dr $fbb22, $fbc3c
-Functionfbc3c:
+CheckMagikarpLength:
 	dr $fbc3c, $fbdd6
-Functionfbdd6:
+MagikarpHouseSign:
 	dr $fbdd6, $fc000

 SECTION "bank3f", ROMX, BANK[$3f]