pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Labels for Trainer Rankings stat tracking functions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
battle/core.asm
View File

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

4
battle/effect_commands.asm
View File

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

50
constants/sram_constants.asm
View File

@@ -1,3 +1,53 @@
; 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
LOGIN_PASSWORD_LENGTH EQU 17

2
engine/breeding/egg.asm
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

2
engine/events_3.asm
View File

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

2
engine/evolve.asm
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

2
engine/fruit_trees.asm
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

2
engine/link.asm
View File

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

2
engine/mysterygift.asm
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]

4
engine/phone.asm
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

2
engine/player_step.asm
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)

4
engine/scripting.asm
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]

8
engine/slot_machine.asm
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)

2
engine/specials.asm
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

2
engine/startmenu.asm
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

2
engine/std_scripts.asm
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

2
engine/tmhm2.asm
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

2
event/bug_contest_judging.asm
View File

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

2
event/magikarp.asm
View File

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

4
event/overworld.asm
View File

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

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