Fixing My Errors + More

This commit is contained in:
Misty Violet 2023-10-22 18:15:19 -04:00
parent fa5f2111f9
commit d0d6bbb8cf
25 changed files with 518 additions and 702 deletions

View file

@ -276,22 +276,22 @@ ItemAttributes:
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; PASS
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_87
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_88
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_89
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; HEART_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; POISON_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ICE_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; CHARCOAL
item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY_JUICE
item_attribute 100, HELD_BERRY, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SCOPE_LENS
item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_8D
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_8E
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; DUSK_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; SHINY_STONE
item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; METAL_COAT
item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BUG: Dragon Scale, not Dragon Fang, boosts Dragon-type moves (see docs/bugs_and_glitches.md)
@ -387,14 +387,14 @@ ItemAttributes:
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MIRAGE_MAIL
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_BE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_DC
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_C3
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_FA
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; OLD_AMBER
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; DOME_FOSSIL
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; HELIX_FOSSIL
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; WING_FOSSIL
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS
; TM01
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE

View file

@ -9,10 +9,10 @@ TimeCapsule_CatchRateItems:
db ITEM_5A, BERRY
db ITEM_64, BERRY
db ITEM_78, BERRY
db ITEM_87, BERRY
db ITEM_BE, BERRY
db ITEM_C3, BERRY
db ITEM_DC, BERRY
db ITEM_FA, BERRY
db HEART_STONE, BERRY
db OLD_AMBER, BERRY
db DOME_FOSSIL, BERRY
db HELIX_FOSSIL, BERRY
db WING_FOSSIL, BERRY
db -1, BERRY
db 0 ; end

View file

@ -135,14 +135,14 @@ ItemDescriptions:
dw StarPieceDesc
dw BasementKeyDesc
dw PassDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw HeartStoneDesc
dw PoisonStoneDesc
dw IceStoneDesc
dw CharcoalDesc
dw BerryJuiceDesc
dw ScopeLensDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw DuskStoneDesc
dw ShinyStoneDesc
dw MetalCoatDesc
dw DragonFangDesc
dw QuestionMarkDesc
@ -190,10 +190,10 @@ ItemDescriptions:
dw BlueSkyMailDesc
dw MusicMailDesc
dw MirageMailDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw QuestionMarkDesc
dw OldAmberDesc
dw DomeFossilDesc
dw HelixFossilDesc
dw WingFossilDesc
assert_table_length NUM_ITEMS
dw QuestionMarkDesc
dw QuestionMarkDesc
@ -919,3 +919,39 @@ MirageMailDesc:
FairyFeatherDesc:
db "Powers up fairy-"
next "type moves. (HOLD)@"
OldAmberDesc:
db "Amber with DNA of"
next "an ancient #MON."
DomeFossilDesc:
db "A dome-shaped fossil"
next "of an ancient #MON."
HelixFossilDesc:
db "A swirl-shaped fossil"
next "of an ancient #MON."
WingFossilDesc:
db "A wing-shaped fossil"
next "of an ancient #MON."
HeartStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"
PoisonStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"
IceStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"
DuskStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"
ShinyStoneDesc:
db "Evolves certain"
next "kinds of #MON.@"

View file

@ -134,14 +134,14 @@ ItemNames::
li "STAR PIECE"
li "BASEMENT KEY"
li "PASS"
li "TERU-SAMA"
li "TERU-SAMA"
li "TERU-SAMA"
li "HEART STONE"
li "POISON STONE"
li "ICE STONE"
li "CHARCOAL"
li "BERRY JUICE"
li "SCOPE LENS"
li "TERU-SAMA"
li "TERU-SAMA"
li "DUSK STONE"
li "SHINY STONE"
li "METAL COAT"
li "DRAGON FANG"
li "TERU-SAMA"
@ -189,10 +189,10 @@ ItemNames::
li "BLUESKY MAIL"
li "MUSIC MAIL"
li "MIRAGE MAIL"
li "TERU-SAMA"
li "TERU-SAMA"
li "TERU-SAMA"
li "TERU-SAMA"
li "OLD AMBER"
li "DOME FOSSIL"
li "HELIX FOSSIL"
li "WING FOSSIL"
assert_list_length NUM_ITEMS
li "TM01"
li "TM02"