From 156f2cc3ef66ccaf21bfe1c8a5066928e772ffac Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 18 May 2020 11:59:48 -0400 Subject: [PATCH] Update some routine labels, including unreferenced ones --- engine/battle/trainer_huds.asm | 2 +- engine/gfx/load_font.asm | 48 +++++++++++++++++----------------- engine/gfx/mon_icons.asm | 2 +- home/gfx.asm | 6 ++--- home/map_objects.asm | 4 +-- home/math.asm | 4 +-- home/menu.asm | 2 +- home/text.asm | 2 +- home/time.asm | 2 +- home/trainers.asm | 2 +- mobile/mobile_42.asm | 2 +- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm index bc55c7423..f701a4dfc 100644 --- a/engine/battle/trainer_huds.asm +++ b/engine/battle/trainer_huds.asm @@ -225,7 +225,7 @@ LoadBallIconGFX: ld de, .gfx ld hl, vTiles0 tile $31 lb bc, BANK(LoadBallIconGFX), 4 - call Get2bpp_2 + call Get2bppViaHDMA ret .gfx diff --git a/engine/gfx/load_font.asm b/engine/gfx/load_font.asm index db24dced1..bd5e29d52 100644 --- a/engine/gfx/load_font.asm +++ b/engine/gfx/load_font.asm @@ -8,13 +8,13 @@ Unreferenced_fb434: Unreferenced_Functionfb435: ld a, [Unreferenced_fb434] and a - jp nz, Get1bpp_2 + jp nz, Get1bppViaHDMA jp Get1bpp Unreferenced_Functionfb43f: ld a, [Unreferenced_fb434] and a - jp nz, Get2bpp_2 + jp nz, Get2bppViaHDMA jp Get2bpp ; End unreferenced block @@ -29,34 +29,34 @@ _LoadStandardFont:: ld de, Font ld hl, vTiles1 lb bc, BANK(Font), 32 ; "A" to "]" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 32 * LEN_1BPP_TILE ld hl, vTiles1 tile $20 lb bc, BANK(Font), 32 ; "a" to $bf - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 64 * LEN_1BPP_TILE ld hl, vTiles1 tile $40 lb bc, BANK(Font), 32 ; "Ä" to "←" - call Get1bpp_2 + call Get1bppViaHDMA ld de, Font + 96 * LEN_1BPP_TILE ld hl, vTiles1 tile $60 lb bc, BANK(Font), 32 ; "'" to "9" - call Get1bpp_2 + call Get1bppViaHDMA ret _LoadFontsExtra1:: ld de, FontsExtra_SolidBlackGFX ld hl, vTiles2 tile "■" ; $60 lb bc, BANK(FontsExtra_SolidBlackGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ld de, PokegearPhoneIconGFX ld hl, vTiles2 tile "☎" ; $62 lb bc, BANK(PokegearPhoneIconGFX), 1 - call Get2bpp_2 + call Get2bppViaHDMA ld de, FontExtra + 3 tiles ; "" ld hl, vTiles2 tile "" lb bc, BANK(FontExtra), 22 ; "" to "ぉ" - call Get2bpp_2 + call Get2bppViaHDMA jr LoadFrame _LoadFontsExtra2:: @@ -64,14 +64,14 @@ _LoadFontsExtra2:: ld hl, vTiles2 tile "▲" ; $61 ld b, BANK(FontsExtra2_UpArrowGFX) ld c, 1 - call Get2bpp_2 + call Get2bppViaHDMA ret _LoadFontsBattleExtra:: ld de, FontBattleExtra ld hl, vTiles2 tile $60 lb bc, BANK(FontBattleExtra), 25 - call Get2bpp_2 + call Get2bppViaHDMA jr LoadFrame LoadFrame: @@ -84,41 +84,41 @@ LoadFrame: ld e, l ld hl, vTiles2 tile "┌" ; $79 lb bc, BANK(Frames), 6 ; "┌" to "┘" - call Get1bpp_2 + call Get1bppViaHDMA ld hl, vTiles2 tile " " ; $7f ld de, TextboxSpaceGFX lb bc, BANK(TextboxSpaceGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ret LoadBattleFontsHPBar: ld de, FontBattleExtra ld hl, vTiles2 tile $60 lb bc, BANK(FontBattleExtra), 12 - call Get2bpp_2 + call Get2bppViaHDMA ld hl, vTiles2 tile $70 ld de, FontBattleExtra + 16 tiles ; "" lb bc, BANK(FontBattleExtra), 3 ; "" to "『" - call Get2bpp_2 + call Get2bppViaHDMA call LoadFrame LoadHPBar: ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX ld hl, vTiles2 tile $73 lb bc, BANK(HPExpBarBorderGFX), 6 - call Get1bpp_2 + call Get1bppViaHDMA ld de, ExpBarGFX ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 9 - call Get2bpp_2 + call Get2bppViaHDMA ld de, MobilePhoneTilesGFX + 7 tiles ; mobile phone icon ld hl, vTiles2 tile $5e lb bc, BANK(MobilePhoneTilesGFX), 2 - call Get2bpp_2 + call Get2bppViaHDMA ret StatsScreen_LoadFont: @@ -126,22 +126,22 @@ StatsScreen_LoadFont: ld de, EnemyHPBarBorderGFX ld hl, vTiles2 tile $6c lb bc, BANK(EnemyHPBarBorderGFX), 4 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX ld hl, vTiles2 tile $78 lb bc, BANK(HPExpBarBorderGFX), 1 - call Get1bpp_2 + call Get1bppViaHDMA ld de, HPExpBarBorderGFX + 3 * LEN_1BPP_TILE ld hl, vTiles2 tile $76 lb bc, BANK(HPExpBarBorderGFX), 2 - call Get1bpp_2 + call Get1bppViaHDMA ld de, ExpBarGFX ld hl, vTiles2 tile $55 lb bc, BANK(ExpBarGFX), 8 - call Get2bpp_2 + call Get2bppViaHDMA LoadStatsScreenPageTilesGFX: ld de, StatsScreenPageTilesGFX ld hl, vTiles2 tile $31 lb bc, BANK(StatsScreenPageTilesGFX), 17 - call Get2bpp_2 + call Get2bppViaHDMA ret diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index ac25712d1..68e9b1b84 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -347,7 +347,7 @@ GetGFXUnlessMobile: ld a, [wLinkMode] cp LINK_MOBILE jp nz, Request2bpp - jp Get2bpp_2 + jp Get2bppViaHDMA FreezeMonIcons: ld hl, wSpriteAnimationStructs diff --git a/home/gfx.asm b/home/gfx.asm index 71281e872..8ae2c759c 100644 --- a/home/gfx.asm +++ b/home/gfx.asm @@ -1,6 +1,6 @@ ; Functions to copy data from ROM. -Get2bpp_2:: +Get2bppViaHDMA:: ldh a, [rLCDC] bit rLCDC_ENABLE, a jp z, Copy2bpp @@ -9,7 +9,7 @@ Get2bpp_2:: ret -Get1bpp_2:: +Get1bppViaHDMA:: ldh a, [rLCDC] bit rLCDC_ENABLE, a jp z, Copy1bpp @@ -31,7 +31,7 @@ FarCopyBytesDouble_DoubleBankSwitch:: rst Bankswitch ret -OldDMATransfer: +UnreferencedOldDMATransfer: dec c ldh a, [hBGMapMode] push af diff --git a/home/map_objects.asm b/home/map_objects.asm index 64e21e546..667658f0c 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -574,12 +574,12 @@ _GetMovementByte:: ld a, h ret -SetVramState_Bit0:: +UnreferencedSetVramState_Bit0:: ld hl, wVramState set 0, [hl] ret -ResetVramState_Bit0:: +UnreferencedResetVramState_Bit0:: ld hl, wVramState res 0, [hl] ret diff --git a/home/math.asm b/home/math.asm index 3042cc61d..c99214cce 100644 --- a/home/math.asm +++ b/home/math.asm @@ -48,8 +48,8 @@ Divide:: pop hl ret -SubtractSigned:: -; Return a - b, sign in carry. +UnreferencedSubtractAbsolute:: +; Return |a - b|, sign in carry. sub b ret nc cpl diff --git a/home/menu.asm b/home/menu.asm index 12dfc67af..07ce54d48 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -417,7 +417,7 @@ YesNoBox:: PlaceYesNoBox:: jr _YesNoBox -PlaceGenericTwoOptionBox:: +UnreferencedPlaceGenericTwoOptionBox:: call LoadMenuHeader jr InterpretTwoOptionMenu diff --git a/home/text.asm b/home/text.asm index 102209624..abbf12c41 100644 --- a/home/text.asm +++ b/home/text.asm @@ -128,7 +128,7 @@ SpeechTextbox:: ld c, TEXTBOX_INNERW jp Textbox -TestText:: +UnreferencedTestText:: text "ゲームフりーク！" done diff --git a/home/time.asm b/home/time.asm index b708329c5..2a866d6b5 100644 --- a/home/time.asm +++ b/home/time.asm @@ -256,7 +256,7 @@ SetClock:: call CloseSRAM ; unlatch clock, disable clock r/w ret -ClearRTCStatus:: +UnreferencedClearRTCStatus:: ; clear sRTCStatusFlags xor a push af diff --git a/home/trainers.asm b/home/trainers.asm index e9971be3f..00ae5dbcd 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -203,7 +203,7 @@ FacingPlayerDistance:: and a ret -CheckTrainerFlag:: +UnreferencedCheckTrainerFlag:: push bc ld hl, OBJECT_MAP_OBJECT_INDEX add hl, bc diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 5f4b62e5f..fbf6bed02 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1374,7 +1374,7 @@ Function108ad4: ldh [rVBK], a ld hl, vTiles2 tile $4a lb bc, BANK(MobileCable1GFX), 16 ; aka BANK(MobileCable2GFX) - call Get2bpp_2 + call Get2bppViaHDMA call DelayFrame ld a, $0 ldh [rVBK], a