diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/items/items.asm | 15 | ||||
| -rwxr-xr-x | engine/menu/party_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/start_sub_menus.asm | 1 |
3 files changed, 18 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm index f0666587..c996ba96 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -99,6 +99,21 @@ ItemUsePtrTable: ; d5e1 (3:55e1) dw ItemUsePPRestore ; MAX_ETHER dw ItemUsePPRestore ; ELIXER dw ItemUsePPRestore ; MAX_ELIXER + dw UnusableItem ; FLOOR_B2F + dw UnusableItem ; FLOOR_B1F + dw UnusableItem ; FLOOR_1F + dw UnusableItem ; FLOOR_2F + dw UnusableItem ; FLOOR_3F + dw UnusableItem ; FLOOR_4F + dw UnusableItem ; FLOOR_5F + dw UnusableItem ; FLOOR_6F + dw UnusableItem ; FLOOR_7F + dw UnusableItem ; FLOOR_8F + dw UnusableItem ; FLOOR_9F + dw UnusableItem ; FLOOR_10F + dw UnusableItem ; FLOOR_11F + dw UnusableItem ; FLOOR_B4F + dw ItemUseEvoStone ; ICE_STONE ItemUseBall: ; d687 (3:5687) ld a,[W_ISINBATTLE] diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index f3e1a138..fb07766d 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -148,11 +148,11 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3) ld a,[hli] ld h,[hl] ld l,a - ld de,wcd6d + ld de,wEvolutionData ld a,BANK(EvosMovesPointerTable) ld bc,Mon133_EvosEnd - Mon133_EvosMoves call FarCopyData - ld hl,wcd6d + ld hl,wEvolutionData ld de,.notAbleToEvolveText ; loop through the pokemon's evolution entries .checkEvolutionsLoop diff --git a/engine/menu/start_sub_menus.asm b/engine/menu/start_sub_menus.asm index ab8c8756..e1dc5d98 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -484,6 +484,7 @@ UsableItems_PartyMenu: ; 13434 (4:7434) db MAX_ETHER db ELIXER db MAX_ELIXER + db ICE_STONE db $ff ; items which close the item menu when used |