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

No more mobile EQUS ret (replace with Stubbed_ + ret)

Browse Source
This commit is contained in:
xCrystal 2018-01-02 20:00:14 +01:00
parent b4e087167f
commit aa9a0a900d
39 changed files with 193 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/battle/core.asm
View File

@ -160,7 +160,7 @@ WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
BattleTurn: ; 3c12f BattleTurn: ; 3c12f
.loop .loop
call MobileFn_3c1bf call Stubbed_Function3c1bf
call CheckContestBattleOver call CheckContestBattleOver
jp c, .quit jp c, .quit
@ -231,7 +231,8 @@ BattleTurn: ; 3c12f
ret ret
; 3c1bf ; 3c1bf
MobileFn_3c1bf: mobile Stubbed_Function3c1bf:
ret
ld a, $5 ld a, $5
call GetSRAMBank call GetSRAMBank
ld hl, $a89b ; s5_a89b ld hl, $a89b ; s5_a89b
@ -2588,7 +2589,7 @@ AddBattleMoneyToAccount: ; 3d0be
push bc push bc
ld b, h ld b, h
ld c, l ld c, l
farcall TrainerRankings_AddToBattlePayouts farcall StubbedTrainerRankings_AddToBattlePayouts
pop bc pop bc
pop hl pop hl
.loop .loop
@ -8375,7 +8376,7 @@ Unreferenced_DoBattle: ; 3f4d9
; 3f4dd ; 3f4dd
BattleIntro: ; 3f4dd BattleIntro: ; 3f4dd
farcall TrainerRankings_Battles ; mobile farcall StubbedTrainerRankings_Battles ; mobile
call LoadTrainerOrWildMonPic call LoadTrainerOrWildMonPic
xor a xor a
ld [TempBattleMonSpecies], a ld [TempBattleMonSpecies], a
@ -8460,7 +8461,7 @@ BackUpBGMap2: ; 3f568
InitEnemyTrainer: ; 3f594 InitEnemyTrainer: ; 3f594
ld [TrainerClass], a ld [TrainerClass], a
farcall TrainerRankings_TrainerBattles farcall StubbedTrainerRankings_TrainerBattles
xor a xor a
ld [TempEnemyMonSpecies], a ld [TempEnemyMonSpecies], a
callfar GetTrainerAttributes callfar GetTrainerAttributes
@ -8516,7 +8517,7 @@ InitEnemyTrainer: ; 3f594
InitEnemyWildmon: ; 3f607 InitEnemyWildmon: ; 3f607
ld a, WILD_BATTLE ld a, WILD_BATTLE
ld [wBattleMode], a ld [wBattleMode], a
farcall TrainerRankings_WildBattles farcall StubbedTrainerRankings_WildBattles
call LoadEnemyMon call LoadEnemyMon
ld hl, EnemyMonMoves ld hl, EnemyMonMoves
ld de, wWildMonMoves ld de, wWildMonMoves
@ -8698,7 +8699,7 @@ CheckPayDay: ; 3f71d
; 3f759 ; 3f759
ShowLinkBattleParticipantsAfterEnd: ; 3f759 ShowLinkBattleParticipantsAfterEnd: ; 3f759
farcall TrainerRankings_LinkBattles farcall StubbedTrainerRankings_LinkBattles
farcall BackupMobileEventIndex farcall BackupMobileEventIndex
ld a, [CurOTMon] ld a, [CurOTMon]
ld hl, OTPartyMon1Status ld hl, OTPartyMon1Status
@ -8728,17 +8729,17 @@ DisplayLinkBattleResult: ; 3f77c
cp $1 cp $1
jr c, .victory jr c, .victory
jr z, .loss jr z, .loss
farcall TrainerRankings_ColosseumDraws farcall StubbedTrainerRankings_ColosseumDraws
ld de, .Draw ld de, .Draw
jr .store_result jr .store_result
.victory .victory
farcall TrainerRankings_ColosseumWins farcall StubbedTrainerRankings_ColosseumWins
ld de, .Win ld de, .Win
jr .store_result jr .store_result
.loss .loss
farcall TrainerRankings_ColosseumLosses farcall StubbedTrainerRankings_ColosseumLosses
ld de, .Lose ld de, .Lose
jr .store_result jr .store_result
@ -9486,7 +9487,7 @@ BattleStartMessage: ; 3fc8b
cp BATTLETYPE_FISH cp BATTLETYPE_FISH
jr nz, .NotFishing jr nz, .NotFishing
farcall TrainerRankings_HookedEncounters farcall StubbedTrainerRankings_HookedEncounters
ld hl, HookedPokemonAttackedText ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText jr .PlaceBattleStartText

