diff options
Diffstat (limited to 'engine')
| -rwxr-xr-x | engine/evos_moves.asm | 4 | ||||
| -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 | ||||
| -rwxr-xr-x | engine/save.asm | 4 |
5 files changed, 24 insertions, 4 deletions
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm index f50f8081..27526bd1 100755 --- a/engine/evos_moves.asm +++ b/engine/evos_moves.asm @@ -207,7 +207,11 @@ Evolution_PartyMonLoop: ; loop over party mons ld [wd11e], a xor a ld [wMonDataLocation], a + ld a, [wcf91] + push af call LearnMoveFromLevelUp + pop af + ld [wcf91], a pop hl predef SetPartyMonTypes ld a, [wIsInBattle] diff --git a/engine/items/items.asm b/engine/items/items.asm index f8873a6e..95fea960 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -99,6 +99,21 @@ ItemUsePtrTable: 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: diff --git a/engine/menu/party_menu.asm b/engine/menu/party_menu.asm index a35524ed..5988f7e5 100755 --- a/engine/menu/party_menu.asm +++ b/engine/menu/party_menu.asm @@ -148,11 +148,11 @@ RedrawPartyMenu_: 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 251d7ae4..d3baeb0e 100755 --- a/engine/menu/start_sub_menus.asm +++ b/engine/menu/start_sub_menus.asm @@ -484,6 +484,7 @@ UsableItems_PartyMenu: db MAX_ETHER db ELIXER db MAX_ELIXER + db ICE_STONE db $ff ; items which close the item menu when used diff --git a/engine/save.asm b/engine/save.asm index 4fb2c4c8..59f81db7 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -117,7 +117,7 @@ LoadSAV2: call CopyData ld hl, sMainData ld de, wPokedexOwned - ld bc, wPokedexSeenEnd - wPokedexOwned + ld bc, wPokedexSeenEndOld - wPokedexOwned call CopyData and a jp SAVGoodChecksum @@ -260,7 +260,7 @@ SaveSAVtoSRAM2: call CopyData ld hl, wPokedexOwned ; pokédex only ld de, sMainData - ld bc, wPokedexSeenEnd - wPokedexOwned + ld bc, wPokedexSeenEndOld - wPokedexOwned call CopyData ld hl, sPlayerName ld bc, sMainDataCheckSum - sPlayerName |