diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:21:31 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-07-27 11:24:59 +0200 |
| commit | 9aa6b55d7b1fdb97426305c0ed07fc14012f1293 (patch) | |
| tree | b1123bc6dc8d5f29577ad7518f49042f210571d2 /engine/events | |
| parent | a91b59ab5dd2468e3f48079d45f90a9625a29fe3 (diff) | |
| parent | 748d4249805c19399b3c72c0f60d0f1a6ffe43ad (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/bug_contest/judging.asm | 6 | ||||
| -rw-r--r-- | engine/events/halloffame.asm | 4 | ||||
| -rw-r--r-- | engine/events/magikarp.asm | 2 | ||||
| -rw-r--r-- | engine/events/pokecenter_pc.asm | 8 |
4 files changed, 10 insertions, 10 deletions
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/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 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. 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] |