diff options
Diffstat (limited to 'engine')
51 files changed, 109 insertions, 115 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 653622f86..a36927820 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -826,7 +826,7 @@ ENDM jr nz, .row ret -Unreferenced_Function8c7c9: +Function8c7c9: ; unreferenced ld a, 1 ldh [hBGMapMode], a call WaitBGMap diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4256b0df6..90f0372f6 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1899,7 +1899,7 @@ GetMaxHP: ld c, a ret -Unreferenced_GetHalfHP: +GetHalfHP: ; unreferenced ld hl, wBattleMonHP ldh a, [hBattleTurn] and a @@ -6488,7 +6488,7 @@ CheckUnownLetter: INCLUDE "data/wild/unlocked_unowns.asm" -Unreferenced_SwapBattlerLevels: +SwapBattlerLevels: ; unreferenced push bc ld a, [wBattleMonLevel] ld b, a @@ -6852,7 +6852,7 @@ _LoadHPBar: callfar LoadHPBar ret -Unreferenced_LoadHPExpBarGFX: +LoadHPExpBarGFX: ; unreferenced ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 @@ -7763,7 +7763,7 @@ GoodComeBackText: text_far _GoodComeBackText text_end -Unreferenced_TextJump_ComeBack: +TextJump_ComeBack: ; unreferenced ld hl, ComeBackText ret @@ -7771,7 +7771,7 @@ ComeBackText: text_far _ComeBackText text_end -Unreferenced_HandleSafariAngerEatingStatus: +HandleSafariAngerEatingStatus: ; unreferenced ld hl, wSafariMonEating ld a, [hl] and a @@ -8028,7 +8028,7 @@ StartBattle: scf ret -Unreferenced_DoBattle: +CallDoBattle: ; unreferenced call DoBattle ret @@ -8201,7 +8201,7 @@ InitEnemyWildmon: predef PlaceGraphic ret -Unreferenced_Function3f662: +Function3f662: ; unreferenced ld hl, wEnemyMonMoves ld de, wListMoves_MoveIndicesBuffer ld b, NUM_MOVES diff --git a/engine/battle/unreferenced_getgen1trainerclassname.asm b/engine/battle/getgen1trainerclassname.asm index 045325234..78b543f12 100644 --- a/engine/battle/unreferenced_getgen1trainerclassname.asm +++ b/engine/battle/getgen1trainerclassname.asm @@ -1,4 +1,4 @@ -Unreferenced_GetGen1TrainerClassName: +GetGen1TrainerClassName: ; unreferenced ld hl, Gen1TrainerClassNames ld a, [wTrainerClass] dec a diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm index b2a0903b4..1c1ff1c4b 100644 --- a/engine/battle/read_trainer_party.asm +++ b/engine/battle/read_trainer_party.asm @@ -380,7 +380,7 @@ CopyTrainerName: pop de ret -Unreferenced_Function39990: +Function39990: ; unreferenced ld de, wStringBuffer1 push de ld bc, NAME_LENGTH diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 14396f385..f6c50b72f 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -216,7 +216,7 @@ ClearActorHud: call ClearBox ret -Unreferenced_Functioncc220: +Functioncc220: ; unreferenced xor a ldh [hBGMapMode], a ld a, LOW(vBGMap0 tile $28) diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 6ffc3c8e2..bba5ae3a5 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -581,7 +581,7 @@ CopyBTTrainer_FromBT_OT_TowBT_OTTemp: SkipBattleTowerTrainer: ret -Unreferenced_Function1704ca: +Function1704ca: ; unreferenced ld a, [s5_be46] cp BATTLETOWER_STREAK_LENGTH jr c, .not_max diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index a14a102cf..f7ec0f23e 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -312,14 +312,14 @@ CopyTradeName: call CopyBytes ret -Unreferenced_Functionfcdfb: +Functionfcdfb: ; unreferenced ld bc, 4 call CopyBytes ld a, "@" ld [de], a ret -Unreferenced_Functionfce05: +Functionfce05: ; unreferenced ld bc, 3 call CopyBytes ld a, "@" diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 824cde120..d0ab25d62 100644 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -971,7 +971,7 @@ StrengthFunction: jr c, .Failed jr .UseStrength -.Unreferenced_AlreadyUsing: +.AlreadyUsingStrength: ; unreferenced ld hl, .AlreadyUsingStrengthText call MenuTextboxBackup ld a, $80 diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index 30f6c45af..8a741b025 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -230,7 +230,7 @@ SlotsLoop: call PrintNum ret -Unreferenced_Function92811: +Function92811: ; unreferenced ; debug function? ld a, [wSlotBias] add 0 @@ -248,7 +248,7 @@ Unreferenced_Function92811: ld [hl], a ret -Unreferenced_Function9282c: +Function9282c: ; unreferenced ; animate OAM tiles? ld hl, wcf66 ld a, [hl] @@ -845,7 +845,7 @@ Slots_UpdateReelPositionAndOAM: jr nz, .loop ret -Unreferenced_Function92bbe: +Function92bbe: ; unreferenced push hl srl a srl a diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 70cb5325a..6de95194b 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -980,7 +980,7 @@ _CGB_MysteryGift: .MysteryGiftPalettes: INCLUDE "gfx/mystery_gift/mystery_gift.pal" -Unreferenced_GS_CGB_MysteryGift: +GS_CGB_MysteryGift: ; unreferenced ld hl, .MysteryGiftPalette ld de, wBGPals1 ld bc, 1 palettes diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index cef6381ec..f316548bd 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -76,7 +76,7 @@ Unused_CheckShininess: and a ret -Unreferenced_SGB_ApplyCreditsPals: +SGB_ApplyCreditsPals: ; unreferenced push de push bc ld hl, PalPacket_9ce6 @@ -133,7 +133,7 @@ SGB_ApplyPartyMenuHPPals: ld [hl], e ret -Unreferenced_Function8b07: +Function8b07: ; unreferenced call CheckCGB ret z ; CGB only @@ -166,7 +166,7 @@ Unreferenced_Function8b07: RGB 08, 16, 28 RGB 00, 00, 00 -Unreferenced_Function8b3f: +Function8b3f: ; unreferenced call CheckCGB ret nz ldh a, [hSGB] @@ -175,7 +175,7 @@ Unreferenced_Function8b3f: ld hl, BlkPacket_9a86 jp PushSGBPals -Unreferenced_Function8b4d: +Function8b4d: ; unreferenced call CheckCGB jr nz, .cgb ldh a, [hSGB] @@ -190,7 +190,7 @@ Unreferenced_Function8b4d: call GetPredefPal jp LoadHLPaletteIntoDE -Unreferenced_Function8b67: +Function8b67: ; unreferenced call CheckCGB jr nz, .cgb ldh a, [hSGB] @@ -205,7 +205,7 @@ Unreferenced_Function8b67: call GetPredefPal jp LoadHLPaletteIntoDE -Unreferenced_GSIntro_LoadMonPalette: +GSIntro_LoadMonPalette: ; unreferenced call CheckCGB jr nz, .cgb ldh a, [hSGB] @@ -273,7 +273,7 @@ LoadNthMiddleBGPal: call LoadPalette_White_Col1_Col2_Black ret -Unreferenced_Function8bec: +Function8bec: ; unreferenced ldh a, [hCGB] and a jr nz, .cgb @@ -719,7 +719,7 @@ GetMonPalettePointer: call _GetMonPalettePointer ret -Unreferenced_Function9779: +Function9779: ; unreferenced ret call CheckCGB ret z @@ -742,7 +742,7 @@ Unreferenced_Function9779: BattleObjectPals: INCLUDE "gfx/battle_anims/battle_anims.pal" -Unreferenced_Function97cc: +Function97cc: ; unreferenced call CheckCGB ret z ld a, $90 @@ -952,7 +952,7 @@ _InitSGBBorderPals: dw DataSndPacket7 dw DataSndPacket8 -Unreferenced_Function9911: +Function9911: ; unreferenced di xor a ldh [rJOYP], a diff --git a/engine/gfx/dma_transfer.asm b/engine/gfx/dma_transfer.asm index f30c5eb45..1f5f3e785 100644 --- a/engine/gfx/dma_transfer.asm +++ b/engine/gfx/dma_transfer.asm @@ -108,11 +108,11 @@ Mobile_ReloadMapPart: ret -; unused - ld hl, .unreferenced_1040da +Function1040d4: ; unreferenced + ld hl, .Function jp CallInSafeGFXMode -.unreferenced_1040da +.Function ld a, $1 ldh [rVBK], a ld a, BANK(w3_d800) @@ -131,11 +131,11 @@ Mobile_ReloadMapPart: call WaitDMATransfer ret -; unused - ld hl, .unreferenced_104101 +Function1040fb: ; unreferenced + ld hl, .Function jp CallInSafeGFXMode -.unreferenced_104101 +.Function ld a, $1 ldh [rVBK], a ld a, BANK(w3_d800) diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index a83083581..0852cd8ff 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -1,16 +1,16 @@ INCLUDE "gfx/font.asm" -Unused_EnableHDMA: +EnableHDMAForGraphics: db FALSE -Unreferenced_Get1bppOptionalHDMA: - ld a, [Unused_EnableHDMA] +Get1bppOptionalHDMA: ; unreferenced + ld a, [EnableHDMAForGraphics] and a jp nz, Get1bppViaHDMA jp Get1bpp -Unreferenced_Get2bppOptionalHDMA: - ld a, [Unused_EnableHDMA] +Get2bppOptionalHDMA: ; unreferenced + ld a, [EnableHDMAForGraphics] and a jp nz, Get2bppViaHDMA jp Get2bpp diff --git a/engine/gfx/load_pics.asm b/engine/gfx/load_pics.asm index bf656b48d..a8dc82892 100644 --- a/engine/gfx/load_pics.asm +++ b/engine/gfx/load_pics.asm @@ -287,7 +287,7 @@ EXPORT PICS_FIX db BANK("Pics 23") ; BANK("Pics 1") + 22 db BANK("Pics 24") ; BANK("Pics 1") + 23 -Unreferenced_GSIntro_GetMonFrontpic: +GSIntro_GetMonFrontpic: ; unreferenced ld a, c push de ld hl, PokemonPicPointers diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 6c7f14e3a..c1666fda4 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -273,7 +273,7 @@ FlyFunction_GetMonIcon: call GetIcon_a ret -Unreferenced_GetMonIcon2: +GetMonIconDE: ; unreferenced push de ld a, [wTempIconSpecies] call ReadMonMenuIcon diff --git a/engine/gfx/player_gfx.asm b/engine/gfx/player_gfx.asm index bd0fd0ce7..9a395e048 100644 --- a/engine/gfx/player_gfx.asm +++ b/engine/gfx/player_gfx.asm @@ -1,4 +1,4 @@ -Unreferenced_Function88248: +Function88248: ; unreferenced ld c, CAL ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a @@ -72,7 +72,7 @@ ShowPlayerNamingChoices: INCLUDE "data/player_names.asm" -Unreferenced_GetPlayerNameArray: +GetPlayerNameArray: ; unreferenced ld hl, wPlayerName ld de, MalePlayerNameArray ld a, [wPlayerGender] diff --git a/engine/gfx/sprites.asm b/engine/gfx/sprites.asm index e070cb9f0..c5a91a9b5 100644 --- a/engine/gfx/sprites.asm +++ b/engine/gfx/sprites.asm @@ -508,7 +508,7 @@ GetFrameOAMPointer: add hl, de ret -Unreferenced_BrokenGetStdGraphics: +BrokenGetStdGraphics: ; unreferenced push hl ld l, a ld h, 0 diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 98bb8324c..a0773df4a 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -722,7 +722,7 @@ SellMenu: and a ret -.Unreferenced_NothingToSell: +.NothingToSell: ; unreferenced ld hl, .NothingToSellText call MenuTextboxBackup and a diff --git a/engine/items/pack.asm b/engine/items/pack.asm index 1331c039f..bde5685cc 100644 --- a/engine/items/pack.asm +++ b/engine/items/pack.asm @@ -499,7 +499,7 @@ TossMenu: .finish ret -Unreferenced_ResetPocketCursorPositions: +ResetPocketCursorPositions: ; unreferenced ld a, [wCurPocket] and a ; ITEM_POCKET jr z, .items @@ -1434,7 +1434,7 @@ Pack_GetItemName: call CopyName1 ret -Unreferenced_Pack_ClearTilemap: +Pack_ClearTilemap: ; unreferenced hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index ecc2d45cb..8afd4bf79 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -436,7 +436,7 @@ TMHMPocket_GetCurrentLineCoord: jr nz, .loop ret -Unreferenced_Function2ca95: +Function2ca95: ; unreferenced pop hl ld bc, 3 add hl, bc @@ -484,7 +484,7 @@ TMHM_PlaySFX_ReadText2: pop de ret -Unreferenced_Function2cadf: +Function2cadf: ; unreferenced call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM ld hl, .NoRoomTMHMText diff --git a/engine/link/link.asm b/engine/link/link.asm index 6a698761f..4f794eb00 100644 --- a/engine/link/link.asm +++ b/engine/link/link.asm @@ -1561,7 +1561,7 @@ Function28b22: ldh [rSC], a ret -Unreferenced_Function28b42: +Function28b42: ; unreferenced hlcoord 0, 16 ld a, "┘" ld bc, 2 * SCREEN_WIDTH @@ -1971,7 +1971,7 @@ SetTradeRoomBGPals: call SetPalettes ret -Unreferenced_Function28f09: +Function28f09: ; unreferenced hlcoord 0, 0 ld b, 6 ld c, 18 @@ -2503,10 +2503,10 @@ CableClubCheckWhichChris: ld [wScriptVar], a ret -Unreferenced_GSLinkCommsBorderGFX: +GSLinkCommsBorderGFX: ; unreferenced INCBIN "gfx/trade/unused_gs_border_tiles.2bpp" -Unreferenced_Function29fe4: +Function29fe4: ; unreferenced ld a, BANK(sPartyMail) call OpenSRAM ld d, FALSE diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index 5bf58ac2e..716fad205 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -1350,7 +1350,7 @@ InitMysteryGiftLayout: ld b, 5 jr .gfx_loop -.Unreferenced_Load6GFX: +.Load6GFX: ; unreferenced ld b, 6 jr .gfx_loop diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 37f88506a..0c8d38375 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -781,7 +781,7 @@ NamePlayer: .Kris: db "KRIS@@@@@@@" -Unreferenced_GSShowPlayerNamingChoices: +GSShowPlayerNamingChoices: ; unreferenced call LoadMenuHeader call VerticalMenu ld a, [wMenuCursorY] @@ -1033,7 +1033,7 @@ RunTitleScreen: scf ret -Unreferenced_Function6292: +Function6292: ; unreferenced ldh a, [hVBlankCounter] and $7 ret nz @@ -1061,7 +1061,7 @@ TitleScreenScene: dw TitleScreenMain dw TitleScreenEnd -.Unreferenced_NextScene: +TitleScreenNextScene: ; unreferenced ld hl, wJumptableIndex inc [hl] ret @@ -1252,7 +1252,7 @@ ResetClock: farcall _ResetClock jp Init -Unreferenced_Function639b: +Function639b: ; unreferenced ; If bit 0 or 1 of [wTitleScreenTimer] is set, we don't need to be here. ld a, [wTitleScreenTimer] and %00000011 diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm index 091dd27d0..94accb539 100644 --- a/engine/menus/menu.asm +++ b/engine/menus/menu.asm @@ -272,7 +272,7 @@ MobileMenuJoypad: ld c, a ret -Unreferenced_Function241d5: +Function241d5: ; unreferenced call Place2DMenuCursor .loop call Move2DMenuCursor @@ -690,7 +690,7 @@ _ExitMenu:: dec [hl] ret -Unreferenced_Function24423: +Function24423: ; unreferenced ld a, [wVramState] bit 0, a ret z diff --git a/engine/menus/menu_2.asm b/engine/menus/menu_2.asm index 3c68c2c49..6c65f8bf5 100644 --- a/engine/menus/menu_2.asm +++ b/engine/menus/menu_2.asm @@ -110,7 +110,7 @@ CoinString: ShowMoney_TerminatorString: db "@" -Unreferenced_StartMenu_PrintSafariGameStatus: +StartMenu_PrintSafariGameStatus: ; unreferenced ld hl, wOptions ld a, [hl] push af diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index aa0d9abf7..791ae5e02 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -698,7 +698,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString: scf ret -Unreferenced_AddDakutenToCharacter: +AddDakutenToCharacter: ; unreferenced ld a, [wNamingScreenCurNameLength] and a ret z @@ -975,7 +975,7 @@ INCBIN "gfx/icons/mail_big.2bpp" ld [wNamingScreenMaxNameLength], a ret -.Unreferenced_PleaseWriteAMailString: +.PleaseWriteAMailString: ; unreferenced db "メールを かいてね@" .InitCharset: diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 3bb23f08e..8f77e9b55 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -18,7 +18,7 @@ SaveMenu: .refused call ExitMenu - call ret_d90 + call GSReloadPalettes farcall SaveMenu_CopyTilemapAtOnce scf ret @@ -205,7 +205,7 @@ SaveTheGame_yesorno: dec a call CloseWindow push af - call ret_d90 + call GSReloadPalettes pop af and a ret @@ -390,7 +390,7 @@ EraseHallOfFame: call ByteFill jp CloseSRAM -Unreferenced_Function14d18: +Function14d18: ; unreferenced ld a, BANK(s4_a007) call OpenSRAM ld hl, .Data @@ -421,7 +421,7 @@ SaveData: call _SaveData ret -Unreferenced_Function14d6c: +Function14d6c: ; unreferenced ld a, BANK(s4_a60b) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call OpenSRAM ld a, [s4_a60b] ; address of MBC30 bank @@ -436,7 +436,7 @@ Unreferenced_Function14d6c: call CloseSRAM ret -Unreferenced_Function14d83: +Function14d83: ; unreferenced ld a, BANK(s4_a60c) ; aka BANK(s4_a60d) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call OpenSRAM xor a @@ -445,7 +445,7 @@ Unreferenced_Function14d83: call CloseSRAM ret -Unreferenced_Function14d93: +Function14d93: ; unreferenced ld a, BANK(s7_a000) ; MBC30 bank used by JP Crystal; inaccessible by MBC3 call OpenSRAM xor a diff --git a/engine/menus/scrolling_menu.asm b/engine/menus/scrolling_menu.asm index 0574bc730..d23b4d1e3 100644 --- a/engine/menus/scrolling_menu.asm +++ b/engine/menus/scrolling_menu.asm @@ -78,7 +78,7 @@ ScrollingMenuJoyAction: jp nz, .d_down jr .loop -.unreferenced ; unused +.no_zero_no_carry ; unreferenced ld a, -1 and a ret diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index e9e5236a9..dc12767ff 100644 --- a/engine/menus/start_menu.asm +++ b/engine/menus/start_menu.asm @@ -151,7 +151,7 @@ StartMenu:: call DrawVariableLengthMenuBox call .DrawBugContestStatus call UpdateSprites - call ret_d90 + call GSReloadPalettes call FinishExitMenu ret diff --git a/engine/menus/trainer_card.asm b/engine/menus/trainer_card.asm index 726148e20..6a7477e14 100644 --- a/engine/menus/trainer_card.asm +++ b/engine/menus/trainer_card.asm @@ -128,7 +128,7 @@ TrainerCard_Page1_Joypad: ld [wJumptableIndex], a ret -.Unreferenced_KantoCheck: +.KantoBadgeCheck: ; unreferenced ld a, [wKantoBadges] and a ret z @@ -171,7 +171,7 @@ TrainerCard_Page2_Joypad: ld [wJumptableIndex], a ret -.Unreferenced_KantoCheck: +.KantoBadgeCheck: ; unreferenced ld a, [wKantoBadges] and a ret z diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index d8c467d65..5b885249c 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1400,9 +1400,8 @@ TradeAnim_WaitAnim2: call TradeAnim_AdvanceScriptPointer ret -Unreferenced_DebugTrade: -; This function is not referenced. -; It was meant for use in Japanese versions, so the +DebugTrade: ; unreferenced +; This function was meant for use in Japanese versions, so the ; constant used for copy length was changed by accident. ld hl, .DebugTradeData diff --git a/engine/overworld/cmd_queue.asm b/engine/overworld/cmd_queue.asm index 414281565..e482f789b 100644 --- a/engine/overworld/cmd_queue.asm +++ b/engine/overworld/cmd_queue.asm @@ -33,7 +33,7 @@ HandleCmdQueue:: jr nz, .loop ret -Unreferenced_GetNthCmdQueueEntry: +GetNthCmdQueueEntry: ; unreferenced ld hl, wCmdQueue ld bc, CMDQUEUE_ENTRY_SIZE call AddNTimes @@ -158,7 +158,7 @@ CmdQueue_Null: ret CmdQueue_Type1: - call ret_2f3e + call Function2f3e ret CmdQueue_Type4: diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm index f78635cb7..0606f64b1 100644 --- a/engine/overworld/events.asm +++ b/engine/overworld/events.asm @@ -399,7 +399,7 @@ SetMinTwoStepWildEncounterCooldown: Dummy_CheckScriptFlags3Bit5: call CheckBit5_ScriptFlags3 ret z - call ret_2f3e + call Function2f3e ret RunSceneScript: @@ -928,8 +928,7 @@ CountStep: scf ret -; unused -.unreferenced +.whiteout ; unreferenced ld a, PLAYEREVENT_WHITEOUT scf ret diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index ebc4b8688..7c83f4fea 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -402,7 +402,7 @@ UpdatePlayerStep: set PLAYERSTEP_CONTINUE_F, [hl] ret -Unreferenced_Function4759: +Function4759: ; unreferenced push bc ld e, a ld d, 0 diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 92e706ab3..a767dc5e7 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -113,12 +113,12 @@ EnableTextAcceleration: ret ActivateMapAnims: - ld a, $1 + ld a, TRUE ldh [hMapAnims], a ret SuspendMapAnims: - xor a + xor a ; FALSE ldh [hMapAnims], a ret diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index d6b02fc45..1dc8b6fbd 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -274,7 +274,7 @@ WillObjectBumpIntoSomeoneElse: ld e, [hl] jr IsNPCAtCoord -Unreferenced_Function7015: +Function7015: ; unreferenced ldh a, [hMapObjectIndexBuffer] call GetObjectStruct call .CheckWillBeFacingNPC @@ -473,7 +473,7 @@ IsObjectMovingOffEdgeOfScreen: scf ret -Unreferenced_Function7113: +Function7113: ; unreferenced ld a, [wPlayerStandingMapX] ld d, a ld a, [wPlayerStandingMapY] diff --git a/engine/pokedex/pokedex_2.asm b/engine/pokedex/pokedex_2.asm index 2757d26fc..38282d174 100644 --- a/engine/pokedex/pokedex_2.asm +++ b/engine/pokedex/pokedex_2.asm @@ -214,8 +214,7 @@ DisplayDexEntry: call FarString ret -UnreferencedPOKeString: -; unused +POKeString: ; unreferenced db "#@" GetDexEntryPointer: diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index d2d2d61f9..05700fa2d 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -1693,7 +1693,7 @@ LoadStation_EvolutionRadio: ld de, UnownStationName ret -Unreferenced_LoadStation: +DummyLoadStation: ; unreferenced ret RadioMusicRestartDE: @@ -2813,7 +2813,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: INCBIN "gfx/pokegear/flymap_label_border.1bpp" -Unreferenced_Function92311: +Function92311: xor a ld [wTownMapPlayerIconLandmark], a call ClearBGPalettes diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 93fbeab8d..5992beab4 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -239,7 +239,7 @@ BillsPCDepositMenuHeader: db "RELEASE@" db "CANCEL@" -Unreferenced_BillsPCClearThreeBoxes: +BillsPCClearThreeBoxes: ; unreferenced hlcoord 0, 0 ld b, 4 ld c, 8 @@ -1540,7 +1540,7 @@ endr dbsprite 19, 4, 0, 7, $07, 0 db -1 -Unreferenced_BillsPC_FillBox: +BillsPC_FillBox: ; unreferenced .row push bc push hl diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 71e65186a..757b977c5 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -139,7 +139,7 @@ BillsPC_DepositMenu: and a ret -Unreferenced_Functione512: +Functione512: ; unreferenced ld a, [wPartyCount] and a jr z, .no_mon @@ -206,7 +206,7 @@ BillsPC_WithdrawMenu: and a ret -Unreferenced_Functione56d: +Functione56d: ; unreferenced ld a, [wPartyCount] cp PARTY_LENGTH jr nc, .party_full @@ -261,7 +261,7 @@ CopyBoxmonToTempMon: call CloseSRAM ret -Unreferenced_LoadBoxMonListing: +LoadBoxMonListing: ; unreferenced ld a, [wCurBox] cp b jr z, .same_box diff --git a/engine/pokemon/breeding.asm b/engine/pokemon/breeding.asm index a545d9ab9..fce75963c 100644 --- a/engine/pokemon/breeding.asm +++ b/engine/pokemon/breeding.asm @@ -943,7 +943,7 @@ DayCareMonCompatibilityText: text_far _BreedShowsInterestText text_end -Unreferenced_DayCareMonPrintEmptyString: +DayCareMonPrintEmptyString: ; unreferenced ld hl, .string ret diff --git a/engine/pokemon/correct_party_errors.asm b/engine/pokemon/correct_party_errors.asm index 717893b36..4e7d1cabe 100644 --- a/engine/pokemon/correct_party_errors.asm +++ b/engine/pokemon/correct_party_errors.asm @@ -1,4 +1,4 @@ -Unreferenced_CorrectPartyErrors: +CorrectPartyErrors: ; unreferenced ld hl, wPartyCount ld a, [hl] and a diff --git a/engine/pokemon/mail_2.asm b/engine/pokemon/mail_2.asm index 7114569fb..4879ca7d4 100644 --- a/engine/pokemon/mail_2.asm +++ b/engine/pokemon/mail_2.asm @@ -709,7 +709,7 @@ MailGFX_PlaceMessage: .place_author jp PlaceString -Unreferenced_Functionb984e: +Functionb984e: ; unreferenced .loop ld a, [hl] xor $ff diff --git a/engine/pokemon/mon_menu.asm b/engine/pokemon/mon_menu.asm index c785a098e..c8d35a59f 100644 --- a/engine/pokemon/mon_menu.asm +++ b/engine/pokemon/mon_menu.asm @@ -626,7 +626,7 @@ MonMenu_Fly: ld a, $0 ret -.Unreferenced: +.NoReload: ; unreferenced ld a, $1 ret diff --git a/engine/pokemon/mon_stats.asm b/engine/pokemon/mon_stats.asm index e32bf7160..418ca8554 100644 --- a/engine/pokemon/mon_stats.asm +++ b/engine/pokemon/mon_stats.asm @@ -323,7 +323,7 @@ ListMovePP: jr nz, .load_loop ret -Unreferenced_Function50cd0: +Function50cd0: ; unreferenced .loop ld [hl], $32 ; typo for P? inc hl diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index 3a150c434..e7fc4f8b2 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -446,7 +446,7 @@ StatsScreen_InitUpperHalf: dw sBoxMonNicknames dw wBufferMonNick -Unreferenced_Function4df7f: +Function4df7f: ; unreferenced hlcoord 7, 0 ld bc, SCREEN_WIDTH ld d, SCREEN_HEIGHT @@ -944,7 +944,7 @@ StatsScreen_LoadTextboxSpaceGFX: pop hl ret -Unreferenced_StatsScreenSpaceGFX: +StatsScreenSpaceGFX: ; unreferenced INCBIN "gfx/font/space.2bpp" EggStatsScreen: diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index 1cba451e7..19888ee9a 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -575,7 +575,7 @@ PlacePrinterStatusString: ld [wPrinterStatus], a ret -Unreferenced_Function847bd: +Function847bd: ; unreferenced ld a, [wPrinterStatus] and a ret z diff --git a/engine/rtc/print_hours_mins.asm b/engine/rtc/print_hours_mins.asm index 6dd8daf18..2cc6cc326 100644 --- a/engine/rtc/print_hours_mins.asm +++ b/engine/rtc/print_hours_mins.asm @@ -1,4 +1,4 @@ -Unreferenced_Function1dd6a9: +Function1dd6a9: ; unreferenced ld a, b ld b, c ld c, a diff --git a/engine/rtc/restart_clock.asm b/engine/rtc/restart_clock.asm index 5dc987189..15b1fd135 100644 --- a/engine/rtc/restart_clock.asm +++ b/engine/rtc/restart_clock.asm @@ -206,8 +206,7 @@ RestartClock: ld [wBuffer2], a ret -.unreferenced -; unused +.UnusedPlaceCharsFragment: ; unreferenced ld a, [wBuffer3] ld b, a call Coord2Tile @@ -227,10 +226,8 @@ RestartClock: ld [hl], e ret -UnreferencedString_HourJP: -; unused +JPHourString: ; unreferenced db "じ@" ; HR -UnreferencedString_MinuteJP: -; unused +JPMinuteString: ; unreferenced db "ふん@" ; MIN diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index eb39adb76..d4d7a1ef3 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -1,4 +1,4 @@ -Unreferenced_StopRTC: +StopRTC: ; unreferenced ld a, SRAM_ENABLE ld [MBC3SRamEnable], a call LatchClock @@ -54,7 +54,7 @@ TimesOfDay: db MAX_HOUR, NITE_F db -1, MORN_F -Unreferenced_1404e: +BetaTimesOfDay: ; unreferenced db 20, NITE_F db 40, MORN_F db 60, DAY_F diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 5b12aec1f..c511827b0 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -196,7 +196,7 @@ DisplayHourOClock: pop hl ret -UnreferencedFunction907f1: +Function907f1: ; unreferenced ld h, d ld l, e push hl @@ -593,7 +593,7 @@ InitialClearDSTFlag: text_far _TimeAskOkayText text_end -Unreferenced_MrChrono: +MrChrono: ; unreferenced hlcoord 1, 14 lb bc, 3, SCREEN_WIDTH - 2 call ClearBox |