Labels for Trainer Rankings stat tracking functions

This commit is contained in:
hatschky
2017-01-16 21:11:34 +00:00
parent 5a9701ddc8
commit f0209d6ed6
33 changed files with 322 additions and 241 deletions

View File

@@ -2623,7 +2623,7 @@ AddBattleMoneyToAccount: ; 3d0be
push bc push bc
ld b, h ld b, h
ld c, l ld c, l
callba MobileFn_106008 callba TrainerRankings_AddToBattlePayouts
pop bc pop bc
pop hl pop hl
.loop .loop
@@ -8401,7 +8401,7 @@ _DoBattle: ; 3f4d9
; 3f4dd ; 3f4dd
BattleIntro: ; 3f4dd BattleIntro: ; 3f4dd
callba MobileFn_106050 ; mobile callba TrainerRankings_Battles ; mobile
call LoadTrainerOrWildMonPic call LoadTrainerOrWildMonPic
xor a xor a
ld [TempBattleMonSpecies], a ld [TempBattleMonSpecies], a
@@ -8486,7 +8486,7 @@ BackUpVBGMap2: ; 3f568
InitEnemyTrainer: ; 3f594 InitEnemyTrainer: ; 3f594
ld [TrainerClass], a ld [TrainerClass], a
callba MobileFn_10606a callba TrainerRankings_TrainerBattles
xor a xor a
ld [TempEnemyMonSpecies], a ld [TempEnemyMonSpecies], a
callab GetTrainerAttributes callab GetTrainerAttributes
@@ -8542,7 +8542,7 @@ InitEnemyTrainer: ; 3f594
InitEnemyWildmon: ; 3f607 InitEnemyWildmon: ; 3f607
ld a, WILD_BATTLE ld a, WILD_BATTLE
ld [wBattleMode], a ld [wBattleMode], a
callba MobileFn_10605d callba TrainerRankings_WildBattles
call LoadEnemyMon call LoadEnemyMon
ld hl, EnemyMonMoves ld hl, EnemyMonMoves
ld de, wWildMonMoves ld de, wWildMonMoves
@@ -8725,7 +8725,7 @@ CheckPayDay: ; 3f71d
; 3f759 ; 3f759
ShowLinkBattleParticipantsAfterEnd: ; 3f759 ShowLinkBattleParticipantsAfterEnd: ; 3f759
callba MobileFn_1060df callba TrainerRankings_LinkBattles
callba BackupMobileEventIndex callba BackupMobileEventIndex
ld a, [CurOTMon] ld a, [CurOTMon]
ld hl, OTPartyMon1Status ld hl, OTPartyMon1Status
@@ -8755,17 +8755,17 @@ DetermineMobileBattleResult: ; 3f77c
cp $1 cp $1
jr c, .victory jr c, .victory
jr z, .loss jr z, .loss
callba MobileFn_SaveBattleResult_Draw callba TrainerRankings_ColosseumDraws
ld de, .Draw ld de, .Draw
jr .store_result jr .store_result
.victory .victory
callba MobileFn_SaveBattleResult_Win callba TrainerRankings_ColosseumWins
ld de, .Win ld de, .Win
jr .store_result jr .store_result
.loss .loss
callba MobileFn_SaveBattleResult_Lose callba TrainerRankings_ColosseumLosses
ld de, .Lose ld de, .Lose
jr .store_result jr .store_result
@@ -9513,7 +9513,7 @@ BattleStartMessage: ; 3fc8b
cp BATTLETYPE_FISH cp BATTLETYPE_FISH
jr nz, .NotFishing jr nz, .NotFishing
callba MobileFn_106086 ; update fishing records? callba TrainerRankings_HookedEncounters
ld hl, HookedPokemonAttackedText ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText jr .PlaceBattleStartText

View File

