diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 13:23:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 15:15:37 -0500 |
| commit | 472f5824a65eaa76f6c92e66bfabb1a1eac66442 (patch) | |
| tree | 14b4ba61b32f85c88011ad636f323e1da49b1212 /engine/items | |
| parent | e37300a446f6c5c9612e489305c96515cf88a5ca (diff) | |
Sync more with pokered
Diffstat (limited to 'engine/items')
| -rw-r--r-- | engine/items/inventory.asm | 4 | ||||
| -rwxr-xr-x | engine/items/item_effects.asm | 2 | ||||
| -rwxr-xr-x | engine/items/tms.asm | 2 | ||||
| -rwxr-xr-x | engine/items/town_map.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index 86003319..e28edc6c 100644 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -34,7 +34,7 @@ AddItemToInventory_:: cp b ; does the current item in the table match the item being added? jp z, .increaseItemQuantity ; if so, increase the item's quantity inc hl -.loop +.addAnotherStackOfItem ld a, [hl] cp $ff ; is it the end of the table? jr nz, .notAtEndOfInventory @@ -74,7 +74,7 @@ AddItemToInventory_:: ; if so, store 99 in the current slot and store the rest in a new slot ld a, 99 ld [hli], a - jp .loop + jp .addAnotherStackOfItem .increaseItemQuantityFailed pop hl and a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index d4c3ae18..f8a388d5 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -3092,7 +3092,7 @@ SendNewMonToBox: ld a, [wcf91] cp KADABRA jr nz, .notKadabra - ld a, $60 ; twistedspoon in gsc + ld a, TWISTEDSPOON_GSC ld [wBoxMon1CatchRate], a .notKadabra ret diff --git a/engine/items/tms.asm b/engine/items/tms.asm index dcf2665d..40030675 100755 --- a/engine/items/tms.asm +++ b/engine/items/tms.asm @@ -11,7 +11,7 @@ CanLearnTM: ld hl, TechnicalMachines .findTMloop ld a, [hli] - cp $ff ; reached terminator? + cp -1 ; reached terminator? jr z, .done cp b jr z, .TMfoundLoop diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm index c401d1c1..d385044a 100755 --- a/engine/items/town_map.asm +++ b/engine/items/town_map.asm @@ -152,7 +152,7 @@ LoadTownMap_Fly:: call LoadFontTilePatterns ld de, BirdSprite ld b, BANK(BirdSprite) - ld c, $c + ld c, 12 ld hl, vSprites tile $04 call CopyVideoData ld de, TownMapUpArrow |