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

21
constants/event_flags.asm
View file

@ -234,6 +234,8 @@
const EVENT_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC
const EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
const EVENT_CERULEAN_CAVE_MEWTWO
; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
@ -268,6 +270,20 @@
const EVENT_DANA_GAVE_THUNDERSTONE
const EVENT_TULLY_GAVE_WATER_STONE
const EVENT_TIFFANY_GAVE_PINK_BOW
const EVENT_VIRIDIAN_FOREST_HIDDEN_MAX_ETHER
const EVENT_VIRIDIAN_FOREST_HIDDEN_FULL_HEAL
const EVENT_VIRIDIAN_FOREST_HIDDEN_TINYMUSHROOM
const EVENT_VIRIDIAN_FOREST_HIDDEN_BIG_MUSHROOM
const EVENT_VIRIDIAN_FOREST_HIDDEN_LEAF_STONE
const EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL
const EVENT_CERULEAN_CAVE_1F_HIDDEN_PP_UP
const EVENT_CERULEAN_CAVE_1F_HIDDEN_RARE_CANDY
const EVENT_CERULEAN_CAVE_1F_HIDDEN_BERSERK_GENE
const EVENT_CERULEAN_CAVE_2F_HIDDEN_PROTEIN
const EVENT_CERULEAN_CAVE_2F_HIDDEN_NUGGET
const EVENT_CERULEAN_CAVE_2F_HIDDEN_HYPER_POTION
const EVENT_CERULEAN_CAVE_B1F_HIDDEN_MAX_REVIVE
const EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL
; Unused: next 339 events
const_next 600
@ -894,6 +910,11 @@
const EVENT_BEAT_BUG_CATCHER_DOUG
const EVENT_BEAT_BUG_CATCHER_ARNIE2
const EVENT_BEAT_BUG_CATCHER_ARNIE3
const EVENT_BEAT_BUG_CATCHER_DANE
const EVENT_BEAT_BUG_CATCHER_DION
const EVENT_BEAT_BUG_CATCHER_STACEY
const EVENT_BEAT_BUG_CATCHER_ELLIS
const EVENT_BEAT_BUG_CATCHER_ABNER
; Officer
const EVENT_BEAT_OFFICER_KEITH
const EVENT_BEAT_OFFICER_DIRK

18
constants/item_constants.asm
View file

@ -140,14 +140,14 @@
const STAR_PIECE ; 84
const BASEMENT_KEY ; 85
const PASS ; 86
const ITEM_87 ; 87
const ITEM_88 ; 88
const ITEM_89 ; 89
const HEART_STONE ; 87
const POISON_STONE ; 88
const ICE_STONE ; 89
const CHARCOAL ; 8a
const BERRY_JUICE ; 8b
const SCOPE_LENS ; 8c
const ITEM_8D ; 8d
const ITEM_8E ; 8e
const DUSK_STONE ; 8d
const SHINY_STONE ; 8e
const METAL_COAT ; 8f
const DRAGON_FANG ; 90
const ITEM_91 ; 91
@ -195,10 +195,10 @@
const BLUESKY_MAIL ; bb
const MUSIC_MAIL ; bc
const MIRAGE_MAIL ; bd
const ITEM_BE ; be
const ITEM_DC ; bf
const ITEM_C3 ; c0
const ITEM_FA ; c1
const OLD_AMBER ; be
const DOME_FOSSIL ; bf
const HELIX_FOSSIL ; c0
const WING_FOSSIL ; c1
DEF NUM_ITEMS EQU const_value - 1
DEF __tmhm_value__ = 1

42
constants/landmark_constants.asm
View file