@@ -8073,7 +8073,7 @@ BattleCommand_LeechSeed: ; 36f9d
BattleCommand_Splash: ; 36fe1 BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove call AnimateCurrentMove
callba MobileFn_1060e5 callba TrainerRankings_Splash
jp PrintNothingHappened jp PrintNothingHappened
; 36fed ; 36fed
@@ -8600,7 +8600,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_SelfDestruct: ; 37380 BattleCommand_SelfDestruct: ; 37380
callba MobileFn_10610d callba TrainerRankings_SelfDestruct
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a ld [wNumHits], a
ld c, 3 ld c, 3

View File

@@ -1,3 +1,53 @@
; Mobile bank 5 ; Mobile bank 5
; sMobileEventIndex EQU $a000 ; moved to 1:BE3C in English
sTrainerRankings EQU $a001
sTrainerRankingGameTimeHOF EQU $a001
sTrainerRankingStepCountHOF EQU $a005
sTrainerRankingHealingsHOF EQU $a009
sTrainerRankingBattlesHOF EQU $a00d
sTrainerRankingStepCount EQU $a010
sTrainerRankingBattleTowerWins EQU $a014
sTrainerRankingTMsHMsTaught EQU $a018
sTrainerRankingBattles EQU $a01b
sTrainerRankingWildBattles EQU $a01e
sTrainerRankingTrainerBattles EQU $a021
sTrainerRankingUnused1 EQU $a024
sTrainerRankingHOFEntries EQU $a027
sTrainerRankingWildMonsCaught EQU $a02a
sTrainerRankingHookedEncounters EQU $a02d
sTrainerRankingEggsHatched EQU $a030
sTrainerRankingMonsEvolved EQU $a033
sTrainerRankingFruitPicked EQU $a036
sTrainerRankingHealings EQU $a039
sTrainerRankingMysteryGift EQU $a03c
sTrainerRankingTrades EQU $a03f
sTrainerRankingFly EQU $a042
sTrainerRankingSurf EQU $a045
sTrainerRankingWaterfall EQU $a048
sTrainerRankingWhiteOuts EQU $a04b
sTrainerRankingLuckyNumberShow EQU $a04e
sTrainerRankingPhoneCalls EQU $a051
sTrainerRankingUnused2 EQU $a054
sTrainerRankingLinkBattles EQU $a057
sTrainerRankingSplash EQU $a05a
sTrainerRankingTreeEncounters EQU $a05d
sTrainerRankingUnused3 EQU $a060
sTrainerRankingColosseumWins EQU $a063
sTrainerRankingColosseumLosses EQU $a066
sTrainerRankingColosseumDraws EQU $a069
sTrainerRankingSelfDestruct EQU $a06c
sTrainerRankingCurrentSlotsStreak EQU $a06f
sTrainerRankingLongestSlotsStreak EQU $a071
sTrainerRankingTotalSlotsPayouts EQU $a073
sTrainerRankingTotalBattlePayouts EQU $a077
sTrainerRankingLongestMagikarp EQU $a07b
sTrainerRankingShortestMagikarp EQU $a07d
sTrainerRankingBugContestScore EQU $a07f
sTrainerRankingsChecksum EQU $a081
sTrainerRankingsEnd EQU $a083
; sMobileEventIndexBackup EQU $a083 ; moved to 1:BE44 in English
sTrainerRankingsBackup EQU $a084
sMobileLoginPassword EQU $aa4b sMobileLoginPassword EQU $aa4b
LOGIN_PASSWORD_LENGTH EQU 17 LOGIN_PASSWORD_LENGTH EQU 17

View File

@@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
push de push de
callba SetEggMonCaughtData callba SetEggMonCaughtData
callba MobileFn_10608d callba TrainerRankings_EggsHatched
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species) ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species)
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH

View File

@@ -360,7 +360,7 @@ CheckForHiddenItems: ; b8172
TreeMonEncounter: ; b81ea TreeMonEncounter: ; b81ea
callba MobileFn_1060ef callba TrainerRankings_TreeEncounters
xor a xor a
ld [TempWildMonSpecies], a ld [TempWildMonSpecies], a

View File