4
engine/battle/effect_commands.asm
View File

@ -8078,7 +8078,7 @@ BattleCommand_LeechSeed: ; 36f9d
BattleCommand_Splash: ; 36fe1 BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove call AnimateCurrentMove
farcall TrainerRankings_Splash farcall StubbedTrainerRankings_Splash
jp PrintNothingHappened jp PrintNothingHappened
; 36fed ; 36fed
@ -8605,7 +8605,7 @@ CheckSubstituteOpp: ; 37378
BattleCommand_Selfdestruct: ; 37380 BattleCommand_Selfdestruct: ; 37380
farcall TrainerRankings_Selfdestruct farcall StubbedTrainerRankings_Selfdestruct
ld a, BATTLEANIM_PLAYER_DAMAGE ld a, BATTLEANIM_PLAYER_DAMAGE
ld [wNumHits], a ld [wNumHits], a
ld c, 3 ld c, 3

2
engine/breeding.asm
View File

@ -232,7 +232,7 @@ HatchEggs: ; 16f70 (5:6f70)
push de push de
farcall SetEggMonCaughtData farcall SetEggMonCaughtData
farcall TrainerRankings_EggsHatched farcall StubbedTrainerRankings_EggsHatched
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMon1Species ld hl, PartyMon1Species
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH

3
engine/color.asm
View File

@ -737,7 +737,8 @@ GetMonPalettePointer_:
call GetMonPalettePointer call GetMonPalettePointer
ret ret
Function9779: mobile Unreferenced_Function9779:
ret
call CheckCGB call CheckCGB
ret z ret z
ld hl, BattleObjectPals ld hl, BattleObjectPals

2
engine/events/bug_contest/judging.asm
View File

@ -1,6 +1,6 @@
_Special_BugContestJudging: ; 1369d _Special_BugContestJudging: ; 1369d
call ContestScore call ContestScore
farcall TrainerRankings_BugContestScore farcall StubbedTrainerRankings_BugContestScore
call BugContest_JudgeContestants call BugContest_JudgeContestants
ld a, [wBugContestThirdPlaceWinnerID] ld a, [wBugContestThirdPlaceWinnerID]
call LoadContestantName call LoadContestantName

2
engine/events/fruit_trees.asm
View File

@ -58,7 +58,7 @@ CheckFruitTree: ; 44055
; 4405f ; 4405f
PickedFruitTree: ; 4405f PickedFruitTree: ; 4405f
farcall TrainerRankings_FruitPicked farcall StubbedTrainerRankings_FruitPicked
ld b, 1 ld b, 1
jp GetFruitTreeFlag jp GetFruitTreeFlag
; 4406a ; 4406a

2
engine/events/lucky_number.asm
View File

@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a
ld a, [ScriptVar] ld a, [ScriptVar]
and a and a
ret z ; found nothing ret z ; found nothing
farcall TrainerRankings_LuckyNumberShow farcall StubbedTrainerRankings_LuckyNumberShow
ld a, [wFoundMatchingIDInParty] ld a, [wFoundMatchingIDInParty]
and a and a
push af push af

2
engine/events/magikarp.asm
View File

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

4
engine/events/overworld.asm
View File

@ -427,7 +427,7 @@ UsedSurfScript: ; c986
end end
.empty_fn ; c9a2 .empty_fn ; c9a2
farcall TrainerRankings_Surf farcall StubbedTrainerRankings_Surf
ret ret
UsedSurfText: ; c9a9 UsedSurfText: ; c9a9
@ -700,7 +700,7 @@ Script_UsedWaterfall: ; 0xcb20
ld a, [PlayerStandingTile] ld a, [PlayerStandingTile]
call CheckWaterfallTile call CheckWaterfallTile
ret z ret z
farcall TrainerRankings_Waterfall farcall StubbedTrainerRankings_Waterfall
ld a, $1 ld a, $1
ld [ScriptVar], a ld [ScriptVar], a
ret ret

