diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-15 10:55:44 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-15 10:55:44 -0500 |
| commit | 9bb584798e0b54a5f953665288165af86524a47c (patch) | |
| tree | fc217234aa26fd02510400128304d4d42832e0a3 /engine | |
| parent | 911c1320a29b7fd746fd7573ec562d8e21ca3001 (diff) | |
_Special_BugContestJudging → _BugContestJudging; HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic (close #473)
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/events/bug_contest/judging.asm | 2 | ||||
| -rwxr-xr-x | engine/events/halloffame.asm | 4 | ||||
| -rw-r--r-- | engine/pic_animation.asm | 2 | ||||
| -rw-r--r-- | engine/predef.asm | 2 | ||||
| -rw-r--r-- | engine/specials.asm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index 8681feb8d..a8cb80efe 100755 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -1,4 +1,4 @@ -_Special_BugContestJudging: ; 1369d +_BugContestJudging: ; 1369d call ContestScore farcall StubbedTrainerRankings_BugContestScore call BugContest_JudgeContestants diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index c3e90b597..6b01ee831 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -130,7 +130,7 @@ AnimateHallOfFame: ; 864c3 call WaitBGMap decoord 6, 5 ld c, $6 - predef HOF_Predef_AnimateFrontpic + predef Predef_HOF_AnimateFrontpic ld c, 60 call DelayFrames and a @@ -403,7 +403,7 @@ _HallOfFamePC: ; 86650 call SetPalettes decoord 6, 5 ld c, $6 - predef HOF_Predef_AnimateFrontpic + predef Predef_HOF_AnimateFrontpic and a ret diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm index 062998e5f..6f38967fe 100644 --- a/engine/pic_animation.asm +++ b/engine/pic_animation.asm @@ -1114,7 +1114,7 @@ UnusedPredef48: ; d0669 Predef 48 ld a, $1 ld [wBoxAlignment], a -HOF_Predef_AnimateFrontpic: ; d066e Predef 49 +Predef_HOF_AnimateFrontpic: ; d066e Predef 49 call AnimateMon_CheckIfPokemon jr c, .fail ld h, d diff --git a/engine/predef.asm b/engine/predef.asm index 62ca7b147..da18611e8 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -103,6 +103,6 @@ PredefPointers:: ; 856b add_predef Predef_LoadMonAnimation add_predef Predef_AnimateFrontpic add_predef UnusedPredef48 ; $48 - add_predef HOF_Predef_AnimateFrontpic + add_predef Predef_HOF_AnimateFrontpic dbw $ff, InexplicablyEmptyFunction ; ??? ; 864c diff --git a/engine/specials.asm b/engine/specials.asm index cb8eb3a6b..5ce412093 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -364,7 +364,7 @@ Special_GetMysteryGiftItem: ; c309 ; 0xc34a Special_BugContestJudging: ; c34a - farcall _Special_BugContestJudging + farcall _BugContestJudging ld a, b ld [ScriptVar], a ret |