From 675e112beeb2cdaf8b33aa949149436775487af8 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:49:14 +0100 Subject: [PATCH 01/16] Sepia Museum It's an art museum where you can get your legendary beasts sculpted for now, though I haven't added the functionality. There's a world where it could be for any Pokemon but that implies we make individualised icons... --- constants/map_constants.asm | 1 + data/maps/attributes.asm | 1 + data/maps/blocks.asm | 3 + data/maps/maps.asm | 1 + data/maps/scripts.asm | 1 + data/tilesets/nihon_old_attributes.bin | Bin 1040 -> 1056 bytes data/tilesets/nihon_old_collision.asm | 3 +- data/tilesets/nihon_old_metatiles.bin | Bin 1040 -> 1056 bytes data/tilesets/tower_attributes.bin | Bin 1280 -> 1408 bytes data/tilesets/tower_collision.asm | 8 +++ data/tilesets/tower_metatiles.bin | 2 +- gfx/tilesets/tower.png | Bin 4169 -> 4386 bytes maps/OldCity.ablk | Bin 360 -> 360 bytes maps/OldCity.asm | 8 +-- maps/OldCityMuseum.ablk | 1 + maps/OldCityMuseum.asm | 95 +++++++++++++++++++++++++ 16 files changed, 117 insertions(+), 7 deletions(-) create mode 100644 maps/OldCityMuseum.ablk create mode 100644 maps/OldCityMuseum.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 54f94a4..c264660 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -644,6 +644,7 @@ 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 endgroup newgroup BLUE_FOREST ; 37 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index bc80d4c..6c1e445 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -833,6 +833,7 @@ 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 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..d82b31f 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1243,3 +1243,6 @@ Route66WhiteCityGate_Blocks: OldCityGym_Blocks: INCBIN "maps/OldCityGym.ablk" + +OldCityMuseum_Blocks: + INCBIN "maps/OldCityMuseum.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 26e5772..4af3ce1 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -704,6 +704,7 @@ 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 assert_table_length NUM_OLD_CITY_MAPS MapGroup_BlueForest: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index 665b2c6..3d0573f 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -590,6 +590,7 @@ INCLUDE "maps/Route66WhiteCityGate.asm" SECTION "Map Scripts 30", ROMX INCLUDE "maps/OldCityGym.asm" +INCLUDE "maps/OldCityMuseum.asm" SECTION "Map Scripts 31", ROMX ; spillover INCLUDE "maps/TanobyRuins.asm" diff --git a/data/tilesets/nihon_old_attributes.bin b/data/tilesets/nihon_old_attributes.bin index 036f3fd99bdcaa9796d23935bbeedc948c0e3727..18d6a0d17cee807619d1b6a3ccd7e031cceb117d 100644 GIT binary patch delta 24 WcmbQhv4CTP0E+-CtEwsp!vFv|=mX^d delta 7 OcmZ3$F@a-)01E&Ky8;CO diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm index b310f3f..d21bbba 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, WALL ; 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 cd8c97af33e433f3146c3f09411788050d9bc0b7..6e436715680faa03c5ae3c231b68c8fdc6fdc1ac 100644 GIT binary patch delta 24 YcmbQhv4CTP0E>W)EdxVLECU<>06d}tM*si- delta 7 OcmZ3$F@a-)01E&Ky8;CO diff --git a/data/tilesets/tower_attributes.bin b/data/tilesets/tower_attributes.bin index 49c48769e9bae6ffafb8fa9c3b7c3f5b333cd457..4eee61e67e07537b06595c2fd3869764b6b579a9 100644 GIT binary patch delta 130 zcmZqRYT#bLI#Gb5f)@%{p@5f{l@%Ey#32fGf$|`L&<7Dg@FDUDQy_epnJ`%Zbsz^6 delta 6 NcmZqRZs1zL3IGP60lNSI diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index d0da62e..06f26de 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -78,3 +78,11 @@ 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 diff --git a/data/tilesets/tower_metatiles.bin b/data/tilesets/tower_metatiles.bin index dc59184..607b4d7 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!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^!!^^!!!!!!!!!!!!!!!! !!!$%:;!#%'NO^_<=]]>?MM55]]<=MM>?55]]]]MMMM]]!!MM]]MM!! \ No newline at end of file diff --git a/gfx/tilesets/tower.png b/gfx/tilesets/tower.png index 6ffbcc0f7adb29a025acfe39a61ca85b518aede4..cc7d8d447c4b0c6f719fe3b17a26bc8fa7122eaa 100644 GIT binary patch delta 4221 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 delta 4044 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 Date: Fri, 26 Jul 2024 13:17:15 +0100 Subject: [PATCH 02/16] Pokemon Pagoda MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives Sepia City all of its locations. The pagoda uses references to the Five-Story Pagoda story from 1891, with Sages using various 成语 translated into English. This also adds the Elder class, assigning it to Li and (now) Roen. The Elder in the pagoda is not yet battle-able as I haven't really fit anything into the story. No cutscenes, etc, it's all too early. --- constants/event_flags.asm | 18 ++- constants/landmark_constants.asm | 1 + constants/map_constants.asm | 5 + constants/trainer_constants.asm | 24 +++- data/maps/attributes.asm | 5 + data/maps/blocks.asm | 15 ++ data/maps/landmarks.asm | 2 + data/maps/maps.asm | 5 + data/maps/scripts.asm | 5 + data/tilesets/nihon_old_collision.asm | 2 +- data/tilesets/tower_attributes.bin | Bin 1408 -> 1456 bytes data/tilesets/tower_collision.asm | 15 +- data/tilesets/tower_metatiles.bin | 2 +- data/trainers/attributes.asm | 6 + data/trainers/class_names.asm | 1 + data/trainers/dvs.asm | 1 + data/trainers/encounter_music.asm | 1 + data/trainers/gendered_trainers.asm | 1 + data/trainers/genders.asm | 1 + data/trainers/palettes.asm | 1 + data/trainers/parties.asm | 199 +++++++++++--------------- data/trainers/parties_new_classes.asm | 122 ++++++++++++++++ data/trainers/party_pointers.asm | 1 + data/trainers/pic_pointers.asm | 1 + data/trainers/sprites.asm | 1 + maps/OldCity.asm | 8 +- maps/PokemonPagoda1F.ablk | 1 + maps/PokemonPagoda1F.asm | 94 ++++++++++++ maps/PokemonPagoda2F.ablk | 1 + maps/PokemonPagoda2F.asm | 177 +++++++++++++++++++++++ maps/PokemonPagoda3F.ablk | 1 + maps/PokemonPagoda3F.asm | 173 ++++++++++++++++++++++ maps/PokemonPagoda4F.ablk | 1 + maps/PokemonPagoda4F.asm | 181 +++++++++++++++++++++++ maps/PokemonPagoda5F.ablk | 1 + maps/PokemonPagoda5F.asm | 67 +++++++++ maps/SproutTower3F.asm | 28 ++-- 37 files changed, 1017 insertions(+), 151 deletions(-) create mode 100644 maps/PokemonPagoda1F.ablk create mode 100644 maps/PokemonPagoda1F.asm create mode 100644 maps/PokemonPagoda2F.ablk create mode 100644 maps/PokemonPagoda2F.asm create mode 100644 maps/PokemonPagoda3F.ablk create mode 100644 maps/PokemonPagoda3F.asm create mode 100644 maps/PokemonPagoda4F.ablk create mode 100644 maps/PokemonPagoda4F.asm create mode 100644 maps/PokemonPagoda5F.ablk create mode 100644 maps/PokemonPagoda5F.asm 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 c264660..253913d 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -645,6 +645,11 @@ ENDM 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/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/maps/attributes.asm b/data/maps/attributes.asm index 6c1e445..931fcbf 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -834,6 +834,11 @@ ENDM 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 d82b31f..6b32af0 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1246,3 +1246,18 @@ OldCityGym_Blocks: 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 4af3ce1..092ab19 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -705,6 +705,11 @@ MapGroup_OldCity: 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/scripts.asm b/data/maps/scripts.asm index 3d0573f..bc6fbde 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -591,6 +591,11 @@ 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" SECTION "Map Scripts 31", ROMX ; spillover INCLUDE "maps/TanobyRuins.asm" diff --git a/data/tilesets/nihon_old_collision.asm b/data/tilesets/nihon_old_collision.asm index d21bbba..cd47386 100644 --- a/data/tilesets/nihon_old_collision.asm +++ b/data/tilesets/nihon_old_collision.asm @@ -60,7 +60,7 @@ tilecoll WALL, WALL, WALL, WALL ; 3b tilecoll WALL, WALL, WALL, WALL ; 3c tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d - tilecoll DOOR, WALL, FLOOR, 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/tower_attributes.bin b/data/tilesets/tower_attributes.bin index 4eee61e67e07537b06595c2fd3869764b6b579a9..f1af26100272f98e0c706b0d5ddb513038332662 100644 GIT binary patch delta 113 zcmZqR-oU-ViA9eW40M4cD=UZzB9SpjjF(pzh(V&04OkQeKmsrT5}e4GF`0wafk~Hl UvKOn_WCKR delta 33 jcmdnM-N3!UiDj}9ivkqOO=QiO%)#ow#L7C^i`5JOlu-xB diff --git a/data/tilesets/tower_collision.asm b/data/tilesets/tower_collision.asm index 06f26de..8c0c6fa 100644 --- a/data/tilesets/tower_collision.asm +++ b/data/tilesets/tower_collision.asm @@ -64,14 +64,14 @@ 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 @@ -86,3 +86,6 @@ 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 607b4d7..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^_<=]]>?MM55]]<=MM>?55]]]]MMMM]]!!MM]]MM!! \ 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..b123e10 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/sage.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..c9c1fb0 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 SagePic ; Elder 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/maps/OldCity.asm b/maps/OldCity.asm index 5b8cab8..914ce56 100644 --- a/maps/OldCity.asm +++ b/maps/OldCity.asm @@ -201,12 +201,12 @@ OldCity_MapEvents: warp_event 27, 12, OLD_CITY_GYM, 1 ; gym right warp_event 26, 12, OLD_CITY_GYM, 1 ; gym left warp_event 5, 12, OLD_CITY_MUSEUM, 1 ; Museum(?) right - warp_event 4, 12, OLD_CITY_MUSEUM, 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 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 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/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 From fa99cbc8395c113ca8db3dd972e5a995388d84f1 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:28:14 +0100 Subject: [PATCH 03/16] Fix Sepia City flypoint HOW WERE YOU BUILDING????? --- constants/map_data_constants.asm | 1 + engine/pokegear/pokegear.asm | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) 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/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 From 5ed8e23f7a3c31b4400065c9d183d0a7d549157d Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:30:08 +0100 Subject: [PATCH 04/16] Cleaning up a couple of old references --- maps/OldCity.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/maps/OldCity.asm b/maps/OldCity.asm index 914ce56..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" @@ -215,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 From 6b22dba5badce2bfca0110f3ce6e54257ea63967 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:48:19 +0100 Subject: [PATCH 05/16] no more deadnaming also shortened some text about kurt that was a bit irrelevant and long for a gate --- maps/Route49OldCityGate2F.asm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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: From 0f63c1f1e2e6d2e5f34fffc4e57bac4850c4c6fd Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:53:58 +0100 Subject: [PATCH 06/16] RBY Trainer GFX Still placeholders, but you can now build off these to GSCify them, and I guess it makes playtesting minutely more enjoyable. Also added the student, jessie/james, and yujirou sprites, as well as made blaine have his default sprite, while copying his usual one to be used for chief. --- gfx/trainers/blaine.png | Bin 431 -> 651 bytes gfx/trainers/channeler.png | Bin 430 -> 605 bytes gfx/trainers/chief.png | Bin 0 -> 431 bytes gfx/trainers/cue_ball.png | Bin 430 -> 615 bytes gfx/trainers/firefighter.png | Bin 430 -> 891 bytes gfx/trainers/jack.png | Bin 0 -> 807 bytes gfx/trainers/jessiejames.png | Bin 0 -> 641 bytes gfx/trainers/rocker.png | Bin 430 -> 460 bytes gfx/trainers/student.png | Bin 0 -> 718 bytes gfx/trainers/tamer.png | Bin 430 -> 566 bytes gfx/trainers/yujirou.png | Bin 0 -> 802 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 gfx/trainers/chief.png create mode 100644 gfx/trainers/jack.png create mode 100644 gfx/trainers/jessiejames.png create mode 100644 gfx/trainers/student.png create mode 100644 gfx/trainers/yujirou.png diff --git a/gfx/trainers/blaine.png b/gfx/trainers/blaine.png index 1afc558fda514083c4f83180faeae4e88d0f3914..5ba63b6b28c5519aa0d422b0b8c217be74b0faef 100644 GIT binary patch literal 651 zcmeAS@N?(olHy`uVBq!ia0vp^79h+7Bp8mz)+7TdmUKs7M+SzC{oH>NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMW?mJwzO8}B85kJrJY5_^G|ngg;Ad=C6k%@p zr5xOUa{cG!Eob8&+_C>JZu;@}mBTyc*Xdro`T4lq zx!9*0?nxZ{yQ3xX+&t-mciS5_7hk)xhu=I)^!>H1Q=cc^*}r<%o8R_d55K*dH7UBj zQ}&!~>f)1g4)i>@w&QR71D@wxe>nf0{v>-&^w+CT*To*PuIydM_mAV<$}n+Wc9!oG zG8RmmWIyM(dqeTIV<|2VWV}Chdbky=_j^$|$z_u7lZhdY1^sMlD?Js8)4jM9c7#XV z4f*l<;hp}4ZM?7FPTY~FnJv)uzpKqn$DzwHt&LfR^Nm|sTk;HZq3|o>z z40R2F$T-B%*vi<<%Gg5Nz}U*b;9rq94~mA|{FKbJO57Uy^*?U_YGCkm^>bP0l+XkK D9{>O} delta 417 zcmV;S0bc%#1+N2;7=H)@0001=Sj#K`000b7OjJex|Nr-;ggIJc0002&s#5g;000DZ zQchF<|NsAOC`Nez00B-(L_t(|+Rc{1j>I4gLxcVQ|GW?f%4Ici52NAG=}0^!aZG5$ z?<~&s0t3ffK8g`B67@NO@JQ}}W=LW@i&j8Zo<7Kh@kOqa(tpDgXEH+%FV$%qjNzxs z*$c@tVAhzsSB;(lnACZ-$W;I(6I&Mrc4mN2s;s}tXW50}izTdt7x>Jsm*0ppyRx;vSMj*FRO2#AWmiTOc&cFH7_c zfVf=RG##rK=YR5G+jErJG^-Ns=bEYN_(R7GZE#<7TdR*~Zpeth3E44TosV^nMLz9m zd8fct92`(ok~G1MvTM8(ksB=JBPe^{pxo4JY_ zBc@r+3sNhU{SFup_cgGzu|dRE)eNX?^Xtf0^|{sGd>Wbm``Pgau7CxmKalQ#00000 LNkvXXu0mjfHJrqd diff --git a/gfx/trainers/channeler.png b/gfx/trainers/channeler.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..3fd174a519656c9995fa88d47c840ee7726116b0 100644 GIT binary patch delta 592 zcmV-W0}pFH9FK5w1`aOQyj;eq}y58_!@a(~D#YCIZUv;=>s$X;i$ zXG^y07Sjwc7Rr*zGP7 zNlP$6&9|93qJgYN*!sE>owKvDt5l@=Div`-R$2R#7rK_?EJ=E4ui2dk5K-e3=-|l z;^uejWUxbnKKp3>x=|iZa!m0#XxOpI)?`v+5aVR~h+}0u`hcML+-r<%8=vhW@0%}n z1r%nNigl!*b2fSJ7q4#njB&CK)4wck*N}-S>eLH_-+ya-nV@(FZCZU<4L?Oi75o;; zU4Ees&^;EUiRVg4*?-^;1^Y`~cn5pfljCMV_gvL3etbBcK7|X4o!tFAWeaYF^5Hid zQ<6;L_PkPzPiYV{*MfSbB%_E!S6cR^f_28;ijmhUJA$W#Xby1}3OT_ZA;jTlrTmA) zAf)j4FG+6_a&K!IMI6uwx%22OSx3sBkWrqPt;TN(cF-q-fK2{M<;T4&w@+h|N8Zf8 e;H}P(>AwLt`wyc9Ff1Pc0000o6=lq?G4N`OXq^3Og?}vhMY1S5%MYBZD-4t9 zvS3>Y3u_FAq}`V7_mUad=?u|ehU<+xn_<E=fLM zD=Od#RaV?h;-x5Elv~BvE&D1#|L=+_9Kh{0000< KMNUMnLSTZc00003_Nklq>#P2N5^#TLOTt12sF%tDTf$&J~fM!TyJd0L9R-Qh{h4DqM zlhVT!XEH+%FV$%qjNzxs*$c@tVAhzsSB;(lnACZ-$W;I(6I&Mrc4mN2s; zs}tXW50}izTdt7x>Jsm*0ppyRx;vSMj z*FRO2#AWmiTOc&cFH7_cfVf=RG##rK=kj3NbClUMs}k<#nyKpeL&pqla9?y=tB+`I z$cVrR*)d+7k9CekKJ96Fr@&Pl98gq}G{KFsYrGSY8!Y4_D0|&RF2xz*o%ng9FQ Z@dvJe1*Sic?tlOQ002ovPDHLkV1k4(#9ROX literal 0 HcmV?d00001 diff --git a/gfx/trainers/cue_ball.png b/gfx/trainers/cue_ball.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..6d3ae768f5383b67422eddb8cfd8de8836f91c8b 100644 GIT binary patch delta 602 zcmV-g0;T<~1Lp*g7=Ho)0002TU3_Bz00J&aL_t(|+NILLYZE~f2Jp8@)2LLE+KdJ- zQEa6)2YVLcEVQ*MLXvhTN=>Pymy%24!HXyx#T>*#6dUj=3QZ@4`~%{q)>;X|M#M`m z1wDBw*=$5Dvl(}1LydU!yZsoLH^cjY{}uRu*8SbIqD<{#lYeS@7i+X){-Je_mKols zd7G9$==Oyd8(J5zr(?5FJ_g4m-9C=ug_>IRNM1eB0mXxD1WG72>rU3CJIQY z-OBwX48hYdOGttcTFyNSz(@W{!IYbG!NFnNe^$>kMwes6;#9)HaN+83e6lMf+iz3F9jO& zgkXmTBe$kr9?y5!V!m{Ob00|vGN$w?rjBIf@-9g$m?1>OLM@DD1>Hd$uU{QdtxYuM zGE(;jbW_ui{VwCaG2DtUDdAF=y-tZha=C>BtDURrvezkORT6V~16^?{WhgFN5Oc^N oAZWmbsAttB8;uAu{7?CR1BasszbI$382|tP07*qoM6N<$f~vU_fdBvi delta 416 zcmV;R0bl;-1g-;+7=H)@0001=Sj#K`000b7OjJex|NsBSLSsst0002BD@W!4000DZ zQchF<|NsAOC`Nez00B)&L_t(|+O?L+ZUZq4LnZP5|GC;co#ax|K#c^x_zktti`hR6 zTte^*vLHl*$RUA<1W}U<(y5kQQ8h>o6=lq?G4N`OXq^3Og?}vhMY1S5%MYBZD-4t9 zvS3>Y3u_FAq}`V7_mUad=?u|ehU<+xn_<E=fLM zD=Od#RaV?h;-x5Elv~BvE&D1#|L=+_9Kh{0000< KMNUMnLSTZtB))wB diff --git a/gfx/trainers/firefighter.png b/gfx/trainers/firefighter.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..f0a3617bb0e42cbc6d93d1c92494c77ae72891ef 100644 GIT binary patch delta 879 zcmV-#1Cac#1N#P$8Gix*001ZCtVsX>142neK~!jg?O9ur8zBsYRIUhz91cl7I__#q z7zCc()K=UdE*lus2tCKS_nv+Ne*J3#QGAHrjStbg@gaIQ?j+h;tF>l_T5D_V&CPQp z;8Rj5<+`r%Mmd*KCY!X@-bpUMmn&2s(3$5tXUVCYLwY$R+J9OrrBI{(5|=D>_L%FM zD1|{@&RM5wt@9iATb*$Y5uE_~o-Z(8whl(D50`U>QBtG5_x6BaALQ}MDPQ44qi`>O zLRH>e(+AP&geb%qW1X-$yK94!fZuyJvJqbajOfiy>|{^s9FTfl7k}y$7w9L~r`NW) zlxy&=*Q;Q<9ete1qRjeszyM(hFh@uS|aveq)a81t@H>dnakZ7pPQ$r+0 zEv1)nk?hlR*qSt92HQmmBVwe^&;p9L+*(6x+Ix>X)7tCNJeUz^NFzC?l$qBw2ID?N zMEy<;0DtZRWnf&jWf&Xm7WPCmj;2Rp&nN?mh^E6Nu2Cs{LtjrBMtMt5GNj*O870c- zO=E@22P;b~e${COv2CM}$4Kc{nzqgqP3c8KULqQvG?X&d_!lS4Ooq3PAY6PE(e!MN zbTw z-ye)z58QwI#oELMP@Zb#I^=p5q4tUr?eYj309Xz)YIzMQ+y#c+(%&&1S&E-$j3K&CKFsZrInOgC)VrB9KV&{O~>hc zrD&ABe?^AdnfFcp7-a0tbn^1TbY0Qv$qx=s$V^MR{4($3cm^#C_2y)tzZ5@)=pU{9@OWz4TJ@M?=_oc(HrEPwe$vM4&s51gwj43p@x zU|R_bYYc~^-Ine5k{Q_P4AEeQ>y0~`Vb!%}FJivKah0JJR$xH@E7-v$7fu@-Q<}w# z3*M+W!imzYhy|-YJl5cB-_bUOYrkZgHcb=+*VUNPaIH9kJ-4}?GTeaAChR{~Ags_s zw#`|GAL#=|n15E?)r-It$j15s?h&9|A)BPzU6N=Ah)DuZs1k^y>SA>)6GL+@Nj_jJ zD&PrKR@_bEr6^tHGeS6zXT%#cS#fd6axYMO=fqx+n#FBv3TS?_y;jeprC8^pT$)2b zcvig*=4(aM6{i(u7wwHw7!IhRy7NVNBEYB*TdT8*g3afnE3?KqB1*^eg^ zb5)jnt1N4+NtSVIa-pCRo?)x`{GZF8DJKQ~&SaGwuFm=WWoULlF{?8Be@@H9}M-Kdw-m zhq+9<3%-0h5W4($+jz9rc!7dnxDpr^-ZBB(NN~LVP$RXw=1m8Q8e_^{hjA&@Fospd}<>aR`fwIp_Se) zT{j#%&W(Fa8-HA9bPXOmY7X5kFCMsxv!BI@&bVB$UvdqXRX5QUITho4hN@j)_)n#S z3uhPu(bo;o9VeIRNDGC5^$q*@9HI!VoxO_sT+b1Pie0K_Jr-WPN#& zG_6=wG;(AhB9A%b)77PlS5CzP-NhN+$K8qKB6>%cznMJay;58{==H7b_@Ud+pC((r#7*A^GH+y!Z0^J-~ksKncZ7%tqYi23>{i zjA(O*0-YC60XbiAQF5DmIVI7@Y@Sy*E9lgG{9rw_xl8PQQ%oO|YQVXl^KRMnrE=5L zc|be}=4O|Af|VjpA43wHUA_2eV`>=bJS5(^x?&~u_VBSuV?lCz{+9KAz5VFAZTkpx zKC^_;k=JxSVk?l0{fd6j(8S$nNnm}kRSSrTCn8@{(|a#gxQ(#mU#NIBEBkn+VJ|Sq zOwgu-SeBch6ETgmZHsEMrB!MnU?_~FihU7mnl%@Y?Qhx6K<(SjYQavEyTa&N#l-MazPgMuPw}WU zg|bmniOV3Nw5a021L~A?XkGy@gIP>1krkqpLc#9w8c`wkzk-M9@F%)Go&M+$ceSv4 z{02?1i5YfHmJWZTu26Au#w=FeVv<)9yZF7a_W31EK@F#B4CWec8kK2#j_Jv zXuNaMqgDgEQR9UD*9&Ms z(qXVX!D*&YC2VKRD%0Ev{+DVY-1y5rV5}m}nj?x;+}=ca-y2iIIKUqFM#~WNrb@L} bi$(qcxRT-hev-8P00000NkvXXu0mjfhSx0I literal 0 HcmV?d00001 diff --git a/gfx/trainers/rocker.png b/gfx/trainers/rocker.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..70ecf4e8bdeb20889b55d98278c3e355479c64a4 100644 GIT binary patch delta 446 zcmV;v0YUz*1Iz=E7=Ho)0002TU3_Bz00EOpL_t(|+Ktk`O9D|G0Pye2#314>^@N79 z*`=VS5T0gj!Ij-D5fl*)j{O5dwL8?1o8sb+!GGZ}ZjnMG9L3$~seup=uRHI(yXV#o zkNfcb-jDAOu$C_P7fD zMc3$*{{|)%Ef{*|6=5@|5;e-}E%fbK%Q|N_Veg4~Rpi~MU)t@=bCTSR-E1#PO3tWr zyg;fu+fK3z=nNi of}2cx$oh#}1a)1y8@AYvKSUN#3lrbR9RL6T07*qoM6N<$g44g#Y5)KL delta 416 zcmV;R0bl;i1Fi#*7=H)@0001=Sj#K`000b7OjJex|NsBSLSsst0002BD@W!4000DZ zQchF<|NsAOC`Nez00B)&L_t(|+O?L+ZUZq4LnZP5|GC;co#ax|K#c^x_zktti`hR6 zTte^*vLHl*$RUA<1W}U<(y5kQQ8h>o6=lq?G4N`OXq^3Og?}vhMY1S5%MYBZD-4t9 zvS3>Y3u_FAq}`V7_mUad=?u|ehU<+xn_<E=fLM zD=Od#RaV?h;-x5Elv~BvE&D1#|L=+_9Kh{0000< KMNUMnLSTZ9rM_VR diff --git a/gfx/trainers/student.png b/gfx/trainers/student.png new file mode 100644 index 0000000000000000000000000000000000000000..d4120cc8161b7610415d68cf3712109a30bfc3dd GIT binary patch literal 718 zcmV;<0x|uGP)@>0gjIwo+2XERg9un zH@mSt3NzPQ@uyC@>UzZ~h3obZmL>Qp-7Bv45jTo#8h$C?kF?h2r3vZ-T5Br28-Ajt zl;yj7?{hz%a$|4T58}~TKi&Sl_XwdYgoxH!VL-M$b6u{7J#4LLd%w2nuzlMjlTQs^ z;eeB<&hiz}*-a&EQhRHBxs$Lib$;>FFx}Dp{Gsp7);9c*r1v?_0e>J4l}X~0Er(O_#QVt;}fDm ze~3xSFBsp)H^oK8L|gshCT|f{R6iBLQ?1~UaG&zII@F+RuBZu$0uT}wn}{5u*h!Wv z)r4WUjSFm*+|7(JlgoHzma6jKe?_f{17?xfbJ7Mdy z^pU~U={OiI<&<+(!mX%>D1aB=lYkt%y7-CCGYfuKa>`2-z2bT!)m)(bC8A5N@jD+O zD(7;;jZX6s%F8o5!=Et}BHiQUr#TPd&;0Yt7pPUCSyPc%kpKVy07*qoM6N<$f+@sP AQ~&?~ literal 0 HcmV?d00001 diff --git a/gfx/trainers/tamer.png b/gfx/trainers/tamer.png index 76a1e81afa9f6dce97c717b48ef8607c003d380b..14fe7a536db074c7581dfd14d4eb92e27f2fa3d5 100644 GIT binary patch delta 553 zcmV+^0@nSm1GWT^7=Ho)0002TU3_Bz00I3;L_t(|+Evm$XcR#d2k<#I-g2Uzm7pmO zBt=Xkn)b{lhz4v{IK;vtAQJFEg4imHSZE>S6hsniRK#S9h#IRHHbIV4MCQaoiGeE& z*vZ`P=00%d{?5+M-mOzC{O0ZQ-rM&GBGy@Zp3NAx9e z;UYfHDh9wfPL#0qcEIZ;_`iha{@Qj4%^@@5Z-h4w<`02URmM-y;^pU6L{&&qG^XCX zWMI$?2_qZW=V=Bk5F?B`n(e?0e;7!<6(;D?4II~$Wq(XO-9@2K{`YPNw9nvAf#Y*R zO1UGPc0xF>(X)a+Ps#sc`MPFcLf%u(`IH0^qMn`mchB!h^pe1Fba`?Kx;wWH)@}ff}do6=lq?G4N`OXq^3Og?}vhMY1S5%MYBZD-4t9 zvS3>Y3u_FAq}`V7_mUad=?u|ehU<+xn_<E=fLM zD=Od#RaV?h;-x5Elv~BvE&D1#|L=+_9Kh{0000< KMNUMnLSTYyguYAw diff --git a/gfx/trainers/yujirou.png b/gfx/trainers/yujirou.png new file mode 100644 index 0000000000000000000000000000000000000000..02a8cc231de97ed2c43df8f6488a0685225742ca GIT binary patch literal 802 zcmV+-1Ks?IP)2wc5e^B5R6exRrQzX`+OFM7CHivNfEqno0vA=4zd?TeG=Ql52l}-9V?awO zrIhTalsp5}sKYR|*6bx9K0_?}gosG36>IuuRjswwT5qZ-%5Il)D6NinJ)x3DDR+Pp z7QK^IBv4u&k4#ldAvHcwnNAQP9@!7@Xek8{d+%GHw$^}5RcXHq4RlgD##nI}O8;_< zL1QK9=|nxiaRStP=jbU76xpzKw|DeuqNP+?Zz{T>Y>a`Itu>!dV~mOOx0#+z|Aa;T z(v#~w?&;Gh2GVxT79@yOAS*?N&mR1E107uOTB7zpxz9V@VgS}PDww`Tmfgzl$RKf^ zx>(mx8ql>L@Zlk^suo0<01B*Aq?&U9Vr#P%5ObD_M~S{z$z%FB9uElO;M{qs6iQV^ z_I%u@yr1mg1Y1Fq$&@C1u#e{33w>v|DQZ7Yj)>pAIEP+L@&5I?Z>$fJllMqGozq_t+Y z9AltHa43a7E>EYCZ2)X9B0cDw#z%m9K&Pm+@%~(zk|*!*Q5bWzF(!PBZqZn?e6ksB zPI>&Vh;Q$oU74XL6Me7v*LC0Gfi~xtK3ZgH>8Gy{qEnva?rk1`ZsTt{{n6YccU%t; zADcaK+(fJ6fqDd|4nvm<(eJ(=4PJ7r!@lp5Oq|nOYiQU`>h*QVrfvD9l$ad9^m^oa z%!G_lOADm%g>L`pTa#&`B)Po9M@ZO6lm^16j729ty4Gq~<3x6n^v*o2c*j1CBrHlM glRXfdHq)$07*qoM6N<$f;WD9WdHyG literal 0 HcmV?d00001 From 33676d0f1351bf7f144513867b3720195bdd4d6d Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 14:03:42 +0100 Subject: [PATCH 07/16] Decensoring the trainer sprites, elder pic This decensors the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. The Elder class will use the censored Sage sprite, though it's possible a demake of the HGSS one could be in order down the line. --- README.md | 7 +++---- data/trainers/palettes.asm | 2 +- data/trainers/pic_pointers.asm | 2 +- gfx/pics.asm | 1 + gfx/trainers/beauty.png | Bin 534 -> 514 bytes gfx/trainers/elder.png | Bin 0 -> 385 bytes gfx/trainers/fisher.png | Bin 599 -> 588 bytes gfx/trainers/medium.png | Bin 615 -> 634 bytes gfx/trainers/sage.png | Bin 385 -> 376 bytes gfx/trainers/swimmer_f.png | Bin 489 -> 471 bytes 10 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 gfx/trainers/elder.png diff --git a/README.md b/README.md index d8a124b..042e89a 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! diff --git a/data/trainers/palettes.asm b/data/trainers/palettes.asm index b123e10..3321609 100644 --- a/data/trainers/palettes.asm +++ b/data/trainers/palettes.asm @@ -101,7 +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/sage.gbcpal", middle_colors ; elder +INCBIN "gfx/trainers/elder.gbcpal", middle_colors ; elder EnbyPalette: INCLUDE "gfx/player/topaz.pal" diff --git a/data/trainers/pic_pointers.asm b/data/trainers/pic_pointers.asm index c9c1fb0..2620901 100644 --- a/data/trainers/pic_pointers.asm +++ b/data/trainers/pic_pointers.asm @@ -94,5 +94,5 @@ TrainerPicPointers:: dba ArianaPic dba ArcherPic dba ProfBluePic - dba SagePic ; Elder + dba ElderPic assert_table_length NUM_TRAINER_CLASSES diff --git a/gfx/pics.asm b/gfx/pics.asm index 3a5efe0..9a0a7c3 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -1045,3 +1045,4 @@ 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" diff --git a/gfx/trainers/beauty.png b/gfx/trainers/beauty.png index bb483129032cf96053ff27f7d3443bd8a707111a..ea1a666d3124e27a1434bde3fe520de7adb52522 100644 GIT binary patch delta 465 zcmV;?0WSWQ1cC&RJAVPONklYRKt$+Q83M`@&g*Q~ zn3yhf4P+c^F!G3P&O=1F(M=S-^i2!Qe1elcQkA%CDpY~OMqgwBSH*j*J9IFn9(w#8pajTeYJNS;xW=_6cO1xhsUnE*(lYY>Gp&S#M~nd z!o&45ZK{x>5%!=9HbGdD^8MJ$Zw8Z>;+S3cY}z&FeWy^{!L{SJq>czH45l9};&<_v zogrAZT*j_x#ee&r3WCJ6PpFBEC-umscFwlTAnr`K7!kRRv)|O8|HHc*C5-kMA4eVg zU`{C?k!G7`k`L1@v%L(tN((D)%q?Xufcf<_>9PDta#S+GoL5RGQb8Mj zRatUaLCgB*UNUw+D*UF4(4{#Y%cL(WqSNKXcw2-GuR{d?L-A zII1@%dc5Pq2A#Lw@300005CNkl-7R00000NkvXXu0mjf`1JDo diff --git a/gfx/trainers/elder.png b/gfx/trainers/elder.png new file mode 100644 index 0000000000000000000000000000000000000000..df7e3e4f4b2b4e68b262bb112e2f6b80a70891d1 GIT binary patch literal 385 zcmV-{0e=38P)00003XNklxD3m2($COfEz6oMR9DMHxT?iCsdyOAVs&YplKD$q4JVs+WCbAuZaL&Mf$AKv+p6BG z!shsRAB$(lhQJl{YlwHl(+TzXJ#_pRTs?OKef2t&p7ZZu=XeFZPS`2vgbnp<+=ry6 fcuw~(|LOk#yt4?scqu7P00000NkvXXu0mjfSca_p literal 0 HcmV?d00001 diff --git a/gfx/trainers/fisher.png b/gfx/trainers/fisher.png index a39f10d5788a7ab2c7d55d99e81561d39b933d52..cce1768d698271119e1e286d2c092a8a1fc2b7fc 100644 GIT binary patch delta 540 zcmV+%0^|MH1k41GJAVQDNkl7N|9fuvDH^qt9<_tKyc4eo7GNp= zc2LG&Fv$3dI`$c53`5^@1trY!3(3aGud}Z~;Re{yx8&IA$M}fF92~s2NLC&A7TD$! z97B72FYeUV4ASCTa5w3Saqnd7CBzM0LEWO34GysR zIeCd~O2}OGNPl?!6K?V1q!xU{6ssE+n0hryuTq|=_T3KT3VQU==M2r2i(GZOLcJ7b zkhcR7*BnXU`y zS)pCVPY0Vqj@?h`pl|gEqU=FGoE=!O2Tglcw0{RNiGQ}_KtC@n^}ucR@W|T@$XK;T zUrGfzW&Chzk;edOf6ac3Pf&Be)LbkUM8L0V7A z$^5BrGj|9(bq95g16YNW^r<<8`qmk?s(M8)jM*Y#`@Ii e`^&Pu{S^Qp!3az#dZcOq000000005@NklUFFMrcG2p0#=PAb^e*m_~h z0OgbpEaYDu4Rr?PciEvd=Puw0g{xc`cXkE$DEt_yVA2hq^Y6(S6AzYQPotq7n#+5W z`aN5f@p2f9%{qYQX}7AAuy4x^^z|}iWjb%)de}!NyHSZeTcsGJPUqd(q$|d~lckps zH+ThgiJCSzz<=iFAf#_=q8vH*90-)g(Pjd8FEZJCG~ryN5oe z#}&&(t~y+yo(eO_+kuE|FiM-a=v>Y@OH9H~L(`P$Ewv@dA-^CtQY}O_X3yul(8B2H zVMIhSwR*LLD;}Ung;p6q9c&Ugc8}6QU+NJ=*@J#KJAbfX51RHYY5xvl5^c#F{k*i) z1GibjBW^b!W7ZmVDJA3-@x!T=3uU+0186}%fijqVk_Tva3r?zHgdt7$5tIAEopsDK z7AK2QMN7T}X+9+<^QXGaTp{e#9n?7vU|G_9jzIEyubQ+W)iinh{zAr@#mOaaTyHA5 p;!!VG?;yx|80%B3?=Q>t_5<6L2t#GBw3Yw>002ovPDHLkV1l?y2Iv3) diff --git a/gfx/trainers/medium.png b/gfx/trainers/medium.png index 4828a771d961719521c296e24fc35f1d2b2a5fe3..8c71a8e75b9ff7cda8b4142a48c6b819fee8d632 100644 GIT binary patch delta 586 zcmV-Q0=50;1o{M!JAVQxNkl_6{ z8GkjQqR=%-{U2~7XNn1mdNq3iS~`t)AeK}`NlG({FWSZ zMb?s05iZns)ILS1RDOkQ&9ZZL0tcbWiRu#^0}G4+53Q!hXnn8jeeHigfH@76N+lYt1OtQhG6zYVqbAjFJ~{}E1K%JL zYlhh5^OYCma#esFBUQ}>Q~#DISdc5mp}c^cd3qSPK7R;@6U`D!OLGFuTx_B73QlrE zML8*zGi$j|>_YjYG1b@|wwb!@F-{|v+}uuN-q7Y;b+IopRfdh3a4aRY0hb#R4TZAY z+=Qw1+GOSj%uzFEx`A2pND>opHx^-qR*qr^-1{9gt>2upaM6#ZyR7gI>gOXSH%cBH z?HSKZxI;b$EMS(8c%yo3Nz%dbrkctgc8NBbEB35w{m3&0O-y8M?FVjmIokS<&rCPq YA9Fzo85-IR#{d8T07*qoM6N<$f>k09UH||9 delta 567 zcmV-70?7UP1m^^hJAVKKbW%=J|NsC0Z74>000068Nkl zCJ^LAY=7LGZ5=w}XOd+TE#?0mwH@DbUy;JT0>8}F1J=JT@!df#;7f|7@&dl&8pQ^3 zR`m^6S@kXaObKDA?fW5E2vc$4Kw>BP9J2iabOK)d<5nqEtA8}N#bhqPEtxKMP#kmu z6j$MY8)9-*lSZNz$NGtJqt$_R_=7;_OrstL>{WWN)H!62s6?qfF@YmX`Yr0xEGuUV z2(++D7AePU-&l{GFl~!Pg$Ko~&Bea{w}YM-Jlm>LnOMDZTnDQz8~M66+om=Uki#RG z@8tj=tSYVrtbYtprS3d8+-xMfx@HA0HGQ)OU3Nx#QRT*}SCAv;-eh%j%fsLplS+}* z)cU;ub7m>i>Z1flFtFB2?J%ydaVBZf>e}giK-G7F6+_xuEp;NNs{*9&>w%mw>MjxR zK+YI_ouJRW__t)K`bM6GbV>UJNM9_bQ3R2`p&GC*P=9(=Ijo8LhcVT>JIENa5fXPJ z*16nHbibkGTvf8Xc{X<2$vAOf3dsV1+Xph$jPAI;37PA*$xIKJq9#tNfed*|I_8f8 zTaLsIx%wy;AnjMsa((8+LP=kmZd2hN`B_`VvF_BqH`RJ{QUZUUYvsb1a@B=bg2y307f^h%<002ovPDHLk FV1kI#62<@k diff --git a/gfx/trainers/sage.png b/gfx/trainers/sage.png index df7e3e4f4b2b4e68b262bb112e2f6b80a70891d1..1eb7f84b58c36df322cc6d08cb07f67b49ca1a45 100644 GIT binary patch delta 326 zcmV-M0lEHx1NZ`vJAVNuNklCh)kliJet<807*qoM6N<$f*=;1L;wH) delta 335 zcmV-V0kHn~0)YdNJAVKKbW%=J|NsC0Z74>00003XNklY(-R+=Y^l6Lb*=ecQ=`2Z=f^IqFG=b_Iu-mHM zs>0^@cpr;r$4G|274&O}cf->O_4qw>{1;q3cLRO(I+ULC?_lS61-(w#Dd>a^^=#aS hq^EdJ_b>nH{{XzR2)%eIDNX|(yPcTS%;KV7g2JkU3oD)TxBPMghObkHalQ?oulw@!#SdNUG z;1Ji@?&Kz~4p~iSTx04kC?!@(ixW5`owo*xi1B>-9S$Lldw+!>Zx4wMOspb{>_2q+ z<~WFoS~2M~v51lZZ4fmYv-lCIoQgo!R&1aq!N$xOeyk4xUbr!O6IN!j7rzNL^jSvU zp6&%?K+n`=w#BYAPP(#;Z7||G%N1;)Y6r(fWUe$rVqTg<>5z6-1eXDwwBg;}T~g2% z_cmrU8AWABX@3$_f;whU3u@&^Y#h_CY~?uTNX&M&#mdd)YY$ns5^agv3(GA~1rhbs zm!Ms%Aa{UTK=m$uyTq0=z-NDo)QiC?RwK?H>(#7isx7)2sHCd40Vr)(0nwsMisGy| zwTQaKDLHNrQwsTTS;2D8AQez))A{C9WWntNCCr}vbRWgnS!!+vUU6TJKY)M+ydv%+ Qa{vGU07*qoM6N<$f;khxiU0rr delta 440 zcmV;p0Z0DV1L*^hJAVKKbW%=J|NsC0Z74>00004qNklJIyCWkfIK*|foZRHqA*<<(G^Xx?QevgFIDdgd(s^m1h#1ei-{BC_ zxK{}B@{s7j#457L{-D#D;~*+(#iY|jRK=pEpber%W0oG@9(gLKB9OHem%zr%7#=&A za6USOl{hkw3pMmvM&3PLOF6L{woF}STkJ~Xq$|tV1|zPsq+knGhbp7TWUlmv#QbRv zU5B)@BDfpSNq-yO?cF5>ZIQPzqsb^LJ4!D>C8%QtwV+mxi;ZLYm8~4-I})>Pygms~~rPT0r$Ke!IkWXMoTC6sZ@3RjfvwJ=UvP(NtS> zHBd=aZ39r+t^%S(mlVZWacU8Di&Jvk9;OuX;j)6|o-sixpwg!E&8fHrw-1ys`|YPI izRpr}JMfD8a{K{dTL!oqT>4}H0000 Date: Fri, 26 Jul 2024 14:24:52 +0100 Subject: [PATCH 08/16] SageDeoxys Sprites 1: Paradox edition Adds a bunch of lovely sprites for KEP Mascot, Bad Santa and Lesser Smilodon. --- README.md | 2 +- data/pokemon/dex_entries/flutter_mane.asm | 14 +++++++------- data/pokemon/dex_entries/great_tusk.asm | 2 +- data/pokemon/dex_entries/iron_bundle.asm | 14 +++++++------- data/pokemon/dex_entries/iron_thorns.asm | 14 +++++++------- data/pokemon/dex_entries/iron_treads.asm | 2 +- data/pokemon/dex_entries/sandy_shocks.asm | 14 +++++++------- data/pokemon/dex_entries/scream_tail.asm | 12 ++++++------ gfx/pokemon/iron_bundle/front.png | Bin 315 -> 532 bytes gfx/pokemon/iron_bundle/shiny.pal | 4 ++-- gfx/pokemon/raging_bolt/front.png | Bin 796 -> 674 bytes gfx/pokemon/scream_tail/front.png | Bin 315 -> 628 bytes gfx/pokemon/scream_tail/shiny.pal | 4 ++-- 13 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 042e89a..d1de8d3 100644 --- a/README.md +++ b/README.md @@ -116,7 +116,7 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co - 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) - SCMidna: Munchlax -- SageDeoxys: (TBA) +- SageDeoxys: Iron Bundle, Raging Bolt, Scream Tail - 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/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/gfx/pokemon/iron_bundle/front.png b/gfx/pokemon/iron_bundle/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..f5f1c773c9e03cc2ddc186e755d62ad5fd7bdfb1 100644 GIT binary patch delta 498 zcmV8uG??J;1o10|5CTU|@gzpWv=YxP>(d@!F^mBOG2I1VKe3V}4!3GV4Vc z6K_v)cfj{(abF1%d8pzayazH7Iz|!XgCN1G(tJ0<|E2>8yno&qEaeIanl8Ze?xG0B zSC&oecwf#|z}r#QMB(ruaZY^_SpKcTkadi=3zXV`n*u$A^{{dFiH(@C0O}y%f-wBZ| zl?v4td?PSnRDVkkLUdxyIfj>Q$*k%hXcEf9!~@b>Uu8y01Wg`}KlC_XcJrGD;@3Eb zl|7&bUUJ%UJmo>CT}1qvXGM1rBHSHN)RDH$f;58Hx^)3wPy2MszF=LhjA!f)jGz-J zTkO4My`+?==Hd%NX)gwQwN%5i$08XzwY@~wM5Kv#sB0vlM&YrS;6GA7#=sVkzO2A9 z;CW{TOM17B=|FGYUw9@I&Hlu5S7wG06fRdO@uOI|HF4Sa_QB4*TrF(q059I;-tI2c oUT@s%UAF>Xi~jT9ng{nhKb(#UIC}-Iwg3PC07*qoM6N<$f>b!}h5!Hn delta 280 zcmbQjvYTmwPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{sB)H$B>F!Z>Ku)9X8-# z3H<)QK2P+jsoFi(MIn2qBpWGj*tqc~M}$5@P51#(#@75l>h~5_%qg7vpjqMRUIvj0 z;XiS~f6fVfeUp9qM@G;3er2(w{dN8Ps>{OuBrZ9$rvBK{h7}oM{WF=8&Z;y1apC3h z@u)H=-*!ZQ?E~8zThGasWL3;rwn5>?W0yQu(I2`+Zf~zSwwkPx>{+KM$rQMuBxlX; ztZOrkmuB91usBfu=ic^3r`7XM=pK6g@vYtd|35r!7}x&dEdH$=6%F(ZUuuMBny)W| b7Ld&W#0(6A3=EfoCxcj?u6{1-oD!Mg-Wq}SX*pR_{Y-mglV1LGUOx}}<74_(HSfgWx zXg+WXNGa^uKpp!$U3oc1wIrR|3GUSj(BSp3l)Rzf+!Rz1apBl91Li(M-%1$yyjAHZ zSd~eqWQsi~Vqj&7|8?1N-3riYc$%RlV0 zkUfRpd*sC_;C$Pw{;}koulwr1g@yU0y`7NP^x%Ze^AM5U*$R?G*miqR{;FPRYr~df zffuP}tSrIN&^)-ih=!PLEq@7(2R2*j4unp{voYd40DpmOaMuwBy9H<0fCH`(KXc6Y z7o4dV;W3`#jsp$O&ptEi<)=4jh$ALuf#U`o-JZ3)BRf%!c&4b|Hf6O_fKn*A@tH+& zsV*Ts`C2+%PUxa`94^(~qV|h}xj0J{Y{B&rhd6=I)j1enKqzM9s;l?ltiig%IhbFS zMt(A#s(-_CLos>3xsuW-q1Tf?^BoyI;C922;$#A^DqA!b*VE=IGc-57LGj@9!V_rs zg!Pzx_yq5_I9dyohcbi*r<8jT)kv7Z^KGap#oEm-`^9c0!LfT%JfUvhwpDM!Qgwap w-3On#_Zhx7pWWEsyaBv59>4z!c#QD}*pm#uBoDIr#{d8T07*qoM6N<$f;1*SBme*a literal 796 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ_7YEDSN0do{6dN>djtN1gv3i+ zBT9nv(@M${i&7cfeO!RXD3qlZDH!XS6t*sT2vovRQsCzflraXf8N3=a<$)ASx}&cn z1H;CC?mvmFK)ykMPl)S(5a5_&FcqYb2oQ4nSQJnhW0JSK%m1b9pN=vxFgbX-IEGZr zDGlkK+HAnXUBTES&hd?Dg^7h>z}^6_&q@7r}*?w|2*`g>TI$XZv7&kpxv;d zmi_mW|4c9KK4*F|zlmSTJ7;bFx2s#lw;i3<`;yzE^@`TK{3};IOm0~0Yq^qHT-e`H zf2PCFdj;2l`WYVgZ`jWK*Ep%g?ajpZ9ChYj1=gAd1s@8Tud(ugPu6?QsJmZ%Lu~@z ziL88g>AvHiqZ1>gYW}W#Js~vwh)(93UstX!QLD21cP6d3<%9jffck0bic5-(6&=u>XVU5}oeSDwcy)s~<^h z&zte0&RrthUFu2L(ahNk-Wsh`t5ED+7a$#TY4xYq65J1amb`v&sJ?7UP^oQ^n&pM_G64RRpU7zGXRw8sFgFBDiH^ zXxiqi3^Cc@^0kMQvnOcrUAeMnmuINh9M{7=6Zwt_Z8?2qRgT1oiHqeW!_F6qCdcwe>ays!KBcKd)!c?a@Na;^rYKTlUbmvv4FO#tRN BSxEo@ diff --git a/gfx/pokemon/scream_tail/front.png b/gfx/pokemon/scream_tail/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..28ef7ad717838cc3c909f015aaf55090e0acfabb 100644 GIT binary patch literal 628 zcmV-)0*n2LP)U8z*5R*7Fc9>Afs z{~DNsWBf|luigUt_Le}6zcCzOTO;lJiAFEY%RoMHJvt%6Uz0 z=o}YRsLSP^Fp=}A*5~snCSeD$&3!ka0)m#3sKDqcS3=RMzYw_gR65rv7T7(ZPGuMl zcBu}swh`UAfIf@k{!|IkiJpdmItN*(fHPhZq=cqf-_V&k2RAY&mVeqD!sPJ;*-yzk zR;5gw-6oE`PfJgA%^-5U*%pW%TBH{Cyzr<`Zt8@^{jb}Xh*KIs zdBCD?_%>ivlE{HF^-~Sejz$Hk6(zZo zZ^ruO86CN^>DcE(`sOEYgs@6jG}FYDB;)fNS8hlzzp7I1BYvj0CP4dDx=HKrpU#8J zT!a&!bi+@lQA%U?v8(!!?$(!H#^S)=IKC|Ddx3)D$0NBp`aAaS-5P()91D=Ew9{|^ O0000~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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 From 6b12b3d992b63842460e8259374f278c1658acf1 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 16:55:36 +0100 Subject: [PATCH 09/16] Lavender Crypt puzzle maps The connections between maps, as well as Dokuroar's boss battle, are not finished. However, everything else is, including the warps themselves. My brain is just a bit too small for a puzzle like this, so I require assistance. --- constants/map_constants.asm | 4 + data/maps/attributes.asm | 4 + data/maps/blocks.asm | 12 ++ data/maps/maps.asm | 4 + data/maps/scripts.asm | 4 + data/tilesets/lavendercrypt_attributes.bin | Bin 1808 -> 1808 bytes data/tilesets/lavendercrypt_collision.asm | 150 ++++++++++----------- data/tilesets/lavendercrypt_metatiles.bin | Bin 1808 -> 1808 bytes gfx/tilesets/lavendercrypt.png | Bin 4849 -> 5134 bytes maps/DebugRoom.asm | 2 +- maps/LavenderCrypt.ablk | Bin 90 -> 90 bytes maps/LavenderCrypt.asm | 4 + maps/LavenderCryptDokuroarsRoom.ablk | 1 + maps/LavenderCryptDokuroarsRoom.asm | 20 +++ maps/LavenderCryptSet1.ablk | Bin 0 -> 120 bytes maps/LavenderCryptSet1.asm | 46 +++++++ maps/LavenderCryptSet2.ablk | Bin 0 -> 120 bytes maps/LavenderCryptSet2.asm | 46 +++++++ maps/LavenderCryptSet3.ablk | Bin 0 -> 120 bytes maps/LavenderCryptSet3.asm | 37 +++++ 20 files changed, 258 insertions(+), 76 deletions(-) create mode 100644 maps/LavenderCryptDokuroarsRoom.ablk create mode 100644 maps/LavenderCryptDokuroarsRoom.asm create mode 100644 maps/LavenderCryptSet1.ablk create mode 100644 maps/LavenderCryptSet1.asm create mode 100644 maps/LavenderCryptSet2.ablk create mode 100644 maps/LavenderCryptSet2.asm create mode 100644 maps/LavenderCryptSet3.ablk create mode 100644 maps/LavenderCryptSet3.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 253913d..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 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 931fcbf..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 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 6b32af0..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" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 092ab19..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: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index bc6fbde..7e5230b 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -596,6 +596,10 @@ 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/tilesets/lavendercrypt_attributes.bin b/data/tilesets/lavendercrypt_attributes.bin index 779572ee02f9ece282319809191f5423b69d9c08..1ad86c7db7c81686afd8facdd58aa1f0802533ab 100644 GIT binary patch literal 1808 zcmZ{kQLe-w2t{r3V*1f^4K837(FM#>X8+%hD;&{w#)KjlxFTw=YaJWo&nJ6~5@Xmq zi0j?#S@6~$;}qUM1l$la7k52{nC!btDYcf8)t~jc>WQtH5b8*+tXbSc6>NWt{eyqe zy+Zntdv_$ekt-Wk27gS*hacPcY`W&ombf(fcZnNOhNc5vysQ`Y5-ZG_)Vnk@7@wKm zJMz)NV_qHGIeKhH93+{)G)${5r5Sb8$3|AO&c%5g%H$k8zUOFfb7HtWlD?qHyYt{b zj@L`_et$j^s>P3v`pleft9l3XS`s{dYju08?(-P%0wj-D>~DiNQcw1Q#?!TtfDb-( z$w22(zSnt==k&-MyNLqHqh9nAcLW@rd?2oKJ!ixwDs6Tqojrc~b*EYb-}lxeX2-ks zbHi_B7T?8GnclJHDa51GGe>E@4!nsv^1!XaW~a1mh_8_AluI1(odjo&nK;YYjJpxN%MPN6402*`^;Q#;t 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 a225086164369a066d374baec8b75b6e4a30b36f..1619c258e2f366f5e768fa775afff2ccc7e83e8f 100644 GIT binary patch literal 1808 zcmZ`)OOw+u3~nY}+RP^4G@CwV8<^SA0a`dE2OjMVOLB&5>#^bg{|lrj-#TqUt)fV> zWLXc#n14fgSN1T8CXvZaP6PD(g83&%l*Ut{;(-VhT6p&ZfZs9i_+gB5g5EC~{nA=v zdMv%?KkF5|fB(Vz&tII2r_L1*&JhVhZ_G}7?ZErJF?;rfI0ChnXpE|PHJi3U;tLe<_`UagEBQz>lW!}ckDrJ%Uui}J$*Cbaorzk;1EpD-ZL9D@ezE_+ zFF21+l24+V?b}Xl#~k>h2vybVM-Ns71@?hHW+)g2{#ZAMei!I}{v!JQCwQovc-nRn zk>(EeLs>oSnD6s~b*MAy^*;)KA6-Hl@CG zKE_<=4)BZpt|N@&=O0CJfA9SxqkqIXK)*l7agr28vhkk(<9hWjB^>FcV6T&m_2|O7 zv9|53MZCx^;zL~EL2u=#Q}7^?OAc0iuP|tR^*#cR6@iy|lUWmx9QU)=1%0pJM^j5* zA)nZn`C+cLZqV}_^7?k@LmJJoPP$CHpu{)^S$VkvD-nlMtO`<Q?sXIAynw`$usy(A_=#Rc03$vgn+|*q4gOr~6gUq*D;GTj#_%Od|=G?YQvyAVv zszQDd7v^7MM67{Ae|Xw>(dhJl|~c0ipqtB#Jg0 Ia6(n`7k)Mc1^@s6 literal 1808 zcmZuw*>>765RCu>Qg9H9ZS1f$)j5Do3O#)wp#ff#m-d}wr~m&K9Wh+QlCkCSozbis zY5g??UT~m0aVK<3x6F|axJ~#866WQKF`ce4;LyT*aU|fBa84hs^W3hY2x%4Jey{am z1w}zG>6waRIxC8o*E}y*^1Rc{b7Sm+UhCBQN`Z?^>x_IM56Aa=W6l?Ash!SOWX|hE$LJIBEC| zzdvvf`iuBS+@?N0*?vkTRh-zkoCkk}C|88&bcNX1^xs@{XMdz}3dBJ^;zaPs9QJ?y z8uR(jm=aN&$kuI5N+tiH-5w0J9t?#T46pT8cDXoElW0WbqBWawGCK9Q*_3KDvXZX} zeSmNH^Gl_NZ{zXzpUdU1&33azS+#nt9`&Lgyu#jQVB-LzFW^$$H{#^64?X$}UaQw@ zQLjgn(u?dr_Mtz(;K=8iU+aNgf9%xR)8g}o9Cg88>qJtuT5$ph1P(dQ3--@xnr8F$ zI-ApdnF~QMT@#@mf> zZ63cVF677q-Z_u;8|z&Juj*BUFbHAiRfTZKN^d1Bg&p+FFOjw8ec)1g)i?=4oQqeL zDhS;?!QScF9vJ5cKe&(ZbIq~Oah?a44`bAcI4%$5%ku>Ph>QKV{<*Gezu12*M?A=Z z!Efc4{YO2H^Em>;9`Uti&)m<+LaNm+PVB@TYA4lZYwv@UbT4AeKjuVA>PHM@ HIZOTn^6`%s diff --git a/gfx/tilesets/lavendercrypt.png b/gfx/tilesets/lavendercrypt.png index 2df3a422e5bfda8663f7f4cfeba55ab7c2c645d2..0f051ef986268ea9dc30d277ac121c78dbdcf0b4 100644 GIT binary patch literal 5134 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 delta 4808 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 X&PrB)W8@@A{gU04o0rQkxyAe+KKuOT 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 19fee8212093a2a339cf5528b9eac6759758948f..078edbec82fc75be2370956c4dc5306725774a41 100644 GIT binary patch delta 20 bcma!w;$vXoVdrAwWnf_E;*j8*$mat96s`gt delta 20 bcma!w;$vW7U}R+EWnf?zWRzf<$mat963hYd 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 0000000000000000000000000000000000000000..206dfd97afcd26dc07358c2a0f4c4977f90c9277 GIT binary patch literal 120 zcmY#0F)>kPV6e2dvQkx-Q;_3lU=ZTtljc|FkPV6Y5O2@2HEk+9D%%%2>d5tR;N$Am{~$fu+zgV>P~ zX+R1Lgc3v2+1c2*Kqd)A2J>_Ci6)5f@iPd;`tqxb$MZ>w1KE+mK)oQK%%BM*0A$4y A1poj5 literal 0 HcmV?d00001 diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm new file mode 100644 index 0000000..56c3088 --- /dev/null +++ b/maps/LavenderCryptSet3.asm @@ -0,0 +1,37 @@ + object_const_def + +LavenderCryptSet3_MapScripts: + def_scene_scripts + + def_callbacks + +LavenderCryptSet3_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 2, 4, LAVENDER_CRYPT, 4 + warp_event 7, 13, LAVENDER_CRYPT_SET_1, 1 ; To Dokuroar + + 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 From 4f3b61bb0745b64856f3282f7a1f845e4381114d Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:00:05 +0100 Subject: [PATCH 10/16] oop just making sure the warp connections to actually access the three entry points works proper --- maps/LavenderCryptSet3.ablk | Bin 120 -> 120 bytes maps/LavenderCryptSet3.asm | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/maps/LavenderCryptSet3.ablk b/maps/LavenderCryptSet3.ablk index 518fb02d0d7b328adbb70e4bc0acc166cdebd7e1..0732026bc35e0679b7a5f9653da912b52660947d 100644 GIT binary patch delta 9 Qcmb=Zm|)1LGttNm01znx=l}o! delta 9 Qcmb=Zm|(~#Kheky01x#7+W-In diff --git a/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index 56c3088..bc85861 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -9,9 +9,10 @@ LavenderCryptSet3_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 2, 4, LAVENDER_CRYPT, 4 + warp_event 3, 8, LAVENDER_CRYPT, 3 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 From 0089f7894b0f7f8fcb042f1559bd58c275352fbf Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:03:46 +0100 Subject: [PATCH 11/16] uhhh warp fix and wild data --- data/wild/kanto_grass.asm | 112 +++++++++++++++++++++++++++++++++++++ maps/LavenderCryptSet3.asm | 2 +- 2 files changed, 113 insertions(+), 1 deletion(-) 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/maps/LavenderCryptSet3.asm b/maps/LavenderCryptSet3.asm index bc85861..ddc8020 100644 --- a/maps/LavenderCryptSet3.asm +++ b/maps/LavenderCryptSet3.asm @@ -9,7 +9,7 @@ LavenderCryptSet3_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 3, 8, LAVENDER_CRYPT, 3 + 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 From b51fbdf75355088c3ddb465c92c3dea858da8f76 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:33:16 +0100 Subject: [PATCH 12/16] nihon cut fix You need to input the replacement blocks and such when using cut! Same for whirlpool! --- data/collision/field_move_blocks.asm | 13 +++++++++++++ data/maps/outdoor_sprites.asm | 1 + maps/OldCity.ablk | Bin 360 -> 360 bytes 3 files changed, 14 insertions(+) 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/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/maps/OldCity.ablk b/maps/OldCity.ablk index 5e98a67c423718f0a7ca4f6185df4436ba0a3d9f..ec410ef2f1f6ae9c76ef4aa01fe0b8b3fc9bd408 100644 GIT binary patch delta 11 TcmaFC^nz)^8AkDmXJ-QdA5aBC delta 11 TcmaFC^nz)^8Aiv6XJ-QdANU1q From b4686d5fb529d985c76f7a58ad24f7ab1039b36e Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:43:07 +0100 Subject: [PATCH 13/16] Two more October sprites Folage and Trebir! --- README.md | 2 +- gfx/pokemon/folage/anim.asm | 16 +++++++++++++++- gfx/pokemon/folage/back.png | Bin 304 -> 481 bytes gfx/pokemon/folage/front.png | Bin 315 -> 680 bytes gfx/pokemon/folage/shiny.pal | 4 ++-- gfx/pokemon/trebir/anim.asm | 16 +++++++++++++++- gfx/pokemon/trebir/anim_idle.asm | 3 +++ gfx/pokemon/trebir/back.png | Bin 304 -> 9050 bytes gfx/pokemon/trebir/front.png | Bin 315 -> 812 bytes gfx/pokemon/trebir/shiny.pal | 4 ++-- 10 files changed, 38 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d1de8d3..078228f 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ 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: Iron Bundle, Raging Bolt, Scream Tail - Tom Wang: Gold/Chris running sprite 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..afc1a9b76aca91232dbb739fbb9c17fbd6c89f38 100644 GIT binary patch delta 467 zcmV;^0WAKo0^tLY7=Ho)0000u*}nP!00F2;L_t(2kxk4oNE=ZY2k>`FPcenK6vP{n zp_4=2(4jaq?@bNTAr+hiCwDWHLWj~T4i35DPO`a#9<`)hvS#U>A}BEy9UTe=?}oOM zCLz8YFYoKScNgL}eEfg#|2_oqaJ2!!!vr@HzvdELy_2}Plz)i;^dBV1z>G1@aX^DO zan;Nrcr}(u*36Hx_Ir~+&jx<@QsP3d_d7vp=)8!b)vqxt4QY%mR4yRYx<~INRuJ`! zuBV}f#3@CsW>i30O``WX??P0apRpyz&W{ZIqXpfR;2V(z-}C-6q5zio>Vg6wze=@0 z#0lW8@}W70)M zi!*i8!K`_NS)kCfM27jdw!+aaShuh{t3dL8V2P*64Pkg;k&#g0Tr9nP@?6xC2aWAa zx4lwU;Ojpz`?N+BKp$s9(}4sX_U!-%DY79qjk^^2eN2GY^C^m&FK8=8&Z&&_FvVGD zghnmJ{YaxbatN_rm}H002ov JPDHLkV1ir?;64BV delta 289 zcmaFJyn$(gL_G&H0|P_C9nP&liYLG)#P$FG|9hWv6i)&28G>?msskyOk|4iep!ok> z4Yx`lf2*g9V@SoVqgMj?nhkiEFRa-2f3EsM$AuPUMlIL$HR^a-GLBR;zj$`>?Bdz( z=Ks|W$es}OsGILBDbpk&F(HmiF<{s2mX70#owhaC3-XFhG(RN#Usj@E-sYc6bU8hC zGkuP#W81g(^piS^Z4VEs)~Ry!II?Jew4Lb~og_A+{XC=S3&s;QD=b(QADPIvJ{43= z_|L(*?Ru71N50ro#rG@2AO7R%ju2&E6|NG0Pi^zs_xl&@zA68Jxy^^~nZL(bTc8j4 gQX@Rme0>?Tq<|a_AO?X;!IMFhr>mdKI;Vst0Bay{T>t<8 diff --git a/gfx/pokemon/folage/front.png b/gfx/pokemon/folage/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..aaa07c0784c0c99edbaeb10308dc524899815f2b 100644 GIT binary patch literal 680 zcmV;Z0$2TsP)in+YLzwW(&(NRmx z3n5=FU!J?XA6`fR*s?&cJ9)H;e8)2K(!MO502JU2k8{vrA6Q`X8V1B(HwjFaSpVfJ zkO1&2)<4)T>>nr3y8!4#8wZiwJ|=+7uY|bfQOvqu=pHGWbeDA((iXnbs;;s)6GYa^ z)=VIx>&=!$M4`3O4`;>0eZNKQ_ zF~Kq^jWM5qT;r_?kHxU=a_AZdVuBN6*YrgJdN}ex#LCvU9}lNQ_w1y8{b)_x*m*|0 z%ZZ4{geQ09t~s9ZK9*Ol*DXx3EEs(+mIbsNtg9{@E~KW~^m5g7Rdfj7STJB%hKQBGpG%5jBhET? zw;=aYxMf({&1&vxw<(&tg_#>1V(sQ{Xg5T)8{pi{(djqq&u)2iYO26?9m{BAXxJU@ zcBx~t>%t8QK*HVNodwg2Pq~|OqXcN_9(ViPAYjk$aJTk(9V}0}^_cvwblYZk{Fn$g zPPjO68?i>a-6lE?9X)<^a`Y|+;b^zf@z+y`YLip=ZwSZWcgg?uKj0@88Y@%AsmF5w O0000~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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/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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..dc25ab449f8eb82e06e42931ca2776ae1618c418 100644 GIT binary patch literal 9050 zcmV-gBc zaB^>EX>4U6ba`-PAZ2)IW&i+q+U=WJb|g8nWdE^>UIOM}IT+7*J9x|QD=>Ek8FOaU zUw1?X$#lA#0Xm3^DAdgU-~T!0|L~{TT1`x)=9aVNPi(RI&JWc-f7<=(Y`kCZpYZw> z|NrH6^YIJMOX1r)OMkt;^LqOBf%iS!`1-o3uiyCky3p$v?+XUq+4IBtyhvX6&+9I} zF4Xq(LvFQvUh44A_xXC`UCQgmz^!%7w52J#X+5w`w;!W11=@MSfr03WN(VEUiaoR#ohP%m0m-Q zHPu{8t+mzOd<$S;YPpqGTWh_0)45USTAlZIUKxIb5l0$%lu<_;eG)!1&NTBZv(7gA z@+&N0V&zp(7o(Twlre)QWsgC}2tC-U<*f zkB_s@4yxHm&72UBz3u5_JRr6~q`tyVb#GH#3eDHq_aw<#`*A}yKQ5PqYj&xH z#X?*)+uA3WbEz)?4|tr=k76ulhc9F|0gZ_3_}3P2^ft-PXXYVahQjJq>N?QXY+7^K zIEo#4_hB+vhEZxCfaKmexeD*tXSXy}@&m@IkDaO;eG@yU5<#c#RRUy)`0;5MGfP=u z@S$F?gi!t5Gp`JLtv%SORc=FVS~+9(z;*X{nLX6=HoH%c+0QlmN+lS#eSGXbZN=>2nw|Sr zZ5_vY2OF7d7f!=`jLd`0R+3Zi;tvvnyLCxsi*2#ADrB3_8X4yQu~5Nd^4D zWkhTB1q^_Mbm&9a0NCaaJKF?gC6*FvFC->GwIh*Txm?LPC<~?wtP;4kgoIl_2tFm_ z0ESFF1O&`Z9g%|Rp>@7DT{fKHy5ZZZbF4=4>`G+Jer7M?BEgo&6ToW%LT`i*n)ZcMhFauc{8~he60)sWWxCB0UDk79^B5Rgt1u3X-a_N%4@?UbJ2!XT=ph0wn56V zW3{8h&thz7yO#sk*L}MGVE{W^y>RN*g z1CFtn%Y4h3h|IG#xa(#qU=_>#z`&UzjIEK%^AKsg%MZ+)U7tf@yolsN8Nqza;4u?U zgD#itcmtIcOmnNT(1wkQgFs@;?9iuM(KJX>YEmB5fH*chy`nbafO+mh$WmsTngh1M zaltdPqEvGMEeWM8|AA74eL#^Rp~GXqfLFoLrxqev4~4K@Frg4WC?`y>riB@x!Kfve zc0IDHE9C5$n5iS9n`%nX*=0XIpR&nFNnva6!!^ycNa(S+mh&1PyTl=s?){^TnESCK)L8V zjtQQujg)K`D`;0#T*j3~B)nSYga`q~$ z0jeQ@a!+Ahi>!eDkYxF@$IZWTdCOuER1hb`(H@hzT(!46Zuxr^7|N`&jw1W2FNv%` zQX^VDr3<%`-!F%D04OGBVuJk$exdA_?B3c5*VPTswOuu&!g0t<)ngkQYb3dl?}fcj zg%R&I6uWeuf)4$-_b>KFRTqEDID1lp!IQq-X&C`Ai9c5D+FGLP{Pt9->_C+}1Y(KG zE;PyZyhx>{gl$kNrPW;nypJD1q{r#YE3O4TCtW62rnzn>OaL%lITu|x1YI~eE=(Zr z)H-oB2?xj&3BNj63ut2>F5K^h&G%P+Uzj>f5SK=BV6f=uQ{%A{~mByOZ2$$Aox8-Bo>(F72P zV*ys=0tzL-iuNHq5GuChqb6qx+1NEI!3h--*JAI`tIK+&R8mx_LZ-CxdoJgWxjXyW zzUo_&fi^ey1UL1(;D+oaEUu020<3u$26_jEaVa;r3T66E?EP8Um_LCKq)P-Ekj9Z$ zw}7k=!UWR1b&I1AP_la)?j>A;cb*FB9^o?PR&9X3Jl3XK*;a7DYI);0?Rg$*gQacR!Hz0AxKXYK+vA#YS2z_1In|tS7@mA8b9xq z+UCk|&{InHN>k0YX^l&G3pIrNJCN9F`P;T)W@hWgr2kl`yqjGt`j!NsAPmN7w zHRs6!n1Z;$-j_N8hmWN^EZc!|Qw@z9R|WTiTA?NAkE!uYUozEwAf=%O7sR3dnUu!2 zC2(~l>F`jphN1#BDfKWwam@7Qn8o0ah4(SuWZz^3P=?7WDpIJ(?FRyxMR&?shkhLe zQ?+%6AOR-H)g5|G1Oo3vAdvX0EHAghg2!!oVut(@{U{*fhvJtW&7W3l5#)?ijWxUJ z#9YMZ%U2bb=`*rMSup1#Gz$?+b;3FO5t`|CToK7nb#W1JtE@=nr8Jd%5D|}{d!=}}DgIf`nXBg>HTO-+Ny%Ly2jjUKSJe~= ztTqao-wyR-C{`q=_Z5PVjRM^CZ~=K8QtL4UWyGV4`WmP%v;gaZXKW{7hsU7?%8bEE zGAb{{E62^F$3^CcRw&JIa11Ls-GRBdhs>N!bVVI#Z<{cda_6Pm!_bSnh}9w)@%9E> z6gs(_)oUH0}zJv_Bno&&ywkFkBh^9-K@a4LV5vajdm!WK*l~02=1AwL>C4q=Ur(!t63LyDA_WpjhLyV&qzTYM z##UekYj5bsHpwNH@38EE3xj?D6vTt#mK%0F=)XB)H&4OtPr<%`5n#kBJh%)lPT4qv zO}5$>oEUTkATlzoer+R~cOUVew-I4n+^y^}EnsJW38@b_((+QX;1qvQ+)?Kzc!ruE zRnVRA`rH-}fiC2KM~hP*7BV_M!X-VOSeW4rmz*b@z20yM>wqw^>kNdiU>NudKa(qLPys?Z+|c5|aW8q7>xk}#*lSmi+#V~H+Q zmIy7UxT=;=X~1$S^CEZ1Oh_qgC4s+Fcj_*g>9onk`i~gj_PvmPDc&NKJxq{wPz`Q{ z05u#59kU-`78OM_h<#DqO!+UNzbUMkfJHfvHeVe`b>$``M?E>5eSxh#EvJ>9RC@Oq z-yOzcZiDe#d$GYZ=57+Nx2OxWk#=gIchrPHL$ec*vCA*isl%H~4Fp2RO~|4}7B^8g zz=yZ`C-Nzb6P=DH@%J@|IFcHgBw1qoK7AGddN44wlb)V@!6aX4v2nVioXX3+PKld0pb=cAoR2Pf50|X0z?^Nla{?Y zY(}&`dL&!`d-RC3zP)ACs)4R#=rAD7?5$ zOjsH(FK=M2sKaGLK4MQ3*b)GN?+%j4_y0W0&1ZQ`U??!9}hZG&r;JwVw?Shs0H~doz zk{UOl;S2uTf*3*pTztX5C7ykb{(=9z4HumH01S7g|G;_X<-LnET{azr?WpnHFo)Sz zwZU$qM~53pJQDJPxO-ikn{0>h0~4OBJJl14-3<-oO49Ktm>r!CqacR>1Ex;=!9*4( zhDIV$<#?+(>A59Yd3#Ie-je+wfVtI+TcNqt2$t%zoopE%W$wxHqyi=CV9KwX2gorM zS@iK#yNy-H9h^GAx7n;7jp|9;5>uwF4pz%Y0l0U3CQ)uA`UtrWSfmoTG4TP3Y!pVf z`#KwnONkx(iu{Vt&GA%%{phbCng41c`x~L4shUT|xELG2h zFJ0-MHKlL!_pQyaXtM9-Z@bN3xGdGpkUke7e%osdn1M~fb&gKOHi;u9@cBdLg)92p zmrrSM;nU|*Czf1LixW6|cXc7RYitnRgOKQSGS373ynp%RtQuG~S|W==!TV9mM}705 z7y&GMD^+t@lv5ng#XjOP67-}d95%zj)Pn5(mcR751&J*AkoE9@D}Q0d0xYP-05Q!k zQsco`F8sI0Eao2^uc*4fAYhR8~PLbJS-$hfDE z+vS%MfrSwQ`B5U!V~YJ%BKQ+J4dIDtU`U*8-wwfwYO@o7Yr(a5!-8(LwbX+Ek)}p@ zjMUEcuJj`s3dRXKa_JR74#=V3B?fl!UH@pmZm;R+!Hh9 zU*qSgUR)l4mgII(E6z33Qprk0ceLZD6(_CKs3jUZa+j6_7{GpU|tceN-qQaSI* zo<$H6_XTyRGd~~)*Tc2;vh1Pwg_b@sKIjO|V&AQX>$NAlz5wKf$KTtI4?i8>E9>_# z;ob4g?K##Mua0l{tjXJ>$*&|I;y>p(mZ1X0-4I3^_NqFU2|B*w?QKgd=s>Wt)sAIs z!!*xH#VGe&#!3TH826jcz4Th`Ix0j@V2$l6Il{)8;Jy)=GilywvFD92se4i}u}UgB zMO7(J6|iv2_$?|zHWGX2FVa=r5~{<#qfr1|K*Nf9s7_OGEAP4|^1Ndo2QX};iZeA5 zJBYOQO)|jw!3xb)nC}KF zbe#Ba55+0(b|unjV&;PyT#oP;gk)qDvZi2%sv!WK_@Y6b4xKRE=Of5ufb*WLD55N6 z)zN>@9K$_e?k<=kV}1+f=9g&xOEA|&-;Z!^euL)^oR48!9Ve%~ry4kbL?ewKXCMQ43tA7N z>2kNEe!E(qcWNY^K}oZ<~GAqVxZhN(nuTBIS2=V%5wm0usX{H6s1VJE-Rwm2~;CNahyu1kF4{>fJTpxz9$ zH(?Ly8P~SGf8)jqzhfx6>ON4KQ3c2#5)uvSP6N*QuGmsA|hkrcKpBnR)dK! zd#Nh(x3X#r55tw#wFVUzG*QvS(;h&vH>u``l^%Yb09ev%Zw%0o5w5B^;J)cE9V_pm zwSLdv%ohR&rVr{ioX}ztG@;XD09~z2wO<1n6TY-xT^TQ=HxJZ@{u%1iC#cVQx0E8l zEu~1cBJ`z$)**gF1Is*UVSo!l#R009a5T)WcB=@7m5L?3DF+aX@Sa#iUCI=*rm=iVJgNut98YT`6mPp z#w~{(f#TvC*mkI0<0)Dv^r`9q)%@i9n4`cRAL zm!OVRS{>PI)uN(&&Y1N=xPU+*ZpkDyx738ybPAE()!YKJ@tdP)mh>9+K-HsC zobE^=9sMbz=+7b0^f=fR#A+WW|kLc6#hSeFDj>rPkvrmbWC zI7K=&lT= zL}6N*VtaVylq^CVYsw_NRf?Y%R*|rUsxyh>J)dq4BImawai+9-#|k{*w_Q1RtU%Ji zVH`M4qwtbNaPnC1sL$SyCbmzqt+~DL2;A?3&7PAs6}^l4IZL@E!799N3cQ04%ey!HhrMX)Euff$OJ_P{6`R( z41q?A&5jh&!B}C3nwCz?>!8=4QA##J z#pugwvR=SRB29`ZfK{HNFhQ<&VR96)w>TKOBHw(PAw zw;Pc(oJ{$F;8de$u%26ibMIS~{!EOLSnDC_WkVgf;`Yx>5|RV5Lt191^Krk8&TgP+ zAYNV%KO^z*7nX;7voyI|k11S&W(7Hdh64BD%5fj01F5o%yA<888#J0dh$uF2A!bJ) zWT)W=JqA`tgbY5XHgK5+KWx{jqUtmi54}cI!`X-oJ+ttfT4{oUf0Ko8NltzoT(# zxItAl?IzL(*n?NwIkW`okX?QwC zLtHVse(T&U&v)SJG-W!87w)vn#WvqjnB3SFlPI) zFSH+&H2>JbGe7k3kdu9~+0l4k?O=`O(eHTM?S1M5UFQzq-eLhdLPzUP12t$mL(eI! z6-(EsPgjfJ{2UjY9%4|t=b$^%(=39JPxCzNGO`!32gRTVOBTK-a_SN$XGR`;$%pxMybd5I2Ki8eSHy5;9`nR2K2W!Gz)AUjNTMov|}fPa~lYd<@z%NqS<$ftOlW; z5s;!s3^2G!ItuIkqphOn4n5T>JyqsDJWg<@_-#b@r{B$A!0}(9uK5JJKSN#EuO&Wo zZXP1roN7Nho9`4aET(JD3}ZF}&w+h(6eY#qZp|F8HFVOczInJ$GXYBZp7&A|w~qh$ ztsdwc5ye4Kw6PJ8ZBS8RNu2wbxuh zRV%{h4Sg1G?wUNcw#iiJWUd?SSKK3KqEtEAzLPemfHPG|NHT zM=8YILg1J(K;%L6$#%H(y_%SW}iJ70p}8E;S*q<^-G+o-=&nSIEooL9d=Z zq>G>Vl_d5jg2lqowbws7kl&hU42Zy_=d?upgXXpjQfugdQ|-YlkpNYC8Vc>Bdy7gs z8p!|X-U8WI*gf4_;cGPTuq&MIfrePY`FMh4ctU^#qZpr-vz}=9{P>9dG7oRa@Hiem zz*2KTvbXknK&eLY42_Iw4&y-I@@;NS4Jh6zPD%kfx&pb+h+aBDt^Ct8#&@5U(bKjQ zq6QMYe+lM(`L&da&M4G_iJJ6XuThUL0`OyW<*fkUqbtt?%irdX;>DHajn0BqPA|-J z{fTnd5+wN4c-JWEzDIrUUt0V1*X#(JnDK{)H{I(o)Hlqw{DN7W@_Gz4s`qW+G?^%Raif~F#JBV-9Mh$wq0l6fc1T5+aJ=D?93YW(z$un*ovmxH12XwxqSZ?6ZeVj zKb~@#Umtg|s6)N_zwkwH$l5x>`v3p|glR)VP)S2WAW%|IMoCOX004NLeUUv#!%!53 zPg9E`l@4|gb;wYiEQpFYY88r5A=C=3I+(ol51KS2DK3tJYr(;v#j1mgv#t)Vf*|+< z;^^e0=prTFmlRsWc;WFr&b#OE-hF`3s4&gy8V5ApHq*(3n9Z$<-LD8CfCz>VmYHSD zNm2^F^>t6ZRCjTn<=^*b^{IJ_0RfSCmKml^yg@v@X&apPiKDC}tHkHTVt?1 z$8VgAE(<&}YG%^G0g*uhE%vy!P1PZ7sdO{aVz>#@pti?dd#vDQ8L3&VMRWtr== zhLOY~mLNfdf*Q)Gz($;QofHdcI#2lc2VK8JE`?lWFmf!Q3JtRB2mgcLv$YD76JAm{ z0fb&0=VJuu-UXU<$N4^XoaPA-d*|00ImpKwg3PC0b)x>L;#2d9Y_EG010qNS#tmY zE+YT{E+YYWr9XB6000McNliru<^=-*DKjj{=4$`|0Sie)K~yNuV_+DnfcXFthi?M| z(+4Du4L_W-hT#AMOsQ24GXsYKlw%pg4AjIAk+TfqU|`^X2;=~DzIEndVEDia4!vq3(Pcz!zW)HI2b4ly8C!gACL+tDPqp#IQq6 z*y}vSFd52WcpCWh>SmY;uR`}vhdF`4ZrZCjIEVT5)L$DKVF6+r&Nm-s00VCfb1a-= zP{14+1Lw#veJy}-IN1M&!o!}Ifgv6dC09e?k-)&d|34yrc-KQ20O9mdYbR1=g8%>k M07*qoM6N<$f`R5`L;wH) delta 289 zcmccRwt;DaL_G&H0|P_C9nP&liYLG)#P$FG|9hWv6i)&28G>?msskyOk|4iep!ok> z4Yx`lf2*g9V@SoVqgMj?nhkiEFRa-2f3EsM$AuPUMlIL$HR^a-GLBR;zj$`>?Bdz( z=Ks|W$es}OsGILBDbpk&F(HmiF<{s2mX70#owhaC3-XFhG(RN#Usj@E-sYc6bU8hC zGkuP#W81g(^piS^Z4VEs)~Ry!II?Jew4Lb~og_A+{XC=S3&s;QD=b(QADPIvJ{43= z_|L(*?Ru71N50ro#rG@2AO7R%ju2&E6|NG0Pi^zs_xl&@zA68Jxy^^~nZL(bTc8j4 gQX@Rme0>?Tq<|a_AO?X;!IMFhr>mdKI;Vst0Ir#EnE(I) diff --git a/gfx/pokemon/trebir/front.png b/gfx/pokemon/trebir/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..4b4cc0856271337f35d5387854d8aaa0d990c5b9 100644 GIT binary patch literal 812 zcmV+{1JnG8P)O(q9!?+Wq>=kCqHs#aS8w1Lj$%5yG2F$| zaGloxQ~0Sc9FRL~@5Eo>O1c9x>bFY9J|4g>$EEChZu`x~Wjp}qkuex#m$7EN+mn|W zeK>tvMt7;CqRqdl$l-ib%}IQ8U&ZpEqo;~rrD^MrjEg#z>ye87CmpwM>bSe3V^q;U ztJ4tW82)f82(v90gkxca1=h&;5BoNjTbJCH3pa{6S|=w-xco&E`k^A^ks}Ecx4t4w z-0sNBJkaf$nuuTAx_W+Q{!>D7tCHI~xmo14rQM#B+qwJNjTLS>O=!uiQQz9sw+-ss z(@}ljQ(7RPy7 z9OrQq?Ar}IjkIsAtB0`S{lOdIxI}|lxGNd9* zhE#;fkdv-nUjHw_dwRBd;yqoio&waXoQpdnp~z-0d6i??r|2f+@rJNeT&L qs-7vd8$0y>OY(}9&2LWMyMF>j%dh&}ILIgf0000~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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 From 36f25cbe7f9328a0036b7cfa288961e84ac13c12 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 26 Jul 2024 17:48:11 +0100 Subject: [PATCH 14/16] palfixes uhh can someone fix folage lol --- gfx/pokemon/folage/back.png | Bin 481 -> 980 bytes gfx/pokemon/folage/front.png | Bin 680 -> 794 bytes gfx/pokemon/trebir/front.png | Bin 812 -> 934 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/folage/back.png b/gfx/pokemon/folage/back.png index afc1a9b76aca91232dbb739fbb9c17fbd6c89f38..311e1e94cdf27172bbf64b51bbd927ade35b58c2 100644 GIT binary patch delta 970 zcmV;*12z2N1JnnQ7=H)`000120{Mpk0004VQb$4nuFf3k00004XF*Lt006O%3;baP z00009a7bBm000ie000ie0hKEb8vp$lX(HPUw z@*~Ag93(If(+1CT_@9+EW_kS5`;SD5mzrDR}dyM^A zI_0NSeS5V^Z;HJt1g_?0Uhe`A)q4$fE4@NJ&I~Z?QPp~Qlsw~%pfjRCQV{wk+usiC6$3^e~^S|(3g(S7#?v48p;5MSj8Vu;P#%$lG&#G0i0`wd_`yScxI$9t{JWtGo+j~M4_J;p-;gZ7(s|zYr3C&!L$5W6LiRtappOR{BASm5j!e~2pS0q_cK2i9>bb3 zJp1sgoPQnwbD=IQMG3_?{>-_H&)5-5krd1(672hmN<7Fvs=LB8$_r&PZ&=|X6MQ<) zT7EWT7*Q2aVQ<2k%+CBg_d@;=(*e97WKlh{x>dQ*J74KlF+OcnjS@BLnIKNFUQ=YO zKlhkNG`wN2xeLp4{BEQC+|O8xYN)Y_k3>}GD}Q;c+OM+w24rfWed1z7K5NtpJEQ>@Ur$KdmUWM{;~dSrvbG*A@4Rq8YvKXmS3W({V4Yem*0RRk?H3-Z(P0{qN=;Xr2%wf+Dm+jt?<~a z!+MrW0|*y@RX6MSurkH}=m37xDXKTbD9+E$az3LW0b(}9tHi^#tcHY$6shyd_bl;n zJ+mP}fEb=7&cT;rpCKN;m)$^so8PdLLqo{E%l9h;D?>a(xOn;ipxezso-H0;GJwcI so-H0;`oC3#{t4+7t$t*H*Kxc31FLqrDftf_?f?J)07*qoM6N<$g4poY$N&HU delta 467 zcmV;^0WAL12jK&d7=Ho)0000u*}nP!00F2;L_t(2kxk4oNE=ZY2k>`FPcenK6vP{n zp_4=2(4jaq?@bNTAr+hiCwDWHLWj~T4i35DPO`a#9<`)hvS#U>A}BEy9UTe=?}oOM zCLz8YFYoKScNgL}eEfg#|2_oqaJ2!!!vr@HzvdELy_2}Plz)i;^dBV1z>G1@aX^DO zan;Nrcr}(u*36Hx_Ir~+&jx<@QsP3d_d7vp=)8!b)vqxt4QY%mR4yRYx<~INRuJ`! zuBV}f#3@CsW>i30O``WX??P0apRpyz&W{ZIqXpfR;2V(z-}C-6q5zio>Vg6wze=@0 z#0lW8@}W70)M zi!*i8!K`_NS)kCfM27jdw!+aaShuh{t3dL8V2P*64Pkg;k&#g0Tr9nP@?6xC2aWAa zx4lwU;Ojpz`?N+BKp$s9(}4sX_U!-%DY79qjk^^2eN2GY^C^m&FK8=8&Z&&_FvVGD zghnmJ{YaxbatN_rm}H002ov JPDHLkV1lO8;Aa2; diff --git a/gfx/pokemon/folage/front.png b/gfx/pokemon/folage/front.png index aaa07c0784c0c99edbaeb10308dc524899815f2b..a837af01314600d4b8cf997ea5eab5a636a68aa6 100644 GIT binary patch delta 783 zcmV+q1MvK)1)2ts7=H)@0002_@Xp)-000b7OjJex|NoS&tsyyD0002Iu(B=y00PNL zL_t(|+U=T+a^oNjgjwzTzw=o?7;G@%rfGB65z}cL*a(n>zPNQMLu1)%ly@k(60*PS z#%?;wsq_IkdIn*1#t?5))K82Kue^*o?uhtrJ)O<6N8i z$3>|9gYewRp)0Bzg-4GMs77Zrtr;E?=va1PUHK7k)yXX5%t2yXH$T(8J<6hqE987X zWUejEgLJ+CrGLnf#pb$d%0lA%8B9jlYD4S23L|(PUDS}z+~Y3BMK^AnwsG{C>pIR3 zY|W|2N6zYoc|sGxw=EGP%+`2xN*q?W65y<8SQP3uSmqIIN5XZO`MPtEPo*l$o(GG1 zP(5qISuD>}TMYd-o=a*(<`%~XCF+S>>0DWlHXCKi%2$(iJg zw*qNzo;Y)DE6()%NX{f@k~7Jf*4S?SDf*` zV(xIJ27HS%G3k;sfsYN&_E46 zluzCvmApgBJER0s0x5y?At2@dXYx6KU-%qAKG&QN4CDg?pL$^64>xBg652Yg;{X5v N00>D%PDHLkV1kwegDL<3 delta 668 zcmV;N0%QG}2B-y)7=Ho-00029K-PT#000b7OjJex|NoGvs31640001|vG9KY00LJ@ zL_t(|obA`YYZGA@2k_^7saMGLZjvBgz5D^vzC!At*HWjh*<1<*SH+%i#i3Ud7Z(S& zcIZD5Ty%)!?G&LyucBnALugS)uOx+vxxBu=?!AD~QA^AVA%9;kU!J?XA6`fR*s?&c zJ9)H;e8)2K(!MO502JU2k8{vrA6Q`X8V1B(HwjFaSpVfJkO1&2)<4)T>>nr3y8!4# z8wZiwJ|=+7uY|bfQOvqu=pHGWbeDA((iXnbs;;s)6GYa^)=VIx>&=!$M4`3O4`;>0 zeZNKQ_+wVllxoDUC6ofL!CP36I6F z?sDiF2V#N~W7qUW0eU#{K*Y+{w;vCuMEC5Ze*I`o+}L?WyvvD*$b=_%<*qrN@jjMU zt=BC~u`C#UFO~(g9IUG@94@4$+VpbObX9Z`FUc(YNPn{+qT|@P_17~u%2wt^>BQ}# zxuF4fYbq?}Hnvzp>o2&G``T^ulXgp@+|AW)j8M5%{gqU^d12}HcR9sfvMdyWubxE(p(wnq=-a@1e8!)KTgU$5kz{X$jOCUYJ|7=(P-p%Cx2|hXCyoPPm74Q+og>r z4{tdq6PAT$YW-5Zo@PQ%v|jD&;5ioIZPL>* z|Cd>GVH+c*yNK9_J)L#EKAS4VT;Ag4QG%& zr1z)XFKN0MJbz@p!HY8G`SQwDJ{N8|?#)%iP+ETz@_ZBUmQ!rOxtkp2T_Kyn5Ta0V1-Kyn6bfz3;73}+zDh%@4hI3vz{rk?>g zKLbY%;b%-r`5ENcsGj6!N`@3?U<;4p%uZKvMw}66#F_8=9so#upsVcL6j0?b%xy~9 zdg~5}u76G0q2*X|;hy0Y9|(LDMc@NVn}Q)e(AX4A@NpZj9N-+{11**~d>jFV58*@j z5I#QNrU0BxK~LD@49+3Pk6qBL%;{qn3~UO{<*>-`&ZgA!hfP5}asSw*lBlsMK))PT za8S2MEXrZKO)=_BY)T{)+A(Kv2r=i3>%220XMbQjD8(6wGvbUmBhI|G97aBN*?z&} zeSmxH0)Q)rSv;y72G-Aj^D|Z%Wc-YEgyW3q{)ID9SzL0)28`rPE#xja<&Hj#KFPAmv$+o zgNu_(7Uj?zf;b*FRchfJbkSS<1B5Q|*CNF;dGfyRbHWwnuz#L`WcqTK%bUC(zHgEP z7~Zxb9%YF^YbMO1366|i(_Sof0G0q&2QT|}6JQTOK+8xXUjaCKA*{GDl#<8?Z|6=m z!Cy&#*l_$NL>O(q9!?+Wq>=kCqHs#aS8w1Lj$%5yG2F$|aGloxQ~0Sc9FRL~@5Eo> zO1c9x>bFY9K7Ss-F2|+pdv5#9#$`MJ=aDfOWS6mKyxWtP8GSf?TSj-Oq@vBgsmS4c zQ_V?ybYI2tprfaXU!`g5kBo~tmFtm;{wE!`Z|bff6&%efxe-yLr#Fn^m}} z_&1(QOiYMX#h5LQ0@UK@%96d`Yzi!y+p;#VyNGouoC{*1N_HZ{GNCamv8rIVC6)=S zO;|yJC4WzI+>$YoCUmnfqMI3jax-0hQ!}%Y1xd-;=yoxvxS!itvL7Flk_A{YcE$;1 z$(X%xT$aq^eowkR<_pTLX3mn^NphPm+z#Fj^AtB0`S{lOdIxI}|lxGNd9*hE#;fkdv-nUjHw_ zdwRBd;yqoio&waXoQpdnp~z-0d6i??r|2f+@rJNeT&Ls-7vd8$0y>OY(}9 f%^Gh`-@AVTMa!@H+&IW600000NkvXXu0mjfHg$&` From 5e61056e4098b713adebf6c8dfc932498278f2de Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 26 Jul 2024 17:51:46 +0100 Subject: [PATCH 15/16] More sprites! Terrados, Stromen, Dudunsparce, and Calflac this time. --- README.md | 6 ++++-- gfx/pokemon/calflac/front.png | Bin 315 -> 639 bytes gfx/pokemon/dudunsparce/front.png | Bin 315 -> 624 bytes gfx/pokemon/dudunsparce/front2.png | Bin 0 -> 547 bytes gfx/pokemon/dudunsparce/shiny.pal | 6 ++++-- gfx/pokemon/dunsparce/front.png | Bin 860 -> 836 bytes gfx/pokemon/stromen/anim.asm | 22 +++++++++++++++++++++- gfx/pokemon/stromen/back.png | Bin 453 -> 768 bytes gfx/pokemon/stromen/front.png | Bin 525 -> 1987 bytes gfx/pokemon/stromen/shiny.pal | 4 ++-- gfx/pokemon/terrados/front.png | Bin 315 -> 1068 bytes 11 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 gfx/pokemon/dudunsparce/front2.png diff --git a/README.md b/README.md index d1de8d3..d93cc4d 100644 --- a/README.md +++ b/README.md @@ -103,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 @@ -116,7 +116,9 @@ JEP-affiliated spriters require sprites to be used with direct credit for non-co - 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) - SCMidna: Munchlax -- SageDeoxys: Iron Bundle, Raging Bolt, Scream Tail +- 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/gfx/pokemon/calflac/front.png b/gfx/pokemon/calflac/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..ae993b29d7168a22226b33f8093d98f018846571 100644 GIT binary patch delta 626 zcmdnZ^q*ydL_G^L0|UcSohMs>6nlxMuPgg=E@@63%j6pqdw@dXC9V-A!TD(=<%vb9 z4DLQI0e(B{#E z{{F_tnjEd>MpqX%2o*;5S6DYqnh||*N}xqO+qv1of;+++X0fl7+$BG4lH^-mnKK?N zZM+8M3KtJrf4sIPG$YqnkWKJb7DKUq--88tmEjS)53X+BaDwfE%R*t&|2>HaZX)74vV z_2gD})_u3B-*HHFkK2E@%0DcBvnKKFx){5EYoj~+-Xk`B+4tvHl@?SNohnbg@_NPR z#d53-yHaMXFP}So`5wlz4WC#1nX_Gq?My-D?#==R?rLuCKfIUIqfcr(%w}wQCY~^9 xYxCv}^ZY*__-y$h{=LkF{}1-C{Fz?gDbKst>)u>$=PXd%db;|#taD0e0svPL2y*}c delta 300 zcmey*vYTmwL_G&H0|P_C9nP&liYLG)#P$FG|9hWv6i)&28G>?msskyOk|4iep!ok> z4Yx`l|A429V@SoVw^JSY4jXW=1b+WtpC@|NRP7$?qL95)l8ux%Y}|O0BSN2{Cj5XX zV{85&^?M5|<`m9-(5&!uFM~*h@SnKgKj#F#zR5ma|0APkeZR6;(*C-Be${1Re-f7* zT61h^!-|Zs{+UckXVn@1xbX7$cvKmbZ#$yD_JQq4;8O5p5asFW=d#Wzp$PyRbbh7) diff --git a/gfx/pokemon/dudunsparce/front.png b/gfx/pokemon/dudunsparce/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..c296b1de8e03df47158d04e3c1288b54a8cdbd78 100644 GIT binary patch literal 624 zcmV-$0+0QPP)4N}rjs-MBEL+Rkt^w;s)bi@=bHND+yRQG#h%7-XCvVTaRnI`cdnck zQs@j$X}(!h*-4U&>f;-7e6SdeffTs@&r2H00Sos!dq0 zGk)O|JRT~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/dudunsparce/front2.png b/gfx/pokemon/dudunsparce/front2.png new file mode 100644 index 0000000000000000000000000000000000000000..1a8b61577254f222d27e711a3e07919bde5f2e52 GIT binary patch literal 547 zcmV+;0^I$HP)`IxoeZg8AofM3uK`oS{BNp z4+}yhUrz6jrt05ek%S7hNzj7$b!Ns6eZi{VaD z7x)thDVjyq*O8UL5iIuxI&pA~6?5_@poCfmD}0bJ(ma()7Vjni&zPYniFP42@mEr` zHURh6_zc9RkgWfA1TKZlvi)-bkGsl-(VGpSIkGFL<9u%;U>ul$yB%`wEz7bUu_MW< z1+CWqhMa!j-ZG)}XmwDQAaCwb?a?PNh7<`8`|jx4Fw;Ki>XJ*A9}5#LLEelQDq~;v zV0DC(%#QXh-;$l7lVl7<-Ge)>lAgAi0&7t^t|N<3Z7-~#Pz49hiqx#Lfa2TE`EsKU z)lgx*ip4M@JvU96z<6p#A>Z(}Byu(qtzl+C4|U*b(bS(=Q&}RN6t(_R-PB*EzlwQ& z7{Sf7L1fcFGDVRFZl@HM6f+J4`0%L1D9BRt)9dh@@$`^!lMJB!;x&DKJcXYzlJDcU z_CcnUiEvR!L{eO+?Wv^nnp#+d!g&@QmsF-346rA@ulB?ccB&BLw+ zPYTcUwxE_xU?^;czZG6p;KITl54`jV z4#Zbly7Lk)0!7zZ@W4x!E%!iOU_JUEAUF{lU8=x$;Z@0EA5>AgS{4i7qEOXl(}qk6 z?r4G?$$wy0YzvW-Oqb{k$G)8Qp>sd-QsE(!MC8@J)0MZ^VqFYIvBT*O1w2#mHn1qa z{1gX8?SqkmV?I!;NyJBGAPKkt`S*#_9=F-D?5^jbomd5M#kl9!T~l9!T~l9&E{UZOBBNq>-+BotK{YvKqww71&i_@%07*qoM6N<$f-ne##sB~S delta 814 zcmV+}1JV4%2HXaaJAVKKbW%=J|NsC0Z74>00008}NklqHi?-5)*Lwm5_ibBoQtOiAahIvptoRUXzAJIE;yk zy*j~pOvRpw&jlJ({d*Ww9ViwE0?97v7LMkRk2_JKf(a0@-hV5k-|81GStko-EEn%u1S!KV!OusGCf}!vk{#JNlDStXL_oWQa(=jwa0E)Dr`5$k| zOUX;gOUX-L=Oyv73OeDXC-~X$QimU!;b+ZDkQ@Dgx4a}Y2_`04@sg&c!4Er@V8ctG zhBDJ|Zg{DIgWKOw=7EnJ znyyBwUW;`x7{v~!J5-eb5dsSAWm8G|3I|2)gOP$`K2WPk#7AWy3Ah0D?-Qpz*4lI& zlfq1m>C^@0?>L7cSxkXm!}gf-an)rT%3PF}UVlr-GcR%SQu0#rQu0#rQu5Nj&r1~M zB?*c0-w>xu#oMt{&oP%3xB(;uL1B1(*|IkxC4MyYYQap zD}96X1a!kkA7bwc(+0REtE=zM@Uc3B_*DRw^{xBYD8P#NO!y!~3qT;I0iv*BDP6qq z1%NFu2~f4ZcbOC~d;`$!T%4YKQjxm=o>)&j1&|o8Kp~t$Sv>__< zU4RONykn`+i(g#>uzAHR4N!&fay$z=EM%RQ0?0sk08AjJ)-3>9a0f!>$~zr8IH&7{ z5CBD1AQ*sG;Kl(kzOniugs$ZHO?0K`dLaa`ENqGpY}~5ElU{KDtrBgd#aY)07Cw_+ zNCU7(F4(sv l082aqR3O;-KnM>$YVWkhy`M!j<^uo#002ovPDHLkV1n+IIrabm delta 438 zcmV;n0ZIOV2E_xA8Gi!+003az3AF$K01Qw}R7L;)|CDn%N=hjJ000qd?%MzW00eYW zPE-H?|Nm_$MtJ}L0c1%;K~#9!?UY-h!ypJm!?6E7mxm~z=Jx;Av}sc3h~Vh+{Mx^6 z%slU3=}9iR6Rt$<5vdUTqG$UQ0C)j--X;Oo>rLMXXoz?HgMU`1zw{5Ggt!G*D&kzV zYlsQZieL%&_hm{%BZSBWmRCTFbz3x|5kf|GJ=xC@(f@2j@q_6DFyffK%>tIH=Udy^ zpcqmexpdtu0v$Ks)`V8#uziE% z!D(o#yX=x1mH`e{-dG5!#=icX>d*!@Xwv)Y= zJpcesoG50z6+r+%{bq}{vOe!MkF9_ea$;E6ajci~7T}lSOS`NgPa!Kwn6N)fcqmPf z39uoiwGHlIrT`a0rhZ>?dDvQFE6j~$TQeb64n#{xzE;5OX2dW6py{N;Vww#ApaCAV zon^6DD)U04qe;t!AMK+8|1$-yb{Hb9E2DOC*-VQHJM)+IPCPkG#&*%!$$pgJDbCS` zhaa%qZ}BVEm(nvT{_zWJ?NOi5>DNxzoInj0y13R>y6{NN0qhZe&>v%uB0TT8?Be6H z?X<58B58h%MD0+J>8*^{h#upPY#!LqC3i^aAV?ePSjzfG$M}t@y2jRAel!0|+jzr<9>Fd2-@_aJ~&6pnTKWTh>ukcl$CroVJIF?GXK2##OFDJcf0z z-eQjgC-{g?l*cBXi+eAq@+P>R@m0P5u_NtvOQbP)jBXT9&Rrpkb^HShPa@26v1?Kp z)yol1-7@}bwolCk-C)ik1uqd*wRu7~nlgE_kewl)ag;1zPK8{PNBi|)GV(=<1Cz6+ zy!LF$9c>FPuX$?=cOumzBWn-+P1|erl_x$AHPlv(SprSGyORnupxTfcx<#Vq!FwC7 z_w;W&i-DJ3E@rZ2*?Q|^9lRJiyaoc5p8{&vOcdCz-0NT^c<{ic(jrc8)>`Q3@1R2C=?`E0LfTb#sB`-~ zJ~(1M=uw@N2L>G*lXMZPoQb<{MS+D>MFqEq{$UK+hjFNw3hw#4D$HrO`Hk?!1kgxQ zjJrcZd*b3Y*c3HcW>G4=p%{9&qLUnKOKil}dNRO=1>!Y1`UfxSn;fB18hrRbAy%zJ zu^z94($Of;$zZRWPMtt;-JxX>kFN`KB>LR$Uf~uB&#W%07TzL<8CEszqd38WBjbttOctD3?nXB5ds;Ys9%yIX=;rBoQqdB+j|lg~}mX%_hug1<}HGFlzZ;T;3NT}W;5l_T%C4wO(U`(|c{KQkywzR^J)N}pL$?SF2H XxPXs*cx}!cu>2x9tXO7aBrN+6tcfJ# delta 513 zcmV+c0{;EO4~+zn7JmRR2m=5B0ASn+wEzGB3{Xr|MgRZ*lyf;sN+|#U01<2M+W-In z1awkPQ~&?}|7|Enc>n+btVu*cRCwC0Rtv7fFbLyw|2sdhVM$+0s!5B~Nu6vkh9njF z^)fd+hoxq^-dxq=_ZTvk?SzP-a}wY;h6O>BG$rv`n?O-W^nW9v6NQ${7CH1t2q0Iz z1^iS)0MaN;;QyK)Of7uEF#t_ewveLIe9P zR`@%?cS8DPJ%2-qzs>wg00NO8ipjl%l^`AO`9s~g9n6N3n}D%yxKQA=aTkIE*m>fQ z$8l&p{ehsnH4kmbct`>YD)DI(bOLT7Oq}V==o(p^dTpEo1MY+tGC1LA_Q;TOKWnBU z&FaO_>q%C^gu9bYMI(acXTo~W#FRUo7j_|_-&}G^(RzgROhNJaNaC4k#g}LftY}jPg7kLi9pSWS=tR$c)o&fxrc2Iu0_)zc(m_#Ajtd9xcna5W z+LEXKc5JWFWD0+~_1D?J6#m6G11hrbzB2qP{IAv@IOGQ0ARu9-00000NkvXXu0mjf Dr3LNU 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 e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..7b758b2f70751237891614bb6d3bef0900ee637f 100644 GIT binary patch literal 1068 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C-zo@CkAK|NsAwUtbK24AxdBCwmzhGj_%Sr5KaE z-CYUO_QmvAUQh^kMk%5tku7SC(foX`Lp_PHTm7$Tgfq|8Q!Az}*lTb9| z=BH$)RpQq0qFhrCs6hj6LrG?CYH>+oZUJsR`;$060`)|tMtG+A`Z8z%*&Gb4j6w{c zuww*521Y3cRxq1^!HZEE&JJSKfU03)U|ieXPLa@;T@rlU{=Am4<`75|`_Jt(8BhSEkQRR{!XFNr7{3-J#>6Pir1j)gEp- zE>wSTSzG$Dt9tPp)+*k#dsugPozSCG`%}+<*?pXQ+k`H;!~0e|(iD$5uqL+4!89iC zd&t`7(FVEtjzJHz-A}A~KB*`#wej-3EU(aN=^uWFCaqx(GpI3-bvCh0)Ty|ct=oJ5 zTIj|IyM#84#Vhq+RB=7peJ`hh)7S4sUz`7a>12Nn!=w8ay0=Dg%oWKuXS>2Jw{=~% zF0*fyWu}GRNEQmZ*8H$FK>du? zBU^^#*#=_EIbN~IZgg8e|M0JtjNK9~mYK(nJeOW4%;wP^w?|-auTo9(TdHE)>uM_elH9C2ZU7Z#jl-8~JvH8fK1&g)M3G*q5 zD;>Sv(#SCP{qkGV&VhS`ow!2w{nWl}P^>Thh1I6~BmZ{U9W%cf3cvXJes=ESg;A65 zGau&YwYV#Qh zrVQh!7RMW}W)&M|-+IGXZ}CQe^L=ezPq2L44mFp%HyA7yL{C(gG1l%YERZSo@vAuN vV!vc|%!lV~9`)b*Y7ZT6wOaLu-)?=qo8ZNqIUDEg1tmvMS3j3^P6~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj From b7099d8ee804c42f58d3c6400e75aeb4421e904a Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 26 Jul 2024 21:08:15 +0100 Subject: [PATCH 16/16] ROM builds now, yay! - Fixed/improved dex entries for Calflac, Stromen and Terrados. - Fixed Bipulla's shiny, giving it the one from the beta. - Added Calflac's shiny and official back sprite. - Fixed Folage's, Stromen's and Munchlax's back sprites. - Added Munchlax's shiny. - Fixed Terrados' front sprite, and gave it a shiny palette (currently a clone of Gyarados') - Added temporary colours to the Gen 1 trainer imports. --- data/pokemon/dex_entries/calflac.asm | 14 +++++++------- data/pokemon/dex_entries/stromen.asm | 2 +- data/pokemon/dex_entries/terrados.asm | 8 ++++---- gfx/pics.asm | 26 ++++++++++++++------------ gfx/pokemon/bipulla/shiny.pal | 4 ++-- gfx/pokemon/calflac/back.png | Bin 304 -> 338 bytes gfx/pokemon/calflac/front.png | Bin 639 -> 478 bytes gfx/pokemon/calflac/shiny.pal | 6 ++++-- gfx/pokemon/folage/back.png | Bin 980 -> 520 bytes gfx/pokemon/munchlax/back.png | Bin 452 -> 279 bytes gfx/pokemon/munchlax/front.png | Bin 766 -> 636 bytes gfx/pokemon/munchlax/shiny.pal | 6 ++++-- gfx/pokemon/stromen/back.png | Bin 768 -> 464 bytes gfx/pokemon/terrados/front.png | Bin 1068 -> 664 bytes gfx/pokemon/terrados/shiny.pal | 6 ++++-- gfx/trainers/blaine.png | Bin 651 -> 599 bytes gfx/trainers/channeler.png | Bin 605 -> 757 bytes gfx/trainers/cue_ball.png | Bin 615 -> 770 bytes gfx/trainers/firefighter.png | Bin 891 -> 625 bytes gfx/trainers/rocker.png | Bin 460 -> 629 bytes gfx/trainers/tamer.png | Bin 566 -> 727 bytes 21 files changed, 40 insertions(+), 32 deletions(-) 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/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/gfx/pics.asm b/gfx/pics.asm index 9a0a7c3..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 @@ -1046,3 +1034,17 @@ 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..94f854e6400760f98a6fa502802369daaed9a33b 100644 GIT binary patch delta 303 zcmV+~0nq-i0@4DIEPwyCA&g@w0000i#ocEB0099>L_t(|+U=A<7K0!RM3b5O-?SCv+U}!sAHA%S7z?0Wol%=nyz2>LsQ`&8YJ%JjUrxiQ1U@#)$iB9Eoxvi0#q^ zsep5VDq#2x9z@bakVsHNo7P0sv%zJpJyZWSF!RtiuI;Qx;G#hCn%(j1dx?cl3k-@q zDbRDlo(rbOjwpSeNCh?=)hTB<&9tZ4K`)<;!Uu1626uD%fo=c*002ovPDHLkV1gua Bj_&{f delta 269 zcmcb_w1H`YPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{#H*H$B>F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T80Wbdl1l|LX7=H)@0001B+zGV+000b7OjJex|NsBBA&g@w0000i#ocEB00E6j zL_t(|+Le}zcEcbHL$UP#|2!-cOn77^+iBNU7so>u_CeI;Z~=f7m=M~h z9y&vk4CBV6QH=rcVLhYUC7`W8XEXEI*2DWZEx*kz+dvL9Yax%cU&AK-tb^snZFaq2F2;$vRPstH!-EozR zf)21(Y}+DA)8mOmOFaev`A5@dr}ow7Oui&$0*IxXe#{i1Q;(NL?XkHE0rB(NQM8Q@ z8yYc2YWm&KLx1~C&BoGEyJNzq0&N40)1pCO(ib(X9$-Fd{Ic-b>rG45G9X;f8aWJe zVLC6suAeQK4z07iOM_q>PD`YL=*e`*Abb4akjWy~E|Fm&__{FlaBV0xI!?fQ`IMdj zOnTomy!AK-lHN}@2g=jxM}4%oLed?IfDd__2}bqd@JT6uEHWN*P7YrjIRtX}|0^d7l$?Xn+BzXPuRO}Ui+fBgaH9S4`W;6nlxMuPgg=E@@63%j6pqdw@dXC9V-A!TD(=<%vb9 z4DLQI0e(B{#E z{{F_tnjEd>MpqX%2o*;5S6DYqnh||*N}xqO+qv1of;+++X0fl7+$BG4lH^-mnKK?N zZM+8M3KtJrf4sIPG$YqnkWKJb7DKUq--88tmEjS)53X+BaDwfE%R*t&|2>HaZX)74vV z_2gD})_u3B-*HHFkK2E@%0DcBvnKKFx){5EYoj~+-Xk`B+4tvHl@?SNohnbg@_NPR z#d53-yHaMXFP}So`5wlz4WC#1nX_Gq?My-D?#==R?rLuCKfIUIqfcr(%w}wQCY~^9 xYxCv}^ZY*__-y$h{=LkF{}1-C{Fz?gDbKst>)u>$=PXd%db;|#taD0e0syZV2$ui= 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/folage/back.png b/gfx/pokemon/folage/back.png index 311e1e94cdf27172bbf64b51bbd927ade35b58c2..f2aa059fa115c51f051e1e334bac73f9d87586b2 100644 GIT binary patch delta 505 zcmVKI(OP}?6rs(*t+2s~v%UF`5~(G~9ra(9DIUjyHVmvJ|E7Tkq5hRwm>7}+6`Q1Hcc zXUrx>ons6;d@x2jD1&h@4s99*^bwB24r7>S4Fw-^-L_QuUn9OWK{vim^H*{Mx z6Zc{B6sr*k=&9&Xl3yXnWJ2RO-Tm&H@ z=ty{Hz=sGihw_>5l6-DwLf&-!qS0|(o(OD9GV%#eAJoeDf}acy`yC&QaoigA6)*W^ v=?r_t_uD^@w0vAy_Gf%j{=q*h;;;1sR!aua=9}V%00000NkvXXu0mjfwxsEw delta 969 zcmV;)12+7K1k?wR8Gi-<00374`G)`i00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m_e01m_fl`9S#000ANNkl7Ad$me$ioGfXuI6T5?*b3idku9fy+S?C3^40a)p~f8JmZX@GqJGR-v>Noc#*t` z-p%x&*4ZIOJ*!&f*C?O*kB^V-Yp@mAd|EjxQVx(y4Y-o?`T6-+$(5!943NmpD&r8VL#aGd~v|!%3B@@6%(;ut*bz&S6wD?P?E8vJJjg$)yTUZe3uQBJSm7cQd^*os zel}wmQ58^OZ^D|)&ip+0LjDoc0lXk&Q9ZM|Rk_eRU+GmbK5bNu5;f|XAWpGfQ)H|^ z_n1dCykW1o3(Ir-ZlnC%&sd9UsIiKVL{#T1d4H_hud@6GWNM&&;$lSQ6FSqm_Sg#3 zs4SF?MxuN_ic_ps@ERkg5xpYb+{L+1G5)(lcz(i}a%RjU8WfTs#|8S{1E}6bT)rHls=LCa0d!;9OMHs0@Yt-w zdX`HA2p51=H|zMYGR6Ps0DjXcsyD{QI$U?r$_bUV|Lp(#cc=`aK+s#3qEgoJnfXG3f rEgoL_zg2|(3F#HBeq?~xal8Ekt9H66`41iL00000NkvXXu0mjfZQs>s diff --git a/gfx/pokemon/munchlax/back.png b/gfx/pokemon/munchlax/back.png index 0600d598b452d9e4fda9f1e9ca3350491ed045e9..6fa3309e294c399088fc355f8f9b7b94f3d33fa5 100644 GIT binary patch delta 264 zcmV+j0r&pI1D67j7=H)@0001B+zGV+000b7OjJex|NrNlb0J!D0002Qt&8jc0072G zL_t(|+U?cJ5`!=d15hme|3BA|uqC!*U)oE3%7EUmWCYvxpRWu#E*5$8AOWWG=%Na4 zxy);h=PG#t1-HxrCIKhFHDI52e(A+p38Q-R~vA0?j*yFT_Qp O002ovPDHLkU;%=8nsxgC literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD=;=NsE}9`K>Qs0u&N2 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|NsA2h$wh4qX49k2=MOq%0!?t#w2fdm;X!IKOF^f&Uv~x zhE&YCI{BdBVFezR!Yd42RtI>0toc{Xtx`5YV9zHm{(P2_ zON^)5l~uoW)7Lw^`SriK7c8$wZ^?g>f7ku>z0U4yY^ljXJ8agt>TG!OTR8Is=Oc&r w&AmdKI;Vst03C{z@c;k- diff --git a/gfx/pokemon/munchlax/front.png b/gfx/pokemon/munchlax/front.png index 51f3950447138dba5fe6fbc4ac24a204e6e6f9f1..d26f77a129a043332e5b08a2050a51af1ed15e5b 100644 GIT binary patch delta 623 zcmeyz`iEtLL_G&H0|P^$i8v#W;tB8xasB`Q|MNM;ic!Ttfg@|X-!L#RX?wajhE&{o zJF7eIumOiF@1Otn=Fc96%SdOxHCtJ6X-(RlNesu_&jtOO?0ChGui9nRWprFPst3H0$V0*#IK}vyl zV#R{;ss!OR!fT5i_prGnNXDeiZs2fOQ*taju2uAw|AFMWufiT~Jm1eacjxMTj_g%u zObt>O9G3Z-*0GJ-=`m*<>vchue0KhcBqq7Jppz=#?xNytlWKeyh^%&1uRX~T#}!w_tsnXPTIFf)`fIOC?|lw> zH@it{+wz=@v}cLE_LI{=N>Jf1LH)birts?fzPY}~WYOWi=~lZweVCL}R>>WFaN2aK zmd_uBSoM)%t-8MFkH62oueIKN?ma2?|IbUck0Z9*?cp?AyXj5X6Px%|>z(KBamg@! zV;6U6iQI>vyQ?2K6dv*3H0kf2CFkEhTk3SrFV5@p^s@)O5paLeK9&C>r626x^-SlP uap(Qx7d_K2<^I0C)eGj@U;KN%FsWQrzamilxE`2-7(8A5T-G@yGywqIFd)zX literal 766 zcmeAS@N?(olHy`uVBq!ia0vp^20;9Qg&9b0Ir0lgGO(9;`ns||=aLpNm#Qh3b_WWH zm$*ih1m~xflqVLYGPwJ=0F6;7OD$3`)-x$=UGfm9grlUu&mAaZ3^Ky2K~o+`v7|ft zIx;Y9?C1WI$O_~e1o(uw{{R19A)?^Hi~^8CBEY-bD-(gr7?Zr+UH&g+|8$grfr-P@ z#WAE}&fDqr=MF1yw5^R;lPVMe< zr`k@c3fZV&@G{BLWb&Qr6CD*I%cB+;D4tWXUh|zVJ8tIJ&k?VmK6@*eoMXn(UH4l; zntkQORO$ErT`E2~#;R(sb*{~8e-ra)#icW6*Gvpq(QIhD=ljMviBAOz;*OX^PURMS zwPbP{_s>@fl2<FZaboGZm>&Y$K70KRy6nv{<=Ub>Ec4^oB@`SNDT`Um>fCl} z;yFuOmD){uTUETBElw*QKRP*T(jNUubN7lHxt%|%{7CuGOpgikRiFOsT%mdIc|*Ej zMOtH~lK2hdO-lH6m=36{&?zP9+*6;E#-!p3}&*X#Jnx?wj=Y{Jj zHW|Mtt};1fdHlguv#$@XKDc@nq{{x}>b=ELac|dN`}oSWXI{9G8ta_uIKv74N+qhh z7M_0~$`i*MS9=|#bpLVfmt3FgmLAQ!w?0Mu+uv6i)1K9tzICeJf2rn$*6!a^xpF>w z`JaDs)#Z|j+WL|MPekv0%z7jpw^KS!bW8M}U3*&j<7A^{_DJp7#qs{$`WZfPnOkqa zZ=Mu2IlSPo_V)6W?{*%|;mzT_wZ~T58@EUa9hQ%E1||@`)CkWsUtb0-Ae#f4t}X>n P2C+O{{an^LB{Ts5f^#?- 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/stromen/back.png b/gfx/pokemon/stromen/back.png index 7ba5c3cdf941f681318360a3dcdf52b8d498a80a..2fd9a48244fdbdd74d4524457043663d914677e1 100644 GIT binary patch delta 449 zcmV;y0Y3hK2G9eL8Gi!+003az3AF$K01Qw}R7L;)|CDn%N=hjJ000qd?%MzW0e?wE zK~#9!)s@>4gCGn<$?pIEb0HT9LL6UfXRNh*+(<68_E!hUdH$pqf{oHY-+&%A<2lb0ZxJwV|H$-GyR)0w_1419H`X+!fF9xa? zf$P;p3JZTb)r%fbYW%#u1PKq{fzbDhD-kQR3`Euia8FtSrrvQp^G;HV{E?+rcoY}2?acT_u1F1 z%p__s_1}H=*;5ChXUlYLG5>;6@Q7*)M0GNfJT|L0z&Z!tYI)t@R*9c$qxl_fpk4G400000NkvXXu0mjfgY3g} delta 755 zcmV*c0-w>xu#oMt{&oP%3xB(;uL1B1(*|IkxC4MyYYQap zD}96X1a!kkA7bwc(+0REtE=zM@Uc3B_*DRw^{xBYD8P#NO!y!~3qT;I0iv*BDP6qq z1%NFu2~f4ZcbOC~d;`$!T%4YKQjxm=o>)&j1&|o8Kp~t$Sv>__< zU4RONykn`+i(g#>uzAHR4N!&fay$z=EM%RQ0?0sk08AjJ)-3>9a0f!>$~zr8IH&7{ z5CBD1AQ*sG;Kl(kzOniugs$ZHO?0K`dLaa`ENqGpY}~5ElU{KDtrBgd#aY)07Cw_+ zNCU7(F4(sv l082aqR3O;-KnM>$YVWkhy`M!j<^uo#002ovPDHLkV1f@7IspIx diff --git a/gfx/pokemon/terrados/front.png b/gfx/pokemon/terrados/front.png index 7b758b2f70751237891614bb6d3bef0900ee637f..c8ec4dd0aa175bda882fcffc1db56f5c5831d48f 100644 GIT binary patch delta 652 zcmV;70(1SW2$%(s7=H)@0001=Sj#K`000b7OjJex|NpIfV`EA&0001Tw;qrH00Kuz zL_t(|+Le|Imct+jMTNKjJ&$}vL+m7{O`6181Rm%Z_XBwT`qu%9@jQN$jCt^9l0kAI zFdrbd!^Mo5$Y+zCw?R$}jTIS3GDE7*Yap5F^10>?=CFtb(fvc>_@zTzHS7 zfexe-^hSZ*3C;0a=7 zIhM=|H#QDAQ(cUjzTB^HoFIp~_$ReHneF4Uo&@{{rvf1tF430VqconA6Vg4R zsBDi4(0>~=$qrMek0&pkY??3jNM%FiYesNOeN5CQ7+3P*!Zk8GxJbHbCU#dI!UQEw zQ5=_ikL=wRR9oHjpYWFZtcqMkS1;|h08em4{Qab5NEdO}SEwt$aQxrB_1cIS`DIVO m);Q*GdwI7zfUn%^@dxB^4jiNAEHVH9002ovP6b4+LSTaYhbguI literal 1068 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJg=CK)Uj~LMH3o);76yi2K%s^g z3=E|P3=FRl7#OT(FffQ0%-I!a1C-zo@CkAK|NsAwUtbK24AxdBCwmzhGj_%Sr5KaE z-CYUO_QmvAUQh^kMk%5tku7SC(foX`Lp_PHTm7$Tgfq|8Q!Az}*lTb9| z=BH$)RpQq0qFhrCs6hj6LrG?CYH>+oZUJsR`;$060`)|tMtG+A`Z8z%*&Gb4j6w{c zuww*521Y3cRxq1^!HZEE&JJSKfU03)U|ieXPLa@;T@rlU{=Am4<`75|`_Jt(8BhSEkQRR{!XFNr7{3-J#>6Pir1j)gEp- zE>wSTSzG$Dt9tPp)+*k#dsugPozSCG`%}+<*?pXQ+k`H;!~0e|(iD$5uqL+4!89iC zd&t`7(FVEtjzJHz-A}A~KB*`#wej-3EU(aN=^uWFCaqx(GpI3-bvCh0)Ty|ct=oJ5 zTIj|IyM#84#Vhq+RB=7peJ`hh)7S4sUz`7a>12Nn!=w8ay0=Dg%oWKuXS>2Jw{=~% zF0*fyWu}GRNEQmZ*8H$FK>du? zBU^^#*#=_EIbN~IZgg8e|M0JtjNK9~mYK(nJeOW4%;wP^w?|-auTo9(TdHE)>uM_elH9C2ZU7Z#jl-8~JvH8fK1&g)M3G*q5 zD;>Sv(#SCP{qkGV&VhS`ow!2w{nWl}P^>Thh1I6~BmZ{U9W%cf3cvXJes=ESg;A65 zGau&YwYV#Qh zrVQh!7RMW}W)&M|-+IGXZ}CQe^L=ezPq2L44mFp%HyA7yL{C(gG1l%YERZSo@vAuN vV!vc|%!lV~9`)b*Y7ZT6wOaLu-)?=qo8ZNqIUDEg1tmvMS3j3^P6-L1 z;O^rR;ODMTmRh7>tY=c#y5u2H2}enRpF2>-7|3SuYS5IQs3=@-5a1Ky`v3p`Yg4MX zdP#s}hya_!Sp0y>7?Zr+U6=)Vd_Do$)t)YnAr*6Kr(En+G30Quob15N$ups$@lUa} z&G(H_rgrr`CRJL&AXZ+Z?;7~+cy|^Tc_M5<6TvL`Nta|mEV?M9lT}}}p zR=Wr;g--|Am**{t6ntZQFemKJDb@THVLK#N)?d3V5V-buM(q#T!%9N86k=oV?Pc+N zBHtwX^&M+wazXCeDr=`-3$onm|Grf+;oXLByC+XRG&wKM`Q7qmTa1om zH%&~F6fvyNG_;PXbE^1tXN6Rsn$^M7m?pWCn~k_9KVOvVp={FrWd8(9%jId)rdL+4 zQrypXGH3Z5&shssTlGqBoHdKn*R*NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VW5Hf|~E0P;8s zJR*x382FBWFymBhK53vJdx@v7EBjMMW?mJwzO8}B85kJrJY5_^G|ngg;Ad=C6k%@p zr5xOUa{cG!Eob8&+_C>JZu;@}mBTyc*Xdro`T4lq zx!9*0?nxZ{yQ3xX+&t-mciS5_7hk)xhu=I)^!>H1Q=cc^*}r<%o8R_d55K*dH7UBj zQ}&!~>f)1g4)i>@w&QR71D@wxe>nf0{v>-&^w+CT*To*PuIydM_mAV<$}n+Wc9!oG zG8RmmWIyM(dqeTIV<|2VWV}Chdbky=_j^$|$z_u7lZhdY1^sMlD?Js8)4jM9c7#XV z4f*l<;hp}4ZM?7FPTY~FnJv)uzpKqn$DzwHt&LfR^Nm|sTk;HZq3|o>z z40R2F$T-B%*vi<<%Gg5Nz}U*b;9rq94~mA|{FKbJO57Uy^*?U_YGCkm^>bP0l+XkK D9{>O} diff --git a/gfx/trainers/channeler.png b/gfx/trainers/channeler.png index 3fd174a519656c9995fa88d47c840ee7726116b0..9b4b50ac0801a44c795c228b450cd689cb4d24a0 100644 GIT binary patch literal 757 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ_7YEDSN0d|Qi4pv0@|DQ1BJv( zTq8(IUI|pjnB?v5@_#A&r=tuEOp=~1 zjv*CuwuWTxQdZ zczcuQf>F(;nhi&usp};q#$RSSF-N;ECz*G%Y1n$fD{tI?NJaGO21te&KQe8J%HHDE zw?HEOV$$VpUnLLu@=QOK#VpUft;oT()urOB;X~mSY`YhUdKSeMuQfHZH|XtL9k!K~ zbHa0;PBTN7l&!z|Ty%^kp3Z#`9ywWVgR20eqQ&av_>I4r~{+EsQ`Zo*#Osy6ZH{0nnJbsV3# zT;X=r+S6!twENzRSt2Vx82>F1UD&NB!m9Xp!JPPs5A8dR=2WeF&3?u_aNch5sB^6v zA`G^V%qwTP@BaN(S?RTM=d8G=y!-a%^#**N%J@!=|I_UHqgRY#_+kw_@-Cee4pYcP+hX?*yd-Orw09J=zGq-;w}G!*;4VV*+05JcKypVKmA$j zv4$s?CCu)L$GhA*`^oCTqGRR;7e8KlCEK0rUiw$i;&qWu=6{BZF8djFJWDTLo-XbN ON?4w*elF{r5}E+d2Q+#B delta 592 zcmV-W0FRY7=Ho)0002TU3_Bz00JaQL_t(|+KtoCYtvvD2k}pFH9FK5w1`aOQyj;eq}y58_!@a(~D#YCIZUv;=>s$X;i$ zXG^y07Sjwc7Rr*zGP7 zNlP$6&9|93qJgYN*!sE>owKvDt5l@=Div`-R$2R#7rK_?EJ=E4ui2dk5K-e3=-|l z;^uejWUxbnKKp3>x=|iZa!m0#XxOpI)?`v+5aVR~h+}0u`hcML+-r<%8=vhW@0%}n z1r%nNigl!*b2fSJ7q4#njB&CK)4wck*N}-S>eLH_-+ya-nV@(FZCZU<4L?Oi75o;; zU4Ees&^;EUiRVg4*?-^;1^Y`~cn5pfljCMV_gvL3etbBcK7|X4o!tFAWeaYF^5Hid zQ<6;L_PkPzPiYV{*MfSbB%_E!S6cR^f_28;ijmhUJA$W#Xby1}3OT_ZA;jTlrTmA) zAf)j4FG+6_a&K!IMI6uwx%22OSx3sBkWrqPt;TN(cF-q-fK2{M<;T4&w@+h|N8Zf8 e;H}P(>AwLt`wyc9Ff1Pc00001Z)u_g`di8`T%i@vu&ieEGw`m1kb{+nvll^)6G~PRvyIU+T8; zp;+J^Uu&+jUFBen_O%WxU@S9u%OcwDu+ z{2?^;f|sDX)atlO?`fY!>K)IYSiG%#L-Um^!4|1^*>=ls?PjouuIZYQ;S#^`@KaIw zJx&uCR&{*oV0rF*VSRj!m_Fn0PJK(+`aPm&eM*164Kx(23251KCuzUt3MYZ+4PNe* zJ7r&{I5Kr9I85eSUMbTXpVS{W+c_)HgR@L&cKV4_c9R1O(mqJ`hA=+7KE=zlv5({O z!*3P}1>aa}%gQ~4PCpi$8?rZ~{q`%rw6l-?f8~feS<5FPIKgzms#E%|J7xL%DsHyj zh->mvaCPxZ|vDG@aEw!pMnX%~Xo3xX< zm-r+er)nSE{V@0p`>Rb4`BG21E->3*U-;#H?KWLE>t_YLGws%EwYtgP=re36s(!ie zNz(U<-=9o7%y-_Xas1Z4;7Q_5y%%NSEy*SKndFNO7u;tu*sJaI_IgTe~DWM4f7PCIb delta 602 zcmV-g0;TPymy%24!HXyx#T>*#6dUj=3QZ@4`~%{q)>;X|M#M`m z1wDBw*=$5Dvl(}1LydU!yZsoLH^cjY{}uRu*8SbIqD<{#lYeS@7i+X){-Je_mKols zd7G9$==Oyd8(J5zr(?5FJ_g4m-9C=ug_>IRNM1eB0mXxD1WG72>rU3CJIQY z-OBwX48hYdOGttcTFyNSz(@W{!IYbG!NFnNe^$>kMwes6;#9)HaN+83e6lMf+iz3F9jO& zgkXmTBe$kr9?y5!V!m{Ob00|vGN$w?rjBIf@-9g$m?1>OLM@DD1>Hd$uU{QdtxYuM zGE(;jbW_ui{VwCaG2DtUDdAF=y-tZha=C>BtDURrvezkORT6V~16^?{WhgFN5Oc^N oAZWmbsAttB8;uAu{7?CR1BasszbI$382|tP07*qoM6N<$f=WyiSO5S3 diff --git a/gfx/trainers/firefighter.png b/gfx/trainers/firefighter.png index f0a3617bb0e42cbc6d93d1c92494c77ae72891ef..803f4f304ab36d0f88358d6d8abd73046cf2b5e6 100644 GIT binary patch literal 625 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ_7YEDSN0d|Qi80ez3B^EfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0;o!eO!9Vj`M;F?(@`LMs;7%% zNX49|Q%+B0QRHX~6c+GxP+@HSQyl$b-nv@{?cS$a`b_=H`Nu}4p+2KCbgA6@$UouB zB;BWlvO5&I<+4UZTsyvT*^4Lvu_u*>cg8&sy?W?e;h|+}UmtyLm}jE6|Apxa`N`%x zB3OT${b5UdyLV&B;q@C7^!(+mS`4@Z-taBGCba87(2W`yr6&yHlUPlP{W)S2)-s!) zDyaYQE`FQhG`+bFB8$_%?Oxrp#=`LEk~$fuxhn!&6|VP(s(Bus`@lLc?7mEPw(>2t z@>=Uvm-ccNM_Vc%P`j$=e@yPmsz_|(bni8lLvjnJCKPVmna%SiX+!ki%dv|Sf;ZoG^S^Vh zJS}U&1=Y)uD=Y52^YjnvI-fi<WA`T6IE h((CKzZT&a(FT+D8mmNwkZr6h%)zj6_Wt~$(697&(0QUd@ delta 880 zcmV-$1CRXi1p5Y%7=H)?0000dT+;{9>Vzo77-OBVIlF6vlYrlQH?k350gUL)PV8h)>Ku@IT^E1q6c^|x*QeLE zxRh(~uGgzzx_=#@VaT}SfibMF-rus}!I9p3trg#Et;XA!ED$tyiLNzzU6;xAsuH8c z2{aBIXf%{07&|GC3Y!o$hk-^pIIJ0Fh#0ae0A5l`>Alm<)#Z_F`IL7@@01a&SL3<| zPl`vg{L{s%R1F2(c8h4p>%C{Bhnx3@0Z@6hR=AYES%1BKn11~BqlL_HQw-9#@QHd# zInfc*vm0%dQPIp4sXvf@uIpm1H&v`DXS;;68;GI}8gd;*8E{R{6*s5+NRVi#%u_=o zMJ=V5agprPbJ&_RVFuep2_s^p&d>six7=DoYubB{JJZ_h(L9(DXh=yP!G>)c6Vb3T7iioDeB(6~@eM4VQ8Af?aPco$6VHqXL z=uKmV%LgkO_rEXlk=c>l) z-QORKTo2rT`^DPC22h@Ad6ldPsmJ5y8JTl<9G%w3-#y1Mkgg)#HN#2 z>V#!zw=ZHjWIU+}-y(VoOM_#s=YOSrGycnem%kK0hUg!y{qTJ38x~ps0000uphQYx9>va@}yGMB*X8p$>JN|Tb7vZze-uL^WybvclI!nY}Y zLGY7VaS2P+riN_@pJujjY2<&mO-*asGIaUk4{SbvO?qF0sbktytp_nbU3i0%{bMVA z^d=uLIde$;iExSt-`bFOvfjc|!~()x?taKG;%f8o*Wh11QK-;zxkm6>?h2C<>4!dP z!V8{wd#Ws+w9+l}L+6SMS8JQrd~D4492WVBIcock)B_R^8E>T5PR`lwtGX(L<&xUX z*)?(kktwgGFCLC`o+7^3s8po0JK=9YS;|r4B@9QV9X)7jJEbbm#%-y2x|iz9t=s;^ z#Jf3MPg1(S(xF!9+xi2ic{IH)zTe$GDe3^@N79 z*`=VS5T0gj!Ij-D5fl*)j{O5dwL8?1o8sb+!GGZ}ZjnMG9L3$~seup=uRHI(yXV#o zkNfcb-jDAOu$C_P7fD zMc3$*{{|)%Ef{*|6=5@|5;e-}E%fbK%Q|N_Veg4~Rpi~MU)t@=bCTSR-E1#PO3tWr zyg;fu+fK3z=nNi of}2cx$oh#}1a)1y8@AYvKSUN#3lrbR9RL6T07*qoM6N<$f>AxwvH$=8 diff --git a/gfx/trainers/tamer.png b/gfx/trainers/tamer.png index 14fe7a536db074c7581dfd14d4eb92e27f2fa3d5..d15db3bd9bf5fe414a1eae0ca4eeac83179a7b44 100644 GIT binary patch literal 727 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ_7YEDSN0d|Qi3cNug<=y1PY0l zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o|NsA=>nZjs2H8yv;I9#70jgt6@^*Lmzm)ycQ6T%br;B4q z#hluyHxI5+;Av&fY*@-Tjg9Hc{oA&T?ib_r`FlR4T5>)R`0FOI`117?$vs~V>fD&V zI`FuDxb-WIr-!Fjzu>F9pZM*j^>4Z9wr#7OH8^gzbDAGG;q0S&>Kmi>f`W-!Tid@B zrmmDpH0TQ z6Q;$vR6l*fx{PzB4eiImK30Ey*U-trwYt}t@2B*f?JXydtGJ&w z+hLVbbKUQ|_=zV;vu=N8Iy%EH-h5}xnO$8+s{UVMe${n3<(b-d_M_{V@{8V1bUZV$ zc6#=umzMRXeb?PdTw?o@^L0;R;K!%4rmss$ovG?4&U1RnGv#9^qL-dtV_AOS+4d!? zr#(BHI6twhYF$*(k6N*tvkOA4k~iFYAiDD5;i5w?ch=@6mLJp*p11G~-*d;cxBtEW jaQ?ynKY=gaUic}0qtnr0hln>QJu!H?`njxgN@xNA8A3C1 delta 553 zcmV+^0@nT41-1l`7=Ho)0002TU3_Bz00I3;L_t(|+Evm$XcR#d2k<#I-g2Uzm7pmO zBt=Xkn)b{lhz4v{IK;vtAQJFEg4imHSZE>S6hsniRK#S9h#IRHHbIV4MCQaoiGeE& z*vZ`P=00%d{?5+M-mOzC{O0ZQ-rM&GBGy@Zp3NAx9e z;UYfHDh9wfPL#0qcEIZ;_`iha{@Qj4%^@@5Z-h4w<`02URmM-y;^pU6L{&&qG^XCX zWMI$?2_qZW=V=Bk5F?B`n(e?0e;7!<6(;D?4II~$Wq(XO-9@2K{`YPNw9nvAf#Y*R zO1UGPc0xF>(X)a+Ps#sc`MPFcLf%u(`IH0^qMn`mchB!h^pe1Fba`?Kx;wWH)@}ff}d