thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-14 00:56:40 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from LadyMisticus/master

Browse source 
Correcting my Mistakes + ASM Batch #3
This commit is contained in:
ZetaNull 2023-10-22 21:22:27 -04:00 committed by GitHub
parent fa5f2111f9 1d1fdbe8db
commit 3976f9a734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
39 changed files with 812 additions and 702 deletions
Show stats 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_TALKED_TO_OAK_IN_KANTO
const EVENT_GOT_HP_UP_FROM_VERMILION_GUY const EVENT_GOT_HP_UP_FROM_VERMILION_GUY
const EVENT_GOT_TM29_PSYCHIC const EVENT_GOT_TM29_PSYCHIC
const EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
const EVENT_CERULEAN_CAVE_MEWTWO
; Kanto hidden items ; Kanto hidden items
const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE const EVENT_DIGLETTS_CAVE_HIDDEN_MAX_REVIVE
const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE const EVENT_UNDERGROUND_PATH_HIDDEN_FULL_RESTORE
@ -268,6 +270,20 @@
const EVENT_DANA_GAVE_THUNDERSTONE const EVENT_DANA_GAVE_THUNDERSTONE
const EVENT_TULLY_GAVE_WATER_STONE const EVENT_TULLY_GAVE_WATER_STONE
const EVENT_TIFFANY_GAVE_PINK_BOW 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 ; Unused: next 339 events
const_next 600 const_next 600
@ -894,6 +910,11 @@
const EVENT_BEAT_BUG_CATCHER_DOUG const EVENT_BEAT_BUG_CATCHER_DOUG
const EVENT_BEAT_BUG_CATCHER_ARNIE2 const EVENT_BEAT_BUG_CATCHER_ARNIE2
const EVENT_BEAT_BUG_CATCHER_ARNIE3 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 ; Officer
const EVENT_BEAT_OFFICER_KEITH const EVENT_BEAT_OFFICER_KEITH
const EVENT_BEAT_OFFICER_DIRK const EVENT_BEAT_OFFICER_DIRK

18
constants/item_constants.asm
View file

@ -140,14 +140,14 @@
const STAR_PIECE ; 84 const STAR_PIECE ; 84
const BASEMENT_KEY ; 85 const BASEMENT_KEY ; 85
const PASS ; 86 const PASS ; 86
const ITEM_87 ; 87 const HEART_STONE ; 87
const ITEM_88 ; 88 const POISON_STONE ; 88
const ITEM_89 ; 89 const ICE_STONE ; 89
const CHARCOAL ; 8a const CHARCOAL ; 8a
const BERRY_JUICE ; 8b const BERRY_JUICE ; 8b
const SCOPE_LENS ; 8c const SCOPE_LENS ; 8c
const ITEM_8D ; 8d const DUSK_STONE ; 8d
const ITEM_8E ; 8e const SHINY_STONE ; 8e
const METAL_COAT ; 8f const METAL_COAT ; 8f
const DRAGON_FANG ; 90 const DRAGON_FANG ; 90
const ITEM_91 ; 91 const ITEM_91 ; 91
@ -195,10 +195,10 @@
const BLUESKY_MAIL ; bb const BLUESKY_MAIL ; bb
const MUSIC_MAIL ; bc const MUSIC_MAIL ; bc
const MIRAGE_MAIL ; bd const MIRAGE_MAIL ; bd
const ITEM_BE ; be const OLD_AMBER ; be
const ITEM_DC ; bf const DOME_FOSSIL ; bf
const ITEM_C3 ; c0 const HELIX_FOSSIL ; c0
const ITEM_FA ; c1 const WING_FOSSIL ; c1
DEF NUM_ITEMS EQU const_value - 1 DEF NUM_ITEMS EQU const_value - 1
DEF __tmhm_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_36 ; 14
const LANDMARK_ROUTE_37 ; 15 const LANDMARK_ROUTE_37 ; 15
const LANDMARK_ECRUTEAK_CITY ; 16 const LANDMARK_ECRUTEAK_CITY ; 16
const LANDMARK_BELLCHIME_TRAIL const LANDMARK_BELLCHIME_TRAIL
const LANDMARK_TIN_TOWER ; 17 const LANDMARK_TIN_TOWER ; 17
const LANDMARK_BURNED_TOWER ; 18 const LANDMARK_BURNED_TOWER ; 18
const LANDMARK_ROUTE_38 ; 19 const LANDMARK_ROUTE_38 ; 19
@ -36,9 +36,9 @@
const LANDMARK_WHIRL_ISLANDS ; 1f const LANDMARK_WHIRL_ISLANDS ; 1f
const LANDMARK_ROUTE_41 ; 20 const LANDMARK_ROUTE_41 ; 20
const LANDMARK_CIANWOOD_CITY ; 21 const LANDMARK_CIANWOOD_CITY ; 21
const LANDMARK_ROUTE_47 ;const LANDMARK_ROUTE_47
const LANDMARK_ROUTE_48 ;const LANDMARK_ROUTE_48
const LANDMARK_SAFARI_ZONE ;const LANDMARK_SAFARI_ZONE
const LANDMARK_ROUTE_42 ; 22 const LANDMARK_ROUTE_42 ; 22
const LANDMARK_MT_MORTAR ; 23 const LANDMARK_MT_MORTAR ; 23
const LANDMARK_MAHOGANY_TOWN ; 24 const LANDMARK_MAHOGANY_TOWN ; 24
@ -57,35 +57,35 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_ROUTE_1 ; 30 const LANDMARK_ROUTE_1 ; 30
const LANDMARK_VIRIDIAN_CITY ; 31 const LANDMARK_VIRIDIAN_CITY ; 31
const LANDMARK_ROUTE_2 ; 32 const LANDMARK_ROUTE_2 ; 32
const LANDMARK_VIRIDIAN_FOREST const LANDMARK_VIRIDIAN_FOREST
const LANDMARK_PEWTER_CITY ; 33 const LANDMARK_PEWTER_CITY ; 33
const LANDMARK_ROUTE_3 ; 34 const LANDMARK_ROUTE_3 ; 34
const LANDMARK_MT_MOON ; 35 const LANDMARK_MT_MOON ; 35
const LANDMARK_MT_MOON_CRATER ;const LANDMARK_MT_MOON_CRATER
const LANDMARK_ROUTE_4 ; 36 const LANDMARK_ROUTE_4 ; 36
const LANDMARK_CERULEAN_CITY ; 37 const LANDMARK_CERULEAN_CITY ; 37
const LANDMARK_CERULEAN_CAVE const LANDMARK_CERULEAN_CAVE
const LANDMARK_ROUTE_24 ; 38 const LANDMARK_ROUTE_24 ; 38
const LANDMARK_ROUTE_25 ; 39 const LANDMARK_ROUTE_25 ; 39
const LANDMARK_BILLS_GARDEN ;const LANDMARK_BILLS_GARDEN
const LANDMARK_BILLS_LIGHTHOUSE ;const LANDMARK_BILLS_LIGHTHOUSE
const LANDMARK_ROUTE_5 ; 3a const LANDMARK_ROUTE_5 ; 3a
const LANDMARK_UNDERGROUND_PATH ; 3b const LANDMARK_UNDERGROUND_PATH ; 3b
const LANDMARK_ROUTE_6 ; 3c const LANDMARK_ROUTE_6 ; 3c
const LANDMARK_VERMILION_CITY ; 3d const LANDMARK_VERMILION_CITY ; 3d
const LANDMARK_SS_ANNE ;const LANDMARK_SS_ANNE
const LANDMARK_DIGLETTS_CAVE ; 3e const LANDMARK_DIGLETTS_CAVE ; 3e
const LANDMARK_ROUTE_7 ; 3f const LANDMARK_ROUTE_7 ; 3f
const LANDMARK_ROUTE_8 ; 40 const LANDMARK_ROUTE_8 ; 40
const LANDMARK_ROUTE_9 ; 41 const LANDMARK_ROUTE_9 ; 41
const LANDMARK_ROCK_TUNNEL ; 42 const LANDMARK_ROCK_TUNNEL ; 42
const LANDMARK_UNDERWATER_TUNNEL ;const LANDMARK_UNDERWATER_TUNNEL
const LANDMARK_ROUTE_10 ; 43 const LANDMARK_ROUTE_10 ; 43
const LANDMARK_POWER_PLANT ; 44 const LANDMARK_POWER_PLANT ; 44
const LANDMARK_LAVENDER_TOWN ; 45 const LANDMARK_LAVENDER_TOWN ; 45
const LANDMARK_LAV_RADIO_TOWER ; 46 const LANDMARK_LAV_RADIO_TOWER ; 46
const LANDMARK_CELADON_CITY ; 47 const LANDMARK_CELADON_CITY ; 47
const LANDMARK_CELADON_UNIVERSITY ;const LANDMARK_CELADON_UNIVERSITY
const LANDMARK_SAFFRON_CITY ; 48 const LANDMARK_SAFFRON_CITY ; 48
const LANDMARK_ROUTE_11 ; 49 const LANDMARK_ROUTE_11 ; 49
const LANDMARK_ROUTE_12 ; 4a const LANDMARK_ROUTE_12 ; 4a
@ -96,29 +96,29 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_ROUTE_17 ; 4f const LANDMARK_ROUTE_17 ; 4f
const LANDMARK_ROUTE_18 ; 50 const LANDMARK_ROUTE_18 ; 50
const LANDMARK_FUCHSIA_CITY ; 51 const LANDMARK_FUCHSIA_CITY ; 51
const LANDMARK_SAFARI_ZONE ;const LANDMARK_SAFARI_ZONE
const LANDMARK_ROUTE_19 ; 52 const LANDMARK_ROUTE_19 ; 52
const LANDMARK_ROUTE_20 ; 53 const LANDMARK_ROUTE_20 ; 53
const LANDMARK_SEAFOAM_ISLANDS ; 54 const LANDMARK_SEAFOAM_ISLANDS ; 54
const LANDMARK_CINNABAR_ISLAND ; 55 const LANDMARK_CINNABAR_ISLAND ; 55
const LANDMARK_CINNABAR_VOLCANO ;const LANDMARK_CINNABAR_VOLCANO
const LANDMARK_ROUTE_21 ; 56 const LANDMARK_ROUTE_21 ; 56
const LANDMARK_ROUTE_22 ; 57 const LANDMARK_ROUTE_22 ; 57
const LANDMARK_VICTORY_ROAD ; 58 const LANDMARK_VICTORY_ROAD ; 58
const LANDMARK_ROUTE_23 ; 59 const LANDMARK_ROUTE_23 ; 59
const LANDMARK_INDIGO_PLATEAU ; 5a const LANDMARK_INDIGO_PLATEAU ; 5a
const LANDMARK_CITRINE_CITY ;const LANDMARK_CITRINE_CITY
const LANDMARK_BRUNSWICK_TRAIL ;const LANDMARK_BRUNSWICK_TRAIL
const LANDMARK_BRUNSWICK_GROTTO ;const LANDMARK_BRUNSWICK_GROTTO
const LANDMARK_GARNET_CAVERN ;const LANDMARK_GARNET_CAVERN
const LANDMARK_CELESTE_HILL_CAVE ;const LANDMARK_CELESTE_HILL_CAVE
const LANDMARK_CELESTE_HILL ;const LANDMARK_CELESTE_HILL
const LANDMARK_ROUTE_26 ; 5b const LANDMARK_ROUTE_26 ; 5b
const LANDMARK_ROUTE_27 ; 5c const LANDMARK_ROUTE_27 ; 5c
const LANDMARK_TOHJO_FALLS ; 5d const LANDMARK_TOHJO_FALLS ; 5d
const LANDMARK_ROUTE_28 ; 5e const LANDMARK_ROUTE_28 ; 5e
const LANDMARK_FAST_SHIP ; 5f const LANDMARK_FAST_SHIP ; 5f
const LANDMARK_ONE_ISLAND ;const LANDMARK_ONE_ISLAND
DEF NIHON_LANDMARK EQU const_value DEF NIHON_LANDMARK EQU const_value
const LANDMARK_SILENT_HILLS const LANDMARK_SILENT_HILLS
DEF NUM_LANDMARKS EQU const_value 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_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8 map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
map_const ECRUTEAK_CITY, 20, 18 ; 9 map_const ECRUTEAK_CITY, 20, 18 ; 9
map_const BELLCHIME_TRAIL 6, 12 map_const BELLCHIME_TRAIL, 6, 12
endgroup endgroup
newgroup BLACKTHORN ; 5 newgroup BLACKTHORN ; 5
@ -211,7 +211,7 @@ ENDM
map_const ROUTE_24, 10, 9 ; 15 map_const ROUTE_24, 10, 9 ; 15
map_const ROUTE_25, 30, 9 ; 16 map_const ROUTE_25, 30, 9 ; 16
map_const CERULEAN_CITY, 20, 18 ; 17 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_2F, 9, 15
map_const CERULEAN_CAVE_B1F, 9, 15 map_const CERULEAN_CAVE_B1F, 9, 15
endgroup endgroup
@ -316,8 +316,8 @@ ENDM
map_const PEWTER_POKECENTER_1F, 5, 4 ; 6 map_const PEWTER_POKECENTER_1F, 5, 4 ; 6
map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7 map_const PEWTER_POKECENTER_2F_BETA, 8, 4 ; 7
map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8 map_const PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4 ; 8
map_const PEWTER_MUSEUM_OF_SCIENCE_1F 4, 10 map_const PEWTER_MUSEUM_OF_SCIENCE_1F, 4, 10
map_const PEWTER_MUSEUM_OF_SCIENCE_2F 4, 7 map_const PEWTER_MUSEUM_OF_SCIENCE_2F, 4, 7
endgroup endgroup
newgroup FAST_SHIP ; 15 newgroup FAST_SHIP ; 15