@@ -247,7 +247,7 @@ EvolveAfterBattle_MasterLoop
push hl push hl
ld hl, Text_EvolvedIntoPKMN ld hl, Text_EvolvedIntoPKMN
call PrintTextBoxText call PrintTextBoxText
callba MobileFn_106094 callba TrainerRankings_MonsEvolved
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic

View File

@@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
; 4405f ; 4405f
PickedFruitTree: ; 4405f PickedFruitTree: ; 4405f
callba MobileFn_10609b ; empty function callba TrainerRankings_FruitPicked
ld b, 1 ld b, 1
jp GetFruitTreeFlag jp GetFruitTreeFlag
; 4406a ; 4406a

View File

@@ -1973,7 +1973,7 @@ LinkTrade: ; 28b87
.save .save
callba SaveAfterLinkTrade callba SaveAfterLinkTrade
callba MobileFn_1060af callba TrainerRankings_Trades
callba BackupMobileEventIndex callba BackupMobileEventIndex
ld c, 40 ld c, 40
call DelayFrames call DelayFrames

View File

@@ -63,7 +63,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
jr z, .skip_append_save jr z, .skip_append_save
call .SaveMysteryGiftTrainerName call .SaveMysteryGiftTrainerName
callba RestoreMobileEventIndex callba RestoreMobileEventIndex
callba MobileFn_1060a9 callba TrainerRankings_MysteryGift
callba BackupMobileEventIndex callba BackupMobileEventIndex
.skip_append_save .skip_append_save
ld a, [wMysteryGiftPartnerSentDeco] ld a, [wMysteryGiftPartnerSentDeco]

View File

@@ -471,7 +471,7 @@ UnknownScript_0x90261: ; 0x90261
RingTwice_StartCall: ; 9026f RingTwice_StartCall: ; 9026f
call .Ring call .Ring
call .Ring call .Ring
callba MobileFn_1060d3 callba TrainerRankings_PhoneCalls
ret ret
; 9027c ; 9027c
@@ -500,7 +500,7 @@ PhoneCall:: ; 9029a
ld [PhoneCallerHi], a ld [PhoneCallerHi], a
call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings
call Phone_FirstOfTwoRings call Phone_FirstOfTwoRings
callba MobileFn_1060d3 callba TrainerRankings_PhoneCalls
ret ret
; 902b3 ; 902b3

View File

@@ -77,7 +77,7 @@ HandlePlayerStep: ; d4e5 (3:54e5)
ret ret
.mobile ; d509 (3:5509) .mobile ; d509 (3:5509)
callba MobileFn_10602e callba TrainerRankings_StepCount
ret ret
.fail2 ; d510 (3:5510) .fail2 ; d510 (3:5510)

View File

@@ -3199,8 +3199,8 @@ Script_halloffame: ; 97bd5
ld hl, GameTimerPause ld hl, GameTimerPause
res 0, [hl] res 0, [hl]
callba Mobile_HallOfFame callba TrainerRankings_HallOfFame
callba Mobile_HallOfFame2 callba TrainerRankings_HallOfFame2
callba HallOfFame callba HallOfFame
ld hl, GameTimerPause ld hl, GameTimerPause
set 0, [hl] set 0, [hl]

View File

