summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_5c.asm28
-rw-r--r--misc/mobile_40.asm2
-rwxr-xr-xmisc/mobile_41.asm42
-rw-r--r--misc/mobile_45.asm4
-rwxr-xr-xmisc/mobile_46.asm16
-rw-r--r--misc/mobile_5f.asm2
-rwxr-xr-xmisc/mobile_menu.asm4
-rw-r--r--misc/unused_title.asm3
8 files changed, 40 insertions, 61 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index 4d996167f..ee14c2778 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -952,9 +952,9 @@ BattleTowerAction: ; 170687
.dw ; 170696 (5c:4696)
- dw Function17075f ; 0x00
- dw Function170788 ; 0x01
- dw Function170778 ; 0x02
+ dw BattleTowerAction_CheckExplanationRead ; 0x00
+ dw BattleTowerAction_SetExplanationRead ; 0x01
+ dw BattleTowerAction_GetChallengeState ; 0x02
dw BattleTowerAction_SetByteToQuickSaveChallenge ; 0x03
dw BattleTowerAction_SetByteToCancelChallenge ; 0x04
dw Function1707ac ; 0x05
@@ -966,7 +966,7 @@ BattleTowerAction: ; 170687
dw CheckMobileEventIndex ; 0x0b
dw Function1708c8 ; 0x0c
dw Function1708f0 ; 0x0d
- dw Function17093c ; 0x0e
+ dw BattleTowerAction_EggTicket ; 0x0e
dw Function1709aa ; 0x0f
dw Function1709bb ; 0x10
dw Function170a9c ; 0x11
@@ -976,8 +976,8 @@ BattleTowerAction: ; 170687
dw Function170ad7 ; 0x15
dw Function170807 ; 0x16
dw Function17081d ; 0x17
- dw Function170ae8 ; 0x18
- dw Function170b16 ; 0x19
+ dw BattleTowerAction_LevelCheck ; 0x18
+ dw BattleTowerAction_UbersCheck ; 0x19
dw ResetBattleTowerTrainersSRAM ; 0x1a
dw BattleTower_GiveReward ; 0x1b
dw Function17071b ; 0x1c
@@ -1073,7 +1073,7 @@ BattleTower_RandomlyChooseReward: ; 17073e (5c:473e) BattleTowerAction $1e
call CloseSRAM
ret
-Function17075f: ; 17075f (5c:475f) BattleTowerAction $00
+BattleTowerAction_CheckExplanationRead: ; 17075f (5c:475f) BattleTowerAction $00
call BattleTower_CheckSaveFileExistsAndIsYours
ld a, [ScriptVar]
and a
@@ -1087,7 +1087,7 @@ Function17075f: ; 17075f (5c:475f) BattleTowerAction $00
call CloseSRAM
ret
-Function170778: ; 170778 (5c:4778) BattleTowerAction $02
+BattleTowerAction_GetChallengeState: ; 170778 (5c:4778) BattleTowerAction $02
ld hl, sBattleTowerChallengeState
ld a, BANK(sBattleTowerChallengeState)
call GetSRAMBank
@@ -1096,7 +1096,7 @@ Function170778: ; 170778 (5c:4778) BattleTowerAction $02
call CloseSRAM
ret
-Function170788: ; 170788 (5c:4788) BattleTowerAction $01
+BattleTowerAction_SetExplanationRead: ; 170788 (5c:4788) BattleTowerAction $01
ld a, BANK(s1_be4f)
call GetSRAMBank
ld a, [s1_be4f]
@@ -1344,7 +1344,7 @@ Function170923: ; 170923
; 17093c
-Function17093c: ; 17093c (5c:493c) BattleTowerAction $0e
+BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e
xor a
ld [ScriptVar], a
ld a, EGG_TICKET
@@ -1600,7 +1600,7 @@ Function170ad7: ; 170ad7 (5c:4ad7) BattleTowerAction $15
call CloseSRAM
ret
-Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18
+BattleTowerAction_LevelCheck: ; 170ae8 (5c:4ae8) BattleTowerAction $18
ld a, $5
call GetSRAMBank
ld a, [$b2fb]
@@ -1611,7 +1611,7 @@ Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18
ld [wcd4f], a
xor a
ld [ScriptVar], a
- callba Function119d93 ; level check
+ callba BattleTower_LevelCheck ; level check
ret nc
ld a, $5
call GetSRAMBank
@@ -1620,7 +1620,7 @@ Function170ae8: ; 170ae8 (5c:4ae8) BattleTowerAction $18
ld [ScriptVar], a
ret
-Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19
+BattleTowerAction_UbersCheck: ; 170b16 (5c:4b16) BattleTowerAction $19
ld a, $5
call GetSRAMBank
ld a, [$b2fb]
@@ -1631,7 +1631,7 @@ Function170b16: ; 170b16 (5c:4b16) BattleTowerAction $19
ld [wcd4f], a
xor a
ld [ScriptVar], a
- callba Function119dd1 ; ubers check
+ callba BattleTower_UbersCheck
ret nc
ld a, $5
call GetSRAMBank
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 9bece8265..33dbdb091 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -4084,7 +4084,7 @@ StartMobileBattle: ; 101a21
Function101a4f: ; 101a4f
ld a, 1
ld [wDisableTextAcceleration], a
- callba DetermineMobileBattleResult
+ callba DisplayLinkBattleResult
xor a
ld [wDisableTextAcceleration], a
callba CleanUpBattleRAM
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index 169107978..37e10a01e 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -5,7 +5,7 @@ SECTION "bank41_2", ROMX
; Copies certain values at the time the player enters the Hall of Fame.
TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
- ld a, $5
+ ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
ld hl, GameTimeHours
@@ -36,7 +36,7 @@ TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
; 105f33
TrainerRankings_MagikarpLength: mobile ; 105f33
- ld a, $5
+ ld a, BANK(sTrainerRankingLongestMagikarp)
call GetSRAMBank
ld de, Buffer1
ld hl, sTrainerRankingLongestMagikarp
@@ -104,7 +104,7 @@ TrainerRankings_MagikarpLength: mobile ; 105f33
; 105f79
TrainerRankings_BugContestScore: mobile ; 105f79
- ld a, $5
+ ld a, BANK(sTrainerRankingBugContestScore)
call GetSRAMBank
ld a, [hProduct]
ld hl, sTrainerRankingBugContestScore
@@ -133,7 +133,7 @@ TrainerRankings_BugContestScore: mobile ; 105f79
; 105f9f
TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
- ld a, $5
+ ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
; Increment the current streak
@@ -173,7 +173,7 @@ TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
; 105fd0
TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
- ld a, $5
+ ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
ld hl, sTrainerRankingCurrentSlotsStreak
xor a
@@ -185,7 +185,7 @@ TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
; 105fe3
TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
- ld a, $5
+ ld a, BANK(sTrainerRankingTotalSlotsPayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalSlotsPayouts + 3
ld a, e
@@ -213,7 +213,7 @@ TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
; 106008
TrainerRankings_AddToBattlePayouts: mobile ; 106008
- ld a, $5
+ ld a, BANK(sTrainerRankingTotalBattlePayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalBattlePayouts + 3
ld a, [bc]
@@ -381,13 +381,13 @@ TrainerRankings_ColosseumDraws: mobile ; draw
jr TrainerRankings_Increment3Byte
; 10610d
-; Counts uses of both SelfDestruct and Explosion.
-TrainerRankings_SelfDestruct: mobile ; 10610d
+; Counts uses of both Selfdestruct and Explosion.
+TrainerRankings_Selfdestruct: mobile ; 10610d
; Only counts if it’s the player’s turn
ld a, [hBattleTurn]
and a
ret nz
- ld hl, sTrainerRankingSelfDestruct
+ ld hl, sTrainerRankingSelfdestruct
jr TrainerRankings_Increment3Byte
; 106117
@@ -416,7 +416,7 @@ TrainerRankings_Increment1Byte: ; 106129
; Increments a big-endian value of bc + 1 bytes at hl
TrainerRankings_Increment: ; 10612d
- ld a, $5
+ ld a, BANK(sTrainerRankings)
call GetSRAMBank
push hl
push de
@@ -453,7 +453,7 @@ TrainerRankings_Increment: ; 10612d
; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
UpdateTrainerRankingsChecksum2: mobile ; 106155
- ld a, $5
+ ld a, BANK(sTrainerRankings)
call GetSRAMBank
call UpdateTrainerRankingsChecksum
call CloseSRAM
@@ -1113,21 +1113,3 @@ Function10650a: ; 10650a
GFX_106514:
INCBIN "gfx/unknown/106514.2bpp"
-
-
-LoadOverworldFont:: ; 106594
- ld de, .font
- ld hl, VTiles1
- lb bc, BANK(.font), $80
- call Get2bpp
- ld de, .space
- ld hl, VTiles2 tile $7f
- lb bc, BANK(.space), 1
- call Get2bpp
- ret
-; 1065ad
-
-.font
-INCBIN "gfx/unknown/1065ad.2bpp"
-.space
-INCBIN "gfx/unknown/106dad.2bpp"
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index d871b5006..0bfc7da38 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -7249,13 +7249,13 @@ Function117942: ; 117942 (45:7942)
call PlaceString
ld a, $1e
ld [wcd4e], a
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld a, [wcd4f]
ld [sMobileLoginPassword], a
ld hl, $c708
ld de, sMobileLoginPassword + 1
- ld bc, LOGIN_PASSWORD_LENGTH
+ ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call CopyBytes
call CloseSRAM
ld a, [wcd4f]
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 7a76927cf..9d8196888 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -1320,9 +1320,9 @@ Function118982:
ld a, [wcd38]
and a
jr nz, .asm_118a30
- call Function119d93
+ call BattleTower_LevelCheck
ret c
- call Function119dd1
+ call BattleTower_UbersCheck
ret c
.asm_118a30
@@ -3991,7 +3991,7 @@ String_119d8c:
db "CANCEL@"
; 119d93
-Function119d93: ; 119d93 (46:5d93)
+BattleTower_LevelCheck: ; 119d93 (46:5d93)
ld a, [rSVBK]
push af
ld a, $1
@@ -4035,7 +4035,7 @@ Function119d93: ; 119d93 (46:5d93)
scf
ret
-Function119dd1: ; 119dd1 (46:5dd1)
+BattleTower_UbersCheck: ; 119dd1 (46:5dd1)
ld a, [rSVBK]
push af
ld a, [wcd4f]
@@ -4224,10 +4224,10 @@ Function119eb4: ; 119eb4 (46:5eb4)
ret
Function119ec2: ; 119ec2 (46:5ec2)
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
- ld [sMobileLoginPassword + LOGIN_PASSWORD_LENGTH], a
+ ld [sMobileLoginPassword + MOBILE_LOGIN_PASSWORD_LENGTH], a
ld de, sMobileLoginPassword + 1
.loop
ld a, [de]
@@ -4395,7 +4395,7 @@ Function119f98: ; 119f98
; 11a00e
Function11a00e: ; 11a00e
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld a, [sMobileLoginPassword]
and a
@@ -4404,7 +4404,7 @@ Function11a00e: ; 11a00e
call CloseSRAM
and a
ret nz
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
ld [sMobileLoginPassword], a
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index fdb5ca8b4..e94a51ad8 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -4688,7 +4688,7 @@ Function17f555: ; 17f555
ret nz
.asm_17f5a1
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
xor a
ld [sMobileLoginPassword], a
diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm
index 84e592fcc..518ad9a25 100755
--- a/misc/mobile_menu.asm
+++ b/misc/mobile_menu.asm
@@ -441,11 +441,11 @@ Function4a28a: ; 4a28a (12:628a)
ld a, [wMenuCursorY]
cp $2
jr z, .dont_delete_password
- ld a, $5
+ ld a, BANK(sMobileLoginPassword)
call GetSRAMBank
ld hl, sMobileLoginPassword
xor a
- ld bc, LOGIN_PASSWORD_LENGTH
+ ld bc, MOBILE_LOGIN_PASSWORD_LENGTH
call ByteFill
call CloseSRAM
ld hl, UnknownText_0x4a35d
diff --git a/misc/unused_title.asm b/misc/unused_title.asm
index 92ac409b1..6cd79237b 100644
--- a/misc/unused_title.asm
+++ b/misc/unused_title.asm
@@ -1,6 +1,3 @@
-
-SECTION "bank43", ROMX
-
UnusedTitleScreen: ; 10c000
call ClearBGPalettes
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 17:18:12 +0000