5
constants/trainer_constants.asm
View file

@ -348,6 +348,11 @@ DEF KRIS EQU __trainer_class__
const ARNIE4 const ARNIE4
const ARNIE5 const ARNIE5
const WAYNE 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 trainerclass FISHER ; 25
const JUSTIN const JUSTIN

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 item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_CLOSE, ITEMMENU_NOUSE
; PASS ; PASS
item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_87 ; HEART_STONE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_88 ; POISON_STONE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_89 ; ICE_STONE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; CHARCOAL ; CHARCOAL
item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 9800, HELD_FIRE_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; BERRY_JUICE ; BERRY_JUICE
item_attribute 100, HELD_BERRY, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY item_attribute 100, HELD_BERRY, 20, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_PARTY
; SCOPE_LENS ; SCOPE_LENS
item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 200, HELD_CRITICAL_UP, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_8D ; DUSK_STONE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; ITEM_8E ; SHINY_STONE
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 2100, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_PARTY, ITEMMENU_NOUSE
; METAL_COAT ; METAL_COAT
item_attribute 100, HELD_STEEL_BOOST, 10, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE 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) ; 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 item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; MIRAGE_MAIL ; MIRAGE_MAIL
item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 50, HELD_NONE, 0, CANT_SELECT, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_BE ; OLD_AMBER
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_DC ; DOME_FOSSIL
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_C3 ; HELIX_FOSSIL
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
; ITEM_FA ; WING_FOSSIL
item_attribute $9999, HELD_NONE, 0, NO_LIMITS, ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE item_attribute 0, HELD_NONE, 0, CANT_SELECT | CANT_TOSS, KEY_ITEM, ITEMMENU_NOUSE, ITEMMENU_NOUSE
assert_table_length NUM_ITEMS assert_table_length NUM_ITEMS
; TM01 ; TM01
item_attribute 3000, HELD_NONE, 0, CANT_SELECT, TM_HM, ITEMMENU_PARTY, ITEMMENU_NOUSE 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_5A, BERRY
db ITEM_64, BERRY db ITEM_64, BERRY
db ITEM_78, BERRY db ITEM_78, BERRY
db ITEM_87, BERRY db HEART_STONE, BERRY
db ITEM_BE, BERRY db OLD_AMBER, BERRY
db ITEM_C3, BERRY db DOME_FOSSIL, BERRY
db ITEM_DC, BERRY db HELIX_FOSSIL, BERRY
db ITEM_FA, BERRY db WING_FOSSIL, BERRY
db -1, BERRY db -1, BERRY
db 0 ; end db 0 ; end

54
data/items/descriptions.asm
View file

@ -135,14 +135,14 @@ ItemDescriptions:
dw StarPieceDesc dw StarPieceDesc
dw BasementKeyDesc dw BasementKeyDesc
dw PassDesc dw PassDesc
dw QuestionMarkDesc dw HeartStoneDesc
dw QuestionMarkDesc dw PoisonStoneDesc
dw QuestionMarkDesc dw IceStoneDesc
dw CharcoalDesc dw CharcoalDesc
dw BerryJuiceDesc dw BerryJuiceDesc
dw ScopeLensDesc dw ScopeLensDesc
dw QuestionMarkDesc dw DuskStoneDesc
dw QuestionMarkDesc dw ShinyStoneDesc
dw MetalCoatDesc dw MetalCoatDesc
dw DragonFangDesc dw DragonFangDesc
dw QuestionMarkDesc dw QuestionMarkDesc
@ -190,10 +190,10 @@ ItemDescriptions:
dw BlueSkyMailDesc dw BlueSkyMailDesc
dw MusicMailDesc dw MusicMailDesc
dw MirageMailDesc dw MirageMailDesc
dw QuestionMarkDesc dw OldAmberDesc
dw QuestionMarkDesc dw DomeFossilDesc
dw QuestionMarkDesc dw HelixFossilDesc
dw QuestionMarkDesc dw WingFossilDesc
assert_table_length NUM_ITEMS assert_table_length NUM_ITEMS
dw QuestionMarkDesc dw QuestionMarkDesc
dw QuestionMarkDesc dw QuestionMarkDesc
@ -919,3 +919,39 @@ MirageMailDesc:
FairyFeatherDesc: FairyFeatherDesc:
db "Powers up fairy-" db "Powers up fairy-"
next "type moves. (HOLD)@" 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 "STAR PIECE"
li "BASEMENT KEY" li "BASEMENT KEY"
li "PASS" li "PASS"
li "TERU-SAMA" li "HEART STONE"
li "TERU-SAMA" li "POISON STONE"
li "TERU-SAMA" li "ICE STONE"
li "CHARCOAL" li "CHARCOAL"
li "BERRY JUICE" li "BERRY JUICE"
li "SCOPE LENS" li "SCOPE LENS"
li "TERU-SAMA" li "DUSK STONE"
li "TERU-SAMA" li "SHINY STONE"
li "METAL COAT" li "METAL COAT"
li "DRAGON FANG" li "DRAGON FANG"
li "TERU-SAMA" li "TERU-SAMA"
@ -189,10 +189,10 @@ ItemNames::
li "BLUESKY MAIL" li "BLUESKY MAIL"
li "MUSIC MAIL" li "MUSIC MAIL"
li "MIRAGE MAIL" li "MIRAGE MAIL"
li "TERU-SAMA" li "OLD AMBER"
li "TERU-SAMA" li "DOME FOSSIL"
li "TERU-SAMA" li "HELIX FOSSIL"
li "TERU-SAMA" li "WING FOSSIL"
assert_list_length NUM_ITEMS assert_list_length NUM_ITEMS
li "TM01" li "TM01"
li "TM02" 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 Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0 map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0 map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
map_attributes BellchimeTrail, BELLCHIME_TRAIL, $5, 0 map_attributes BellchimeTrail, BELLCHIME_TRAIL, $00, 0
map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $0, 0 map_attributes PewterMuseumOfScience1F, PEWTER_MUSEUM_OF_SCIENCE_1F, $00, 0
map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $0, 0 map_attributes PewterMuseumOfScience2F, PEWTER_MUSEUM_OF_SCIENCE_2F, $00, 0
map_attributes ViridianForest, VIRIDIAN_FOREST, $45, 0 map_attributes ViridianForest, VIRIDIAN_FOREST, $00, 0
map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $0, 0 map_attributes ViridianForestViridianGate, VIRIDIAN_FOREST_VIRIDIAN_GATE, $00, 0
map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $0, 0 map_attributes ViridianForestPewterGate, VIRIDIAN_FOREST_PEWTER_GATE, $00, 0
map_attributes Route1ViridianGate, ROUTE_1_VIRIDIAN_GATE, $0, 0 map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $00, 0
map_attributes CeruleanCave1F, CERULEAN_CAVE_1F, $9, 0 map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0
map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $9, 0 map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0
map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $9, 0
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later. 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: GoldenrodDeptStoreRoof_Blocks:
INCBIN "maps/GoldenrodDeptStoreRoof.ablk" INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
BellchimeTrail_Blocks BellchimeTrail_Blocks:
INCBIN "maps/BellchimeTrail.ablk" INCBIN "maps/BellchimeTrail.ablk"
ViridianForest_Blocks: ViridianForest_Blocks:
INCBIN "maps/ViridianForest.ablk" INCBIN "maps/ViridianForest.ablk"
PewterCityMuseumOfScience1F_Blocks: PewterMuseumOfScience1F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience1F.ablk" INCBIN "maps/PewterMuseumOfScience1F.ablk"
PewterCityMuseumOfScience2F_Blocks: PewterMuseumOfScience2F_Blocks:
INCBIN "maps/PewterCityMuseumOfScience2F.ablk" INCBIN "maps/PewterMuseumOfScience2F.ablk"
CeruleanCave1F_Blocks: CeruleanCave1F_Blocks:
INCBIN "maps/CeruleanCave1F.ablk" INCBIN "maps/CeruleanCave1F.ablk"