2
engine/events/std_scripts.asm
View File

@ -107,7 +107,7 @@ PokecenterNurseScript:
farwritetext NurseTakePokemonText farwritetext NurseTakePokemonText
pause 20 pause 20
special Special_TrainerRankings_Healings special Special_StubbedTrainerRankings_Healings
spriteface LAST_TALKED, LEFT spriteface LAST_TALKED, LEFT
pause 10 pause 10
special HealParty special HealParty

2
engine/events/whiteout.asm
View File

@ -49,7 +49,7 @@ BattleBGMap: ; 1250a
; 12513 ; 12513
HalveMoney: ; 12513 HalveMoney: ; 12513
farcall TrainerRankings_WhiteOuts farcall StubbedTrainerRankings_WhiteOuts
; Halve the player's money. ; Halve the player's money.
ld hl, Money ld hl, Money

2
engine/events_3.asm
View File

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

2
engine/evolve.asm
View File

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

2
engine/item_effects.asm
View File

@ -517,7 +517,7 @@ ParkBall: ; e8a2
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jp z, .FinishTutorial jp z, .FinishTutorial
farcall TrainerRankings_WildMonsCaught farcall StubbedTrainerRankings_WildMonsCaught
ld hl, Text_GotchaMonWasCaught ld hl, Text_GotchaMonWasCaught
call PrintText call PrintText

2
engine/link.asm
View File

@ -1957,7 +1957,7 @@ LinkTrade: ; 28b87
.save .save
farcall SaveAfterLinkTrade farcall SaveAfterLinkTrade
farcall TrainerRankings_Trades farcall StubbedTrainerRankings_Trades
farcall BackupMobileEventIndex farcall BackupMobileEventIndex
ld c, 40 ld c, 40
call DelayFrames call DelayFrames

7
engine/map_objects.asm
View File

@ -1570,7 +1570,7 @@ StepType05: ; 4e0c
ld [hl], a ld [hl], a
call IncrementObjectStructField1c call IncrementObjectStructField1c
StepType04: ; 4e21 StepType04: ; 4e21
call MobileFn_4fb2 call Stubbed_Function4fb2
ld hl, OBJECT_DIRECTION_WALKING ld hl, OBJECT_DIRECTION_WALKING
add hl, bc add hl, bc
ld [hl], STANDING ld [hl], STANDING
@ -1578,7 +1578,7 @@ StepType04: ; 4e21
; 4e2b ; 4e2b
NPCStep: ; 4e2b NPCStep: ; 4e2b
call MobileFn_4fb2 call Stubbed_Function4fb2
call AddStepVector call AddStepVector
ld hl, OBJECT_STEP_DURATION ld hl, OBJECT_STEP_DURATION
add hl, bc add hl, bc
@ -1841,7 +1841,8 @@ SkyfallTop: ; 4f83
ret ret
; 4fb2 ; 4fb2
MobileFn_4fb2: mobile Stubbed_Function4fb2:
ret
ld hl, OBJECT_1D ld hl, OBJECT_1D
add hl, bc add hl, bc
inc [hl] inc [hl]

2
engine/mystery_gift.asm
View File

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

4
engine/phone/phone.asm
View File

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

2
engine/player_step.asm
View File

@ -76,7 +76,7 @@ HandlePlayerStep: ; d4e5 (3:54e5)
ret ret
.mobile ; d509 (3:5509) .mobile ; d509 (3:5509)
farcall TrainerRankings_StepCount farcall StubbedTrainerRankings_StepCount
ret ret
.fail2 ; d510 (3:5510) .fail2 ; d510 (3:5510)

4
engine/scripting.asm
View File

@ -2994,8 +2994,8 @@ Script_halloffame:
ld hl, wGameTimerPause ld hl, wGameTimerPause
res 0, [hl] res 0, [hl]
farcall TrainerRankings_HallOfFame farcall StubbedTrainerRankings_HallOfFame
farcall TrainerRankings_HallOfFame2 farcall StubbedTrainerRankings_HallOfFame2
farcall HallOfFame farcall HallOfFame
ld hl, wGameTimerPause ld hl, wGameTimerPause
set 0, [hl] set 0, [hl]

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