diff options
Diffstat (limited to 'mobile')
| -rwxr-xr-x | mobile/battle_tower_5c.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_22_2.asm | 8 | ||||
| -rw-r--r-- | mobile/mobile_40.asm | 6 | ||||
| -rwxr-xr-x | mobile/mobile_41.asm | 207 | ||||
| -rw-r--r-- | mobile/mobile_42.asm | 2 | ||||
| -rw-r--r-- | mobile/mobile_45.asm | 5 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 8 | ||||
| -rwxr-xr-x | mobile/mobile_5c.asm | 2 |
8 files changed, 141 insertions, 99 deletions
diff --git a/mobile/battle_tower_5c.asm b/mobile/battle_tower_5c.asm index 76bd35219..745e98616 100755 --- a/mobile/battle_tower_5c.asm +++ b/mobile/battle_tower_5c.asm @@ -243,7 +243,7 @@ RunBattleTowerTrainer: ; 17024d xor a ld [wLinkMode], a - farcall Special_TrainerRankings_Healings + farcall Special_StubbedTrainerRankings_Healings farcall HealParty call ReadBTTrainerParty call Clears5_a89a diff --git a/mobile/mobile_22_2.asm b/mobile/mobile_22_2.asm index 37b3d60b8..73e93cf3f 100644 --- 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 @@ Function8b342:: ; 8b342 ; 8b35a .zero ; 8b35a - mobile + ret ; 8b35b .one ; 8b35b - mobile + ret ; 8b35c .two ; 8b35c - mobile + ret ; 8b35d Function8b35d: ; 8b35d diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 4723b6660..01969e872 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -40,7 +40,7 @@ Function100022: ; 100022 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 @@ Function1013aa: ; 1013aa Function1013c0: ; 1013c0 farcall BlankScreen - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 call FinishExitMenu ret @@ -5454,7 +5454,7 @@ Function102423: ; 102423 call Function102921 ret nc farcall SaveAfterLinkTrade - farcall TrainerRankings_Trades + farcall StubbedTrainerRankings_Trades farcall BackupMobileEventIndex ld hl, wcd4b set 1, [hl] diff --git a/mobile/mobile_41.asm b/mobile/mobile_41.asm index bae2f2ce4..a4b2cff86 100755 --- 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 @@ TrainerRankings_HallOfFame2:: mobile ; 0x105ef6 ret ; 105f33 -TrainerRankings_MagikarpLength: mobile ; 105f33 +StubbedTrainerRankings_MagikarpLength: ; 105f33 + ret ld a, BANK(sTrainerRankingLongestMagikarp) call GetSRAMBank ld de, Buffer1 @@ -101,7 +103,8 @@ TrainerRankings_MagikarpLength: mobile ; 105f33 ret ; 105f79 -TrainerRankings_BugContestScore: mobile ; 105f79 +StubbedTrainerRankings_BugContestScore: ; 105f79 + ret ld a, BANK(sTrainerRankingBugContestScore) call GetSRAMBank ld a, [hProduct] @@ -130,7 +133,8 @@ TrainerRankings_BugContestScore: mobile ; 105f79 ret ; 105f9f -TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f +StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f + ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) call GetSRAMBank @@ -170,7 +174,8 @@ TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f ret ; 105fd0 -TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0 +StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0 + ret ld a, BANK(sTrainerRankingCurrentSlotsStreak) call GetSRAMBank ld hl, sTrainerRankingCurrentSlotsStreak @@ -182,7 +187,8 @@ TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0 ret ; 105fe3 -TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3 +StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3 + ret ld a, BANK(sTrainerRankingTotalSlotsPayouts) call GetSRAMBank ld hl, sTrainerRankingTotalSlotsPayouts + 3 @@ -210,7 +216,8 @@ TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3 ret ; 106008 -TrainerRankings_AddToBattlePayouts: mobile ; 106008 +StubbedTrainerRankings_AddToBattlePayouts: ; 106008 + ret ld a, BANK(sTrainerRankingTotalBattlePayouts) call GetSRAMBank ld hl, sTrainerRankingTotalBattlePayouts + 3 @@ -240,11 +247,13 @@ TrainerRankings_AddToBattlePayouts: mobile ; 106008 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 @@ Unreferenced_TrainerRankings_BattleTowerWins: mobile ; 106035 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 @@ TrainerRankings_Increment: ; 10612d ; 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 @@ endr 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 @@ Special_Mobile_DummyReturnFalse: ; 10630f ret ; 106314 -MobileFn_106314: mobile ; 106314 +Stubbed_Function106314: ; 106314 + ret ld a, $4 call GetSRAMBank ld a, c @@ -958,7 +998,7 @@ Function106403: ; 106403 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 @@ Function106403: ; 106403 .asm_106435 ld c, $0 - call MobileFn_106314 + call Stubbed_Function106314 ld a, [wMobileCommsJumptableIndex] inc a ld [wMobileCommsJumptableIndex], a @@ -1003,7 +1043,8 @@ Function106453: ; 106453 ret ; 106462 -MobileFunc_106462: mobile +Stubbed_Function106462: + ret ret ; 106464 diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index e39051862..e1f414a4d 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -361,7 +361,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld [hWY], a call LoadStandardFont call LoadFontsBattleExtra - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 scf ret diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index eb2d799c1..6d085732d 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -61,7 +61,7 @@ String_114163: ; 114163 ; 114165 Jumptable_114165: ; 114165 - dw Function114268 + dw Stubbed_Function114268 dw Function114269 dw Function11433c dw Function1143b7 @@ -159,7 +159,8 @@ Function11425c: ; 11425c ; 114268 -Function114268: mobile +Stubbed_Function114268: + ret ; 114269 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 78784051a..11dd8c45e 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -487,7 +487,7 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb ld [hMobileReceive], a ld [hMobile], a ei - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 farcall Function115d99 farcall Function11615a @@ -4461,7 +4461,7 @@ Function11a00e: ; 11a00e call PushWindow farcall Function11765d farcall Function117ab4 - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 call ExitMenu farcall ReloadMapPart @@ -4484,7 +4484,7 @@ Function11a0ca: ; 11a0ca call PushWindow farcall Function11765d farcall Function17d3f6 - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 call ExitMenu farcall ReloadMapPart @@ -5577,7 +5577,7 @@ Function11a9ce: ; 11a9ce call ClearBGPalettes call ReloadTilesetAndPalettes call Call_ExitMenu - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 call ret_d90 farcall FinishExitMenu diff --git a/mobile/mobile_5c.asm b/mobile/mobile_5c.asm index 0e2f7d024..3280040f6 100755 --- a/mobile/mobile_5c.asm +++ b/mobile/mobile_5c.asm @@ -654,7 +654,7 @@ Function171c41: ; 171c41 (5c:5c41) dec [hl] ret nz call ClearBGPalettes - farcall MobileFunc_106462 + farcall Stubbed_Function106462 farcall Function106464 ld a, $2 ld [wc303], a |