5
data/maps/landmarks.asm
View file

@ -30,7 +30,7 @@ Landmarks:
landmark 64, 60, Route36Name landmark 64, 60, Route36Name
landmark 68, 52, Route37Name landmark 68, 52, Route37Name
landmark 68, 44, EcruteakCityName landmark 68, 44, EcruteakCityName
landmark 77, 58, BellchimeTrailName landmark 77, 58, BellchimeTrailName
landmark 70, 42, TinTowerName landmark 70, 42, TinTowerName
landmark 66, 42, BurnedTowerName landmark 66, 42, BurnedTowerName
landmark 52, 44, Route38Name landmark 52, 44, Route38Name
@ -66,7 +66,7 @@ Landmarks:
landmark 76, 52, MtMoonName landmark 76, 52, MtMoonName
landmark 88, 52, Route4Name landmark 88, 52, Route4Name
landmark 100, 52, CeruleanCityName landmark 100, 52, CeruleanCityName
landmark 108, 52, CeruleanCaveName landmark 108, 52, CeruleanCaveName
landmark 100, 44, Route24Name landmark 100, 44, Route24Name
landmark 108, 36, Route25Name landmark 108, 36, Route25Name
landmark 100, 60, Route5Name landmark 100, 60, Route5Name
@ -209,7 +209,6 @@ DarkCaveName: db "DARK CAVE@"
IlexForestName: db "ILEX¯FOREST@" IlexForestName: db "ILEX¯FOREST@"
BurnedTowerName: db "BURNED¯TOWER@" BurnedTowerName: db "BURNED¯TOWER@"
FastShipName: db "FAST SHIP@" FastShipName: db "FAST SHIP@"
ViridianForestName: db "VIRIDIAN¯FOREST@" ; unreferenced
DiglettsCaveName: db "DIGLETT'S¯CAVE@" DiglettsCaveName: db "DIGLETT'S¯CAVE@"
TohjoFallsName: db "TOHJO FALLS@" TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@" 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 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 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 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 assert_table_length NUM_ECRUTEAK_MAPS
MapGroup_Blackthorn: 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 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 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 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 CeruleanCave1F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_LIGHTHOUSE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map CeruleanCave2F, TILESET_CAVE, CAVE, LANDMARK_CERULEAN_CAVE, MUSIC_RBY_CERULEAN_CAVE, 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_RBY_CERULEAN_CAVE, 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 assert_table_length NUM_CERULEAN_MAPS
MapGroup_Azalea: 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 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 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 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 PewterMuseumOfScience1F, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE; should have own tileset later
map PewterMuseumOfScience2F, TILESET_MUSEUM, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE 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 assert_table_length NUM_PEWTER_MAPS
MapGroup_FastShip: 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 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 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 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 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 map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_VIRIDIAN_MAPS assert_table_length NUM_VIRIDIAN_MAPS

21
data/pokemon/base_stats/arcanineh.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 95, 115, 80, 90, 95, 80
; hp atk def spd sat sdf
db FIRE, ROCK ; type
db 75 ; catch rate
db 213 ; base exp
db BURNT_BERRY, BURNT_BERRY ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/arcanineh/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
; end

21
data/pokemon/base_stats/digletta.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 10, 55, 30, 90, 35, 45
; hp atk def spd sat sdf
db GROUND, STEEL ; type
db 255 ; catch rate
db 81 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/digletta/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
; end

21
data/pokemon/base_stats/dugtrioa.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 35, 80, 60, 110, 50, 70
; hp atk def spd sat sdf
db GROUND, STEEL ; type
db 50 ; catch rate
db 153 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/dugtrioa/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT
; end

21
data/pokemon/base_stats/electrodeh.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 60, 50, 70, 140, 80, 80
; hp atk def spd sat sdf
db ELECTRIC, GRASS ; type
db 60 ; catch rate
db 150 ; base exp
db NO_ITEM, BERRY ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/electrodeh/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_MINERAL, EGG_MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
; end

21
data/pokemon/base_stats/farfetch_dg.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 52, 95, 55, 55, 58, 62
; hp atk def spd sat sdf
db FIGHTING, FIGHTING ; type
db 45 ; catch rate
db 94 ; base exp
db NO_ITEM, STICK ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/farfetch_d/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_FLYING, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
; end

21
data/pokemon/base_stats/growlitheh.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 60, 75, 45, 60, 65, 50
; hp atk def spd sat sdf
db FIRE, ROCK ; type
db 190 ; catch rate
db 91 ; base exp
db BURNT_BERRY, BURNT_BERRY ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/growlitheh/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
; end

21
data/pokemon/base_stats/luxwan.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 72, 105, 75, 70, 63, 72
; hp atk def spd sat sdf
db NORMAL, FLYING ; type
db 25 ; catch rate
db 196 ; base exp
db NO_ITEM, STICK ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/luxwan/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_FLYING, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
; end

21
data/pokemon/base_stats/pupperon.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 35, 50, 25, 40, 50, 30
; hp atk def spd sat sdf
db FIRE, FIRE ; type
db 255 ; catch rate
db 61 ; base exp
db BURNT_BERRY, BURNT_BERRY ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/pupperon/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_GROUND, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, RETURN, DIG, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, REST, ATTRACT, FLAMETHROWER
; end

21
data/pokemon/base_stats/sirfetch_d.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 62, 135, 95, 65, 68, 82
; hp atk def spd sat sdf
db FIGHTING, FIGHTING ; type
db 25 ; catch rate
db 196 ; base exp
db NO_ITEM, STICK ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/sirfetch_d/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_FLYING, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DETECT, REST, ATTRACT, THIEF, STEEL_WING, CUT, FLY
; end

21
data/pokemon/base_stats/toedscool.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 40, 40, 35, 70, 50, 100
; hp atk def spd sat sdf
db GROUND, GRASS ; type
db 190 ; catch rate
db 105 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/toedscool/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_PLANT, EGG_PLANT ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, CUT
; end

21
data/pokemon/base_stats/toedscruel.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 80, 70, 65, 100, 80, 120
; hp atk def spd sat sdf
db GROUND, GRASS ; type
db 60 ; catch rate
db 205 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/toedscruel/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_SLOW ; growth rate
dn EGG_PLANT, EGG_PLANT ; egg groups
; tm/hm learnset
tmhm CURSE, TOXIC, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, REST, ATTRACT, CUT
; end

21
data/pokemon/base_stats/voltorbh.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 40, 30, 50, 100, 55, 55
; hp atk def spd sat sdf
db ELECTRIC, GRASS ; type
db 190 ; catch rate
db 103 ; base exp
db NO_ITEM, BERRY ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/voltorbh/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_MINERAL, EGG_MINERAL ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, SOLARBEAM, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, REST, FLASH, THUNDERBOLT
; end

21
data/pokemon/base_stats/wiglett.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 10, 55, 25, 95, 35, 25
; hp atk def spd sat sdf
db WATER, WATER ; type
db 255 ; catch rate
db 81 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/wiglett/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_WATER_3, EGG_WATER_3 ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, SURF, WHIRLPOOL
; end

