diff --git a/README.md b/README.md index d8a124b..af376f3 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ With respect to Pokemon from the May 1998 Sprite Cache, creative liberties based Mega Evolutions, Gigantamax forms, etc, are not in active consideration. # Changes -## New Features - There is now an enby character option named Topaz, purple-themed. - There is a new Nihon region, based on the 1998 version before it got scrapped for Johto. - The Fairy-type is now available, though Pokemon are not retroactively changed, per the Kanto Expansion Pak philosophy (you wouldn't want a Fairy-type Granbull pre-split, would you?) @@ -40,12 +39,12 @@ Mega Evolutions, Gigantamax forms, etc, are not in active consideration. - 24% SOFT_SAND - 48% PEARL - 64% BRICK_PIECE - -# New things -- 11 new Trainer classes, including; +- Many new Trainer classes, including; - RBY classes not in GSC, such as the Rocker, Channeler, and even the beta Firefighter - Prototype GSC classes such as the Male Teacher, Sportsman, and Soldier - The Painter from FRLG! + - The Elder from HGSS, featuring the NTSC Sage sprite. + - Decensor is applied to the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. Let Tully have a puff! - Many evolution stones have been added to accomodate the Pokemon featured here, including the Heart and Poison Stones from the SpaceWorld demo, and the Peat Block! - The Fairy Feather from Scarlet and Violet has been added to accomodate the Fairy type. - The Antique Pot has been added to accomodate a Shuckle evolution! @@ -104,7 +103,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu ### JEP Developers JEP-affiliated spriters require sprites to be used with direct credit for non-commerical purposes. Credit the artist in any case of using them. - Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord, -- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops +- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops, Calflac (with inspiration from KmiE_821) - zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix - Shawesome: Alolan Geodude - EyeDonutz: Walking Wake @@ -115,9 +114,11 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co - nuuk: Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back) - Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly: Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj - Gorotora is edited from RacieBeep's Yellow sprite in the Helix Chamber PokeThon ROM Hack. A full list of Helix Chamber sprites are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). Helix Chamber spriters have a "must credit" policy. -- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage) +- SoupPotato et al: Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage), Trebir (Mallody), Folage (Silkane) - SCMidna: Munchlax -- SageDeoxys: (TBA) +- SageDeoxys: Iron Bundle, Raging Bolt, Scream Tail, Dudunsparce (both forms) +- Pokets: Terrados +- KmiE_821: Calflac design inspiration - Tom Wang: Gold/Chris running sprite - Seasick: Kris running sprite - Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites. diff --git a/constants/event_flags.asm b/constants/event_flags.asm index b61fe1b..c359ef3 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -595,7 +595,14 @@ const EVENT_BEAT_SAGE_PING const EVENT_BEAT_SAGE_EDMOND const EVENT_BEAT_SAGE_NEAL - const EVENT_BEAT_SAGE_LI + const EVENT_BEAT_SAGE_MING + const EVENT_BEAT_SAGE_WEI + const EVENT_BEAT_SAGE_LANG + const EVENT_BEAT_SAGE_HUANG + const EVENT_BEAT_SAGE_GEN + const EVENT_BEAT_SAGE_RAOH + const EVENT_BEAT_SAGE_SHUU + const EVENT_BEAT_SAGE_SHENG ; Camper const EVENT_BEAT_CAMPER_ROLAND const EVENT_BEAT_CAMPER_TODD @@ -1015,6 +1022,7 @@ const EVENT_BEAT_MEDIUM_ETHEL const EVENT_BEAT_MEDIUM_REBECCA const EVENT_BEAT_MEDIUM_DORIS + const EVENT_BEAT_MEDIUM_ELSIE ; Skier const EVENT_BEAT_SKIER_ROXANNE const EVENT_BEAT_SKIER_CLARISSA @@ -1091,6 +1099,8 @@ const EVENT_BEAT_PAINTER_DALI ; unused const EVENT_BEAT_SOLDIER_PEPPINO ; unused const EVENT_BEAT_SPORTSMAN_JACQUES ; unused + const EVENT_BEAT_ELDER_LI + const EVENT_BEAT_ELDER_ROEN ; Nihon Bosses const EVENT_BEAT_LEADER_WALKER const EVENT_BEAT_LEADER_LORELEI @@ -1109,8 +1119,7 @@ const EVENT_BEAT_ARCHER2 const EVENT_BEAT_ARCHER3 const EVENT_BEAT_PROFBLUE - const EVENT_GOT_TM47_STEEL_WING2 -; Unused: next 86 events +; Unused: next 77 events const_next 1600 ; Sprite visibility flags @@ -1538,7 +1547,8 @@ const EVENT_PALSSIO_POKEBALL_IN_BLUES_LAB ; to hide const EVENT_GONE_THROUGH_STARTER_DOOR const EVENT_BRIEFED_BY_BLUE -; Unused: next 40 events + const EVENT_GOT_TM47_STEEL_WING2 +; Unused: next 39 events const_next 2048 DEF NUM_EVENTS EQU const_value ; 800 diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index b3d7eca..8c9a3bb 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -132,6 +132,7 @@ DEF NIHON_LANDMARK EQU const_value const LANDMARK_ROUTE_49 const LANDMARK_QUIET_CAVE const LANDMARK_OLD_CITY + const LANDMARK_POKEMON_PAGODA const LANDMARK_BLUE_FOREST const LANDMARK_ROUTE_66 const LANDMARK_WHITE_CITY diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 54f94a4..e18e986 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -391,6 +391,10 @@ ENDM map_const ROUTE_8_SAFFRON_GATE, 5, 4 ; 13 map_const ROUTE_12_SUPER_ROD_HOUSE, 4, 4 ; 14 map_const LAVENDER_CRYPT, 9, 10 ; 15 + map_const LAVENDER_CRYPT_SET_1, 12, 10 ; 16 + map_const LAVENDER_CRYPT_SET_2, 12, 10 ; 17 + map_const LAVENDER_CRYPT_SET_3, 12, 10 ; 18 + map_const LAVENDER_CRYPT_DOKUROARS_ROOM, 7, 8 ; 19 endgroup newgroup SILVER ; 19 @@ -644,6 +648,12 @@ ENDM map_const OLD_CITY_FAMILY_HOUSE, 4, 4 ; 6 map_const SEPIA_SCHOOL, 4, 8 ; 7 map_const OLD_CITY_GYM, 6, 10 ; 8 + map_const OLD_CITY_MUSEUM, 8, 3 ; 9 + map_const POKEMON_PAGODA_1F, 5, 5 ; 10 + map_const POKEMON_PAGODA_2F, 5, 5 ; 10 + map_const POKEMON_PAGODA_3F, 5, 5 ; 10 + map_const POKEMON_PAGODA_4F, 5, 5 ; 10 + map_const POKEMON_PAGODA_5F, 3, 3 ; 10 endgroup newgroup BLUE_FOREST ; 37 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 9a15db2..3f5fe21 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -141,6 +141,7 @@ DEF KANTO_FLYPOINT EQU const_value const FLY_INDIGO DEF NIHON_FLYPOINT EQU const_value const FLY_SILENT_HILLS + const FLY_OLD_CITY DEF NUM_FLYPOINTS EQU const_value DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index e7c7a42..f503655 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -635,19 +635,31 @@ DEF KRIS EQU __trainer_class__ const PING const EDMOND const NEAL - const LI const GAKU const MASA const KOJI + + ; New Sages for the Pokemon Pagoda. + ; Given Li, Chow, Jin, and Ping are Chinese names, I decided to adapt it here. + ; I also added the French Crystal Wise Trio's names; Raoh, and Shuu, which were Fist of the North Star references. Because it's just kind of cool. Ken already exists, so I instead went with Gen, the name of a Chinese Street Fighter character. + const MING + const WEI + const LANG + const HUANG + const GEN + const RAOH + const SHUU + const SHENG trainerclass MEDIUM ; 39 const MARTHA const GRACE - const BETHANY ; unused - const MARGRET ; unused - const ETHEL ; unused + const BETHANY ; unused, now Pagoda 2F Medium + const MARGRET ; unused, now Pagoda 2F Medium + const ETHEL ; unused, now Pagoda 2F Medium const REBECCA const DORIS + const ELSIE ; Pagoda 2F Mediums trainerclass BOARDER ; 3a const RONALD @@ -793,6 +805,10 @@ DEF KRIS EQU __trainer_class__ trainerclass PROFBLUE const PROFBLUE1 + + trainerclass ELDER + const LI + const KONG DEF TOPAZ EQU __trainer_class__ DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1 diff --git a/data/collision/field_move_blocks.asm b/data/collision/field_move_blocks.asm index 444be14..aebd007 100644 --- a/data/collision/field_move_blocks.asm +++ b/data/collision/field_move_blocks.asm @@ -6,6 +6,8 @@ CutTreeBlockPointers: dbw TILESET_KANTO, .kanto dbw TILESET_PARK, .park dbw TILESET_FOREST, .forest + dbw TILESET_NIHON_01, .nihon01 + dbw TILESET_NIHON_OLD, .oldCity db -1 ; end .johto: @@ -43,6 +45,16 @@ CutTreeBlockPointers: db $0f, $17, 0 db -1 ; end +.nihon01: +; facing block, replacement block, animation + db $03, $02, 1 ; grass + db $6d, $88, 0 ; tree + db -1 ; end + +.oldCity: +; facing block, replacement block, animation + db $17, $41, 0 ; tree + db -1 ; end ; these blocks all use COLL_WHIRLPOOL in one quadrant WhirlpoolBlockPointers: @@ -53,3 +65,4 @@ WhirlpoolBlockPointers: ; facing block, replacement block, animation db $07, $36, 0 db -1 ; end + diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index bc80d4c..ffc6818 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -732,6 +732,10 @@ ENDM map_attributes JohtoSafariZoneGate, JOHTO_SAFARI_ZONE_GATE, $00, 0 ; Bank 1 map_attributes JohtoSafariZone, JOHTO_SAFARI_ZONE, $00, 0 ; Bank 1 map_attributes LavenderCrypt, LAVENDER_CRYPT, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet1, LAVENDER_CRYPT_SET_1, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet2, LAVENDER_CRYPT_SET_2, $00, 0 ; Bank 1 + map_attributes LavenderCryptSet3, LAVENDER_CRYPT_SET_3, $00, 0 ; Bank 1 + map_attributes LavenderCryptDokuroarsRoom, LAVENDER_CRYPT_DOKUROARS_ROOM, $00, 0 ; Bank 1 map_attributes UnderwaterTunnel, UNDERWATER_TUNNEL, $00, 0 ; Bank 1 map_attributes BillsGarden, BILLS_GARDEN, $00, 0 ; Bank 1 map_attributes CeladonUniversityOutside, CELADON_UNIVERSITY_OUTSIDE, $00, 0 ; Bank 1 @@ -833,6 +837,12 @@ ENDM map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0 map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0 map_attributes OldCityGym, OLD_CITY_GYM, $00, 0 + map_attributes OldCityMuseum, OLD_CITY_MUSEUM, $00, 0 + map_attributes PokemonPagoda1F, POKEMON_PAGODA_1F, $00, 0 + map_attributes PokemonPagoda2F, POKEMON_PAGODA_2F, $00, 0 + map_attributes PokemonPagoda3F, POKEMON_PAGODA_3F, $00, 0 + map_attributes PokemonPagoda4F, POKEMON_PAGODA_4F, $00, 0 + map_attributes PokemonPagoda5F, POKEMON_PAGODA_5F, $00, 0 map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 860998f..f6505f9 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -279,6 +279,18 @@ JohtoSafariZone_Blocks: LavenderCrypt_Blocks: INCBIN "maps/LavenderCrypt.ablk" +LavenderCryptSet1_Blocks: + INCBIN "maps/LavenderCryptSet1.ablk" + +LavenderCryptSet2_Blocks: + INCBIN "maps/LavenderCryptSet2.ablk" + +LavenderCryptSet3_Blocks: + INCBIN "maps/LavenderCryptSet3.ablk" + +LavenderCryptDokuroarsRoom_Blocks: + INCBIN "maps/LavenderCryptDokuroarsRoom.ablk" + UnderwaterTunnel_Blocks: INCBIN "maps/UnderwaterTunnel.ablk" @@ -1243,3 +1255,21 @@ Route66WhiteCityGate_Blocks: OldCityGym_Blocks: INCBIN "maps/OldCityGym.ablk" + +OldCityMuseum_Blocks: + INCBIN "maps/OldCityMuseum.ablk" + +PokemonPagoda1F_Blocks: + INCBIN "maps/PokemonPagoda1F.ablk" + +PokemonPagoda2F_Blocks: + INCBIN "maps/PokemonPagoda2F.ablk" + +PokemonPagoda3F_Blocks: + INCBIN "maps/PokemonPagoda3F.ablk" + +PokemonPagoda4F_Blocks: + INCBIN "maps/PokemonPagoda4F.ablk" + +PokemonPagoda5F_Blocks: + INCBIN "maps/PokemonPagoda5F.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 3b1730f..4423587 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -136,6 +136,7 @@ Landmarks: landmark 84, 108, Route49Name landmark 76, 108, QuietCaveName landmark 76, 100, OldCityName + landmark 76, 100, PokemonPagodaName landmark 140, 60, BlueForestName landmark 108, 108, Route66Name landmark 124, 108, WhiteCityName @@ -251,6 +252,7 @@ Route66Name: db "ROUTE 66@" Route49Name: db "ROUTE 49@" QuietCaveName: db "QUIET¯CAVE@" OldCityName: db "SEPIA¯CITY@" +PokemonPagodaName: db "#MON¯PAGODA@" ; High Tech will be called "Vogue City" BlueForestName: db "BLUE¯FOREST@" WhiteCityName: db "WHITE¯CITY@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 26e5772..ceea80a 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -431,6 +431,10 @@ MapGroup_Lavender: map Route8SaffronGate, TILESET_GATE, GATE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE map Route12SuperRodHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_12, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map LavenderCrypt, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet1, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE + map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE assert_table_length NUM_LAVENDER_MAPS MapGroup_Silver: @@ -704,6 +708,12 @@ MapGroup_OldCity: map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE + map OldCityMuseum, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE + map PokemonPagoda1F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE + map PokemonPagoda2F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE + map PokemonPagoda3F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE + map PokemonPagoda4F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE + map PokemonPagoda5F, TILESET_TOWER, INDOOR, LANDMARK_POKEMON_PAGODA, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_NONE assert_table_length NUM_OLD_CITY_MAPS MapGroup_BlueForest: diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index fa19737..7d835ea 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -717,6 +717,7 @@ SilentHillsGroupSprites: db SPRITE_BLUE db SPRITE_POKEFAN_M db SPRITE_SUPER_NERD + db SPRITE_COOLTRAINER_M ; 2 non-walking sprites db SPRITE_POKE_BALL db SPRITE_FRUIT_TREE diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 665b2c6..7e5230b 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -590,6 +590,16 @@ INCLUDE "maps/Route66WhiteCityGate.asm" SECTION "Map Scripts 30", ROMX INCLUDE "maps/OldCityGym.asm" +INCLUDE "maps/OldCityMuseum.asm" +INCLUDE "maps/PokemonPagoda1F.asm" +INCLUDE "maps/PokemonPagoda2F.asm" +INCLUDE "maps/PokemonPagoda3F.asm" +INCLUDE "maps/PokemonPagoda4F.asm" +INCLUDE "maps/PokemonPagoda5F.asm" +INCLUDE "maps/LavenderCryptSet1.asm" +INCLUDE "maps/LavenderCryptSet2.asm" +INCLUDE "maps/LavenderCryptSet3.asm" +INCLUDE "maps/LavenderCryptDokuroarsRoom.asm" SECTION "Map Scripts 31", ROMX ; spillover INCLUDE "maps/TanobyRuins.asm" diff --git a/data/pokemon/dex_entries/calflac.asm b/data/pokemon/dex_entries/calflac.asm index 503cc86..bdb3b2f 100644 --- a/data/pokemon/dex_entries/calflac.asm +++ b/data/pokemon/dex_entries/calflac.asm @@ -1,10 +1,10 @@ db "CALF@" ; species name - dw 404, 458 ; height, weight + dw 311, 350 ; height, weight - db "Formed when" - next "BIPULLA's two" - next "halves joined" + db "Both of BIPULLA's" + next "halves joined to" + next "become CALFLAC." - page "together. However," - next "they still strug-" - next "gle to cooperate.@" + page "However, its two" + next "brains struggle" + next "to cooperate.@" diff --git a/data/pokemon/dex_entries/flutter_mane.asm b/data/pokemon/dex_entries/flutter_mane.asm index e80110d..93aa9fa 100644 --- a/data/pokemon/dex_entries/flutter_mane.asm +++ b/data/pokemon/dex_entries/flutter_mane.asm @@ -1,10 +1,10 @@ db "PARADOX@" ; species name - dw 407, 088 ; height, weight + dw 407, 80 ; height, weight - db "It floats around with" + db "Believed to be the" + next "ghost of a ptero-" + next "saur. At night, it" + + page "flies around with" next "its writhing hair," - next "scoffing at those" - - page "beneath it. Said" - next "to be the ghost" - next "of a pterosaur.@" + next "cackling wickedly.@" diff --git a/data/pokemon/dex_entries/great_tusk.asm b/data/pokemon/dex_entries/great_tusk.asm index d8b984c..33d3810 100644 --- a/data/pokemon/dex_entries/great_tusk.asm +++ b/data/pokemon/dex_entries/great_tusk.asm @@ -1,5 +1,5 @@ db "PARADOX@" ; species name - dw 703, 7055 ; height, weight + dw 703, 7050 ; height, weight db "A relic of the age" next "of dinosaurs. Its" diff --git a/data/pokemon/dex_entries/iron_bundle.asm b/data/pokemon/dex_entries/iron_bundle.asm index a093a6f..f8551ec 100644 --- a/data/pokemon/dex_entries/iron_bundle.asm +++ b/data/pokemon/dex_entries/iron_bundle.asm @@ -1,10 +1,10 @@ db "PARADOX@" ; species name - dw 200, 243 ; height, weight + dw 200, 240 ; height, weight - db "It carries a metal" - next "device that launches" - next "it backward. This," + db "A strange, robotic" + next "#MON that can" + next "launch itself by" - page "and its extendable" - next "head, have resulted" - next "in much speculation.@" + page "firing icy blasts" + next "from the round" + next "device it holds.@" diff --git a/data/pokemon/dex_entries/iron_thorns.asm b/data/pokemon/dex_entries/iron_thorns.asm index bcef70f..c06a312 100644 --- a/data/pokemon/dex_entries/iron_thorns.asm +++ b/data/pokemon/dex_entries/iron_thorns.asm @@ -1,10 +1,10 @@ db "PARADOX@" ; species name - dw 503, 668 ; height, weight + dw 503, 6680 ; height, weight - db "Seemingly OMEGADGE's" - next "final version. It" - next "only picks fights" + db "Thought to be the" + next "final version of" + next "OMEGADGE. It's a" - page "it can win, and" - next "attacks using its" - next "retractable spikes.@" + page "highly intelligent" + next "creature, avoiding" + next "needless battles.@" diff --git a/data/pokemon/dex_entries/iron_treads.asm b/data/pokemon/dex_entries/iron_treads.asm index c181a91..0be22a0 100644 --- a/data/pokemon/dex_entries/iron_treads.asm +++ b/data/pokemon/dex_entries/iron_treads.asm @@ -1,5 +1,5 @@ db "PARADOX@" ; species name - dw 211, 5922 ; height, weight + dw 211, 5920 ; height, weight db "A creature of the" next "digital age. It" diff --git a/data/pokemon/dex_entries/sandy_shocks.asm b/data/pokemon/dex_entries/sandy_shocks.asm index eda4cb5..7b3066b 100644 --- a/data/pokemon/dex_entries/sandy_shocks.asm +++ b/data/pokemon/dex_entries/sandy_shocks.asm @@ -1,10 +1,10 @@ db "PARADOX@" ; species name - dw 707, 1323 ; height, weight + dw 707, 1320 ; height, weight - db "Its magnets are very" - next "dexterous, allowing" - next "for easy traversal" + db "It travels across" + next "deserts by walking" + next "on its dexterous" - page "across deserts." - next "However, it leaves" - next "covered in iron.@" + page "magnets. The iron" + next "filings it picks" + next "up adorn its body.@" diff --git a/data/pokemon/dex_entries/scream_tail.asm b/data/pokemon/dex_entries/scream_tail.asm index ad1d3dd..9888f16 100644 --- a/data/pokemon/dex_entries/scream_tail.asm +++ b/data/pokemon/dex_entries/scream_tail.asm @@ -1,10 +1,10 @@ db "PARADOX@" ; species name - dw 311, 176 ; height, weight + dw 311, 170 ; height, weight - db "Its eyes glow yellow" - next "when angered. Its" - next "aggression prompted" + db "Its eyes glow when" + next "angered. Its aggr-" + next "essive nature has" - page "rumours of it being" - next "a beast from the" + page "sparked rumors of" + next "it being from the" next "Cambrian period.@" diff --git a/data/pokemon/dex_entries/stromen.asm b/data/pokemon/dex_entries/stromen.asm index 5eeae21..a9e838c 100644 --- a/data/pokemon/dex_entries/stromen.asm +++ b/data/pokemon/dex_entries/stromen.asm @@ -1,5 +1,5 @@ db "CURSE@" ; species name - dw 8, 19 ; height, weight + dw 100, 20 ; height, weight db "It lives quietly" next "in places no one" diff --git a/data/pokemon/dex_entries/terrados.asm b/data/pokemon/dex_entries/terrados.asm index a883611..51f7f80 100644 --- a/data/pokemon/dex_entries/terrados.asm +++ b/data/pokemon/dex_entries/terrados.asm @@ -3,8 +3,8 @@ db "It blindly tunnels" next "through the earth," - next "feasting on any," + next "crushing rocks in" - page "unfortunate GRAVELER" - next "or ONIX that it" - next "comes across.@" + page "its jaws. GRAVELER" + next "and ONIX are its" + next "favorite prey.@" diff --git a/data/tilesets/lavendercrypt_attributes.bin b/data/tilesets/lavendercrypt_attributes.bin index 779572e..1ad86c7 100644 Binary files a/data/tilesets/lavendercrypt_attributes.bin and b/data/tilesets/lavendercrypt_attributes.bin differ diff --git a/data/tilesets/lavendercrypt_collision.asm b/data/tilesets/lavendercrypt_collision.asm index 7cc9135..3b3ee54 100644 --- a/data/tilesets/lavendercrypt_collision.asm +++ b/data/tilesets/lavendercrypt_collision.asm @@ -16,96 +16,96 @@ tilecoll FLOOR, WALL, FLOOR, WALL ; 0f tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 tilecoll WALL, WALL, DOOR, DOOR ; 11 - tilecoll FLOOR, WALL, LADDER, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, FLOOR, FLOOR ; 13 tilecoll WALL, WALL, WALL, FLOOR ; 14 tilecoll WALL, WALL, FLOOR, WALL ; 15 - tilecoll FLOOR, WALL, LADDER, WALL ; 16 + tilecoll FLOOR, PIT, FLOOR, PIT ; 16 tilecoll WALL, WALL, WALL, WALL ; 17 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 tilecoll WALL, WALL, WALL, FLOOR ; 19 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a - tilecoll WALL, FLOOR, LADDER, FLOOR ; 1b + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1a + tilecoll PIT, FLOOR, FLOOR, FLOOR ; 1b tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d tilecoll FLOOR, FLOOR, WALL, WALL ; 1e - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1f - tilecoll FLOOR, WALL, FLOOR, WALL ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 20 tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 21 - tilecoll WALL, WALL, FLOOR, FLOOR ; 22 - tilecoll WALL, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 tilecoll WALL, WALL, FLOOR, FLOOR ; 24 - tilecoll FLOOR, WALL, FLOOR, WALL ; 25 - tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26 - tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 27 - tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WALL ; 28 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll WALL, WALL, WALL, WALL ; 2a - tilecoll FLOOR, WALL, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b - tilecoll WALL, WALL, WALL, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, WALL ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 25 + tilecoll WALL, WALL, WALL, FLOOR ; 26 + tilecoll WALL, FLOOR, WALL, FLOOR ; 27 + tilecoll WALL, FLOOR, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 2a + tilecoll PIT, FLOOR, PIT, FLOOR ; 2b + tilecoll FLOOR, WARP_CARPET_DOWN, WALL, WALL ; 2c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f tilecoll WALL, WALL, WALL, WALL ; 30 - tilecoll WALL, LADDER, WALL, WALL ; 31 - tilecoll LADDER, FLOOR, LADDER, FLOOR ; 32 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, FLOOR, WALL, WALL ; 32 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll WALL, WALL, FLOOR, FLOOR ; 34 - tilecoll WALL, WALL, WALL, WALL ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll FLOOR, FLOOR, WALL, WALL ; 37 - tilecoll FLOOR, FLOOR, WALL, WALL ; 38 - tilecoll WALL, FLOOR, WALL, FLOOR ; 39 - tilecoll WALL, WALL, WALL, FLOOR ; 3a - tilecoll WALL, WALL, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, WALL, WALL ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, PIT, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, WALL ; 36 + tilecoll PIT, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, PIT, WALL, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, FLOOR, WALL ; 3b + tilecoll FLOOR, FLOOR, WALL, WALL ; 3c + tilecoll WALL, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e tilecoll WALL, WALL, FLOOR, FLOOR ; 3f - tilecoll WALL, WALL, WALL, FLOOR ; 40 - tilecoll WALL, WALL, FLOOR, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, WALL ; 42 - tilecoll WALL, WALL, WALL, WALL ; 43 - tilecoll WALL, FLOOR, WALL, FLOOR ; 44 - tilecoll WALL, FLOOR, WALL, FLOOR ; 45 - tilecoll FLOOR, WALL, FLOOR, WALL ; 46 - tilecoll WALL, WALL, FLOOR, FLOOR ; 47 - tilecoll WALL, FLOOR, WALL, WALL ; 48 - tilecoll FLOOR, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, WALL, WALL, WALL ; 4a - tilecoll FLOOR, WALL, FLOOR, WALL ; 4b - tilecoll WALL, WALL, FLOOR, FLOOR ; 4c - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4e - tilecoll FLOOR, FLOOR, WALL, WALL ; 4f - tilecoll FLOOR, WALL, FLOOR, WALL ; 50 - tilecoll WALL, FLOOR, WALL, FLOOR ; 51 - tilecoll WALL, WALL, WALL, WALL ; 52 - tilecoll WALL, WALL, WALL, WALL ; 53 - tilecoll WALL, WALL, WALL, WALL ; 54 - tilecoll WALL, FLOOR, WALL, WALL ; 55 - tilecoll WALL, WALL, WALL, WALL ; 56 - tilecoll WALL, FLOOR, WALL, WALL ; 57 - tilecoll FLOOR, WALL, WALL, WALL ; 58 - tilecoll WALL, WALL, WALL, WALL ; 59 - tilecoll WALL, WALL, WALL, WALL ; 5a - tilecoll WALL, WALL, WALL, WALL ; 5b - tilecoll WALL, WALL, FLOOR, WALL ; 5c - tilecoll WALL, WALL, WALL, FLOOR ; 5d - tilecoll WALL, WALL, WALL, FLOOR ; 5e + tilecoll WALL, WALL, FLOOR, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, WALL ; 41 + tilecoll WALL, WALL, PIT, FLOOR ; 42 + tilecoll FLOOR, WALL, WALL, PIT ; 43 + tilecoll WALL, FLOOR, WALL, WALL ; 44 + tilecoll FLOOR, WALL, WALL, WALL ; 45 + tilecoll WALL, WALL, FLOOR, WALL ; 46 + tilecoll WALL, WALL, WALL, FLOOR ; 47 + tilecoll FLOOR, WALL, FLOOR, WALL ; 48 + tilecoll WALL, FLOOR, WALL, FLOOR ; 49 + tilecoll WALL, FLOOR, WALL, WALL ; 4a + tilecoll WALL, WALL, WALL, WALL ; 4b + tilecoll FLOOR, WALL, WALL, WALL ; 4c + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 4d + tilecoll FLOOR, PIT, WALL, WALL ; 4e + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 4f + tilecoll WALL, FLOOR, WALL, WALL ; 50 + tilecoll WALL, WALL, WALL, WALL ; 51 + tilecoll WALL, WALL, FLOOR, PIT ; 52 + tilecoll FLOOR, FLOOR, WALL, WALL ; 53 + tilecoll WALL, FLOOR, WALL, FLOOR ; 54 + tilecoll WALL, WALL, WALL, WALL ; 55 + tilecoll FLOOR, WALL, FLOOR, WALL ; 56 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 57 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 58 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 59 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5a + tilecoll PIT, WALL, WALL, WALL ; 5b + tilecoll WALL, FLOOR, FLOOR, WALL ; 5c + tilecoll FLOOR, PIT, WALL, PIT ; 5d + tilecoll PIT, FLOOR, WALL, WALL ; 5e tilecoll WALL, WALL, FLOOR, WALL ; 5f - tilecoll WALL, WALL, WALL, WALL ; 60 - tilecoll WALL, WALL, WALL, WALL ; 61 - tilecoll FLOOR, WALL, WALL, WALL ; 62 - tilecoll WALL, WALL, FLOOR, WALL ; 63 - tilecoll WALL, WALL, WALL, FLOOR ; 64 - tilecoll FLOOR, WALL, WALL, FLOOR ; 65 - tilecoll WALL, FLOOR, FLOOR, WALL ; 66 - tilecoll WALL, FLOOR, WALL, WALL ; 67 - tilecoll FLOOR, WALL, WALL, WALL ; 68 - tilecoll WALL, WALL, WALL, FLOOR ; 69 - tilecoll WALL, WALL, FLOOR, WALL ; 6a - tilecoll WALL, WALL, FLOOR, WALL ; 6b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 60 + tilecoll FLOOR, PIT, WALL, WALL ; 61 + tilecoll PIT, FLOOR, WALL, WALL ; 62 + tilecoll WALL, FLOOR, WALL, WALL ; 63 + tilecoll WALL, WALL, WALL, WALL ; 64 + tilecoll WALL, WALL, FLOOR, WALL ; 65 + tilecoll WALL, WALL, WALL, WALL ; 66 + tilecoll WALL, WALL, FLOOR, WALL ; 67 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 68 + tilecoll WALL, WALL, WALL, WALL ; 69 + tilecoll WALL, WALL, WALL, WALL ; 6a + tilecoll WALL, WALL, WALL, WALL ; 6b tilecoll WALL, WALL, WALL, WALL ; 6c tilecoll WALL, WALL, WALL, WALL ; 6d tilecoll WALL, WALL, WALL, WALL ; 6e diff --git a/data/tilesets/lavendercrypt_metatiles.bin b/data/tilesets/lavendercrypt_metatiles.bin index a225086..1619c25 100644 Binary files a/data/tilesets/lavendercrypt_metatiles.bin and b/data/tilesets/lavendercrypt_metatiles.bin differ diff --git a/data/tilesets/nihon_old_attributes.bin b/data/tilesets/nihon_old_attributes.bin index 036f3fd..18d6a0d 100644 Binary files a/data/tilesets/nihon_old_attributes.bin and b/data/tilesets/nihon_old_attributes.bin differ diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm index b310f3f..cd47386 100644 --- a/data/tilesets/nihon_old_collision.asm +++ b/data/tilesets/nihon_old_collision.asm @@ -60,6 +60,7 @@ tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d - tilecoll DOOR, WALL, WALL, WALL ; 3e + tilecoll DOOR, WALL, FLOOR, FLOOR ; 3e tilecoll WALL, WALL, WALL, WALL ; 3f tilecoll WALL, WALL, FLOOR, WALL ; 40 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 41 diff --git a/data/tilesets/nihon_old_metatiles.bin b/data/tilesets/nihon_old_metatiles.bin index cd8c97a..6e43671 100644 Binary files a/data/tilesets/nihon_old_metatiles.bin and b/data/tilesets/nihon_old_metatiles.bin differ diff --git a/data/tilesets/tower_attributes.bin b/data/tilesets/tower_attributes.bin index 49c4876..f1af261 100644 Binary files a/data/tilesets/tower_attributes.bin and b/data/tilesets/tower_attributes.bin differ diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index d0da62e..8c0c6fa 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -64,17 +64,28 @@ tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f tilecoll WALL, WALL, FLOOR, FLOOR ; 40 tilecoll WALL, WALL, FLOOR, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, FLOOR ; 43 - tilecoll WALL, WALL, FLOOR, FLOOR ; 44 - tilecoll WALL, WALL, FLOOR, FLOOR ; 45 - tilecoll WALL, WALL, FLOOR, FLOOR ; 46 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 42 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 43 + tilecoll WALL, WALL, FLOOR, WALL ; 44 + tilecoll WALL, WALL, WALL, FLOOR ; 45 + tilecoll WALL, WALL, FLOOR, WALL ; 46 tilecoll WALL, WALL, FLOOR, FLOOR ; 47 tilecoll WALL, WALL, FLOOR, FLOOR ; 48 - tilecoll WALL, WALL, FLOOR, FLOOR ; 49 + tilecoll WALL, WALL, FLOOR, WALL ; 49 tilecoll WALL, FLOOR, WALL, FLOOR ; 4a tilecoll FLOOR, WALL, FLOOR, WALL ; 4b tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4c tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d tilecoll WALL, WALL, FLOOR, WALL ; 4e tilecoll WALL, WALL, WALL, FLOOR ; 4f + tilecoll FLOOR, FLOOR, WALL, WALL ; 50 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 51 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 52 + tilecoll WALL, WALL, FLOOR, FLOOR ; 53 + tilecoll WALL, WALL, FLOOR, FLOOR ; 54 + tilecoll WALL, WALL, FLOOR, FLOOR ; 55 + tilecoll WALL, WALL, FLOOR, FLOOR ; 56 + tilecoll WALL, WALL, FLOOR, FLOOR ; 57 + tilecoll WALL, WALL, FLOOR, WALL ; 58 + tilecoll WALL, WALL, LADDER, FLOOR ; 59 + tilecoll WALL, WALL, LADDER, FLOOR ; 5a diff --git a/data/tilesets/tower_metatiles.bin b/data/tilesets/tower_metatiles.bin index dc59184..b491099 100644 --- a/data/tilesets/tower_metatiles.bin +++ b/data/tilesets/tower_metatiles.bin @@ -1,4 +1,4 @@  @ !!A1A1!!!!!!@ A1A1 A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^   GHWX - GHWXFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 0123!!4501!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^!!^^!!!!!!!!!!!!!!!! \ No newline at end of file + GHWXFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 0123!!4501!!2345EFUV55EFUV55IJ]]YZMM55NO^_]]MM!!NO^_KL]][\MM55NO^_KL!![\556789!!5501]]23MM45NO^_!!^^!!^^!!!!!!!!!!!!!!!! !!!$%:;!#%'NO^_<=]]>?MM5567<=89>?5555]]]]MMMM]]!!MM]]MM!!]]]]MMMMNO^_]]]]MMMM ]]]]MMMM \ No newline at end of file diff --git a/data/trainers/attributes.asm b/data/trainers/attributes.asm index 5f989ce..3096d99 100644 --- a/data/trainers/attributes.asm +++ b/data/trainers/attributes.asm @@ -549,4 +549,10 @@ TrainerClassAttributes: dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY dw CONTEXT_USE | SWITCH_SOMETIMES +; Elder + db NO_ITEM, NO_ITEM ; items + db 10 ; base reward + dw AI_BASIC | AI_SETUP | AI_TYPES | AI_CAUTIOUS | AI_STATUS | AI_RISKY + dw CONTEXT_USE | SWITCH_SOMETIMES + assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/class_names.asm b/data/trainers/class_names.asm index 65e5108..0097dc1 100644 --- a/data/trainers/class_names.asm +++ b/data/trainers/class_names.asm @@ -92,4 +92,5 @@ TrainerClassNames:: li "EXECUTIVE" li "EXECUTIVE" li "PROFESSOR" + li "ELDER" assert_list_length NUM_TRAINER_CLASSES diff --git a/data/trainers/dvs.asm b/data/trainers/dvs.asm index 2ee2599..eb5857c 100644 --- a/data/trainers/dvs.asm +++ b/data/trainers/dvs.asm @@ -93,4 +93,5 @@ TrainerClassDVs: dn 13, 12, 13, 13 ; ARIANA dn 13, 12, 13, 13 ; ARCHER dn 13, 12, 13, 13 ; PROF.BLUE + dn 12, 15, 13, 13 ; ELDER (HP Ground) assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/encounter_music.asm b/data/trainers/encounter_music.asm index bf2e8c3..37d85d5 100644 --- a/data/trainers/encounter_music.asm +++ b/data/trainers/encounter_music.asm @@ -95,4 +95,5 @@ TrainerEncounterMusic:: db MUSIC_ROCKET_ENCOUNTER ; ARIANA db MUSIC_ROCKET_ENCOUNTER ; ARCHER db MUSIC_OFFICER_ENCOUNTER ; PROF.BLUE + db MUSIC_SAGE_ENCOUNTER ; ELDER assert_table_length NUM_TRAINER_CLASSES + 1 diff --git a/data/trainers/gendered_trainers.asm b/data/trainers/gendered_trainers.asm index 6df0f09..f6fc843 100644 --- a/data/trainers/gendered_trainers.asm +++ b/data/trainers/gendered_trainers.asm @@ -36,6 +36,7 @@ MaleTrainers: db SOLDIER db SPORTSMAN db AEROFOSSIL + db ELDER .End FemaleTrainers: diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm index 0f29913..864f597 100644 --- a/data/trainers/genders.asm +++ b/data/trainers/genders.asm @@ -94,4 +94,5 @@ BTTrainerClassGenders: db MALE ; ARIANA db FEMALE ; ARCHER db MALE ; PROF.BLUE + db MALE ; ELDER assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index afdb27d..3321609 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -101,6 +101,7 @@ INCBIN "gfx/trainers/kurt.gbcpal", middle_colors INCBIN "gfx/trainers/ariana.gbcpal", middle_colors INCBIN "gfx/trainers/archer.gbcpal", middle_colors INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors +INCBIN "gfx/trainers/elder.gbcpal", middle_colors ; elder EnbyPalette: INCLUDE "gfx/player/topaz.pal" diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 5f9826b..a4cc06d 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -4876,6 +4876,7 @@ ExecutiveFGroup: ; Ariana end_list_items +; Often seen with Hoothoot in media, so there's a few scattered around for variety. SageGroup: next_list_item ; SAGE (1) db "CHOW@", TRAINERTYPE_NORMAL @@ -4894,13 +4895,13 @@ SageGroup: db 3 dw BELLSPROUT db 3 - dw BELLSPROUT + dw HOOTHOOT db -1 ; end next_list_item ; SAGE (3) db "JIN@", TRAINERTYPE_NORMAL db 6 - dw BELLSPROUT + dw HOOTHOOT db -1 ; end next_list_item ; SAGE (4) @@ -4947,16 +4948,9 @@ SageGroup: dw BELLSPROUT db -1 ; end - next_list_item ; SAGE (9) - db "LI@", TRAINERTYPE_MOVES - db 10 - dw BELLIGNAN - dw FLASH, VINE_WHIP, GROWTH, WRAP - db -1 ; end - ; So these sages are in the Dragon's Den but end up being the Kimono Girls but again. ; Let's give them the Eeveelutions the Kimono Girls don't have! - next_list_item ; SAGE (10) + next_list_item ; SAGE (9) db "GAKU@", TRAINERTYPE_NORMAL db 42 dw NOCTOWL @@ -4964,7 +4958,7 @@ SageGroup: dw LEAFEON db -1 ; end - next_list_item ; SAGE (11) + next_list_item ; SAGE (10) db "MASA@", TRAINERTYPE_NORMAL db 42 dw NOCTOWL @@ -4972,14 +4966,71 @@ SageGroup: dw GLACEON db -1 ; end - next_list_item ; SAGE (12) + next_list_item ; SAGE (11) db "KOJI@", TRAINERTYPE_NORMAL db 42 dw NOCTOWL db 42 dw SYLVEON db -1 ; end - + + ; Pokemon Pagoda Sages + ; 3F + next_list_item ; SAGE (12) + db "MING@", TRAINERTYPE_NORMAL ; double-references this one super old clam that lived since the ming dynasty and aptly received it as an epithet before dying to trawlers. Since it's the Tentacruel floor, it felt very fitting! https://en.wikipedia.org/wiki/Ming_(clam) + db 50 + dw CLOYSTER + db 50 + dw TENTACRUEL + db -1 ; end + + next_list_item ; SAGE (13) + db "WEI@", TRAINERTYPE_NORMAL + db 50 + dw TENTACRUEL + db -1 ; end + + next_list_item ; SAGE (14) + db "LANG@", TRAINERTYPE_NORMAL + db 50 + dw TENTACRUEL + db -1 ; end + + next_list_item ; SAGE (15) + db "HUANG@", TRAINERTYPE_NORMAL + db 50 + dw NOCTOWL + db 50 + dw TENTACRUEL + db -1 ; end + + ; 4F + next_list_item ; SAGE (16) + db "GEN@", TRAINERTYPE_NORMAL + db 50 + dw FEAROW + db -1 ; end + + next_list_item ; SAGE (17) + db "RAOH@", TRAINERTYPE_NORMAL + db 50 + dw FEAROW + db -1 ; end + + next_list_item ; SAGE (18) + db "SHUU@", TRAINERTYPE_NORMAL + db 50 + dw FEAROW + db -1 ; end + + next_list_item ; SAGE (19) + db "SHENG@", TRAINERTYPE_NORMAL + db 50 + dw NOCTOWL + db 50 + dw FEAROW + db -1 ; end + end_list_items MediumGroup: @@ -5000,21 +5051,23 @@ MediumGroup: db -1 ; end next_list_item ; MEDIUM (3) - db "BETHANY@", TRAINERTYPE_NORMAL ; Unused? - db 25 - dw HAUNTER + db "BETHANY@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium + db 50 + dw WISPIRIT db -1 ; end next_list_item ; MEDIUM (4) - db "MARGRET@", TRAINERTYPE_NORMAL ; unused - db 25 - dw HAUNTER + db "MARGRET@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium + db 50 + dw STROMEN + db 50 + dw PHANDARIN db -1 ; end next_list_item ; MEDIUM (5) - db "ETHEL@", TRAINERTYPE_NORMAL ; unused - db 25 - dw HAUNTER + db "ETHEL@", TRAINERTYPE_NORMAL ; unused, now Pagoda 2F Medium + db 50 + dw KITSEN db -1 ; end next_list_item ; MEDIUM (6) @@ -5032,7 +5085,13 @@ MediumGroup: db 36 dw SLOWBRO db -1 ; end - + + next_list_item ; MEDIUM (8) + db "ELSIE@", TRAINERTYPE_NORMAL ; Pagoda 2F Medium + db 50 + dw WISPIRIT + db -1 ; end + end_list_items BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam. @@ -5263,100 +5322,6 @@ KimonoGirlGroup: end_list_items -; No rematches here, just a lot of unused dupes. -; Potential alt usage? rename a few? -; See spreadsheet for combinations. -TwinsGroup: - next_list_item ; TWINS (1) - db "AMY & MAY@", TRAINERTYPE_NORMAL - db 10 - dw SPINARAK - db 10 - dw LEDYBA - db -1 ; end - - next_list_item ; TWINS (2) - db "ANN & ANNE@", TRAINERTYPE_MOVES - db 16 - dw CLEFAIRY - dw GROWL, ENCORE, DOUBLESLAP, METRONOME - db 16 - dw JIGGLYPUFF - dw SING, DEFENSE_CURL, POUND, DISABLE - db -1 ; end - - next_list_item ; TWINS (3) - db "ANN & ANNE@", TRAINERTYPE_MOVES - db 16 - dw JIGGLYPUFF - dw SING, DEFENSE_CURL, POUND, DISABLE - db 16 - dw CLEFAIRY - dw GROWL, ENCORE, DOUBLESLAP, METRONOME - db -1 ; end - - next_list_item ; TWINS (4) - db "AMY & MAY@", TRAINERTYPE_NORMAL - db 10 - dw LEDYBA - db 10 - dw SPINARAK - db -1 ; end - - next_list_item ; TWINS (5) - db "JO & ZOE@", TRAINERTYPE_NORMAL - db 35 - dw VICTREEBEL - db 35 - dw VILEPLUME - db -1 ; end - - next_list_item ; TWINS (6) - db "JO & ZOE@", TRAINERTYPE_NORMAL - db 35 - dw VILEPLUME - db 35 - dw VICTREEBEL - db -1 ; end - - next_list_item ; TWINS (7) - db "MEG & PEG@", TRAINERTYPE_NORMAL - db 31 - dw TEDDIURSA - db 31 - dw PHANPY - db -1 ; end - - next_list_item ; TWINS (8) - db "MEG & PEG@", TRAINERTYPE_NORMAL - db 31 - dw PHANPY - db 31 - dw TEDDIURSA - db -1 ; end - - next_list_item ; TWINS (9) - db "LEA & PIA@", TRAINERTYPE_MOVES - db 35 - dw DRATINI - dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT - db 35 - dw DRATINI - dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT - db -1 ; end - - next_list_item ; TWINS (10) - db "LEA & PIA@", TRAINERTYPE_MOVES - db 38 - dw DRATINI - dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT - db 38 - dw DRATINI - dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT - db -1 ; end - - end_list_items - ; Added this to make room for more stuff. ; Yeah, they filled trainers to max capacity originally. Pretty impressive. SECTION "Enemy Trainer Parties 3", ROMX diff --git a/data/trainers/parties_new_classes.asm b/data/trainers/parties_new_classes.asm index 381ead1..607ece3 100644 --- a/data/trainers/parties_new_classes.asm +++ b/data/trainers/parties_new_classes.asm @@ -672,3 +672,125 @@ ProfBlueGroup: dw THUNDERBOLT, CROSS_CHOP, EARTHQUAKE, THIEF db -1 ; end end_list_items + +ElderGroup: + next_list_item ; originally SAGE (9), now adapted from HGSS + db "LI@", TRAINERTYPE_MOVES + db 10 + dw BELLIGNAN + dw FLASH, VINE_WHIP, GROWTH, WRAP + db -1 ; end + + ; Intended to be just before you fight Shi-Shi (potentially) + db "ROEN@", TRAINERTYPE_MOVES ; from Roen, an esteemed priest from The Five-Storied Pagoda by Koda Rohan. + db 65 + dw FEAROW + dw DOUBLE_EDGE, DRILL_PECK, MIRROR_MOVE, AGILITY + db 65 + dw TENTACRUEL + dw SURF, DOUBLE_EDGE, SLUDGE_BOMB, SWORDS_DANCE + db 65 + dw ALAKAZAM + dw PSYCHIC_M, THUNDERPUNCH, FIRE_PUNCH, RECOVER + db 65 + dw ARCANINE + dw FIRE_BLAST, BODY_SLAM, DIG, HIDDEN_POWER + db 65 + dw GOROCHU + dw BELLY_DRUM, THUNDERBOLT, BODY_SLAM, SUBMISSION + db -1 ; end + end_list_items + +; No rematches here, just a lot of unused dupes. +; Potential alt usage? rename a few? +; See spreadsheet for combinations. +TwinsGroup: + next_list_item ; TWINS (1) + db "AMY & MAY@", TRAINERTYPE_NORMAL + db 10 + dw SPINARAK + db 10 + dw LEDYBA + db -1 ; end + + next_list_item ; TWINS (2) + db "ANN & ANNE@", TRAINERTYPE_MOVES + db 16 + dw CLEFAIRY + dw GROWL, ENCORE, DOUBLESLAP, METRONOME + db 16 + dw JIGGLYPUFF + dw SING, DEFENSE_CURL, POUND, DISABLE + db -1 ; end + + next_list_item ; TWINS (3) + db "ANN & ANNE@", TRAINERTYPE_MOVES + db 16 + dw JIGGLYPUFF + dw SING, DEFENSE_CURL, POUND, DISABLE + db 16 + dw CLEFAIRY + dw GROWL, ENCORE, DOUBLESLAP, METRONOME + db -1 ; end + + next_list_item ; TWINS (4) + db "AMY & MAY@", TRAINERTYPE_NORMAL + db 10 + dw LEDYBA + db 10 + dw SPINARAK + db -1 ; end + + next_list_item ; TWINS (5) + db "JO & ZOE@", TRAINERTYPE_NORMAL + db 35 + dw VICTREEBEL + db 35 + dw VILEPLUME + db -1 ; end + + next_list_item ; TWINS (6) + db "JO & ZOE@", TRAINERTYPE_NORMAL + db 35 + dw VILEPLUME + db 35 + dw VICTREEBEL + db -1 ; end + + next_list_item ; TWINS (7) + db "MEG & PEG@", TRAINERTYPE_NORMAL + db 31 + dw TEDDIURSA + db 31 + dw PHANPY + db -1 ; end + + next_list_item ; TWINS (8) + db "MEG & PEG@", TRAINERTYPE_NORMAL + db 31 + dw PHANPY + db 31 + dw TEDDIURSA + db -1 ; end + + next_list_item ; TWINS (9) + db "LEA & PIA@", TRAINERTYPE_MOVES + db 35 + dw DRATINI + dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT + db 35 + dw DRATINI + dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db -1 ; end + + next_list_item ; TWINS (10) + db "LEA & PIA@", TRAINERTYPE_MOVES + db 38 + dw DRATINI + dw THUNDER_WAVE, TWISTER, ICE_BEAM, HEADBUTT + db 38 + dw DRATINI + dw THUNDER_WAVE, TWISTER, FLAMETHROWER, HEADBUTT + db -1 ; end + + end_list_items diff --git a/data/trainers/party_pointers.asm b/data/trainers/party_pointers.asm index f8b2f27..061e924 100644 --- a/data/trainers/party_pointers.asm +++ b/data/trainers/party_pointers.asm @@ -94,4 +94,5 @@ TrainerGroups: dba ArianaGroup dba ArcherGroup dba ProfBlueGroup + dba ElderGroup assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index 5e71c6d..2620901 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -94,4 +94,5 @@ TrainerPicPointers:: dba ArianaPic dba ArcherPic dba ProfBluePic + dba ElderPic assert_table_length NUM_TRAINER_CLASSES diff --git a/data/trainers/sprites.asm b/data/trainers/sprites.asm index 088d202..5fababb 100644 --- a/data/trainers/sprites.asm +++ b/data/trainers/sprites.asm @@ -92,4 +92,5 @@ BTTrainerClassSprites: db SPRITE_RED ; Ariana db SPRITE_RED ; Archer db SPRITE_RED ; Prof.Blue + db SPRITE_SAGE ; ELDER assert_table_length NUM_TRAINER_CLASSES diff --git a/data/wild/kanto_grass.asm b/data/wild/kanto_grass.asm index 04ab6b3..6c5a71b 100644 --- a/data/wild/kanto_grass.asm +++ b/data/wild/kanto_grass.asm @@ -929,6 +929,118 @@ KantoGrassWildMons: dbw 42, WISPIRIT dbw 42, GENGAR end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_1 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, VULPIX + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, VULPIX + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_2 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, NOCTOWL + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, NOCTOWL + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_SET_3 + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, GASTLY + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, VULPIX + ; day + dbw 32, GASTLY + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, VULPIX + ; nite + dbw 34, GASTLY + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons + + def_grass_wildmons LAVENDER_CRYPT_DOKUROARS_ROOM + db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite + ; morn + dbw 33, CUBONE + dbw 36, GASTLY + dbw 32, HAUNTER + dbw 44, CUBONE + dbw 44, WISPIRIT + dbw 44, WISPIRIT + dbw 44, MAROWAK + ; day + dbw 32, CUBONE + dbw 34, GASTLY + dbw 38, HAUNTER + dbw 36, CUBONE + dbw 46, WISPIRIT + dbw 46, WISPIRIT + dbw 46, MAROWAK + ; nite + dbw 34, CUBONE + dbw 38, MISDREAVUS + dbw 36, HAUNTER + dbw 32, KITSEN + dbw 42, WISPIRIT + dbw 42, WISPIRIT + dbw 42, GENGAR + end_grass_wildmons def_grass_wildmons ALTERING_CAVE db 4 percent, 2 percent, 8 percent ; encounter rates: morn/day/nite diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index f2a35e2..c9de376 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -764,7 +764,7 @@ TownMap_GetKantoLandmarkLimits: TownMap_GetNihonLandmarkLimits: ld a, [wStatusFlags] ld d, LANDMARK_SILENT_HILLS - ld e, LANDMARK_SILENT_HILLS ; Gonna need another map. + ld e, LANDMARK_WHITE_CITY ; Gonna need another map. ret PokegearRadio_Init: @@ -2375,12 +2375,12 @@ FlyMap: call HasVisitedSpawn and a jr z, .NoKanto -; Kanto's map is only loaded if we've visited Indigo Plateau +; Nihon's map is only loaded if we've visited Silent Hills ld a, NIHON_FLYPOINT ; first Nihon flypoint ld [wStartFlypoint], a ld a, NUM_FLYPOINTS - 1 ; last Nihon flypoint ld [wEndFlypoint], a - ld [wTownMapPlayerIconLandmark], a ; last one is default (Indigo Plateau) + ld [wTownMapPlayerIconLandmark], a ; last one is default (Silent Hills) ; Fill out the map call FillNihonMap call .MapHud diff --git a/gfx/pics.asm b/gfx/pics.asm index 3a5efe0..9e13e73 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -742,18 +742,6 @@ TangrowthBackpic: INCBIN "gfx/pokemon/tangrowth/back.2bpp.lz" JungelaFrontpic: INCBIN "gfx/pokemon/jungela/front.animated.2bpp.lz" JungelaBackpic: INCBIN "gfx/pokemon/jungela/back.2bpp.lz" -; RBY/unused trainer Pics -ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz" -CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz" -EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz" -RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz" -TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz" -FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz" -TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz" -PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" -SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" -SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" - SECTION "Pics 20", ROMX @@ -1045,3 +1033,18 @@ KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz" ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz" ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz" ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz" +ElderPic: INCBIN "gfx/trainers/elder.2bpp.lz" + +SECTION "Pics 26", ROMX + +; RBY/unused trainer Pics +ChannelerPic: INCBIN "gfx/trainers/channeler.2bpp.lz" +CueBallPic: INCBIN "gfx/trainers/cue_ball.2bpp.lz" +EngineerPic: INCBIN "gfx/trainers/engineer.2bpp.lz" +RockerPic: INCBIN "gfx/trainers/rocker.2bpp.lz" +TamerPic: INCBIN "gfx/trainers/tamer.2bpp.lz" +FirefighterPic: INCBIN "gfx/trainers/firefighter.2bpp.lz" +TeacherMPic: INCBIN "gfx/trainers/teacherm.2bpp.lz" +PainterPic: INCBIN "gfx/trainers/painter.2bpp.lz" +SoldierPic: INCBIN "gfx/trainers/soldier.2bpp.lz" +SportsmanPic: INCBIN "gfx/trainers/sportsman.2bpp.lz" diff --git a/gfx/pokemon/bipulla/shiny.pal b/gfx/pokemon/bipulla/shiny.pal index 7253e17..7e646f4 100644 --- a/gfx/pokemon/bipulla/shiny.pal +++ b/gfx/pokemon/bipulla/shiny.pal @@ -1,2 +1,2 @@ - RGB 16, 17, 30 - RGB 05, 07, 11 \ No newline at end of file + RGB 28, 00, 29 + RGB 16, 09, 28 \ No newline at end of file diff --git a/gfx/pokemon/calflac/back.png b/gfx/pokemon/calflac/back.png index c7216be..94f854e 100644 Binary files a/gfx/pokemon/calflac/back.png and b/gfx/pokemon/calflac/back.png differ diff --git a/gfx/pokemon/calflac/front.png b/gfx/pokemon/calflac/front.png index e0a9da9..5ae97b5 100644 Binary files a/gfx/pokemon/calflac/front.png and b/gfx/pokemon/calflac/front.png differ diff --git a/gfx/pokemon/calflac/shiny.pal b/gfx/pokemon/calflac/shiny.pal index 5c88669..b25726e 100644 --- a/gfx/pokemon/calflac/shiny.pal +++ b/gfx/pokemon/calflac/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 19, 00 + RGB 16, 09, 28 + diff --git a/gfx/pokemon/dudunsparce/front.png b/gfx/pokemon/dudunsparce/front.png index e0a9da9..c296b1d 100644 Binary files a/gfx/pokemon/dudunsparce/front.png and b/gfx/pokemon/dudunsparce/front.png differ diff --git a/gfx/pokemon/dudunsparce/front2.png b/gfx/pokemon/dudunsparce/front2.png new file mode 100644 index 0000000..1a8b615 Binary files /dev/null and b/gfx/pokemon/dudunsparce/front2.png differ diff --git a/gfx/pokemon/dudunsparce/shiny.pal b/gfx/pokemon/dudunsparce/shiny.pal index 5c88669..a86589e 100644 --- a/gfx/pokemon/dudunsparce/shiny.pal +++ b/gfx/pokemon/dudunsparce/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 24, 06 + RGB 31, 05, 21 + diff --git a/gfx/pokemon/dunsparce/front.png b/gfx/pokemon/dunsparce/front.png index a2fbc6f..6fc5aac 100644 Binary files a/gfx/pokemon/dunsparce/front.png and b/gfx/pokemon/dunsparce/front.png differ diff --git a/gfx/pokemon/folage/anim.asm b/gfx/pokemon/folage/anim.asm index 875f7be..63eb280 100644 --- a/gfx/pokemon/folage/anim.asm +++ b/gfx/pokemon/folage/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + frame 0, 08 + frame 1, 15 + frame 2, 08 + frame 3, 15 + frame 4, 08 + frame 5, 08 + frame 6, 08 + frame 5, 08 + frame 4, 08 + frame 2, 08 + frame 1, 08 + frame 7, 08 + frame 1, 08 + frame 7, 08 + endanim diff --git a/gfx/pokemon/folage/back.png b/gfx/pokemon/folage/back.png index c7216be..f2aa059 100644 Binary files a/gfx/pokemon/folage/back.png and b/gfx/pokemon/folage/back.png differ diff --git a/gfx/pokemon/folage/front.png b/gfx/pokemon/folage/front.png index e0a9da9..a837af0 100644 Binary files a/gfx/pokemon/folage/front.png and b/gfx/pokemon/folage/front.png differ diff --git a/gfx/pokemon/folage/shiny.pal b/gfx/pokemon/folage/shiny.pal index 5c88669..9cc43a6 100644 --- a/gfx/pokemon/folage/shiny.pal +++ b/gfx/pokemon/folage/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 31, 31, 05 + RGB 28, 10, 05 \ No newline at end of file diff --git a/gfx/pokemon/iron_bundle/front.png b/gfx/pokemon/iron_bundle/front.png index e0a9da9..f5f1c77 100644 Binary files a/gfx/pokemon/iron_bundle/front.png and b/gfx/pokemon/iron_bundle/front.png differ diff --git a/gfx/pokemon/iron_bundle/shiny.pal b/gfx/pokemon/iron_bundle/shiny.pal index 5c88669..978abc5 100644 --- a/gfx/pokemon/iron_bundle/shiny.pal +++ b/gfx/pokemon/iron_bundle/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 18, 21, 30 + RGB 15, 15, 16 \ No newline at end of file diff --git a/gfx/pokemon/munchlax/back.png b/gfx/pokemon/munchlax/back.png index 0600d59..6fa3309 100644 Binary files a/gfx/pokemon/munchlax/back.png and b/gfx/pokemon/munchlax/back.png differ diff --git a/gfx/pokemon/munchlax/front.png b/gfx/pokemon/munchlax/front.png index 51f3950..d26f77a 100644 Binary files a/gfx/pokemon/munchlax/front.png and b/gfx/pokemon/munchlax/front.png differ diff --git a/gfx/pokemon/munchlax/shiny.pal b/gfx/pokemon/munchlax/shiny.pal index 5c88669..9a3ed5d 100644 --- a/gfx/pokemon/munchlax/shiny.pal +++ b/gfx/pokemon/munchlax/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 27, 22, 11 + RGB 09, 07, 31 + diff --git a/gfx/pokemon/raging_bolt/front.png b/gfx/pokemon/raging_bolt/front.png index 9eefc7c..56ec001 100644 Binary files a/gfx/pokemon/raging_bolt/front.png and b/gfx/pokemon/raging_bolt/front.png differ diff --git a/gfx/pokemon/scream_tail/front.png b/gfx/pokemon/scream_tail/front.png index e0a9da9..28ef7ad 100644 Binary files a/gfx/pokemon/scream_tail/front.png and b/gfx/pokemon/scream_tail/front.png differ diff --git a/gfx/pokemon/scream_tail/shiny.pal b/gfx/pokemon/scream_tail/shiny.pal index 5c88669..b032e19 100644 --- a/gfx/pokemon/scream_tail/shiny.pal +++ b/gfx/pokemon/scream_tail/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 31, 17, 31 + RGB 18, 06, 21 \ No newline at end of file diff --git a/gfx/pokemon/stromen/anim.asm b/gfx/pokemon/stromen/anim.asm index 875f7be..ea1fb2c 100644 --- a/gfx/pokemon/stromen/anim.asm +++ b/gfx/pokemon/stromen/anim.asm @@ -1 +1,21 @@ - endanim \ No newline at end of file + frame 0, 06 + frame 1, 06 + frame 2, 12 + frame 3, 06 + frame 4, 12 + frame 5, 06 + frame 6, 04 + frame 7, 10 + frame 7, 06 + frame 8, 10 + frame 8, 06 + frame 7, 10 + frame 7, 06 + frame 8, 10 + frame 8, 06 + frame 7, 10 + frame 6, 08 + frame 4, 08 + frame 2, 08 + frame 0, 06 + endanim diff --git a/gfx/pokemon/stromen/back.png b/gfx/pokemon/stromen/back.png index 1af6983..2fd9a48 100644 Binary files a/gfx/pokemon/stromen/back.png and b/gfx/pokemon/stromen/back.png differ diff --git a/gfx/pokemon/stromen/front.png b/gfx/pokemon/stromen/front.png index fd4499d..fb8da32 100644 Binary files a/gfx/pokemon/stromen/front.png and b/gfx/pokemon/stromen/front.png differ diff --git a/gfx/pokemon/stromen/shiny.pal b/gfx/pokemon/stromen/shiny.pal index 5c88669..21c9b51 100644 --- a/gfx/pokemon/stromen/shiny.pal +++ b/gfx/pokemon/stromen/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 18, 15, 20 + RGB 11, 08, 12 \ No newline at end of file diff --git a/gfx/pokemon/terrados/front.png b/gfx/pokemon/terrados/front.png index e0a9da9..c8ec4dd 100644 Binary files a/gfx/pokemon/terrados/front.png and b/gfx/pokemon/terrados/front.png differ diff --git a/gfx/pokemon/terrados/shiny.pal b/gfx/pokemon/terrados/shiny.pal index 5c88669..d059972 100644 --- a/gfx/pokemon/terrados/shiny.pal +++ b/gfx/pokemon/terrados/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 25, 20, 08 + RGB 27, 10, 05 + diff --git a/gfx/pokemon/trebir/anim.asm b/gfx/pokemon/trebir/anim.asm index 875f7be..7df014f 100644 --- a/gfx/pokemon/trebir/anim.asm +++ b/gfx/pokemon/trebir/anim.asm @@ -1 +1,15 @@ - endanim \ No newline at end of file + frame 0, 18 + frame 1, 18 + frame 2, 10 + frame 3, 20 + frame 4, 10 + frame 5, 10 + frame 6, 10 + frame 7, 10 + frame 8, 10 + frame 9, 10 + frame 10, 10 + frame 11, 10 + frame 1, 10 + frame 12, 18 + endanim diff --git a/gfx/pokemon/trebir/anim_idle.asm b/gfx/pokemon/trebir/anim_idle.asm index 875f7be..7836f83 100644 --- a/gfx/pokemon/trebir/anim_idle.asm +++ b/gfx/pokemon/trebir/anim_idle.asm @@ -1 +1,4 @@ + frame 0, 18 + frame 1, 18 + frame 12, 18 endanim \ No newline at end of file diff --git a/gfx/pokemon/trebir/back.png b/gfx/pokemon/trebir/back.png index c7216be..dc25ab4 100644 Binary files a/gfx/pokemon/trebir/back.png and b/gfx/pokemon/trebir/back.png differ diff --git a/gfx/pokemon/trebir/front.png b/gfx/pokemon/trebir/front.png index e0a9da9..97d7048 100644 Binary files a/gfx/pokemon/trebir/front.png and b/gfx/pokemon/trebir/front.png differ diff --git a/gfx/pokemon/trebir/shiny.pal b/gfx/pokemon/trebir/shiny.pal index 5c88669..6cdb6fc 100644 --- a/gfx/pokemon/trebir/shiny.pal +++ b/gfx/pokemon/trebir/shiny.pal @@ -1,2 +1,2 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + RGB 15, 18, 30 + RGB 31, 06, 04 \ No newline at end of file diff --git a/gfx/tilesets/lavendercrypt.png b/gfx/tilesets/lavendercrypt.png index 2df3a42..0f051ef 100644 Binary files a/gfx/tilesets/lavendercrypt.png and b/gfx/tilesets/lavendercrypt.png differ diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png index 6ffbcc0..cc7d8d4 100644 Binary files a/gfx/tilesets/tower.png and b/gfx/tilesets/tower.png differ diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png index bb48312..ea1a666 100644 Binary files a/gfx/trainers/beauty.png and b/gfx/trainers/beauty.png differ diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png index 1afc558..6303a7c 100644 Binary files a/gfx/trainers/blaine.png and b/gfx/trainers/blaine.png differ diff --git a/gfx/trainers/channeler.png b/gfx/trainers/channeler.png index 76a1e81..9b4b50a 100644 Binary files a/gfx/trainers/channeler.png and b/gfx/trainers/channeler.png differ diff --git a/gfx/trainers/chief.png b/gfx/trainers/chief.png new file mode 100644 index 0000000..1afc558 Binary files /dev/null and b/gfx/trainers/chief.png differ diff --git a/gfx/trainers/cue_ball.png b/gfx/trainers/cue_ball.png index 76a1e81..fbc7add 100644 Binary files a/gfx/trainers/cue_ball.png and b/gfx/trainers/cue_ball.png differ diff --git a/gfx/trainers/elder.png b/gfx/trainers/elder.png new file mode 100644 index 0000000..df7e3e4 Binary files /dev/null and b/gfx/trainers/elder.png differ diff --git a/gfx/trainers/firefighter.png b/gfx/trainers/firefighter.png index 76a1e81..803f4f3 100644 Binary files a/gfx/trainers/firefighter.png and b/gfx/trainers/firefighter.png differ diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png index a39f10d..cce1768 100644 Binary files a/gfx/trainers/fisher.png and b/gfx/trainers/fisher.png differ diff --git a/gfx/trainers/jack.png b/gfx/trainers/jack.png new file mode 100644 index 0000000..f8f22c8 Binary files /dev/null and b/gfx/trainers/jack.png differ diff --git a/gfx/trainers/jessiejames.png b/gfx/trainers/jessiejames.png new file mode 100644 index 0000000..764e5af Binary files /dev/null and b/gfx/trainers/jessiejames.png differ diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png index 4828a77..8c71a8e 100644 Binary files a/gfx/trainers/medium.png and b/gfx/trainers/medium.png differ diff --git a/gfx/trainers/rocker.png b/gfx/trainers/rocker.png index 76a1e81..608341b 100644 Binary files a/gfx/trainers/rocker.png and b/gfx/trainers/rocker.png differ diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png index df7e3e4..1eb7f84 100644 Binary files a/gfx/trainers/sage.png and b/gfx/trainers/sage.png differ diff --git a/gfx/trainers/student.png b/gfx/trainers/student.png new file mode 100644 index 0000000..d4120cc Binary files /dev/null and b/gfx/trainers/student.png differ diff --git a/gfx/trainers/swimmer_f.png b/gfx/trainers/swimmer_f.png index affef5f..2d42cb4 100644 Binary files a/gfx/trainers/swimmer_f.png and b/gfx/trainers/swimmer_f.png differ diff --git a/gfx/trainers/tamer.png b/gfx/trainers/tamer.png index 76a1e81..d15db3b 100644 Binary files a/gfx/trainers/tamer.png and b/gfx/trainers/tamer.png differ diff --git a/gfx/trainers/yujirou.png b/gfx/trainers/yujirou.png new file mode 100644 index 0000000..02a8cc2 Binary files /dev/null and b/gfx/trainers/yujirou.png differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index da345fb..48a57db 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -238,7 +238,7 @@ DebugRoom_MapEvents: warp_event 4, 9, PALLET_TOWN, 1 ; left lab/league warp warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp warp_event 35, 17, OLD_CITY, 1 ; east warp - warp_event 5, 35, BLUE_FOREST, 1 ; southwest warp + warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp warp_event 19, 34, BLUE_FOREST, 1 ; southern warp warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 diff --git a/maps/LavenderCrypt.ablk b/maps/LavenderCrypt.ablk index 19fee82..078edbe 100644 Binary files a/maps/LavenderCrypt.ablk and b/maps/LavenderCrypt.ablk differ diff --git a/maps/LavenderCrypt.asm b/maps/LavenderCrypt.asm index c097cc8..c0335e0 100644 --- a/maps/LavenderCrypt.asm +++ b/maps/LavenderCrypt.asm @@ -10,6 +10,10 @@ LavenderCrypt_MapEvents: def_warp_events warp_event 2, 17, SOUL_HOUSE, 3 + warp_event 15, 3, LAVENDER_CRYPT_SET_1, 1 + warp_event 9, 1, LAVENDER_CRYPT_SET_2, 1 + warp_event 3, 3, LAVENDER_CRYPT_SET_3, 1 + warp_event 3, 3, LAVENDER_CRYPT_DOKUROARS_ROOM, 1 ; Exit point for the room; goes through the pit. def_coord_events diff --git a/maps/LavenderCryptDokuroarsRoom.ablk b/maps/LavenderCryptDokuroarsRoom.ablk new file mode 100644 index 0000000..d21b6e3 --- /dev/null +++ b/maps/LavenderCryptDokuroarsRoom.ablk @@ -0,0 +1 @@ +kklkkk-22.m3_mm0H`I0mmmmmmmmmmmmmmmmmmm \ No newline at end of file diff --git a/maps/LavenderCryptDokuroarsRoom.asm b/maps/LavenderCryptDokuroarsRoom.asm new file mode 100644 index 0000000..def7d29 --- /dev/null +++ b/maps/LavenderCryptDokuroarsRoom.asm @@ -0,0 +1,20 @@ + object_const_def + +LavenderCryptDokuroarsRoom_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptDokuroarsRoom_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 7, 15, LAVENDER_CRYPT_SET_3, 2 + warp_event 6, 15, LAVENDER_CRYPT_SET_3, 2 + warp_event 7, 2, LAVENDER_CRYPT, 4 + + def_coord_events + + def_bg_events + + def_object_events \ No newline at end of file diff --git a/maps/LavenderCryptSet1.ablk b/maps/LavenderCryptSet1.ablk new file mode 100644 index 0000000..206dfd9 Binary files /dev/null and b/maps/LavenderCryptSet1.ablk differ diff --git a/maps/LavenderCryptSet1.asm b/maps/LavenderCryptSet1.asm new file mode 100644 index 0000000..8d898a0 --- /dev/null +++ b/maps/LavenderCryptSet1.asm @@ -0,0 +1,46 @@ + object_const_def + +LavenderCryptSet1_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet1_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 6, LAVENDER_CRYPT, 2 + warp_event 3, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 6, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 5, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 7, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 3, LAVENDER_CRYPT_SET_2, 24 ; top-left corridor entry + warp_event 16, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 13, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 12, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 17, LAVENDER_CRYPT_SET_1, 1 + + warp_event 8, 1, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 1 + warp_event 1, 5, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 2 + warp_event 1, 5, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 3 + + warp_event 16, 1, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 1 + warp_event 22, 4, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 2 + warp_event 17, 6, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 3 + + warp_event 1, 12, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 1 + warp_event 6, 13, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 2 + warp_event 2, 17, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 3 + warp_event 8, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom-left entry 4 + + warp_event 17, 14, LAVENDER_CRYPT_SET_1, 1 ; bottom-right entry 1 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom-right entry 3 + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/LavenderCryptSet2.ablk b/maps/LavenderCryptSet2.ablk new file mode 100644 index 0000000..a057f69 Binary files /dev/null and b/maps/LavenderCryptSet2.ablk differ diff --git a/maps/LavenderCryptSet2.asm b/maps/LavenderCryptSet2.asm new file mode 100644 index 0000000..2d0a113 --- /dev/null +++ b/maps/LavenderCryptSet2.asm @@ -0,0 +1,46 @@ + object_const_def + +LavenderCryptSet2_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet2_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 2, LAVENDER_CRYPT, 3 + warp_event 8, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 16, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 18, 3, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 21, 1, LAVENDER_CRYPT_SET_1, 1 + warp_event 8, 10, LAVENDER_CRYPT_SET_1, 1 + warp_event 2, 9, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 18, LAVENDER_CRYPT_SET_1, 1 + warp_event 20, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 4, 17, LAVENDER_CRYPT_SET_1, 1 + warp_event 17, 17, LAVENDER_CRYPT_SET_1, 1 ; linked at bottom + warp_event 17, 18, LAVENDER_CRYPT_SET_1, 1 ; linked at bottom + warp_event 17, 9, LAVENDER_CRYPT_SET_1, 1 ; linked in top-right + warp_event 17, 10, LAVENDER_CRYPT_SET_1, 1 ; linked in top-right + warp_event 19, 5, LAVENDER_CRYPT_SET_1, 1 + + warp_event 1, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 1 + warp_event 10, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 2 + warp_event 18, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 3 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 ; bottom entry 4 + + warp_event 16, 2, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 1 + warp_event 22, 5, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 2 + warp_event 22, 10, LAVENDER_CRYPT_SET_1, 1 ; top-right entry warp 3 + + warp_event 1, 2, LAVENDER_CRYPT_SET_1, 1 ; top-left entry 1 + warp_event 8, 6, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 2 + warp_event 3, 9, LAVENDER_CRYPT_SET_1, 1 ; top-left entry warp 3 + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/LavenderCryptSet3.ablk b/maps/LavenderCryptSet3.ablk new file mode 100644 index 0000000..0732026 Binary files /dev/null and b/maps/LavenderCryptSet3.ablk differ diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm new file mode 100644 index 0000000..ddc8020 --- /dev/null +++ b/maps/LavenderCryptSet3.asm @@ -0,0 +1,38 @@ + object_const_def + +LavenderCryptSet3_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet3_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 8, LAVENDER_CRYPT, 4 + warp_event 7, 13, LAVENDER_CRYPT_SET_1, 1 ; To Dokuroar + + warp_event 2, 4, LAVENDER_CRYPT_SET_1, 4 + warp_event 21, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 6, LAVENDER_CRYPT_SET_1, 1 + warp_event 18, 2, LAVENDER_CRYPT_SET_1, 1 + warp_event 8, 4, LAVENDER_CRYPT_SET_1, 1 + warp_event 22, 16, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 10, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 14, LAVENDER_CRYPT_SET_1, 1 + warp_event 19, 15, LAVENDER_CRYPT_SET_1, 1 + + warp_event 1, 8, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 1 + warp_event 7, 6, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 2 + warp_event 2, 2, LAVENDER_CRYPT_SET_1, 1 ; top-right entry 3 + + warp_event 22, 3, LAVENDER_CRYPT_SET_1, 1 ; right entry 1 + warp_event 22, 18, LAVENDER_CRYPT_SET_1, 1 ; right entry 2 + + warp_event 7, 17, LAVENDER_CRYPT_SET_1, 1 ; Dokuroar bottom-left room entry point + + def_coord_events + + def_bg_events + + def_object_events diff --git a/maps/OldCity.asm b/maps/OldCity.asm index e68d2c7..bd5d28e 100644 --- a/maps/OldCity.asm +++ b/maps/OldCity.asm @@ -26,11 +26,11 @@ HoneyGrandmaSignText: line "house" done -OldCityBillsHouseSignScript: - jumptext OldCityBillsHouseSignText +OldCityEarlsHouseSignScript: + jumptext OldCityEarlsHouseSignText -OldCityBillsHouseSignText: - text "BILL'S house" +OldCityEarlsHouseSignText: + text "EARL'S house" done OldCityTrainerSchoolSignScript: @@ -45,7 +45,7 @@ OldCityGymSignScript: jumptext OldCityGymSignText OldCityGymSignText: - text "OLD CITY" + text "SEPIA CITY" line "#MON GYM" para "LEADER: WALKER" @@ -88,9 +88,7 @@ OldCityMuseumSignScript: jumptext OldCityMuseumSignText OldCityMuseumSignText: - text "XX" - line "Comment to be" - cont "written." + text "SEPIA ART MUSEUM" done OldCityFruitTree: @@ -202,13 +200,13 @@ OldCity_MapEvents: warp_event 3, 26, OLD_MART, 1 ; Mart warp_event 27, 12, OLD_CITY_GYM, 1 ; gym right warp_event 26, 12, OLD_CITY_GYM, 1 ; gym left - warp_event 5, 12, DEBUG_ROOM, 1 ; Museum(?) right - warp_event 4, 12, DEBUG_ROOM, 1 ; Museum(?) left - warp_event 12, 16, DEBUG_ROOM, 1 ; Pokemon Pagoda right - warp_event 11, 16, DEBUG_ROOM, 1 ; Pokemon Pagoda left + warp_event 5, 12, OLD_CITY_MUSEUM, 1 ; Museum(?) right + warp_event 4, 12, OLD_CITY_MUSEUM, 2 ; Museum(?) left + warp_event 12, 16, POKEMON_PAGODA_1F, 1 ; Pokemon Pagoda right + warp_event 11, 16, POKEMON_PAGODA_1F, 2 ; Pokemon Pagoda left warp_event 3, 31, HONEY_GRANDMAS_HOUSE, 1 warp_event 27, 28, OLD_CITY_POKECENTER_1F, 1 - warp_event 30, 20, OLD_CITY_EARLS_HOUSE, 1 + warp_event 30, 20, OLD_CITY_EARLS_HOUSE, 2 warp_event 10, 26, OLD_CITY_FAMILY_HOUSE, 1 ; considering a tearoom where the waiters are passive-aggressive. classic kyoto. def_coord_events @@ -217,7 +215,7 @@ OldCity_MapEvents: bg_event 20, 22, BGEVENT_READ, OldCitySignScript bg_event 4, 32, BGEVENT_READ, HoneyGrandmaSignScript bg_event 8, 14, BGEVENT_READ, PokemonPagodaSignScript - bg_event 26, 20, BGEVENT_READ, OldCityBillsHouseSignScript + bg_event 26, 20, BGEVENT_READ, OldCityEarlsHouseSignScript bg_event 28, 14, BGEVENT_READ, OldCityGymSignScript bg_event 8, 11, BGEVENT_READ, OldCityMuseumSignScript bg_event 28, 28, BGEVENT_READ, OldCityPokecenterSign diff --git a/maps/OldCityMuseum.ablk b/maps/OldCityMuseum.ablk new file mode 100644 index 0000000..88ee51b --- /dev/null +++ b/maps/OldCityMuseum.ablk @@ -0,0 +1 @@ +VWVWVWVW RPQPQPQ & \ No newline at end of file diff --git a/maps/OldCityMuseum.asm b/maps/OldCityMuseum.asm new file mode 100644 index 0000000..79a4168 --- /dev/null +++ b/maps/OldCityMuseum.asm @@ -0,0 +1,95 @@ +; This seems to have been Mr. Pokemon's house in SW97. The egg is on the far right. + +; Here, we've changed it to an art museum, a la RSE's. Only here, the sculptor will construct statues of legendary Pokemon. +; Technically, we could make it the player's, but the problem is, it implies we'd have icons for all 466+ Pokemon in our dex, which is very unfeasible. +; So let's make him do statues of the Legendary Beasts! + +; He should have connections with Mr. Pokemon. +; Include an item maniac? + + object_const_def + +OldCityMuseum_MapScripts: + def_scene_scripts + + def_callbacks + +; Will eventually be complete. +OldCityInteriorMuseumSign: + jumptext OldCityMuseumInteriorSignText + +OldCityMuseumInteriorSignText: + text "NOW LOOKING FOR" + line "DONATIONS" + cont " - CURATOR" + done + +; These exhibits will only appear when he's inspired. +OldCityMuseumExhibit1: + jumptext OldCityMuseumExhibit1Text + +OldCityMuseumExhibit2: + jumptext OldCityMuseumExhibit2Text + +OldCityMuseumExhibit3: + jumptext OldCityMuseumExhibit3Text + +OldCityMuseumExhibit1Text: + text "SUICUNE" + line "Comment to be" + cont "written." + done + +OldCityMuseumExhibit2Text: + text "ENTEI" + line "Comment to be" + cont "written." + done + +OldCityMuseumExhibit3Text: + text "RAIKOU" + line "Comment to be" + cont "written." + done + +OldCityMuseumCuratorScript: + opentext + writetext OldCityMuseumCuratorText + waitbutton + closetext + end + +OldCityMuseumCuratorText: + text "Hello! I am a" + line "local sculptor!" + + para "I wish to fill" + line "this museum with" + cont "statues of legen-" + cont "dary #MON!" + + para "If you have a" + line "subject, please" + cont "allow me a look!" + done + +OldCityMuseum_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 5, OLD_CITY, 7 + warp_event 2, 5, OLD_CITY, 8 + + def_coord_events + + def_bg_events + bg_event 2, 2, BGEVENT_READ, OldCityInteriorMuseumSign + bg_event 5, 3, BGEVENT_READ, OldCityMuseumExhibit1 + bg_event 9, 3, BGEVENT_READ, OldCityMuseumExhibit2 + bg_event 13, 3, BGEVENT_READ, OldCityMuseumExhibit3 + + def_object_events + object_event 6, 4, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, OldCityMuseumCuratorScript, -1 + object_event 5, 3, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit1, -1 + object_event 9, 3, SPRITE_ENTEI, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit2, -1 + object_event 13, 3, SPRITE_RAIKOU, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, OldCityMuseumExhibit3Text, -1 diff --git a/maps/PokemonPagoda1F.ablk b/maps/PokemonPagoda1F.ablk new file mode 100644 index 0000000..5137005 --- /dev/null +++ b/maps/PokemonPagoda1F.ablk @@ -0,0 +1 @@ +YWXVU C&B \ No newline at end of file diff --git a/maps/PokemonPagoda1F.asm b/maps/PokemonPagoda1F.asm new file mode 100644 index 0000000..08cc1d7 --- /dev/null +++ b/maps/PokemonPagoda1F.asm @@ -0,0 +1,94 @@ +; In general, this place is almost certainly a reference to the story Gojunoto (The Five-Storied Pagoda), written in 1891. +; https://en.wikipedia.org/wiki/The_Five-Storied_Pagoda +; It's a good read! I strongly recommend it! + +; The story seems to have impacted GSC's writing in a big way, with two conflicting carpenters and the pagoda weathering a deadly storm. It seems Lugia could represent Genta, while Ho-Oh represents Jubei. However, in the final game, the towers are extremely different, and most references seem to have been removed. + +; Given this is a direct reference to the story, we'll focus squarely on it. + + object_const_def + +PokemonPagoda1F_MapScripts: + def_scene_scripts + + def_callbacks + +PokemonPagoda1FSign: + jumptext PokemonPagoda1FSignText + +PokemonPagoda1FSignText: + text "#MON PAGODA" + line "C… by JU…I…" + + para "The text is too" + line "faded to read…" + done + +PokemonPagodaSage1: + jumptextfaceplayer PokemonPagodaSage1Text + +PokemonPagodaSage2: + jumptextfaceplayer PokemonPagodaSage2Text + +PokemonPagodaSage3: + jumptextfaceplayer PokemonPagodaSage3Text + +PokemonPagodaSage4: + jumptextfaceplayer PokemonPagodaSage4Text + +PokemonPagodaSage1Text: + text "This PAGODA is one" + line "among many." + + para "If you travel" + line "west, you can see" + cont "many more." ; Refers to pagodas seen in Bhutan, Myanmar, Korea, China, etc... + done + +PokemonPagodaSage2Text: + text "My master told me" + line "these designs come" + cont "from 'the land" + cont "of TRAMPEL'…" ; Pagoda designs can be traced back to ancient India! + + para "I don't underst-" + line "and." + done + +PokemonPagodaSage3Text: + text "You can get a" + line "great view of" + para "SEPIA CITY from" + line "the top of this" + cont "place." + done + +PokemonPagodaSage4Text: + text "You wouldn't be-" + line "lieve this, but" + cont "this PAGODA was" + cont "built by a man of" + cont "no skill at all." + + para "It even survived" + line "a terrible storm!" + done + +PokemonPagoda1F_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 5, 9, OLD_CITY, 9 + warp_event 4, 9, OLD_CITY, 10 + warp_event 0, 1, POKEMON_PAGODA_2F, 2 + + def_coord_events + + def_bg_events + bg_event 5, 1, BGEVENT_READ, PokemonPagoda1FSign + + def_object_events + object_event 0, 2, SPRITE_SAGE, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 5, PokemonPagodaSage1, -1 + object_event 2, 7, SPRITE_SAGE, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 5, PokemonPagodaSage2, -1 + object_event 7, 6, SPRITE_SAGE, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 5, PokemonPagodaSage3, -1 + object_event 6, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 5, PokemonPagodaSage4, -1 ; By sign diff --git a/maps/PokemonPagoda2F.ablk b/maps/PokemonPagoda2F.ablk new file mode 100644 index 0000000..5043302 --- /dev/null +++ b/maps/PokemonPagoda2F.ablk @@ -0,0 +1 @@ +ZWDVU  \ No newline at end of file diff --git a/maps/PokemonPagoda2F.asm b/maps/PokemonPagoda2F.asm new file mode 100644 index 0000000..0c1117a --- /dev/null +++ b/maps/PokemonPagoda2F.asm @@ -0,0 +1,177 @@ + object_const_def + +PokemonPagoda2F_MapScripts: + def_scene_scripts + + def_callbacks + +PokemonPagoda2FStatue: + jumptext PokemonPagoda2FStatueText + +PokemonPagoda2FSign: + jumptext PokemonPagoda2FSignText + +PokemonPagoda2FStatueText: + text "It's a statue of" + line "PIKACHU." + done + +PokemonPagoda2FSignText: + text "One must not gl-" + line "orify man-made" + cont "objects." + + para "To do so loses" + line "our touch with" + cont "nature." + done + +TrainerMediumBethany: + trainer MEDIUM, BETHANY, EVENT_BEAT_MEDIUM_BETHANY, MediumBethanySeenText, MediumBethanyBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext MediumBethanyAfterBattleText + waitbutton + closetext + end + +MediumBethanySeenText: + text "Worldly pleasures" + line "are unnecessary." + done + +MediumBethanyBeatenText: + text "Kwa!" + done + +MediumBethanyAfterBattleText: + text "It is said that" + line "if you abstain" + cont "from material" + cont "things, you can" + cont "command unstop-" + cont "pable magic." + done + +TrainerMediumMargret: + trainer MEDIUM, MARGRET, EVENT_BEAT_MEDIUM_MARGRET, MediumMargretSeenText, MediumMargretBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext MediumMargretAfterBattleText + waitbutton + closetext + end + +MediumMargretSeenText: + text "Our ways have" + line "survived many an" + cont "attack!" + + para "Allow me to show" + line "you the fruits of" + cont "that past!" + done + +MediumMargretBeatenText: + text "How!?" + done + +MediumMargretAfterBattleText: ; In the Meiji era, Itako rituals were outlawed. It seems Margret is still miffed about that. + text "Our divinations" + line "were once feared" + cont "by all!" + + para "Have some pity on" + line "us!" + done + +TrainerMediumEthel: + trainer MEDIUM, ETHEL, EVENT_BEAT_MEDIUM_ETHEL, MediumEthelSeenText, MediumEthelBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext MediumEthelAfterBattleText + waitbutton + closetext + end + +; Itako are wedded to their patron spirits. In this case, Ethel is wedded to her late husband, William. +MediumEthelSeenText: + text "Hm? You want me" + line "to win, dear?" + + para "Then it shall be" + line "so!" + done + +; I decided to reference the character Ethel Skinner from Eastenders. +; She was one of the more popular characters in the show, never recovering from her husband's death and deteriorating due to cancer. +; She's eventually allowed to die with dignity, with Dot's assistance, who 22 years later is buried alongside her - in real time, mind you! +; The reference to Ethel is timely, considering she is still alive in Eastenders at this time and was going to die the year Pokemon Crystal was released in the west. +MediumEthelBeatenText: + text "WILLIAM! I'm so" + line "sorry!" + done + +MediumEthelAfterBattleText: + text "Who was I talking" + line "to?" + + para "My husband, of co-" + line "urse!" + done + +; Elsie is the maiden name of my mother. Eerily fitting! +TrainerMediumElsie: + trainer MEDIUM, ELSIE, EVENT_BEAT_MEDIUM_ELSIE, MediumElsieSeenText, MediumElsieBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext MediumElsieAfterBattleText + waitbutton + closetext + end + +MediumElsieSeenText: + text "Sight grants one" + line "many distractions." + + para "In the dark, one" + line "sees the truth!" + done + +MediumElsieBeatenText: + text "Agh! Bugger this" + line "for a lark!" + done + +MediumElsieAfterBattleText: + text "Maybe I should" + line "return home. This" + cont "isn't working!" + done + +PokemonPagoda2F_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 0, 1, POKEMON_PAGODA_1F, 3 + warp_event 9, 9, POKEMON_PAGODA_3F, 2 + + def_coord_events + + def_bg_events + bg_event 5, 1, BGEVENT_READ, PokemonPagoda2FSign + bg_event 4, 0, BGEVENT_READ, PokemonPagoda2FStatue + + def_object_events + object_event 6, 6, SPRITE_MEDIUM, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumBethany, -1 + object_event 3, 6, SPRITE_MEDIUM, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumMargret, -1 + object_event 6, 3, SPRITE_MEDIUM, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumEthel, -1 + object_event 3, 3, SPRITE_MEDIUM, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 2, TrainerMediumElsie, -1 diff --git a/maps/PokemonPagoda3F.ablk b/maps/PokemonPagoda3F.ablk new file mode 100644 index 0000000..dec13e2 --- /dev/null +++ b/maps/PokemonPagoda3F.ablk @@ -0,0 +1 @@ +ZWFVU  \ No newline at end of file diff --git a/maps/PokemonPagoda3F.asm b/maps/PokemonPagoda3F.asm new file mode 100644 index 0000000..96dc558 --- /dev/null +++ b/maps/PokemonPagoda3F.asm @@ -0,0 +1,173 @@ + object_const_def + +PokemonPagoda3F_MapScripts: + def_scene_scripts + + def_callbacks + +PokemonPagoda3FStatue: + jumptext PokemonPagoda3FStatueText + +PokemonPagoda3FSign: + jumptext PokemonPagoda3FSignText + +PokemonPagoda3FStatueText: + text "It's a statue of" + line "TENTACRUEL." + done + +PokemonPagoda3FSignText: + text "One should pay" + line "attention to" + cont "the world." + + para "You need not" + line "cut a notch in" + cont "your boat to" + cont "find your sword." ; a reference to a story here https://www.laowaichengyuguide.com/entry/%E5%88%BB%E8%88%9F%E6%B1%82%E5%89%91 + done + +TrainerSageMing: + trainer SAGE, MING, EVENT_BEAT_SAGE_MING, SageMingSeenText, SageMingBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageMingAfterBattleText + waitbutton + closetext + end + +SageMingSeenText: + text "This PAGODA has" + line "existed for cen-" + cont "turies." + done + +SageMingBeatenText: + text "Very good!" + done + +SageMingAfterBattleText: + text "I like to live" + line "life at a leis-" + cont "urely pace." + + para "Sort of like" + line "riding in a" + cont "carriage." ; 安步当车 - a chengyu. + done + +TrainerSageWei: + trainer SAGE, WEI, EVENT_BEAT_SAGE_WEI, SageWeiSeenText, SageWeiBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageWeiAfterBattleText + waitbutton + closetext + end + +SageWeiSeenText: + text "You're as expres-" + line "sionless as a" + cont "wooden PIDGEOT." ; 呆若木鸡 - used to express whether someone is dumbstruck, either with fear or shock. Here, Pidgeot replaces the chicken. + + para "Are you not in" + line "awe?" ; so this results in very, very funny communication failure. + done + +SageWeiBeatenText: + text "You've got the" + line "wrong idea!" + done + +SageWeiAfterBattleText: + text "I was asking if" + line "you're dumbstruck!" + + para "My sincerest apo-" + line "logies! I shall" + cont "bring branches" + cont "for my punishment!" ; references 负荆请罪 - comes from a story where a misunderstanding between two generals that ended in one bringing bramble branches, shirt-off, to be whipped with, as an apology. + done + +TrainerSageLang: + trainer SAGE, LANG, EVENT_BEAT_SAGE_LANG, SageLangSeenText, SageLangBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageLangAfterBattleText + waitbutton + closetext + end + +SageLangSeenText: + text "Excuse me, could" + line "you take your" + cont "shoes off?" + done + +SageLangBeatenText: + text "Hmph!" + done + +SageLangAfterBattleText: + text "When you enter a" + line "village, do you" + cont "no comply with" + cont "its customs?" ; 入乡随俗 + + para "Then take your" + line "shoes off!" + done + +TrainerSageHuang: + trainer SAGE, HUANG, EVENT_BEAT_SAGE_HUANG, SageHuangSeenText, SageHuangBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageHuangAfterBattleText + waitbutton + closetext + end + +SageHuangSeenText: + text "Willow trees make" + line "shade, flowers" + cont "give light." ; 柳暗花明 refers to a positive turn of events after a struggle; light at the end of the tunnel. It seems Huang has been through some hardship. + done + +SageHuangBeatenText: + text "Things will get" + line "better." + done + +SageHuangAfterBattleText: + text "Sometimes, the" + line "best thing one" + cont "can do is turn" + cont "on the light." + done + +PokemonPagoda3F_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 9, 9, POKEMON_PAGODA_4F, 2 + warp_event 0, 1, POKEMON_PAGODA_2F, 1 + + def_coord_events + + def_bg_events + bg_event 5, 1, BGEVENT_READ, PokemonPagoda3FSign + bg_event 4, 0, BGEVENT_READ, PokemonPagoda3FStatue + + def_object_events + object_event 4, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageMing, -1 + object_event 5, 5, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageWei, -1 + object_event 6, 6, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageLang, -1 + object_event 3, 4, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageHuang, -1 diff --git a/maps/PokemonPagoda4F.ablk b/maps/PokemonPagoda4F.ablk new file mode 100644 index 0000000..68f27eb --- /dev/null +++ b/maps/PokemonPagoda4F.ablk @@ -0,0 +1 @@ +ZWIVU  \ No newline at end of file diff --git a/maps/PokemonPagoda4F.asm b/maps/PokemonPagoda4F.asm new file mode 100644 index 0000000..8f06b15 --- /dev/null +++ b/maps/PokemonPagoda4F.asm @@ -0,0 +1,181 @@ + object_const_def + +PokemonPagoda4F_MapScripts: + def_scene_scripts + + def_callbacks + +PokemonPagoda4FStatue: + jumptext PokemonPagoda4FStatueText + +PokemonPagoda4FSign: + jumptext PokemonPagoda4FSignText + +PokemonPagoda4FStatueText: + text "It's a statue of" + line "FEAROW." + done + +PokemonPagoda4FSignText: + text "Do not swallow a" ; 囫囵吞枣 + line "date with one" + cont "gulp." + + para "Engage with your" + line "surroundings." + + para "Digest its con-" + line "tents." + + para "You need not fear" ; 杞人忧天 + line "whether the sky" + cont "will fall." + done + +; Street Fighter Alpha 3 had just come out at this time, so let's reference Gen. +TrainerSageGen: + trainer SAGE, GEN, EVENT_BEAT_SAGE_GEN, SageGenSeenText, SageGenBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageGenAfterBattleText + waitbutton + closetext + end + +SageGenSeenText: + text "Death may come" + line "when one is at" + cont "their best." + done + +SageGenBeatenText: + text "Your style is" + line "pure." + done + +SageGenAfterBattleText: + text "You can't win" + line "just by battling." ; I mean, in Pokemon? You...really can. + + para "Much has to be" + line "done. Do you pull" + cont "seedlings from" + cont "the ground to" + cont "help them grow?" ; 拔苗助长 - Haste makes waste is the effectual meaning. + done + +TrainerSageRaoh: + trainer SAGE, RAOH, EVENT_BEAT_SAGE_RAOH, SageRaohSeenText, SageRaohBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageRaohAfterBattleText + waitbutton + closetext + end + +SageRaohSeenText: + text "The heavens wish" + line "for my victory!" + done + +SageRaohBeatenText: + text "My #MON no" + line "longer have the" + cont "strength." + done + +SageRaohAfterBattleText: + text "I understand." + + para "You have lived" + line "all this time by" + cont "seeing through" + cont "death." + done + +TrainerSageShuu: + trainer SAGE, SHUU, EVENT_BEAT_SAGE_SHUU, SageShuuSeenText, SageShuuBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageShuuAfterBattleText + waitbutton + closetext + end + +SageShuuSeenText: + text "Benevolence is" + line "a virtue." + done + +SageShuuBeatenText: + text "My eyes…" + done + +SageShuuAfterBattleText: + text "This loss…" + + para "It bears on me" + line "with the weight" + cont "of MT.SILVER." ; 安如泰山 - To bear down with the weight of Mt. Tai, a mountain in Shandong. This is also the Chinese name for Body Slam! + done + +TrainerSageSheng: + trainer SAGE, SHENG, EVENT_BEAT_SAGE_SHENG, SageShengSeenText, SageShengBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext SageShengAfterBattleText + waitbutton + closetext + end + +SageShengSeenText: + text "Even in one's" + line "darkest hours," + cont "defeat only comes" + cont "if they don't" + cont "fight!" + done + +SageShengBeatenText: + text "I…" + done + +SageShengAfterBattleText: + text "It seems my" + line "studies were" + cont "insufficient." + + para "I must redouble" + line "my efforts!" + + para "But some worry" + line "about my sleep" + cont "and eating! Ha!" ; 废寝忘食 while it basically says neglecting sleep and food to continue working diligently, it is a positive Chengyu... + done + +PokemonPagoda4F_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 9, 9, POKEMON_PAGODA_5F, 1 + warp_event 0, 1, POKEMON_PAGODA_3F, 1 + + def_coord_events + + def_bg_events + bg_event 5, 1, BGEVENT_READ, PokemonPagoda4FSign + bg_event 4, 0, BGEVENT_READ, PokemonPagoda4FStatue + + def_object_events + object_event 4, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageGen, -1 + object_event 6, 9, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageRaoh, -1 + object_event 8, 9, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageShuu, -1 + object_event 9, 1, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 4, TrainerSageSheng, -1 diff --git a/maps/PokemonPagoda5F.ablk b/maps/PokemonPagoda5F.ablk new file mode 100644 index 0000000..aa37c42 --- /dev/null +++ b/maps/PokemonPagoda5F.ablk @@ -0,0 +1 @@ +VTE  \ No newline at end of file diff --git a/maps/PokemonPagoda5F.asm b/maps/PokemonPagoda5F.asm new file mode 100644 index 0000000..7255d6f --- /dev/null +++ b/maps/PokemonPagoda5F.asm @@ -0,0 +1,67 @@ + object_const_def + +PokemonPagoda5F_MapScripts: + def_scene_scripts + + def_callbacks + +PokemonPagoda5FStatue: + jumptext PokemonPagoda5FStatueText + +PokemonPagoda5FSign: + jumptext PokemonPagoda5FSignText + +PokemonPagoda5FButsudan: + jumptext PokemonPagoda5FButsudanText + +PokemonPagoda5FStatueText: + text "It's a statue of" + line "ABRA." + done + +; Very very very much set to change. +PokemonPagoda5FSignText: ; 女娲补天 + text "There was once" + line "a beast with the" + cont "strength and" + cont "spirit to trans-" + cont "form the world." + + para "By patching a" + line "heavenly hole," + cont "it prevented our" + cont "disaster." + done + +PokemonPagoda5FButsudanText: + text "It's a butsudan!" + done + +ElderRoenScript: + faceplayer + opentext + writetext ElderRoenFirstText + waitbutton + closetext + end + +ElderRoenFirstText: + text "Comment to be" + line "written." + done + +PokemonPagoda5F_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 5, 5, POKEMON_PAGODA_4F, 2 + + def_coord_events + + def_bg_events + bg_event 4, 1, BGEVENT_READ, PokemonPagoda5FSign + bg_event 2, 0, BGEVENT_READ, PokemonPagoda5FStatue + bg_event 3, 0, BGEVENT_READ, PokemonPagoda5FButsudan + + def_object_events + object_event 2, 3, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, ElderRoenScript, -1 diff --git a/maps/Route49OldCityGate2F.asm b/maps/Route49OldCityGate2F.asm index ea69ce8..c0670d6 100644 --- a/maps/Route49OldCityGate2F.asm +++ b/maps/Route49OldCityGate2F.asm @@ -18,12 +18,6 @@ Route49OldCityGate2FLassText: line "metimes to show us" cont "his # BALL" cont "craft." - - para "They say if you" - line "can get on his" - cont "good side, you'll" - cont "have made it as" - cont "a TRAINER!" done Route49OldCityGate2FTwinScript: @@ -33,7 +27,7 @@ Route49OldCityGate2FTwinText: text "You're a tourist?" line "That's too bad." - para "GROWLITHE PAGODA" + para "The #MON PAGODA" line "isn't open to just" cont "anyone." done @@ -49,7 +43,7 @@ Route49OldCityGate2FTelescopeText1: line "into a telescope!" para "Whoa! There's a" - line "tall, tall tower!" + line "tall, tall pagoda!" done Route49OldCityGate2FTelescopeText2: diff --git a/maps/SproutTower3F.asm b/maps/SproutTower3F.asm index b4388df..6dff36d 100644 --- a/maps/SproutTower3F.asm +++ b/maps/SproutTower3F.asm @@ -61,31 +61,31 @@ SproutTower3FRivalScene: special RestartMapMusic end -SageLiScript: +ElderLiScript: faceplayer opentext checkevent EVENT_GOT_HM05_FLASH iftrue .GotFlash - writetext SageLiSeenText + writetext ElderLiSeenText waitbutton closetext - winlosstext SageLiBeatenText, 0 - loadtrainer SAGE, LI + winlosstext ElderLiBeatenText, 0 + loadtrainer ELDER, LI startbattle reloadmapafterbattle opentext - writetext SageLiTakeThisFlashText + writetext ElderLiTakeThisFlashText promptbutton verbosegiveitem HM_FLASH setevent EVENT_GOT_HM05_FLASH - setevent EVENT_BEAT_SAGE_LI - writetext SageLiFlashExplanationText + setevent EVENT_BEAT_ELDER_LI + writetext ElderLiFlashExplanationText waitbutton closetext end .GotFlash: - writetext SageLiAfterBattleText + writetext ElderLiAfterBattleText waitbutton closetext end @@ -203,7 +203,7 @@ SproutTowerRivalUsedEscapeRopeText: line "ESCAPE ROPE!" done -SageLiSeenText: +ElderLiSeenText: text "So good of you to" line "come here!" @@ -226,11 +226,11 @@ SageLiSeenText: line "you!" done -SageLiBeatenText: +ElderLiBeatenText: text "Ah, excellent!" done -SageLiTakeThisFlashText: +ElderLiTakeThisFlashText: text "You and your #-" line "MON should have" @@ -241,7 +241,7 @@ SageLiTakeThisFlashText: line "HM." done -SageLiFlashExplanationText: +ElderLiFlashExplanationText: text "FLASH illuminates" line "even the darkest" cont "of all places." @@ -253,7 +253,7 @@ SageLiFlashExplanationText: line "from VIOLET's GYM." done -SageLiAfterBattleText: +ElderLiAfterBattleText: text "I hope you learn" line "and grow from your" cont "journey." @@ -347,7 +347,7 @@ SproutTower3F_MapEvents: def_object_events object_event 8, 13, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageJin, -1 object_event 8, 8, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerSageTroy, -1 - object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, SageLiScript, -1 + object_event 10, 2, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ElderLiScript, -1 object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1 object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE