From 2db54ecb9b2ec41dd40318395f69814af64f6f7b Mon Sep 17 00:00:00 2001 From: Rangi Date: Thu, 5 Nov 2020 13:23:57 -0500 Subject: Sync more with pokeyellow --- engine/items/inventory.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/items') diff --git a/engine/items/inventory.asm b/engine/items/inventory.asm index bf433175..ec1cfd0f 100644 --- a/engine/items/inventory.asm +++ b/engine/items/inventory.asm @@ -27,7 +27,7 @@ AddItemToInventory_:: ld a, [hli] and a jr z, .addNewItem -.loop +.notAtEndOfInventory ld a, [hli] ld b, a ; b = ID of current item in table ld a, [wcf91] ; a = ID of item being added @@ -36,7 +36,7 @@ AddItemToInventory_:: inc hl ld a, [hl] cp $ff ; is it the end of the table? - jr nz, .loop + jr nz, .notAtEndOfInventory .addNewItem ; add an item not yet in the inventory pop hl ld a, d @@ -73,7 +73,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 .notAtEndOfInventory .increaseItemQuantityFailed pop hl and a -- cgit v1.2.3 From 66377fca32c63ca9e362d2d2ce15f0692260ce53 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 14 Nov 2020 20:52:10 -0600 Subject: Fix file modes --- engine/items/item_effects.asm | 0 engine/items/itemfinder.asm | 0 engine/items/tm_prices.asm | 0 engine/items/tmhm.asm | 0 engine/items/tms.asm | 0 engine/items/town_map.asm | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 engine/items/item_effects.asm mode change 100755 => 100644 engine/items/itemfinder.asm mode change 100755 => 100644 engine/items/tm_prices.asm mode change 100755 => 100644 engine/items/tmhm.asm mode change 100755 => 100644 engine/items/tms.asm mode change 100755 => 100644 engine/items/town_map.asm (limited to 'engine/items') diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm old mode 100755 new mode 100644 diff --git a/engine/items/itemfinder.asm b/engine/items/itemfinder.asm old mode 100755 new mode 100644 diff --git a/engine/items/tm_prices.asm b/engine/items/tm_prices.asm old mode 100755 new mode 100644 diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm old mode 100755 new mode 100644 diff --git a/engine/items/tms.asm b/engine/items/tms.asm old mode 100755 new mode 100644 diff --git a/engine/items/town_map.asm b/engine/items/town_map.asm old mode 100755 new mode 100644 -- cgit v1.2.3