ref: 156f2cc3ef66ccaf21bfe1c8a5066928e772ffac
parent: e32cf1bfd1dd39b72ee672f3815986cc8b1a9406
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Mon May 18 07:59:48 EDT 2020
Update some routine labels, including unreferenced ones
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
@@ -225,7 +225,7 @@
ld de, .gfx
ld hl, vTiles0 tile $31
lb bc, BANK(LoadBallIconGFX), 4
- call Get2bpp_2
+ call Get2bppViaHDMA
ret
.gfx
--- a/engine/gfx/load_font.asm
+++ b/engine/gfx/load_font.asm
@@ -8,13 +8,13 @@
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,19 +29,19 @@
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::
@@ -48,15 +48,15 @@
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 ; "<BOLD_D>"
ld hl, vTiles2 tile "<BOLD_D>"
lb bc, BANK(FontExtra), 22 ; "<BOLD_D>" to "ぉ"
- call Get2bpp_2
+ call Get2bppViaHDMA
jr LoadFrame
_LoadFontsExtra2::
@@ -64,7 +64,7 @@
ld hl, vTiles2 tile "▲" ; $61
ld b, BANK(FontsExtra2_UpArrowGFX)
ld c, 1
- call Get2bpp_2
+ call Get2bppViaHDMA
ret
_LoadFontsBattleExtra::
@@ -71,7 +71,7 @@
ld de, FontBattleExtra
ld hl, vTiles2 tile $60
lb bc, BANK(FontBattleExtra), 25
- call Get2bpp_2
+ call Get2bppViaHDMA
jr LoadFrame
LoadFrame:
@@ -84,11 +84,11 @@
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:
@@ -95,11 +95,11 @@
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 ; "<DO>"
lb bc, BANK(FontBattleExtra), 3 ; "<DO>" to "『"
- call Get2bpp_2
+ call Get2bppViaHDMA
call LoadFrame
LoadHPBar:
@@ -106,19 +106,19 @@
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 @@
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
--- a/engine/gfx/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
@@ -347,7 +347,7 @@
ld a, [wLinkMode]
cp LINK_MOBILE
jp nz, Request2bpp
- jp Get2bpp_2
+ jp Get2bppViaHDMA
FreezeMonIcons:
ld hl, wSpriteAnimationStructs
--- 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 @@
ret
-Get1bpp_2::
+Get1bppViaHDMA::
ldh a, [rLCDC]
bit rLCDC_ENABLE, a
jp z, Copy1bpp
@@ -31,7 +31,7 @@
rst Bankswitch
ret
-OldDMATransfer:
+UnreferencedOldDMATransfer:
dec c
ldh a, [hBGMapMode]
push af
--- a/home/map_objects.asm
+++ b/home/map_objects.asm
@@ -574,12 +574,12 @@
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
--- a/home/math.asm
+++ b/home/math.asm
@@ -48,8 +48,8 @@
pop hl
ret
-SubtractSigned::
-; Return a - b, sign in carry.
+UnreferencedSubtractAbsolute::
+; Return |a - b|, sign in carry.
sub b
ret nc
cpl
--- a/home/menu.asm
+++ b/home/menu.asm
@@ -417,7 +417,7 @@
PlaceYesNoBox::
jr _YesNoBox
-PlaceGenericTwoOptionBox::
+UnreferencedPlaceGenericTwoOptionBox::
call LoadMenuHeader
jr InterpretTwoOptionMenu
--- a/home/text.asm
+++ b/home/text.asm
@@ -128,7 +128,7 @@
ld c, TEXTBOX_INNERW
jp Textbox
-TestText::
+UnreferencedTestText::
text "ゲームフりーク！"
done
--- a/home/time.asm
+++ b/home/time.asm
@@ -256,7 +256,7 @@
call CloseSRAM ; unlatch clock, disable clock r/w
ret
-ClearRTCStatus::
+UnreferencedClearRTCStatus::
; clear sRTCStatusFlags
xor a
push af
--- a/home/trainers.asm
+++ b/home/trainers.asm
@@ -203,7 +203,7 @@
and a
ret
-CheckTrainerFlag::
+UnreferencedCheckTrainerFlag::
push bc
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, bc
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -1374,7 +1374,7 @@
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