ref: aa9a0a900ddeaa79a05f1b93458a8b19ae170d69
parent: b4e087167f3263342bbe01b5256f42fcf2d726af
author: xCrystal <rgr.crystal@gmail.com>
date: Tue Jan 2 15:00:14 EST 2018
No more mobile EQUS ret (replace with Stubbed_ + ret)
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -160,7 +160,7 @@
BattleTurn: ; 3c12f
.loop
- call MobileFn_3c1bf
+ call Stubbed_Function3c1bf
call CheckContestBattleOver
jp c, .quit
@@ -231,7 +231,8 @@
ret
; 3c1bf
-MobileFn_3c1bf: mobile
+Stubbed_Function3c1bf:
+ ret
ld a, $5
call GetSRAMBank
ld hl, $a89b ; s5_a89b
@@ -2588,7 +2589,7 @@
push bc
ld b, h
ld c, l
- farcall TrainerRankings_AddToBattlePayouts
+ farcall StubbedTrainerRankings_AddToBattlePayouts
pop bc
pop hl
.loop
@@ -8375,7 +8376,7 @@
; 3f4dd
BattleIntro: ; 3f4dd
- farcall TrainerRankings_Battles ; mobile
+ farcall StubbedTrainerRankings_Battles ; mobile
call LoadTrainerOrWildMonPic
xor a
ld [TempBattleMonSpecies], a
@@ -8460,7 +8461,7 @@
InitEnemyTrainer: ; 3f594
ld [TrainerClass], a
- farcall TrainerRankings_TrainerBattles
+ farcall StubbedTrainerRankings_TrainerBattles
xor a
ld [TempEnemyMonSpecies], a
callfar GetTrainerAttributes
@@ -8516,7 +8517,7 @@
InitEnemyWildmon: ; 3f607
ld a, WILD_BATTLE
ld [wBattleMode], a
- farcall TrainerRankings_WildBattles
+ farcall StubbedTrainerRankings_WildBattles
call LoadEnemyMon
ld hl, EnemyMonMoves
ld de, wWildMonMoves
@@ -8698,7 +8699,7 @@
; 3f759
ShowLinkBattleParticipantsAfterEnd: ; 3f759
- farcall TrainerRankings_LinkBattles
+ farcall StubbedTrainerRankings_LinkBattles
farcall BackupMobileEventIndex
ld a, [CurOTMon]
ld hl, OTPartyMon1Status
@@ -8728,17 +8729,17 @@
cp $1
jr c, .victory
jr z, .loss
- farcall TrainerRankings_ColosseumDraws
+ farcall StubbedTrainerRankings_ColosseumDraws
ld de, .Draw
jr .store_result
.victory
- farcall TrainerRankings_ColosseumWins
+ farcall StubbedTrainerRankings_ColosseumWins
ld de, .Win
jr .store_result
.loss
- farcall TrainerRankings_ColosseumLosses
+ farcall StubbedTrainerRankings_ColosseumLosses
ld de, .Lose
jr .store_result
@@ -9486,7 +9487,7 @@
cp BATTLETYPE_FISH
jr nz, .NotFishing
- farcall TrainerRankings_HookedEncounters
+ farcall StubbedTrainerRankings_HookedEncounters
ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@@ -8078,7 +8078,7 @@
BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove
- farcall TrainerRankings_Splash
+ farcall StubbedTrainerRankings_Splash
jp PrintNothingHappened
; 36fed
@@ -8605,7 +8605,7 @@
BattleCommand_Selfdestruct: ; 37380
- farcall TrainerRankings_Selfdestruct
+ farcall StubbedTrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a
ld c, 3
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -232,7 +232,7 @@
push de
farcall SetEggMonCaughtData
- farcall TrainerRankings_EggsHatched
+ farcall StubbedTrainerRankings_EggsHatched
ld a, [CurPartyMon]
ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -737,7 +737,8 @@
call GetMonPalettePointer
ret
-Function9779: mobile
+Unreferenced_Function9779:
+ ret
call CheckCGB
ret z
ld hl, BattleObjectPals
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
@@ -1,6 +1,6 @@
_Special_BugContestJudging: ; 1369d
call ContestScore
- farcall TrainerRankings_BugContestScore
+ farcall StubbedTrainerRankings_BugContestScore
call BugContest_JudgeContestants
ld a, [wBugContestThirdPlaceWinnerID]
call LoadContestantName
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -58,7 +58,7 @@
; 4405f
PickedFruitTree: ; 4405f
- farcall TrainerRankings_FruitPicked
+ farcall StubbedTrainerRankings_FruitPicked
ld b, 1
jp GetFruitTreeFlag
; 4406a
--- a/engine/events/lucky_number.asm
+++ b/engine/events/lucky_number.asm
@@ -103,7 +103,7 @@
ld a, [ScriptVar]
and a
ret z ; found nothing
- farcall TrainerRankings_LuckyNumberShow
+ farcall StubbedTrainerRankings_LuckyNumberShow
ld a, [wFoundMatchingIDInParty]
and a
push af
--- a/engine/events/magikarp.asm
+++ b/engine/events/magikarp.asm
@@ -28,7 +28,7 @@
ld c, l
call CalcMagikarpLength
call PrintMagikarpLength
- farcall TrainerRankings_MagikarpLength
+ farcall StubbedTrainerRankings_MagikarpLength
ld hl, .MeasureItText
call PrintText
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -427,7 +427,7 @@
end
.empty_fn ; c9a2
- farcall TrainerRankings_Surf
+ farcall StubbedTrainerRankings_Surf
ret
UsedSurfText: ; c9a9
@@ -700,7 +700,7 @@
ld a, [PlayerStandingTile]
call CheckWaterfallTile
ret z
- farcall TrainerRankings_Waterfall
+ farcall StubbedTrainerRankings_Waterfall
ld a, $1
ld [ScriptVar], a
ret
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -107,7 +107,7 @@
farwritetext NurseTakePokemonText
pause 20
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
spriteface LAST_TALKED, LEFT
pause 10
special HealParty
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -49,7 +49,7 @@
; 12513
HalveMoney: ; 12513
- farcall TrainerRankings_WhiteOuts
+ farcall StubbedTrainerRankings_WhiteOuts
; Halve the player's money.
ld hl, Money
--- a/engine/events_3.asm
+++ b/engine/events_3.asm
@@ -360,7 +360,7 @@
TreeMonEncounter: ; b81ea
- farcall TrainerRankings_TreeEncounters
+ farcall StubbedTrainerRankings_TreeEncounters
xor a
ld [TempWildMonSpecies], a
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -247,7 +247,7 @@
push hl
ld hl, Text_EvolvedIntoPKMN
call PrintTextBoxText
- farcall TrainerRankings_MonsEvolved
+ farcall StubbedTrainerRankings_MonsEvolved
ld de, MUSIC_NONE
call PlayMusic
--- a/engine/item_effects.asm
+++ b/engine/item_effects.asm
@@ -517,7 +517,7 @@
cp BATTLETYPE_TUTORIAL
jp z, .FinishTutorial
- farcall TrainerRankings_WildMonsCaught
+ farcall StubbedTrainerRankings_WildMonsCaught
ld hl, Text_GotchaMonWasCaught
call PrintText
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1957,7 +1957,7 @@
.save
farcall SaveAfterLinkTrade
- farcall TrainerRankings_Trades
+ farcall StubbedTrainerRankings_Trades
farcall BackupMobileEventIndex
ld c, 40
call DelayFrames
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -1570,7 +1570,7 @@
ld [hl], a
call IncrementObjectStructField1c
StepType04: ; 4e21
- call MobileFn_4fb2
+ call Stubbed_Function4fb2
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
@@ -1578,7 +1578,7 @@
; 4e2b
NPCStep: ; 4e2b
- call MobileFn_4fb2
+ call Stubbed_Function4fb2
call AddStepVector
ld hl, OBJECT_STEP_DURATION
add hl, bc
@@ -1841,7 +1841,8 @@
ret
; 4fb2
-MobileFn_4fb2: mobile
+Stubbed_Function4fb2:
+ ret
ld hl, OBJECT_1D
add hl, bc
inc [hl]
--- a/engine/mystery_gift.asm
+++ b/engine/mystery_gift.asm
@@ -63,7 +63,7 @@
jr z, .skip_append_save
call .SaveMysteryGiftTrainerName
farcall RestoreMobileEventIndex
- farcall TrainerRankings_MysteryGift
+ farcall StubbedTrainerRankings_MysteryGift
farcall BackupMobileEventIndex
.skip_append_save
ld a, [wMysteryGiftPartnerSentDeco]
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -471,7 +471,7 @@
RingTwice_StartCall: ; 9026f
call .Ring
call .Ring
- farcall TrainerRankings_PhoneCalls
+ farcall StubbedTrainerRankings_PhoneCalls
ret
; 9027c
@@ -500,7 +500,7 @@
ld [PhoneCaller + 1], a
call Phone_FirstOfTwoRings
call Phone_FirstOfTwoRings
- farcall TrainerRankings_PhoneCalls
+ farcall StubbedTrainerRankings_PhoneCalls
ret
; 902b3
--- a/engine/player_step.asm
+++ b/engine/player_step.asm
@@ -76,7 +76,7 @@
ret
.mobile ; d509 (3:5509)
- farcall TrainerRankings_StepCount
+ farcall StubbedTrainerRankings_StepCount
ret
.fail2 ; d510 (3:5510)
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -2994,8 +2994,8 @@
ld hl, wGameTimerPause
res 0, [hl]
- farcall TrainerRankings_HallOfFame
- farcall TrainerRankings_HallOfFame2
+ farcall StubbedTrainerRankings_HallOfFame
+ farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame
ld hl, wGameTimerPause
set 0, [hl]
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -85,7 +85,7 @@
call PlaySFX
call WaitSFX
call ClearBGPalettes
- farcall TrainerRankings_EndSlotsWinStreak
+ farcall StubbedTrainerRankings_EndSlotsWinStreak
ld hl, Options
res NO_TEXT_SCROLL, [hl]
ld hl, rLCDC
@@ -1935,7 +1935,7 @@
ld a, [hl]
ld [wPayout], a
ld d, a
- farcall TrainerRankings_AddToSlotsPayouts
+ farcall StubbedTrainerRankings_AddToSlotsPayouts
ret
.PayoutTable:
@@ -1959,7 +1959,7 @@
jr nz, .MatchedSomething
ld hl, .Text_Darn
call PrintText
- farcall TrainerRankings_EndSlotsWinStreak
+ farcall StubbedTrainerRankings_EndSlotsWinStreak
ret
.MatchedSomething:
@@ -1983,7 +1983,7 @@
.return
ld hl, .Text_PrintPayout
call PrintText
- farcall TrainerRankings_AddToSlotsWinStreak
+ farcall StubbedTrainerRankings_AddToSlotsWinStreak
ret
; 93195 (24:7195)
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -178,7 +178,7 @@
add_special Special_Mobile_SelectThreeMons
add_special Special_Function1037eb
add_special Special_Function10383c
- add_special Special_TrainerRankings_Healings
+ add_special Special_StubbedTrainerRankings_Healings
add_special Special_RefreshSprites
add_special Special_Function1037c2
add_special Special_Mobile_DummyReturnFalse
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -1255,7 +1255,7 @@
jr z, .Fail
cp $0
jr z, .Error
- farcall TrainerRankings_Fly
+ farcall StubbedTrainerRankings_Fly
ld b, $4
ld a, $2
ret
--- a/engine/tmhm2.asm
+++ b/engine/tmhm2.asm
@@ -146,7 +146,7 @@
and a
jr z, .nope
- farcall TrainerRankings_TMsHMsTaught
+ farcall StubbedTrainerRankings_TMsHMsTaught
ld a, [CurItem]
call IsHM
ret c
--- a/macros/code.asm
+++ b/macros/code.asm
@@ -35,9 +35,6 @@
jp hl
ENDM
-; Many mobile functions were dummied out in localization.
-mobile EQUS "ret"
-
maskbits: MACRO
; example usage in rejection sampling:
; .loop
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -308,7 +308,7 @@
end
ElmsLabHealingMachine_HealParty:
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_NONE
writebyte 1 ; Machine is in Elm's Lab
--- a/maps/FastShipCabins_SW_SSW_NW.asm
+++ b/maps/FastShipCabins_SW_SSW_NW.asm
@@ -71,7 +71,7 @@
closetext
special Special_FadeBlackQuickly
special ReloadSpritesNoPalettes
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
special HealParty
playmusic MUSIC_HEAL
pause 60
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -41,7 +41,7 @@
special RestartMapMusic
refreshscreen $0
.two_
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
special HealParty
special Special_Function10383c
iftrue .false
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -113,7 +113,7 @@
special Special_FadeBlackQuickly
special ReloadSpritesNoPalettes
playmusic MUSIC_HEAL
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
special HealParty
pause 60
special Special_FadeInQuickly
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealSpeechHouse.asm
@@ -16,7 +16,7 @@
closetext
special Special_FadeBlackQuickly
special ReloadSpritesNoPalettes
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
playmusic MUSIC_HEAL
special HealParty
pause 60
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -167,7 +167,7 @@
waitbutton
closetext
special Special_FadeOutPalettes
- special Special_TrainerRankings_Healings
+ special Special_StubbedTrainerRankings_Healings
playsound SFX_FULL_HEAL
special HealParty
special Special_FadeInPalettes
--- a/mobile/battle_tower_5c.asm
+++ b/mobile/battle_tower_5c.asm
@@ -243,7 +243,7 @@
xor a
ld [wLinkMode], a
- farcall Special_TrainerRankings_Healings
+ farcall Special_StubbedTrainerRankings_Healings
farcall HealParty
call ReadBTTrainerParty
call Clears5_a89a
--- a/mobile/mobile_22_2.asm
+++ b/mobile/mobile_22_2.asm
@@ -1,6 +1,6 @@
Function8b342:: ; 8b342
; Loads the secondary map header pointer, then runs through a
-; dw with three dummy functions. Spends a lot of energy
+; dw with three dummy functions. Spends a lot of energy
; doing pretty much nothing.
call GetSecondaryMapHeaderPointer
ld d, h
@@ -26,15 +26,15 @@
; 8b35a
.zero ; 8b35a
- mobile
+ ret
; 8b35b
.one ; 8b35b
- mobile
+ ret
; 8b35c
.two ; 8b35c
- mobile
+ ret
; 8b35d
Function8b35d: ; 8b35d
--- a/mobile/mobile_40.asm
+++ b/mobile/mobile_40.asm
@@ -40,7 +40,7 @@
ld a, b
ld [wcd24], a
farcall Function10127e
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464 ; load broken gfx
farcall Function11615a ; init RAM
ld hl, VramState
@@ -3077,7 +3077,7 @@
Function1013c0: ; 1013c0
farcall BlankScreen
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
call FinishExitMenu
ret
@@ -5454,7 +5454,7 @@
call Function102921
ret nc
farcall SaveAfterLinkTrade
- farcall TrainerRankings_Trades
+ farcall StubbedTrainerRankings_Trades
farcall BackupMobileEventIndex
ld hl, wcd4b
set 1, [hl]
--- a/mobile/mobile_41.asm
+++ b/mobile/mobile_41.asm
@@ -2,7 +2,8 @@
; 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
+StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
+ ret
ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
@@ -33,7 +34,8 @@
ret
; 105f33
-TrainerRankings_MagikarpLength: mobile ; 105f33
+StubbedTrainerRankings_MagikarpLength: ; 105f33
+ ret
ld a, BANK(sTrainerRankingLongestMagikarp)
call GetSRAMBank
ld de, Buffer1
@@ -101,7 +103,8 @@
ret
; 105f79
-TrainerRankings_BugContestScore: mobile ; 105f79
+StubbedTrainerRankings_BugContestScore: ; 105f79
+ ret
ld a, BANK(sTrainerRankingBugContestScore)
call GetSRAMBank
ld a, [hProduct]
@@ -130,7 +133,8 @@
ret
; 105f9f
-TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
+StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f
+ ret
ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
@@ -170,7 +174,8 @@
ret
; 105fd0
-TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
+StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0
+ ret
ld a, BANK(sTrainerRankingCurrentSlotsStreak)
call GetSRAMBank
ld hl, sTrainerRankingCurrentSlotsStreak
@@ -182,7 +187,8 @@
ret
; 105fe3
-TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
+StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3
+ ret
ld a, BANK(sTrainerRankingTotalSlotsPayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalSlotsPayouts + 3
@@ -210,7 +216,8 @@
ret
; 106008
-TrainerRankings_AddToBattlePayouts: mobile ; 106008
+StubbedTrainerRankings_AddToBattlePayouts: ; 106008
+ ret
ld a, BANK(sTrainerRankingTotalBattlePayouts)
call GetSRAMBank
ld hl, sTrainerRankingTotalBattlePayouts + 3
@@ -240,11 +247,13 @@
ret
; 10602e
-TrainerRankings_StepCount: mobile ; 10602e (41:602e)
+StubbedTrainerRankings_StepCount: ; 10602e (41:602e)
+ ret
ld hl, sTrainerRankingStepCount
- jp TrainerRankings_Increment4Byte
+ jp StubbedTrainerRankings_Increment4Byte
-Unreferenced_TrainerRankings_BattleTowerWins: mobile ; 106035
+Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035
+ ret
ld a, $5
call GetSRAMBank
ld a, [$aa8d]
@@ -252,167 +261,196 @@
call CloseSRAM
ret nz
ld hl, sTrainerRankingBattleTowerWins
- jp TrainerRankings_Increment2Byte
+ jp StubbedTrainerRankings_Increment2Byte
-TrainerRankings_TMsHMsTaught: mobile ; 106049
+StubbedTrainerRankings_TMsHMsTaught: ; 106049
+ ret
ld hl, sTrainerRankingTMsHMsTaught
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Battles: mobile ; 106050
+StubbedTrainerRankings_Battles: ; 106050
+ ret
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingBattles
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_WildBattles: mobile ; 10605d
+StubbedTrainerRankings_WildBattles: ; 10605d
+ ret
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingWildBattles
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_TrainerBattles: mobile ; 10606a
+StubbedTrainerRankings_TrainerBattles: ; 10606a
+ ret
ld hl, sTrainerRankingTrainerBattles
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Unused1: mobile ; 106071
+StubbedTrainerRankings_Unused1: ; 106071
+ ret
ld hl, sTrainerRankingUnused1
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_HallOfFame:: mobile ; 0x106078
+StubbedTrainerRankings_HallOfFame:: ; 0x106078
+ ret
ld hl, sTrainerRankingHOFEntries
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_WildMonsCaught: mobile ; 10607f (41:607f)
+StubbedTrainerRankings_WildMonsCaught: ; 10607f (41:607f)
+ ret
ld hl, sTrainerRankingWildMonsCaught
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_HookedEncounters: mobile ; 106086
+StubbedTrainerRankings_HookedEncounters: ; 106086
+ ret
ld hl, sTrainerRankingHookedEncounters
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_EggsHatched: mobile ; 10608d (41:608d)
+StubbedTrainerRankings_EggsHatched: ; 10608d (41:608d)
+ ret
ld hl, sTrainerRankingEggsHatched
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_MonsEvolved: mobile ; 106094
+StubbedTrainerRankings_MonsEvolved: ; 106094
+ ret
ld hl, sTrainerRankingMonsEvolved
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_FruitPicked: mobile ; 10609b
+StubbedTrainerRankings_FruitPicked: ; 10609b
+ ret
ld hl, sTrainerRankingFruitPicked
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-Special_TrainerRankings_Healings: mobile ; 1060a2
+Special_StubbedTrainerRankings_Healings: ; 1060a2
+ ret
ld hl, sTrainerRankingHealings
- jp TrainerRankings_Increment3Byte
+ jp StubbedTrainerRankings_Increment3Byte
-TrainerRankings_MysteryGift: mobile ; 1060a9 (41:60a9)
+StubbedTrainerRankings_MysteryGift: ; 1060a9 (41:60a9)
+ ret
ld hl, sTrainerRankingMysteryGift
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Trades: mobile ; 1060af
+StubbedTrainerRankings_Trades: ; 1060af
+ ret
ld hl, sTrainerRankingTrades
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Fly: mobile ; 1060b5
+StubbedTrainerRankings_Fly: ; 1060b5
+ ret
ld hl, sTrainerRankingFly
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Surf: mobile ; 1060bb
+StubbedTrainerRankings_Surf: ; 1060bb
+ ret
ld hl, sTrainerRankingSurf
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Waterfall: mobile ; 1060c1
+StubbedTrainerRankings_Waterfall: ; 1060c1
+ ret
ld hl, sTrainerRankingWaterfall
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_WhiteOuts: mobile ; 1060c7
+StubbedTrainerRankings_WhiteOuts: ; 1060c7
+ ret
ld hl, sTrainerRankingWhiteOuts
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_LuckyNumberShow: mobile ; 1060cd
+StubbedTrainerRankings_LuckyNumberShow: ; 1060cd
+ ret
ld hl, sTrainerRankingLuckyNumberShow
- jr TrainerRankings_Increment2Byte
+ jr StubbedTrainerRankings_Increment2Byte
-TrainerRankings_PhoneCalls: mobile ; 1060d3
+StubbedTrainerRankings_PhoneCalls: ; 1060d3
+ ret
ld hl, sTrainerRankingPhoneCalls
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Unused2: mobile ; 1060df
+StubbedTrainerRankings_Unused2: ; 1060df
+ ret
ld hl, sTrainerRankingUnused2
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_LinkBattles: mobile ; 1060df
+StubbedTrainerRankings_LinkBattles: ; 1060df
+ ret
ld hl, sTrainerRankingLinkBattles
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Splash: mobile ; 1060e5
+StubbedTrainerRankings_Splash: ; 1060e5
+ ret
; Only counts if it’s the player’s turn
ld a, [hBattleTurn]
and a
ret nz
ld hl, sTrainerRankingSplash
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_TreeEncounters: mobile ; 1060ef
+StubbedTrainerRankings_TreeEncounters: ; 1060ef
+ ret
ld hl, sTrainerRankingTreeEncounters
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_Unused3: mobile ; 1060f5
+StubbedTrainerRankings_Unused3: ; 1060f5
+ ret
ld hl, sTrainerRankingUnused3
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_ColosseumWins: mobile ; win
+StubbedTrainerRankings_ColosseumWins: ; win
+ ret
ld hl, sTrainerRankingColosseumWins
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
-TrainerRankings_ColosseumLosses: mobile ; lose
+StubbedTrainerRankings_ColosseumLosses: ; lose
+ ret
ld hl, sTrainerRankingColosseumLosses
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
; 106107
-TrainerRankings_ColosseumDraws: mobile ; draw
+StubbedTrainerRankings_ColosseumDraws: ; draw
+ ret
ld hl, sTrainerRankingColosseumDraws
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
; 10610d
; Counts uses of both Selfdestruct and Explosion.
-TrainerRankings_Selfdestruct: mobile ; 10610d
+StubbedTrainerRankings_Selfdestruct: ; 10610d
+ ret
; Only counts if it’s the player’s turn
ld a, [hBattleTurn]
and a
ret nz
ld hl, sTrainerRankingSelfdestruct
- jr TrainerRankings_Increment3Byte
+ jr StubbedTrainerRankings_Increment3Byte
; 106117
-TrainerRankings_Increment4Byte: ; 106117
+StubbedTrainerRankings_Increment4Byte: ; 106117
push bc
ld bc, 3
- jr TrainerRankings_Increment
+ jr StubbedTrainerRankings_Increment
; 10611d
-TrainerRankings_Increment3Byte: ; 10611d
+StubbedTrainerRankings_Increment3Byte: ; 10611d
push bc
ld bc, 2
- jr TrainerRankings_Increment
+ jr StubbedTrainerRankings_Increment
; 106123
-TrainerRankings_Increment2Byte: ; 106123
+StubbedTrainerRankings_Increment2Byte: ; 106123
push bc
ld bc, 1
- jr TrainerRankings_Increment
+ jr StubbedTrainerRankings_Increment
; 106129
; unused
-TrainerRankings_Increment1Byte: ; 106129
+StubbedTrainerRankings_Increment1Byte: ; 106129
push bc
ld bc, 0
; Increments a big-endian value of bc + 1 bytes at hl
-TrainerRankings_Increment: ; 10612d
+StubbedTrainerRankings_Increment: ; 10612d
ld a, BANK(sTrainerRankings)
call GetSRAMBank
push hl
@@ -449,7 +487,8 @@
; 106155
; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
-UpdateTrainerRankingsChecksum2: mobile ; 106155
+UpdateTrainerRankingsChecksum2: ; 106155
+ ret
ld a, BANK(sTrainerRankings)
call GetSRAMBank
call UpdateTrainerRankingsChecksum
@@ -771,7 +810,7 @@
ret
; 10630f
-; functions related to the cable club and various NPC scripts referencing mobile communications
+; functions related to the cable club and various NPC scripts referencing communications
Special_Mobile_DummyReturnFalse: ; 10630f
xor a
@@ -779,7 +818,8 @@
ret
; 106314
-MobileFn_106314: mobile ; 106314
+Stubbed_Function106314: ; 106314
+ ret
ld a, $4
call GetSRAMBank
ld a, c
@@ -958,7 +998,7 @@
or c
inc a
ld c, a
- call MobileFn_106314
+ call Stubbed_Function106314
ld a, [wMobileCommsJumptableIndex]
inc a
ld [wMobileCommsJumptableIndex], a
@@ -976,7 +1016,7 @@
.asm_106435
ld c, $0
- call MobileFn_106314
+ call Stubbed_Function106314
ld a, [wMobileCommsJumptableIndex]
inc a
ld [wMobileCommsJumptableIndex], a
@@ -1003,7 +1043,8 @@
ret
; 106462
-MobileFunc_106462: mobile
+Stubbed_Function106462:
+ ret
ret
; 106464
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -361,7 +361,7 @@
ld [hWY], a
call LoadStandardFont
call LoadFontsBattleExtra
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
scf
ret
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -61,7 +61,7 @@
; 114165
Jumptable_114165: ; 114165
- dw Function114268
+ dw Stubbed_Function114268
dw Function114269
dw Function11433c
dw Function1143b7
@@ -159,7 +159,8 @@
; 114268
-Function114268: mobile
+Stubbed_Function114268:
+ ret
; 114269
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -487,7 +487,7 @@
ld [hMobileReceive], a
ld [hMobile], a
ei
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
farcall Function115d99
farcall Function11615a
@@ -4461,7 +4461,7 @@
call PushWindow
farcall Function11765d
farcall Function117ab4
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
call ExitMenu
farcall ReloadMapPart
@@ -4484,7 +4484,7 @@
call PushWindow
farcall Function11765d
farcall Function17d3f6
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
call ExitMenu
farcall ReloadMapPart
@@ -5577,7 +5577,7 @@
call ClearBGPalettes
call ReloadTilesetAndPalettes
call Call_ExitMenu
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
call ret_d90
farcall FinishExitMenu
--- a/mobile/mobile_5c.asm
+++ b/mobile/mobile_5c.asm
@@ -654,7 +654,7 @@
dec [hl]
ret nz
call ClearBGPalettes
- farcall MobileFunc_106462
+ farcall Stubbed_Function106462
farcall Function106464
ld a, $2
ld [wc303], a
--
⑨