diff options
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/breeding/egg.asm | 2 | ||||
-rwxr-xr-x | engine/events_3.asm | 2 | ||||
-rwxr-xr-x | engine/evolve.asm | 2 | ||||
-rw-r--r-- | engine/fruit_trees.asm | 2 | ||||
-rwxr-xr-x | engine/link.asm | 2 | ||||
-rwxr-xr-x | engine/mysterygift.asm | 2 | ||||
-rw-r--r-- | engine/phone.asm | 4 | ||||
-rwxr-xr-x | engine/player_step.asm | 2 | ||||
-rw-r--r-- | engine/scripting.asm | 4 | ||||
-rwxr-xr-x | engine/slot_machine.asm | 8 | ||||
-rw-r--r-- | engine/specials.asm | 2 | ||||
-rwxr-xr-x | engine/startmenu.asm | 2 | ||||
-rw-r--r-- | engine/std_scripts.asm | 2 | ||||
-rwxr-xr-x | engine/tmhm2.asm | 2 |
14 files changed, 19 insertions, 19 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index fa499c071..326faaa6c 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70) push de callba SetEggMonCaughtData - callba MobileFn_10608d + callba TrainerRankings_EggsHatched ld a, [CurPartyMon] ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species) ld bc, PARTYMON_STRUCT_LENGTH diff --git a/engine/events_3.asm b/engine/events_3.asm index 01b8d7046..b6aaea3b7 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172 TreeMonEncounter: ; b81ea - callba MobileFn_1060ef + callba TrainerRankings_TreeEncounters xor a ld [TempWildMonSpecies], a diff --git a/engine/evolve.asm b/engine/evolve.asm index 202ad10ff..2f7739191 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -247,7 +247,7 @@ EvolveAfterBattle_MasterLoop push hl ld hl, Text_EvolvedIntoPKMN call PrintTextBoxText - callba MobileFn_106094 + callba TrainerRankings_MonsEvolved ld de, MUSIC_NONE call PlayMusic diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm index 09619cfa5..6a40fb05c 100644 --- a/engine/fruit_trees.asm +++ b/engine/fruit_trees.asm @@ -58,7 +58,7 @@ CheckFruitTree: ; 44055 ; 4405f PickedFruitTree: ; 4405f - callba MobileFn_10609b ; empty function + callba TrainerRankings_FruitPicked ld b, 1 jp GetFruitTreeFlag ; 4406a diff --git a/engine/link.asm b/engine/link.asm index 951eb1444..f5bc24da9 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -1973,7 +1973,7 @@ LinkTrade: ; 28b87 .save callba SaveAfterLinkTrade - callba MobileFn_1060af + callba TrainerRankings_Trades callba BackupMobileEventIndex ld c, 40 call DelayFrames diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm index 9f5302506..f2d29b08a 100755 --- a/engine/mysterygift.asm +++ b/engine/mysterygift.asm @@ -63,7 +63,7 @@ DoMysteryGift: ; 1048ba (41:48ba) jr z, .skip_append_save call .SaveMysteryGiftTrainerName callba RestoreMobileEventIndex - callba MobileFn_1060a9 + callba TrainerRankings_MysteryGift callba BackupMobileEventIndex .skip_append_save ld a, [wMysteryGiftPartnerSentDeco] diff --git a/engine/phone.asm b/engine/phone.asm index 9d1376a62..f5f39218d 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -471,7 +471,7 @@ UnknownScript_0x90261: ; 0x90261 RingTwice_StartCall: ; 9026f call .Ring call .Ring - callba MobileFn_1060d3 + callba TrainerRankings_PhoneCalls ret ; 9027c @@ -500,7 +500,7 @@ PhoneCall:: ; 9029a ld [PhoneCallerHi], a call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings - callba MobileFn_1060d3 + callba TrainerRankings_PhoneCalls ret ; 902b3 diff --git a/engine/player_step.asm b/engine/player_step.asm index 24e4fb873..83158c1b7 100755 --- a/engine/player_step.asm +++ b/engine/player_step.asm @@ -77,7 +77,7 @@ HandlePlayerStep: ; d4e5 (3:54e5) ret .mobile ; d509 (3:5509) - callba MobileFn_10602e + callba TrainerRankings_StepCount ret .fail2 ; d510 (3:5510) diff --git a/engine/scripting.asm b/engine/scripting.asm index 745948a6f..c9b343a8b 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -3199,8 +3199,8 @@ Script_halloffame: ; 97bd5 ld hl, GameTimerPause res 0, [hl] - callba Mobile_HallOfFame - callba Mobile_HallOfFame2 + callba TrainerRankings_HallOfFame + callba TrainerRankings_HallOfFame2 callba HallOfFame ld hl, GameTimerPause set 0, [hl] diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 00ab1d828..ea842ea9c 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -20,7 +20,7 @@ _SlotMachine: call PlaySFX call WaitSFX call ClearBGPalettes - callba MobileFn_105fd0 + callba TrainerRankings_EndSlotsWinStreak ld hl, Options res NO_TEXT_SCROLL, [hl] ld hl, rLCDC ; $ff40 @@ -1812,7 +1812,7 @@ SlotGetPayout: ; 93124 (24:7124) ld a, [hl] ld [wPayout], a ld d, a - callba MobileFn_105fe3 + callba TrainerRankings_AddToSlotsPayouts ret .PayoutTable: @@ -1836,7 +1836,7 @@ SlotPayoutText: ; 93158 (24:7158) jr nz, .MatchedSomething ld hl, .Text_Darn call PrintText - callba MobileFn_105fd0 + callba TrainerRankings_EndSlotsWinStreak ret .MatchedSomething: @@ -1860,7 +1860,7 @@ SlotPayoutText: ; 93158 (24:7158) .return ld hl, .Text_PrintPayout call PrintText - callba MobileFn_105f9f + callba TrainerRankings_AddToSlotsWinStreak ret ; 93195 (24:7195) diff --git a/engine/specials.asm b/engine/specials.asm index 841a59cd3..2d9b6f998 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -179,7 +179,7 @@ SpecialsPointers:: ; c029 add_special Mobile_SelectThreeMons add_special Function1037eb add_special Function10383c - add_special Mobile_HealParty + add_special TrainerRankings_Healings add_special RefreshSprites add_special Function1037c2 add_special Mobile_DummyReturnFalse diff --git a/engine/startmenu.asm b/engine/startmenu.asm index bf71a0b8d..fa61d99cb 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -1255,7 +1255,7 @@ MonMenu_Fly: ; 12e30 jr z, .Fail cp $0 jr z, .Error - callba MobileFn_1060b5 + callba TrainerRankings_Fly ld b, $4 ld a, $2 ret diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 0f144f79c..4b69a4de1 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -107,7 +107,7 @@ PokeCenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Mobile_HealParty + special TrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 6efd07294..6e32fdae8 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -146,7 +146,7 @@ TeachTMHM: ; 2c867 and a jr z, .nope - callba MobileFn_106049 + callba TrainerRankings_TMsHMsTaught ld a, [CurItem] call IsHM ret c |