@@ -20,7 +20,7 @@ _SlotMachine:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
call ClearBGPalettes call ClearBGPalettes
callba MobileFn_105fd0 callba TrainerRankings_EndSlotsWinStreak
ld hl, Options ld hl, Options
res NO_TEXT_SCROLL, [hl] res NO_TEXT_SCROLL, [hl]
ld hl, rLCDC ; $ff40 ld hl, rLCDC ; $ff40
@@ -1812,7 +1812,7 @@ SlotGetPayout: ; 93124 (24:7124)
ld a, [hl] ld a, [hl]
ld [wPayout], a ld [wPayout], a
ld d, a ld d, a
callba MobileFn_105fe3 callba TrainerRankings_AddToSlotsPayouts
ret ret
.PayoutTable: .PayoutTable:
@@ -1836,7 +1836,7 @@ SlotPayoutText: ; 93158 (24:7158)
jr nz, .MatchedSomething jr nz, .MatchedSomething
ld hl, .Text_Darn ld hl, .Text_Darn
call PrintText call PrintText
callba MobileFn_105fd0 callba TrainerRankings_EndSlotsWinStreak
ret ret
.MatchedSomething: .MatchedSomething:
@@ -1860,7 +1860,7 @@ SlotPayoutText: ; 93158 (24:7158)
.return .return
ld hl, .Text_PrintPayout ld hl, .Text_PrintPayout
call PrintText call PrintText
callba MobileFn_105f9f callba TrainerRankings_AddToSlotsWinStreak
ret ret
; 93195 (24:7195) ; 93195 (24:7195)

View File

@@ -179,7 +179,7 @@ SpecialsPointers:: ; c029
add_special Mobile_SelectThreeMons add_special Mobile_SelectThreeMons
add_special Function1037eb add_special Function1037eb
add_special Function10383c add_special Function10383c
add_special Mobile_HealParty add_special TrainerRankings_Healings
add_special RefreshSprites add_special RefreshSprites
add_special Function1037c2 add_special Function1037c2
add_special Mobile_DummyReturnFalse add_special Mobile_DummyReturnFalse

View File

@@ -1255,7 +1255,7 @@ MonMenu_Fly: ; 12e30
jr z, .Fail jr z, .Fail
cp $0 cp $0
jr z, .Error jr z, .Error
callba MobileFn_1060b5 callba TrainerRankings_Fly
ld b, $4 ld b, $4
ld a, $2 ld a, $2
ret ret

View File

@@ -107,7 +107,7 @@ PokeCenterNurseScript:
farwritetext NurseTakePokemonText farwritetext NurseTakePokemonText
pause 20 pause 20
special Mobile_HealParty special TrainerRankings_Healings
spriteface LAST_TALKED, LEFT spriteface LAST_TALKED, LEFT
pause 10 pause 10
special HealParty special HealParty

View File

@@ -146,7 +146,7 @@ TeachTMHM: ; 2c867
and a and a
jr z, .nope jr z, .nope
callba MobileFn_106049 callba TrainerRankings_TMsHMsTaught
ld a, [CurItem] ld a, [CurItem]
call IsHM call IsHM
ret c ret c

View File

@@ -1,6 +1,6 @@
_BugContestJudging: ; 1369d _BugContestJudging: ; 1369d
call ContestScore call ContestScore
callba MobileFn_105f79 callba TrainerRankings_BugContestScore
call BugContest_JudgeContestants call BugContest_JudgeContestants
ld a, [wBugContestThirdPlacePersonID] ld a, [wBugContestThirdPlacePersonID]
call LoadContestantName call LoadContestantName

View File

@@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32
ld c, l ld c, l
call CalcMagikarpLength call CalcMagikarpLength
call PrintMagikarpLength call PrintMagikarpLength
callba MagikarpLength_Mobile callba TrainerRankings_MagikarpLength
ld hl, .MeasureItText ld hl, .MeasureItText
call PrintText call PrintText

View File

@@ -472,7 +472,7 @@ UsedSurfScript: ; c986
end end
.empty_fn ; c9a2 .empty_fn ; c9a2
callba MobileFn_1060bb ; empty callba TrainerRankings_Surf
ret ret
UsedSurfText: ; c9a9 UsedSurfText: ; c9a9
@@ -745,7 +745,7 @@ Script_UsedWaterfall: ; 0xcb20
ld a, [PlayerStandingTile] ld a, [PlayerStandingTile]
call CheckWaterfallTile call CheckWaterfallTile
ret z ret z
callba MobileFn_1060c1 callba TrainerRankings_Waterfall
ld a, $1 ld a, $1
ld [ScriptVar], a ld [ScriptVar], a
ret ret

Some files were not shown because too many files have changed in this diff Show More