21
data/pokemon/base_stats/wugtrio.asm Normal file
View file

@ -0,0 +1,21 @@
db 0 ; species ID placeholder
db 35, 80, 50, 120, 50, 70
; hp atk def spd sat sdf
db WATER, WATER ; type
db 50 ; catch rate
db 153 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/wugtrio/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_WATER_3, EGG_WATER_3 ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, TOXIC, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, REST, ATTRACT, THIEF, CUT, SURF, WHIRLPOOL
; end

2
layout.link
View file

@ -117,7 +117,6 @@ ROMX $24
"bank24" "bank24"
ROMX $25 ROMX $25
"Maps" "Maps"
"Events"
ROMX $26 ROMX $26
"Map Scripts 11" "Map Scripts 11"
ROMX $27 ROMX $27
@ -313,6 +312,7 @@ ROMX $7c
"Battle Tower Trainer Data" "Battle Tower Trainer Data"
ROMX $7d ROMX $7d
"Mobile News Data" "Mobile News Data"
"Events"
ROMX $7e ROMX $7e
"Crystal Events" "Crystal Events"
ROMX $7f ROMX $7f

297
maps/BellchimeTrail.asm
View file

@ -1,66 +1,16 @@
BellchimeTrail_MapScriptHeader: BellchimeTrail_MapScripts:
def_scene_scripts def_scene_scripts
scene_script BellchimeTrailStepDownTrigger
def_callbacks def_callbacks
callback MAPCALLBACK_OBJECTS, SetupValerieMorningWalkCallback
def_warp_events
warp_event 4, 4, WISE_TRIOS_ROOM, 1
warp_event 4, 5, WISE_TRIOS_ROOM, 2
warp_event 21, 9, TIN_TOWER_1F, 1 ; hole
def_coord_events
coord_event 21, 9, 1, BellchimeTrailPanUpTrigger
def_bg_events
bg_event 22, 12, BGEVENT_JUMPTEXT, TinTowerSignText
def_object_events
object_event 16, 6, SPRITE_VALERIE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BellchimeTrailValerieScript, EVENT_VALERIE_BELLCHIME_TRAIL
object_const_def
const BELLCHIMETRAIL_VALERIE
BellchimeTrailStepDownTrigger:
sdefer .Script
end
.Script:
readvar VAR_YCOORD
ifnotequal $9, .Done
readvar VAR_XCOORD
ifnotequal $15, .Done
applyonemovement PLAYER, step_down
.Done
setscene $1
end
SetupValerieMorningWalkCallback:
checkevent EVENT_FOUGHT_SUICUNE
iffalse .Disappear
checkevent EVENT_BEAT_VALERIE
iffalse .Appear
checkflag ENGINE_VALERIE_MORNING_WALK
iftrue .Disappear
checktime 1 << MORN
iffalse .Disappear
.Appear:
appear BELLCHIMETRAIL_VALERIE
endcallback
.Disappear:
disappear BELLCHIMETRAIL_VALERIE
endcallback
BellchimeTrailPanUpTrigger: BellchimeTrailPanUpTrigger:
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
applyonemovement PLAYER, hide_object applymovement PLAYER, hide_object
waitsfx waitsfx
applymovement PLAYER, .PanUpMovement applymovement PLAYER, .PanUpMovement
disappear PLAYER disappear PLAYER
pause 10 pause 10
special Special_FadeOutMusic special FadeOutMusic
special FadeOutPalettes special FadeOutPalettes
pause 15 pause 15
setscene $0 setscene $0
@ -83,235 +33,14 @@ TinTowerSignText:
cont "roost here." cont "roost here."
done done
BellchimeTrailValerieScript: BellchimeTrail_MapEvents:
faceplayer def_warp_events
opentext warp_event 4, 4, WISE_TRIOS_ROOM, 1
checkevent EVENT_BEAT_VALERIE warp_event 4, 5, WISE_TRIOS_ROOM, 2
iftrue .Rematch warp_event 21, 9, TIN_TOWER_1F, 1 ; hole
checkevent EVENT_LISTENED_TO_VALERIE
iftrue .Listened
writetext .IntroText
waitbutton
setevent EVENT_LISTENED_TO_VALERIE
.Listened:
writetext .BattleText
yesorno
iffalse_jumpopenedtext .RefusedText
writetext .AcceptedText
waitbutton
closetext
winlosstext .BeatenText, 0
setlasttalked BELLCHIMETRAIL_VALERIE
loadtrainer VALERIE, 1
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_VALERIE
opentext
writetext .RewardText
promptbutton
verbosegivetmhm TM_DAZZLINGLEAM
setevent EVENT_GOT_TM49_DAZZLINGLEAM_FROM_VALERIE
writetext .FarewellText
.Depart
waitbutton
closetext
readvar VAR_FACING
ifnotequal RIGHT, .SkipGoAround
applymovement BELLCHIMETRAIL_VALERIE, .ValerieGoesAroundMovement
.SkipGoAround
applymovement BELLCHIMETRAIL_VALERIE, .ValerieDepartsMovement
disappear BELLCHIMETRAIL_VALERIE
clearevent EVENT_VALERIE_ECRUTEAK_CITY
setflag ENGINE_VALERIE_MORNING_WALK
end
.Rematch: def_coord_events
writetext .RematchText coord_event 21, 9, 1, BellchimeTrailPanUpTrigger
waitbutton
closetext
winlosstext .RematchBeatenText, 0
setlasttalked BELLCHIMETRAIL_VALERIE
readvar VAR_BADGES
ifequal 16, .Battle3
checkevent EVENT_BEAT_ELITE_FOUR
iftrue .Battle2
loadtrainer VALERIE, 1
startbattle
reloadmapafterbattle
sjump .AfterRematch
.Battle2: def_bg_events
loadtrainer VALERIE, 2 bg_event 22, 12, BGEVENT_READ, TinTowerSignText
startbattle
reloadmapafterbattle
sjump .AfterRematch
.Battle3:
loadtrainer VALERIE, 3
startbattle
reloadmapafterbattle
sjump .AfterRematch
.AfterRematch:
opentext
writetext .RematchFarewellText
sjump .Depart
.IntroText:
text "If it isn't the"
line "trainer who faced"
cont "Suicune…"
para "I am Valerie."
line "I come to this"
para "trail to be"
line "captivated by its"
cont "beauty."
para "Today I was for-"
line "tunate enough to"
para "witness your"
line "battle with a"
cont "legend…"
para "I would love to"
line "contend with one"
para "who caught the eye"
line "of a legendary"
cont "#mon."
done
.BattleText:
text "Valerie: I train"
line "the elusive Fairy"
cont "type."
para "They appear frail"
line "and delicate, but"
cont "they are strong."
para "Will you battle"
line "with me?"
done
.RefusedText:
text "Valerie: Alas…"
done
.AcceptedText:
text "Valerie: I hope"
line "our battle will"
para "prove entertaining"
line "to you."
done
.BeatenText:
text "I hope the sun is"
line "shining tomorrow…"
para "That would be"
line "reason enough to"
cont "smile."
done
.RewardText:
text "Valerie: Yes… that"
line "was a fine battle."
para "I shall reward you"
line "for this great"
cont "victory."
para "Please consider"
line "this as a personal"
cont "gift from me."
done
.FarewellText:
text "Valerie: Oh? My,"
line "what a curious"
cont "feeling…"
para "I can't seem to"
line "recall which move"
para "is contained in"
line "that TM."
para "I hope you might"
line "forgive me."
para "That was truly a"
line "captivating"
cont "battle."
para "I might just be"
line "captivated by you."
para "Until we meet"
line "again, farewell."
done
.RematchText:
text "Valerie: Oh, if it"
line "isn't my young"
cont "trainer…"
para "It is lovely to"
line "meet you again"
cont "like this."
para "Then I suppose you"
line "have earned your-"
para "self the right to"
line "a battle."
para "The elusive Fairy"
line "may appear frail"
para "as the breeze and"
line "delicate as a"
para "bloom, but it is"
line "strong."
done
.RematchBeatenText:
text "I hope that you"
line "will find things"
para "worth smiling"
line "about tomorrow…"
done
.RematchFarewellText:
text "That was truly a"
line "captivating"
cont "battle."
para "I might just be"
line "captivated by you."
para "Until we meet"
line "again, farewell."
done
.ValerieGoesAroundMovement:
step_down
step_left
step_end
.ValerieDepartsMovement:
step_left
step_left
step_left
step_up
step_up
step_left
step_left
step_end

59
maps/CeruleanCave1F.asm
View file

