diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 20:00:14 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-01-02 20:00:14 +0100 |
| commit | aa9a0a900ddeaa79a05f1b93458a8b19ae170d69 (patch) | |
| tree | edad8064a35aec29c6b874101eba41d21305cda0 /engine/events | |
| parent | b4e087167f3263342bbe01b5256f42fcf2d726af (diff) | |
No more mobile EQUS ret (replace with Stubbed_ + ret)
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/bug_contest/judging.asm | 2 | ||||
| -rw-r--r-- | engine/events/fruit_trees.asm | 2 | ||||
| -rw-r--r-- | engine/events/lucky_number.asm | 2 | ||||
| -rw-r--r-- | engine/events/magikarp.asm | 2 | ||||
| -rwxr-xr-x | engine/events/overworld.asm | 4 | ||||
| -rw-r--r-- | engine/events/std_scripts.asm | 2 | ||||
| -rwxr-xr-x | engine/events/whiteout.asm | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 8e4b063d6..0dbd27024 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -1,6 +1,6 @@ _Special_BugContestJudging: ; 1369d call ContestScore - farcall TrainerRankings_BugContestScore + farcall StubbedTrainerRankings_BugContestScore call BugContest_JudgeContestants ld a, [wBugContestThirdPlaceWinnerID] call LoadContestantName diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index d0b0bac15..139c27612 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -58,7 +58,7 @@ CheckFruitTree: ; 44055 ; 4405f PickedFruitTree: ; 4405f - farcall TrainerRankings_FruitPicked + farcall StubbedTrainerRankings_FruitPicked ld b, 1 jp GetFruitTreeFlag ; 4406a diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 4488cfcc9..a172fc431 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -103,7 +103,7 @@ Special_CheckForLuckyNumberWinners: ; 4d87a ld a, [ScriptVar] and a ret z ; found nothing - farcall TrainerRankings_LuckyNumberShow + farcall StubbedTrainerRankings_LuckyNumberShow ld a, [wFoundMatchingIDInParty] and a push af diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 68e8baad7..5f21e978c 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -28,7 +28,7 @@ Special_CheckMagikarpLength: ; fbb32 ld c, l call CalcMagikarpLength call PrintMagikarpLength - farcall TrainerRankings_MagikarpLength + farcall StubbedTrainerRankings_MagikarpLength ld hl, .MeasureItText call PrintText diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm index 27f3fd595..c9e0a5fe5 100755 --- a/engine/events/overworld.asm +++ b/engine/events/overworld.asm @@ -427,7 +427,7 @@ UsedSurfScript: ; c986 end .empty_fn ; c9a2 - farcall TrainerRankings_Surf + farcall StubbedTrainerRankings_Surf ret UsedSurfText: ; c9a9 @@ -700,7 +700,7 @@ Script_UsedWaterfall: ; 0xcb20 ld a, [PlayerStandingTile] call CheckWaterfallTile ret z - farcall TrainerRankings_Waterfall + farcall StubbedTrainerRankings_Waterfall ld a, $1 ld [ScriptVar], a ret diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm index beb118e5c..69fcc3ca7 100644 --- a/engine/events/std_scripts.asm +++ b/engine/events/std_scripts.asm @@ -107,7 +107,7 @@ PokecenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Special_TrainerRankings_Healings + special Special_StubbedTrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm index 1ad5c9c65..a9bee4c2b 100755 --- a/engine/events/whiteout.asm +++ b/engine/events/whiteout.asm @@ -49,7 +49,7 @@ BattleBGMap: ; 1250a ; 12513 HalveMoney: ; 12513 - farcall TrainerRankings_WhiteOuts + farcall StubbedTrainerRankings_WhiteOuts ; Halve the player's money. ld hl, Money |