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

Fixing My Errors + More

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

36
data/items/attributes.asm
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

10
data/items/catch_rate_items.asm
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

54
data/items/descriptions.asm
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.@"

18
data/items/names.asm
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"

19
data/maps/attributes.asm
View file

@ -695,14 +695,13 @@ ENDM
map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
map_attributes BellchimeTrail, BELLCHIME_TRAIL, $5, 0
map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $0, 0
map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $0, 0
map_attributes ViridianForest, VIRIDIAN_FOREST, $45, 0
map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $0, 0
map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $0, 0
map_attributes Route1ViridianGate, ROUTE_1_VIRIDIAN_GATE, $0, 0
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $9, 0
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $9, 0
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $9, 0
map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0
map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0
map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0
map_attributes ViridianForest, VIRIDIAN_FOREST, $00, 0
map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0
map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.

12
data/maps/blocks.asm
View file

@ -1048,17 +1048,17 @@ BetaBlank_Blocks: ; unreferenced
GoldenrodDeptStoreRoof_Blocks:
INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
BellchimeTrail_Blocks
INCBIN "maps/BellchimeTrail.ablk"
BellchimeTrail_Blocks:
INCBIN "maps/BellchimeTrail.ablk"
ViridianForest_Blocks:
INCBIN "maps/ViridianForest.ablk"
PewterCityMuseumOfScience1F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience1F.ablk"
PewterMuseumOfScience1F_Blocks:
INCBIN "maps/PewterMuseumOfScience1F.ablk"
PewterCityMuseumOfScience2F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience2F.ablk"
PewterMuseumOfScience2F_Blocks:
INCBIN "maps/PewterMuseumOfScience2F.ablk"
CeruleanCave1F_Blocks:
INCBIN "maps/CeruleanCave1F.ablk"

5
data/maps/landmarks.asm
View file

@ -30,7 +30,7 @@ Landmarks:
landmark 64, 60, Route36Name
landmark 68, 52, Route37Name
landmark 68, 44, EcruteakCityName
landmark 77, 58, BellchimeTrailName
landmark 77, 58, BellchimeTrailName
landmark 70, 42, TinTowerName
landmark 66, 42, BurnedTowerName
landmark 52, 44, Route38Name
@ -66,7 +66,7 @@ Landmarks:
landmark 76, 52, MtMoonName
landmark 88, 52, Route4Name
landmark 100, 52, CeruleanCityName
landmark 108, 52, CeruleanCaveName
landmark 108, 52, CeruleanCaveName
landmark 100, 44, Route24Name
landmark 108, 36, Route25Name
landmark 100, 60, Route5Name
@ -209,7 +209,6 @@ DarkCaveName: db "DARK CAVE@"
IlexForestName: db "ILEX¯FOREST@"
BurnedTowerName: db "BURNED¯TOWER@"
FastShipName: db "FAST SHIP@"
ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced
DiglettsCaveName: db "DIGLETT'S¯CAVE@"
TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@"

14
data/maps/maps.asm
View file

@ -181,7 +181,7 @@ MapGroup_Ecruteak:
map EcruteakGym, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakItemfinderHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakCity, TILESET_JOHTO, TOWN, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
map BellchimeTrail, TILESET_JOHTO, TOWN, LANDMARK_BELLCHIME_TRAIL, MUSIC_ECRUTEAK_CITY, PALETTE_AUTO, FISHGROUP_SHORE
map BellchimeTrail, TILESET_JOHTO, TOWN, LANDMARK_BELLCHIME_TRAIL, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_ECRUTEAK_MAPS
MapGroup_Blackthorn:
@ -229,9 +229,9 @@ MapGroup_Cerulean:
map Route24, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_24, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map Route25, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_25, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map CeruleanCity, TILESET_KANTO, TOWN, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_NONE
map CeruleanCave1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCave2F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCaveB1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCave1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCave2F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCaveB1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CERULEAN_MAPS
MapGroup_Azalea:
@ -341,8 +341,8 @@ MapGroup_Pewter:
map PewterPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterSnoozeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map PewterMuseumOfScience1F, TILESET_MUSEUM, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PewterMuseumOfScience2F, TILESET_MUSEUM, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PewterMuseumOfScience1F, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE; should have own tileset later
map PewterMuseumOfScience2F, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE; should have own tileset later
assert_table_length NUM_PEWTER_MAPS
MapGroup_FastShip:
@ -491,7 +491,7 @@ MapGroup_Viridian:
map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_RBY_VIRIDIAN_FOREST, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_UNION_CAVE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_VIRIDIAN_MAPS