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

@@ -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

View File

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

View File

@@ -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

View File

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

View File

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

View File

@@ -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]

View File

@@ -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

View File

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

View File

@@ -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]

View File

@@ -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)

View File

@@ -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

View File

@@ -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

View File

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

View File

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