thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack""

Browse source 
This reverts commit e772de43d5.
This commit is contained in:
Llinos Evans 2023-04-09 14:03:02 +01:00
parent e772de43d5
commit 4389e86fd1
18 changed files with 107 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

17
engine/debug/debug_party.asm
View file

@ -21,13 +21,13 @@ SetIshiharaTeam:
jr .loop
IshiharaTeam:
db EXEGGUTOR, 90
db EXEGGUTOR_A, 90
db RAICHU, 90
db EXEGGUTOR, 90
db RAPIDASH, 50
db MEWTWO, 90
db PORYGON, 50
IF DEF(_DEBUG)
db GOLEM, 50
db MAROWAK, 50
db NINETALES, 50
db DUGTRIO, 50
ENDC
db -1 ; end
@ -143,7 +143,6 @@ DebugItemsList:
db RARE_CANDY, 99
db MASTER_BALL, 99
db ULTRA_BALL, 99
db CANDY_JAR, 99
db SECRET_KEY, 1
db CARD_KEY, 1
db S_S_TICKET, 1
@ -152,7 +151,11 @@ DebugItemsList:
db COIN_CASE, 1
db POKE_FLUTE, 1
db SILPH_SCOPE, 1
db OLDSEACHART, 1
db OLD_SEA_MAP, 1
db UP_GRADE, 1
db TM_MEGA_PUNCH, 1
db HM_SURF, 1
db FLOOR_1F
db -1 ; end
DebugUnusedList:

1
engine/events/in_game_trades.asm
View file

@ -277,7 +277,6 @@ InGameTradeTextPointers:
dw TradeTextPointers3
dw TradeTextPointers4
dw TradeTextPointers5
;dw TradeTextPointers6
TradeTextPointers1:
dw WannaTrade1Text

16
engine/items/item_effects.asm
View file

@ -100,6 +100,14 @@ ItemUsePtrTable:
dw ItemUsePPRestore ; MAX_ETHER
dw ItemUsePPRestore ; ELIXER
dw ItemUsePPRestore ; MAX_ELIXER
dw ItemUseEvoStone ; ICE_STONE
dw ItemUseEvoStone ; PROTECTOR
dw ItemUseEvoStone ; POISON_STONE
dw ItemUseEvoStone ; BLK_AUGURITE
dw ItemUseEvoStone ; DUBIOUS_DISC
dw UnusableItem ; CITRINE_PASS
dw UnusableItem ; OLDSEACHART
dw ItemUseEvoStone ; UP_GRADE
dw UnusableItem ; FLOOR_B2F
dw UnusableItem ; FLOOR_B1F
dw UnusableItem ; FLOOR_1F
@ -114,14 +122,6 @@ ItemUsePtrTable:
dw UnusableItem ; FLOOR_10F
dw UnusableItem ; FLOOR_11F
dw UnusableItem ; FLOOR_14F
dw ItemUseEvoStone ; ICE_STONE
dw ItemUseEvoStone ; PROTECTOR
dw ItemUseEvoStone ; POISON_STONE
dw ItemUseEvoStone ; BLK_AUGURITE
dw ItemUseEvoStone ; DUBIOUS_DISC
dw UnusableItem ; CITRINE_PASS
dw UnusableItem ; OLDSEACHART
dw ItemUseEvoStone ; UP_GRADE
ItemUseBall:

32
engine/menus/item_descriptions.asm
View file

@ -180,34 +180,6 @@ ItemDescriptionPointers:
text_end
text_far _MaxElixerDescription
text_end
text_far _UnusedItemDescription ; for the floor items - we've added items after these, so we need to stuff them in lest TM descriptions invade our personal space.
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end
text_far _UnusedItemDescription
text_end ; floor items end here
text_far _IceStoneDescription
text_end
text_far _ProtectorDescription
@ -220,7 +192,9 @@ ItemDescriptionPointers:
text_end
text_far _CitrinePassDescription
text_end
text_far _OldSeaChartDescription
text_far _OldSeaMapDescription
text_end
text_far _UpGradeDescription
text_end
text_far _HM01Description
text_end