@ -1,9 +1,9 @@
CeruleanCave1F_MapScriptHeader: CeruleanCave1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
callback MAPCALLBACK_TILES, CeruleanCave1FTileScript
CeruleanCave1F_MapEvents:
def_warp_events def_warp_events
warp_event 27, 21, CERULEAN_CITY, 7 warp_event 27, 21, CERULEAN_CITY, 7
warp_event 9, 5, CERULEAN_CAVE_2F, 1 warp_event 9, 5, CERULEAN_CAVE_2F, 1
@ -15,12 +15,6 @@ CeruleanCave1F_MapScriptHeader:
warp_event 5, 15, CERULEAN_CAVE_2F, 6 warp_event 5, 15, CERULEAN_CAVE_2F, 6
def_coord_events def_coord_events
coord_event 20, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 20, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 4, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 23, 5, 1, CeruleanCave1FBridgeOverheadTrigger
coord_event 21, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
coord_event 22, 7, 0, CeruleanCave1FBridgeUnderfootTrigger
def_bg_events def_bg_events
bg_event 10, 13, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL bg_event 10, 13, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_1F_HIDDEN_ULTRA_BALL
@ -29,49 +23,6 @@ CeruleanCave1F_MapScriptHeader:
bg_event 25, 2, BGEVENT_ITEM + BERSERK_GENE, EVENT_CERULEAN_CAVE_1F_HIDDEN_BERSERK_GENE bg_event 25, 2, BGEVENT_ITEM + BERSERK_GENE, EVENT_CERULEAN_CAVE_1F_HIDDEN_BERSERK_GENE
def_object_events def_object_events
itemball_event 7, 6, BIG_NUGGET, 1, EVENT_CERULEAN_CAVE_1F_BIG_NUGGET object_event 7, 6, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, NUGGET, 1, EVENT_CERULEAN_CAVE_1F_BIG_NUGGET
itemball_event 9, 17, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_1F_FULL_RESTORE object_event 9, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_1F_FULL_RESTORE
itemball_event 14, 2, MAX_REVIVE, 1, EVENT_CERULEAN_CAVE_1F_MAX_REVIVE object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MAX_REVIVE, 1, EVENT_CERULEAN_CAVE_1F_MAX_REVIVE
CeruleanCave1FTileScript:
checkscene
iftrue .underfoot
callasm CeruleanCave1F_OverheadBridgeAsm
endcallback
.underfoot:
callasm CeruleanCave1F_UnderfootBridgeAsm
endcallback
CeruleanCave1F_OverheadBridgeAsm:
changebridgeblock 20, 2, $ea, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $eb, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ee, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ef, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $59, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $5b, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1F_UnderfootBridgeAsm:
changebridgeblock 20, 2, $e8, CERULEAN_CAVE_1F
changebridgeblock 22, 2, $e9, CERULEAN_CAVE_1F
changebridgeblock 20, 4, $ec, CERULEAN_CAVE_1F
changebridgeblock 22, 4, $ed, CERULEAN_CAVE_1F
changebridgeblock 20, 6, $55, CERULEAN_CAVE_1F
changebridgeblock 22, 6, $57, CERULEAN_CAVE_1F
jmp BufferScreen
CeruleanCave1FBridgeOverheadTrigger:
callasm CeruleanCave1F_OverheadBridgeAsm
callthisasm
xor a
jr CeruleanCave1F_FinishBridge
CeruleanCave1FBridgeUnderfootTrigger:
callasm CeruleanCave1F_UnderfootBridgeAsm
callthisasm
ld a, $1
CeruleanCave1F_FinishBridge:
ld [wWalkingOnBridge], a
ld [wCeruleanCave1FSceneID], a ; setscene a
jmp GenericFinishBridge

13
maps/CeruleanCave2F.asm
View file

@ -1,8 +1,9 @@
CeruleanCave2F_MapScriptHeader: CeruleanCave2F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
CeruleanCave2F_MapEvents:
def_warp_events def_warp_events
warp_event 11, 3, CERULEAN_CAVE_1F, 2 warp_event 11, 3, CERULEAN_CAVE_1F, 2
warp_event 31, 3, CERULEAN_CAVE_1F, 3 warp_event 31, 3, CERULEAN_CAVE_1F, 3
@ -19,7 +20,7 @@ CeruleanCave2F_MapScriptHeader:
bg_event 13, 17, BGEVENT_ITEM + HYPER_POTION, EVENT_CERULEAN_CAVE_2F_HIDDEN_HYPER_POTION bg_event 13, 17, BGEVENT_ITEM + HYPER_POTION, EVENT_CERULEAN_CAVE_2F_HIDDEN_HYPER_POTION
def_object_events def_object_events
itemball_event 31, 11, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_2F_FULL_RESTORE object_event 31, 11, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FULL_RESTORE, 1, EVENT_CERULEAN_CAVE_2F_FULL_RESTORE
itemball_event 7, 17, PP_UP, 1, EVENT_CERULEAN_CAVE_2F_PP_UP object_event 7, 17, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, PP_UP, 1, EVENT_CERULEAN_CAVE_2F_PP_UP
itemball_event 27, 15, ULTRA_BALL, 1, EVENT_CERULEAN_CAVE_2F_ULTRA_BALL object_event 27, 15, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, ULTRA_BALL, 1, EVENT_CERULEAN_CAVE_2F_ULTRA_BALL
itemball_event 2, 7, DUSK_STONE, 1, EVENT_CERULEAN_CAVE_2F_DUSK_STONE object_event 2, 7, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DUSK_STONE, 1, EVENT_CERULEAN_CAVE_2F_DUSK_STONE

53
maps/CeruleanCaveB1F.asm
View file

@ -1,8 +1,31 @@
CeruleanCaveB1F_MapScriptHeader: object_const_def
const CERULEANCAVEB1F_MEWTWO
CeruleanCaveB1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
CeruleanCaveMewtwo:
faceplayer
opentext
writetext MewtwoText
cry MEWTWO
pause 15
closetext
loadwildmon MEWTWO, 80
loadvar VAR_BATTLETYPE, BATTLETYPE_FORCEITEM
startbattle
disappear CERULEANCAVEB1F_MEWTWO
setevent EVENT_CERULEAN_CAVE_MEWTWO
reloadmapafterbattle
end
MewtwoText:
text "Myuu!"
done
CeruleanCaveB1F_MapEvents:
def_warp_events def_warp_events
warp_event 5, 7, CERULEAN_CAVE_1F, 5 warp_event 5, 7, CERULEAN_CAVE_1F, 5
@ -13,28 +36,6 @@ CeruleanCaveB1F_MapScriptHeader:
bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL bg_event 24, 11, BGEVENT_ITEM + ULTRA_BALL, EVENT_CERULEAN_CAVE_B1F_HIDDEN_ULTRA_BALL
def_object_events def_object_events
object_event 7, 13, SPRITE_MON_ICON, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO object_event 7, 13, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, MEWTWO, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, CeruleanCaveMewtwo, EVENT_CERULEAN_CAVE_MEWTWO
itemball_event 26, 9, MAX_ELIXIR, 1, EVENT_CERULEAN_CAVE_B1F_MAX_ELIXIR object_event 26, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MAX_ELIXER, 1, EVENT_CERULEAN_CAVE_B1F_MAX_ELIXER
itemball_event 26, 3, ULTRA_BALL, 1, EVENT_CERULEAN_CAVE_B1F_ULTRA_BALL object_event 26, 3, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, ULTRA_BALL, 1, EVENT_CERULEAN_CAVE_B1F_ULTRA_BALL
object_const_def
const CERULEANCAVEB1F_MEWTWO
CeruleanCaveMewtwo:
faceplayer
opentext
writetext MewtwoText
cry MEWTWO
pause 15
closetext
loadwildmon MEWTWO, 80
loadvar VAR_BATTLETYPE, BATTLETYPE_LEGENDARY
startbattle
disappear CERULEANCAVEB1F_MEWTWO
setevent EVENT_CERULEAN_CAVE_MEWTWO
reloadmapafterbattle
end
MewtwoText:
text "Myuu!"
done

8
maps/EcruteakCity.asm
View file

@ -223,14 +223,6 @@ EcruteakCitySignText:
line "Meets the Present" line "Meets the Present"
done done
TinTowerSignText:
text "TIN TOWER"
para "A legendary #-"
line "MON is said to"
cont "roost here."
done
EcruteakGymSignText: EcruteakGymSignText:
text "ECRUTEAK CITY" text "ECRUTEAK CITY"
line "#MON GYM" line "#MON GYM"

174
maps/PewterMuseumOfScience1F.asm
View file

