From bdde60c64b9268ffa1a26c1ea0434edbec4d5b21 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 22 Jul 2018 23:42:50 -0400 Subject: =?UTF-8?q?ANIM=5FMON=5FUNUSED=20=E2=86=92=20ANIM=5FMON=5FHOF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/halloffame.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/events') diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 6cbc749d5..fcbcc1593 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -124,7 +124,7 @@ AnimateHallOfFame: call PlaceString call WaitBGMap decoord 6, 5 - ld c, $6 + ld c, ANIM_MON_HOF predef HOF_AnimateFrontpic ld c, 60 call DelayFrames @@ -390,7 +390,7 @@ _HallOfFamePC: call GetSGBLayout call SetPalettes decoord 6, 5 - ld c, $6 + ld c, ANIM_MON_HOF predef HOF_AnimateFrontpic and a ret -- cgit v1.2.3 From a1806d6e816369ad5452c4a008d7cd5802f1ec45 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 23 Jul 2018 00:13:43 -0400 Subject: Consistent routine naming convention: 'Foo' wraps '_Foo' --- engine/events/pokecenter_pc.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/events') diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index f1a593b5a..8f73fc41e 100644 --- a/engine/events/pokecenter_pc.asm +++ b/engine/events/pokecenter_pc.asm @@ -478,21 +478,21 @@ PlayerDepositItemMenu: push af ld a, [wBuffer2] push af - call .DepositItem_ + call .DepositItem pop af ld [wBuffer2], a pop af ld [wBuffer1], a ret -.DepositItem_: +.DepositItem: farcall _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a jr z, .AskQuantity ld a, $1 ld [wItemQuantityChangeBuffer], a - jr .DepositItem + jr .ContinueDeposit .AskQuantity: ld hl, .HowManyText @@ -504,7 +504,7 @@ PlayerDepositItemMenu: pop af jr c, .DeclinedToDeposit -.DepositItem: +.ContinueDeposit: ld a, [wItemQuantityChangeBuffer] ld [wBuffer1], a ld a, [wCurItemQuantity] -- cgit v1.2.3 From 4f0c9cecf9a4c9dec50e2a5fce8392c2217068e0 Mon Sep 17 00:00:00 2001 From: Rangi Date: Mon, 23 Jul 2018 00:25:53 -0400 Subject: =?UTF-8?q?StringCmp=20=E2=86=92=20CompareBytes;=20CompareLong=20?= =?UTF-8?q?=E2=86=92=20CompareBytesLong=20hStringCmpString[1/2]=20?= =?UTF-8?q?=E2=86=92=20h[EnemyMon/PartyMon1]Speed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- engine/events/bug_contest/judging.asm | 6 +++--- engine/events/magikarp.asm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engine/events') diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm index d8f9d7657..a6ec3baf6 100644 --- a/engine/events/bug_contest/judging.asm +++ b/engine/events/bug_contest/judging.asm @@ -171,7 +171,7 @@ DetermineContestWinners: ld de, wBugContestTempScore ld hl, wBugContestFirstPlaceScore ld c, 2 - call StringCmp + call CompareBytes jr c, .not_first_place ld hl, wBugContestSecondPlaceWinnerID ld de, wBugContestThirdPlaceWinnerID @@ -189,7 +189,7 @@ DetermineContestWinners: ld de, wBugContestTempScore ld hl, wBugContestSecondPlaceScore ld c, 2 - call StringCmp + call CompareBytes jr c, .not_second_place ld hl, wBugContestSecondPlaceWinnerID ld de, wBugContestThirdPlaceWinnerID @@ -203,7 +203,7 @@ DetermineContestWinners: ld de, wBugContestTempScore ld hl, wBugContestThirdPlaceScore ld c, 2 - call StringCmp + call CompareBytes jr c, .done ld hl, wBugContestThirdPlaceWinnerID call CopyTempContestant diff --git a/engine/events/magikarp.asm b/engine/events/magikarp.asm index 7fe8adba7..cf8ad80ba 100644 --- a/engine/events/magikarp.asm +++ b/engine/events/magikarp.asm @@ -36,7 +36,7 @@ CheckMagikarpLength: ld hl, wMagikarpLength ld de, wBestMagikarpLengthFeet ld c, 2 - call StringCmp + call CompareBytes jr nc, .not_long_enough ; NEW RECORD!!! Let's save that. -- cgit v1.2.3