Learnsets, Sun Stones and Evos, oh my

This commit is contained in:
MementoMartha 2022-08-31 16:43:33 +01:00
parent 40180459ee
commit 53e0cbf9f5
8 changed files with 548 additions and 143 deletions

View file

@ -52,7 +52,7 @@ DEF SAFARI_ROCK EQU $16 ; overload
const DOME_FOSSIL ; $29 const DOME_FOSSIL ; $29
const HELIX_FOSSIL ; $2A const HELIX_FOSSIL ; $2A
const SECRET_KEY ; $2B const SECRET_KEY ; $2B
const UNUSED_ITEM ; $2C "?????" const SUN_STONE ; $2C
const BIKE_VOUCHER ; $2D const BIKE_VOUCHER ; $2D
const X_ACCURACY ; $2E const X_ACCURACY ; $2E
const LEAF_STONE ; $2F const LEAF_STONE ; $2F

View file

@ -30,7 +30,7 @@ KeyItemFlags:
dbit TRUE ; EARTHBADGE dbit TRUE ; EARTHBADGE
dbit FALSE ; ESCAPE_ROPE dbit FALSE ; ESCAPE_ROPE
dbit FALSE ; REPEL dbit FALSE ; REPEL
dbit TRUE ; OLD_AMBER dbit FALSE ; OLD_AMBER
dbit FALSE ; FIRE_STONE dbit FALSE ; FIRE_STONE
dbit FALSE ; THUNDER_STONE dbit FALSE ; THUNDER_STONE
dbit FALSE ; WATER_STONE dbit FALSE ; WATER_STONE
@ -40,10 +40,10 @@ KeyItemFlags:
dbit FALSE ; CARBOS dbit FALSE ; CARBOS
dbit FALSE ; CALCIUM dbit FALSE ; CALCIUM
dbit FALSE ; RARE_CANDY dbit FALSE ; RARE_CANDY
dbit TRUE ; DOME_FOSSIL dbit FALSE ; DOME_FOSSIL
dbit TRUE ; HELIX_FOSSIL dbit FALSE ; HELIX_FOSSIL
dbit TRUE ; SECRET_KEY dbit TRUE ; SECRET_KEY
dbit TRUE ; UNUSED_ITEM dbit FALSE ; SUN_STONE
dbit TRUE ; BIKE_VOUCHER dbit TRUE ; BIKE_VOUCHER
dbit FALSE ; X_ACCURACY dbit FALSE ; X_ACCURACY
dbit FALSE ; LEAF_STONE dbit FALSE ; LEAF_STONE

View file

@ -26,7 +26,7 @@ CeladonMart2Clerk2Text::
script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION script_mart TM_DOUBLE_TEAM, TM_REFLECT, TM_RAZOR_WIND, TM_HORN_DRILL, TM_EGG_BOMB, TM_MEGA_PUNCH, TM_MEGA_KICK, TM_TAKE_DOWN, TM_SUBMISSION
CeladonMart4ClerkText:: CeladonMart4ClerkText::
script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE, SUN_STONE
CeladonMart5Clerk1Text:: CeladonMart5Clerk1Text::
script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL

View file

@ -43,7 +43,7 @@ ItemNames::
li "DOME FOSSIL" li "DOME FOSSIL"
li "HELIX FOSSIL" li "HELIX FOSSIL"
li "SECRET KEY" li "SECRET KEY"
li "?????" li "SUN STONE"
li "BIKE VOUCHER" li "BIKE VOUCHER"
li "X ACCURACY" li "X ACCURACY"
li "LEAF STONE" li "LEAF STONE"

View file

@ -43,7 +43,7 @@ ItemPrices::
bcd3 0 ; DOME_FOSSIL bcd3 0 ; DOME_FOSSIL
bcd3 0 ; HELIX_FOSSIL bcd3 0 ; HELIX_FOSSIL
bcd3 0 ; SECRET_KEY bcd3 0 ; SECRET_KEY
bcd3 0 ; XXX bcd3 2100 ; SUN_STONE
bcd3 0 ; BIKE_VOUCHER bcd3 0 ; BIKE_VOUCHER
bcd3 950 ; X_ACCURACY bcd3 950 ; X_ACCURACY
bcd3 2100 ; LEAF_STONE bcd3 2100 ; LEAF_STONE

View file

@ -20,6 +20,7 @@ UsableItems_PartyMenu:
db CARBOS db CARBOS
db CALCIUM db CALCIUM
db RARE_CANDY db RARE_CANDY
db SUN_STONE
db LEAF_STONE db LEAF_STONE
db FULL_HEAL db FULL_HEAL
db REVIVE db REVIVE

File diff suppressed because it is too large Load diff

View file

@ -60,7 +60,7 @@ ItemUsePtrTable:
dw UnusableItem ; DOME_FOSSIL dw UnusableItem ; DOME_FOSSIL
dw UnusableItem ; HELIX_FOSSIL dw UnusableItem ; HELIX_FOSSIL
dw UnusableItem ; SECRET_KEY dw UnusableItem ; SECRET_KEY
dw UnusableItem dw ItemUseEvoStone ; SUN_STONE
dw UnusableItem ; BIKE_VOUCHER dw UnusableItem ; BIKE_VOUCHER
dw ItemUseXAccuracy ; X_ACCURACY dw ItemUseXAccuracy ; X_ACCURACY
dw ItemUseEvoStone ; LEAF_STONE dw ItemUseEvoStone ; LEAF_STONE