@ -1,37 +1,19 @@
PewterMuseumOfScience1F_MapScriptHeader: object_const_def
const PEWTERMUSEUMOFSCIENCE1F_SCIENTIST2
PewterMuseumOfScience1F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
Museum1FScientistScript:
jumptextfaceplayer Museum1FScientistText
Museum1FGrampsScript:
jumptextfaceplayer Museum1FGrampsText
def_warp_events Museum1FYoungsterScript:
warp_event 10, 7, PEWTER_CITY, 6 jumptextfaceplayer Museum1FYoungsterText
warp_event 11, 7, PEWTER_CITY, 6
warp_event 16, 7, PEWTER_CITY, 7
warp_event 17, 7, PEWTER_CITY, 7
warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_2F, 1
def_coord_events
def_bg_events
bg_event 2, 3, BGEVENT_READ, KabutopsFossilSignpostScript
bg_event 6, 3, BGEVENT_READ, OmastarFossilSignpostScript
bg_event 3, 6, BGEVENT_READ, AerodactylFossilSignpostScript
bg_event 12, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
bg_event 13, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
bg_event 14, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
bg_event 15, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
bg_event 17, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
bg_event 18, 1, BGEVENT_JUMPTEXT, Museum1FBookshelfSignpostText
def_object_events
object_event 18, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Museum1FFossilScientistScript, -1
object_event 12, 4, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum1FReceptionistScript, -1
object_event 16, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum1FScientistText, -1
object_event 1, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum1FGrampsText, -1
object_event 4, 3, SPRITE_SCHOOLBOY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum1FYoungsterText, -1
object_const_def
const PEWTERMUSEUMOFSCIENCE1F_SCIENTIST2
Museum1FFossilScientistScript: Museum1FFossilScientistScript:
faceplayer faceplayer
@ -42,31 +24,31 @@ Museum1FFossilScientistScript:
iftrue .own_helix iftrue .own_helix
checkitem DOME_FOSSIL checkitem DOME_FOSSIL
iftrue .own_dome iftrue .own_dome
checkitem OLD_AMBER checkitem WING_FOSSIL
iftrue .ask_old_amber iftrue .ask_wing_fossil
jumpopenedtext NoFossilsText jumptext NoFossilsText
.own_helix .own_helix
checkitem DOME_FOSSIL checkitem DOME_FOSSIL
iftrue .own_helix_and_dome iftrue .own_helix_and_dome
checkitem OLD_AMBER checkitem WING_FOSSIL
iftrue .ask_helix_amber iftrue .ask_helix_wing
writetext AskHelixFossilText writetext AskHelixFossilText
yesorno yesorno
iftrue ResurrectHelixFossil iftrue ResurrectHelixFossil
sjump .maybe_later sjump .maybe_later
.own_dome .own_dome
checkitem OLD_AMBER checkitem WING_FOSSIL
iftrue .ask_dome_amber iftrue .ask_dome_wing
writetext AskDomeFossilText writetext AskDomeFossilText
yesorno yesorno
iftrue ResurrectDomeFossil iftrue ResurrectDomeFossil
sjump .maybe_later sjump .maybe_later
.own_helix_and_dome .own_helix_and_dome
checkitem OLD_AMBER checkitem WING_FOSSIL
iftrue .ask_helix_dome_amber iftrue .ask_helix_dome_wing
loadmenu HelixDomeMenuDataHeader loadmenu HelixDomeMenuDataHeader
verticalmenu verticalmenu
closewindow closewindow
@ -74,37 +56,37 @@ Museum1FFossilScientistScript:
ifequal $2, ResurrectDomeFossil ifequal $2, ResurrectDomeFossil
sjump .maybe_later sjump .maybe_later
.ask_old_amber .ask_wing_fossil
writetext AskOldAmberText writetext AskWingFossilText
yesorno yesorno
iftrue ResurrectOldAmber iftrue ResurrectWingFossil
sjump .maybe_later sjump .maybe_later
.ask_helix_amber .ask_helix_wing
loadmenu HelixAmberMenuDataHeader loadmenu HelixWingMenuDataHeader
verticalmenu verticalmenu
closewindow closewindow
ifequal $1, ResurrectHelixFossil ifequal $1, ResurrectHelixFossil
ifequal $2, ResurrectOldAmber ifequal $2, ResurrectWingFossil
sjump .maybe_later sjump .maybe_later
.ask_dome_amber .ask_dome_wing
loadmenu DomeAmberMenuDataHeader loadmenu DomeWingMenuDataHeader
verticalmenu verticalmenu
closewindow closewindow
ifequal $1, ResurrectDomeFossil ifequal $1, ResurrectDomeFossil
ifequal $2, ResurrectOldAmber ifequal $2, ResurrectWingFossil
sjump .maybe_later sjump .maybe_later
.ask_helix_dome_amber .ask_helix_dome_wing
loadmenu HelixDomeAmberMenuDataHeader loadmenu HelixDomeWingMenuDataHeader
verticalmenu verticalmenu
closewindow closewindow
ifequal $1, ResurrectHelixFossil ifequal $1, ResurrectHelixFossil
ifequal $2, ResurrectDomeFossil ifequal $2, ResurrectDomeFossil
ifequal $3, ResurrectOldAmber ifequal $3, ResurrectWingFossil
.maybe_later: .maybe_later:
jumpopenedtext MaybeLaterText jumptext MaybeLaterText
HelixDomeMenuDataHeader: HelixDomeMenuDataHeader:
db $40 ; flags db $40 ; flags
@ -120,7 +102,7 @@ HelixDomeMenuDataHeader:
db "Dome Fossil@" db "Dome Fossil@"
db "Cancel@" db "Cancel@"
HelixAmberMenuDataHeader: HelixWingMenuDataHeader:
db $40 ; flags db $40 ; flags
db 04, 00 ; start coords db 04, 00 ; start coords
db 11, 15 ; end coords db 11, 15 ; end coords
@ -131,10 +113,10 @@ HelixAmberMenuDataHeader:
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db "Helix Fossil@" db "Helix Fossil@"
db "Old Amber@" db "Wing Fossil@"
db "Cancel@" db "Cancel@"
DomeAmberMenuDataHeader: DomeWingMenuDataHeader:
db $40 ; flags db $40 ; flags
db 04, 00 ; start coords db 04, 00 ; start coords
db 11, 14 ; end coords db 11, 14 ; end coords
@ -145,10 +127,10 @@ DomeAmberMenuDataHeader:
db $80 ; flags db $80 ; flags
db 3 ; items db 3 ; items
db "Dome Fossil@" db "Dome Fossil@"
db "Old Amber@" db "Wing Fossil@"
db "Cancel@" db "Cancel@"
HelixDomeAmberMenuDataHeader: HelixDomeWingMenuDataHeader:
db $40 ; flags db $40 ; flags
db 02, 00 ; start coords db 02, 00 ; start coords
db 11, 15 ; end coords db 11, 15 ; end coords
@ -160,7 +142,7 @@ HelixDomeAmberMenuDataHeader:
db 4 ; items db 4 ; items
db "Helix Fossil@" db "Helix Fossil@"
db "Dome Fossil@" db "Dome Fossil@"
db "Old Amber@" db "Wing Fossil@"
db "Cancel@" db "Cancel@"
ResurrectHelixFossil: ResurrectHelixFossil:
@ -175,13 +157,19 @@ ResurrectDomeFossil:
givepoke KABUTO, 20 givepoke KABUTO, 20
sjump FinishResurrect sjump FinishResurrect
ResurrectOldAmber: ResurrectWingFossil:
takeitem OLD_AMBER takeitem WING_FOSSIL
scall ResurrectAFossilScript scall ResurrectAFossilScript
givepoke AERODACTYL, 20 givepoke AERODACTYL, 20
FinishResurrect: FinishResurrect:
iffalse_jumpopenedtext NoRoomForFossilPokemonText iffalse .PartyFull
jumpopenedtext TakeGoodCareOfItText jumptext TakeGoodCareOfItText
.PartyFull:
writetext NoRoomForFossilPokemonText
waitbutton
closetext
end
ResurrectAFossilScript: ResurrectAFossilScript:
writetext ResurrectingPokemonText writetext ResurrectingPokemonText
@ -206,10 +194,11 @@ ResurrectAFossilScript:
Museum1FReceptionistScript: Museum1FReceptionistScript:
readvar VAR_FACING readvar VAR_FACING
ifequal DOWN, .Sneak ifequal DOWN, SneakScript
ifequal LEFT, .Sneak ifequal LEFT, SneakScript
jumpthistextfaceplayer jumptextfaceplayer WelcomeText
WelcomeText:
text "Welcome!" text "Welcome!"
para "Thanks to a gene-" para "Thanks to a gene-"
@ -222,20 +211,22 @@ Museum1FReceptionistScript:
para "Please go ahead." para "Please go ahead."
done done
.Sneak: SneakScript:
jumpthistextfaceplayer jumptextfaceplayer SneakText
SneakText:
text "You can't sneak" text "You can't sneak"
line "in the back way!" line "in the back way!"
done done
KabutopsFossilSignpostScript: KabutopsFossilSignpostScript:
refreshscreen refreshscreen
trainerpic KABUTOPS_FOSSIL pokepic KABUTOPS ;placeholder, will become KABUTOPS_FOSSIL later
waitbutton waitbutton
closepokepic closepokepic
jumpthistext jumptext KabutopsFossilText
KabutopsFossilText:
text "Kabutops Fossil" text "Kabutops Fossil"
line "(Dome)" line "(Dome)"
@ -245,11 +236,12 @@ KabutopsFossilSignpostScript:
OmastarFossilSignpostScript: OmastarFossilSignpostScript:
refreshscreen refreshscreen
trainerpic OMASTAR_FOSSIL pokepic OMASTAR ;placeholder, will become OMASTAR_FOSSIL later
waitbutton waitbutton
closepokepic closepokepic
jumpthistext jumptext OmastarFossilText
OmastarFossilText:
text "Omastar Fossil" text "Omastar Fossil"
line "(Helix)" line "(Helix)"
@ -259,12 +251,14 @@ OmastarFossilSignpostScript:
AerodactylFossilSignpostScript: AerodactylFossilSignpostScript:
refreshscreen refreshscreen
trainerpic AERODACTYL_FOSSIL pokepic AERODACTYL ;placeholder, will become AERODACTYL_FOSSIL later
waitbutton waitbutton
closepokepic closepokepic
jumpthistext jumptext AerodactylFossilText
AerodactylFossilText:
text "Aerodactyl Fossil" text "Aerodactyl Fossil"
line "(Wing)"
para "A primitive and" para "A primitive and"
line "rare #mon." line "rare #mon."
@ -340,10 +334,10 @@ AskDomeFossilText:
cont "Dome Fossil?" cont "Dome Fossil?"
done done
AskOldAmberText: AskWingFossilText:
text "Do you want to" text "Do you want to"
line "resurrect the" line "resurrect the"
cont "Old Amber?" cont "Wing Fossil?"
done done
NoFossilsText: NoFossilsText:
@ -373,3 +367,31 @@ TakeGoodCareOfItText:
text "Take good care" text "Take good care"
line "of it!" line "of it!"
done done
PewterMuseumOfScience1F_MapEvents:
def_warp_events
warp_event 10, 7, PEWTER_CITY, 6
warp_event 11, 7, PEWTER_CITY, 6
warp_event 16, 7, PEWTER_CITY, 7
warp_event 17, 7, PEWTER_CITY, 7
warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_2F, 1
def_coord_events
def_bg_events
bg_event 2, 3, BGEVENT_READ, KabutopsFossilSignpostScript
bg_event 6, 3, BGEVENT_READ, OmastarFossilSignpostScript
bg_event 3, 6, BGEVENT_READ, AerodactylFossilSignpostScript
bg_event 12, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
bg_event 13, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
bg_event 14, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
bg_event 15, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
bg_event 17, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
bg_event 18, 1, BGEVENT_READ, Museum1FBookshelfSignpostText
def_object_events
object_event 18, 3, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Museum1FFossilScientistScript, -1
object_event 12, 4, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum1FReceptionistScript, -1
object_event 16, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Museum1FScientistScript, -1
object_event 1, 7, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Museum1FGrampsScript, -1
object_event 4, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Museum1FYoungsterScript, -1