@ -24,7 +24,7 @@
const LANDMARK_ROUTE_36 ; 14
const LANDMARK_ROUTE_37 ; 15
const LANDMARK_ECRUTEAK_CITY ; 16
const LANDMARK_BELLCHIME_TRAIL
const LANDMARK_BELLCHIME_TRAIL
const LANDMARK_TIN_TOWER ; 17
const LANDMARK_BURNED_TOWER ; 18
const LANDMARK_ROUTE_38 ; 19
@ -36,9 +36,9 @@
const LANDMARK_WHIRL_ISLANDS ; 1f
const LANDMARK_ROUTE_41 ; 20
const LANDMARK_CIANWOOD_CITY ; 21
const LANDMARK_ROUTE_47
const LANDMARK_ROUTE_48
const LANDMARK_SAFARI_ZONE
;const LANDMARK_ROUTE_47
;const LANDMARK_ROUTE_48
;const LANDMARK_SAFARI_ZONE
const LANDMARK_ROUTE_42 ; 22
const LANDMARK_MT_MORTAR ; 23
const LANDMARK_MAHOGANY_TOWN ; 24
@ -57,35 +57,35 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_ROUTE_1 ; 30
const LANDMARK_VIRIDIAN_CITY ; 31
const LANDMARK_ROUTE_2 ; 32
const LANDMARK_VIRIDIAN_FOREST
const LANDMARK_VIRIDIAN_FOREST
const LANDMARK_PEWTER_CITY ; 33
const LANDMARK_ROUTE_3 ; 34
const LANDMARK_MT_MOON ; 35
const LANDMARK_MT_MOON_CRATER
;const LANDMARK_MT_MOON_CRATER
const LANDMARK_ROUTE_4 ; 36
const LANDMARK_CERULEAN_CITY ; 37
const LANDMARK_CERULEAN_CAVE
const LANDMARK_CERULEAN_CAVE
const LANDMARK_ROUTE_24 ; 38
const LANDMARK_ROUTE_25 ; 39
const LANDMARK_BILLS_GARDEN
const LANDMARK_BILLS_LIGHTHOUSE
;const LANDMARK_BILLS_GARDEN
;const LANDMARK_BILLS_LIGHTHOUSE
const LANDMARK_ROUTE_5 ; 3a
const LANDMARK_UNDERGROUND_PATH ; 3b
const LANDMARK_ROUTE_6 ; 3c
const LANDMARK_VERMILION_CITY ; 3d
const LANDMARK_SS_ANNE
;const LANDMARK_SS_ANNE
const LANDMARK_DIGLETTS_CAVE ; 3e
const LANDMARK_ROUTE_7 ; 3f
const LANDMARK_ROUTE_8 ; 40
const LANDMARK_ROUTE_9 ; 41
const LANDMARK_ROCK_TUNNEL ; 42
const LANDMARK_UNDERWATER_TUNNEL
;const LANDMARK_UNDERWATER_TUNNEL
const LANDMARK_ROUTE_10 ; 43
const LANDMARK_POWER_PLANT ; 44
const LANDMARK_LAVENDER_TOWN ; 45
const LANDMARK_LAV_RADIO_TOWER ; 46
const LANDMARK_CELADON_CITY ; 47
const LANDMARK_CELADON_UNIVERSITY
;const LANDMARK_CELADON_UNIVERSITY
const LANDMARK_SAFFRON_CITY ; 48
const LANDMARK_ROUTE_11 ; 49
const LANDMARK_ROUTE_12 ; 4a
@ -96,29 +96,29 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_ROUTE_17 ; 4f
const LANDMARK_ROUTE_18 ; 50
const LANDMARK_FUCHSIA_CITY ; 51
const LANDMARK_SAFARI_ZONE
;const LANDMARK_SAFARI_ZONE
const LANDMARK_ROUTE_19 ; 52
const LANDMARK_ROUTE_20 ; 53
const LANDMARK_SEAFOAM_ISLANDS ; 54
const LANDMARK_CINNABAR_ISLAND ; 55
const LANDMARK_CINNABAR_VOLCANO
;const LANDMARK_CINNABAR_VOLCANO
const LANDMARK_ROUTE_21 ; 56
const LANDMARK_ROUTE_22 ; 57
const LANDMARK_VICTORY_ROAD ; 58
const LANDMARK_ROUTE_23 ; 59
const LANDMARK_INDIGO_PLATEAU ; 5a
const LANDMARK_CITRINE_CITY
const LANDMARK_BRUNSWICK_TRAIL
const LANDMARK_BRUNSWICK_GROTTO
const LANDMARK_GARNET_CAVERN
const LANDMARK_CELESTE_HILL_CAVE
const LANDMARK_CELESTE_HILL
;const LANDMARK_CITRINE_CITY
;const LANDMARK_BRUNSWICK_TRAIL
;const LANDMARK_BRUNSWICK_GROTTO
;const LANDMARK_GARNET_CAVERN
;const LANDMARK_CELESTE_HILL_CAVE
;const LANDMARK_CELESTE_HILL
const LANDMARK_ROUTE_26 ; 5b
const LANDMARK_ROUTE_27 ; 5c
const LANDMARK_TOHJO_FALLS ; 5d
const LANDMARK_ROUTE_28 ; 5e
const LANDMARK_FAST_SHIP ; 5f
const LANDMARK_ONE_ISLAND
;const LANDMARK_ONE_ISLAND
DEF NIHON_LANDMARK EQU const_value
const LANDMARK_SILENT_HILLS
DEF NUM_LANDMARKS EQU const_value

8
constants/map_constants.asm
View file

@ -166,7 +166,7 @@ ENDM
map_const ECRUTEAK_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
map_const ECRUTEAK_CITY, 20, 18 ; 9
map_const BELLCHIME_TRAIL 6, 12
map_const BELLCHIME_TRAIL, 6, 12
endgroup
newgroup BLACKTHORN ; 5
@ -211,7 +211,7 @@ ENDM
map_const ROUTE_24, 10, 9 ; 15
map_const ROUTE_25, 30, 9 ; 16
map_const CERULEAN_CITY, 20, 18 ; 17
map_const CERULEAN_CAVE_1F, 9, 15
map_const CERULEAN_CAVE_1F, 9, 15
map_const CERULEAN_CAVE_2F, 9, 15
map_const CERULEAN_CAVE_B1F, 9, 15
endgroup
@ -316,8 +316,8 @@ ENDM
map_const PEWTER_POKECENTER_1F, 5, 4 ; 6
map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7
map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8
map_const PEWTER_MUSEUM_OF_SCIENCE_1F 4, 10
map_const PEWTER_MUSEUM_OF_SCIENCE_2F 4, 7
map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 4, 10
map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 4, 7
endgroup
newgroup FAST_SHIP ; 15

5
constants/trainer_constants.asm
View file

@ -348,6 +348,11 @@ DEF KRIS EQU __trainer_class__
const ARNIE4
const ARNIE5
const WAYNE
const BUG_CATCHER_DANE
const BUG_CATCHER_DION
const BUG_CATCHER_STACEY
const BUG_CATCHER_ELLIS
const BUG_CATCHER_ABNER
trainerclass FISHER ; 25
const JUSTIN