summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
Diffstat (limited to 'misc')
-rwxr-xr-xmisc/battle_tower_5c.asm10
-rwxr-xr-xmisc/fixed_words.asm2
-rw-r--r--misc/gbc_only.asm2
-rwxr-xr-xmisc/gfx_41.asm2
-rw-r--r--misc/mobile_40.asm2
-rwxr-xr-xmisc/mobile_41.asm431
-rw-r--r--misc/mobile_42.asm2
-rw-r--r--misc/mobile_45.asm8
-rwxr-xr-xmisc/mobile_45_sprite_engine.asm2
-rwxr-xr-xmisc/mobile_46.asm2
-rwxr-xr-xmisc/mobile_5c.asm2
-rw-r--r--misc/mobile_5f.asm6
12 files changed, 253 insertions, 218 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm
index da14a5ac8..4d996167f 100755
--- a/misc/battle_tower_5c.asm
+++ b/misc/battle_tower_5c.asm
@@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 170249
.dw ; 170249
@@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d
xor a
ld [wLinkMode], a
- callba Mobile_HealParty
+ callba TrainerRankings_Healings
callba HealParty
call ReadBTTrainerParty
call Clears5_a89a
@@ -692,7 +692,7 @@ Function1704e1: ; 1704e1
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 17051f
.dw ; 17051f
@@ -947,7 +947,7 @@ BattleTowerAction: ; 170687
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 170696
@@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.invalid
ld a, $5
diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm
index 14ef91e9d..b471ff013 100755
--- a/misc/fixed_words.asm
+++ b/misc/fixed_words.asm
@@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable:
dw .zero
diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm
index cae976a1c..f4b3eba8b 100644
--- a/misc/gbc_only.asm
+++ b/misc/gbc_only.asm
@@ -145,5 +145,5 @@ GBCOnlyString: ; 4eb38
GBCOnlyGFX: ; 4eb76
-INCBIN "gfx/misc/gbc_only.w112.2bpp.lz"
+INCBIN "gfx/misc/gbc_only.2bpp.lz"
; 4f0bc
diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm
index e3a1a0375..952742ec1 100755
--- a/misc/gfx_41.asm
+++ b/misc/gfx_41.asm
@@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177
; 10419c
._hl_ ; 10419c
- jp [hl]
+ jp hl
; 10419d
diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm
index 54160ca08..3c7a34710 100644
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -5452,7 +5452,7 @@ Function102423: ; 102423
call Function102921
ret nc
callba SaveAfterLinkTrade
- callba MobileFn_1060af
+ callba TrainerRankings_Trades
callba BackupMobileEventIndex
ld hl, wcd4b
set 1, [hl]
diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm
index b68336a28..ff661b1bc 100755
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -1,50 +1,63 @@
SECTION "bank41_2", ROMX, BANK[$41]
-Mobile_HallOfFame2:: mobile ; 0x105ef6
+; These functions deal with miscellaneous statistics
+; which were used for Trainer Rankings in Pokémon News.
+
+; Copies certain values at the time the player enters the Hall of Fame.
+TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
ld a, $5
call GetSRAMBank
+
ld hl, GameTimeHours
- ld de, $a001
+ ld de, sTrainerRankingGameTimeHOF
ld bc, 4
call CopyBytes
- ld hl, $a010
- ld de, $a005
+
+ ld hl, sTrainerRankingStepCount
+ ld de, sTrainerRankingStepCountHOF
ld bc, 4
call CopyBytes
- ld hl, $a039
- ld de, $a009
+
+ ; sTrainerRankingHealings is only a 3-byte value.
+ ; One extraneous byte is copied from sTrainerRankingMysteryGift.
+ ld hl, sTrainerRankingHealings
+ ld de, sTrainerRankingHealingsHOF
ld bc, 4
call CopyBytes
- ld hl, $a01b
- ld de, $a00d
+
+ ld hl, sTrainerRankingBattles
+ ld de, sTrainerRankingBattlesHOF
ld bc, 3
call CopyBytes
- call Function106162
+
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 105f33
-MagikarpLength_Mobile: mobile ; 105f33
+TrainerRankings_MagikarpLength: mobile ; 105f33
ld a, $5
call GetSRAMBank
ld de, Buffer1
- ld hl, $a07b
+ ld hl, sTrainerRankingLongestMagikarp
+
+ ; Is this Magikarp the longest measured?
ld a, [de]
cp [hl]
- jr z, .asm_105f47
- jr nc, .asm_105f4f
- jr .asm_105f55
+ jr z, .isLowByteHigher
+ jr nc, .newRecordLongest
+ jr .checkShortest
-.asm_105f47
+.isLowByteHigher
inc hl
inc de
ld a, [de]
cp [hl]
dec hl
dec de
- jr c, .asm_105f55
+ jr c, .checkShortest
-.asm_105f4f
+.newRecordLongest
ld a, [de]
inc de
ld [hli], a
@@ -52,150 +65,157 @@ MagikarpLength_Mobile: mobile ; 105f33
dec de
ld [hl], a
-.asm_105f55
- ld hl, $a07d
+.checkShortest
+ ; First, check if the record for shortest Magikarp is 0.
+ ; This seems unnecessary, because the value is initialized to 100.0 cm.
+ ld hl, sTrainerRankingShortestMagikarp
ld a, [hli]
or [hl]
dec hl
- jr z, .asm_105f6d
+ jr z, .newRecordShortest
+
+ ; Now check if this Magikarp is the shortest
ld a, [de]
cp [hl]
- jr z, .asm_105f65
- jr c, .asm_105f6d
- jr .asm_105f72
+ jr z, .isLowByteLower
+ jr c, .newRecordShortest
+ jr .done
-.asm_105f65
+.isLowByteLower
inc hl
inc de
ld a, [de]
cp [hl]
- jr nc, .asm_105f72
+ jr nc, .done
dec hl
dec de
-.asm_105f6d
+.newRecordShortest
ld a, [de]
inc de
ld [hli], a
ld a, [de]
ld [hl], a
-.asm_105f72
- call Function106162
+.done
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 105f79
-MobileFn_105f79: mobile ; 105f79
+TrainerRankings_BugContestScore: mobile ; 105f79
ld a, $5
call GetSRAMBank
ld a, [hProduct]
- ld hl, $a07f
+ ld hl, sTrainerRankingBugContestScore
cp [hl]
- jr z, .asm_105f8b
- jr nc, .asm_105f92
- jr .asm_105f98
+ jr z, .isLowByteHigher
+ jr nc, .newHighScore
+ jr .done
-.asm_105f8b
+.isLowByteHigher
inc hl
ld a, [hMultiplicand]
cp [hl]
- jr c, .asm_105f98
+ jr c, .done
dec hl
-.asm_105f92
+.newHighScore
ld a, [hProduct]
ld [hli], a
ld a, [hMultiplicand]
ld [hl], a
-.asm_105f98
- call Function106162
+.done
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 105f9f
-MobileFn_105f9f: mobile ; 105f9f
+TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
ld a, $5
call GetSRAMBank
- ld hl, $a070
+
+ ; Increment the current streak
+ ld hl, sTrainerRankingCurrentSlotsStreak + 1
inc [hl]
- jr nz, .asm_105fae
+ jr nz, .noCarry
dec hl
inc [hl]
inc hl
-.asm_105fae
+.noCarry
dec hl
- ld a, [$a071]
+ ; Now check if this is a new record for longest streak
+ ld a, [sTrainerRankingLongestSlotsStreak]
cp [hl]
- jr z, .asm_105fb9
- jr c, .asm_105fc1
- jr .asm_105fc9
+ jr z, .isLowByteHigher
+ jr c, .newRecordStreak
+ jr .done
-.asm_105fb9
+.isLowByteHigher
inc hl
- ld a, [$a072]
+ ld a, [sTrainerRankingLongestSlotsStreak + 1]
cp [hl]
- jr nc, .asm_105fc9
+ jr nc, .done
dec hl
-.asm_105fc1
+.newRecordStreak
ld a, [hli]
- ld [$a071], a
+ ld [sTrainerRankingLongestSlotsStreak], a
ld a, [hl]
- ld [$a072], a
+ ld [sTrainerRankingLongestSlotsStreak + 1], a
-.asm_105fc9
- call Function106162
+.done
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 105fd0
-MobileFn_105fd0: mobile ; 105fd0
+TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
ld a, $5
call GetSRAMBank
- ld hl, $a06f
+ ld hl, sTrainerRankingCurrentSlotsStreak
xor a
ld [hli], a
ld [hl], a
- call Function106162
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 105fe3
-MobileFn_105fe3: mobile ; 105fe3
+TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
ld a, $5
call GetSRAMBank
- ld hl, $a076
+ ld hl, sTrainerRankingTotalSlotsPayouts + 3
ld a, e
add [hl]
ld [hld], a
ld a, d
adc [hl]
ld [hld], a
- jr nc, .asm_106001
+ jr nc, .done
inc [hl]
- jr nz, .asm_106001
+ jr nz, .done
dec hl
inc [hl]
- jr nz, .asm_106001
+ jr nz, .done
ld a, $ff
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
-.asm_106001
- call Function106162
+.done
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 106008
-MobileFn_106008: mobile ; 106008
+TrainerRankings_AddToBattlePayouts: mobile ; 106008
ld a, $5
call GetSRAMBank
- ld hl, $a07a
+ ld hl, sTrainerRankingTotalBattlePayouts + 3
ld a, [bc]
dec bc
add [hl]
@@ -207,189 +227,195 @@ MobileFn_106008: mobile ; 106008
ld a, [bc]
adc [hl]
ld [hld], a
- jr nc, .asm_106027
+ jr nc, .done
inc [hl]
- jr nz, .asm_106027
+ jr nz, .done
ld a, $ff
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
-.asm_106027
- call Function106162
+.done
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 10602e
-MobileFn_10602e: mobile ; 10602e (41:602e)
- ld hl, $a010
- jp MobileFn_106117
+TrainerRankings_StepCount: mobile ; 10602e (41:602e)
+ ld hl, sTrainerRankingStepCount
+ jp TrainerRankings_Increment4Byte
-MobileFn_106035: mobile ; 106035
+; Unreferenced in English version.
+TrainerRankings_BattleTowerWins: mobile ; 106035
ld a, $5
call GetSRAMBank
ld a, [$aa8d]
and a
call CloseSRAM
ret nz
- ld hl, $a014
- jp Function106123
+ ld hl, sTrainerRankingBattleTowerWins
+ jp TrainerRankings_Increment2Byte
-MobileFn_106049: mobile ; 106049
- ld hl, $a018
- jp Function10611d
+TrainerRankings_TMsHMsTaught: mobile ; 106049
+ ld hl, sTrainerRankingTMsHMsTaught
+ jp TrainerRankings_Increment3Byte
-MobileFn_106050: mobile ; 106050
+TrainerRankings_Battles: mobile ; 106050
ld a, [BattleType]
- cp BATTLETYPE_TUTORIAL
+ cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
- ld hl, $a01b
- jp Function10611d
+ ld hl, sTrainerRankingBattles
+ jp TrainerRankings_Increment3Byte
-MobileFn_10605d: mobile ; 10605d
+TrainerRankings_WildBattles: mobile ; 10605d
ld a, [BattleType]
- cp BATTLETYPE_TUTORIAL
+ cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
- ld hl, $a01e
- jp Function10611d
+ ld hl, sTrainerRankingWildBattles
+ jp TrainerRankings_Increment3Byte
-MobileFn_10606a: mobile ; 10606a
- ld hl, $a021
- jp Function10611d
+TrainerRankings_TrainerBattles: mobile ; 10606a
+ ld hl, sTrainerRankingTrainerBattles
+ jp TrainerRankings_Increment3Byte
-MobileFn_106071: mobile ; 106071
- ld hl, $a024
- jp Function10611d
+TrainerRankings_Unused1: mobile ; 106071
+ ld hl, sTrainerRankingUnused1
+ jp TrainerRankings_Increment3Byte
-Mobile_HallOfFame:: mobile ; 0x106078
- ld hl, $a027
- jp Function10611d
+TrainerRankings_HallOfFame:: mobile ; 0x106078
+ ld hl, sTrainerRankingHOFEntries
+ jp TrainerRankings_Increment3Byte
-MobileFn_10607f: mobile ; 10607f (41:607f)
- ld hl, $a02a
- jp Function10611d
+TrainerRankings_WildMonsCaught: mobile ; 10607f (41:607f)
+ ld hl, sTrainerRankingWildMonsCaught
+ jp TrainerRankings_Increment3Byte
-MobileFn_106086: mobile ; 106086
- ld hl, $a02d
- jp Function10611d
+TrainerRankings_HookedEncounters: mobile ; 106086
+ ld hl, sTrainerRankingHookedEncounters
+ jp TrainerRankings_Increment3Byte
-MobileFn_10608d: mobile ; 10608d (41:608d)
- ld hl, $a030
- jp Function10611d
+TrainerRankings_EggsHatched: mobile ; 10608d (41:608d)
+ ld hl, sTrainerRankingEggsHatched
+ jp TrainerRankings_Increment3Byte
-MobileFn_106094: mobile ; 106094
- ld hl, $a033
- jp Function10611d
+TrainerRankings_MonsEvolved: mobile ; 106094
+ ld hl, sTrainerRankingMonsEvolved
+ jp TrainerRankings_Increment3Byte
-MobileFn_10609b: mobile ; 10609b
- ld hl, $a036
- jp Function10611d
+TrainerRankings_FruitPicked: mobile ; 10609b
+ ld hl, sTrainerRankingFruitPicked
+ jp TrainerRankings_Increment3Byte
-Mobile_HealParty: mobile ; 1060a2
- ld hl, $a039
- jp Function10611d
+TrainerRankings_Healings: mobile ; 1060a2
+ ld hl, sTrainerRankingHealings
+ jp TrainerRankings_Increment3Byte
-MobileFn_1060a9: mobile ; 1060a9 (41:60a9)
- ld hl, $a03c
- jr Function10611d
+TrainerRankings_MysteryGift: mobile ; 1060a9 (41:60a9)
+ ld hl, sTrainerRankingMysteryGift
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060af: mobile ; 1060af
- ld hl, $a03f
- jr Function10611d
+TrainerRankings_Trades: mobile ; 1060af
+ ld hl, sTrainerRankingTrades
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060b5: mobile ; 1060b5
- ld hl, $a042
- jr Function10611d
+TrainerRankings_Fly: mobile ; 1060b5
+ ld hl, sTrainerRankingFly
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060bb: mobile ; 1060bb
- ld hl, $a045
- jr Function10611d
+TrainerRankings_Surf: mobile ; 1060bb
+ ld hl, sTrainerRankingSurf
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060c1: mobile ; 1060c1
- ld hl, $a048
- jr Function10611d
+TrainerRankings_Waterfall: mobile ; 1060c1
+ ld hl, sTrainerRankingWaterfall
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060c7: mobile ; 1060c7
- ld hl, $a04b
- jr Function10611d
+TrainerRankings_WhiteOuts: mobile ; 1060c7
+ ld hl, sTrainerRankingWhiteOuts
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060cd: mobile ; 1060cd
- ld hl, $a04e
- jr Function106123
+TrainerRankings_LuckyNumberShow: mobile ; 1060cd
+ ld hl, sTrainerRankingLuckyNumberShow
+ jr TrainerRankings_Increment2Byte
-MobileFn_1060d3: mobile ; 1060d3
- ld hl, $a051
- jr Function10611d
+TrainerRankings_PhoneCalls: mobile ; 1060d3
+ ld hl, sTrainerRankingPhoneCalls
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060d9: mobile ; 1060df
- ld hl, $a054
- jr Function10611d
+TrainerRankings_Unused2: mobile ; 1060df
+ ld hl, sTrainerRankingUnused2
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060df: mobile ; 1060df
- ld hl, $a057
- jr Function10611d
+TrainerRankings_LinkBattles: mobile ; 1060df
+ ld hl, sTrainerRankingLinkBattles
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060e5: mobile ; 1060e5
+TrainerRankings_Splash: mobile ; 1060e5
+ ; Only counts if it’s the player’s turn
ld a, [hBattleTurn]
and a
ret nz
- ld hl, $a05a
- jr Function10611d
+ ld hl, sTrainerRankingSplash
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060ef: mobile ; 1060ef
- ld hl, $a05d
- jr Function10611d
+TrainerRankings_TreeEncounters: mobile ; 1060ef
+ ld hl, sTrainerRankingTreeEncounters
+ jr TrainerRankings_Increment3Byte
-MobileFn_1060f5: mobile ; 1060f5
- ld hl, $a060
- jr Function10611d
+TrainerRankings_Unused3: mobile ; 1060f5
+ ld hl, sTrainerRankingUnused3
+ jr TrainerRankings_Increment3Byte
-MobileFn_SaveBattleResult_Win: mobile ; win
- ld hl, $a063
- jr Function10611d
+TrainerRankings_ColosseumWins: mobile ; win
+ ld hl, sTrainerRankingColosseumWins
+ jr TrainerRankings_Increment3Byte
-MobileFn_SaveBattleResult_Lose: mobile ; lose
- ld hl, $a066
- jr Function10611d
+TrainerRankings_ColosseumLosses: mobile ; lose
+ ld hl, sTrainerRankingColosseumLosses
+ jr TrainerRankings_Increment3Byte
; 106107
-MobileFn_SaveBattleResult_Draw: mobile ; draw
- ld hl, $a069
- jr Function10611d
+TrainerRankings_ColosseumDraws: mobile ; draw
+ ld hl, sTrainerRankingColosseumDraws
+ jr TrainerRankings_Increment3Byte
; 10610d
-MobileFn_10610d: 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, $a06c
- jr Function10611d
+ ld hl, sTrainerRankingSelfDestruct
+ jr TrainerRankings_Increment3Byte
; 106117
-MobileFn_106117: ; 106117
+TrainerRankings_Increment4Byte: ; 106117
push bc
ld bc, 3
- jr Function10612d
+ jr TrainerRankings_Increment
; 10611d
-Function10611d: ; 10611d
+TrainerRankings_Increment3Byte: ; 10611d
push bc
ld bc, 2
- jr Function10612d
+ jr TrainerRankings_Increment
; 106123
-Function106123: ; 106123
+TrainerRankings_Increment2Byte: ; 106123
push bc
ld bc, 1
- jr Function10612d
+ jr TrainerRankings_Increment
; 106129
-Function106129: ; 106129
+; unused
+TrainerRankings_Increment1Byte: ; 106129
push bc
ld bc, 0
-Function10612d: ; 10612d
+; Increments a big-endian value of bc + 1 bytes at hl
+TrainerRankings_Increment: ; 10612d
ld a, $5
call GetSRAMBank
push hl
@@ -419,24 +445,25 @@ Function10612d: ; 10612d
jr .asm_106142
.asm_10614d
- call Function106162
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
pop bc
ret
; 106155
-MobileFn_106155: mobile ; 106155
+; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
+UpdateTrainerRankingsChecksum2: mobile ; 106155
ld a, $5
call GetSRAMBank
- call Function106162
+ call UpdateTrainerRankingsChecksum
call CloseSRAM
ret
; 106162
-Function106162: ; 106162
+UpdateTrainerRankingsChecksum: ; 106162
push de
- call Function10616e
- ld hl, $a081 ; s5_a081
+ call CalculateTrainerRankingsChecksum
+ ld hl, sTrainerRankingsChecksum
ld [hl], d
inc hl
ld [hl], e
@@ -444,10 +471,10 @@ Function106162: ; 106162
ret
; 10616e
-Function10616e: ; 10616e
+CalculateTrainerRankingsChecksum: ; 10616e
push bc
- ld hl, $a001 ; s5_a001
- ld bc, $80
+ ld hl, sTrainerRankings
+ ld bc, sTrainerRankingsChecksum - sTrainerRankings
xor a
ld de, 0
.asm_106179
@@ -495,9 +522,10 @@ RestoreMobileEventIndex: ; 10619d (41:619d)
ret
; 1061b3 (41:61b3)
-Function1061b3: ; 1061b3
- call Function10616e
- ld hl, $a081 ; s5_a081
+; Unreferenced in English version.
+VerifyTrainerRankingsChecksum: ; 1061b3
+ call CalculateTrainerRankingsChecksum
+ ld hl, sTrainerRankingsChecksum
ld a, d
cp [hl]
ret nz
@@ -516,19 +544,24 @@ DeleteMobileEventIndex: ; 1061c0 (41:61c0)
ret
; 1061cd (41:61cd)
-Function1061cd: ; unreferenced
- ld hl, $a001
- ld bc, $82
+; Used in the Japanese version to initialize Trainer Rankings data
+; for a new save file. Unreferenced in the English version.
+InitializeTrainerRankings:
+ ld hl, sTrainerRankings
+ ld bc, sTrainerRankingsEnd - sTrainerRankings
xor a
call ByteFill
- ld hl, $a07d
+
+ ; Initialize the shortest Magikarp to 100.0 cm
+ ld hl, sTrainerRankingShortestMagikarp
ld a, $3
ld [hli], a
ld [hl], $e8
- call Function106162
- ld hl, $a001
- ld de, $a084
- ld bc, $82
+
+ call UpdateTrainerRankingsChecksum
+ ld hl, sTrainerRankings
+ ld de, sTrainerRankingsBackup
+ ld bc, sTrainerRankingsEnd - sTrainerRankings
call CopyBytes
ret
; 1061ef
@@ -1083,16 +1116,18 @@ INCBIN "gfx/unknown/106514.2bpp"
LoadOverworldFont:: ; 106594
- ld de, .bgfont
+ ld de, .font
ld hl, VTiles1
- lb bc, BANK(.bgfont), $80
+ lb bc, BANK(.font), $80
call Get2bpp
- ld de, .bgfont + $80 tiles
+ ld de, .space
ld hl, VTiles2 tile $7f
- lb bc, BANK(.bgfont), 1
+ lb bc, BANK(.space), 1
call Get2bpp
ret
; 1065ad
-.bgfont
+.font
INCBIN "gfx/unknown/1065ad.2bpp"
+.space
+INCBIN "gfx/unknown/106dad.2bpp"
diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm
index 60f9e6d66..d08bc8882 100644
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 10828a
.Jumptable: ; 10828a
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm
index 10242b77e..41f106211 100644
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -146,7 +146,7 @@ Function114243:: ; 114243
ld h, [hl]
ld l, a
pop de
- jp [hl]
+ jp hl
; 11425c
@@ -5397,7 +5397,7 @@ Function11659d: ; 11659d
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1165af
@@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_117728: ; 117728 (45:7728)
dw Function117738
@@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.Jumptable: ; 0x117af8
dw Function117b06
diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm
index d0183b2ca..57c45e43c 100755
--- a/misc/mobile_45_sprite_engine.asm
+++ b/misc/mobile_45_sprite_engine.asm
@@ -380,7 +380,7 @@ Function1161b8: ; 1161b8
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
; 1161c7
diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm
index 644989872..7d0003b13 100755
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e
ld a, [wJumptableIndex]
ld hl, Jumptable_11ad78
call Function11b239
- jp [hl]
+ jp hl
; 11ad78
Jumptable_11ad78: ; 11ad78
diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm
index b057e8c66..34bdb15ad 100755
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36)
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
Jumptable_171a45: ; 171a45 (5c:5a45)
dw Function171a95
diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm
index dd4dbb6dc..47b85dcd8 100644
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -1146,7 +1146,7 @@ Function17d711:
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
asm_17d721
call Function17e5af
@@ -3098,7 +3098,7 @@ Function17e3c3: ; 17e3c3
push af
ld a, $1
ld [rSVBK], a
- callba MobileFn_106155
+ callba UpdateTrainerRankingsChecksum2
callba BackupMobileEventIndex
pop af
ld [rSVBK], a
@@ -3746,7 +3746,7 @@ Function17f047: ; 17f047
ld a, [hli]
ld h, [hl]
ld l, a
- jp [hl]
+ jp hl
.finished
scf
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 23:09:49 +0000