65
maps/PewterMuseumOfScience2F.asm
View file

@ -1,35 +1,26 @@
PewterMuseumOfScience2F_MapScriptHeader: PewterMuseumOfScience2F_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
def_warp_events Museum2FScientistScript:
warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 5 jumptextfaceplayer Museum2FScientistText
def_coord_events Museum2FChildScript:
jumptextfaceplayer Museum2FChildText
def_bg_events Museum2FTeacherScript:
bg_event 3, 6, BGEVENT_READ, Museum2FMoonStoneSignpostScript jumptextfaceplayer Museum2FTeacherText
bg_event 11, 2, BGEVENT_JUMPTEXT, Museum2FSpaceShuttleSignpostText
def_object_events Museum2FLassScript:
object_event 7, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum2FScientistText, -1 jumptextfaceplayer Museum2FLassText
object_event 1, 7, SPRITE_CHILD, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum2FChildText, -1
object_event 2, 7, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum2FTeacherText, -1
object_event 2, 1, SPRITE_CUTE_GIRL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_COMMAND, jumptextfaceplayer, Museum2FLassText, -1
object_event 12, 5, SPRITE_HIKER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Museum2FPokefanMScript, -1
Museum2FPokefanMScript: Museum2FPokefanMScript:
faceplayer faceplayer
opentext opentext
checkevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO checkevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
iftrue Museum2FTutorSeismicTossScript iftrue Museum2FTutorSeismicTossScript
checkunits
iftrue .metric
writetext Museum2FPokefanMImperialText
sjump .ok sjump .ok
.metric
writetext Museum2FPokefanMMetricText
.ok .ok
waitbutton waitbutton
setevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO setevent EVENT_LISTENED_TO_SEISMIC_TOSS_INTRO
@ -42,25 +33,18 @@ Museum2FTutorSeismicTossScript:
yesorno yesorno
iffalse .TutorRefused iffalse .TutorRefused
setval SEISMIC_TOSS setval SEISMIC_TOSS
writetext ClearText writetext Text_Museum2FTutorMoveText
special Special_MoveTutor special MoveTutor
ifequal $0, .TeachMove ifequal $0, .TeachMove
.TutorRefused .TutorRefused
jumpopenedtext Text_Museum2FTutorRefused jumptext Text_Museum2FTutorRefused
.NoSilverLeaf .NoSilverLeaf
jumpopenedtext Text_Museum2FTutorNoSilverLeaf jumptext Text_Museum2FTutorNoSilverLeaf
.TeachMove .TeachMove
takeitem SILVER_LEAF takeitem SILVER_LEAF
jumpopenedtext Text_Museum2FTutorTaught jumptext Text_Museum2FTutorTaught
Museum2FMoonStoneSignpostScript:
refreshscreen
trainerpic METEORITE
waitbutton
closepokepic
jumptext Museum2FMoonStoneSignpostText
Museum2FScientistText: Museum2FScientistText:
text "Meteorites struck" text "Meteorites struck"
@ -146,6 +130,10 @@ Text_Museum2FTutorSeismicToss:
line "one Silver Leaf." line "one Silver Leaf."
done done
Text_Museum2FTutorMoveText:
text_start
done
Text_Museum2FTutorNoSilverLeaf: Text_Museum2FTutorNoSilverLeaf:
text "You don't have a" text "You don't have a"
line "Silver Leaf!" line "Silver Leaf!"
@ -176,3 +164,20 @@ Museum2FMoonStoneSignpostText:
Museum2FSpaceShuttleSignpostText: Museum2FSpaceShuttleSignpostText:
text "Space Shuttle" text "Space Shuttle"
done done
PewterMuseumOfScience2F_MapEvents:
def_warp_events
warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 5
def_coord_events
def_bg_events
bg_event 3, 6, BGEVENT_READ, Museum2FMoonStoneSignpostText
bg_event 11, 2, BGEVENT_READ, Museum2FSpaceShuttleSignpostText
def_object_events
object_event 7, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Museum2FScientistScript, -1
object_event 1, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Museum2FChildScript, -1
object_event 2, 7, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Museum2FTeacherScript, -1
object_event 2, 1, SPRITE_LASS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Museum2FLassScript, -1
object_event 12, 5, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Museum2FPokefanMScript, -1

219
maps/ViridianForest.asm
View file

@ -1,40 +1,75 @@
ViridianForest_MapScriptHeader: ViridianForest_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
def_warp_events TrainerBugCatcherDane:
warp_event 3, 5, VIRIDIAN_FOREST_PEWTER_GATE, 1 trainer BUG_CATCHER, BUG_CATCHER_DANE, EVENT_BEAT_BUG_CATCHER_DANE, BugCatcherDaneSeenText, BugCatcherDaneBeatenText, 0, .AfterScript
warp_event 18, 47, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1
warp_event 19, 47, VIRIDIAN_FOREST_VIRIDIAN_GATE, 2
def_coord_events .AfterScript:
endifjustbattled
opentext
writetext BugCatcherDaneAfterBattleText
waitbutton
closetext
end
def_bg_events TrainerBugCatcherDion:
bg_event 4, 7, BGEVENT_JUMPTEXT, ViridianForestSignText1 trainer BUG_CATCHER, BUG_CATCHER_DION, EVENT_BEAT_BUG_CATCHER_DION, BugCatcherDionSeenText, BugCatcherDionBeatenText, 0, .AfterScript
bg_event 6, 26, BGEVENT_JUMPTEXT, ViridianForestSignText2
bg_event 28, 19, BGEVENT_JUMPTEXT, ViridianForestSignText3 .AfterScript:
bg_event 18, 34, BGEVENT_JUMPTEXT, ViridianForestSignText4 endifjustbattled
bg_event 26, 42, BGEVENT_JUMPTEXT, ViridianForestSignText5 opentext
bg_event 20, 44, BGEVENT_JUMPTEXT, ViridianForestSignText6 writetext BugCatcherDionAfterBattleText
bg_event 32, 44, BGEVENT_ITEM + MAX_ETHER, EVENT_VIRIDIAN_FOREST_HIDDEN_MAX_ETHER waitbutton
bg_event 18, 43, BGEVENT_ITEM + FULL_HEAL, EVENT_VIRIDIAN_FOREST_HIDDEN_FULL_HEAL closetext
bg_event 4, 43, BGEVENT_ITEM + MULCH, EVENT_VIRIDIAN_FOREST_HIDDEN_MULCH end
bg_event 30, 9, BGEVENT_ITEM + BIG_MUSHROOM, EVENT_VIRIDIAN_FOREST_HIDDEN_BIG_MUSHROOM
bg_event 3, 14, BGEVENT_ITEM + LEAF_STONE, EVENT_VIRIDIAN_FOREST_HIDDEN_LEAF_STONE
def_object_events TrainerBugCatcherStacey:
object_event 29, 42, SPRITE_BUG_MANIAC, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 2, GenericTrainerBug_maniacDane, -1 trainer BUG_CATCHER, BUG_CATCHER_STACEY, EVENT_BEAT_BUG_CATCHER_STACEY, BugCatcherStaceySeenText, BugCatcherStaceyBeatenText, 0, .AfterScript
object_event 33, 35, SPRITE_BUG_MANIAC, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 5, GenericTrainerBug_maniacDion, -1
object_event 32, 21, SPRITE_BUG_MANIAC, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, GenericTrainerBug_maniacStacey, -1
object_event 31, 4, SPRITE_BUG_MANIAC, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 3, GenericTrainerBug_maniacEllis, -1
object_event 5, 24, SPRITE_BUG_MANIAC, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_GENERICTRAINER, 4, GenericTrainerBug_maniacAbner, -1
itemball_event 14, 31, DIRE_HIT, 1, EVENT_ROUTE_2_DIRE_HIT
itemball_event 3, 33, MAX_POTION, 1, EVENT_ROUTE_2_MAX_POTION
GenericTrainerBug_maniacDane: .AfterScript:
generictrainer BUG_MANIAC, DANE, EVENT_BEAT_BUG_MANIAC_DANE, BugManiacDaneSeenText, BugManiacDaneBeatenText endifjustbattled
opentext
writetext BugCatcherStaceyAfterBattleText
waitbutton
closetext
end
TrainerBugCatcherEllis:
trainer BUG_CATCHER, BUG_CATCHER_ELLIS, EVENT_BEAT_BUG_CATCHER_ELLIS, BugCatcherEllisSeenText, BugCatcherEllisBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext BugCatcherEllisAfterBattleText
waitbutton
closetext
end
TrainerBugCatcherAbner:
trainer BUG_CATCHER, BUG_CATCHER_ABNER, EVENT_BEAT_BUG_CATCHER_ABNER, BugCatcherAbnerSeenText, BugCatcherAbnerBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext BugCatcherAbnerAfterBattleText
waitbutton
closetext
end
BugCatcherDaneSeenText:
text "Welcome to"
line "Viridian Forest."
cont "Enjoy my Bug-type"
cont "#mon."
done
BugCatcherDaneBeatenText:
text "That's wonderful…"
done
BugCatcherDaneAfterBattleText:
text "Pretty impressive!" text "Pretty impressive!"
para "I'm sure you can" para "I'm sure you can"
@ -42,9 +77,17 @@ GenericTrainerBug_maniacDane:
cont "that skill!" cont "that skill!"
done done
GenericTrainerBug_maniacDion: BugCatcherDionSeenText:
generictrainer BUG_MANIAC, DION, EVENT_BEAT_BUG_MANIAC_DION, BugManiacDionSeenText, BugManiacDionBeatenText text "Shh! Be quiet! The"
line "bug #mon will"
cont "run away!"
done
BugCatcherDionBeatenText:
text "Phew…"
done
BugCatcherDionAfterBattleText:
text "Bug-type #mon" text "Bug-type #mon"
line "make all kinds of" line "make all kinds of"
cont "sounds." cont "sounds."
@ -55,56 +98,7 @@ GenericTrainerBug_maniacDion:
cont "them is key!" cont "them is key!"
done done
GenericTrainerBug_maniacStacey: BugCatcherStaceySeenText:
generictrainer BUG_MANIAC, STACEY, EVENT_BEAT_BUG_MANIAC_STACEY, BugManiacStaceySeenText, BugManiacStaceyBeatenText
text "Has anyone ever"
line "told you that from"
cont "behind you look"
cont "like a Venonat?"
done
GenericTrainerBug_maniacEllis:
generictrainer BUG_MANIAC, ELLIS, EVENT_BEAT_BUG_MANIAC_ELLIS, BugManiacEllisSeenText, BugManiacEllisBeatenText
text "If this is it,"
line "then I don't mind"
cont "losing!"
done
GenericTrainerBug_maniacAbner:
generictrainer BUG_MANIAC, ABNER, EVENT_BEAT_BUG_MANIAC_ABNER, BugManiacAbnerSeenText, BugManiacAbnerBeatenText
text "Doesn't matter what"
line "kind of #mon--"
para "as long as you"
line "like them, they"
cont "all look cute."
done
BugManiacDaneSeenText:
text "Welcome to"
line "Viridian Forest."
cont "Enjoy my Bug-type"
cont "#mon."
done
BugManiacDaneBeatenText:
text "That's wonderful…"
done
BugManiacDionSeenText:
text "Shh! Be quiet! The"
line "bug #mon will"
cont "run away!"
done
BugManiacDionBeatenText:
text "Phew…"
done
BugManiacStaceySeenText:
text "Wow, that's a HUGE" text "Wow, that's a HUGE"
line "#mon!" line "#mon!"
@ -113,35 +107,57 @@ BugManiacStaceySeenText:
cont "trainer?!" cont "trainer?!"
done done
BugManiacStaceyBeatenText: BugCatcherStaceyBeatenText:
text "I couldn't catch" text "I couldn't catch"
line "it!" line "it!"
done done
BugManiacEllisSeenText: BugCatcherStaceyAfterBattleText:
text "Has anyone ever"
line "told you that from"
cont "behind you look"
cont "like a Venonat?"
done
BugCatcherEllisSeenText:
text "There's nothing" text "There's nothing"
line "more efficient and" line "more efficient and"
cont "beautiful than a" cont "beautiful than a"
cont "Bug-type #mon." cont "Bug-type #mon."
done done
BugManiacEllisBeatenText: BugCatcherEllisBeatenText:
text "I lost" text "I lost"
line "beautifully!" line "beautifully!"
done done
BugManiacAbnerSeenText: BugCatcherEllisAfterBattleText:
text "If this is it,"
line "then I don't mind"
cont "losing!"
done
BugCatcherAbnerSeenText:
text "Many people prefer" text "Many people prefer"
line "solid bug #mon" line "solid bug #mon"
cont "over squishy bug" cont "over squishy bug"
cont "#mon." cont "#mon."
done done
BugManiacAbnerBeatenText: BugCatcherAbnerBeatenText:
text "Thanks for your" text "Thanks for your"
line "hard work, my" line "hard work, my"
cont "lovely #mon…" cont "lovely #mon…"
done done
BugCatcherAbnerAfterBattleText:
text "Doesn't matter what"
line "kind of #mon--"
para "as long as you"
line "like them, they"
cont "all look cute."
done
ViridianForestSignText1: ViridianForestSignText1:
text "Leaving" text "Leaving"
@ -194,3 +210,34 @@ ViridianForestSignText6:
para "When healthy," para "When healthy,"
line "they may escape!" line "they may escape!"
done done
ViridianForest_MapEvents:
def_warp_events
warp_event 3, 5, VIRIDIAN_FOREST_PEWTER_GATE, 1
warp_event 18, 47, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1
warp_event 19, 47, VIRIDIAN_FOREST_VIRIDIAN_GATE, 2
def_coord_events
def_bg_events
bg_event 4, 7, BGEVENT_READ, ViridianForestSignText1
bg_event 6, 26, BGEVENT_READ, ViridianForestSignText2
bg_event 28, 19, BGEVENT_READ, ViridianForestSignText3
bg_event 18, 34, BGEVENT_READ, ViridianForestSignText4
bg_event 26, 42, BGEVENT_READ, ViridianForestSignText5
bg_event 20, 44, BGEVENT_READ, ViridianForestSignText6
bg_event 32, 44, BGEVENT_ITEM + MAX_ETHER, EVENT_VIRIDIAN_FOREST_HIDDEN_MAX_ETHER
bg_event 18, 43, BGEVENT_ITEM + FULL_HEAL, EVENT_VIRIDIAN_FOREST_HIDDEN_FULL_HEAL
bg_event 4, 43, BGEVENT_ITEM + TINYMUSHROOM, EVENT_VIRIDIAN_FOREST_HIDDEN_TINYMUSHROOM
bg_event 30, 9, BGEVENT_ITEM + BIG_MUSHROOM, EVENT_VIRIDIAN_FOREST_HIDDEN_BIG_MUSHROOM
bg_event 3, 14, BGEVENT_ITEM + LEAF_STONE, EVENT_VIRIDIAN_FOREST_HIDDEN_LEAF_STONE
def_object_events
object_event 29, 42, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerBugCatcherDane, -1
object_event 33, 35, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 5, TrainerBugCatcherDion, -1
object_event 32, 21, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherStacey, -1
object_event 31, 4, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherEllis, -1
object_event 5, 24, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherAbner, -1
object_event 14, 31, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, DIRE_HIT, 1, EVENT_ROUTE_2_DIRE_HIT
object_event 3, 33, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, MAX_POTION, 1, EVENT_ROUTE_2_MAX_POTION

32
maps/ViridianForestPewterGate.asm
View file

@ -1,20 +1,10 @@
ViridianForestPewterGate_MapScriptHeader: ViridianForestPewterGate_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
def_warp_events ViridianForestPewterGateOfficerScript:
warp_event 4, 7, VIRIDIAN_FOREST, 1 jumptextfaceplayer ViridianForestPewterGateOfficerText
warp_event 5, 7, VIRIDIAN_FOREST, 1
warp_event 4, 0, ROUTE_2_NORTH, 5
warp_event 5, 0, ROUTE_2_NORTH, 6
def_coord_events
def_bg_events
def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, ViridianForestPewterGateOfficerText, -1
ViridianForestPewterGateOfficerText: ViridianForestPewterGateOfficerText:
text "Are you headed" text "Are you headed"
@ -23,3 +13,17 @@ ViridianForestPewterGateOfficerText:
para "Be sure to check" para "Be sure to check"
line "out the Museum!" line "out the Museum!"
done done
ViridianForestPewterGate_MapEvents:
def_warp_events
warp_event 4, 7, VIRIDIAN_FOREST, 1
warp_event 5, 7, VIRIDIAN_FOREST, 1
warp_event 4, 0, ROUTE_2, 5
warp_event 5, 0, ROUTE_2, 6
def_coord_events
def_bg_events
def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianForestPewterGateOfficerScript, -1

34
maps/ViridianForestViridianGate.asm
View file

@ -1,21 +1,11 @@
ViridianForestViridianGate_MapScriptHeader: ViridianForestViridianGate_MapScripts:
def_scene_scripts def_scene_scripts
def_callbacks def_callbacks
def_warp_events ViridianForestViridianGateOfficerScript:
warp_event 4, 0, VIRIDIAN_FOREST, 2 jumptextfaceplayer ViridianForestViridianGateOfficerText
warp_event 5, 0, VIRIDIAN_FOREST, 3
warp_event 4, 7, ROUTE_2_SOUTH, 2
warp_event 5, 7, ROUTE_2_SOUTH, 2
def_coord_events
def_bg_events
def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_COMMAND, jumptextfaceplayer, ViridianForestViridianGateOfficerText, -1
ViridianForestViridianGateOfficerText: ViridianForestViridianGateOfficerText:
text "Be careful," text "Be careful,"
line "Viridian Forest" line "Viridian Forest"
@ -23,3 +13,17 @@ ViridianForestViridianGateOfficerText:
para "is a natural" para "is a natural"
line "maze!" line "maze!"
done done
ViridianForestViridianGate_MapEvents:
def_warp_events
warp_event 4, 0, VIRIDIAN_FOREST, 2
warp_event 5, 0, VIRIDIAN_FOREST, 3
warp_event 4, 7, ROUTE_2, 2
warp_event 5, 7, ROUTE_2, 2
def_coord_events
def_bg_events
def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ViridianForestViridianGateOfficerScript, -1

2
maps/unused/BetaSproutTower7.ablk
View file

@ -2,7 +2,7 @@