From 7655162dbda4920a869fb81fcf1dfeb592e8f8ac Mon Sep 17 00:00:00 2001 From: Martha Schilling <112545117+MementoMartha@users.noreply.github.com> Date: Wed, 15 Nov 2023 10:15:25 +0000 Subject: [PATCH 01/24] Update songs.asm Just a handful of music changes. --- data/maps/songs.asm | 68 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 33d2a15b..dbdd4f77 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -38,8 +38,8 @@ MapSongBanks:: db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23 db MUSIC_ROUTES2, 0 ; ROUTE_24 db MUSIC_ROUTES2, 0 ; ROUTE_25 - db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY - db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden + db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL + db MUSIC_ROUTES2, 0 ; BILLS_GARDEN db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE @@ -72,16 +72,16 @@ MapSongBanks:: db MUSIC_CITIES2, 0 ; BIKE_SHOP db MUSIC_POKECENTER, 0 ; CERULEAN_MART db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER - db MUSIC_GYM, 0 ; VIRIDIAN_PRE_GYM, was CERULEAN_TRASHED_HOUSE_COPY + db MUSIC_GYM, 0 ; VIRIDIAN_PRE_GYM db MUSIC_CITIES1, 0 ; ROUTE_5_GATE db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5 - db MUSIC_CITIES1, 0 ; DAYCARE + db MUSIC_CITIES2, 0 ; DAYCARE db MUSIC_CITIES1, 0 ; ROUTE_6_GATE db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6 - db MUSIC_KINCHOU01, 0 ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY + db MUSIC_KINCHOU01, 0 ; CELESTE_HILL db MUSIC_CITIES1, 0 ; ROUTE_7_GATE db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7 - db MUSIC_DUNGEON1, 0 ; Rocket House, UNDERGROUND_PATH_ROUTE_7_COPY + db MUSIC_DUNGEON1, 0 ; CITRINE_ROCKET_HOUSE db MUSIC_CITIES1, 0 ; ROUTE_8_GATE db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8 db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER @@ -108,19 +108,19 @@ MapSongBanks:: db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F_ROOMS db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F_ROOMS db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F_ROOMS - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_69 / Gauntlet 1F - db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_6A / Gauntlet 2F - db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_6B / Gauntlet 3F + db MUSIC_DUNGEON2, 0 ; SILPH_GAUNTLET_1F + db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F + db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F - db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D / Gauntlet 4F - db MUSIC_SAFARI_ZONE, 0 ; UNUSED_MAP_6E / Gauntlet 5F - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F / Gauntlet 6F - db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 / Gauntlet 7F + db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F + db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F + db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F + db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE - db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F - db MUSIC_AREA_ZERO, 0 ; UNUSED_MAP_75 / MT. MOON CRATER + db MUSIC_DUNGEON2, 0 ; FARAWAY_ISLAND_INSIDE + db MUSIC_DUNGEON2, 0 ; FARAWAY_ISLAND_OUTSIDE + db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B2F + db MUSIC_AREA_ZERO, 0 ; MT_MOON_CRATER db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM @@ -148,8 +148,7 @@ MapSongBanks:: db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO - ;db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F - db MUSIC_FIELD06, 0 ; Celeste Hill Gate, was POKEMON_TOWER_4F + db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F @@ -167,8 +166,8 @@ MapSongBanks:: db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F - db MUSIC_CITIES2, 0 ; CITRINE_TRADEBACK_HOUSE, was old rod house - db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER was good rod house + db MUSIC_CITRINE, 0 ; CITRINE_TRADEBACK_HOUSE + db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F db MUSIC_GYM, 0 ; CINNABAR_GYM db MUSIC_CINNABAR, 0 ; CINNABAR_LAB @@ -180,7 +179,7 @@ MapSongBanks:: db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F - db MUSIC_CITIES1, 0 ; FIGHTING_DOJO + db MUSIC_GYM, 0 ; FIGHTING_DOJO db MUSIC_GYM, 0 ; SAFFRON_GYM db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE db MUSIC_POKECENTER, 0 ; SAFFRON_MART @@ -207,16 +206,15 @@ MapSongBanks:: db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR - db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC - db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD - db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F, was UNUSED_MAP_CE + db MUSIC_POKECENTER, 0 ; CITRINE_MART + db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F + db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F db MUSIC_VERMILION, 0 ; VERMILION_FERRY_DOCK db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F db MUSIC_CITRINE, 0 ; CITRINE_FERRY_DOCK db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F db MUSIC_VERMILION, 0 ; SEAGALLOP_FERRY db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F - ;db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F @@ -232,20 +230,20 @@ MapSongBanks:: db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F - db MUSIC_CITIES2, 0 ; NAME_RATERS_HOUSE - db MUSIC_CITIES1, 0 ; CERULEAN_BADGE_HOUSE - db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_E7 / Cinnabar Volcano + db MUSIC_LAVENDER, 0 ; NAME_RATERS_HOUSE + db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE + db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR - db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_ED - db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_EE / Underwater Tunnel - db MUSIC_CELADON, 0 ; TRADE_CENTER - db MUSIC_CELADON, 0 ; COLOSSEUM - db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside - db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter + db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F + db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL + db MUSIC_CITRINE, 0 ; TRADE_CENTER + db MUSIC_GYM, 0 ; COLOSSEUM + db MUSIC_OAKS_LAB, 0 ; CELADON_UNIVERSITY_INSIDE + db MUSIC_POKECENTER, 0 ; CELADON_UNIVERSITY_POKECENTER db MUSIC_GYM, 0 ; LORELEIS_ROOM db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM From d0decc8e667d3e6e105bdd7dc525544308fdc8fb Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 17 Nov 2023 09:27:03 +0000 Subject: [PATCH 02/24] Ubers sprite update (it's actually just Lickilicky and Porygon-Z but whatevs) --- gfx/pokemon/front/lickilicky.png | Bin 844 -> 963 bytes gfx/pokemon/front/porygonz.png | Bin 847 -> 887 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/front/lickilicky.png b/gfx/pokemon/front/lickilicky.png index 40f419b094dc0b25d547cc7b863d6b7a6fe3dd22..5599c345c01a1ffedc11c146226eaa5c9861c891 100644 GIT binary patch delta 747 zcmX@Zc9?yF1Sbar0|P_v+mu5S4NZ0bxA&jf&%nUIS>O>_%)r2R7=#&*=dVa%U|?V` z@$_|Nf6gt)DW*5Qp846t$!ZdYhPsC4AqJLKMn+a9rrHJuRt5$i92hT8yeR2|O|DUP zXFdZ1gGPyKL`h0wNvc&zW^QV6Nn&mRgOP!eu`Y@pGl+T5A2jJsW@5~!XOj1HaSZV| zK6hHQ-w^{I*Y$3X+W%Hgz9;9TtT-d!c45-r~SQ>Ci!L$_94TqPH$-|X&ctuDKh<5Hn{ zk+qQaxrQRIK7}o6)8w=|xD_HDE$aW=oFE}9)cPhv{|2Yco6SB`>_Yx1d0aRxry0w# z^0(sQ7hZ*1tWr8BuKXhvd%)=C&a9u#8Td=`7-E1 zy<7!@;v@GNY`l2bMsSNb4pr-wxs@^P;)Wy*ezopr0FGrqK>z>% delta 627 zcmX@ieuiy=gd`IK0|UeH*qUSp1_qXNM_)$E)e-c?IDw^st8@Cj7FfcH17I;J! zGcfQS0b$0e+I-Rs3=Hfgp1!W^&zabS*~C;XG~JlktR`V#q-$UnVrXe)U}j}xsBK_i zWnl17+<5!MgOaFn1`s(j+lKv<)fhAC8P9mSIEHAPuf6P>E$k@4{=smA*3OWlqO&Fk zh)iDm{LqzYayF^g&vpD@?7DegAwsb$E;h(my>RxCSKijRCUVJ>ZDDU2B`?sCke$_YMz0M7vaYpZ@r*-vip6zNztSh%($T?H_ zN#yOWnAUhD%YFT80wvz9x7ZfAzErfW;xR{|fN`tbuli~GFUrc~Mcz8(QfRiLw)E-+ zF*U2IE9`MI&TJF9xLou^*VMHxZ`fot+zpo-EVk@Yzfv3?rWiG6@0XgoR3^#dHd*(q zbq|^6Ey`T+AufF5b=APr!9qOScXFOD-4p%qfMoy5T))_fbCvUUJgX}8fBo6{T=3=W z)5@#%A5&ewzFu->s?F>@FDoVs8lO;pXBTvQrS7C9XLJvm9N`EJ>j%5=1BZE+ SYG*71B`;4`KbLh*2~7Y{RuF6e diff --git a/gfx/pokemon/front/porygonz.png b/gfx/pokemon/front/porygonz.png index 297008a222ab8231e0e842709e802a0043d35717..61f437cb13e73146d69a0a36a8c8458808f14925 100644 GIT binary patch delta 643 zcmX@l_ML5l%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gt)DW*5Qp846t$!ZdYhPsC4 zAqJLKMn+a9X4(b@Rt5$KS4jI!yeR2|B4-MbYn0uY&%nT-QQ{g=l9E`GYE_b%n_66w zm|MVLWME{hi=qc=-tz}dx|5k0GwUyVx;TbtoDaQd=p*7N!f+w7|22>F(Txi>ev7hp zGMbRFH#_gY)VhTVF=qlVMLHxVRhBxYb?%84T=j&(__!`#Qk{qZ?*X=tubzbco+en>Z?T0%Ywsu3>&fn|sq41dJ({O_ zKyB8a$7>QD{>WtHP5Q~yJ1^!n=VzG(-ZJlBmE0&Ws9W@#vG5fC?0ZkFe5Drs*>Zzj zZTr?`DRUfsC*-eSs)(5xUo|7pOCog1flYC&6=AXU&!SF8ZFRiV?4rDIadT6}nLU=> zY&QjLIgMTS?E1nsYgxwOa}#zc2MpFwNAM z%Ig-YH*fzj>y!31ni*>MijHQki4=&C+Tb4fiR)#{i;81ie`amrO&pI|iA|WD zcl)}k(uvJ#5(Y-P24*3KmR1JlR))sf1_o9J2I5EkoF^WXM3pmw$Q^k9*L$)WV`lw% zPZ!4!jq|>j4D&As2(TA)UvqjTBzFGH2gQoDS`m+%&NC?ov}CX_?qhIrdE+6;r8Tc> zirJC&0Bu79r#2m)h9fM@cdbQ_nGYdx%|B0U!J>J%rZA1%O*W{(S(fS!pjAdf81MDIQ#Gt#%*7irlx Date: Mon, 20 Nov 2023 11:00:20 +0000 Subject: [PATCH 03/24] would you believe me if i told you this still isnt done in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One - Fixed a bug where an item couldn't be picked up in Mt. Moon Crater - Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later - Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there - Brought Pokemon Tower 5F back for some reason - Moved the Rocket Grunt on Silph 11F closer to the Omegadge door - 'Fixed' a warp issue on Faraway Island, can definitely be improved though - Gave Gapdos 10 more base special because i forgot the first time - Fixed a typo in Hitmontop's dex entry - Fixed some inconsistencies in Gao and Gorotora's movesets - Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene) - Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene) - Made Sandshrew more common in Mt. Moon - Improved the 'already caught' icon - uncapitalised all new instances of "trainer" in the text to make it more consistent - HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded --- README.md | 2 +- constants/hide_show_constants.asm | 281 +++++++++++----------- crysaudio/cry_headers.asm | 28 +-- data/maps/hide_show_data.asm | 29 +-- data/maps/objects/CitrineCity.asm | 6 +- data/maps/objects/PokemonTower2F.asm | 2 +- data/maps/objects/PokemonTower5F.asm | 2 +- data/maps/objects/PokemonTower6F.asm | 12 +- data/maps/objects/SilphCo11F.asm | 2 +- data/maps/special_warps.asm | 6 +- data/pokemon/base_stats/zapdosg.asm | 2 +- data/pokemon/dex_entries.asm | 2 +- data/pokemon/evos_moves.asm | 12 +- data/tilesets/collision_tile_ids.asm | 2 +- data/tilesets/pair_collision_tile_ids.asm | 7 +- data/tilesets/warp_tile_ids.asm | 2 +- data/wild/grass_water.asm | 6 +- data/wild/maps/CitrineCity.asm | 14 +- data/wild/maps/MtMoonB1F.asm | 2 +- data/wild/maps/MtMoonB2F.asm | 2 +- data/wild/maps/Route5.asm | 4 +- engine/menus/pokedex.asm | 132 +++++++++- gfx/blocksets/cavern.bst | Bin 2144 -> 2480 bytes gfx/blocksets/citrine.bst | 6 +- gfx/font/font.png | Bin 2369 -> 1399 bytes gfx/tilesets.asm | 6 +- home/overworld.asm | 2 +- maps/CitrineCity.blk | 41 ++-- maps/GarnetCavern1F.blk | 6 +- maps/GarnetCavernB1F.blk | 2 +- maps/PokemonTower6F.blk | 4 +- maps/SeafoamIslands1F.blk | 2 +- maps/SeafoamIslandsB1F.blk | 2 +- maps/SeafoamIslandsB2F.blk | 2 +- maps/SeafoamIslandsB3F.blk | 2 +- maps/SeafoamIslandsB4F.blk | 2 +- ram/wram.asm | 4 +- scripts/BattleTent.asm | 4 +- scripts/SaffronGym.asm | 1 + scripts/SilphCo11F.asm | 17 +- scripts/VermilionCity.asm | 18 -- text/ChampionsRoom.asm | 2 +- text/CitrinePokecenter.asm | 2 +- text/RedsHouse1F.asm | 2 +- text/Route1.asm | 6 +- text/SaffronGym.asm | 4 +- text/SilphGauntlet6F.asm | 126 +++++----- text/VermilionCity.asm | 5 - 48 files changed, 465 insertions(+), 360 deletions(-) diff --git a/README.md b/README.md index 3c88b241..c9229c89 100644 --- a/README.md +++ b/README.md @@ -386,7 +386,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * ZumiIsawhat? - Restorations of prototype OST. * FrenchOrange - Reconstructions of various overworld prototype sprites. * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype PokΓ©mon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). -* Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI. Assisted in bug fixes. Used their sprite sheet generator. +* Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI and Pokedex stats page. Assisted in bug fixes. Used their sprite sheet generator. * Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual. * BGVC - Composed the original 4-channel version of the unused Koukan (trading) music. diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 87420f4f..84ee285d 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -21,60 +21,60 @@ DEF SHOW EQU $15 const HS_CERULEAN_GUARD_1 ; 07 const HS_CERULEAN_CAVE_GUY ; 08 const HS_CERULEAN_GUARD_2 ; 09 - const HS_VERMILION_JENNY - const HS_SAFFRON_CITY_1 ; 0A - const HS_SAFFRON_CITY_2 ; 0B - const HS_SAFFRON_CITY_3 ; 0C - const HS_SAFFRON_CITY_4 ; 0D - const HS_SAFFRON_CITY_5 ; 0E - const HS_SAFFRON_CITY_6 ; 0F - const HS_SAFFRON_CITY_7 ; 10 - const HS_SAFFRON_CITY_8 ; 11 - const HS_SAFFRON_CITY_9 ; 12 - const HS_SAFFRON_CITY_A ; 13 - const HS_SAFFRON_CITY_B ; 14 - const HS_SAFFRON_CITY_C ; 15 - const HS_SAFFRON_CITY_D ; 16 - const HS_SAFFRON_CITY_E ; 17 - const HS_SAFFRON_CITY_F ; 18 - const HS_ROUTE_1_OAK ; 19 - const HS_ROUTE_2_ITEM_1 ; 1A X - const HS_ROUTE_2_ITEM_2 ; 1B X - const HS_ROUTE_4_ITEM ; 1C X - const HS_ROUTE_9_ITEM ; 1D X - const HS_ROUTE_12_SNORLAX ; 1E - const HS_ROUTE_12_ITEM_1 ; 1F X - const HS_ROUTE_12_ITEM_2 ; 20 X - const HS_ROUTE_15_ITEM ; 21 X - const HS_ROUTE_16_SNORLAX ; 22 - const HS_ROUTE_22_RIVAL_1 ; 23 - const HS_ROUTE_22_RIVAL_2 ; 24 - const HS_NUGGET_BRIDGE_GUY ; 25 - const HS_ROUTE_24_ITEM ; 26 X - const HS_DAMIEN - const HS_ROUTE_25_ITEM ; 27 X - const HS_CACTUS ; 28 - const HS_BRUNSWICK_ZAPDOS_G_1 ; 29 - const HS_DAISY_SITTING ; 2A - const HS_DAISY_WALKING ; 2B - const HS_TOWN_MAP ; 2C - const HS_OAKS_LAB_RIVAL ; 2D - const HS_STARTER_BALL_1 ; 2E - const HS_STARTER_BALL_2 ; 2F - const HS_STARTER_BALL_3 ; 30 - const HS_OAKS_LAB_OAK_1 ; 31 - const HS_STARTER_BALL_4 ; 32, was dex, pikachu - const HS_STARTER_BALL_5 ; 33, was dex, eevee - const HS_OAKS_LAB_OAK_2 ; 34 - const HS_VIRIDIAN_GYM_GIOVANNI ; 35 - const HS_VIRIDIAN_GYM_ITEM ; 36 X - const HS_OLD_AMBER ; 37 - const HS_CERULEAN_CAVE_1F_ITEM_1 ; 38 X - const HS_CERULEAN_CAVE_1F_ITEM_2 ; 39 X - const HS_CERULEAN_CAVE_1F_ITEM_3 ; 3A X + const HS_VERMILION_JENNY ; 0A + const HS_SAFFRON_CITY_1 ; 0B + const HS_SAFFRON_CITY_2 ; 0C + const HS_SAFFRON_CITY_3 ; 0D + const HS_SAFFRON_CITY_4 ; 0E + const HS_SAFFRON_CITY_5 ; 0F + const HS_SAFFRON_CITY_6 ; 10 + const HS_SAFFRON_CITY_7 ; 11 + const HS_SAFFRON_CITY_8 ; 12 + const HS_SAFFRON_CITY_9 ; 13 + const HS_SAFFRON_CITY_A ; 14 + const HS_SAFFRON_CITY_B ; 15 + const HS_SAFFRON_CITY_C ; 16 + const HS_SAFFRON_CITY_D ; 17 + const HS_SAFFRON_CITY_E ; 18 + const HS_SAFFRON_CITY_F ; 19 + const HS_ROUTE_1_OAK ; 1A + const HS_ROUTE_2_ITEM_1 ; 1B X + const HS_ROUTE_2_ITEM_2 ; 1C X + const HS_ROUTE_4_ITEM ; 1D X + const HS_ROUTE_9_ITEM ; 1E X + const HS_ROUTE_12_SNORLAX ; 1F + const HS_ROUTE_12_ITEM_1 ; 20 X + const HS_ROUTE_12_ITEM_2 ; 21 X + const HS_ROUTE_15_ITEM ; 22 X + const HS_ROUTE_16_SNORLAX ; 23 + const HS_ROUTE_22_RIVAL_1 ; 24 + const HS_ROUTE_22_RIVAL_2 ; 25 + const HS_NUGGET_BRIDGE_GUY ; 26 + const HS_ROUTE_24_ITEM ; 27 X + const HS_DAMIEN ; 28 + const HS_ROUTE_25_ITEM ; 29 X + const HS_CACTUS ; 2A + const HS_BRUNSWICK_ZAPDOS_G_1 ; 2B + const HS_DAISY_SITTING ; 2C + const HS_DAISY_WALKING ; 2D + const HS_TOWN_MAP ; 2E + const HS_OAKS_LAB_RIVAL ; 2F + const HS_STARTER_BALL_1 ; 30 + const HS_STARTER_BALL_2 ; 31 + const HS_STARTER_BALL_3 ; 32 + const HS_OAKS_LAB_OAK_1 ; 33 + const HS_STARTER_BALL_4 ; 34, was dex, pikachu + const HS_STARTER_BALL_5 ; 35, was dex, eevee + const HS_OAKS_LAB_OAK_2 ; 36 + const HS_VIRIDIAN_GYM_GIOVANNI ; 37 + const HS_VIRIDIAN_GYM_ITEM ; 38 X + const HS_OLD_AMBER ; 39 + const HS_CERULEAN_CAVE_1F_ITEM_1 ; 3A X + const HS_CERULEAN_CAVE_1F_ITEM_2 ; 3B X + const HS_CERULEAN_CAVE_1F_ITEM_3 ; 3C X const HS_MOLTRES_G ; 3D X const HS_POKEMON_TOWER_2F_RIVAL ; 3E - const HS_BRUNSWICK_ZAPDOS_G_2 ; 3F, was const HS_POKEMON_TOWER_3F_ITEM + const HS_BRUNSWICK_ZAPDOS_G_2 ; 3F const HS_POKEMON_TOWER_5F_ITEM ; 40 X const HS_POKEMON_TOWER_6F_ITEM_1 ; 41 X const HS_POKEMON_TOWER_6F_ITEM_2 ; 42 X @@ -164,92 +164,91 @@ DEF SHOW EQU $15 const HS_SILPH_CO_3F_1 ; 97 const HS_SILPH_CO_3F_2 ; 98 const HS_SILPH_CO_3F_ITEM ; 99 X - - const HS_SILPH_CO_5F_1 ; A0 - const HS_SILPH_CO_5F_2 ; A1 - const HS_SILPH_CO_5F_3 ; A2 - const HS_SILPH_CO_5F_4 ; A3 - const HS_SILPH_CO_5F_ITEM_1 ; A4 X - const HS_SILPH_CO_5F_ITEM_2 ; A5 X - const HS_SILPH_CO_5F_ITEM_3 ; A6 X - - const HS_SILPH_CO_7F_1 ; AC - const HS_SILPH_CO_7F_2 ; AE - const HS_SILPH_CO_7F_3 ; AF - const HS_SILPH_CO_7F_4 ; B0 - const HS_SILPH_CO_7F_RIVAL ; B1 - const HS_SILPH_CO_7F_ITEM_1 ; B2 X - const HS_SILPH_CO_7F_ITEM_2 ; B3 X - const HS_SILPH_CO_10F_1 ; B7 - const HS_SILPH_CO_10F_2 ; B8 - const HS_SILPH_CO_10F_ITEM_1 ; B9 X - const HS_SILPH_CO_10F_ITEM_2 ; BA X best deck - const HS_SILPH_CO_10F_ITEM_3 ; BB X - const HS_SILPH_CO_11F_1 ; BC - const HS_SILPH_CO_11F_JAMES ; BD - const HS_SILPH_CO_11F_3 ; BE - const HS_SILPH_CO_11F_JESSIE ; BD - const HS_OMEGA ; BF - const HS_OMEGA_2 - const HS_DRAGONITE ; C0 - const HS_MOLTRES ; C1 - const HS_POKEMON_MANSION_2F_ITEM ; C2 X - const HS_POKEMON_MANSION_3F_ITEM_1 ; C3 X - const HS_POKEMON_MANSION_3F_ITEM_2 ; C4 X - const HS_POKEMON_MANSION_B1F_ITEM_1 ; C5 X - const HS_POKEMON_MANSION_B1F_ITEM_2 ; C6 X - const HS_POKEMON_MANSION_B1F_ITEM_3 ; C7 X - const HS_POKEMON_MANSION_B1F_ITEM_4 ; C8 X - const HS_POKEMON_MANSION_B1F_ITEM_5 ; C9 X - const HS_MANSION_GUARD ; CA - const HS_SAFARI_ZONE_EAST_ITEM_1 ; CB X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; CC X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; CD X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; CE X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CF X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; D0 X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; D1 X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; D2 X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; D3 X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; D4 X - const HS_SAFARI_ZONE_CENTER_ITEM ; D5 X - const HS_CERULEAN_CAVE_2F_ITEM_1 ; D6 X - const HS_CERULEAN_CAVE_2F_ITEM_2 ; D7 X - const HS_CERULEAN_CAVE_2F_ITEM_3 ; D8 X - const HS_MEWTWO ; D9 X - const HS_CERULEAN_CAVE_B1F_ITEM_1 ; DA X - const HS_CERULEAN_CAVE_B1F_ITEM_2 ; DB X - const HS_VICTORY_ROAD_1F_ITEM_1 ; DC X - const HS_VICTORY_ROAD_1F_ITEM_2 ; DE X - const HS_CHAMPIONS_ROOM_OAK ; DF - const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; E0 - const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; E1 - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; E2 - const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; E3 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; E4 - const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; E5 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; E6 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; E7 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; E8 - const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; E9 - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; EA sports. to the game. - const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; EB - const HS_ARTICUNO ; EC - const HS_MEW ; ED - const HS_POKEMON_MANSION_B2F_ITEM_1 ; EE - const HS_POKEMON_MANSION_B2F_ITEM_2 ; EF - const HS_MT_MOON_CRATER_ITEM_1 ; F1 - const HS_MT_MOON_CRATER_ITEM_2 ; F2 - const HS_MT_MOON_CRATER_ITEM_3 ; F3 - const HS_GIOVANNIS_ROOM_ITEM_1 ; F4 - const HS_GIOVANNIS_ROOM_ITEM_2 ; F5 - const HS_ROCK_TUNNEL_B1F_DOME ; F6 - const HS_ROCK_TUNNEL_B1F_HELIX ; F7 - const HS_ROCK_TUNNEL_B1F_AMBER ; F8 - const HS_ROCK_TUNNEL_B1F_WING ; F9 - const HS_MT_MOON_CRATER_GUARD ; FA - const HS_DAYCARE_BULBASAUR ; FB should be FD - const HS_GLADE_GZAP_1 - const HS_GLADE_GZAP_2 - const HS_GLADE_GZAP_3 ; we're at 250 -DEF NUM_HS_OBJECTS EQU const_value + const HS_SILPH_CO_5F_1 ; 9A + const HS_SILPH_CO_5F_2 ; 9B + const HS_SILPH_CO_5F_3 ; 9C + const HS_SILPH_CO_5F_4 ; 9D + const HS_SILPH_CO_5F_ITEM_1 ; 9E X + const HS_SILPH_CO_5F_ITEM_2 ; 9F X + const HS_SILPH_CO_5F_ITEM_3 ; A0 X + const HS_SILPH_CO_7F_1 ; A1 + const HS_SILPH_CO_7F_2 ; A2 + const HS_SILPH_CO_7F_3 ; A3 + const HS_SILPH_CO_7F_4 ; A4 + const HS_SILPH_CO_7F_RIVAL ; A5 + const HS_SILPH_CO_7F_ITEM_1 ; A6 X + const HS_SILPH_CO_7F_ITEM_2 ; A7 X + const HS_SILPH_CO_10F_1 ; A8 + const HS_SILPH_CO_10F_2 ; A9 + const HS_SILPH_CO_10F_ITEM_1 ; AA X + const HS_SILPH_CO_10F_ITEM_2 ; AB X + const HS_SILPH_CO_10F_ITEM_3 ; AC X + const HS_SILPH_CO_11F_1 ; AD + const HS_SILPH_CO_11F_JAMES ; AE + const HS_SILPH_CO_11F_3 ; AF + const HS_SILPH_CO_11F_JESSIE ; B0 + const HS_OMEGA ; B1 + const HS_OMEGA_2 ; B2 + const HS_DRAGONITE ; B3 + const HS_MOLTRES ; B4 + const HS_POKEMON_MANSION_2F_ITEM ; B5 X + const HS_POKEMON_MANSION_3F_ITEM_1 ; B6 X + const HS_POKEMON_MANSION_3F_ITEM_2 ; B7 X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; B8 X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; B9 X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; BA X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; BB X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; BC X + const HS_MANSION_GUARD ; BD + const HS_SAFARI_ZONE_EAST_ITEM_1 ; BE X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; BF X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; C0 X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; C1 X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; C2 X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; C3 X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; C4 X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; C5 X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; C6 X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; C7 X + const HS_SAFARI_ZONE_CENTER_ITEM ; C8 X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; C9 X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; CA X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; CB X + const HS_MEWTWO ; CC X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; CD X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; CE X + const HS_VICTORY_ROAD_1F_ITEM_1 ; CF X + const HS_VICTORY_ROAD_1F_ITEM_2 ; D0 X + const HS_CHAMPIONS_ROOM_OAK ; D1 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; D2 + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; D3 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; D4 + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D5 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D6 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D7 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D8 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D9 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; DA + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; DB + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; DC + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; DD + const HS_ARTICUNO ; DE + const HS_MEW ; DF + const HS_POKEMON_MANSION_B2F_ITEM_1 ; E0 + const HS_POKEMON_MANSION_B2F_ITEM_2 ; E1 + const HS_MT_MOON_CRATER_ITEM_1 ; E2 + const HS_MT_MOON_CRATER_ITEM_2 ; E3 + const HS_MT_MOON_CRATER_ITEM_3 ; E4 + const HS_MT_MOON_CRATER_ITEM_4 ; E5 + const HS_GIOVANNIS_ROOM_ITEM_1 ; E6 + const HS_GIOVANNIS_ROOM_ITEM_2 ; E7 + const HS_ROCK_TUNNEL_B1F_DOME ; E8 + const HS_ROCK_TUNNEL_B1F_HELIX ; E9 + const HS_ROCK_TUNNEL_B1F_AMBER ; EA sports. to the game. + const HS_ROCK_TUNNEL_B1F_WING ; EB + const HS_MT_MOON_CRATER_GUARD ; EC + const HS_DAYCARE_BULBASAUR ; ED + const HS_GLADE_GZAP_1 ; EE + const HS_GLADE_GZAP_2 ; EF + const HS_GLADE_GZAP_3 ; F0 +DEF NUM_HS_OBJECTS EQU const_value ; F1 - FE all go unused. diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index a4d72e4f..8d458072 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -24,8 +24,8 @@ PokemonCries:: mon_cry CRY_VENONAT, 16, 160 ; FLAREON mon_cry CRY_AIPOM, 162, 320 ; ESPEON mon_cry CRY_VENONAT, -233, 240 ; UMBREON - mon_cry CRY_NIDORAN_M, 0, 0 ; LEAFEON (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; GLACEON (incomplete) + mon_cry CRY_CHIKORITA, -1, 512 ; LEAFEON + mon_cry CRY_AMPHAROS, 63, 592 ; GLACEON mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete) mon_cry CRY_RATTATA, 0, 256 ; RATTATA mon_cry CRY_RATTATA, 32, 383 ; RATICATE @@ -37,19 +37,19 @@ PokemonCries:: mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN_A - mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise) + mon_cry CRY_AIPOM, -221, 232 ; PERRSERKER mon_cry CRY_CATERPIE, 128, 160 ; CATERPIE mon_cry CRY_METAPOD, 204, 129 ; METAPOD mon_cry CRY_CATERPIE, 119, 192 ; BUTTERFREE mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL - mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete) - mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) + mon_cry CRY_MUK, 163, 187 ; GENTLARVA + mon_cry CRY_KRABBY, 144, 151 ; PUPAL (needs revising) + mon_cry CRY_KRABBY, 245, 288 ; CARAPTHOR mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA - mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA + mon_cry CRY_RHYDON, 32, 144 ; GOROTORA mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW mon_cry CRY_FEAROW, 64, 288 ; FEAROW mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F @@ -113,7 +113,7 @@ PokemonCries:: mon_cry CRY_RATTATA, 255, 192 ; CHEEP mon_cry CRY_RATTATA, 50, 383 ; JABETTA mon_cry CRY_SEEL, 0, 256 ; LICKITUNG - mon_cry CRY_NIDORAN_M, 0, 0 ; LICKILICKY (incomplete) + mon_cry CRY_TYPHLOSION, 576, 234 ; LICKILICKY (sounds really similar to electivire, consider revising) mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H @@ -125,7 +125,7 @@ PokemonCries:: mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE mon_cry CRY_METAPOD, 177, 272 ; MAGNETITE mon_cry CRY_METAPOD, 32, 320 ; MAGNETON - mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete) + mon_cry CRY_AMPHAROS, 656, 682 ; MAGNEZONE mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO mon_cry CRY_DIGLETT, 42, 144 ; DUGTRIO_A @@ -176,7 +176,7 @@ PokemonCries:: mon_cry CRY_GOLEM, 255, 383 ; WEEZING mon_cry CRY_GOLEM, 255, 383 ; WEEZING_G mon_cry CRY_GOLEM, 0, 256 ; TANGELA - mon_cry CRY_NIDORAN_M, 0, 0 ; TANGROWTH + mon_cry CRY_RAIKOU, 426, 592 ; TANGROWTH mon_cry CRY_WEEDLE, 64, 293 ; RAMOOSE mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN @@ -204,7 +204,7 @@ PokemonCries:: mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR - mon_cry CRY_RAICHU, 291, 256 ; TRICULES + mon_cry CRY_AMPHAROS, 555, 356 ; TRICULES mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_KANGASKHAN, 144, 304 ; TRAMPEL mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS @@ -221,7 +221,7 @@ PokemonCries:: mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ mon_cry CRY_TEDDIURSA, 470, 256 ; ELECTIVIRE mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR - mon_cry CRY_NIDORAN_M, 0, 0 ; MAGMORTAR (incomplete) + mon_cry CRY_PIDGEOTTO, 3093, 642 ; MAGMORTAR mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS mon_cry CRY_PIDGEY, 255, 383 ; DITTO mon_cry CRY_PIDGEY, 80, 383 ; MIMMEO @@ -253,5 +253,5 @@ PokemonCries:: mon_cry CRY_RAICHU, 248, 192 ; MOLTRES_G mon_cry CRY_PARAS, 153, 383 ; MEWTWO mon_cry CRY_PARAS, 238, 383 ; MEW - mon_cry CRY_PIDGEY, 255, 156 ; MELTAN (may revise) - mon_cry CRY_RHYDON, 240, 224 ; MELMETAL + mon_cry CRY_NATU, -18, 89 ; MELTAN + mon_cry CRY_RHYDON, 240, 224 ; MELMETAL (revise if possible) diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 4e0a4b81..88e58235 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -151,7 +151,7 @@ MapHSPointers: dw NoHS dw PokemonTower2FHS dw BrunswickGrottoHS - dw NoHS ; Pokemon Tower 4F, removed for constant space + dw NoHS dw PokemonTower5FHS dw PokemonTower6FHS dw PokemonTower7FHS @@ -218,7 +218,6 @@ MapHSPointers: dw SilphCo5FHS dw NoHS dw SilphCo7FHS - ;dw SilphCo8FHS dw PokemonMansion2FHS dw PokemonMansion3FHS dw PokemonMansionB1FHS @@ -253,11 +252,11 @@ MapHSPointers: dw NoHS dw RockTunnelB1FHS dw GiovannisRoomHS - dw NoHS ; Battle Tent - dw MtMoonSquareHS ; Mt Moon Square - dw NoHS ; Mt Moon Square House - dw NoHS ; Celeste Hill Cave - dw NoHS ; Celeste Hill Outside + dw NoHS + dw MtMoonSquareHS + dw NoHS + dw NoHS + dw NoHS dw BrunswickGladeHS assert_table_length NUM_MAPS dw -1 ; end @@ -330,7 +329,7 @@ Route25HS: db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM BrunswickTrailHS: db BRUNSWICK_TRAIL, $01, SHOW ; HS_CACTUS - db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 + db BRUNSWICK_TRAIL, $06, SHOW ; HS_BRUNSWICK_ZAPDOS_G_1 BluesHouseHS: db BLUES_HOUSE, $01, SHOW ; HS_DAISY_SITTING db BLUES_HOUSE, $02, HIDE ; HS_DAISY_WALKING @@ -481,13 +480,6 @@ SilphCo3FHS: db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1 db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2 db SILPH_CO_3F, $04, SHOW ; HS_SILPH_CO_3F_ITEM -;SilphCo4FHS: -; db SILPH_CO_4F, $02, SHOW ; HS_SILPH_CO_4F_1 -; db SILPH_CO_4F, $03, SHOW ; HS_SILPH_CO_4F_2 -; db SILPH_CO_4F, $04, SHOW ; HS_SILPH_CO_4F_3 -; db SILPH_CO_4F, $05, SHOW ; HS_SILPH_CO_4F_ITEM_1 -; db SILPH_CO_4F, $06, SHOW ; HS_SILPH_CO_4F_ITEM_2 -; db SILPH_CO_4F, $07, SHOW ; HS_SILPH_CO_4F_ITEM_3 SilphCo5FHS: db SILPH_CO_5F, $02, SHOW ; HS_SILPH_CO_5F_1 db SILPH_CO_5F, $03, SHOW ; HS_SILPH_CO_5F_2 @@ -496,12 +488,6 @@ SilphCo5FHS: db SILPH_CO_5F, $06, SHOW ; HS_SILPH_CO_5F_ITEM_1 db SILPH_CO_5F, $07, SHOW ; HS_SILPH_CO_5F_ITEM_2 db SILPH_CO_5F, $08, SHOW ; HS_SILPH_CO_5F_ITEM_3 -;SilphCo6FHS: -; db SILPH_CO_6F, $06, SHOW ; HS_SILPH_CO_6F_1 -; db SILPH_CO_6F, $07, SHOW ; HS_SILPH_CO_6F_2 -; db SILPH_CO_6F, $08, SHOW ; HS_SILPH_CO_6F_3 -; db SILPH_CO_6F, $09, SHOW ; HS_SILPH_CO_6F_ITEM_1 -; db SILPH_CO_6F, $0A, SHOW ; HS_SILPH_CO_6F_ITEM_2 SilphCo7FHS: db SILPH_CO_7F, $05, SHOW ; HS_SILPH_CO_7F_1 db SILPH_CO_7F, $06, SHOW ; HS_SILPH_CO_7F_2 @@ -594,6 +580,7 @@ MtMoonCraterHS: db MT_MOON_CRATER, $01, SHOW ; HS_MT_MOON_CRATER_ITEM_1 db MT_MOON_CRATER, $02, SHOW ; HS_MT_MOON_CRATER_ITEM_2 db MT_MOON_CRATER, $03, SHOW ; HS_MT_MOON_CRATER_ITEM_3 + db MT_MOON_CRATER, $04, SHOW ; HS_MT_MOON_CRATER_ITEM_4 GiovannisRoomHS: db GIOVANNIS_ROOM, $05, SHOW ; HS_GIOVANNIS_ROOM_ITEM_1 db GIOVANNIS_ROOM, $06, SHOW ; HS_GIOVANNIS_ROOM_ITEM_2 diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index e72fb59c..b273fd8d 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -18,13 +18,13 @@ CitrineCity_Object: bg_event 5, 18, 8 ; Billboard 2 bg_event 9, 7, 9 ; Battle Tower bg_event 33, 23, 10 ; City Sign - bg_event 25, 24, 11 ; Directions + bg_event 25, 22, 11 ; Directions bg_event 25, 7, 12 ; Celeste Hill Sign def_object_events - object_event 12, 18, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person + object_event 12, 19, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person object_event 6, 9, SPRITE_HIKER, WALK, LEFT_RIGHT, 2 ; person - object_event 20, 26, SPRITE_GENTLEMAN, STAY, UP, 3 ; person + object_event 19, 15, SPRITE_GENTLEMAN, STAY, UP, 3 ; person object_event 29, 23, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person def_warps_to CITRINE_CITY diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm index e6d36931..c8698478 100644 --- a/data/maps/objects/PokemonTower2F.asm +++ b/data/maps/objects/PokemonTower2F.asm @@ -2,7 +2,7 @@ PokemonTower2F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_6F, 1 + warp_event 3, 9, POKEMON_TOWER_5F, 1 warp_event 18, 9, POKEMON_TOWER_1F, 3 def_bg_events diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm index e89c5eb4..f2572ce9 100644 --- a/data/maps/objects/PokemonTower5F.asm +++ b/data/maps/objects/PokemonTower5F.asm @@ -2,7 +2,7 @@ PokemonTower5F_Object: db $1 ; border block def_warp_events -; warp_event 3, 9, POKEMON_TOWER_4F, 1 + warp_event 3, 9, POKEMON_TOWER_2F, 1 warp_event 18, 9, POKEMON_TOWER_6F, 1 def_bg_events diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm index 073413fb..20719479 100644 --- a/data/maps/objects/PokemonTower6F.asm +++ b/data/maps/objects/PokemonTower6F.asm @@ -2,16 +2,16 @@ PokemonTower6F_Object: db $1 ; border block def_warp_events - warp_event 3, 9, POKEMON_TOWER_2F, 1 + warp_event 18, 9, POKEMON_TOWER_5F, 2 warp_event 9, 16, POKEMON_TOWER_7F, 1 def_bg_events def_object_events - object_event 9, 10, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 19 - object_event 12, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20 - object_event 5, 5, SPRITE_CHANNELER, STAY, RIGHT, 3, OPP_CHANNELER, 21 - object_event 15, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 7, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY + object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19 + object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20 + object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21 + object_event 7, 10, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY + object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY def_warps_to POKEMON_TOWER_6F diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 8b90ea4c..8e6839cd 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -14,7 +14,7 @@ SilphCo11F_Object: object_event 10, 5, SPRITE_BEAUTY, STAY, DOWN, 2 ; person object_event 6, 9, SPRITE_GIOVANNI, STAY, DOWN, 3, OPP_GIOVANNI, 2 object_event 2, 8, SPRITE_JAMES, STAY, UP, 4 - object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41 + object_event 7, 14, SPRITE_ROCKET, STAY, LEFT, 5, OPP_ROCKET, 41 object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6 object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGADGE, 40 | OW_POKEMON object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGADGE, 65 | OW_POKEMON diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index acfcdcf3..f5700d1a 100644 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -78,7 +78,6 @@ FlyWarpDataPtr: fly_warp_spec ROUTE_4, .Route4 fly_warp_spec ROUTE_10, .Route10 fly_warp_spec REDS_HOUSE_2F, .RedsHouse2F ; This doesn't show on the Fly map, just used so the post-league warp doesn't have a stroke - fly_warp_spec FARAWAY_ISLAND_OUTSIDE, .FarawayIslandOutside .PalletTown: fly_warp PALLET_TOWN, 5, 6 .ViridianCity: fly_warp VIRIDIAN_CITY, 23, 26 @@ -94,6 +93,5 @@ FlyWarpDataPtr: .CitrineCity: fly_warp CITRINE_CITY, 15, 18 .CeladonUniversityOutside: fly_warp CELADON_UNIVERSITY_OUTSIDE, 15, 26 .Route4: fly_warp ROUTE_4, 11, 6 -.Route10: fly_warp ROUTE_10, 11, 20 -.RedsHouse2F: fly_warp REDS_HOUSE_2F, 3, 6 -.FarawayIslandOutside: fly_warp FARAWAY_ISLAND_OUTSIDE, 2, 23 \ No newline at end of file +.Route10: fly_warp ROUTE_10, 11, 28 +.RedsHouse2F: fly_warp REDS_HOUSE_2F, 3, 6 \ No newline at end of file diff --git a/data/pokemon/base_stats/zapdosg.asm b/data/pokemon/base_stats/zapdosg.asm index 3dec79a5..36da6883 100644 --- a/data/pokemon/base_stats/zapdosg.asm +++ b/data/pokemon/base_stats/zapdosg.asm @@ -1,6 +1,6 @@ db DEX_ZAPDOS_G ; pokedex id - db 90, 125, 90, 100, 75 + db 90, 125, 90, 100, 85 ; hp atk def spd spc db FIGHTING, FLYING ; type diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index f8f3dc52..90b1918c 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1675,7 +1675,7 @@ SteelixDexEntry: text_end HitmontopDexEntry: - db "HEADSTAND@" + db "HANDSTAND@" db 4,7 dw 1060 text_far _HitmontopDexEntry diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 529eb497..306580f1 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2150,8 +2150,8 @@ GaotoraEvosMoves: db EV_LEVEL, 36, GOROTORA db 0 ; Learnset - db 9, LEER - db 14, ROAR + db 6, LEER + db 11, ROAR db 23, QUICK_ATTACK db 30, BITE db 37, THUNDER @@ -2162,10 +2162,10 @@ GorotoraEvosMoves: ; Evolutions db 0 ; Learnset - db 16, LEER - db 21, ROAR - db 30, QUICK_ATTACK - db 34, BITE + db 6, LEER + db 11, ROAR + db 23, QUICK_ATTACK + db 30, BITE db 40, THUNDER db 48, AGILITY db 0 diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 752399c1..d081338c 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -47,7 +47,7 @@ Interior_Coll:: coll_tiles $04, $0f, $15, $1f, $3b, $45, $47, $55, $56 Cavern_Coll:: - coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30 + coll_tiles $05, $15, $18, $1a, $20, $21, $22, $2a, $2d, $30, $38 Lobby_Coll:: coll_tiles $14, $17, $1a, $1c, $20, $38, $45 diff --git a/data/tilesets/pair_collision_tile_ids.asm b/data/tilesets/pair_collision_tile_ids.asm index 58b2e2b8..ec0d8fc8 100644 --- a/data/tilesets/pair_collision_tile_ids.asm +++ b/data/tilesets/pair_collision_tile_ids.asm @@ -15,12 +15,15 @@ TilePairCollisionsLand:: db FOREST, $20, $2E db FOREST, $5E, $2E db FOREST, $5F, $2E + db CAVERN, $20, $38 db -1 ; end TilePairCollisionsWater:: db FOREST, $14, $2E db FOREST, $48, $2E db CAVERN, $14, $05 - db GYM , $14, $32 ;prevent surfing into statue base tile ($32) from water tile ($14) - db GYM , $14, $33 ;prevent surfing into statue base tile ($33) from water tile ($14) + db CAVERN, $14, $32 + db CAVERN, $14, $38 + db GYM, $14, $32 ;prevent surfing into statue base tile ($32) from water tile ($14) + db GYM, $14, $33 ;prevent surfing into statue base tile ($33) from water tile ($14) db -1 ; end diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 967e3e75..892b1334 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -105,7 +105,7 @@ ENDM warp_tiles $1B, $1C, $0B, $0C, $58, $59 .CelesteWarpTileIDs: - warp_tiles $5A, $5C, $3A ; Like Forest but a bit better + warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better .RocketHouseWarpTileIDs: warp_tiles diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 1fc65edb..e8c37b47 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -148,7 +148,6 @@ WildDataPointers: dw PokemonTower1FWildMons dw PokemonTower2FWildMons dw BrunswickGrottoWildMons - ;dw PokemonTower3FWildMons dw NothingWildMons dw PokemonTower5FWildMons dw PokemonTower6FWildMons @@ -216,7 +215,6 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - ;dw NothingWildMons dw PokemonMansion2FWildMons dw PokemonMansion3FWildMons dw PokemonMansionB1FWildMons @@ -251,8 +249,8 @@ WildDataPointers: dw NothingWildMons dw RockTunnelB1FWildMons dw NothingWildMons - dw NothingWildMons ; battle tent - dw NothingWildMons ; mt moon square + dw NothingWildMons + dw NothingWildMons dw NothingWildMons dw CelesteHillCaveWildMons dw CelesteHillWildMons ; using Celeste Hill's summit for Celeste Hill Outside diff --git a/data/wild/maps/CitrineCity.asm b/data/wild/maps/CitrineCity.asm index d3aa9880..c1fa5d65 100644 --- a/data/wild/maps/CitrineCity.asm +++ b/data/wild/maps/CitrineCity.asm @@ -1,6 +1,16 @@ -CitrineWildMons: ; encounters are being removed for now since I'm very unsure what to do with them... +CitrineWildMons: def_grass_wildmons 0 ; encounter rate end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 10 ; encounter rate + db 40, TENTACRUEL + db 45, TENTACRUEL + db 50, PENDRAKEN + db 50, PENDRAKEN + db 45, JABETTA + db 45, JABETTA + db 45, TENTACRUEL + db 50, TENTACRUEL + db 50, SHARPOON + db 55, SHARPOON end_water_wildmons diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index f8b661cb..a1b03f87 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -4,7 +4,7 @@ MtMoonB1FWildMons: db 9, BITTYBAT db 7, GEODUDE db 8, GEODUDE - db 9, GEODUDE + db 9, SANDSHREW db 9, PARAS db 10, BITTYBAT db 9, SANDSHREW diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 72df01e0..73987ae7 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -6,7 +6,7 @@ MtMoonB2FWildMons: db 10, GEODUDE db 11, ZUBAT db 10, PARAS - db 11, PARAS + db 10, SANDSHREW db 10, CLEFAIRY db 11, SANDSHREW db 12, ZUBAT diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index b8cd28b2..3015e181 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -3,13 +3,13 @@ Route5WildMons: db 13, ODDISH db 13, EKANS db 15, EKANS - db 10, MANKEY + db 14, MANKEY db 12, JIGGLYPUFF db 15, BELLSPROUT db 16, BELLSPROUT db 15, PIDGEY + db 14, PIDGEY db 14, JIGGLYPUFF - db 16, PIDGEOTTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 52403092..f2444fd7 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -516,7 +516,7 @@ ShowPokedexDataInternal: ld a, c and a - jp z, .waitForButtonPress ; if the pokemon has not been owned, don't print the height, weight, or description + jp z, .displaySeenBottomInfo ; if the pokemon has not been owned, don't print the height or weight, but show their type inc de ; de = address of feet (height) ld a, [de] ; reads feet, but a is overwritten without being used hlcoord 12, 6 @@ -573,6 +573,85 @@ ShowPokedexDataInternal: ld a, %10 ldh [hClearLetterPrintingDelayFlags], a call TextCommandProcessor ; print pokedex description text +;;;;;;;;;; PureRGBnote: ADDED: pokedex will display the pokemon's types and their base stats on a new third page. + CheckEvent EVENT_GOT_POKEDEX + jp z, .clearLetterPrintingFlags ; don't display this new third page if we're showing the starters before getting the pokedex. + ld hl, PromptText + call TextCommandProcessor + hlcoord 1, 10 + lb bc, 7, 18 + call ClearScreenArea + call PrintMonTypes + ; print mon base stats + hlcoord 9, 10 + ld de, BaseStatsText + call PlaceString + hlcoord 12, 11 + ld de, HPText + call PlaceString + ld de, wMonHBaseHP + hlcoord 15, 11 + lb bc, 1, 3 + call PrintNumber + hlcoord 11, 12 + ld de, AtkText + call PlaceString + ld de, wMonHBaseAttack + hlcoord 15, 12 + lb bc, 1, 3 + call PrintNumber + hlcoord 11, 13 + ld de, DefText + call PlaceString + ld de, wMonHBaseDefense + hlcoord 15, 13 + lb bc, 1, 3 + call PrintNumber + hlcoord 11, 14 + ld de, SpdText + call PlaceString + ld de, wMonHBaseSpeed + hlcoord 15, 14 + lb bc, 1, 3 + call PrintNumber + hlcoord 11, 15 + ld de, SpcText + call PlaceString + ld de, wMonHBaseSpecial + hlcoord 15, 15 + lb bc, 1, 3 + call PrintNumber + hlcoord 9, 16 + ld de, TotalText + call PlaceString + ; calculate the base stat total to print it + ld b, 0 + ld a, [wMonHBaseHP] + ld hl, 0 + ld c, a + add hl, bc + ld a, [wMonHBaseAttack] + ld c, a + add hl, bc + ld a, [wMonHBaseDefense] + ld c, a + add hl, bc + ld a, [wMonHBaseSpeed] + ld c, a + add hl, bc + ld a, [wMonHBaseSpecial] + ld c, a + add hl, bc + ld a, h + ld [wSum], a + ld a, l + ld [wSum+1], a + ld de, wSum + hlcoord 15, 16 + lb bc, 2, 3 + call PrintNumber +.clearLetterPrintingFlags +;;;;;;;;;; xor a ldh [hClearLetterPrintingDelayFlags], a .waitForButtonPress @@ -592,6 +671,26 @@ ShowPokedexDataInternal: ld a, $77 ; max volume ldh [rNR50], a ret +.displaySeenBottomInfo + call PrintMonTypes ; PureRGBnote: ADDED: for pokemon you have seen but not caught it displays just their types on the bottom + jr .waitForButtonPress + +PrintMonTypes: + hlcoord 1, 11 + ld de, DexType1Text + call PlaceString + hlcoord 2, 12 + predef PrintMonType + ld a, [wMonHType1] + ld b, a + ld a, [wMonHType2] + cp b + jr z, .done ; don't print TYPE2/ if the pokemon has 1 type only. + hlcoord 1, 13 + ld de, DexType2Text + call PlaceString +.done + ret HeightWeightText: db "HT ?β€²??β€³" @@ -665,3 +764,34 @@ IndexToPokedex: ret INCLUDE "data/pokemon/dex_order.asm" + +PromptText: + text_promptbutton + text_end + +DexType1Text: + db "TYPE1/@" + +DexType2Text: + db "TYPE2/@" + +BaseStatsText: + db "BASE STATS@" + +HPText: + db "HP@" + +AtkText: + db "ATK@" + +DefText: + db "DEF@" + +SpdText: + db "SPD@" + +SpcText: + db "SPC@" + +TotalText: + db "TOTAL@" diff --git a/gfx/blocksets/cavern.bst b/gfx/blocksets/cavern.bst index 613c37e5509e8b32403a8d509bdc3bcdb96f69ba..e81fe7378b45d5c8e2b10312de9eb215aaadd996 100644 GIT binary patch delta 453 zcmaDLut9i&Dx0IDxS^xtM(wNY^$JGD#zvMF7M4(KY;0_7fdq_=O%yCFtV}E{tgJxT z$k^D#(!#2@| delta 114 zcmdlW{6JuWDjO@SxFIX+M(wNY39L{c00kl@A,,PQ,,@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ +R*+*+:;:;*+*+:;:;LM,,\],,,,,,,,,,,,NO,,^_,,,,,,,,,,LM,,\],,,,,,,,LM,\],,,,,*+*+:;:;,,,,/U/U??@A@APQPQ@A@APQPQ@A,,PQ,,/U/U??@A/UPQ?####9###@A@APQPQ33332223333TTT3333@A@APQPQ@A/UPQ?@A@APQPQ/U@A?PQ!########!## ######## '''''6776777$$$$774$7774##!########!########''''''''$$$$$$$$7'57$533,,,,,,,,,,,,74<<@A,,PQ,,@A@APQPQ9999999999999999*+:;@A@APQPQ,,-.,,=>-.,,=>,,@A@APQPQ,,-.,,=>@A,,PQ,,@A@APQPQ,,@A,,PQ KKKKKK ,,,,,,,,,,,,,,,,  @@ -41,7 +41,7 @@ KKKK KKK -KKK999999999999<<67!##!############!##!99NO99^_99999999,,@A,,PQ-.@A=>PQ99999999*+*+:;:;*+*+:;:;*+,,:;,,1111[[TTTT22222T2T2T2T[[[[[[%& +KKK,,,,,,,,,,*+,,:;!##!############!##!99NO99^_99999999*+:;99999999*+*+:;:;*+*+:;:;*+,,:;,,*+:;TTTT22222T2T2T2T[[[[[[%& KKK @@ -51,7 +51,7 @@ KKKK ()KKK -KKK33*+:;*+:;*+*+:;:;@A@APQPQ,,,,,,,,@A,,PQ,,@A,,PQ,,,,@A,,PQ,,@A,,PQ,,,,,,,,@A@APQPQ$$$$HI4$XY74"""" +KKK*+,,:;,,,,,,,,,,*+*+:;:;@A@APQPQ,,,,,,,,@A,,PQ,,@A,,PQ,,,,@A,,PQ,,@A,,PQ,,,,,,,,@A@APQPQ$$$$HI4$XY74"""" ()KKKBCKJJR diff --git a/gfx/font/font.png b/gfx/font/font.png index f6a75a35897ab2dd75a6571594b4d28fa1c512f2..4b4d9c9b79bc125b15cd735be1f4193cd632c0ff 100644 GIT binary patch delta 1381 zcmX>o^qp&haynlX24+7#PG$Tq8mi^mSxl*x1kgCy|wbfq^Z_ z+ueoXKL{?^yL>VO1Ir~(7srr_Id5lm=V>eQxP1O^Uw?OX+)BZvb#pe}+>@|mRb+mTtw_ZZyn(kEFoe$b~mqI$FRDOA?Q)2Us^FxbHbD%5^R-#lbmVn1Wc*yBYV#_6YC%&LYp|tT;hJx+euOZ( z-%;Lh)AmQi9o7Z!E}Urp62F!C1>Y76&A*c=;C>x<31-`_m> z{FL!ipC4(3D>sDHF|N-pd%%>mu0Qp2UGTmVo2f^`-{@;HeC3FUWYn48#jq%5eNueu zG=>*`QLas0s*jv+FRGE1{`!*Z!6dE($<5XcMeYtN4f*a2AxGwZu6FHNF2h({5ajjz z+d07nM^`7yS+ec@QF3v`dZl`mEovP%4|+f7vS#V3@O+fylj>etyteQE3hxC? z+l3f*R+kj5wToX}*WXgj{^MzgMR~{mTl=fpD@s^b+%w#?@1|7cw}QMWjINwkhMWG~ zT(`GSvwnX$#Ua@XIi_*MM z%X@zgKD}isDU=M=+!Wh4H@Q zVl4U8|28fr$}vsxhebvf6) zt6TI)$L*MAmiqZqO=;G5J_o)@>A7oZc3h10CTmHOyBj29=_}cVB3B&z_nfH}cn0oWKuXu6fSIeu6I^oyHC&aR?+-u}H z_5GEzWnZ-;wf3L;G3Cdqx%-ape7o3r+JVjP=Ox|#|NK1X`YMxo@mK1By_Xuq5|FqjxDE_nz0xc4bI0pWNtTv&nVE zv`ZXuPbF`^U~>Jq__?U%A?1c9m5pqU$?4m2wud+ze_|VLv(_T;---UP^<4+Nm^wQ8 zT2^n&yca6k@a;59T;!aK%ihIx)wgpW*c{)xy05|S-n)zLZ@ApQb1X=G7Fm&+_nzmo z=?B5dYn~`P*RfSTDe0}3IEDG8^v%8hX7cyFw>-mw`2hmM71D zucZ6?hJ>QkZ_yGxqr0ps?i@E=17o%_U3lem%$xOxJA=x{{&@CR>y-Y6b2Rwv6LpWf z`!TY9s(og+%eFO40#Dt{l9q=$Je;9xqr34Pi@A5nm1VzX{d}q7az66Xt9M~Fiwq~Q xDy2>d>GVkv-7Q}3S`)*#Dq`!8uKSF~?WY7}OmW=p6ay*|Jzf1=);T3K0RR!xmO}sl delta 2359 zcmey)bx>%6ay?^Srn7TEW^ytEgT}5+#n+#~t!Gy0EE(jlG+#RioqBrh~3d zXB1Yu`o}Tpw--;DaBaa-$Bd4sUA%wUx3aBebqrt;%zb-zTF2$znF%d*?eF*4&wF1T zcki>z26yhLizR-}8$%2qP25m#xbsQ*-Ur9L?fslI&t6GS+Ne=4d;PhrS!llVs_^I4 zxznpnld}?Di_N=IvRFyyvOw(m7hT(1e{ZSD3jGmak#VBoP`H=B`OnD0btm6<^}5uE zy;-%~{(Jl7`iRrgt`7qrI&2KMTK7CK{?W-PV$YWHosv7G;@4tOcPS)tu|w;GE0a>L z-7~-T;cTE-zgqrWsWywEC-q0AMYd|i8V7A&l>S6BAb98h^Ow)~^_cIjK6K%0N@V`w z2e%sE?@FzejlA~V&_eFvqAQ=Kt1e&3fAO`hZUMtSUyI#2nJ;54?l(2E+omp&n&iCA zc6RIa;16mGzq3_Mn;rRgUU3nBC+|l?Q7D;M40{)zd&QwC?Znd&qK1_sW8dXLCr z1_r((Aj~*bn@^g7fxXhx#WAEJ?rm&i-(xF|J?q~6um8E%w=|@L>r8_6&79d&{l1%R zGvqONaAa5c@Ato-pWi?K_SgkAM8G#kg-qQI1XUI;PH4v)h;Z``_H3cz@<;nW-l~Ritpv zNG&S2dsUFmps%uMZdaQ%L#Sj=a?i1}(-*k*8VaPRgq7s$m`EjrO4eyHhPFJqvBK!0 zTu=R~n-)PkSxdj%xxDU?!BIbZ_nG$(-aMb`Xr%Q0w8*`d-}YJ8(o5pj&S%t2;tCBv z`cS#JreU2cxMpe%MJYFq%{PX`+y5tGn+*4&xs@?y{lR9JU!)Zj;Lmev-6o zliwccl8Js2BCF2a-oD|uVL)uj*=l)~LvjtK3D>5i)PD_$JTE1^cw^5wtH(3^H;nIV%{@~Oz|^v=e^ap>(ccDwi)%AAH-21G{DH^OZ zrWV@-yRO+;q_3m6#{ERq^z9Y=8x}F9oReJp-shd*pPZ5NO1D#vKlx0@ zp?=l#z?%-~8xI5@H~!6E%O7A`wVChN%CED1pKZ|)h%8tqm%fytP|Ke&@cUfZ<*RxZ zC&yf!>K-}a?D-dG=ebK>nwbALKqO(dU&Qy^c~wP;%h_$D+_uVBYvgY}u6W46hBd{_ zc*AC$kb^VMKJu`?Gn;XqrIfT!*&3Iy6F2-*8+`KXqvt1{d2-s;fmOzu^^8^7(W=W6 z8H3)2UcJ3)kL!)n(+}e$mLGRuX<}@DtUNQ!(8DctTUy#2+2CG5Z5|1`)lEB+7G?3z zXYfybTCK20tZ(abBZIDIId#)qy*@9Rrm*x__}tnp^QN-3F-jkIIQI9-*L^kab`=|a zIU7VTR;NjNeW;%s`Cszxy+^JWco^pI`*z_w!+gGPl5h7jJ?M$E3|Owsz{m2tCpwm~ zz-_(Eip!!5>`k@D)~;i)SRBrG#!;Cpf|X^2>7!7hm6ecf8A= z`CaUryZ$b_kMP%NO-FDxr3G!#pPS}R6c(nC>2@I8|T*h z#{IAS@&>_%zq9^N-JVD0_VM z81I$P2Vvske?MO7*|7hjz!iP%OxXuH>!!=THGVAPqtv##s^0L@&D+UEDr^Cc!JBSw zGB@7hy-`9%P&mP$^HtA!oUPxgtF;^z-8S z1!q%Mn_i1x&plJcd&c6ZnJS}_LYR`uHHcbGY@C&M zm8JTZSb*hrtNOGRs*022P2F!qtZG|nweqk3F(#ky9`Pv>#~ea8pESCo?$UDda`ytR znBq9srJ?T)4$IgbGQ71pY9$-jwYM6NwRZ0*{$um|y@s{*!Ig7NX6!ku_W$_#{qvaw zSVTI`t}~H;F57#0)_+FLsRhC7J9pe>>>>gG>>>>><'FCCCCC<FCCCCC \ No newline at end of file diff --git a/maps/GarnetCavern1F.blk b/maps/GarnetCavern1F.blk index 689593fd..a1d9d71b 100644 --- a/maps/GarnetCavern1F.blk +++ b/maps/GarnetCavern1F.blk @@ -1,3 +1,3 @@ -|_vvvv|bRvvvvvfm,+vvvvv'fv,+|vvtvf,v=vvv f S - ^-f+ -$ \ No newline at end of file +€š‚ "_vvvv|b„˜†vvvv€‚vfm€Œ”†v€…†vvvv'„†Šv„Œ‰‰”š‚v€…†vtvŠ„Œ‰Šv„•†vvv f„† „˜†€˜ + ^„†ˆŠ”…† +ˆ‰‰‰‰‰Š$ \ No newline at end of file diff --git a/maps/GarnetCavernB1F.blk b/maps/GarnetCavernB1F.blk index 8411849f..49830772 100644 --- a/maps/GarnetCavernB1F.blk +++ b/maps/GarnetCavernB1F.blk @@ -1 +1 @@ -n !"n,- " L  "avvv "Q-+tv "vfvvNvvvvvvf--SQvvvvvL  \ No newline at end of file +€‚n˜˜ƒn„…Œ‰Šƒ‹˜ „…†L ‹˜˜ˆ—Švv€‚˜v˜_rQˆ‰‰‰”˜†ƒv€‚vr„…†‡v‰Švv€‚„˜†‡vvvvvvŠˆŠ‹˜˜vvvvvL˜ ˜ \ No newline at end of file diff --git a/maps/PokemonTower6F.blk b/maps/PokemonTower6F.blk index 546eacc9..7256a841 100644 --- a/maps/PokemonTower6F.blk +++ b/maps/PokemonTower6F.blk @@ -1,2 +1,2 @@ -`[a]66\ ^6R6LM_  -L6R666666LOOQRY66OLL6O WPO6O6X L6O 0 \ No newline at end of file +`[a]66 ^NL6R6_  +6666R6LZRPOOL66O6LLOO W6O6OQX O6R 0 \ No newline at end of file diff --git a/maps/SeafoamIslands1F.blk b/maps/SeafoamIslands1F.blk index 3cd6e5c7..3ef621ea 100644 --- a/maps/SeafoamIslands1F.blk +++ b/maps/SeafoamIslands1F.blk @@ -1 +1 @@ -................(..<,-..xmw..m..)L^^^..m..m(...$..........$. \ No newline at end of file +................€‚(..„…™…Œ‰‰‰‰Š..„………†xmw..„………†m..ˆ‰Ž‰ŠL^^^..m..m(...$..........$. \ No newline at end of file diff --git a/maps/SeafoamIslandsB1F.blk b/maps/SeafoamIslandsB1F.blk index 61402221..92da5c82 100644 --- a/maps/SeafoamIslandsB1F.blk +++ b/maps/SeafoamIslandsB1F.blk @@ -1 +1 @@ -...........',->..|m..,<wmx..fL^^^..(..f-..m(m>................ \ No newline at end of file +.....€‚......'„…ŒŠ>..€š‚„…†m..„ŒŠ„™†wmx..Š€……†L^^^..„………‚(..‰‰‰Š..m(m>................ \ No newline at end of file diff --git a/maps/SeafoamIslandsB2F.blk b/maps/SeafoamIslandsB2F.blk index cc037328..615f72e9 100644 --- a/maps/SeafoamIslandsB2F.blk +++ b/maps/SeafoamIslandsB2F.blk @@ -1 +1 @@ -................><..-..=xRw....)+|..(-..>y................ \ No newline at end of file +................>€–‚..€‚ˆŠ..„•†xRw..€………‚..ˆ‰Ž‰‰‰”……†€š‚..(ˆ‰Š„…†..>ˆ“Š................ \ No newline at end of file diff --git a/maps/SeafoamIslandsB3F.blk b/maps/SeafoamIslandsB3F.blk index 956a1053..5ac49fd3 100644 --- a/maps/SeafoamIslandsB3F.blk +++ b/maps/SeafoamIslandsB3F.blk @@ -1 +1 @@ -vvvvvv=,)vy',-vvvv-+,+vvvvvav )vaxwzvm \ No newline at end of file +€‚˜˜v˜˜€‚„………†vvvvv„…•…†„…ŒŽŠ€‚vˆ‰“‰Š„…†'„ŒŠv€‚„………†vvvˆ”…†„……Œ‰”†vvvvv„…†ˆ‰—Š„…‚v€……† ˆ‰‰ŽŠvˆ—‰Šxwzvm \ No newline at end of file diff --git a/maps/SeafoamIslandsB4F.blk b/maps/SeafoamIslandsB4F.blk index a118fe57..56456be3 100644 --- a/maps/SeafoamIslandsB4F.blk +++ b/maps/SeafoamIslandsB4F.blk @@ -1 +1 @@ -.vvu..v-v..vvvvvv,-a..vv|vvvvv..vv,vvvvv..vvf+vvvvvv..vvvvvvvvvvv..vvuvvvv..vvL. \ No newline at end of file +.˜€‚˜€‚..vˆ‰Šv„……………†..vvvvvv„Œ‰‰—Š..vv€š…†vvvvv..vv„………ŒŠvvvvv..vv‰‰”†vvvvvv..vvvvv„†vvvvvv..vv€……‚vvvv..˜vˆ‰‰‰‰‰Šv˜˜˜. \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index ff6a5452..ec6c69dd 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -897,7 +897,8 @@ wRightGBMonSpecies:: db ; bit 6: tried pushing against boulder once (you need to push twice before it will move) wFlags_0xcd60:: db - ds 9 +wSum:: + ds 8 ; This has overlapping related uses. ; When the player tries to use an item or use certain field moves, 0 is stored @@ -2052,6 +2053,7 @@ wRocketHideoutB3FCurScript:: db wRocketHideoutB4FCurScript:: db wRoute6GateCurScript:: db wRoute8GateCurScript:: db +; wSilphCo1FCurScript:: db ds 1 wCinnabarIslandCurScript:: db wPokemonMansion1FCurScript:: db diff --git a/scripts/BattleTent.asm b/scripts/BattleTent.asm index ad5929a0..a3bc4649 100644 --- a/scripts/BattleTent.asm +++ b/scripts/BattleTent.asm @@ -718,11 +718,11 @@ BattleTentWelcome: text "Welcome to the" line "BATTLE TENT!" - para "Here, TRAINERs" + para "Here, trainers" line "from far and" cont "wide come to" ;cont "face a gauntlet" - ;cont "of 10 TRAINERs!" + ;cont "of 10 trainers!" cont "spar against" cont "one another!" diff --git a/scripts/SaffronGym.asm b/scripts/SaffronGym.asm index 476c18ba..2a62e4f1 100644 --- a/scripts/SaffronGym.asm +++ b/scripts/SaffronGym.asm @@ -47,6 +47,7 @@ SaffronGymReceiveTM46: ldh [hSpriteIndexOrTextID], a call DisplayTextID SetEvent EVENT_BEAT_SABRINA + ResetEvent EVENT_SS_ANNE_LEFT lb bc, TM_PSYWAVE, 1 call GiveItem jr nc, .BagFull diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 26f5d9ab..22a984b7 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -165,16 +165,10 @@ MissableObjectIDs_6219b: db HS_SAFFRON_CITY_E db HS_SILPH_CO_3F_1 db HS_SILPH_CO_3F_2 - ;db HS_SILPH_CO_4F_1 - ;db HS_SILPH_CO_4F_2 - ;db HS_SILPH_CO_4F_3 db HS_SILPH_CO_5F_1 db HS_SILPH_CO_5F_2 db HS_SILPH_CO_5F_3 db HS_SILPH_CO_5F_4 - ;db HS_SILPH_CO_6F_1 - ;db HS_SILPH_CO_6F_2 - ;db HS_SILPH_CO_6F_3 db HS_SILPH_CO_7F_1 db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 @@ -630,23 +624,14 @@ SaffronCityRockets: db HS_SAFFRON_CITY_E db HS_SILPH_CO_3F_1 db HS_SILPH_CO_3F_2 - ;db HS_SILPH_CO_4F_1 - ;db HS_SILPH_CO_4F_2 - ;db HS_SILPH_CO_4F_3 db HS_SILPH_CO_5F_1 db HS_SILPH_CO_5F_2 db HS_SILPH_CO_5F_3 db HS_SILPH_CO_5F_4 - ;db HS_SILPH_CO_6F_1 - ;db HS_SILPH_CO_6F_2 - ;db HS_SILPH_CO_6F_3 db HS_SILPH_CO_7F_1 db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - ;db HS_SILPH_CO_8F_1 - ;db HS_SILPH_CO_8F_2 - ;db HS_SILPH_CO_8F_3 db HS_SILPH_CO_10F_1 db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 @@ -671,7 +656,7 @@ SilphCo11F_TextPointers: SilphCo11TrainerHeaders: def_trainers 5 SilphCo11TrainerHeader0: - trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 3, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText + trainer EVENT_BEAT_SILPH_CO_11F_TRAINER_1, 1, SilphCo11Trainer1BattleText, SilphCo11Trainer1EndBattleText, SilphCo11Trainer1AfterBattleText Omega2TrainerHeader: trainer EVENT_BEAT_OMEGA, 0, Omega2BattleText, Omega2BattleText, Omega2BattleText db -1 ; end diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 7edbbcab..9754a2a7 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -50,11 +50,8 @@ VermilionCityScript0: ld a, $3 ldh [hSpriteIndexOrTextID], a call DisplayTextID - CheckEvent EVENT_BEAT_SABRINA - jr nz, .default CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted -.default ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b @@ -167,7 +164,6 @@ VermilionCityTextSSAnneDeparted: VermilionCityText3: text_asm - CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted ld a, [wSpritePlayerStateData1FacingDirection] @@ -247,23 +243,9 @@ VermilionCityText14: text_end VermilionCityText6: - text_asm - CheckEvent EVENT_BEAT_SABRINA - jr z, .default - ld hl, VermilionCityText15 - ret -.default - ld hl, VermilionCityText6get - ret - -VermilionCityText6get: text_far _VermilionCityText6 text_end -VermilionCityText15: - text_far _VermilionCityText15 - text_end - VermilionCityText7: text_far _VermilionCityText7 text_end diff --git a/text/ChampionsRoom.asm b/text/ChampionsRoom.asm index 86596504..6408ec54 100644 --- a/text/ChampionsRoom.asm +++ b/text/ChampionsRoom.asm @@ -163,7 +163,7 @@ _BlueRematchAfterBattleText:: para "As long as I can" line "battle strong" - cont "TRAINERs, I don't" + cont "trainers, I don't" cont "care what happens." para "You get what I" diff --git a/text/CitrinePokecenter.asm b/text/CitrinePokecenter.asm index 47ff8198..330747a4 100644 --- a/text/CitrinePokecenter.asm +++ b/text/CitrinePokecenter.asm @@ -10,7 +10,7 @@ _CitrinePokecenterText2:: done _CitrinePokecenterText3:: - text "The TRAINERs here" + text "The trainers here" line "are too tough!" para "What are they" diff --git a/text/RedsHouse1F.asm b/text/RedsHouse1F.asm index dbee6718..aaf10898 100644 --- a/text/RedsHouse1F.asm +++ b/text/RedsHouse1F.asm @@ -71,7 +71,7 @@ _ChiefLetterText:: line "SILPH GAUNTLET!" para "I have called the" - line "greatest TRAINERs" + line "greatest trainers" cont "in all of KANTO!" para "Stronger than even" ; A sneaky trick - we can fit 18 characters, they just mess up the arrow. diff --git a/text/Route1.asm b/text/Route1.asm index d3b45ac3..da7ba7c2 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -102,7 +102,7 @@ _OakWonText:: _OakYes:: text "Back in my day," line "I was a serious" - cont "TRAINER! Prepare" + cont "trainer! Prepare" cont "yourself!" prompt @@ -142,12 +142,12 @@ _OakCitrineExplain:: line "to CITRINE CITY." para "It's a place where" - line "the best TRAINERs" + line "the best trainers" cont "go to become far" cont "stronger." para "Some strange BIRD" - line "#MON will come" + line "#MON are said" cont "to roost there," cont "but they are so" cont "fast and vicious," diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 65a5da90..8a39e02f 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -249,7 +249,7 @@ _SabrinaRematchPreBattleText:: cont "power alone." para "I won't rely on" - line "my psychic" + line "just my psychic" cont "powers this" cont "time." @@ -264,6 +264,6 @@ _SabrinaRematchPreBattleText:: _SabrinaRematchDefeatedText:: text "I doubt" line "I'll encounter" - cont "a TRAINER like" + cont "a trainer like" cont "you ever again." prompt diff --git a/text/SilphGauntlet6F.asm b/text/SilphGauntlet6F.asm index 2b792cab..293ab188 100644 --- a/text/SilphGauntlet6F.asm +++ b/text/SilphGauntlet6F.asm @@ -1,23 +1,32 @@ _SilphGauntlet6FBattleText1:: text "Congratulations on" - line "making it this far!" + line "making it!" - para "Now, my rock type" - line "#MON will pound" - cont "you into dust!" + para "It's sure been a" + line "while since our" + cont "last match..." + + para "My #MON are" + line "itching for a" + cont "rematch! We'll" + cont "pound you into" + cont "dust!" done _SilphGauntlet6FEndBattleText1:: - text "Crushed again!" - done + text "Crushed" + line "again!" + prompt _SilphGauntlet6FAfterBattleText1:: - text "The CHIEF has kept" - line "the #MON LEAGUE" + text "CHIEF has kept the" + line "#MON LEAGUE" cont "afloat for years!" - para "Comment to be" ; Follow the line with something along the lines of "it's only fair..." - line "written." + para "It's only fair" + line "that we're all" + cont "a part of this" + cont "GAUNTLET too!" done _SilphGauntlet6FBattleText2:: @@ -36,8 +45,9 @@ _SilphGauntlet6FBattleText2:: done _SilphGauntlet6FEndBattleText2:: - text "Eeeek! No!" - done + text "Eeeek!" + line "No way!" + prompt _SilphGauntlet6FAfterBattleText2:: text "Tell you what," @@ -61,22 +71,21 @@ _SilphGauntlet6FBattleText3:: cont "even powered my" cont "plane!" - para "The same as I'll" - line "do to you!" + para "I'll zap you for" + line "real this time!" done _SilphGauntlet6FEndBattleText3:: - text "Did I call" ; Get this shortened. - line "you a pint-sized" - cont "challenger?" + text "Haha!" + line "Pint-sized, eh?" para "I think you're" line "a gallon, now!" - done + prompt _SilphGauntlet6FAfterBattleText3:: - text "Huh? BLAINE? Oh," - line "man!" + text "Huh? BLAINE?" + line "Oh, man!" para "He won't tell you" ; Referring to Blaine's original design. line "this, but he was" @@ -91,27 +100,29 @@ _SilphGauntlet6FAfterBattleText3:: done _SilphGauntlet6FBattleText4:: - text "It takes a lot" ; This sucks can you fix it - line "to inspire me," - cont "you know!" + text "Lovely to see you" + line "again, ." - para "I'm not fond of" - line "public things," - cont "but..." + para "Though this place" + line "isn't my style," + cont "I've been hoping" + cont "for a rematch for" + cont "quite some time." - para "Battles are quite" - line "different." + para "Be careful not to" ; She has Toedscruel now, you WILL spend several turns sleeping. + line "let your #MON" + cont "grow drowsy..." done _SilphGauntlet6FEndBattleText4:: text "You have" line "grown even" cont "stronger..." - done + prompt _SilphGauntlet6FAfterBattleText4:: text "Hmm? How did I" - line "become a TRAINER?" + line "become a trainer?" cont "It's quite odd," cont "isn't it?" @@ -148,9 +159,9 @@ _SilphGauntlet6FAfterBattleText4:: _SilphGauntlet6FBattleText5:: text "Fwahahaha!" - para "I have honed" - line "my skills just" - cont "for you, !" + para "I have honed my" + line "skills just for" + cont "you, !" para "Can you keep up?" done @@ -158,18 +169,17 @@ _SilphGauntlet6FBattleText5:: _SilphGauntlet6FEndBattleText5:: text "Indeed!" line "Indeed you can!" - done + prompt _SilphGauntlet6FAfterBattleText5:: - text "I feel that I" + text "I feel that I may" line "have outgrown" cont "my roots." - para "To train, I" - line "watch over the" - cont "SAFARI ZONE," - cont "but I must aim" - cont "higher!" + para "To train, I watch" + line "over the SAFARI" + cont "ZONE, but I must" + cont "aim higher!" para "Perhaps it is" line "time for my" @@ -178,9 +188,9 @@ _SilphGauntlet6FAfterBattleText5:: done _SilphGauntlet6FBattleText6:: - text "After beating" + text "After defeating" line "the KARATE KING," - cont "I felt nigh" + cont "I felt nigh-" cont "unstoppable..." para "But you humbled" @@ -193,20 +203,20 @@ _SilphGauntlet6FEndBattleText6:: text "I wanted" line "to fight fate," cont "but..." - done + prompt _SilphGauntlet6FAfterBattleText6:: - text "It's impossible" ; This is kind of incoherent, could easily be fixed. - line "for me to change" - cont "my future." + text "Was the future" ; HGSS quote + line "I saw...wrong?" - para "Looking into my" - line "own, though..." + para "Perhaps my future" + line "isn't so easily" + cont "predictable." - para "A movie star?" - - para "That would be" - line "good..." + para "I wonder if I'll" + line "ever meet another" + cont "trainer like you" + cont "again..." done _SilphGauntlet6FBattleText7:: @@ -219,19 +229,19 @@ _SilphGauntlet6FBattleText7:: para "Now..." - para "When I fight hard," - line "I get a little hot" - cont "under the collar." ; Puzzle League + para "BURN HEAL won't" ; reference to his iconic 'better have BURN HEAL!' line + line "be enough this" + cont "time around!" - para "Think you can take" - line "me?" + para "Hope you packed" + line "a FULL RESTORE!" done _SilphGauntlet6FEndBattleText7:: text "Whoa, hey!" ; Gen 5 quote line "I'm a raging" cont "inferno!" - done + prompt _SilphGauntlet6FAfterBattleText7:: text "The war? I don't" diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index 39ed7729..fc89427f 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -123,11 +123,6 @@ _VermilionCityText13:: text "VERMILION HARBOR" done -_VermilionCityText15:: - text "The S.S.ANNE" - line "has returned!" - done - _BeautyText1:: text "Hey! Do you like" line "cats or dogs?" From 31c17f04cdb37f74279476b38c7ccfce72697044 Mon Sep 17 00:00:00 2001 From: Martha Schilling <112545117+MementoMartha@users.noreply.github.com> Date: Wed, 22 Nov 2023 09:43:01 +0000 Subject: [PATCH 04/24] Update scaled_parties.asm Just a handful of minor changes to the initial E4 teams --- data/trainers/scaled_parties.asm | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 1bc917a6..15b67042 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -56,17 +56,6 @@ KogaData: db $FF, 47, VENOMOTH, 46, BELLIGNAN, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused) db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame) -BlaineData: - db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused) - db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 (unused) - db $FF, 22, PONYTA, 21, VULPIX, 21, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2 - db $FF, 29, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, CHARMELEON, 31, MAGMAR, 0 ; 3 - db $FF, 38, PONYTA, 37, NINETALES, 37, FLAREON, 38, ARCANINE, 40, MAGMORTAR, 0 ; 4 - db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5 - db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6 - db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused) - db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame) - SabrinaData: db $FF, 11, SLOWPOKE, 12, DROWZEE, 14, KADABRA, 0 ; 0 badges (unused) db $FF, 19, SLOWPOKE, 18, DROWZEE, 19, KADABRA, 21, MR_MIME, 0 ; 1 @@ -78,6 +67,17 @@ SabrinaData: db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, EXEGGUTOR, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused) db $FF, 67, EXEGGUTOR, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame) +BlaineData: + db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused) + db $FF, 19, PONYTA, 18, VULPIX, 19, GROWLITHE, 21, MAGMAR, 0 ; 1 (unused) + db $FF, 22, PONYTA, 21, VULPIX, 21, GROWLITHE, 23, CHARMELEON, 25, MAGMAR, 0 ; 2 + db $FF, 29, PONYTA, 28, VULPIX, 28, GROWLITHE, 29, CHARMELEON, 31, MAGMAR, 0 ; 3 + db $FF, 38, PONYTA, 37, NINETALES, 37, FLAREON, 38, ARCANINE, 40, MAGMORTAR, 0 ; 4 + db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5 + db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6 + db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused) + db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame) + GiovanniData: ; is not scaled as he is always fought last ; Rocket Hideout B4F db $FF, 28, BEEDRILL, 30, RHYHORN, 30, KANGASKHAN, 32, PERSIAN, 0 @@ -87,24 +87,24 @@ GiovanniData: ; is not scaled as he is always fought last db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0 LoreleiData: - db $FF, 53, DEWGONG, 52, CLOYSTER, 52, NINETALES_A, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0 + db $FF, 53, DEWGONG, 52, CLOYSTER, 52, BUU, 54, JYNX, 54, GLACEON, 56, LAPRAS, 0 ; post-game rematch team (currently unused) db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0 BrunoData: - db $FF, 55, JABETTA, 54, STEELIX, 54, SIRFETCHD, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0 + db $FF, 55, JABETTA, 54, STEELIX, 54, TRICULES, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0 ; post-game rematch team (currently unused) - db $FF, 70, JABETTA, 69, STEELIX, 69, SIRFETCHD, 71, HITMONTOP, 71, TRICULES, 73, MACHAMP, 0 + db $FF, 70, JABETTA, 69, STEELIX, 69, SIRFETCHD, 71, TRICULES, 71, HITMONTOP, 73, MACHAMP, 0 AgathaData: - db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0 + db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, GENGAR, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0 ; Agatha has double Gengars in every single battle in the main-series, it's fine here... ; post-game rematch team (currently unused) db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0 LanceData: - db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, IGUANARCH, 60, KINGDRA, 62, DRAGONITE, 0 + db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, KINGDRA, 60, IGUANARCH, 60, AERODACTYL, 62, DRAGONITE, 0 ; post-game rematch team (currently unused) - db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, IGUANARCH, 75, KINGDRA, 77, DRAGONITE, 0 + db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, IGUANARCH, 77, DRAGONITE, 0 YujirouData: ; was unused juggler db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0 From 7c5c2a3047dd74b9ed014053172e0222b49d486b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 22 Nov 2023 12:25:46 +0000 Subject: [PATCH 05/24] mini update - Tiles now animate correctly while still being sped up (credit to jojobear13!) - Fixed issues with certain cave maps being glitched after importing the new tileset for Seafoam - Gave Celeste Hill Cave the same palette as the exterior areas - Fixed an inconsistency in Koga's pre-fight script --- README.md | 3 -- data/maps/hide_show_data.asm | 12 ++--- data/maps/objects/CinnabarVolcano.asm | 4 +- data/maps/objects/CinnabarVolcanoFloors.asm | 2 +- data/maps/objects/CitrineCity.asm | 6 +-- data/tilesets/spinner_tiles.asm | 16 +++--- engine/gfx/palettes.asm | 31 ++++++++++-- engine/overworld/spinners.asm | 53 +++++++++++++++++++- gfx/blocksets/citrine.bst | 2 +- gfx/overworld/spinners.png | Bin 128 -> 247 bytes maps/CelesteHillCave.blk | 2 +- maps/CinnabarVolcano.blk | 2 +- maps/CinnabarVolcanoFloors.blk | 4 +- maps/CitrineCity.blk | 8 +-- maps/DiglettsCave.blk | 2 +- ram/hram.asm | 2 +- text/FuchsiaGym.asm | 2 +- text/ViridianPreGym.asm | 4 +- 18 files changed, 108 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index c9229c89..6075ead2 100644 --- a/README.md +++ b/README.md @@ -256,12 +256,9 @@ and more! Known Bugs ==== Comprehensive list can be found on Discord. -- Only portions of spinner tiles animate. - Occasionally, menu text sets itself to scroll. - The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1. - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. -- The door mat tiles added recently warp the player when they walk on another (Citrine mats, arrow tiles...) -- James doesn't check for Max DVs when Hyper Training. - Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly - LAST_MAP isn't updated properly when sailing from Vermilion to Citrine - After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house. diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 88e58235..70970176 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -358,12 +358,6 @@ PokemonTower2FHS: db POKEMON_TOWER_2F, $01, SHOW ; HS_POKEMON_TOWER_2F_RIVAL BrunswickGrottoHS: db BRUNSWICK_GROTTO, $01, HIDE ; HS_BRUNSWICK_ZAPDOS_G_2 -;PokemonTower3FHS: -; db POKEMON_TOWER_3F, $04, SHOW ; HS_POKEMON_TOWER_3F_ITEM -;PokemonTower4FHS: -; db POKEMON_TOWER_4F, $04, SHOW ; HS_POKEMON_TOWER_4F_ITEM_1 -; db POKEMON_TOWER_4F, $05, SHOW ; HS_POKEMON_TOWER_4F_ITEM_2 -; db POKEMON_TOWER_4F, $06, SHOW ; HS_POKEMON_TOWER_4F_ITEM_3 PokemonTower5FHS: db POKEMON_TOWER_5F, $06, SHOW ; HS_POKEMON_TOWER_5F_ITEM PokemonTower6FHS: @@ -499,9 +493,9 @@ SilphCo7FHS: SilphCo10FHS: db SILPH_CO_10F, $01, SHOW ; HS_SILPH_CO_10F_1 db SILPH_CO_10F, $02, SHOW ; HS_SILPH_CO_10F_2 - db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_3 - db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_1 - db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_2 + db SILPH_CO_10F, $03, SHOW ; HS_SILPH_CO_10F_ITEM_1 + db SILPH_CO_10F, $04, SHOW ; HS_SILPH_CO_10F_ITEM_2 + db SILPH_CO_10F, $05, SHOW ; HS_SILPH_CO_10F_ITEM_3 SilphCo11FHS: db SILPH_CO_11F, $03, SHOW ; Giovanni db SILPH_CO_11F, $04, SHOW ; James diff --git a/data/maps/objects/CinnabarVolcano.asm b/data/maps/objects/CinnabarVolcano.asm index 704a36bf..89d6ed8f 100644 --- a/data/maps/objects/CinnabarVolcano.asm +++ b/data/maps/objects/CinnabarVolcano.asm @@ -2,11 +2,11 @@ CinnabarVolcano_Object: db $7d ; border block def_warp_events - warp_event 13, 21, CINNABAR_VOLCANO_FLOORS, 9 + warp_event 15, 21, CINNABAR_VOLCANO_FLOORS, 9 def_bg_events def_object_events - object_event 14, 8, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON + object_event 15, 7, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON def_warps_to CINNABAR_VOLCANO diff --git a/data/maps/objects/CinnabarVolcanoFloors.asm b/data/maps/objects/CinnabarVolcanoFloors.asm index 4ffa3afd..1b5a07ad 100644 --- a/data/maps/objects/CinnabarVolcanoFloors.asm +++ b/data/maps/objects/CinnabarVolcanoFloors.asm @@ -10,7 +10,7 @@ CinnabarVolcanoFloors_Object: warp_event 5, 13, CINNABAR_VOLCANO_FLOORS, 5 warp_event 5, 3, CINNABAR_VOLCANO_FLOORS, 8 warp_event 5, 25, CINNABAR_VOLCANO_FLOORS, 7 - warp_event 13, 25, CINNABAR_VOLCANO, 1 + warp_event 12, 24, CINNABAR_VOLCANO, 1 def_bg_events diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index b273fd8d..f284de91 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -2,17 +2,17 @@ CitrineCity_Object: db $43 ; border block def_warp_events - warp_event 9, 27, CITRINE_ROCKET_HOUSE, 1 + warp_event 9, 25, CITRINE_ROCKET_HOUSE, 1 warp_event 9, 17, CITRINE_TRADEBACK_HOUSE, 1 warp_event 15, 17, CITRINE_POKECENTER, 1 - warp_event 15, 27, CITRINE_MART, 1 + warp_event 15, 25, CITRINE_MART, 1 warp_event 23, 5, CELESTE_HILL_GATE, 4 warp_event 11, 7, BATTLE_TENT, 1 warp_event 26, 31, CITRINE_FERRY_DOCK, 1 warp_event 27, 31, CITRINE_FERRY_DOCK, 1 def_bg_events - bg_event 16, 27, 5 ; Citrine Shop + bg_event 16, 25, 5 ; Citrine Shop bg_event 16, 17, 6 ; Pokecenter bg_event 20, 22, 7 ; Billboard 1 bg_event 5, 18, 8 ; Billboard 2 diff --git a/data/tilesets/spinner_tiles.asm b/data/tilesets/spinner_tiles.asm index 9ce3deb3..f7549203 100644 --- a/data/tilesets/spinner_tiles.asm +++ b/data/tilesets/spinner_tiles.asm @@ -13,17 +13,17 @@ FacilitySpinnerArrows: spinner SpinnerArrowAnimTiles, 1, $21 spinner SpinnerArrowAnimTiles, 2, $30 spinner SpinnerArrowAnimTiles, 3, $31 - spinner Facility_GFX, $20, $20 - spinner Facility_GFX, $21, $21 - spinner Facility_GFX, $30, $30 - spinner Facility_GFX, $31, $31 + spinner SpinnerArrowAnimTiles, 4, $20 + spinner SpinnerArrowAnimTiles, 5, $21 + spinner SpinnerArrowAnimTiles, 6, $30 + spinner SpinnerArrowAnimTiles, 7, $31 GymSpinnerArrows: spinner SpinnerArrowAnimTiles, 1, $3c spinner SpinnerArrowAnimTiles, 3, $3d spinner SpinnerArrowAnimTiles, 0, $4c spinner SpinnerArrowAnimTiles, 2, $4d - spinner Gym_GFX, $3c, $3c - spinner Gym_GFX, $3d, $3d - spinner Gym_GFX, $4c, $4c - spinner Gym_GFX, $4d, $4d + spinner SpinnerArrowAnimTiles, 5, $3c + spinner SpinnerArrowAnimTiles, 7, $3d + spinner SpinnerArrowAnimTiles, 4, $4c + spinner SpinnerArrowAnimTiles, 6, $4d diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 75190ab1..8700199a 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -161,8 +161,6 @@ SetPal_Overworld: jr z, .pachinko cp GAME_CORNER_PRIZE_ROOM jr z, .pachinko - cp SILPH_GAUNTLET_1F - jr z, .faraway cp CELESTE_HILL_OUTSIDE jr z, .celeste cp CELESTE_HILL @@ -212,6 +210,8 @@ SetPal_Overworld: jr z, .garnet cp ROCK_TUNNEL_B1F + 1 jr c, .caveDefault + cp CELESTE_HILL_CAVE + jr z, .celeste .caveDefault ld a, PAL_CAVE - 1 jr .town @@ -230,9 +230,6 @@ SetPal_Overworld: .celeste ld a, PAL_CELESTE - 1 jr .town -.faraway - ld a, PAL_ROUTE - 1 - jr .town .seafoam ld a, PAL_CYANMON - 1 jr .town @@ -249,6 +246,30 @@ SetPal_Overworld: ld a, PAL_FUCHSIA - 1 jr .town +; these can't be added without a more efficient solution +; cp ROCKET_HIDEOUT_B1F +; jr z, .pachinko +; cp ROCKET_HIDEOUT_B2F +; jr z, .pachinko +; cp ROCKET_HIDEOUT_B3F +; jr z, .pachinko +; cp ROCKET_HIDEOUT_B4F +; jr z, .pachinko +; cp ROCKET_HIDEOUT_ELEVATOR +; jr z, .pachinko +; cp FARAWAY_ISLAND_OUTSIDE +; jr z, .faraway +; cp FARAWAY_ISLAND_INSIDE +; jr z, .faraway +; cp SILPH_GAUNTLET_1F +; jr z, .faraway +;.pachinko +; ld a, PAL_CASINO - 1 +; jr .town +;.faraway +; ld a, PAL_ROUTE - 1 +; jr .town + ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame SetPal_PokemonWholeScreen: diff --git a/engine/overworld/spinners.asm b/engine/overworld/spinners.asm index dddd1b69..721ada0b 100644 --- a/engine/overworld/spinners.asm +++ b/engine/overworld/spinners.asm @@ -20,7 +20,7 @@ LoadSpinnerArrowTiles:: ld de, 6 * 4 add hl, de .alternateGraphics - ld a, 1 + ld a, $4 ld bc, $0 .loop push af @@ -38,7 +38,8 @@ LoadSpinnerArrowTiles:: ld a, [hli] ld h, [hl] ld l, a - call CopyVideoData + ;call CopyVideoData + call CopySpinnerTiles pop bc ld a, $6 add c @@ -47,6 +48,54 @@ LoadSpinnerArrowTiles:: pop af dec a jr nz, .loop + call DelayFrame ;Delay a frame because CopySpinnerTiles does not do this like CopyVideoData + ret + +CopySpinnerTiles: + di ;prevent vblank functions from running + + ;back up destination address + ld b, h + ld c, l + ;back up stack pointer + ld hl, sp + 0 + ld a, h + ld [hstemp], a + ld a, l + ld [hstemp + 1], a + ;set stack pointer to source address + ld h, d + ld l, e + ld sp, hl + ;restore destination address + ld h, b + ld l, c + + ;Stack Pointer = tile source address + ;HL = tile destination address + + ld c, 8 +.loop + pop de +.waitVRAM + ldh a, [rSTAT] ;read from stat register to get the mode + and %10 + jr nz, .waitVRAM + ld [hl], e + inc l + ld [hl], d + inc l + dec c + jr nz, .loop + + ;restore stack spointer + ld a, [hstemp] + ld h, a + ld a, [hstemp + 1] + ld l, a + ld sp, hl + + ei ;re-enable vblank functions ret INCLUDE "data/tilesets/spinner_tiles.asm" diff --git a/gfx/blocksets/citrine.bst b/gfx/blocksets/citrine.bst index 2e490878..27d39867 100644 --- a/gfx/blocksets/citrine.bst +++ b/gfx/blocksets/citrine.bst @@ -41,7 +41,7 @@ KKKK KKK -KKK,,,,,,,,,,*+,,:;!##!############!##!99NO99^_99999999*+:;99999999*+*+:;:;*+*+:;:;*+,,:;,,*+:;TTTT22222T2T2T2T[[[[[[%& +KKK,,,,,,,,,,*+,,:;!##!############!##!99NO99^_99999999,,,,,,,,*+,,:;,,99999999*+*+:;:;*+*+:;:;*+,,:;,,*+:;TTTT22222T2T2T2T[[[[[[%& KKK diff --git a/gfx/overworld/spinners.png b/gfx/overworld/spinners.png index 534ae610fc03b83de207e2cf62812951b6979348..472c7d8e68402dc66d8acc3ba11d2ff9acb6909e 100644 GIT binary patch delta 232 zcmZo*{LVN*yk3BVfq{V`C|jwOfq{W3$=lt9;eUJonf(k544efXk;M!Q+`=Ht$S`Y; z1Oo#Ddx@v7EBkXUNl{7RrRf~S3=9k%o-U3d8s|$VL~=q z0!?C%J*LYEdUz zNoVa|%v<5GT-3~&ARRDC>gt}^aX)f2BZ7^pBUUbM)jeuBe|BPi)8>=w j|Nf2t&QtPabL0bP0l+XkKS@2fQ delta 112 zcmey)*uXeJJd=Zofq{YHd)%%|3=9nJo-U3d6}ME+Y~(#)z`^3MjA!o6BR&&VU&Kb) zvn~$!)VH)GeC{6gM>c|+WbPi;yd7ZL%jBx|RcYa=Ju7mL&1#B!_eN2${sUvicirhe S_fyV-jP`W(b6Mw<&;$UJz%B0p diff --git a/maps/CelesteHillCave.blk b/maps/CelesteHillCave.blk index 65b364da..1e6cd213 100644 --- a/maps/CelesteHillCave.blk +++ b/maps/CelesteHillCave.blk @@ -1,2 +1,2 @@ ,+,<,+,a+,+,.........................................0b N  - r'jk„r ,+|)f-) " "^$^ \ No newline at end of file + r'jkr ,+|)f-) " "^$^ \ No newline at end of file diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk index 0f7b8427..5c199531 100644 --- a/maps/CinnabarVolcano.blk +++ b/maps/CinnabarVolcano.blk @@ -1 +1 @@ -..............}vvvvvvvvvvvv}Qvvvvvvvvvvvv}vvvvvvvvvvvvvvvvvvv+,vvv+,vvNvv-vvR}vvvv vvvv}N}vvv>vvv}}}}Q}}}}}}}QN \ No newline at end of file +..............}vvvvvvvvvvvv}Qvvvvvvvvvvvv}vvvvvvvvvvvvvvvvvvvv !" !"vvv+,vvvv !" !!"vvNvvv)vvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file diff --git a/maps/CinnabarVolcanoFloors.blk b/maps/CinnabarVolcanoFloors.blk index 39acf9e0..aa7ffbcf 100644 --- a/maps/CinnabarVolcanoFloors.blk +++ b/maps/CinnabarVolcanoFloors.blk @@ -1,4 +1,4 @@ -,€€€€€€€+,€€€€€€€+|__b "+ +,+,+|__b "+  vvvfvvvvvvv-vvvvfvvv-v |fyvr - _,€€€€€€€+,€€€€€€€+|‚'  r€+vvvvvv)vvvvvvvvvvv vvvvr-tfvvvv_ + _,+,+|#'  r+vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_  " ___$ \ No newline at end of file diff --git a/maps/CitrineCity.blk b/maps/CitrineCity.blk index 1111512c..149d3edc 100644 --- a/maps/CitrineCity.blk +++ b/maps/CitrineCity.blk @@ -16,14 +16,14 @@ t e,+,)+vvvvv+vv+vvnn+v)vL%+77zt%--%+r+sf+s s%+~kkkk[[o>~kk[o \ No newline at end of file +,+,+>,+,)+vvvvv+vv+vvnn+v)vL+,zt--+r+,sfs s+~kkkk[[o>~kk[o \ No newline at end of file diff --git a/ram/hram.asm b/ram/hram.asm index 29a582b4..3c404d1b 100644 --- a/ram/hram.asm +++ b/ram/hram.asm @@ -343,7 +343,7 @@ hUnlockedSilphCoDoors:: ; the first tile ID in a sequence of tile IDs that increase by 1 each step hStartTileID:: db - ds 2 +hstemp:: dw hNewPartyLength:: db diff --git a/text/FuchsiaGym.asm b/text/FuchsiaGym.asm index c05d27b5..ca746d6d 100644 --- a/text/FuchsiaGym.asm +++ b/text/FuchsiaGym.asm @@ -1,5 +1,5 @@ _KogaBeforeBattleText:: - text "KOGA: Fwahahaha!" + text "Fwahahaha!" para "A mere child like" line "you dares to" diff --git a/text/ViridianPreGym.asm b/text/ViridianPreGym.asm index 20b08f9a..af3a7504 100644 --- a/text/ViridianPreGym.asm +++ b/text/ViridianPreGym.asm @@ -65,7 +65,7 @@ _YujirouAfterBattleText2:: para "..." para "I had all the" - line "best normal-" + line "best NORMAL-" cont "type #MON." para "Maybe it's me?" @@ -75,7 +75,7 @@ _YujirouAfterBattleText2:: _ViridianPreGymBattleText1:: text "Did you know that" line "the best #MON" - cont "are normal-type?" + cont "are NORMAL-type?" done _ViridianPreGymEndBattleText1:: From 013dc271fb93ee3838a1ffa1c551bbf1ea16621c Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 23 Nov 2023 19:18:00 +0000 Subject: [PATCH 06/24] why why why why why won't you work I'm committing this for someone to have a look at my apparently-garbage code and figure out what I'm doing wrong because i CANNOT figure this out on my own --- data/maps/objects/SilphCo1F.asm | 1 + ram/wram.asm | 3 +- scripts/SilphCo1F.asm | 63 +++++++++++++++++++++++++++++++++ text/SilphCo1F.asm | 24 +++++++++++++ 4 files changed, 89 insertions(+), 2 deletions(-) diff --git a/data/maps/objects/SilphCo1F.asm b/data/maps/objects/SilphCo1F.asm index f09d9a5d..f8165ce7 100644 --- a/data/maps/objects/SilphCo1F.asm +++ b/data/maps/objects/SilphCo1F.asm @@ -12,5 +12,6 @@ SilphCo1F_Object: def_object_events object_event 4, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person + object_event 14, 3, SPRITE_LINK_RECEPTIONIST, STAY, RIGHT, 2 ; person def_warps_to SILPH_CO_1F diff --git a/ram/wram.asm b/ram/wram.asm index ec6c69dd..63f62b1b 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2053,8 +2053,7 @@ wRocketHideoutB3FCurScript:: db wRocketHideoutB4FCurScript:: db wRoute6GateCurScript:: db wRoute8GateCurScript:: db -; wSilphCo1FCurScript:: db - ds 1 +wSilphCo1FCurScript:: db wCinnabarIslandCurScript:: db wPokemonMansion1FCurScript:: db wBrunswickGrottoCurScript:: db diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm index bc484b7c..c0c39fe8 100644 --- a/scripts/SilphCo1F.asm +++ b/scripts/SilphCo1F.asm @@ -7,10 +7,73 @@ SilphCo1F_Script: ld a, HS_SILPH_CO_1F_RECEPTIONIST ld [wMissableObjectIndex], a predef_jump ShowObject + ld hl, SilphCo1F_ScriptPointers + ld a, [wSilphCo1FCurScript] + jp CallFunctionInTable + +SilphCo1F_ScriptPointers: + dw SilphCo1FScript0 + dw SilphCo1FScript1 + +SilphCo1FScript0: + call SilphCo1FScript_CheckForLetter + +SilphCo1FScript_CheckForLetter: + ld b, SILPHLETTER + call IsItemInBag + ret nz + ld a, [wYCoord] + cp 3 + ret nz + ld a, [wXCoord] + cp 15 + ret nz + ld a, PLAYER_DIR_LEFT + ld [wPlayerMovingDirection], a + ld a, $3 + ldh [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ldh [hJoyHeld], a + call SilphCo1FScript_ForceDown + ld a, $1 + ld [wSilphCo1FCurScript], a + ret + +SilphCo1FScript_ForceDown: + call StartSimulatingJoypadStates + ld a, $1 + ld [wSimulatedJoypadStatesIndex], a + ld a, D_DOWN + ld [wSimulatedJoypadStatesEnd], a + xor a + ld [wSpritePlayerStateData1FacingDirection], a + ld [wJoyIgnore], a + ret + +SilphCo1FScript1: + ld a, [wSimulatedJoypadStatesIndex] + and a + ret nz + call Delay3 + ld a, $0 + ld [wSilphCo1FCurScript], a + ret SilphCo1F_TextPointers: dw SilphCo1Text1 + dw SilphCo1Text2 + dw SilphCo1Text3 SilphCo1Text1: text_far _SilphCo1Text1 text_end + +SilphCo1Text2: + text_far _SilphCo1Text2 + text_end + +SilphCo1Text3: + text_far _SilphCo1Text3 + text_end + diff --git a/text/SilphCo1F.asm b/text/SilphCo1F.asm index 1ef80189..ec24d070 100644 --- a/text/SilphCo1F.asm +++ b/text/SilphCo1F.asm @@ -5,3 +5,27 @@ _SilphCo1Text1:: line "in the boardroom" cont "on 11F!" done + +_SilphCo1Text2:: + text "Past here is the" + line "SILPH GAUNTLET," + cont "a gathering of" + cont "some of KANTO's" + cont "best trainers!" + + para "I can only allow" + line "you in if you've" + cont "been invited by" + cont "CHIEF, though." + done + +_SilphCo1Text3:: + text "Excuse me, only" + line "trainers with a" + cont "special invite" + cont "are allowed in." + + para "Please come back" + line "once you have an" + cont "invite!" + done From 3e811d4ed1f377bad3602a0b68bdc9aac76ca851 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 23 Nov 2023 20:30:00 +0000 Subject: [PATCH 07/24] FINALLY oh my god plague thank you for figuring this out this took me like 2 months to get working properly --- scripts/SilphCo11F.asm | 1 + scripts/SilphCo1F.asm | 20 +++----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 22a984b7..e579eb04 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -610,6 +610,7 @@ SaffronCityCitizens: db HS_SAFFRON_CITY_B db HS_SAFFRON_CITY_C db HS_SAFFRON_CITY_F + db HS_SILPH_CO_1F_RECEPTIONIST db -1 ; end SaffronCityRockets: diff --git a/scripts/SilphCo1F.asm b/scripts/SilphCo1F.asm index c0c39fe8..601607b0 100644 --- a/scripts/SilphCo1F.asm +++ b/scripts/SilphCo1F.asm @@ -1,12 +1,5 @@ SilphCo1F_Script: call EnableAutoTextBoxDrawing - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI - ret z - CheckAndSetEvent EVENT_SILPH_CO_RECEPTIONIST_AT_DESK - ret nz - ld a, HS_SILPH_CO_1F_RECEPTIONIST - ld [wMissableObjectIndex], a - predef_jump ShowObject ld hl, SilphCo1F_ScriptPointers ld a, [wSilphCo1FCurScript] jp CallFunctionInTable @@ -16,9 +9,6 @@ SilphCo1F_ScriptPointers: dw SilphCo1FScript1 SilphCo1FScript0: - call SilphCo1FScript_CheckForLetter - -SilphCo1FScript_CheckForLetter: ld b, SILPHLETTER call IsItemInBag ret nz @@ -35,20 +25,16 @@ SilphCo1FScript_CheckForLetter: call DisplayTextID xor a ldh [hJoyHeld], a - call SilphCo1FScript_ForceDown - ld a, $1 - ld [wSilphCo1FCurScript], a - ret - -SilphCo1FScript_ForceDown: - call StartSimulatingJoypadStates ld a, $1 ld [wSimulatedJoypadStatesIndex], a ld a, D_DOWN ld [wSimulatedJoypadStatesEnd], a + call StartSimulatingJoypadStates xor a ld [wSpritePlayerStateData1FacingDirection], a ld [wJoyIgnore], a + ld a, $1 + ld [wSilphCo1FCurScript], a ret SilphCo1FScript1: From 29fc579c3f42d570b792af19f424839cfcec125b Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Thu, 23 Nov 2023 22:19:08 +0000 Subject: [PATCH 08/24] Obtainable Safari Balls...? Here's one for all the people that wanted another wacky interaction with the shady salesman! He stands outside the Safari Zone selling his own Safari Balls. They act the same way, they're called the same thing, but they're looking a little off...hey, is that paint peeling off? Anyway, this acts as a way to get Safari Balls outside of the Safari Zone, like in SwSh! Whether or not you wanna pretend that they're real, it's still neat that he's selling them to you for a good price. --- data/items/key_items.asm | 2 +- .../objects/CeladonUniversityPokecenter.asm | 2 +- data/maps/objects/CinnabarPokecenter.asm | 2 +- data/maps/objects/FuchsiaCity.asm | 31 +++++----- data/maps/objects/RockTunnelPokecenter.asm | 2 +- data/maps/sprite_sets.asm | 2 +- data/text/item_descriptions.asm | 5 ++ engine/menus/item_descriptions.asm | 2 +- maps/FuchsiaCity.blk | 2 +- scripts/FuchsiaCity.asm | 60 +++++++++++++++++++ text/CeladonUniversityPokecenter.asm | 13 ++-- text/CinnabarPokecenter.asm | 12 ++-- text/FuchsiaCity.asm | 43 +++++++++++++ text/MtMoonPokecenter.asm | 11 ++-- text/RockTunnelPokecenter.asm | 8 +-- 15 files changed, 152 insertions(+), 45 deletions(-) diff --git a/data/items/key_items.asm b/data/items/key_items.asm index 361b9131..2eae83b1 100644 --- a/data/items/key_items.asm +++ b/data/items/key_items.asm @@ -7,7 +7,7 @@ KeyItemFlags: dbit TRUE ; TOWN_MAP dbit TRUE ; BICYCLE dbit TRUE ; SURFBOARD - dbit TRUE ; SAFARI_BALL + dbit FALSE ; SAFARI_BALL dbit TRUE ; POKEDEX dbit FALSE ; MOON_STONE dbit FALSE ; ANTIDOTE diff --git a/data/maps/objects/CeladonUniversityPokecenter.asm b/data/maps/objects/CeladonUniversityPokecenter.asm index 016a8b66..3ce023cb 100644 --- a/data/maps/objects/CeladonUniversityPokecenter.asm +++ b/data/maps/objects/CeladonUniversityPokecenter.asm @@ -10,7 +10,7 @@ CeladonUniversityPokecenter_Object: def_object_events object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person object_event 8, 3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person - object_event 10, 5, SPRITE_MIDDLE_AGED_MAN, WALK, ANY_DIR, 3 ; spamton + object_event 10, 5, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 3 ; spamton object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey diff --git a/data/maps/objects/CinnabarPokecenter.asm b/data/maps/objects/CinnabarPokecenter.asm index 759b5414..5001949d 100644 --- a/data/maps/objects/CinnabarPokecenter.asm +++ b/data/maps/objects/CinnabarPokecenter.asm @@ -12,7 +12,7 @@ CinnabarPokecenter_Object: object_event 9, 4, SPRITE_COOLTRAINER_F, WALK, ANY_DIR, 2 ; person object_event 2, 6, SPRITE_GENTLEMAN, STAY, NONE, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton + object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 5 ; spamton object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Muk Trader object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 6be9a10f..d0baa698 100644 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -5,27 +5,25 @@ FuchsiaCity_Object: warp_event 15, 19, FUCHSIA_MART, 1 warp_event 11, 27, FUCHSIA_BILLS_GRANDPAS_HOUSE, 1 warp_event 19, 27, FUCHSIA_POKECENTER, 1 - warp_event 27, 27, WARDENS_HOUSE, 1 + warp_event 28, 27, WARDENS_HOUSE, 1 warp_event 18, 3, SAFARI_ZONE_GATE, 1 warp_event 5, 27, FUCHSIA_GYM, 1 warp_event 22, 13, FUCHSIA_MEETING_ROOM, 1 - ;warp_event 31, 27, FUCHSIA_GOOD_ROD_HOUSE, 2 these need to be replaced with...something. - ;warp_event 31, 24, FUCHSIA_GOOD_ROD_HOUSE, 1 def_bg_events - bg_event 25, 17, 12 ; FuchsiaCityText12 - bg_event 17, 5, 13 ; FuchsiaCityText13 - bg_event 16, 19, 14 ; MartSignText - bg_event 20, 27, 15 ; PokeCenterSignText - bg_event 27, 29, 16 ; FuchsiaCityText16 - bg_event 21, 17, 17 ; FuchsiaCityText17 - bg_event 3, 29, 18 ; FuchsiaCityText18 - bg_event 33, 7, 19 ; FuchsiaCityText19 - bg_event 27, 7, 20 ; FuchsiaCityText20 - bg_event 13, 7, 21 ; FuchsiaCityText21 - bg_event 31, 13, 22 ; FuchsiaCityText22 - bg_event 13, 15, 23 ; FuchsiaCityText23 - bg_event 7, 7, 24 ; FuchsiaCityText24 + bg_event 25, 17, 13 ; FuchsiaCityText12 + bg_event 17, 5, 14 ; FuchsiaCityText13 + bg_event 16, 19, 15 ; MartSignText + bg_event 20, 27, 16 ; PokeCenterSignText + bg_event 27, 29, 17 ; FuchsiaCityText16 + bg_event 21, 17, 18 ; FuchsiaCityText17 + bg_event 3, 29, 19 ; FuchsiaCityText18 + bg_event 33, 7, 20 ; FuchsiaCityText19 + bg_event 27, 7, 21 ; FuchsiaCityText20 + bg_event 13, 7, 22 ; FuchsiaCityText21 + bg_event 31, 13, 23 ; FuchsiaCityText22 + bg_event 13, 15, 24 ; FuchsiaCityText23 + bg_event 7, 7, 25 ; FuchsiaCityText24 def_object_events object_event 10, 12, SPRITE_YOUNGSTER, WALK, LEFT_RIGHT, 1 ; person @@ -39,5 +37,6 @@ FuchsiaCity_Object: object_event 8, 17, SPRITE_SEEL, WALK, ANY_DIR, 9 ; person object_event 6, 5, SPRITE_FOSSIL, STAY, NONE, 10 ; person object_event 11, 8, SPRITE_GAMBLER, STAY, UP, 11 ; person + object_event 15, 2, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 12 ; spamton def_warps_to FUCHSIA_CITY diff --git a/data/maps/objects/RockTunnelPokecenter.asm b/data/maps/objects/RockTunnelPokecenter.asm index d97c5404..10932792 100644 --- a/data/maps/objects/RockTunnelPokecenter.asm +++ b/data/maps/objects/RockTunnelPokecenter.asm @@ -12,7 +12,7 @@ RockTunnelPokecenter_Object: object_event 7, 3, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 2 ; person object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person - object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton + object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 5 ; spamton object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey def_warps_to ROCK_TUNNEL_POKECENTER diff --git a/data/maps/sprite_sets.asm b/data/maps/sprite_sets.asm index 0d0ec101..bd5088e2 100644 --- a/data/maps/sprite_sets.asm +++ b/data/maps/sprite_sets.asm @@ -188,7 +188,7 @@ SpriteSets: db SPRITE_SNORLAX ; SPRITESET_FUCHSIA - db SPRITE_BIRD + db SPRITE_MIDDLE_AGED_MAN db SPRITE_COOLTRAINER_M db SPRITE_CHANSEY db SPRITE_FISHER diff --git a/data/text/item_descriptions.asm b/data/text/item_descriptions.asm index 313f7afe..1c7744a0 100644 --- a/data/text/item_descriptions.asm +++ b/data/text/item_descriptions.asm @@ -31,6 +31,11 @@ _BicycleDescription:: next "for travel." prompt +_SafariBallDescription:: + text "Just an ULTRA BALL" + next "painted green." + prompt + _MoonStoneDescription:: _FireStoneDescription:: _ThunderStoneDescription:: diff --git a/engine/menus/item_descriptions.asm b/engine/menus/item_descriptions.asm index 070abab0..d6501d38 100644 --- a/engine/menus/item_descriptions.asm +++ b/engine/menus/item_descriptions.asm @@ -28,7 +28,7 @@ ItemDescriptionPointers: text_end text_far _UnusedItemDescription text_end - text_far _UnusedItemDescription + text_far _SafariBallDescription text_end text_far _UnusedItemDescription text_end diff --git a/maps/FuchsiaCity.blk b/maps/FuchsiaCity.blk index 55796514..59108509 100644 --- a/maps/FuchsiaCity.blk +++ b/maps/FuchsiaCity.blk @@ -2,7 +2,7 @@ -tt_1111n !tttt !_89n|~0|r_<=0nJ\K +tt_1111n !tttt !_ !1n|~0|r_7:~1nJ\K _Vw1wn diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm index c5e3c4d2..65d84811 100644 --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm @@ -13,6 +13,7 @@ FuchsiaCity_TextPointers: dw FuchsiaCityText9 dw FuchsiaCityText10 dw SubstituteGuy + dw SafariBallSalesman dw FuchsiaCityText12 dw FuchsiaCityText13 dw MartSignText @@ -167,6 +168,65 @@ FuchsiaCityText_19b2a: text_far _FuchsiaCityText_19b2a text_end +SafariBallSalesman: + text_asm + ld hl, .Text1 + call PrintText + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + call YesNoChoice + ld a, [wCurrentMenuItem] + and a + jp nz, .choseNo + ldh [hMoney], a + ldh [hMoney + 2], a + ld a, $24 + ldh [hMoney + 1], a + call HasEnoughMoney + jr nc, .enoughMoney + ld hl, .NoMoneyText + jr .printText +.enoughMoney + lb bc, SAFARI_BALL, 3 + call GiveItem + jr nc, .done + xor a + ld [wPriceTemp], a + ld [wPriceTemp + 2], a + ld a, $24 + ld [wPriceTemp + 1], a + ld hl, wPriceTemp + 2 + ld de, wPlayerMoney + 2 + ld c, $3 + predef SubBCDPredef + ld a, MONEY_BOX + ld [wTextBoxID], a + call DisplayTextBoxID + jr .done +.choseNo + ld hl, .RefuseText +.printText + call PrintText +.done + jp TextScriptEnd + +.Text1 + text_far _SafariBallSalesmanText1 + text_end + +.RefuseText + text_far _SafariBallSalesmanNoText + text_end + +.NoMoneyText + text_far _SafariBallSalesmanNoMoneyText + text_end + +SafariBallBagFull: + text_far _SafariBallBagFull + text_end + ; FireRed NPC ; This guy has a Kangaskhan fetish or something wtf SubstituteGuy: diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm index 71aac816..96630ffc 100644 --- a/text/CeladonUniversityPokecenter.asm +++ b/text/CeladonUniversityPokecenter.asm @@ -12,11 +12,10 @@ _CeladonUniversityPokecenterText4:: done _CuboneSalesmanText1:: - text "MAN: Hey there," - line "big shot trainer!" - - para "Have I got a" - line "deal for you!" + text "SALESMAN: Hey," + line "kid! Interested" + cont "in another great" + cont "deal?" para "Strike fear into" line "the hearts of" @@ -45,8 +44,8 @@ _CuboneSalesmanNoMoneyText:: done _CuboneSalesmanText2:: - text "MAN: As usual, no" - line "refunds!" + text "SALESMAN: Again," + line "no refunds!" done _CeladonUniversityPokecenterText8:: diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm index 0633a94a..f56bfcb7 100644 --- a/text/CinnabarPokecenter.asm +++ b/text/CinnabarPokecenter.asm @@ -21,15 +21,15 @@ _CinnabarPokecenterText3:: done _PoryZSalesmanText1:: - text "MAN: Whoa there," - line "kid! Long time" - cont "no see!" + text "SALESMAN: Whoa" + line "there, kid! Long" + cont "time no see!" para "My uncle works for" line "SILPH CO., and he" cont "got me some top" - cont "secret data on the" - cont "next PORYGON!" + cont "secret data on" + cont "the next PORYGON!" para "Tell you what." line "You can get a" @@ -50,7 +50,7 @@ _PoryZSalesmanNoMoneyText:: done _PoryZSalesmanText2:: - text "MAN: I'm not" + text "SALESMAN: I'm not" line "liable for any" cont "bugs in that code!" done diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index 73042749..7d04a0db 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -118,6 +118,49 @@ _FuchsiaCityText_19b2a:: text "..." done +_SafariBallSalesmanText1:: + text "SALESMAN: Shh!" + line "Hey, keep this" + cont "quiet, would ya?" + cont "I managed to" + cont "sneak a couple" + cont "SAFARI BALLs" + cont "out!" + + para "Wanna take some" + line "off my hands?" + cont "It'll cost you" + cont "Β₯2400 for 3, but" + cont "think about it!" + + para "You won't find" + line "these anywhere" + cont "else!" + done + +_SafariBallSalesmanNoText:: + text "C'mon, they're" + line "totally genuine!" + cont "Don't you trust" + cont "me?" + done + +_SafariBallSalesmanNoMoneyText:: + text "Not enough money?" + line "Sorry, kid! Paint" + cont "isn't cheap, you" + cont "know!" + + para "...Wait, forget" + line "I said anything!" + done + +_SafariBallBagFull:: + text "Whoa now! Can't" + line "give you these" + cont "when your bag's" + cont "that full!" + _ReceivedTM50Text:: text " received" line "@" diff --git a/text/MtMoonPokecenter.asm b/text/MtMoonPokecenter.asm index dda62044..11bdd05e 100644 --- a/text/MtMoonPokecenter.asm +++ b/text/MtMoonPokecenter.asm @@ -17,9 +17,9 @@ _MtMoonPokecenterText3:: done _MagikarpSalesmanText1:: - text "MAN: Hello, there!" - line "Have I got a deal" - cont "just for you!" + text "SALESMAN: Hello," + line "there! Have I got" + cont "a deal for you!" para "I'll let you have" line "a swell MAGIKARP" @@ -39,8 +39,9 @@ _MagikarpSalesmanNoMoneyText:: done _MagikarpSalesmanText2:: - text "MAN: Well, I don't" - line "give refunds!" + text "SALESMAN: Well, I" + line "don't give any" + cont "refunds!" done _MtMoonPokecenterText5:: diff --git a/text/RockTunnelPokecenter.asm b/text/RockTunnelPokecenter.asm index 5ff0435f..c9357d16 100644 --- a/text/RockTunnelPokecenter.asm +++ b/text/RockTunnelPokecenter.asm @@ -13,7 +13,7 @@ _RockTunnelPokecenterText3:: done _DittoSalesmanText1:: - text "MAN: Hey there," + text "SALESMAN: Hey," line "kid! Nice to" cont "see you again!" @@ -45,8 +45,8 @@ _DittoSalesmanNoMoneyText:: done _DittoSalesmanText2:: - text "MAN: Sold as seen!" - line "You can't get" - cont "every #MON" + text "SALESMAN: Sold as" + line "seen! You can't" + cont "get every #MON" cont "at the same time!" done From 4384bc639d950cabb8d452614c11b94f374abccc Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Fri, 24 Nov 2023 11:36:14 +0000 Subject: [PATCH 09/24] Improved Cinnabar Volcano + Mansion B2F! - Cinnabar Volcano now requires Strength to complete, and contains several trainers, including 3 Firefighters. - The entrance to Mansion B2F has been changed to a warp pad instead of a staircase. - Removed the boulders in B2F to fix a bug and to prevent softlocks. - Minor text fixes. --- constants/event_constants.asm | 7 +- constants/hide_show_constants.asm | 3 +- data/maps/hide_show_data.asm | 4 +- data/maps/objects/CinnabarVolcano.asm | 8 +- data/maps/objects/CinnabarVolcanoFloors.asm | 12 +++ data/maps/objects/PokemonMansionB1F.asm | 4 +- data/maps/objects/PokemonMansionB2F.asm | 29 ++---- data/trainers/parties.asm | 16 +-- maps/CinnabarVolcano.blk | 2 +- maps/CinnabarVolcanoFloors.blk | 4 +- maps/PokemonMansionB1F.blk | 2 +- ram/wram.asm | 2 +- scripts/CinnabarVolcano.asm | 6 ++ scripts/CinnabarVolcanoFloors.asm | 109 +++++++++++++++++++- scripts/PokemonMansionB2F.asm | 9 -- text.asm | 1 + text/CinnabarVolcanoFloors.asm | 68 ++++++++++++ text/PokemonMansionB1F.asm | 2 +- text/PokemonMansionB2F.asm | 30 +++--- 19 files changed, 259 insertions(+), 59 deletions(-) create mode 100644 text/CinnabarVolcanoFloors.asm diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 76bc1d69..6a8779cf 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -751,7 +751,12 @@ const_skip 15 const EVENT_BEAT_MANSION_3_TRAINER_0 const EVENT_BEAT_MANSION_3_TRAINER_1 - const_skip 14 + const_skip 6 + const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1 + const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2 + const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3 + const EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4 + const_skip 4 const EVENT_BEAT_MANSION_4_TRAINER_0 const EVENT_BEAT_MANSION_4_TRAINER_1 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 84ee285d..54467918 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -251,4 +251,5 @@ DEF SHOW EQU $15 const HS_GLADE_GZAP_1 ; EE const HS_GLADE_GZAP_2 ; EF const HS_GLADE_GZAP_3 ; F0 -DEF NUM_HS_OBJECTS EQU const_value ; F1 - FE all go unused. + const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1 +DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 70970176..f2851bd5 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -236,7 +236,7 @@ MapHSPointers: dw NoHS dw NoHS dw CinnabarVolcanoHS - dw NoHS + dw CinnabarVolcanoFloorsHS dw NoHS dw SilphCo10FHS dw SilphCo11FHS @@ -591,4 +591,6 @@ BrunswickGladeHS: db BRUNSWICK_GLADE, $01, HIDE ; HS_GLADE_GZAP_1 db BRUNSWICK_GLADE, $02, HIDE ; HS_GLADE_GZAP_2 db BRUNSWICK_GLADE, $03, HIDE ; HS_GLADE_GZAP_3 +CinnabarVolcanoFloorsHS: + db CINNABAR_VOLCANO_FLOORS, $05, SHOW assert_table_length NUM_HS_OBJECTS diff --git a/data/maps/objects/CinnabarVolcano.asm b/data/maps/objects/CinnabarVolcano.asm index 89d6ed8f..15722895 100644 --- a/data/maps/objects/CinnabarVolcano.asm +++ b/data/maps/objects/CinnabarVolcano.asm @@ -7,6 +7,12 @@ CinnabarVolcano_Object: def_bg_events def_object_events - object_event 15, 7, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON + object_event 15, 5, SPRITE_BIRD, STAY, UP, 1, MOLTRES, 50 | OW_POKEMON + object_event 13, 14, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 2 ; person + object_event 14, 13, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 3 ; person + object_event 14, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 4 ; person + object_event 15, 12, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person + object_event 14, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object_event 15, 10, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person def_warps_to CINNABAR_VOLCANO diff --git a/data/maps/objects/CinnabarVolcanoFloors.asm b/data/maps/objects/CinnabarVolcanoFloors.asm index 1b5a07ad..6922daee 100644 --- a/data/maps/objects/CinnabarVolcanoFloors.asm +++ b/data/maps/objects/CinnabarVolcanoFloors.asm @@ -15,5 +15,17 @@ CinnabarVolcanoFloors_Object: def_bg_events def_object_events + object_event 9, 10, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_FIREFIGHTER, 3 + object_event 37, 4, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_FIREFIGHTER, 4 + object_event 13, 8, SPRITE_COOLTRAINER_M, STAY, LEFT, 3, OPP_FIREFIGHTER, 5 + object_event 5, 32, SPRITE_SCIENTIST, STAY, RIGHT, 4, OPP_SCIENTIST, 9 + object_event 35, 7, SPRITE_POKE_BALL, STAY, DOWN, 5, FULL_RESTORE + object_event 25, 33, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person + object_event 24, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person + object_event 25, 28, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person + object_event 33, 6, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person + object_event 34, 11, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person + object_event 11, 35, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person + object_event 12, 30, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person def_warps_to CINNABAR_VOLCANO_FLOORS diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm index 82bb275d..ba43898e 100644 --- a/data/maps/objects/PokemonMansionB1F.asm +++ b/data/maps/objects/PokemonMansionB1F.asm @@ -3,7 +3,7 @@ PokemonMansionB1F_Object: def_warp_events warp_event 23, 22, POKEMON_MANSION_1F, 6 - warp_event 2, 1, POKEMON_MANSION_B2F, 1 ; temp for debugging purposes...unless? + warp_event 17, 3, POKEMON_MANSION_B2F, 1 ; temp for debugging purposes...unless? def_bg_events @@ -16,6 +16,6 @@ PokemonMansionB1F_Object: object_event 5, 4, SPRITE_POKE_BALL, STAY, NONE, 6, TM_SOLARBEAM object_event 16, 20, SPRITE_POKEDEX, STAY, NONE, 7 ; person object_event 5, 13, SPRITE_POKE_BALL, STAY, NONE, 8, SECRET_KEY - object_event 2, 1, SPRITE_GUARD, STAY, NONE, 9 ; person + object_event 15, 4, SPRITE_GUARD, STAY, NONE, 9 ; person def_warps_to POKEMON_MANSION_B1F diff --git a/data/maps/objects/PokemonMansionB2F.asm b/data/maps/objects/PokemonMansionB2F.asm index c0baedbc..8f5645f7 100644 --- a/data/maps/objects/PokemonMansionB2F.asm +++ b/data/maps/objects/PokemonMansionB2F.asm @@ -3,32 +3,23 @@ PokemonMansionB2F_Object: def_warp_events warp_event 26, 22, CINNABAR_ISLAND, 1 ; this should not be accessible, only something the player arrives at. - warp_event 27, 2, CINNABAR_ISLAND, 6 + warp_event 27, 2, CINNABAR_ISLAND, 1 def_bg_events - bg_event 23, 0, 14 ; photo - bg_event 18, 2, 15 ; starter pod - bg_event 14, 2, 16 ; starter pod - bg_event 10, 2, 17 ; starter pod - bg_event 6, 2, 18 ; amber's pod - bg_event 1, 2, 19 ; mewtwo's pod - bg_event 12, 6, 20 ; computer 1 - bg_event 14, 6, 21 ; computer 2 - bg_event 16, 6, 22 ; computer 3, missingno + bg_event 23, 0, 5 ; photo + bg_event 18, 2, 6 ; starter pod + bg_event 14, 2, 7 ; starter pod + bg_event 10, 2, 8 ; starter pod + bg_event 6, 2, 9 ; amber's pod + bg_event 1, 2, 10 ; mewtwo's pod + bg_event 12, 6, 11 ; computer 1 + bg_event 14, 6, 12 ; computer 2 + bg_event 16, 6, 13 ; computer 3 def_object_events object_event 7, 8, SPRITE_POKEDEX, STAY, NONE, 1 ; Book 1 object_event 26, 6, SPRITE_POKEDEX, STAY, NONE, 2 ; Book 2 object_event 8, 8, SPRITE_POKE_BALL, STAY, NONE, 3, TM_PSYCHIC_M object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY - object_event 6, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 5 ; person - object_event 9, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 6 ; person - object_event 5, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 7 ; person - object_event 17, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 8 ; person - object_event 11, 21, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 9 ; person - object_event 8, 19, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 10 ; person - object_event 5, 17, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 11 ; person - object_event 7, 18, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 12 ; person - object_event 12, 22, SPRITE_BOULDER, STAY, BOULDER_MOVEMENT_BYTE_2, 13 ; person def_warps_to POKEMON_MANSION_B2F \ No newline at end of file diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 6c4832f6..db0ef273 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -548,24 +548,24 @@ ChiefData: ScientistData: ; Silph Gauntlet 4F (Lavender Tower) db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0 -; Silph Co. 2F +; Silph Co. 2F (unused) db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 db 28, MAGNETITE, VOLTORB, MAGNETON, 0 ; Silph Co. 3F/Mansion 1F db 29, ELECTRODE, MUK, 0 -; Silph Co. 4F +; Silph Co. 4F (unused) db 33, VOLTORB, ELECTRODE, KOFFING, 0 ; Silph Co. 5F db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0 -; Silph Co. 6F +; Silph Co. 6F (unused) db 25, VOLTORB, KOFFING, MAGNETITE, MAGNEMITE, KOFFING, 0 ; Silph Co. 7F db 29, PORYGON, 0 ; stolen technology!!! -; Silph Co. 8F - db 29, GRIMER, ELECTRODE, 0 +; Cinnabar Volcano + db 37, GAVILLAIN, WEEZING, 0 ; Silph Co. 9F db 28, VOLTORB, KOFFING, MAGNETON, 0 -; Silph Co. 10F +; Silph Co. 10F (unused) db 29, MAGNETITE, KOFFING, 0 ; Mansion 3F db 33, MAGNETITE, MAGNETON, DITTO, 0 @@ -738,6 +738,10 @@ FirefighterData: db 15, POLIWAG, CHEEP, SQUIRTLE, 0 ; Silph Gauntlet 3F (S.S Anne) db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 +; Cinnabar Volcano + db 36, WARTORTLE, MAROWAK, POLITOED, 0 + db 35, SANDSLASH, OMANYTE, SEAKING, CROAKOZUNA, 0 + db 38, SEADRA, BLASTOISE, 0 JuniorData: ; to be removed diff --git a/maps/CinnabarVolcano.blk b/maps/CinnabarVolcano.blk index 5c199531..df1df773 100644 --- a/maps/CinnabarVolcano.blk +++ b/maps/CinnabarVolcano.blk @@ -1 +1 @@ -..............}vvvvvvvvvvvv}Qvvvvvvvvvvvv}vvvvvvvvvvvvvvvvvvvv !" !"vvv+,vvvv !" !!"vvNvvv)vvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file +..............}vvvvvvvvvvvv}Qvvvvvvvvv}vvvvvvvvvvvvvvv45vvvvvvvv+,vvvv8-888vvNvvvvv vvvvR}vvvv vvv}N}vvv>vv}}}}Q}}}}}}QN \ No newline at end of file diff --git a/maps/CinnabarVolcanoFloors.blk b/maps/CinnabarVolcanoFloors.blk index aa7ffbcf..16375cf5 100644 --- a/maps/CinnabarVolcanoFloors.blk +++ b/maps/CinnabarVolcanoFloors.blk @@ -1,4 +1,4 @@ -,+,+|__b "+ +,+,+|__b "+  vvvfvvvvvvv-vvvvfvvv-v |fyvr - _,+,+|#'  r+vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_ + _,+,+|#'  r+ vvvvvvvvvvvvvvvvv vvvvr-tfvvvv_  " ___$ \ No newline at end of file diff --git a/maps/PokemonMansionB1F.blk b/maps/PokemonMansionB1F.blk index 40af64cc..bb8b6b9c 100644 --- a/maps/PokemonMansionB1F.blk +++ b/maps/PokemonMansionB1F.blk @@ -1 +1 @@ -`saaBaaaabAAAABdFfwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ \ No newline at end of file +`aaaBaaaabAAAABdF /fwCCCFDGVXWIJIXWQDF@cgBAAAAAAABFD  FFFDFFFD  FFFPIIIJZaaYVQDFDFDVGDFDDnFDZwDFHIIIIIJIIIHIIIJ \ No newline at end of file diff --git a/ram/wram.asm b/ram/wram.asm index 63f62b1b..cdd0e219 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2043,7 +2043,6 @@ wSSAnneB1FRoomsCurScript:: db wVermilionCityCurScript:: db wPokemonTower2FCurScript:: db wPokemonTower3FCurScript:: db - ds 1 ;was wPokemonTower4FCurScript wPokemonTower5FCurScript:: db wPokemonTower6FCurScript:: db wPokemonTower7FCurScript:: db @@ -2062,6 +2061,7 @@ wPokemonMansion3FCurScript:: db wPokemonMansionB1FCurScript:: db wDiglettsCaveCurScript:: db wCinnabarVolcanoCurScript:: db +wCinnabarVolcanoFloorsCurScript:: db wCeladonUniversityOutsideCurScript:: db wUnderwaterTunnelCurScript:: db wVictoryRoad2FCurScript:: db diff --git a/scripts/CinnabarVolcano.asm b/scripts/CinnabarVolcano.asm index 97f2e06e..53e21ae2 100644 --- a/scripts/CinnabarVolcano.asm +++ b/scripts/CinnabarVolcano.asm @@ -14,6 +14,12 @@ CinnabarVolcano_ScriptPointers: CinnabarVolcano_TextPointers: dw MoltresText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText CinnabarVolcanoTrainerHeaders: def_trainers diff --git a/scripts/CinnabarVolcanoFloors.asm b/scripts/CinnabarVolcanoFloors.asm index 0de14c1b..1143a50d 100644 --- a/scripts/CinnabarVolcanoFloors.asm +++ b/scripts/CinnabarVolcanoFloors.asm @@ -1,6 +1,113 @@ CinnabarVolcanoFloors_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ld hl, CinnabarVolcanoFloorsTrainerHeaders + ld de, CinnabarVolcanoFloors_ScriptPointers + ld a, [wCinnabarVolcanoFloorsCurScript] + call ExecuteCurMapScriptInTable + ld [wCinnabarVolcanoFloorsCurScript], a + ret + +CinnabarVolcanoFloors_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle CinnabarVolcanoFloors_TextPointers: + dw CinnabarVolcanoFloorsText1 + dw CinnabarVolcanoFloorsText2 + dw CinnabarVolcanoFloorsText3 + dw CinnabarVolcanoFloorsText4 + dw PickUpItemText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + dw BoulderText + +CinnabarVolcanoFloorsTrainerHeaders: + def_trainers +CinnabarVolcanoFloorsTrainerHeader0: + trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_1, 2, CinnabarVolcanoFloorsBattleText1, CinnabarVolcanoFloorsEndBattleText1, CinnabarVolcanoFloorsAfterBattleText1 +CinnabarVolcanoFloorsTrainerHeader1: + trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_2, 5, CinnabarVolcanoFloorsBattleText2, CinnabarVolcanoFloorsEndBattleText2, CinnabarVolcanoFloorsAfterBattleText2 +CinnabarVolcanoFloorsTrainerHeader2: + trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_3, 2, CinnabarVolcanoFloorsBattleText3, CinnabarVolcanoFloorsEndBattleText3, CinnabarVolcanoFloorsAfterBattleText3 +CinnabarVolcanoFloorsTrainerHeader3: + trainer EVENT_BEAT_CINNABAR_VOLCANO_TRAINER_4, 3, CinnabarVolcanoFloorsBattleText4, CinnabarVolcanoFloorsEndBattleText4, CinnabarVolcanoFloorsAfterBattleText4 + db -1 ; end + +CinnabarVolcanoFloorsText1: + text_asm + ld hl, CinnabarVolcanoFloorsTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +CinnabarVolcanoFloorsBattleText1: + text_far _CinnabarVolcanoFloorsBattleText1 + text_end + +CinnabarVolcanoFloorsEndBattleText1: + text_far _CinnabarVolcanoFloorsEndBattleText1 + text_end + +CinnabarVolcanoFloorsAfterBattleText1: + text_far _CinnabarVolcanoFloorsAfterBattleText1 + text_end + +CinnabarVolcanoFloorsText2: + text_asm + ld hl, CinnabarVolcanoFloorsTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +CinnabarVolcanoFloorsBattleText2: + text_far _CinnabarVolcanoFloorsBattleText2 + text_end + +CinnabarVolcanoFloorsEndBattleText2: + text_far _CinnabarVolcanoFloorsEndBattleText2 + text_end + +CinnabarVolcanoFloorsAfterBattleText2: + text_far _CinnabarVolcanoFloorsAfterBattleText2 + text_end + +CinnabarVolcanoFloorsText3: + text_asm + ld hl, CinnabarVolcanoFloorsTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +CinnabarVolcanoFloorsBattleText3: + text_far _CinnabarVolcanoFloorsBattleText3 + text_end + +CinnabarVolcanoFloorsEndBattleText3: + text_far _CinnabarVolcanoFloorsEndBattleText3 + text_end + +CinnabarVolcanoFloorsAfterBattleText3: + text_far _CinnabarVolcanoFloorsAfterBattleText3 + text_end + +CinnabarVolcanoFloorsText4: + text_asm + ld hl, CinnabarVolcanoFloorsTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +CinnabarVolcanoFloorsBattleText4: + text_far _CinnabarVolcanoFloorsBattleText4 + text_end + +CinnabarVolcanoFloorsEndBattleText4: + text_far _CinnabarVolcanoFloorsEndBattleText4 + text_end + +CinnabarVolcanoFloorsAfterBattleText4: + text_far _CinnabarVolcanoFloorsAfterBattleText4 + text_end text_end ; unused diff --git a/scripts/PokemonMansionB2F.asm b/scripts/PokemonMansionB2F.asm index 5aede687..77a27da0 100644 --- a/scripts/PokemonMansionB2F.asm +++ b/scripts/PokemonMansionB2F.asm @@ -10,15 +10,6 @@ PokemonMansionB2F_TextPointers: dw B2FBook2 dw PickUpItemText dw PickUpItemText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText - dw BoulderText dw B2FPicture dw B2FTrioPods dw B2FTrioPods diff --git a/text.asm b/text.asm index e212b65d..0aceeacb 100644 --- a/text.asm +++ b/text.asm @@ -298,6 +298,7 @@ INCLUDE "text/GarnetCavern2F.asm" INCLUDE "text/GiovannisRoom.asm" INCLUDE "text/CitrineCity.asm" INCLUDE "text/MtMoonSquare.asm" +INCLUDE "text/CinnabarVolcanoFloors.asm" SECTION "PokΓ©dex Text", ROMX diff --git a/text/CinnabarVolcanoFloors.asm b/text/CinnabarVolcanoFloors.asm new file mode 100644 index 00000000..432e30ba --- /dev/null +++ b/text/CinnabarVolcanoFloors.asm @@ -0,0 +1,68 @@ +_CinnabarVolcanoFloorsBattleText1:: + text "Look out! You'll" + line "get burned!" + done + +_CinnabarVolcanoFloorsEndBattleText1:: + text "You're" + line "no joke!" + prompt + +_CinnabarVolcanoFloorsAfterBattleText1:: + text "You'll be fine as" + line "long as you have" + cont "your #MON to" + cont "protect you." + done + +_CinnabarVolcanoFloorsBattleText2:: + text "Whew! This place" + line "is scorching!" + done + +_CinnabarVolcanoFloorsEndBattleText2:: + text "Too" + line "hot for me!" + prompt + +_CinnabarVolcanoFloorsAfterBattleText2:: + text "I'm sweating just" + line "standing here!" + done + +_CinnabarVolcanoFloorsBattleText3:: + text "My WATER #MON" + line "can keep us cool!" + done + +_CinnabarVolcanoFloorsEndBattleText3:: + text "Oh" + line "well..." + prompt + +_CinnabarVolcanoFloorsAfterBattleText3:: + text "BLASTOISE is a" + line "favorite among" + cont "us FIREFIGHTERs!" + done + +_CinnabarVolcanoFloorsBattleText4:: + text "I'm collecting" + line "volcanic rock" + cont "samples!" + done + +_CinnabarVolcanoFloorsEndBattleText4:: + text "Ouch!" + line "Hot, hot, hot!" + prompt + +_CinnabarVolcanoFloorsAfterBattleText4:: + text "I sometimes see" + line "MAGMAR swimming" + cont "in the magma." + + para "I wonder if I" + line "could fish one" + cont "up? Hahaha!" + done diff --git a/text/PokemonMansionB1F.asm b/text/PokemonMansionB1F.asm index 760fbcb7..e164d8c0 100644 --- a/text/PokemonMansionB1F.asm +++ b/text/PokemonMansionB1F.asm @@ -41,7 +41,7 @@ _Mansion4Text7:: done _MansionGuardText:: - text "This room is" + text "This area is" line "off-limits." para "Beat it, kid!" diff --git a/text/PokemonMansionB2F.asm b/text/PokemonMansionB2F.asm index b446f6f2..01974718 100644 --- a/text/PokemonMansionB2F.asm +++ b/text/PokemonMansionB2F.asm @@ -24,12 +24,12 @@ _B2FBook2:: para "MEWTWO remains." line "However..." - para "Its seemed to" + para "It has seemed to" line "react to the" cont "situation." - para "Tranquilizers" - line "were administered." + para "Tranquilizers were" + line "administered." para "We should never" line "have gone to" @@ -38,11 +38,15 @@ _B2FBook2:: para "Somewhere no one" line "will ever look." + cont "With any luck," + cont "it'll end up at" + cont "the bottom of" + cont "the sea..." done _B2FPicture:: - text "It's charred" + text "It's a charred" line "picture of a" cont "happy family." @@ -50,9 +54,9 @@ _B2FPicture:: _B2FComputer1:: text "The screen is" - line "cracked, but" - cont "five graphs" - cont "are visible." + line "cracked, but 5" + cont "graphs are" + cont "visible." done @@ -64,10 +68,12 @@ _B2FComputer2:: done _B2FMissingNo:: - text "A multicolored," - line "glitched block" - cont "is visible on" - cont "this screen." + text "Badly corrupted" + line "graphics are on" + cont "this screen..." + + para "It's best to" + line "leave it alone." done @@ -86,7 +92,7 @@ _AmberPod:: _MewtwoPod:: text "Smashed glass" - line "litters the" + line "surrounds this" cont "pod..." para "What could have" From d41d0e8e9aac039285a3530146f253b0f60385c9 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 25 Nov 2023 08:48:01 +0000 Subject: [PATCH 10/24] minor post-playtest fixes - Moved one of the trainers in the Celadon Uni PokeCenter to stop him from being in the way of the nurse - Buffed one of the Scientists in the Mansion - Moved the nurse and Weezing trader on the SS Anne slightly - Boosted Meltan's catch rate because having it be that low is ridiculous - Increased Luxwan's height because real swans are not that small - Changed a Cue Ball's party to allow his dialogue to make sense - Wild level balancing around Vermilion City - Fixed a small Pokedex display bug - Text fixes --- .../objects/CeladonUniversityPokecenter.asm | 2 +- data/maps/objects/PokemonMansion1F.asm | 2 +- data/maps/objects/SSAnne1FRooms.asm | 4 ++-- data/pokemon/base_stats/meltan.asm | 2 +- data/pokemon/dex_entries.asm | 4 ++-- data/trainers/parties.asm | 10 ++++---- data/wild/maps/Route11.asm | 2 +- data/wild/maps/Route6.asm | 4 ++-- engine/menus/pokedex.asm | 1 - text/CeladonUniversityPokecenter.asm | 2 +- text/FuchsiaGym_2.asm | 2 +- text/Route15Gate2F.asm | 5 ---- text/Route22.asm | 23 +++++++++---------- text/SaffronCity.asm | 2 +- text/SilphCo7F.asm | 3 ++- 15 files changed, 31 insertions(+), 37 deletions(-) diff --git a/data/maps/objects/CeladonUniversityPokecenter.asm b/data/maps/objects/CeladonUniversityPokecenter.asm index 3ce023cb..6e993e5d 100644 --- a/data/maps/objects/CeladonUniversityPokecenter.asm +++ b/data/maps/objects/CeladonUniversityPokecenter.asm @@ -11,7 +11,7 @@ CeladonUniversityPokecenter_Object: object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person object_event 8, 3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person object_event 10, 5, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 3 ; spamton - object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person + object_event 6, 5, SPRITE_SUPER_NERD, STAY, LEFT_RIGHT, 4 ; person object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 5568f7fe..7f1d5530 100644 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -14,7 +14,7 @@ PokemonMansion1F_Object: def_bg_events def_object_events - object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object_event 17, 17, SPRITE_SCIENTIST, STAY, LEFT, 1, OPP_SCIENTIST, 5 object_event 14, 3, SPRITE_POKE_BALL, STAY, NONE, 2, ESCAPE_ROPE object_event 18, 21, SPRITE_POKE_BALL, STAY, NONE, 3, CARBOS diff --git a/data/maps/objects/SSAnne1FRooms.asm b/data/maps/objects/SSAnne1FRooms.asm index 5b56f452..71430ce1 100644 --- a/data/maps/objects/SSAnne1FRooms.asm +++ b/data/maps/objects/SSAnne1FRooms.asm @@ -24,7 +24,7 @@ SSAnne1FRooms_Object: object_event 12, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_BODY_SLAM object_event 21, 13, SPRITE_GENTLEMAN, WALK, LEFT_RIGHT, 11 ; person object_event 0, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 12 ; Perrserker Trader - object_event 10, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader - object_event 23, 3, SPRITE_NURSE, STAY, LEFT, 14 ; Healer + object_event 20, 4, SPRITE_GAMEBOY_KID, STAY, DOWN, 13 ; Weezing Trader + object_event 23, 1, SPRITE_NURSE, STAY, LEFT, 14 ; Healer def_warps_to SS_ANNE_1F_ROOMS diff --git a/data/pokemon/base_stats/meltan.asm b/data/pokemon/base_stats/meltan.asm index c68d67db..887dedc7 100644 --- a/data/pokemon/base_stats/meltan.asm +++ b/data/pokemon/base_stats/meltan.asm @@ -4,7 +4,7 @@ ; hp atk def spd spc db STEEL, STEEL ; type - db 3 ; catch rate + db 45 ; catch rate db 131 ; base exp INCBIN "gfx/pokemon/front/meltan.pic", 0, 1 ; sprite dimensions diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 90b1918c..af8caa05 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -1346,8 +1346,8 @@ RamooseDexEntry: text_end LuxwanDexEntry: - db "MASQUERADE@" ; changed from Wild Duck since it's more closely based on a mute swan - db 3,11 + db "MASQUERADE@" ; changed from Wild Duck since it's more closely based on a swan + db 5,3 dw 590 text_far _LuxwanDexEntry text_end diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index db0ef273..d6b25de0 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -404,8 +404,8 @@ CueBallData: db 33, CARAPTHOR, 0 ; Route 17 db 29, MANKEY, PRIMEAPE, 0 - db 29, MACHOP, MACHOKE, 0 - db 33, JABETTA, 0 + db 29, CHEEP, JABETTA, 0 + db 33, MACHOKE, 0 db 26, MANKEY, MACHOKE, CROAKOZUNA, 0 db 29, PRIMEAPE, MACHOKE, 0 ; Route 21 @@ -551,10 +551,10 @@ ScientistData: ; Silph Co. 2F (unused) db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0 db 28, MAGNETITE, VOLTORB, MAGNETON, 0 -; Silph Co. 3F/Mansion 1F +; Silph Co. 3F db 29, ELECTRODE, MUK, 0 -; Silph Co. 4F (unused) - db 33, VOLTORB, ELECTRODE, KOFFING, 0 +; Mansion 1F + db 36, VOLTORB, ELECTRODE, KOFFING, 0 ; Silph Co. 5F db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0 ; Silph Co. 6F (unused) diff --git a/data/wild/maps/Route11.asm b/data/wild/maps/Route11.asm index dc538b18..e63e4878 100644 --- a/data/wild/maps/Route11.asm +++ b/data/wild/maps/Route11.asm @@ -7,7 +7,7 @@ Route11WildMons: db 13, MAGNEMITE db 13, DROWZEE db 15, SANDSHREW - db 17, SPEAROW + db 16, SPEAROW db 11, DROWZEE db 15, RATICATE end_grass_wildmons diff --git a/data/wild/maps/Route6.asm b/data/wild/maps/Route6.asm index 24226e3a..b287e99b 100644 --- a/data/wild/maps/Route6.asm +++ b/data/wild/maps/Route6.asm @@ -7,8 +7,8 @@ Route6WildMons: db 13, RATTATA db 13, PIDGEY db 15, PIDGEOTTO - db 10, MEOWTH - db 12, MEOWTH + db 15, MEOWTH + db 16, MEOWTH db 15, GROWLITHE db 16, GROWLITHE db 16, JIGGLYPUFF diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index f2444fd7..21f29bd5 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -202,7 +202,6 @@ HandlePokedexListMenu: ld de, PokedexMenuItemsText call PlaceString ; find the highest pokedex number among the pokemon the player has seen - ld hl, wPokedexSeenEnd - 1 ld b, 251 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. .maxSeenPokemonLoop ld a, [hld] diff --git a/text/CeladonUniversityPokecenter.asm b/text/CeladonUniversityPokecenter.asm index 96630ffc..e74fbdf3 100644 --- a/text/CeladonUniversityPokecenter.asm +++ b/text/CeladonUniversityPokecenter.asm @@ -53,7 +53,7 @@ _CeladonUniversityPokecenterText8:: line "DRAGONAIR can fly" cont "without wings..." - para "#MON are strange" + para "#MON are odd" line "creatures..." done \ No newline at end of file diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index c07e994a..c256e019 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -115,7 +115,7 @@ _FuchsiaGymBattleText4:: _FuchsiaGymEndBattleText4:: text "Whoa!" - line "He's got it!" + line "You've got it!" prompt _FuchsiaGymAfterBattleText4:: diff --git a/text/Route15Gate2F.asm b/text/Route15Gate2F.asm index ade4a358..961b9cef 100644 --- a/text/Route15Gate2F.asm +++ b/text/Route15Gate2F.asm @@ -5,11 +5,6 @@ _Route15GateUpstairsText_4968c:: cont "you, even if they" cont "don't fight." - para "It does, however," - line "reduce the amount" - cont "of EXP for each" - cont "#MON." - para "If you don't need" line "it, you should " cont "store it via PC." diff --git a/text/Route22.asm b/text/Route22.asm index 3a1d28f0..56eca4d9 100644 --- a/text/Route22.asm +++ b/text/Route22.asm @@ -2,8 +2,9 @@ _Route22RivalBeforeBattleText1:: text ": Hey!" line "!" - para "You're going to" - line "#MON LEAGUE?" + para "Ha! You're going" + para "to the #MON" + line "LEAGUE?" para "Forget it! You" line "probably don't" @@ -18,7 +19,7 @@ _Route22RivalBeforeBattleText1:: done _Route22RivalAfterBattleText1:: - text "I heard #MON" + text "I heard that the" line "LEAGUE has many" cont "tough trainers!" @@ -52,25 +53,23 @@ _Route22RivalBeforeBattleText2:: cont "surprise to see" cont "you here!" - para "So you're going to" - line "#MON LEAGUE?" - para "You collected all" line "the BADGEs too?" cont "That's cool!" - para "Then I'll whip you" - line " as a" - cont "warm up for" - cont "#MON LEAGUE!" + para "Then, I'll whip" + line "you as a warm up" + cont "for the #MON" + cont "LEAGUE!" para "Come on!" done _Route22RivalAfterBattleText2:: text "That loosened me" - line "up! I'm ready for" - cont "#MON LEAGUE!" + line "up! Now I'm ready" + cont "for the #MON" + cont "LEAGUE!" para ", you need" line "more practice!" diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index 101493b6..3b8cc3e0 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -153,7 +153,7 @@ _UpGradePreReceiveText:: cont "those TEAM" cont "ROCKET thugs?" - text "Thank you so" + para "Thank you so" line "much! Here," cont "take this!" prompt diff --git a/text/SilphCo7F.asm b/text/SilphCo7F.asm index 1cc2bc30..7638f752 100644 --- a/text/SilphCo7F.asm +++ b/text/SilphCo7F.asm @@ -169,7 +169,8 @@ _SilphCo7Text_51ec3:: _SilphCo7Text_51ec8:: text "Oh ho!" line "So, you are ready" - cont "for BOSS ROCKET!" + cont "for the TEAM" + cont "ROCKET BOSS!" prompt _SilphCo7Text_51ecd:: From 8d28a3ae0ed27dfa6aed9eb53692941a9f1dc4a8 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 12:36:10 +0000 Subject: [PATCH 11/24] Restore unreferenced Porygon PC This was deleted when I was sprucing up the final Silph Co. floor, but I decided to restore it instead. Because of the weird way PCs work, I made it so the text is a literal bg event on a monitor, true to the text. I think it works fine. The text was changed to use `prompt` instead of `done` to fix text scrolling issues. --- README.md | 1 + data/maps/objects/RedsHouse2F.asm | 4 ++-- data/maps/objects/SilphCo11F.asm | 1 + scripts/SilphCo11F.asm | 13 +++++++++++++ text/SilphCo11F.asm | 6 ++++++ 5 files changed, 23 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6075ead2..751f6a56 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,7 @@ Improved Areas - Fuchsia City has been made to resemble the more walkable LGPE version, removing the Cut trees among other things. - The Fighting Dojo has been revamped, featuring a design reminiscent of the prototype versions; rough floors, the elder in the back, and more. Additionally, you can now get a Hitmontop as a third option. The Karate Master is also now treated somewhat more like a Gym Leader, having Gym Scaling and a Rematch system. - Silph Co's pathing was completely overhauled to make navigating it less tedious. +- Silph Co. 11F's unreferenced Porygon PC was restored. It's on the monitor! - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too... - Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you! - Viridian Gym now has a minor new area once you make Giovanni leave. diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 8a02d3b2..3c719bf4 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -4,14 +4,14 @@ RedsHouse2F_Object: def_warp_events warp_event 7, 1, REDS_HOUSE_1F, 3 ;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief - ;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. + warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater ;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt ;warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup ;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew - warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles + ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles def_bg_events diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 8e6839cd..dd4536af 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -8,6 +8,7 @@ SilphCo11F_Object: warp_event 3, 2, SILPH_CO_7F, 3 def_bg_events + bg_event 11, 12, 14 ; Porygon PC def_object_events object_event 7, 5, SPRITE_SILPH_PRESIDENT, STAY, DOWN, 1 ; person diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index e579eb04..445ba971 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -653,6 +653,7 @@ SilphCo11F_TextPointers: dw OmegaText dw Omega2Text dw StupidGiovanniFix + dw SilphCo11FPorygonText SilphCo11TrainerHeaders: def_trainers 5 @@ -796,3 +797,15 @@ Omega2BattleText: StupidGiovanniFix: text_far _SilphCo10Text_62335 text_end + +SilphCo11FPorygonText: + text_asm + ld hl, .Text + call PrintText + ld a, PORYGON + call DisplayPokedex + jp TextScriptEnd + +.Text: + text_far _SilphCo11FPorygonText + text_end diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index a645b956..68f5d81b 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -176,3 +176,9 @@ _SilphCoJessieJamesText4:: para "Again...@" text_end + +_SilphCo11FPorygonText:: + text "The monitor has" + line "#MON on it!" + prompt ; this fixes its strange scrolling issue + From 791689c3000317722fd67ae6a6a09be5460df1f5 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 12:48:48 +0000 Subject: [PATCH 12/24] Voltorb/Electrode in Silph/Rocket parties MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This gives various Rockets and Scientists Voltorb and Electrode, Pokemon that were discovered in Silph Co., to add a bit more immersion. Naturally, Chief will use it too, which comes with the benefit of reducing Magnezone's insane prevalence in late-game parties. Ruby Dex Entry: > Voltorb was first sighted at a company that manufactures PokΓ© Balls. The link between that sighting and the fact that this PokΓ©mon looks very similar to a PokΓ© Ball remains a mystery. --- data/trainers/parties.asm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index d6b25de0..09ec3394 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -478,7 +478,7 @@ RockerData: ; Psychic, Poison, and a little bit of Voltorb. JugglerData: ; Silph Co. 5F - db 29, KADABRA, MR_MIME, 0 + db 29, ELECTRODE, KADABRA, MR_MIME, 0 ; Victory Road 2F db 41, DROWZEE, HYPNO, ESPEON, KADABRA, 0 ; Fuchsia Gym @@ -541,7 +541,7 @@ BirdKeeperData: ; Uses Silph products and Steel-types ChiefData: ; Silph Gauntlet 7F - db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0 + db $FF, 71, ELECTRODE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0 ; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope. ; Poison- and Electric-type Pokemon @@ -556,11 +556,11 @@ ScientistData: ; Mansion 1F db 36, VOLTORB, ELECTRODE, KOFFING, 0 ; Silph Co. 5F - db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0 + db 26, MAGNEMITE, VOLTORB, WEEZING, MAGNETITE, 0 ; Silph Co. 6F (unused) db 25, VOLTORB, KOFFING, MAGNETITE, MAGNEMITE, KOFFING, 0 ; Silph Co. 7F - db 29, PORYGON, 0 ; stolen technology!!! + db 29, ELECTRODE, PORYGON, 0 ; stolen technology!!! ; Cinnabar Volcano db 37, GAVILLAIN, WEEZING, 0 ; Silph Co. 9F @@ -572,6 +572,7 @@ ScientistData: ; Mansion B1F db 34, MAGNETITE, ELECTRODE, 0 +; Gave the Rockets more Sandshrew, Cubone, and Voltorb, Pokemon shown to be used quite a bit in various media. RocketData: ; Mt. Moon B2F db 13, RATTATA, ZUBAT, 0 @@ -590,7 +591,7 @@ RocketData: db 21, RATICATE, RATICATE, 0 db 20, GRIMER, KOFFING, KOFFING, 0 db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0 - db 22, GRIMER, KOFFING, 0 + db 22, VOLTORB, KOFFING, 0 ; Rocket Hideout B2F db 17, ZUBAT, KOFFING, GRIMER, CUBONE, RATICATE, 0 ; Rocket Hideout B3F @@ -602,7 +603,7 @@ RocketData: db 21, KOFFING, ZUBAT, 0 ; PokΓ©mon Tower 7F db 25, ZUBAT, GRIMER, GOLBAT, 0 - db 26, KOFFING, DROWZEE, 0 + db 26, VOLTORB, KOFFING, DROWZEE, 0 db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0 ; Silph Gauntlet 4F (Lavender Tower) db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0 @@ -610,7 +611,7 @@ RocketData: db 29, CUBONE, ZUBAT, 0 db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0 ; Silph Co. 3F - db 28, RATICATE, HYPNO, RATICATE, 0 + db 28, ELECTRODE, HYPNO, RATICATE, 0 ; Silph Co. 4F - cut db 29, MACHOP, DROWZEE, 0 db 28, EKANS, ZUBAT, CUBONE, 0 @@ -622,7 +623,7 @@ RocketData: db 28, ZUBAT, ZUBAT, GOLBAT, 0 ; Silph Co. 7F db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0 - db 29, CUBONE, MACHOKE, 0 + db 29, CUBONE, MACHOKE, ELECTRODE, 0 db 29, SANDSHREW, SANDSLASH, 0 ; Silph Co. 8F - cut db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0 @@ -634,7 +635,7 @@ RocketData: db 33, MACHOKE, 0 ; Silph Co. 11F db 25, RATTATA, ZUBAT, EKANS, RATICATE, 0 - db 32, CUBONE, DROWZEE, MAROWAK, 0 + db 32, ELECTRODE, DROWZEE, MAROWAK, 0 ; Very varied, nothing to say CooltrainerMData: From e6119651d8021409769d70fef0bc75b01baaea19 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 13:08:49 +0000 Subject: [PATCH 13/24] Cinnabar Lab has a proper fossil machine now! Taken from the RG prototype assets! --- README.md | 1 + constants/tileset_constants.asm | 1 + data/maps/headers/CinnabarLabFossilRoom.asm | 2 +- data/maps/objects/RedsHouse2F.asm | 3 ++- data/tilesets/collision_tile_ids.asm | 1 + data/tilesets/tileset_headers.asm | 1 + data/tilesets/warp_tile_ids.asm | 1 + gfx/blocksets/fossillab.bst | Bin 0 -> 928 bytes gfx/tilesets.asm | 4 ++++ gfx/tilesets/fossillab.png | Bin 0 -> 2234 bytes 10 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 gfx/blocksets/fossillab.bst create mode 100644 gfx/tilesets/fossillab.png diff --git a/README.md b/README.md index 751f6a56..355c4bb0 100644 --- a/README.md +++ b/README.md @@ -146,6 +146,7 @@ Improved Areas - Silph Co. 11F's unreferenced Porygon PC was restored. It's on the monitor! - Cinnabar Island is a lot bigger, with the volcano being added to it. The mansion seems different too... - Cinnabar Lab's Trade Room now features the Trader, who will evolve trade-evolving Pokemon for you! + - Cinnabar Lab's Fossil Room now features a unique machine from the prototype blocksets, serving as the fossil machine! - Viridian Gym now has a minor new area once you make Giovanni leave. - Various Move Tutors from FireRed and LeafGreen have been distributed around the region, instead giving their respective TMs. - The S.S. Anne now returns after getting the Marsh Badge and features trades for Galarian forms & Evolutions, as well as Paldean Tauros. diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index c23af843..a519fe43 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -31,4 +31,5 @@ const ROCKETHOUSE const BETAMART const JACKY + const FOSSILLAB DEF NUM_TILESETS EQU const_value diff --git a/data/maps/headers/CinnabarLabFossilRoom.asm b/data/maps/headers/CinnabarLabFossilRoom.asm index 1d072a50..b229b729 100644 --- a/data/maps/headers/CinnabarLabFossilRoom.asm +++ b/data/maps/headers/CinnabarLabFossilRoom.asm @@ -1,2 +1,2 @@ - map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, LAB, 0 + map_header CinnabarLabFossilRoom, CINNABAR_LAB_FOSSIL_ROOM, FOSSILLAB, 0 end_map_header diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 3c719bf4..ffe0315a 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -4,7 +4,7 @@ RedsHouse2F_Object: def_warp_events warp_event 7, 1, REDS_HOUSE_1F, 3 ;warp_event 5, 1, SILPH_GAUNTLET_7F, 1 ; - Test Chief - warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. + ;warp_event 5, 1, SILPH_CO_11F, 2 ; - Test J&J, Omega, & Giovanni. To test the Omega refight, change to SHOW in hide/show data, and set warp ID to 1. ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater ;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt @@ -12,6 +12,7 @@ RedsHouse2F_Object: ;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles + warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils def_bg_events diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index d081338c..44b51514 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -55,6 +55,7 @@ Lobby_Coll:: Mansion_Coll:: coll_tiles $01, $05, $11, $12, $14, $1a, $1c, $2c, $53 +FossilLab_Coll:: ; It has the same tileset except the trees are the fossil machine, so... Lab_Coll:: coll_tiles $0c, $26, $16, $1e, $34, $37 diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 4342b619..05e32aa5 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -39,4 +39,5 @@ Tilesets: tileset RocketHouse, $0A, -1, -1, -1, TILEANIM_NONE tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE tileset Jacky, -1, -1, -1, -1, TILEANIM_NONE + tileset FossilLab, -1, -1, -1, -1, TILEANIM_NONE assert_table_length NUM_TILESETS diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 892b1334..9417864e 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -32,6 +32,7 @@ WarpTileIDPointers: dw .RocketHouseWarpTileIDs dw .BetaMartWarpTileIDs dw .JackyWarpTileIDs + dw .LabWarpTileIDs ; Fossil Lab assert_table_length NUM_TILESETS MACRO warp_tiles diff --git a/gfx/blocksets/fossillab.bst b/gfx/blocksets/fossillab.bst new file mode 100644 index 0000000000000000000000000000000000000000..91f667919f1ff0d80d916c4e4c36a588b30a62ef GIT binary patch literal 928 zcmZQT14>Z9sK%(K#;C>^6B`$AWbEvsqpPQHV{2!xq$D7yq@f) zl$10y4Gc9jL9~ODgOi3P0>bpcXeMSBRv}>#Q8soCPBC#cMjc%xB^z5MB|UvcH9LDX zMkOVP2&0;wz8a&QJr6G`gqfqRuC8uwZf>rl%cy2!tHub^�!OtHx+!3)Ao5=;#y> z7#I}b;TaTcWfj7x#>cP5C@0UT=HRHt7!U~KJ32Z#1qKENxw^W!hK7cPa&dceNl8ab zxw^T!hK7ZPa(i=eOGisdGpYpysxbyz!SsRjSRt9~>gH-48Ww8p0$~_mCNMA%83zUi%A(;wWWcCqWUR*M>;j{Wj6t!7;9FQQs##j9 zF~aEZh=@oTcXwG82}xBgB_(aNb|85lVHJzX3_D&nrriVl*o6mUIw zkgM>9d|K^?M5g?UhhIK4y8hBfGqk_WQm`m&>XMLsOV;HT|NcF7Hsks8=gsf$tJPM$ zbMIc<6RpWh?|gPc2mFy*yd}GX8wxd zN_r&ETzL7YukoSdaz#uQ7Y%yY%y<2|@nEO*L75L5FDdU8Joamr@&#r4wB++iTk6CX z^G(&Cx$m%FgJ93+Ljg?2%@yY=xE%j(F5P1NyNEH!gl+t<`esrtUY3!a6nUlH;yh{8CD5(^JoVDQ}RhT6iF0tEj=WWph=Iv+nx4 zVp_43{MqTY0XLOorB*9Nr=E{#)cuspdeleS+3?i?o1+}B%S9O$`0(xcB-j%!#Q1n; zcu|tWHjx87`VH@79u}uw*824P1k;BZX&F6#{vNWwlandxrRRG+kc(B}&}Xd;XV(8} zFtyTk5?Fj@UTvAk?i)t;?lanG3NVX^rg#dU3AL{ZEe&-0v-4W_>r3&Lk5hih-h94d z#p0GXH`7(M-*tUay&$ZytC9U!rIP9O)YfZXe;#`K%Hn15+^oFv^7?N|C%U9J?Rflg zwf+A4)}l`&Z02b<9*|(|`N{Q4W2fYc)k3W6&dVm-M)|Or8Rn(6A2XP5Ikn~HjER4h zH_YF8W6_V&M7eL;YMZulZ#(={R$-Fml~SSRuv=CF|sE zO3}N0m#8;PT9go4yE?R-?Hy0fP0r}QH;lst{F8P@iJbW?oS>b_cw_<23H z?>6M8PJ5%VJHfhG>*WLu)zhhEwQQT8tm4=dyY{)P?782Z8?J7YIKtBuyD+71QtU}S zV_VTn`kZyODqcD4suzxz3&~%cHJ#~#;f~hG01l(0rd(zzCnZnn$<`*hzIWd|>qFP> z^N&iV&YAee;PT@iZUOV{SDSGqFV;&hVLJC>9#6DqJ?9?|8%^1pOBd@Wt7g7fxc0!V ztG6VpCcd7u_e1KPwGtbr{y%Je;Fa}+XGZ$f3*Ri*DY|(3cfPrcJomH8blR;paAQ;a zIcw#8X^SXMg@X^O)J)xruGrk1d4x^%kaTU<9pktH-(!ZHDetx*QdHnvm+TFjVuUTJQ zR5P*B%dT^I;aZ0Z;hD)g65?z3EwZt--5dK=@y6x`_oPjWMdrQnd&FAh=9{gs_vOsR z5i3(G7Ac3$f8C=$b$ULdM3i9f5)O?%i~b|0GuG8E-<+`~;zkh5>J#TCvWV_ox4Xn& zckSa7Z9MlaVtyZcWTzHXG5`Ga(kGvUG#>Am=A1VpzWS5#a;+79T}oodx$@k_Z$^5i zcmI=&QeMaUG16y}882tZ8<(EMH;?Z<=f3vgx4j<&e}nyJt?L!@+4B-i{Q4>dKj>JC z_Nm>PeNyn##pAy=OZJ>RmU`aC@WbQd{oP-l{5oEs^6lrJ714M0seRwxG*Py;@VNWQ zMTQTZI@3O`+4XYzI^B|IW$`H&U71TR&Cvd9Xtqz&&0~5Ax9#MA67v0$*X5EQi6zU; z*Zel&Xgq7-&&>tq$7JWK#y{RJ(l9|$TR+a=7AId>-+|+Sj4$kxmr3s`s}q^dWO3TV zUrWCxZfTrM^$bQEiq=q#j`HY#!7<8oKC7kXQ?a#`WbH68ogbCy=^1O>&xcUEsZuintw zp*?46jm4pTU0RhJEp|Ot3fFAdn{v=~T|w9<$CG_RX=T4|^!(uUk{306=w;&mn``-h z0T+fJYZPB>33PaI*+M?r^MPyH6_#J;JpS Date: Sat, 25 Nov 2023 16:57:55 +0000 Subject: [PATCH 14/24] Add Uppercut Misty's worst nightmare. FIGHTING type 55 Power 15 PP 80 Accuracy Effect: Flinch (30% chance) Learned by Hitmonchan, Machop, and Mankey at L1. Primeape, Machoke, and Machamp have it in their L1 learnsets as well. Learned by Carapthor at L10 as an evolution move. Also part of its L1 learnset. --- constants/move_animation_constants.asm | 1 + constants/move_constants.asm | 3 ++- data/battle_anims/subanimations.asm | 8 ++++++++ data/moves/animations.asm | 5 +++++ data/moves/moves.asm | 1 + data/moves/names.asm | 1 + data/moves/sfx.asm | 1 + data/pokemon/base_stats/carapthor.asm | 2 +- data/pokemon/base_stats/hitmonchan.asm | 2 +- data/pokemon/base_stats/machamp.asm | 2 +- data/pokemon/base_stats/machoke.asm | 2 +- data/pokemon/base_stats/machop.asm | 2 +- data/pokemon/base_stats/mankey.asm | 2 +- data/pokemon/base_stats/primeape.asm | 2 +- data/pokemon/evos_moves.asm | 1 + engine/debug/debug_menu.asm | 16 ++++++++-------- 16 files changed, 35 insertions(+), 16 deletions(-) diff --git a/constants/move_animation_constants.asm b/constants/move_animation_constants.asm index e09b9f3d..e44c11f8 100644 --- a/constants/move_animation_constants.asm +++ b/constants/move_animation_constants.asm @@ -136,6 +136,7 @@ DEF FIRST_SE_ID EQU const_value const SUBANIM_0_SAFARI_BAIT const SUBANIM_0_STAR_HIGH const SUBANIM_0_FAKE_TEARS + const SUBANIM_0_STAR_ASCENDING DEF NUM_SUBANIMS EQU const_value ; types of subanimations diff --git a/constants/move_constants.asm b/constants/move_constants.asm index 49ed557f..dc978f58 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -190,7 +190,8 @@ const KOWTOW_CLEAVE ; b6 const DISARMING_VOICE ; b7 const NASTY_PLOT ; b8 - const STRUGGLE ; formerly a5, now b9 + const UPPERCUT ; b9 + const STRUGGLE ; formerly a5, now c0 DEF NUM_ATTACKS EQU const_value - 1 ; Moves do double duty as animation identifiers. diff --git a/data/battle_anims/subanimations.asm b/data/battle_anims/subanimations.asm index a1169072..9a502bcb 100644 --- a/data/battle_anims/subanimations.asm +++ b/data/battle_anims/subanimations.asm @@ -87,6 +87,7 @@ SubanimationPointers: dw Subanim_0SafariBait dw Subanim_0StarHigh dw Subanim_0FakeTears + dw Subanim_0StarAscending ; Uppercut assert_table_length NUM_SUBANIMS ; format: @@ -256,6 +257,13 @@ Subanim_0StarDescending: db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00 db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 +Subanim_0StarAscending: + subanim SUBANIMTYPE_HFLIP, 4 + db FRAMEBLOCK_01, BASECOORD_1D, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_18, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_11, FRAMEBLOCKMODE_00 + db FRAMEBLOCK_01, BASECOORD_0B, FRAMEBLOCKMODE_00 + Subanim_1FlameColumn1: subanim SUBANIMTYPE_HFLIP, 3 db FRAMEBLOCK_0C, BASECOORD_20, FRAMEBLOCKMODE_00 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index c4dfb2bb..363725eb 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -184,6 +184,7 @@ AttackAnimationPointers: dw KowtowCleaveAnim dw DisarmingVoiceAnim dw NastyPlotAnim + dw UppercutAnim dw StruggleAnim assert_table_length NUM_ATTACKS dw ShowPicAnim @@ -261,6 +262,10 @@ KarateChopAnim: battle_anim KARATE_CHOP, SUBANIM_0_STAR_DESCENDING, 0, 8 db -1 ; end +UppercutAnim: + battle_anim UPPERCUT, SUBANIM_0_STAR_ASCENDING, 0, 8 + db -1 ; end + DoubleSlapAnim: battle_anim DOUBLESLAP, SUBANIM_0_STAR_TWICE, 0, 5 battle_anim DOUBLESLAP, SUBANIM_0_STAR_TWICE, 0, 5 diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 34890a49..799eef53 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -195,5 +195,6 @@ Moves: move KOWTOW_CLEAVE, SWIFT_EFFECT, 85, DARK, 100, 10 move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 + move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 assert_table_length NUM_ATTACKS diff --git a/data/moves/names.asm b/data/moves/names.asm index 4b90d361..6cdb1677 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -184,5 +184,6 @@ MoveNames:: ; 12chr limit li "KOWTOWCLEAVE" li "DISARMVOICE" li "NASTY PLOT" + li "UPPERCUT" li "STRUGGLE" assert_list_length NUM_ATTACKS diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index 3ad3c71a..018a85a3 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -185,6 +185,7 @@ MoveSoundTable: db SFX_NOT_VERY_EFFECTIVE, $11, $ff ; KOWTOW_CLEAVE db SFX_BATTLE_37, $10, $60 ; DISARMING_VOICE db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT + db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT db SFX_BATTLE_0B, $00, $80 ; STRUGGLE assert_table_length NUM_ATTACKS diff --git a/data/pokemon/base_stats/carapthor.asm b/data/pokemon/base_stats/carapthor.asm index 5e857b4e..4ed854f0 100644 --- a/data/pokemon/base_stats/carapthor.asm +++ b/data/pokemon/base_stats/carapthor.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/carapthor.pic", 0, 1 ; sprite dimensions dw CarapthorPicFront, CarapthorPicBack - db COMET_PUNCH, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db COMET_PUNCH, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/hitmonchan.asm b/data/pokemon/base_stats/hitmonchan.asm index ef28aad6..c602ef02 100644 --- a/data/pokemon/base_stats/hitmonchan.asm +++ b/data/pokemon/base_stats/hitmonchan.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/hitmonchan.pic", 0, 1 ; sprite dimensions dw HitmonchanPicFront, HitmonchanPicBack - db COMET_PUNCH, AGILITY, NO_MOVE, NO_MOVE ; level 1 learnset + db COMET_PUNCH, AGILITY, UPPERCUT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/machamp.asm b/data/pokemon/base_stats/machamp.asm index 41e80d74..94e4e560 100644 --- a/data/pokemon/base_stats/machamp.asm +++ b/data/pokemon/base_stats/machamp.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/machamp.pic", 0, 1 ; sprite dimensions dw MachampPicFront, MachampPicBack - db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset + db KARATE_CHOP, LOW_KICK, LEER, UPPERCUT ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/machoke.asm b/data/pokemon/base_stats/machoke.asm index e33e3789..e2480725 100644 --- a/data/pokemon/base_stats/machoke.asm +++ b/data/pokemon/base_stats/machoke.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/machoke.pic", 0, 1 ; sprite dimensions dw MachokePicFront, MachokePicBack - db KARATE_CHOP, LOW_KICK, LEER, NO_MOVE ; level 1 learnset + db KARATE_CHOP, LOW_KICK, LEER, UPPERCUT ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/machop.asm b/data/pokemon/base_stats/machop.asm index 1b70b5d1..700e68e4 100644 --- a/data/pokemon/base_stats/machop.asm +++ b/data/pokemon/base_stats/machop.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/machop.pic", 0, 1 ; sprite dimensions dw MachopPicFront, MachopPicBack - db KARATE_CHOP, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset + db KARATE_CHOP, UPPERCUT, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/mankey.asm b/data/pokemon/base_stats/mankey.asm index 07cad4e1..2c81d268 100644 --- a/data/pokemon/base_stats/mankey.asm +++ b/data/pokemon/base_stats/mankey.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/mankey.pic", 0, 1 ; sprite dimensions dw MankeyPicFront, MankeyPicBack - db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, LEER, UPPERCUT, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/primeape.asm b/data/pokemon/base_stats/primeape.asm index a45c79d3..0eef4f50 100644 --- a/data/pokemon/base_stats/primeape.asm +++ b/data/pokemon/base_stats/primeape.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/primeape.pic", 0, 1 ; sprite dimensions dw PrimeapePicFront, PrimeapePicBack - db SCRATCH, LEER, KARATE_CHOP, FURY_SWIPES ; level 1 learnset + db SCRATCH, LEER, UPPERCUT, KARATE_CHOP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 306580f1..a40e1b1b 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -2834,6 +2834,7 @@ CarapthorEvosMoves: ; Evolutions db 0 ; Learnset + db 10, UPPERCUT db 12, COMET_PUNCH db 16, PIN_MISSILE db 20, DEFENSE_CURL diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index 16875a60..ad0a8eb5 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -108,9 +108,9 @@ TestBattle: ld [hl], a ; Player's Pokemon. - ld a, MEW + ld a, MANKEY ld [wcf91], a - ld a, 100 + ld a, 10 ld [wCurEnemyLVL], a xor a ld [wMonDataLocation], a @@ -120,19 +120,19 @@ TestBattle: ; This function gives you a way to waste a turn, never know when you'll need it. ; Alternatively, add a move to test. ld hl, wPartyMon1Moves - ld a, POISON_STING ; Something super weak + ld a, UPPERCUT ; Something super weak ld [hli], a - ld a, LEECH_SEED ; Test new failure text + ld a, KARATE_CHOP ; Test new failure text ld [hli], a - ld a, FISSURE ; Something that'll miss easily + ld a, LOW_KICK ; Something that'll miss easily ld [hli], a - ld a, SPLASH ; Skip turn + ld a, LEER ; Skip turn ld [hli], a ; Opponent's Pokemon. - ld a, ARTICUNO ; Test new theme + ld a, MANKEY ; Test new theme ld [wCurOpponent], a - ld a, 100 ; Set the level you want here. + ld a, 10 ; Set the level you want here. ld [wCurEnemyLVL], a predef InitOpponent From 1c07d4e59e81688199a35fefe2397d9f41534785 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sat, 25 Nov 2023 18:05:44 +0000 Subject: [PATCH 15/24] GAY GYM - Added the unused rainbow palette for Celadon Gym. - Fixed Faraway Island using Vermilion's palette. - Rocket Hideout now uses the same palette as the Game Corner - Minor text fixes --- data/maps/objects/CeladonCity.asm | 2 +- data/sgb/sgb_packets.asm | 9 ++++ data/trainers/scaled_parties.asm | 18 +++---- engine/gfx/palettes.asm | 90 +++++++++++++++++-------------- maps/CeladonCity.blk | 6 +-- text/RocketHideoutB4F.asm | 13 +++-- text/Route14.asm | 18 +++---- text/ViridianCity.asm | 31 ++++++----- 8 files changed, 102 insertions(+), 85 deletions(-) diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm index e265da08..53a019c4 100644 --- a/data/maps/objects/CeladonCity.asm +++ b/data/maps/objects/CeladonCity.asm @@ -28,7 +28,7 @@ CeladonCity_Object: bg_event 27, 21, 18 ; CeladonCityText18 def_object_events - object_event 8, 17, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person + object_event 8, 16, SPRITE_LITTLE_GIRL, WALK, ANY_DIR, 1 ; person object_event 11, 28, SPRITE_GRAMPS, STAY, UP, 2 ; person object_event 14, 19, SPRITE_GIRL, WALK, UP_DOWN, 3 ; person object_event 25, 22, SPRITE_GRAMPS, STAY, DOWN, 4 ; person diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index 2a38f6c5..e24dae14 100644 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -214,6 +214,14 @@ BlkPacket_GameFreakIntro: db $03, 12,11, 14,13, $03 db $00 +BlkPacket_Gay: + ATTR_BLK 4 + ATTR_BLK_DATA %011, 0,0,0, 00,00, 04,17 ; left: pal 1 + ATTR_BLK_DATA %011, 1,1,0, 05,00, 09,17 ; center left: pal 2 + ATTR_BLK_DATA %011, 2,2,0, 10,00, 14,17 ; center right: pal 3 + ATTR_BLK_DATA %011, 3,3,0, 15,00, 19,17 ; right: pal 4 + ds 2, 0 + PalPacket_Empty: PAL_SET 0, 0, 0, 0 PalPacket_PartyMenu: PAL_SET PAL_MEWMON, PAL_GREENBAR, PAL_YELLOWBAR, PAL_REDBAR @@ -226,6 +234,7 @@ PalPacket_TrainerCard: PAL_SET PAL_MEWMON, PAL_BADGE, PAL_REDMON, PAL_YELLOWM PalPacket_Generic: PAL_SET PAL_MEWMON, 0, 0, 0 PalPacket_NidorinoIntro: PAL_SET PAL_PURPLEMON, PAL_BLACK, 0, 0 PalPacket_GameFreakIntro: PAL_SET PAL_GAMEFREAK, PAL_REDMON, PAL_VIRIDIAN, PAL_BLUEMON +PalPacket_Gay: PAL_SET PAL_YELLOWMON, PAL_REDMON, PAL_GREENMON, PAL_BLUEMON PalTrnPacket: PAL_TRN MltReq1Packet: MLT_REQ 1 diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index 15b67042..fb72c7c5 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -107,17 +107,17 @@ LanceData: db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, KINGDRA, 75, IGUANARCH, 77, DRAGONITE, 0 YujirouData: ; was unused juggler - db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0 - db $FF, 11, COINPUR, 12, RATTATA, 14, LICKITUNG, 0 ; 1 + db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0 + db $FF, 11, COINPUR, 12, RATTATA, 14, LICKITUNG, 0 ; 1 db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 2 - db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0 ; 3 - db $FF, 29, PERSIAN, 28, RATICATE, 28, LUXWAN, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4 - db $FF, 38, PERSIAN, 37, RATICATE, 37, LUXWAN, 38, CHANSEY, 40, LICKITUNG, 0, ; 5 - db $FF, 41, PERSIAN, 40, TAUROS, 40, LUXWAN, 41, CHANSEY, 43, LICKILICKY, 0 ; 6 - db $FF, 45, PERSIAN, 44, TAUROS, 44, LUXWAN, 45, CHANSEY, 47, LICKILICKY, 0 ; 7 - db $FF, 47, PERSIAN, 46, TAUROS, 46, LUXWAN, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 + db $FF, 22, MEOWTH, 21, RATICATE, 21, JIGGLYPUFF, 23, FARFETCHD, 25, LICKITUNG, 0 ; 3 + db $FF, 29, PERSIAN, 28, RATICATE, 28, JIGGLYPUFF, 29, LUXWAN, 31, LICKITUNG, 0 ; 4 + db $FF, 38, PERSIAN, 37, RATICATE, 37, CHANSEY, 38, LUXWAN, 40, LICKILICKY, 0, ; 5 + db $FF, 41, PERSIAN, 40, TAUROS, 40, CHANSEY, 41, LUXWAN, 43, LICKILICKY, 0 ; 6 + db $FF, 45, PERSIAN, 44, TAUROS, 44, CHANSEY, 45, LUXWAN, 47, LICKILICKY, 0 ; 7 + db $FF, 47, PERSIAN, 46, TAUROS, 46, BLISSEY, 48, LUXWAN, 48, SNORLAX, 50, LICKILICKY, 0 ; 8 ; post-game rematch team - db $FF, 66, PERSIAN, 65, TAUROS, 66, LUXWAN, 65, BLISSEY, 66, SNORLAX, 69, LICKILICKY, 0 + db $FF, 66, PERSIAN, 65, TAUROS, 66, BLISSEY, 65, LUXWAN, 66, SNORLAX, 69, LICKILICKY, 0 BlackbeltData: ; Koichi parties diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 8700199a..80a37c10 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -134,6 +134,7 @@ SetPal_GameFreakIntro: ret ; uses PalPacket_Empty to build a packet based on the current map +; are the edits I've made here horribly inefficient? yes, but as long as it works, who cares? SetPal_Overworld: ld hl, PalPacket_Empty ld de, wPalPacket @@ -141,44 +142,72 @@ SetPal_Overworld: call CopyData ld a, [wCurMapTileset] cp CEMETERY - jr z, .PokemonTowerOrAgatha + jp z, .PokemonTowerOrAgatha cp CAVERN - jr z, .caveOrBruno + jp z, .caveOrBruno ld a, [wCurMap] cp BRUNSWICK_TRAIL - jr z, .brunswick + jp z, .brunswick cp FIRST_INDOOR_MAP - jr c, .townOrRoute + jp c, .townOrRoute + cp CELADON_GYM + jp z, .gay cp POWER_PLANT - jr z, .powerPlant + jp z, .powerPlant cp BRUNSWICK_GLADE - jr z, .brunswick + jp z, .brunswick cp BRUNSWICK_GROTTO - jr z, .brunswick + jp z, .brunswick cp SILPH_GAUNTLET_3F - jr z, .ship + jp z, .ship cp GAME_CORNER - jr z, .pachinko + jp z, .pachinko cp GAME_CORNER_PRIZE_ROOM - jr z, .pachinko + jp z, .pachinko + cp ROCKET_HIDEOUT_B1F + jp z, .pachinko + cp ROCKET_HIDEOUT_B2F + jp z, .pachinko + cp ROCKET_HIDEOUT_B3F + jp z, .pachinko + cp ROCKET_HIDEOUT_B4F + jp z, .pachinko + cp ROCKET_HIDEOUT_ELEVATOR + jp z, .pachinko + cp FARAWAY_ISLAND_OUTSIDE + jp z, .faraway + cp FARAWAY_ISLAND_INSIDE + jp z, .faraway + cp SILPH_GAUNTLET_1F + jp z, .faraway cp CELESTE_HILL_OUTSIDE - jr z, .celeste + jp z, .celeste cp CELESTE_HILL - jr z, .celeste + jp z, .celeste cp SILPH_GAUNTLET_5F - jr z, .trans + jp z, .trans cp CERULEAN_CAVE_2F - jr c, .normalDungeonOrBuilding + jp c, .normalDungeonOrBuilding cp LORELEIS_ROOM - jr z, .seafoam + jp z, .seafoam cp BRUNOS_ROOM - jr z, .caveOrBruno + jp z, .caveOrBruno .normalDungeonOrBuilding ld a, [wLastMap] ; town or route that current dungeon or building is located .townOrRoute cp NUM_CITY_MAPS - jr c, .town + jp c, .town ld a, PAL_ROUTE - 1 +.gay + ld hl, PalPacket_Gay + ld de, wPalPacket + ld bc, $10 + call CopyData + ld hl, PalPacket_Gay + ld de, BlkPacket_Gay + ld a, SET_PAL_OVERWORLD + ld [wDefaultPaletteCommand], a + ret .town inc a ; a town's palette ID is its map ID + 1 ld hl, wPalPacket + 1 @@ -245,30 +274,9 @@ SetPal_Overworld: .trans ld a, PAL_FUCHSIA - 1 jr .town - -; these can't be added without a more efficient solution -; cp ROCKET_HIDEOUT_B1F -; jr z, .pachinko -; cp ROCKET_HIDEOUT_B2F -; jr z, .pachinko -; cp ROCKET_HIDEOUT_B3F -; jr z, .pachinko -; cp ROCKET_HIDEOUT_B4F -; jr z, .pachinko -; cp ROCKET_HIDEOUT_ELEVATOR -; jr z, .pachinko -; cp FARAWAY_ISLAND_OUTSIDE -; jr z, .faraway -; cp FARAWAY_ISLAND_INSIDE -; jr z, .faraway -; cp SILPH_GAUNTLET_1F -; jr z, .faraway -;.pachinko -; ld a, PAL_CASINO - 1 -; jr .town -;.faraway -; ld a, PAL_ROUTE - 1 -; jr .town +.faraway + ld a, PAL_ROUTE - 1 + jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame diff --git a/maps/CeladonCity.blk b/maps/CeladonCity.blk index a3f21a78..826b98f8 100644 --- a/maps/CeladonCity.blk +++ b/maps/CeladonCity.blk @@ -3,7 +3,7 @@ U lllllllllllloooooooooUo ooo oooooo -n ! !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUUUgj7:~|~U7~7~nUUUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! +n ! !U !UUUUUUUUUmnhi !hiUhi ! ! ! !Umn7~hi7}~y7:~7~7~7~|rUUUhiUUUUUUUUUUUUUUUUUUUU7::sUUUUUUUUUUUUUUUUUUUUUUUUy0 VwwwwUwwwwUUUUUUUUUNTM ! !U ! !nwUUUUUUUgj7:~|~U7~7~nUUUUUUUCVwwVwUVwww5nUUUUUUUUUUUUUUUUUUUUUUmn !  ! !UU ! ! ! ! ! n7~7~7~UU7~|~|~7~|~ nUUUUUyUU !UUUUUUUUUUUU n/7~UUUUUUUUUUUU @@ -17,5 +17,5 @@ n -llllllm6llll -nooooooooooooooooo6ooooo \ No newline at end of file +llllllmllll +noooooooooooooooooooooo \ No newline at end of file diff --git a/text/RocketHideoutB4F.asm b/text/RocketHideoutB4F.asm index 5b21374e..37b9f740 100644 --- a/text/RocketHideoutB4F.asm +++ b/text/RocketHideoutB4F.asm @@ -3,15 +3,14 @@ _RocketHideout4Text_4557a:: line "am impressed you" cont "got here!" - para "TEAM ROCKET" - line "captures #MON" - cont "from around the" - cont "world." + para "We, TEAM ROCKET," + line "capture #MON" + cont "from all around" + cont "the world." para "They're important" line "tools for keeping" - cont "our criminal" - cont "enterprise" + cont "our enterprise" cont "running." para "And I am the" @@ -38,7 +37,7 @@ _RocketHideout4Text_4557a:: done _RocketHideout4Text_4557f:: - text "WHAT!" + text "What?!" line "This cannot be!" prompt diff --git a/text/Route14.asm b/text/Route14.asm index 04dd9358..58410cba 100644 --- a/text/Route14.asm +++ b/text/Route14.asm @@ -68,8 +68,8 @@ _Route14AfterBattleText4:: done _Route14BattleText5:: - text "Have you heard of" - line "the winged" + text "Have you heard" + line "of the winged" cont "mirages?" done @@ -79,16 +79,14 @@ _Route14EndBattleText5:: prompt _Route14AfterBattleText5:: - text "The winged" ; jp / remake restoration + text "The three winged" ; jp / remake restoration line "mirages are the" + cont "legendary bird" + cont "#MON." - para "legendary bird" - line "#MON." - - para "There are 3 of" - line "them: ZAPDOS," - cont "ARTICUNO, and" - cont "MOLTRES." + para "Their names are" + line "ARTICUNO, ZAPDOS," + cont "and MOLTRES." done diff --git a/text/ViridianCity.asm b/text/ViridianCity.asm index 8ee81348..b10c84e2 100644 --- a/text/ViridianCity.asm +++ b/text/ViridianCity.asm @@ -24,7 +24,7 @@ _ViridianCityText_19127:: _ViridianCityText_1914d:: text "You want to know" - line "about the 2 kinds" + line "about the 3 kinds" cont "of caterpillar" cont "#MON?" done @@ -34,19 +34,22 @@ _ViridianCityText_19152:: done _ViridianCityText_19157:: - text "CATERPIE has no" - line "poison, but" + text "Both CATERPIE and" + line "GENTLARVA have" + cont "no poison, but" cont "WEEDLE does." para "Watch out for its" line "POISON STING!" done -_ViridianCityText_19175:: +_ViridianCityText_19175:: ; undoing localisation change text "Oh Grandpa! Don't" line "be so mean!" - cont "He hasn't had his" - cont "coffee yet." + + para "I'm sorry, but" + cont "he hasn't sobered" + cont "up yet..." done _ViridianCityText_1917a:: @@ -98,13 +101,13 @@ _TM42NoRoomText:: line "stuff already." done -_ViridianCityText_1920a:: - text "Ahh, I've had my" - line "coffee now and I" - cont "feel great!" +_ViridianCityText_1920a:: ; undoing localisation change + text "Hmm..." + line "Looks like I was" + cont "pretty drunk!" - para "Sure you can go" - line "through!" + para "My head hurts," + line "though..." para "Are you in a" line "hurry?" @@ -115,8 +118,8 @@ _ViridianCityText_1920f:: line "a #DEX." para "When you catch a" - line "#MON, #DEX" - cont "is automatically" + line "#MON, it will" + cont "be automatically" cont "updated." para "What? Don't you" From afa5b76639ba41c248555f1302a6fb80a7092877 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 18:28:36 +0000 Subject: [PATCH 16/24] Add Powder Snow, fix Moltres - Adds Powder Snow; GSC stats, was cut from RBY. - Articuno, Jynx, Buu, Glaceon, Alolan Sandslash, and Alolan Ninetales get Powder Snow at L1. - Glaceon also gets Powder Snow over Aurora Beam at L1; a nerf that makes it more accurate to its PLA learnset. Glaceon doesn't normally get this move. - Moltres now gets Flamethrower at L51, fixing an error that GSC fixed. Leer is off by exactly 10 spaces. Leer has been made an L1 move, making it consistent with Articuno's Powder Snow. Does not affect legality, given the Tradeback Tutor. - Because I'm pedantic, Zapdos gets Thunderbolt as an L1 move like Articuno's Ice Beam, so they all stay the same. Does not affect legality. --- constants/move_constants.asm | 1 + data/moves/animations.asm | 6 ++++++ data/moves/moves.asm | 1 + data/moves/names.asm | 1 + data/moves/sfx.asm | 1 + data/pokemon/base_stats/articuno.asm | 2 +- data/pokemon/base_stats/buu.asm | 2 +- data/pokemon/base_stats/glaceon.asm | 2 +- data/pokemon/base_stats/jynx.asm | 2 +- data/pokemon/base_stats/moltres.asm | 2 +- data/pokemon/base_stats/ninetalesa.asm | 2 +- data/pokemon/base_stats/sandslasha.asm | 2 +- data/pokemon/base_stats/zapdos.asm | 2 +- data/pokemon/evos_moves.asm | 4 ++-- engine/debug/debug_menu.asm | 8 ++++---- 15 files changed, 24 insertions(+), 14 deletions(-) diff --git a/constants/move_constants.asm b/constants/move_constants.asm index dc978f58..e9da8670 100644 --- a/constants/move_constants.asm +++ b/constants/move_constants.asm @@ -191,6 +191,7 @@ const DISARMING_VOICE ; b7 const NASTY_PLOT ; b8 const UPPERCUT ; b9 + const POWDER_SNOW ; b10 const STRUGGLE ; formerly a5, now c0 DEF NUM_ATTACKS EQU const_value - 1 diff --git a/data/moves/animations.asm b/data/moves/animations.asm index 363725eb..4aee11f0 100644 --- a/data/moves/animations.asm +++ b/data/moves/animations.asm @@ -185,6 +185,7 @@ AttackAnimationPointers: dw DisarmingVoiceAnim dw NastyPlotAnim dw UppercutAnim + dw PowderSnowAnim dw StruggleAnim assert_table_length NUM_ATTACKS dw ShowPicAnim @@ -565,6 +566,11 @@ IceBeamAnim: battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16 db -1 ; end +PowderSnowAnim: + battle_anim BLIZZARD, SUBANIM_0_CIRCLES_FALLING, 0, 6 + battle_anim NO_MOVE, SUBANIM_0_ICE_RISE, 0, 16 + db -1 ; end + BlizzardAnim: battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE battle_anim BLIZZARD, SUBANIM_0_ICE_FALL, 0, 4 diff --git a/data/moves/moves.asm b/data/moves/moves.asm index 799eef53..f2217b27 100644 --- a/data/moves/moves.asm +++ b/data/moves/moves.asm @@ -196,5 +196,6 @@ Moves: move DISARMING_VOICE, SWIFT_EFFECT, 40, FAIRY, 100, 10 move NASTY_PLOT, SPECIAL_UP2_EFFECT, 0, DARK, 100, 10 move UPPERCUT, FLINCH_SIDE_EFFECT2, 55, FIGHTING, 80, 15 + move POWDER_SNOW, FREEZE_SIDE_EFFECT, 40, ICE, 100, 25 move STRUGGLE, RECOIL_EFFECT, 50, NORMAL, 100, 10 assert_table_length NUM_ATTACKS diff --git a/data/moves/names.asm b/data/moves/names.asm index 6cdb1677..e683e14e 100644 --- a/data/moves/names.asm +++ b/data/moves/names.asm @@ -185,5 +185,6 @@ MoveNames:: ; 12chr limit li "DISARMVOICE" li "NASTY PLOT" li "UPPERCUT" + li "POWDER SNOW" li "STRUGGLE" assert_list_length NUM_ATTACKS diff --git a/data/moves/sfx.asm b/data/moves/sfx.asm index 018a85a3..8f735c0c 100644 --- a/data/moves/sfx.asm +++ b/data/moves/sfx.asm @@ -186,6 +186,7 @@ MoveSoundTable: db SFX_BATTLE_37, $10, $60 ; DISARMING_VOICE db SFX_BATTLE_09, $e8, $10 ; NASTY_PLOT db SFX_SUPER_EFFECTIVE, $00, $e0 ; UPPERCUT + db SFX_BATTLE_28, $40, $80 ; POWDER_SNOW db SFX_BATTLE_0B, $00, $80 ; STRUGGLE assert_table_length NUM_ATTACKS diff --git a/data/pokemon/base_stats/articuno.asm b/data/pokemon/base_stats/articuno.asm index 265a7c2f..d0e397eb 100644 --- a/data/pokemon/base_stats/articuno.asm +++ b/data/pokemon/base_stats/articuno.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/articuno.pic", 0, 1 ; sprite dimensions dw ArticunoPicFront, ArticunoPicBack - db PECK, ICE_BEAM, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, ICE_BEAM, POWDER_SNOW, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/buu.asm b/data/pokemon/base_stats/buu.asm index da10a264..a6244768 100644 --- a/data/pokemon/base_stats/buu.asm +++ b/data/pokemon/base_stats/buu.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/buu.pic", 0, 1 ; sprite dimensions dw BuuPicFront, BuuPicBack - db AURORA_BEAM, LEER, NO_MOVE, NO_MOVE ; level 1 learnset + db POWDER_SNOW, LEER, NO_MOVE, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/glaceon.asm b/data/pokemon/base_stats/glaceon.asm index 07926198..21e4e299 100644 --- a/data/pokemon/base_stats/glaceon.asm +++ b/data/pokemon/base_stats/glaceon.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/glaceon.pic", 0, 1 ; sprite dimensions dw GlaceonPicFront, GlaceonPicBack - db TACKLE, SAND_ATTACK, QUICK_ATTACK, AURORA_BEAM ; level 1 learnset + db TACKLE, SAND_ATTACK, QUICK_ATTACK, POWDER_SNOW ; level 1 learnset db GROWTH_MEDIUM_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/jynx.asm b/data/pokemon/base_stats/jynx.asm index e9e4218a..74a8a0f7 100644 --- a/data/pokemon/base_stats/jynx.asm +++ b/data/pokemon/base_stats/jynx.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/jynx.pic", 0, 1 ; sprite dimensions dw JynxPicFront, JynxPicBack - db POUND, LOVELY_KISS, NO_MOVE, NO_MOVE ; level 1 learnset + db POUND, LOVELY_KISS, POWDER_SNOW, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/moltres.asm b/data/pokemon/base_stats/moltres.asm index 13795ae9..3b411800 100644 --- a/data/pokemon/base_stats/moltres.asm +++ b/data/pokemon/base_stats/moltres.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/moltres.pic", 0, 1 ; sprite dimensions dw MoltresPicFront, MoltresPicBack - db PECK, FIRE_SPIN, NO_MOVE, NO_MOVE ; level 1 learnset + db PECK, FIRE_SPIN, LEER, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/ninetalesa.asm b/data/pokemon/base_stats/ninetalesa.asm index c588352b..7be5f635 100644 --- a/data/pokemon/base_stats/ninetalesa.asm +++ b/data/pokemon/base_stats/ninetalesa.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/ninetalesa.pic", 0, 1 ; sprite dimensions dw NinetalesAPicFront, NinetalesAPicBack - db FAIRY_WIND, TAIL_WHIP, QUICK_ATTACK, ROAR ; level 1 learnset - used for trainers + db FAIRY_WIND, TAIL_WHIP, QUICK_ATTACK, POWDER_SNOW ; level 1 learnset - used for trainers db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/sandslasha.asm b/data/pokemon/base_stats/sandslasha.asm index 2ddc8806..b6427cb1 100644 --- a/data/pokemon/base_stats/sandslasha.asm +++ b/data/pokemon/base_stats/sandslasha.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/sandslasha.pic", 0, 1 ; sprite dimensions dw SandslashAPicFront, SandslashAPicBack - db SCRATCH, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset + db SCRATCH, SAND_ATTACK, POWDER_SNOW, NO_MOVE ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/base_stats/zapdos.asm b/data/pokemon/base_stats/zapdos.asm index 21577754..0aa58957 100644 --- a/data/pokemon/base_stats/zapdos.asm +++ b/data/pokemon/base_stats/zapdos.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/zapdos.pic", 0, 1 ; sprite dimensions dw ZapdosPicFront, ZapdosPicBack - db THUNDERSHOCK, DRILL_PECK, NO_MOVE, NO_MOVE ; level 1 learnset + db THUNDERSHOCK, DRILL_PECK, THUNDERBOLT, NO_MOVE ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index a40e1b1b..5629a741 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -1152,7 +1152,7 @@ MoltresEvosMoves: ; Evolutions db 0 ; Learnset - db 51, LEER + db 51, FLAMETHROWER db 55, AGILITY db 60, SKY_ATTACK db 0 @@ -2604,7 +2604,7 @@ GlaceonEvosMoves: db 0 ; Learnset db 8, SAND_ATTACK - db 16, AURORA_BEAM + db 16, POWDER_SNOW db 23, QUICK_ATTACK db 30, MIST db 32, HAZE diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index ad0a8eb5..e7f71967 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -108,9 +108,9 @@ TestBattle: ld [hl], a ; Player's Pokemon. - ld a, MANKEY + ld a, GLACEON ld [wcf91], a - ld a, 10 + ld a, 16 ld [wCurEnemyLVL], a xor a ld [wMonDataLocation], a @@ -122,7 +122,7 @@ TestBattle: ld hl, wPartyMon1Moves ld a, UPPERCUT ; Something super weak ld [hli], a - ld a, KARATE_CHOP ; Test new failure text + ld a, POWDER_SNOW ; Test new failure text ld [hli], a ld a, LOW_KICK ; Something that'll miss easily ld [hli], a @@ -130,7 +130,7 @@ TestBattle: ld [hli], a ; Opponent's Pokemon. - ld a, MANKEY ; Test new theme + ld a, BUU ; Test new theme ld [wCurOpponent], a ld a, 10 ; Set the level you want here. ld [wCurEnemyLVL], a From 6504863b284bbec8279860d3a1621b9d966783f3 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 25 Nov 2023 19:22:15 +0000 Subject: [PATCH 17/24] Seagallop Ferry Port This adds a new tileset for the Seagallop Ferry. Had to remake the tileset from scratch using the S.S. Anne one. Very awkward! The map could be made to look more like the FRLG one but that's neither here nor there. --- constants/tileset_constants.asm | 1 + data/maps/headers/VermilionFerryDock.asm | 2 +- data/maps/objects/VermilionFerryDock.asm | 4 ++-- data/tilesets/collision_tile_ids.asm | 3 +++ data/tilesets/door_tile_ids.asm | 7 +++++-- data/tilesets/tileset_headers.asm | 1 + data/tilesets/warp_tile_ids.asm | 1 + gfx/blocksets/seagallop_port.bst | Bin 0 -> 480 bytes gfx/tilesets.asm | 2 ++ gfx/tilesets/seagallop_port.png | Bin 0 -> 1974 bytes maps/VermilionFerryDock.blk | Bin 84 -> 84 bytes 11 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 gfx/blocksets/seagallop_port.bst create mode 100644 gfx/tilesets/seagallop_port.png diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index a519fe43..8d9b9e69 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -32,4 +32,5 @@ const BETAMART const JACKY const FOSSILLAB + const SEAGALLOPPORT DEF NUM_TILESETS EQU const_value diff --git a/data/maps/headers/VermilionFerryDock.asm b/data/maps/headers/VermilionFerryDock.asm index fe5279e5..c988f186 100644 --- a/data/maps/headers/VermilionFerryDock.asm +++ b/data/maps/headers/VermilionFerryDock.asm @@ -1,2 +1,2 @@ - map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SHIP_PORT, 0 + map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SEAGALLOPPORT, 0 end_map_header diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm index 466a658f..a8d070a7 100644 --- a/data/maps/objects/VermilionFerryDock.asm +++ b/data/maps/objects/VermilionFerryDock.asm @@ -1,9 +1,9 @@ VermilionFerryDock_Object: - db $f ; border block + db $13 ; border block def_warp_events warp_event 14, 0, LAST_MAP, 9 - warp_event 14, 2, SEAGALLOP_FERRY, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 def_bg_events diff --git a/data/tilesets/collision_tile_ids.asm b/data/tilesets/collision_tile_ids.asm index 44b51514..052a2e84 100644 --- a/data/tilesets/collision_tile_ids.asm +++ b/data/tilesets/collision_tile_ids.asm @@ -85,3 +85,6 @@ BetaMart_Coll:: Jacky_Coll:: coll_tiles $01, $40, $11, $04, $14, $02, $03, $13, $12, + +SeagallopPort_Coll:: + coll_tiles $1C, $0E, $1E diff --git a/data/tilesets/door_tile_ids.asm b/data/tilesets/door_tile_ids.asm index 4cbdbf2f..5a097dc1 100644 --- a/data/tilesets/door_tile_ids.asm +++ b/data/tilesets/door_tile_ids.asm @@ -15,6 +15,7 @@ DoorTileIDPointers: dbw INTERIOR, .InteriorDoorTileIDs ; fixes weirdness in silph co. dbw CITRINE, .CitrineDoorTileIDs dbw CELESTE, .CelesteDoorTileIDs + dbw SEAGALLOPPORT, .SeagallopPortDoorTileIDs db -1 ; end MACRO door_tiles @@ -60,9 +61,11 @@ ENDM .InteriorDoorTileIDs: door_tiles $04, $15 -.CitrineDoorTileIDs +.CitrineDoorTileIDs: door_tiles $1C, $1B, $58, $59 -.CelesteDoorTileIDs +.CelesteDoorTileIDs: door_tiles $0C, $1C +.SeagallopPortDoorTileIDs: + door_tiles $0E, $1E diff --git a/data/tilesets/tileset_headers.asm b/data/tilesets/tileset_headers.asm index 05e32aa5..581ddb32 100644 --- a/data/tilesets/tileset_headers.asm +++ b/data/tilesets/tileset_headers.asm @@ -40,4 +40,5 @@ Tilesets: tileset BetaMart, $18, -1, -1, -1, TILEANIM_NONE tileset Jacky, -1, -1, -1, -1, TILEANIM_NONE tileset FossilLab, -1, -1, -1, -1, TILEANIM_NONE + tileset SeagallopPort, -1, -1, -1, -1, TILEANIM_WATER assert_table_length NUM_TILESETS diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index 9417864e..0282b6b6 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -33,6 +33,7 @@ WarpTileIDPointers: dw .BetaMartWarpTileIDs dw .JackyWarpTileIDs dw .LabWarpTileIDs ; Fossil Lab + dw .ShipPortWarpTileIDs ; Seagallop Port assert_table_length NUM_TILESETS MACRO warp_tiles diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst new file mode 100644 index 0000000000000000000000000000000000000000..e0ac6cd6266862088c72c240741eabbc9988c85b GIT binary patch literal 480 zcmZQzWMUQ&6cScYR8lrDG%{vpWnMgx&g0?X;nCL7*0Hv+wt>;!KE8g@ NF|lzlb@4+C006N+V|M@m literal 0 HcmV?d00001 diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index 37543234..aee94231 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -88,3 +88,5 @@ Jacky_Block:: INCBIN "gfx/blocksets/jacky.bst" FossilLab_GFX:: INCBIN "gfx/tilesets/fossillab.2bpp" FossilLab_Block:: INCBIN "gfx/blocksets/fossillab.bst" +SeagallopPort_GFX:: INCBIN "gfx/tilesets/seagallop_port.2bpp" +SeagallopPort_Block:: INCBIN "gfx/blocksets/seagallop_port.bst" diff --git a/gfx/tilesets/seagallop_port.png b/gfx/tilesets/seagallop_port.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc24d9c680f7f17aeac79fc32d0d6afe57c6ec0 GIT binary patch literal 1974 zcmeAS@N?(olHy`uVBq!ia0y~yU}#`qU@+idV_;yo`K4$d0|NtNage(c!@6@aFBupZ zSkfJR9T^xl_H+M9WMyDr;4JWnEM{QfI|9OtQ?>b|85r2TJzX3_D&pSGKAU&jN~C3O zx8A3WST>EI6yXJTpHAGQGr{+gg2VLME$@oHo|H?k@#(UkG;C+h_||{r ze5I@GAOHN>Q&k&#TKc~G_5afU?*>>~{I9ZX{`%v`j$fajpMP?Y!FuU$?j!&I{QUeZ zCsy9^&xdM{Cm~+)MeGIg_uBWpy!T|M*)(4Bn{EuEbF4a|A6;J`zk2rU*=KJ`v5Cj* z(U0GkQ5H7xR}=3e4r$W751Ot%TBI-Nn3tb#zSH!TLiP%l7mkOv@0;Izz>vw|9D{=J3)`Y2H+6(N zD%Sn>^x3*vb=&=$EY}ns3Ld$8M_b^~Z=HvCtXJ;)dZupv*Ww4V-hvH#^f`6e8m9bs zaD7q5gsjIqEQ8+Kf8?JkPlwWS*RryFvpsN$ z&0)!$2`gVqsbAP$qx)vd^J2xB7B8v<z&tu6jbzaNpaA-GURej>p+&LRH1?OJ- zv}`}Sg&EJHmSls)AF~vz6cpH-3fE6lHcC~v8s7DT10gDRDh$Mc)OrcOR-*%7UI+3p%i_`XQIGd75ziW`4sG zndWQHE2d27=+XWe#HD$7%9od#_ir;F@M}HTx|HL=l%1CtwZMIAR`7HU7x&w=_a>CR=yAptk0U>AjiBxzG2D) z1;gso$K#o=-?ZtFzJ6y%bbH2>olEQlWtfln?=5cWd?0ur{qH5ggmo8oewu50K%{W* zQ)S7f-y2PAni;2k;1E9iVNyZfidqL4w~^j2he&3KBw#--Z8qVzr%x)07@=W7C^M#wvbuE^xMc#})XP=3z zAy}$HZ-2^3~Jhzq0E=q^fsSyuiAs7ci;B8PrH*|Zu@!f>FoQ- zT~j!{Hs53In{w-$fbWLCY7^R@vT3rGS{6041*gjQUaEdkJDufY6j^pS@7* z;(z>~TcD&xzRg5?*#}>~pCW|;$$R_b^g{H*^*V$Mxm;pGIM2^`&hp;WG55=j-@FcbAN{X=VBj)e9W)3TZ zp5!#e7A5XK#vl}5+0Qda-iC?ic%IHG7qu6WpZyx|s0B3bu#n?i#8_p~#rQym^OJ&I zQr73Ehpbf_lm13!@do@2Kd4!8()f4Av)||Bijs--f^ wm3Ce2gO42lZ_A>`vDUAnZ~15Mj{3`QKO_H$>bzopr0JI>OW&i*H literal 0 HcmV?d00001 diff --git a/maps/VermilionFerryDock.blk b/maps/VermilionFerryDock.blk index f4a9573982a3f37685047ffe84e95bca52063a8b..c9c5d199d6849cb03326ec1ee2e555440e53ef8c 100644 GIT binary patch literal 84 zcmWe+V`F0z;9wUJVq;?y Date: Tue, 28 Nov 2023 12:33:01 +0000 Subject: [PATCH 18/24] progress is progress Bug fixes and new sprites mostly, just trying to do what I can, when I can. --- constants/map_constants.asm | 36 ++++++++++----------- data/maps/headers/CitrineFerryDock.asm | 2 +- data/maps/headers/FarawayFerryDock.asm | 2 ++ data/maps/hide_show_data.asm | 4 +-- data/maps/map_header_banks.asm | 6 ++-- data/maps/map_header_pointers.asm | 6 ++-- data/maps/objects/CitrineFerryDock.asm | 4 +-- data/maps/objects/FarawayFerryDock.asm | 12 +++++++ data/maps/objects/FarawayIslandOutside.asm | 4 +-- data/maps/objects/VermilionFerryDock.asm | 2 +- data/maps/songs.asm | 6 ++-- data/maps/town_map_entries.asm | 7 ++-- data/wild/grass_water.asm | 4 +-- engine/gfx/palettes.asm | 2 ++ engine/overworld/ferry_script.asm | 4 +-- gfx/blocksets/seagallop_port.bst | Bin 480 -> 480 bytes gfx/pokemon/back/steelixb.png | Bin 581 -> 637 bytes gfx/pokemon/back/taurospaquab.png | Bin 477 -> 613 bytes gfx/pokemon/back/taurospblazeb.png | Bin 462 -> 604 bytes gfx/pokemon/back/wugtriob.png | Bin 537 -> 582 bytes gfx/pokemon/front/mew.png | Bin 395 -> 758 bytes gfx/pokemon/front/porygon.png | Bin 387 -> 746 bytes gfx/pokemon/front/slowpoke.png | Bin 313 -> 680 bytes maps.asm | 8 ++--- maps/CitrineFerryDock.blk | Bin 84 -> 84 bytes maps/FarawayFerryDock.blk | Bin 0 -> 84 bytes maps/VermilionFerryDock.blk | Bin 84 -> 84 bytes scripts/FarawayFerryDock.asm | 6 ++++ 28 files changed, 70 insertions(+), 45 deletions(-) create mode 100644 data/maps/headers/FarawayFerryDock.asm create mode 100644 data/maps/objects/FarawayFerryDock.asm create mode 100644 maps/FarawayFerryDock.blk create mode 100644 scripts/FarawayFerryDock.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 24135f65..07a46bcc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -131,7 +131,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SILPH_GAUNTLET_2F, 13, 10 ; $6C - Was UNUSED_MAP_6A map_const SILPH_GAUNTLET_3F, 17, 13 ; $6D - Was UNUSED_MAP_6B map_const VICTORY_ROAD_1F, 10, 9 ; $6E - map_const SILPH_GAUNTLET_4F, 10, 9 ; $6F - Was UNUSED_MAP_6D + map_const BRUNSWICK_GROTTO, 15, 12 ; $6F - Was UNUSED_MAP_6D map_const SILPH_GAUNTLET_5F, 10, 9 ; $70 - Was UNUSED_MAP_6E map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70 @@ -166,9 +166,9 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const LAVENDER_POKECENTER, 7, 4 ; $8F map_const POKEMON_TOWER_1F, 10, 9 ; $90 map_const POKEMON_TOWER_2F, 10, 9 ; $91 - map_const BRUNSWICK_GROTTO, 15, 12 ; $92 - Was Pokemon Tower 3F + map_const SILPH_GAUNTLET_4F, 10, 9 ; $92 - Was Pokemon Tower 3F map_const CELESTE_HILL_GATE, 5, 4 ; $93 - Was Pokemon Tower 4F - map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused + map_const POKEMON_TOWER_5F, 10, 9 ; $94 map_const POKEMON_TOWER_6F, 10, 9 ; $95 map_const POKEMON_TOWER_7F, 10, 9 ; $96 map_const MR_FUJIS_HOUSE, 4, 4 ; $97 @@ -252,28 +252,28 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const NAME_RATERS_HOUSE, 4, 4 ; $E6 map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7 map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7 - map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $F8 - Switched with ROCK_TUNNEL_B1F - map_const SILPH_CO_9F, 13, 9 ; $EA - map_const SILPH_CO_10F, 8, 9 ; $EB + map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F + map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused) + map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused) map_const SILPH_CO_11F, 9, 9 ; $EC - map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED + map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE map_const TRADE_CENTER, 5, 4 ; $F0 map_const COLOSSEUM, 5, 4 ; $F1 map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1 map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2 - map_const LORELEIS_ROOM, 5, 6 ; $F5 - map_const BRUNOS_ROOM, 5, 6 ; $F6 - map_const AGATHAS_ROOM, 5, 6 ; $F7 - map_const ROCK_TUNNEL_B1F, 20, 18 ; $F8 - Switched with CINNABAR_VOLCANO_FLOORS - map_const GIOVANNIS_ROOM, 11, 14 ; $F9 - map_const BATTLE_TENT, 5, 10 ; $FA - map_const MT_MOON_SQUARE, 13, 7 ; $FB - map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC - map_const CELESTE_HILL_CAVE, 20, 18 ; $FD - map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FE - map_const BRUNSWICK_GLADE, 19, 20 ; $FE should be this, i cut silph 8f before this but never updated the $s. + map_const LORELEIS_ROOM, 5, 6 ; $F4 + map_const BRUNOS_ROOM, 5, 6 ; $F5 + map_const AGATHAS_ROOM, 5, 6 ; $F6 + map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS + map_const GIOVANNIS_ROOM, 11, 14 ; $F8 + map_const BATTLE_TENT, 5, 10 ; $F9 + map_const MT_MOON_SQUARE, 13, 7 ; $FA + map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB + map_const CELESTE_HILL_CAVE, 20, 18 ; $FC + map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FD + map_const BRUNSWICK_GLADE, 19, 20 ; $FE DEF NUM_MAPS EQU const_value ; Indoor maps, such as houses, use this as the Map ID in their exit warps diff --git a/data/maps/headers/CitrineFerryDock.asm b/data/maps/headers/CitrineFerryDock.asm index 36259099..fde92a33 100644 --- a/data/maps/headers/CitrineFerryDock.asm +++ b/data/maps/headers/CitrineFerryDock.asm @@ -1,2 +1,2 @@ - map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0 + map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SEAGALLOPPORT, 0 end_map_header diff --git a/data/maps/headers/FarawayFerryDock.asm b/data/maps/headers/FarawayFerryDock.asm new file mode 100644 index 00000000..088b58d0 --- /dev/null +++ b/data/maps/headers/FarawayFerryDock.asm @@ -0,0 +1,2 @@ + map_header FarawayFerryDock, FARAWAY_FERRY_DOCK, SEAGALLOPPORT, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index f2851bd5..42140dbe 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -115,7 +115,7 @@ MapHSPointers: dw NoHS dw NoHS dw VictoryRoad1FHS - dw NoHS + dw BrunswickGrottoHS dw NoHS dw NoHS dw NoHS @@ -150,7 +150,7 @@ MapHSPointers: dw NoHS dw NoHS dw PokemonTower2FHS - dw BrunswickGrottoHS + dw NoHS dw NoHS dw PokemonTower5FHS dw PokemonTower6FHS diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 5f646309..8c06fc59 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -113,7 +113,7 @@ MapHeaderBanks:: db BANK(SilphGauntlet2F_h) db BANK(SilphGauntlet3F_h) db BANK(VictoryRoad1F_h) - db BANK(SilphGauntlet4F_h) + db BANK(BrunswickGrotto_h) db BANK(SilphGauntlet5F_h) db BANK(SilphGauntlet6F_h) db BANK(SilphGauntlet7F_h) @@ -148,7 +148,7 @@ MapHeaderBanks:: db BANK(LavenderPokecenter_h) db BANK(PokemonTower1F_h) db BANK(PokemonTower2F_h) - db BANK(BrunswickGrotto_h) + db BANK(SilphGauntlet4F_h) db BANK(CelesteHillGate_h) ; was pokemon tower 4f db BANK(PokemonTower5F_h) db BANK(PokemonTower6F_h) @@ -238,7 +238,7 @@ MapHeaderBanks:: db BANK(SilphCo9F_h) db BANK(SilphCo10F_h) db BANK(SilphCo11F_h) - db BANK(SilphCoElevator_h) + db BANK(FarawayFerryDock_h) db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE db BANK(TradeCenter_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 40c2537d..4f89390d 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -113,7 +113,7 @@ MapHeaderPointers:: dw SilphGauntlet2F_h dw SilphGauntlet3F_h dw VictoryRoad1F_h - dw SilphGauntlet4F_h + dw BrunswickGrotto_h dw SilphGauntlet5F_h dw SilphGauntlet6F_h dw SilphGauntlet7F_h @@ -148,7 +148,7 @@ MapHeaderPointers:: dw LavenderPokecenter_h dw PokemonTower1F_h dw PokemonTower2F_h - dw BrunswickGrotto_h + dw SilphGauntlet4F_h dw CelesteHillGate_h ; was pokemon tower 4f dw PokemonTower5F_h dw PokemonTower6F_h @@ -238,7 +238,7 @@ MapHeaderPointers:: dw SilphCo9F_h dw SilphCo10F_h dw SilphCo11F_h - dw SilphCoElevator_h + dw FarawayFerryDock_h dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f dw UnderwaterTunnel_h ; UNUSED_MAP_EE dw TradeCenter_h diff --git a/data/maps/objects/CitrineFerryDock.asm b/data/maps/objects/CitrineFerryDock.asm index 20c3e6c4..250d25ce 100644 --- a/data/maps/objects/CitrineFerryDock.asm +++ b/data/maps/objects/CitrineFerryDock.asm @@ -1,9 +1,9 @@ CitrineFerryDock_Object: - db $f ; border block + db $15 ; border block def_warp_events warp_event 14, 0, CITRINE_CITY, 7 - warp_event 14, 2, SEAGALLOP_FERRY, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 def_bg_events diff --git a/data/maps/objects/FarawayFerryDock.asm b/data/maps/objects/FarawayFerryDock.asm new file mode 100644 index 00000000..d4099900 --- /dev/null +++ b/data/maps/objects/FarawayFerryDock.asm @@ -0,0 +1,12 @@ +FarawayFerryDock_Object: + db $15 ; border block + + def_warp_events + warp_event 14, 0, FARAWAY_ISLAND_OUTSIDE, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 + + def_bg_events + + def_object_events + + def_warps_to FARAWAY_FERRY_DOCK diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index 45313b17..f9dd71c0 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -2,8 +2,8 @@ FarawayIslandOutside_Object: db $2d ; border block def_warp_events - warp_event 6, 35, SEAGALLOP_FERRY, 1 - warp_event 7, 35, SEAGALLOP_FERRY, 1 + warp_event 6, 35, FARAWAY_FERRY_DOCK, 1 + warp_event 7, 35, FARAWAY_FERRY_DOCK, 1 warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1 warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2 diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm index a8d070a7..89379dcc 100644 --- a/data/maps/objects/VermilionFerryDock.asm +++ b/data/maps/objects/VermilionFerryDock.asm @@ -1,5 +1,5 @@ VermilionFerryDock_Object: - db $13 ; border block + db $15 ; border block def_warp_events warp_event 14, 0, LAST_MAP, 9 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index dbdd4f77..47fec6da 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -112,7 +112,7 @@ MapSongBanks:: db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F - db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F + db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F @@ -147,7 +147,7 @@ MapSongBanks:: db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F - db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO + db MUSIC_POKEMON_TOWER, 0 ; BRUNSWICK_GROTTO db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F @@ -237,7 +237,7 @@ MapSongBanks:: db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR + db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL db MUSIC_CITRINE, 0 ; TRADE_CENTER diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 37792e69..d6170694 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -83,6 +83,7 @@ InternalMapEntries: internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName + internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName internal_map LANCES_ROOM, 0, 2, PokemonLeagueName internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName @@ -95,7 +96,8 @@ InternalMapEntries: internal_map CELADON_HOTEL, 7, 5, CeladonCityName internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName - internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName + internal_map SILPH_GAUNTLET_4F, 10, 5, SilphCoName + internal_map CELESTE_HILL_GATE, 7, 9, CelesteHillName internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName @@ -133,7 +135,8 @@ InternalMapEntries: internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName - internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName + internal_map SILPH_CO_11F, 10, 5, SilphCoName + internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index e8c37b47..46405b89 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -112,7 +112,7 @@ WildDataPointers: dw Gauntlet2FWildMons dw Gauntlet3FWildMons dw VictoryRoad1FWildMons - dw Gauntlet4FWildMons + dw BrunswickGrottoWildMons dw Gauntlet5FWildMons dw Gauntlet6FWildMons dw NothingWildMons @@ -147,7 +147,7 @@ WildDataPointers: dw NothingWildMons dw PokemonTower1FWildMons dw PokemonTower2FWildMons - dw BrunswickGrottoWildMons + dw Gauntlet4FWildMons dw NothingWildMons dw PokemonTower5FWildMons dw PokemonTower6FWildMons diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 80a37c10..8e13c232 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -178,6 +178,8 @@ SetPal_Overworld: jp z, .faraway cp FARAWAY_ISLAND_INSIDE jp z, .faraway + cp FARAWAY_FERRY_DOCK + jp z, .faraway cp SILPH_GAUNTLET_1F jp z, .faraway cp CELESTE_HILL_OUTSIDE diff --git a/engine/overworld/ferry_script.asm b/engine/overworld/ferry_script.asm index ef462ef5..db2e9de0 100644 --- a/engine/overworld/ferry_script.asm +++ b/engine/overworld/ferry_script.asm @@ -143,8 +143,8 @@ DoIslandMenu: jr .islandSelected .choseFarawayIsland - ld b, 0 - ld c, FARAWAY_ISLAND_OUTSIDE + ld b, 1 + ld c, FARAWAY_FERRY_DOCK jr .islandSelected .choseCitrineCity diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst index e0ac6cd6266862088c72c240741eabbc9988c85b..cee0fa696c788875ddd25ca5cf4b724cd83d902a 100644 GIT binary patch delta 60 lcmaFB{D66b0;7S52tPjv^FslMjf{DDd3llflMNXs008|q2R{G+ delta 32 icmaFB{D66b0;7PpkFQ^JOl+JC6ig0e?4O*#s0aX^6$rHe diff --git a/gfx/pokemon/back/steelixb.png b/gfx/pokemon/back/steelixb.png index 0a3c1e8261ca944ae5e7177eeca0e402874cbba4..ef5a54e653d5c275b7ebc4f114f11c25a995a77b 100644 GIT binary patch delta 395 zcmX@g@|R_T%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gt#Bd%4u;!VfI$tqIDx`u|j zMiwE4Mpj0~RwhQ;1_o9J2DOvTI3`{c_d}C4gvi>eP0?gvV9+RWjVMV;EJ?L0$;?eH zE=kNSU@$T;Lem2^G5YrU?8!`wne{h4T^vIsE+_xsXXSDDBYbGbpa1i0X9Rw{d{6#N zz})}(5@!T{{5NJelkk7`3$BnOAKtIOxoX2thhy*G|6LuX%Wkx<{#*T47oih7{+_hY zR^pye_-WqzQybiV|K~aWXV0=#a$o(Z;z$8cAy2`-^B*Q&cAlah@!0MRrc(~;+*fS}+4 zQ6+CzXPIWj9tUZG$0tIrH~jzOaBTS%hWZWr{m$`hWjDSObP0l+XkKYVx73 delta 337 zcmey%a+GC)3NK5#qpu?a!^VE@KZ&dp6&pI&lbKIW zJ!7YZ+{9)TDI;A2OI-uw5JM9yV*@K=3vB}fD+7Zy#Yz?v4~pZEy{k8?WwIJ$X8lo5 z7sn8Z%gI0ZS$Td)$}9BPe|!GpV9)uzf4UF$`o+O!$?eU?ENgw|I z|K25d;>YLz^DIcR=NA-C(^Y@{x92}k`+3QC_S?+=MB5+!87y|QG4Y_oF+*M7>lgn0=XsVF z#J6an!{prES0d)BF}&UMYRZo%LOdxl4@CYY^OtBlo31uEBK|A)pFrEyD<}WBR7mnL ZFdW}|t3t-)#`BBH zXHB+dl$05@$GB9B1$XPZy2VK$>BI#gzu6^=cMwxnSI@Jz* zJ<7nq5S1F?nda-upvAzzz`?-ED8#@FvYCOAfq_wqffdYVVDMs;hO>hhHK1yk7#Ns@ zp=?G581R7V0n_q9-%S|m85jD4b@*NZPYpyOkq&_FCVv%3o_M#^n zqg8bKe@;)A`}_S#+{3EQJ91H(hioDkQbL4^I98t0OFUhoP^Eup>&ha<>yh7DBTi|^ z-eU3IaB!YL@4>#Et`hSr1lMsqI406LH}mj}%{c;Ao;h1s8s#ec11?RGBxdyxN6NZ%aB7nyA!e|oz5xvXb|85kJYOFVsD*`Kp;@>(q<=uV%N6Kb8N{;RBh6JCv$Le1;c6)IfbTqP8+`}OzY}BI_bSio({|M zsx$A-q#uY#I3aZ=`=Q*OMaLFvujZd7=y+tZ_#>T1C$tR(HcEyCJH@ZzJkM3TWcl<% z{ugK75fRInu6)RO^&Nq=hmA z_LE!_4@yR0ldFy@+{VDbpi$x)QIe8al4@0wnVVW%l9*e-U}Ruqtcy*Lj(mdKI;Vst0OD4DM*si- diff --git a/gfx/pokemon/back/taurospblazeb.png b/gfx/pokemon/back/taurospblazeb.png index 4f55ecb2c6c6c365bb80ad020b8bc9a1a18a991a..38f594ed7cf2c6bc6ea4d44fd13286483f6a0930 100644 GIT binary patch delta 448 zcmX@de1~O1n$}?k2EN0L$MaXDFfcH%mw5WRvOnjR;gMut_GNA{0|NtNevw}YN=g_S>Ka*u7#dj_nOYf`Ya19?85k`4pDr{x7G2U5BI#gzu6=SJqf9+EoekUn z6*4d|M5RV}ruq6ZXfZG_a4@hk3NbK)Y-V6&U|^JDU1_mZ! zD4UT120Wm8z_fhOcN2zs28JD;E{-7*mut^j^BpqaVM}oLtnl#2bgi1VENiA_Rt={f zV+VHu`;4kCJ%uAjR3}JSm$0y^i*SnB)NZQ3{ou!BYpsfqxx5*<$>DP0XBS^d7GCP> zuy5a6r?eAi6&yGl)*fd`S!v6%VCob$Wy54S-=@tu_ncQv(^H;yYtBpY042R;%KY7| z`-LAxFu##4S(G3qQre(6>(s&4t6QcEU-ND%D6s0e@9~P~;w6oR%^6qO-*F$84`I1} bU49S4|D67a!nI$XfxPGG>gTe~DWM4fOnHK9 delta 326 zcmcb^a*laITKy3Q2EHSVQ?>b|85kJYOFVsD*`Kp;@>(D$(PK%D_trIVb`(c-5zP^f+fq_Az#5JNMC9x#csw6WvwYVfP zw}8ROzzDmZkVDrZyF%drVV}}vTDGpX6Cue8ogFF{6Tu^Y9Sj>LxL!%MXL!Q|y4+>bc-3;PT zej?n#X!Jp>XQAm;`9mFCtVVWBZv}W+t=`y+JV<037rTfH&iBm)BjgQu&X%Q~lo FCIDN!cqae= delta 293 zcmX@cGLvP33NK5#qpu?a!^VE@KZ&dp6&pI&hgFzI zB<#h>kcrJIQbxLlM!E*3A%>P#hDKIK2HFM&Rt5%Fn%111cu*Wo*3c3nyYEDp<773) z%=($0E{-7*mut@`@*Q#zV7=fe;1R+qch!3hgQG!9o8_T6CdTCv8)t2Kc}_LJv|zH; zEUil^5^3el3J+IL|1+Q8hN+%u&*IjkU0=hG9;jViVc>cvUZkf<$ZJv6w2fUH>kPWs z64!l**v8eJzKdheVPVO}qskZOCB9^F3|O!rPW^{|u1m6c*Qw++THS>;1(H8nZOZK{ g(tIT6d}7b{UNFDAXVcYM1_lNOPgg&ebxsLQ0Au!Ri~s-t diff --git a/gfx/pokemon/front/mew.png b/gfx/pokemon/front/mew.png index a00783a977ec2670c732dfc7ac32de533e395d0c..60ecb3438f2d0d27f7035207959e279e534c33bf 100644 GIT binary patch literal 758 zcmeAS@N?(olHy`uVBq!ia0y~yV9)?zCI$uuhR3S^1sE6@6p}rHd>I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2Bsu$cNYd``sfb8Z}}$&94j$42=0jej$wK7nRRqU|>)!ag8WRNi0dV zN-j!GEJ5frds>;csSrsadan=mji26?(ThDcm)y`b;m>?p(j zVZNj8A)ctPI1w=&wLlx4*||;iaWN%lS48M#O>94CQgW#H60L{eT83g*%R3UDw)bZK6&h6cxY1ds-UGdrmWl=eJ9=c zrd7-}a!ylaChYINka}2${qA|^IoI8itel+-Eoa%J&03gruy{|xq_6jGx|eU8a_vvn zrgk~$9kUi4T&4K_yJ>3k&lBE9zv$=q#ux5&(sS8T!ZxvRmgWDoMvG^D+m@rR9X;z@ zcXqhdGWL!Cs}g^Qw|z=kGs9YU7SD{yOU$^_49gVWFFSvY$2KAVQdGZ{x8lTOAy=Lx z{1Gg*eq|o1a_fZ4l#fA~rmw^~PMFAk%>Vb4zs1~S(%KV0ML}Wi>FVdQ&MBb@03&Al A9{>OV delta 369 zcmeyy+RZ#cxt=k|)5S5Q;#TVgdkev5^sDT{bSvjzVsPXG1u*v0L#Es_rPPdV=#oxHwJL|Mmj zMO4;O{z;r|&$i9UXl`Qe$cwC+wbg8&_`+%Wj#nA&_!oNdow)D%VpHO@=6BB(&t)qc z+B!QITF$abo3$|MVDX*=wby$$_rJ^0T>JBC3csycfvIbAsPnz|*{9e(Pn_QMQa8sp zzVNP-p39b)zvhokivLBYx@8%^&Ak~Hw#{U&`1N%qK72|4zaILwp6BVw2*dIy6XOKG zNw;)n9J|rDXSQ9m@t20Zp4qmibXr}cf&(Wte{{d{R^xuk#0+KOz+>J^uWH0AC`>Ln evj5j~`^&;67h@J4;A3E5VDNPHb6Mw<&;$TV$gE}n diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index f991dd6e4f06c59227cd5d1ca485c4542826fb10..8e5b3f5e7274202bb7fb7330cb202195d2172c0b 100644 GIT binary patch literal 746 zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-CI$uu28)~felajGC?tCX`7$t6sWC7#v@kG$ zgc@EjFq9fFFuY1&V6d9Oz#v{QXIG#N0|Nt7lDE4H1G8~UQ3nG9180FpWHAE+-(e7D zJf6QIg@J*Ay~NYkmHj!l43C8HQqu~51_lPk{35>)#`BBHXE87^sFt`!l%ync8S5Gv>Ka*u7#dj_nOGTGXd4(<85k7buZc#{kei>9nO2EKgBe6a(BA#K z7#J8d;5L+G=B5^xB<2=i(PIhG^ZCKM9tH-6sMHA0G+$o^Ed~Y#4hB|6AqHlU!xUdHTcS#`#7z)vD%) zZ|^>|RpfYH`R?gXn_oWEIqLa8HE6c7RQ$!vDm9tes;15-8K!OfckTNemia7p>mtrd z^s}sgBOv@nz-A*`SW5GSX)886MIP9%V3GBLy-n9^vf9Bs=50)RUcXH*E|`>ke#hF@ zK8G!)5S5Q;?~qlhW>{fMA$!+H(Pl5yn1jbCFvLEoE***T`ktTE}mo* z+u!J;qhs~r0gDIcQ<)o)C5jhk2>fB`Y4hW9o4o94W%-R$9ozqYI={EN@;$?KzMLNa zPwff+&vh7nmp&_TKW?$`mNNqJEr z|HB0gQJvi{eguh}=zF7D-g6+otE?kU@%hZw@X5>XD97` zx=%{9MR)vJ0+n4G~Iu_JiT?wyVLN=iVz`-DbtbaG^=}+p+~SJGC#|2uYgM za%!c=Cm}VJJe3^I1};{GD*-q5s_`gny>&-9F~^jx(X*WQ{cDb+t2g}J@4u0=j-hz= XdYdPAdn*|j7#KWV{an^LB{Ts5pp33w diff --git a/gfx/pokemon/front/slowpoke.png b/gfx/pokemon/front/slowpoke.png index 1328f4a00bcbc1c7fb9e3b2eb4471fe4fd7d7cbe..d78c2a59c320bd6fb4af004b6663169c082c4bf6 100644 GIT binary patch literal 680 zcmeAS@N?(olHy`uVBq!ia0y~yV9)?zCI$uuhR3S^1sE6@6p}rHd>I(3)EF2VS{N99 zF)%PRykKA`HDF+PmB7GYHG_dcykO3*KpO@I2Bsu$cNYd``sfb8Z$4dc7@|@mJkxxA8MGJ}7&sVM8HE^_85kHC85kKD z7^N6k!E6QwFGguNJBU#Os)mVyfk_z3W&{N+7<)kVfNA-l?HH_E9}jyxvgx~1tgO7{mni$8c##z?Z)4f!8k>tQ2oL(5yUC+I zPXBpwV%WBo-E-Fd-F-!@G%J^9_xHN9a~ytFdTnv|_x-0^PUELHucqu^$tpjw)72u( zcjq^W153k?+&*wzF!qvZ<9Trx?>#%y*d8jTr!DAMC}!++Bd3$QD*E`EDF$=CyKIeZ z-cYD$lDJjm73Z0W&sqLXep4KL_u7}gTmL`I+;~;}MD@Ci-5avws%{-x^)K4)&-D+^ b!EtvP_3u0A-anJ71PUcjS3j3^P6|R5Nla3CLsIgG8T;ow| z?+}%3e4#-hzv~4iXf5e#6i+yFjU_Pfro{cZlXZTU{CY1mU)bKpv&LV^|IP`HwRJ~V zeqd+SO8h;;@%b5N))#YA_WOvvT>tuQmC~70W~CEP@2#Jn6S%zo+Ob6L_utQGPKjUc z!u@3b{QM(g8te1)JEIqrrQ2-hm>+6uV|zl%P5#!sjkk!3`O5lf vo^_UZneW}pb{SXWPqT|1=9M_R;}^falzmuyfG-mR0|SGntDnm{r-UW|Uc7?H diff --git a/maps.asm b/maps.asm index 1aa91c5d..23c2bfc1 100644 --- a/maps.asm +++ b/maps.asm @@ -313,10 +313,10 @@ INCLUDE "scripts/RocketHideoutElevator.asm" INCLUDE "data/maps/objects/RocketHideoutElevator.asm" RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" -INCLUDE "data/maps/headers/SilphCoElevator.asm" -INCLUDE "scripts/SilphCoElevator.asm" -INCLUDE "data/maps/objects/SilphCoElevator.asm" -SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" +INCLUDE "data/maps/headers/FarawayFerryDock.asm" +INCLUDE "scripts/FarawayFerryDock.asm" +INCLUDE "data/maps/objects/FarawayFerryDock.asm" +FarawayFerryDock_Blocks: INCBIN "maps/FarawayFerryDock.blk" INCLUDE "data/maps/headers/SafariZoneEast.asm" INCLUDE "scripts/SafariZoneEast.asm" diff --git a/maps/CitrineFerryDock.blk b/maps/CitrineFerryDock.blk index f4a9573982a3f37685047ffe84e95bca52063a8b..3a5dec84c8e04bdd6b2e93ddd3944a82edacb0df 100644 GIT binary patch literal 84 zcmWe+V`F0z;9wU3(Sp3(Ai%{5BDqC)xWIrDObSDI42(=5E|ka2!V2c`@go5t0FG$` Aj{pDw literal 84 zcmd<%0Rb^l9v)^M9zJ14Mn*;!RyKAJ%_GRm%gf8b$;Az#Av_QZgwc2cLP&rQ0GPJ~ A2LJ#7 diff --git a/maps/FarawayFerryDock.blk b/maps/FarawayFerryDock.blk new file mode 100644 index 0000000000000000000000000000000000000000..ca698c1ad05f5c086d74cfd32e0c76752d1c0125 GIT binary patch literal 84 ncmd<*00VX~$ Date: Tue, 28 Nov 2023 15:50:50 +0000 Subject: [PATCH 19/24] Update palettes.asm Fixed a bug where every route had the Celadon Gym rainbow palette --- engine/gfx/palettes.asm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 8e13c232..7720889e 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -136,6 +136,19 @@ SetPal_GameFreakIntro: ; uses PalPacket_Empty to build a packet based on the current map ; are the edits I've made here horribly inefficient? yes, but as long as it works, who cares? SetPal_Overworld: + ld a, [wCurMap] + cp CELADON_GYM + jr nz, .notCeladon + ld hl, PalPacket_Gay + ld de, wPalPacket + ld bc, $10 + call CopyData + ld hl, PalPacket_Gay + ld de, BlkPacket_Gay + ld a, SET_PAL_OVERWORLD + ld [wDefaultPaletteCommand], a + ret +.notCeladon ld hl, PalPacket_Empty ld de, wPalPacket ld bc, $10 @@ -150,8 +163,6 @@ SetPal_Overworld: jp z, .brunswick cp FIRST_INDOOR_MAP jp c, .townOrRoute - cp CELADON_GYM - jp z, .gay cp POWER_PLANT jp z, .powerPlant cp BRUNSWICK_GLADE @@ -200,16 +211,6 @@ SetPal_Overworld: cp NUM_CITY_MAPS jp c, .town ld a, PAL_ROUTE - 1 -.gay - ld hl, PalPacket_Gay - ld de, wPalPacket - ld bc, $10 - call CopyData - ld hl, PalPacket_Gay - ld de, BlkPacket_Gay - ld a, SET_PAL_OVERWORLD - ld [wDefaultPaletteCommand], a - ret .town inc a ; a town's palette ID is its map ID + 1 ld hl, wPalPacket + 1 From defbcb68d053c84387767804ec9917e9c15ac4a7 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 29 Nov 2023 18:01:56 +0000 Subject: [PATCH 20/24] boat fix + polishing dex entries --- data/pokemon/base_stats/annihilape.asm | 2 +- data/pokemon/dex_text.asm | 293 ++++++++++++------------- gfx/blocksets/seagallop_port.bst | Bin 480 -> 480 bytes gfx/tilesets/seagallop_port.png | Bin 1974 -> 1470 bytes 4 files changed, 147 insertions(+), 148 deletions(-) diff --git a/data/pokemon/base_stats/annihilape.asm b/data/pokemon/base_stats/annihilape.asm index 14cc447a..690c6a9e 100644 --- a/data/pokemon/base_stats/annihilape.asm +++ b/data/pokemon/base_stats/annihilape.asm @@ -10,7 +10,7 @@ INCBIN "gfx/pokemon/front/annihilape.pic", 0, 1 ; sprite dimensions dw AnnihilapePicFront, AnnihilapePicBack - db SCRATCH, LEER, KARATE_CHOP, FURY_SWIPES ; level 1 learnset + db SCRATCH, LEER, UPPERCUT, KARATE_CHOP ; level 1 learnset db GROWTH_MEDIUM_FAST ; growth rate ; tm/hm learnset diff --git a/data/pokemon/dex_text.asm b/data/pokemon/dex_text.asm index 3dedd60b..31f3a472 100644 --- a/data/pokemon/dex_text.asm +++ b/data/pokemon/dex_text.asm @@ -78,32 +78,32 @@ _SlowbroDexEntry:: ; new entry next "into SLOWBRO" dex -_IvysaurDexEntry:: - text "When the bulb on" - next "its back grows" - next "large, it appears" +_IvysaurDexEntry:: ; new entry + text "Can often be seen" + next "sunbathing. After" + next "absorbing enough" - page "to lose the" - next "ability to stand" - next "on its hind legs" + page "nutrients and sun-" + next "light, its bud" + next "will blossom" dex _ExeggutorDexEntry:: - text "Known as The" + text "Also known as The" next "Walking Tropical" next "Rainforest, each" - page "fruit has a face" - next "and a will of" - next "its own" + page "of the fruits" + next "has a face and" + next "will of its own" dex _LickitungDexEntry:: ; new entry - text "It has a lazy" - next "nature and a" - next "ravenous appetite," + text "Has a lazy nature" + next "and a ravenous" + next "appetite, moving" - page "moving its tongue" + page "its long tongue" next "like a human arm" next "for grabbing food" dex @@ -190,8 +190,8 @@ _LaprasDexEntry:: ; new entry _ArcanineDexEntry:: ; new entry text "Often depicted in" - next "Chinese folklore." - next "This legendary" + next "Chinese folklore" + next "and legends, this" page "#MON is capable" next "of outrunning" @@ -299,13 +299,13 @@ _TangelaDexEntry:: ; new entry dex _GrowlitheDexEntry:: ; new entry - text "Friendly toward" - next "people with a" - next "loyal nature. Its" + text "It's very friendly" + next "and faithful to" + next "people. CINNABAR's" - page "development may be" - next "due to CINNABAR's" - next "ecosystem" + page "ecosystem may have" + next "influenced its" + next "development" dex _OnixDexEntry:: ; new entry @@ -419,9 +419,9 @@ _HitmonchanDexEntry:: ; new entry dex _ArbokDexEntry:: ; new entry - text "ARBOK paralyzes" - next "prey with its" - next "gaze. It often" + text "Weak foes flee at" + next "the sight of its" + next "belly pattern. It" page "fights viciously" next "with its mortal" @@ -430,25 +430,25 @@ _ArbokDexEntry:: ; new entry _ParasectDexEntry:: ; new entry text "It lives in dark," - next "damp forests." - next "In China, the" + next "damp forests. In" + next "China, the toxic" - page "mushroom's toxic" - next "spores are used" - next "in medicine" + page "spores it scatters" + next "are sometimes used" + next "to make medicine" dex -_PsyduckDexEntry:: ; new entry, modified from the original. - text "It always has a" - next "headache. If it" - next "intensifies, it" +_PsyduckDexEntry:: ; new entry + text "Always suffering" + next "from a constant" + next "headache. If its" - page "will begin to" - next "use psychokinetic" - next "powers" + page "headache worsens," + next "it unleashes its" + next "psychokinesis" dex -_DrowzeeDexEntry:: +_DrowzeeDexEntry:: ; new entry text "Said to be a" next "decendant of the" next "legendary Baku," @@ -461,16 +461,16 @@ _DrowzeeDexEntry:: _GolemDexEntry:: ; new entry text "Its rugged shell" next "is made from rock-" - next "like slabs. It" + next "like slabs. Each" - page "sheds this shell" - next "annually to" - next "grow larger" + page "year, it sheds its" + next "shell in order to" + next "grow even larger" dex _MagmarDexEntry:: ; new entry, modified from the original - text "A rare species," - next "sometimes sighted" + text "This rare species" + next "has been sighted" next "in volcanic areas." page "The temperature of" @@ -485,17 +485,17 @@ _ElectabuzzDexEntry:: ; new entry page "electricity. The" next "color red appears" - next "to anger it" + next "to enrage it" dex _MagnetonDexEntry:: ; new entry - text "What keeps it" - next "levitating is" - next "currently unknown." + text "A linked cluster" + next "of MAGNEMITE. It" + next "discharges high-" - page "It discharges" - next "intense voltage" - next "and magnetic rays" + page "voltage magnetic" + next "rays that harm" + next "man-made devices" dex _KoffingDexEntry:: ; new entry @@ -509,13 +509,13 @@ _KoffingDexEntry:: ; new entry dex _MankeyDexEntry:: ; new entry - text "While carefree," - next "it can become" - next "enraged instantly." + text "It's believed that" + next "MANKEY's habit of" + next "suddenly rampaging" - page "Research points" - next "towards a calcium" - next "deficiency" + page "could be due to a" + next "calcium deficiency" + next "in its diet" dex _SeelDexEntry:: @@ -529,8 +529,8 @@ _SeelDexEntry:: dex _DiglettDexEntry:: ; new entry - text "Burrows through" - next "the ground seeking" + text "It burrows through" + next "the earth, seeking" next "ONIX's leftovers." page "The trails of soil" @@ -539,12 +539,12 @@ _DiglettDexEntry:: ; new entry dex _TaurosDexEntry:: ; new entry - modified first line from the original - text "If provoked by" - next "an enemy, it" - next "charges furiously" + text "If provoked by an" + next "enemy, it charges" + next "furiously while" - page "while whipping its" - next "body with its" + page "whipping its body" + next "with its three" next "long tails" dex @@ -559,14 +559,13 @@ _FarfetchdDexEntry:: ; new entry dex _VenonatDexEntry:: ; new entry - text "Its eyes emit" - next "beams of light" - next "to be used as" + text "Its eyes serve as" + next "radars, emitting" + next "bright beams of" - page "radars. This lets" + page "light. This lets" next "VENONAT remain" - next "active at night" - + next "active at night" dex _DragoniteDexEntry:: ; new entry @@ -761,19 +760,19 @@ _HorseaDexEntry:: ; new entry dex _SeadraDexEntry:: - text "A vicious #MON," - next "SEADRA's spikes" - next "are so painful" + text "A vicious #MON." + next "SEADRA's sharp," + next "venomous spikes" - page "to touch that" - next "they can cause" - next "fainting" + page "are so painful to" + next "touch, they can" + next "cause fainting" dex _SandshrewDexEntry:: ; new entry. text "It lives inside" next "deep underground" - next "burrows. Curls" + next "burrows. It curls" page "itself up into a" next "ball to protect" @@ -821,23 +820,23 @@ _JigglypuffDexEntry:: ; new entry dex _WigglytuffDexEntry:: ; new entry - text "WIGGLYTUFF's" - next "dense, supple fur" - next "is sold as a" + text "WIGGLYTUFF's dense" + next "and supple fur is" + next "sold as a luxury" - page "luxury item to" - next "a number of rich," + page "item to a large" + next "number of rich," next "foreign buyers" dex -_EeveeDexEntry:: ; does not need a new entry - text "Its genetic code" - next "is irregular." - next "It may mutate if" +_EeveeDexEntry:: ; new entry + text "A special #MON" + next "that can evolve" + next "in multiple ways," - page "it is exposed to" - next "radiation from" - next "element STONEs" + page "due to a unique" + next "genetic code that" + next "it possesses" dex _FlareonDexEntry:: ; new entry, sort of modified off the original @@ -921,43 +920,43 @@ _PoliwhirlDexEntry:: ; new entry dex _PoliwrathDexEntry:: ; new entry, modified from original. - text "An adept swimmer" - next "at both the crawl" - next "and butterfly." + text "An adept swimmer," + next "faster than any" + next "Olympic athlete." - page "Why it remains a" - next "tadpole is still" - next "unknown" + page "Why it remains in" + next "a tadpole form is" + next "still unknown" dex _WeedleDexEntry:: ; new entry, modified from the original, including adding the omitted gingko leaf bit - text "Often found in" - next "forests, eating" + text "It's often found" + next "in forests eating" next "gingko leaves." page "It wiggles its" - next "stinger to" + next "sharp stinger to" next "intimidate foes" dex -_KakunaDexEntry:: ; does not need a new entry. +_KakunaDexEntry:: text "Almost incapable" - next "of moving, this" - next "#MON can only" + next "of moving. In an" + next "attempt to protect" - page "harden its shell" - next "to protect itself" - next "from predators" + page "itself, it may" + next "extend its hidden" + next "poisonous barb" dex _BeedrillDexEntry:: ; new entry - text "Often appears" - next "in swarms. It" - next "buzzes around at" + text "Often appears in" + next "swarms. It buzzes" + next "around at high" - page "quick speeds and" - next "attacks with its" - next "venomous stinger" + page "speeds, attacking" + next "with its three" + next "venomous stingers" dex _DodrioDexEntry:: ; new entry @@ -1131,7 +1130,7 @@ _KinglerDexEntry:: ; does not need a new entry dex _CloysterDexEntry:: ; new entry - text "Its shell is" + text "Its hard shell is" next "extremely durable." next "Even napalm bombs" @@ -1152,11 +1151,11 @@ _ElectrodeDexEntry:: ; new entry _ClefableDexEntry:: ; new entry text "Its hearing is" - next "very well-" - next "developed. It" + next "incredibly well-" + next "developed. It can" - page "can hear a pin" - next "drop from nearly" + page "hear a pin drop" + next "from over half" next "a mile away" dex @@ -1292,12 +1291,12 @@ _GoldeenDexEntry:: ; new entry _SeakingDexEntry:: ; new entry text "Using its drill-" - next "like horn, it" - next "hollows out" + next "like horn, it can" + next "hollow out river" - page "boulders to" - next "prepare for" - next "spawning ORFRY" + page "boulders, making" + next "nests to prepare" + next "to spawn ORFRY" dex _PonytaDexEntry:: ; new entry @@ -1325,29 +1324,29 @@ _RattataDexEntry:: ; new entry next "material to keep" next "its fangs short." - page "It feasts on" - next "nuts like walnuts" - next "and acorns" + page "It feasts on nuts" + next "and acorns, but" + next "also likes cheese" dex _RaticateDexEntry:: ; new entry - text "Its feet are" - next "slightly webbed," - next "letting it swim" + text "Its hind feet are" + next "webbed, allowing" + next "it to swim across" - page "across rivers." - next "Along with nuts," - next "it also eats fish" + page "rivers in order" + next "to hunt for and" + next "eat fish" dex _NidorinoDexEntry:: ; new entry - text "Easily angered." - next "By wildly swinging" - next "its horn around," + text "Quick-tempered and" + next "aggressive, its" + next "horn can pierce" - page "NIDORINO can even" - next "pierce through" - next "diamond" + page "through diamond" + next "when it swings it" + next "around wildly" dex _NidorinaDexEntry:: ; new entry @@ -1362,17 +1361,17 @@ _NidorinaDexEntry:: ; new entry _GeodudeDexEntry:: ; new entry text "Being round and" - next "easy to hold," - next "it is often" + next "easy to hold, it" + next "is often tossed" - page "tossed around in" - next "GEODUDE fights by" - next "unruly teenagers" + page "around by people" + next "as if it were in" + next "a snowball fight" dex _PorygonDexEntry:: ; new entry - text "Created in 1995" - next "by SILPH CO." + text "It was created in" + next "1995 by SILPH CO." next "Cases of illegal" page "prize PORYGON are" @@ -1393,11 +1392,11 @@ _AerodactylDexEntry:: ; new entry _MagnemiteDexEntry:: ; new entry altered from original text "Uses anti-gravity" next "to stay suspended." - next "The magnets on its" + next "The magnets on" - page "sides radiate" - next "electromagnetic" - next "waves" + page "its sides radiate" + next "strange electro-" + next "magnetic waves" dex _CharmanderDexEntry:: ; new entry diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst index cee0fa696c788875ddd25ca5cf4b724cd83d902a..73b6b2444f53e280d5a17bc0ac25eabcb166acf5 100644 GIT binary patch delta 26 hcmaFB{D4`Ifsu(>Ku}0nK~YKBz|hE;WuxGEMgT(k1qJ{B delta 26 hcmaFB{D4`Ifsu(>Ku}0nK~YKBz|hE;d86QYMgT(f1qA>A diff --git a/gfx/tilesets/seagallop_port.png b/gfx/tilesets/seagallop_port.png index 9bc24d9c680f7f17aeac79fc32d0d6afe57c6ec0..4f5a28f9a6ee0a3da289ce779bd87a3a6b49be4e 100644 GIT binary patch delta 1452 zcmdnSzmI!@N`sfb8cB4Zj+liuP-w&Fo>79MwA5Sr@Ch>&U>cv7h@-A}a#}16z`} zy9>jA5L~c#`D6wLR!L76$B>FSZ|B_1dt$}o@^^CO`TFOqKM(D>+t_s4ZRaczaoxQ~ z*ev{x&z@Bpvc&47jJ>`6|E)iM{IF=vS=}#xys%tH>g}zI&rcsaerxaE4ePGYJOAQ zPs!x4O7eu{N$T0}pSst-Q@#Ci-<*y>$9sx452HI8rYWDecJA?n&rh?nyF26y8Q8v- z@c8#l`roIRbmIENjOW{L>L_};3jUC?^#5jKT{-Ps5d&}E{k?lCTpt>Kv}R@$2rSeQ zWC*CanSA2Ao2)_z)1qzPc^WzIaO!gP8cQ6#&hVmF{`}RnJeNN!m}fBTsqgwRX@}&Z z%^4FnC|qD-J;Ttj`TnevqU;Ygxjdi4*m2E%?aGN0^vc^JHm6y0g;dt_FfgrTRG7`) zaKq+YTBU3xo12V7GlSIG#dAbDC5`8tJfc_iL^AZ^&b)Mn1dgiN5ytNf*X;SA(|_#l z*BdNpE$Oq|Tb^Iv6SMN%zpks%NmUH>1)dJSzcOq%lFksZCxidO-ndEc91n!$MAn%V zINVa(yk69&+o#t>g-QxIZ#->Nn+iXrV z{@DBYdl*x~)P@zzGgKL@!`}LCU|r92Kxq%tffqY$*k^D$@VDIa$&22`zGL@1#sm%% zMv3}{$g}r#7)&OVTQE#-@=-pqm*JhI`b@b4d*xcM&q-is`15D7tLS@uy$wmC35*BM zud!m-_s+M^hd&{%e^K_+gz3x?c?yqu9SmNvNwPa|l$kajUd`ZVH@$f(LqP`Tw3e{< zoeCidC(Igo8q|Z%?^|rVv+7R>lZkho3d5W?lIN4^B^EU@JlJ8PVWPP9*S*{BX&+vE zy#1Vk$LSbjTIuaMKHh7xJZCWWZ*%&@uwhr_`m}sThs|~C46PXtsLq+@vv%Qa)jBqY zKl4;sr4zJy%JAA&lAjFk@Jw0Gq=j z!CvumC#LEp)P6|q?Ph#XcutQ|TY-ad0DvvhPeBn~Acbs928y}=#b`@!Ob0+_{=(hUn%y0fQJdIs^o%>8dL#V=% zdhH)wG7Oi_gerad&2ZRvK}5Z1Q{3j}b4hbQ>l|PFUYXl5Wt+S70m;JaEZgd}1Y9)h z#2Qy0U;8(J79^!$!y z@kE9nOC}Z-xXLrkd8*C$fbEhlqsBgqL#ziaSTvZrdLC6XgxK4@nc9DOb2USZfQ?*3 z&fIi{JyRXOzh~0pIMiFjOVQ3tTzc z&!k{Eb$z9oetE+wD`CZolHR&&89OgB9GKbrD4HQ8iJM`%@E7MJPv&V|%I=-QuvSEe z`9aeGG5cN1-go{HVu%s=@yI>>_ZbfRV%6^l?%7`Wwpk%1t^7+>{+|B~pRX4mcK#~8 Q4pg#wy85}Sb4q9e0A@#x#sB~S delta 1960 zcmdnTy^Vi@NGZx^prw85kH?(j9#r85lP9bN@+XWnf_7EbxddW?X?_ zwfUqO7}&i%T^vIy;@-|an|Iqvq-Acm-lvRMHjSVZ;RSb}PTZt3!S|Aa!}QuM?~1;j zluNJi>9U_Rcgr{S6-!)#7Fis2zU8OCZvFcB@MGua+aLc@|N8p+WGTz3pSrud4d*6F z?Dl=vTk*fWz1^_)&fU9f>;C+h_||{re5I@GAOHN>Q&k&#TKc~G_5afU?*>>~{I9ZX z{`%v`j$fajpMP?Y!FuU$?j!&I{QUeZCsy9^&xdM{Cm~+)MeGIg_uBWpy!T|M*)(4B zn{EuEbF4a|A6;J`zk2rU`q^i1O0kK@?9q?kms6C#LRL+AeVO2v2`7Rx`A+TJ{_Zi` z-D$k6k1y|JD0%hjRo0pLLP8=RPhNNUn}2^_?zymJkAAfdwjY0ge~;)dThd?<=<(%( zZOoextJdqKCAlUH>h+61v;&IJpcFj=Y`0s-&Pj?*ITsBH2yX{S>jL1TxS`Z?)29`=lwdkH8Ekk`=0(+ zF9K}$i>;r2X{B>18?(Y!j>@SUA6(w3`13}_^*t_2f}UhN{P(XeM#|*&%hL+aX7mS` z@w}VSKcDG~oYPkm??h{B^B+EbOD#jr)o!hy z_6n94j)%7Io8NrEkjdd3gM#o2+oB^kb%Z-A*8TSM*}7VF+x?p?*AyNK9=Ur*Tj0=d zoriaJ_AsLvh%uqY^z z*H2S6N>#WT-t~jyz-ov0N zaXn~7-vzaIAF5f(f}UCnI=l%1C ztwZMIAR`7HU7x&w=_a>CR=yAptk0U>AjiBxzG2D)1;gso$K#o=-?ZtFzJ6y%bbH2> zolEQlWtfln?=5cWd?0ur{qH5ggmo8oewu50K%{W*Q)S7f-y2PAni;2k;1E9iVNyZ< zyo0;zryTKr%gHA>S7lC1&zEW8t_@)}A^JO`uP?aX@;pvpf7#*X9*V(6k1e17x+LiE zByCfM?tNnh{SR{T8}CUU+9|!AjZ?Qq(nE4V>lDUmV)EPAEJ7bT)>~Xs+PD69pG&#P zhqW?C84fca+s|QjMC#xA!$E@IRg42!9dtvy6Yi`CI9~PDnO1 zp6?85+Locrm)P_+pK-6+gQIuf_PI~HlU{E7dGG1$`^jBXIK4LCW9^%A>zjb@hQDeP z+Mlv%vX)vFHM0fRr^@$Us(w*Bo#kWX!xn>S4gP!Cx#TF&*KgJ*wU)j$y zN8W~s=XjpZDi^gEk)Qn<@2CYd?XZyJT*O#q(Z%>chVzqxT~gNPr-!Un8s%Wpp;|A^|ns4WZ(3=E#GelF{r5}E)r1e>A& From d091a4613ea5fdebb8baa69dc5655eb43fe920df Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Wed, 29 Nov 2023 13:06:40 -0500 Subject: [PATCH 21/24] Fix how boat tileset builds by using the correct greys lol --- gfx/tilesets/seagallop_port.png | Bin 1470 -> 2050 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/tilesets/seagallop_port.png b/gfx/tilesets/seagallop_port.png index 4f5a28f9a6ee0a3da289ce779bd87a3a6b49be4e..0a67113e67930e26e9936b33821df9edf9f320ee 100644 GIT binary patch delta 1962 zcmdnT-6SwUMTsTd(btiIVPik{pF~y$1_sUokH}&M2EHR8%s5q>PkN%FZ#`R*x4R3& ze-K=-cll%n26him7srr_xVN*~-yZ#ygKPkE-9FK7Fd%{NcwBkD>=Zf9_nezy818%ayP4^YioT{`?61wE54U zpP$n%xivo zn!)>@?0)t7S5-MTi@qM4zcPGYp*UmQO_{aXDgV~UKkZpx>7g9w{yXf}t}AUDTl%ZL z8yDrQl<4}i{+!aK=ym7T$M3g$bMENW{GH`DS_QwG|6C*gq9mm!EULNc*fonY>}M)h zL~GTbdLzQn`|kaF?|+jfEa>pBW4X1Pp=cFLn}$H{4vq5p>2FQ?Ze6=1cJEqXBqu}O zKlg`UW8PaP=GUlC{Qh(CX5-`4)xWZ3jvv1^W9yc-?a4Y@pU(Su`mfN&rn2{kbDHbYT)#p?@#5?{|G!ADbIHznS+V3&W>K28L9wCb2Dt&HU$9=+O^mJ7ceO_y?1-J_44^b zrXxS^CW!5L<{Hq?lwrA&J*j6NL(Ha`n{4kh8VOeat-Txh|J8fOE!u*=r!Wc}?AuYF zVHsj}_E96lyD5Sj(p4B74plR(`P(*iU!Hl2lGWy~_iNZs9rQ{Lm?J$$!?`exXHTGo zt-yrStkQdx)-nWDFYV}`aK?J}u>%Wvz6r^n;(XvJAZf{H@%?115!a5_PRN}! z^Oq3A#UCE}3aqaru_A%_^Fy;XC7so67swuhqZL_V4Vq#0fvn zJe|_f-PgFOeyYXsdyZku>8aU$8w4}jdxdJ z|67}-!JXde!TyZN#_ZWIJLm5e?%~?Q#;G3fa_t)bT!zgLI4qOTZ!fis?Y3m?u>W3u=vy7z_vQ`($a7KJSnDe)tVZp)uKRUjye^_sE{N`dMM-h)hm0Vm6 zk}u?s-;b`bU^%dqi~rY^$LHQPE)cqPvSr%ibW3jr9pNedjLR$9>Pss^Tn?7@7epGI z5n|4Hub`oRAoNe=A6rFkCVqyei)WbbslVo~ zhF`0%=}1V3>vzPtewgQGU46BG-D1}_=WEx;=lV&^ES~nF|M2$4J?vNJOmU1}ca15k zbbjwWt1b6z6JzFmtU9OM7hnBbzl;Crf7S|to_Q=T%X!wgX2m$%xn-jAHM8PZH0ZiF#3^xynrR`5Rk-qcDFgT>)28mdKI;Vst0M3%RtpET3 delta 1353 zcmZn?*vCCVWum9oL=}OFlLhNpB|TjnLn`LHopUqqi4~8_-^rEdpR@ivwC8SP(`mPz zvqZ#o_a0%h@H;+xR%yr*tCKSJ_V)j`{`m33qBUoAzx?sSaviC+w=OgfB=KYVJgymqXv!05x)X=`pCSMK~KWRP8>@$dTe>6-KE zU7q}$_T%k8C6mJ{$rF+%sb{}`>i$mk_RD>9IszTk~7cZ@;Od=;L(0h+Jp24uE z>&K)Wl8ZKHOx&Pwfr<4DL&N6#vrdY#KiK5*d=6vBHT$(ICr;2SZ;RNRX3Z5+S5$TjPo^$euUey!H(2G0s(isvss%A$RzcXC3 z=YvlFvAbVy)U%|uq|b71d47FQ%*u2Bx~@hiRWTHJI{g01u;EBLL&Tm8{tJ8KCcSe! z5S9~JXI9{FOKtOdrGF>Zytia9YZPM$6u;ndo+)7NUvu^YvlAc9C|P%!!_{<)$`z=BW$? z8JyEv!rpf(ge06WYvgHAuMaxEZ?W;tsy`u2Cf;=_40GN{o==ik)X4B)hlz%X;@V&L zZo8*_c=7S}a|Rx#V~lB~x99kHugUV9!Pvje=@Y|-U6t$8@);dA*R3{oeFkB?X2sX6wU@ zVT}T84vz$T#m}9Xs+UmvA+@)g@j>A^Jw|N>4#o+*BAKc@+D!9>OS#^0hB0nf!r61< zZ+u7B?h~dQ4Pks*rw_d4`w-rmANaG9vHt&qc6)_KY8!;28Gg)fYVZEg)%fi^Lxpy8 zMvf+9zuyyWw%v`PTrMuYKH7V-3#4u9*bl5*dd=EZq~Xn({NJM6>aR1u`P1+;cJX!Y zGX)Ky3QOv>e{{((Tsjk~^yxRlVc!K2^`cF2o14!i&Hb!%eDQl_ZpV~u?$QS&3$L?m ztJkU*aM7$2Yg~PN?dNoc0-5Lk4;+kUJ16%48N(+fW=8$WHTRbsWZ8eKFgJ60A)~KD zOXtz^JDSB48GbC8SXAID&oJkyHsb@fOS+62`z#Kz9<*T5VCw35RLu}#Z~JCy|K-iq z3^4*Wat%3i(;4 zl@u><Xg5}ipm1g?o4X3Px6)Q@5>#k+&yvT51X78hDhL9v~hUvmzoR2)2r*$d2 zcM8K=5gq0SO$RK+>~}4D-}y&~Ax7ZGBlq;*XE^MOzaO|~d*Rz=g_N}NFID+_{xf{O XUVPa3tMobs1_lOCS3j3^P6 Date: Wed, 29 Nov 2023 23:09:20 +0000 Subject: [PATCH 22/24] Updating the credits Added a few more names from the README into the in-game credits, and used the original draft of the ending theme to extend the music. --- README.md | 2 +- constants/credits_constants.asm | 10 + crysaudio/music/RBY/credits.asm | 408 ++++++++++++++++++++++++++++++ data/credits/credits_mons.asm | 1 + data/credits/credits_order.asm | 10 +- data/credits/credits_text.asm | 30 +++ data/maps/objects/RedsHouse2F.asm | 4 +- layout.link | 2 +- 8 files changed, 460 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 355c4bb0..187d61cb 100644 --- a/README.md +++ b/README.md @@ -381,7 +381,7 @@ If you use our implementations of anything at all, it is encouraged to submit Pu * Chatot4444 - Assisting with gym scaling code. * Enigami - Reworking the Battle Tent's RestoreTeam code to make it work properly. * LadyMisticus - Made a well-documented spreadsheet for the hack that details every Pokemon's stats, movepools and locations, plus more! -* Ness the Unexplained - Helped with writing NPC dialogue and PokΓ©dex entries for new PokΓ©mon such as Gyopin. +* HeadBoiSkye - Helped with writing NPC dialogue and PokΓ©dex entries for new PokΓ©mon such as Gyopin. * ZumiIsawhat? - Restorations of prototype OST. * FrenchOrange - Reconstructions of various overworld prototype sprites. * Helix Chamber, RacieBeep, loumilouminosus, Orchid, GBCRetro, & catstorm26 - Prototype PokΓ©mon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png). diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index ad25c7ed..a5e2c584 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -73,17 +73,27 @@ const CRED_ALBA const CRED_HELIX const CRED_FO + const CRED_ZETA const CRED_PS_DEVS const CRED_AUS const CRED_PAUL const CRED_DUO + const CRED_KEP_MUSIC + const CRED_LUCI + const CRED_ZUMI + const CRED_BGVC const CRED_KEP_THANKS const CRED_FRRF + const CRED_MISTY + const CRED_THORNAVERY const CRED_DANNYE const CRED_EROSUNICA + const CRED_BLUEZANGOOSE + const CRED_SKYE const CRED_CHATOT const CRED_ENI const CRED_VORT + const CRED_PRET DEF NUM_CRED_STRINGS EQU const_value const_def -1, -1 diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 5abc11a3..79b1bfd6 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -287,6 +287,196 @@ Music_RBYCredits_Ch1:: note A_, 1 note_type 12, 11, 1 note A_, 8 +;; P1-5 + note_type 12, 12, 3 + octave 3 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 +;; P1-6 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 +;; P1-7 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 +;; P1-8 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 + note F#, 1 + rest 1 + note D_, 1 + rest 1 + note F#, 1 + rest 1 +;; P1-9 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 + note G_, 1 + rest 1 + note D_, 1 + rest 1 + note G_, 1 + rest 1 +;; P1-10 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note E_, 1 + rest 1 + note A_, 1 + rest 1 +;; P1-11 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note F#, 1 + rest 1 + note B_, 1 + rest 1 +;; P1-12 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 + note A_, 1 + rest 1 + note D_, 1 + rest 1 + note A_, 1 + rest 1 +;; P1-13 + note D_, 1 + rest 5 + note D_, 1 + rest 5 + note D_, 1 + rest 3 +;; P1-14 + note E_, 1 + rest 5 + note E_, 1 + rest 5 + note E_, 1 + rest 3 +;; P1-15 + note F#, 1 + rest 5 + note F#, 1 + rest 5 + note F#, 1 + rest 3 +;; P1-16 + note D_, 1 + rest 5 + note D_, 1 + rest 5 + note F#, 4 +;; P1-1 + note_type 12, 12, 3 + octave 4 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note E_, 6 + note C_, 1 + note E_, 1 +;; P1-2 + note F_, 6 + note D_, 1 + note F_, 1 + note G_, 1 + rest 3 + note A#, 1 + rest 2 + note A#, 1 +;; P1-3 + note B_, 16 +;; P1-4 + note G_, 1 + rest 15 sound_ret @@ -577,6 +767,110 @@ Music_RBYCredits_Ch2:: note A_, 1 note_type 12, 12, 1 note A_, 8 +;; P2-5 + note_type 12, 13, 3 + octave 3 + note G_, 1 + rest 5 + note G_, 1 + rest 5 + note G_, 1 + rest 3 +;; P2-6 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 2 + octave 4 + note C_, 1 +;; P2-7 + octave 3 + note B_, 12 + rest 3 + octave 4 + note C_, 1 +;; P2-8 + octave 3 + note B_, 6 + rest 1 + octave 4 + note C_, 1 + note D_, 6 + rest 1 + note C_, 1 +;; P2-9 + note D_, 12 + rest 3 + note C_, 1 +;; P2-10 + note E_, 12 + rest 3 + note E_, 1 +;; P2-11 + note F#, 12 + rest 3 + note E_, 1 +;; P2-12 + note F#, 6 + rest 1 + note G_, 1 + note A_, 8 +;; P2-13 + octave 3 + note G_, 1 + rest 5 + note G_, 1 + rest 5 + note G_, 1 + rest 3 +;; P2-14 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P2-15 + note B_, 1 + rest 5 + note B_, 1 + rest 5 + note B_, 1 + rest 3 +;; P2-16 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P2-1 + note_type 12, 13, 3 + octave 4 + note G_, 6 + note D_, 1 + note G_, 1 + note A_, 6 + note F_, 1 + note A_, 1 +;; P2-2 + note A#, 6 + note G_, 1 + note A#, 1 + octave 5 + note C_, 1 + rest 3 + note D#, 1 + rest 2 + note D#, 1 +;; P2-3 + note G_, 16 +;; P2-4 + note G_, 1 + rest 11 + octave 3 sound_ret @@ -721,6 +1015,120 @@ Music_RBYCredits_Ch3:: note A_, 1 note A_, 1 rest 7 +;; P3-5 + note_type 12, 1, 0 + octave 4 + note G_, 1 + rest 5 + note G_, 1 + rest 5 + note G_, 1 + rest 3 +;; P3-6 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-7 + note B_, 1 + rest 5 + note B_, 1 + rest 5 + note B_, 1 + rest 3 +;; P3-8 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-9 + note G_, 1 + rest 5 + note G_, 1 + rest 5 + note G_, 1 + rest 3 +;; P3-10 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-11 + note B_, 1 + rest 5 + note B_, 1 + rest 5 + note B_, 1 + rest 3 +;; P3-12 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-13 + note G_, 1 + rest 5 + note G_, 1 + rest 5 + note G_, 1 + rest 3 +;; P3-14 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-15 + note B_, 1 + rest 5 + note B_, 1 + rest 5 + note B_, 1 + rest 3 +;; P3-16 + note A_, 1 + rest 5 + note A_, 1 + rest 5 + note A_, 1 + rest 3 +;; P3-1 + note_type 12, 1, 0 + octave 4 + note B_, 6 + note G_, 1 + note B_, 1 + octave 5 + note C_, 6 + octave 4 + note A_, 1 + octave 5 + note C_, 1 +;; P3-2 + note D_, 6 + octave 4 + note A#, 1 + octave 5 + note D_, 1 + note E_, 1 + rest 3 + note G_, 1 + rest 2 + note G_, 1 +;; P3-3 + note G_, 16 +;; P3-4 + note G_, 1 + rest 15 sound_ret Music_RBYCredits_branch_7ffa4:: diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index bbee279e..8eee261f 100644 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -15,6 +15,7 @@ CreditsMons: db VENUSAUR db CHARIZARD db TOTARTLE + db UMBREON db OMEGADGE db ARTICUNO_G db ZAPDOS_G diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index 5111e50d..1ef3f2f1 100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -38,9 +38,13 @@ CreditsOrder: db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON db CRED_KEP_STAFF, CRED_TEXT_FADE db CRED_KEP_DEVS, CRED_PVK, CRED_MAH, CRED_EMA, CRED_TEXT_FADE_MON - db CRED_KEP_SPRITES, CRED_ALBA, CRED_HELIX, CRED_FO, CRED_TEXT_FADE_MON + db CRED_KEP_SPRITES, CRED_ALBA, CRED_HELIX, CRED_FO, CRED_TEXT_FADE + db CRED_KEP_SPRITES, CRED_ZETA, CRED_PVK, CRED_MAH, CRED_TEXT_FADE_MON db CRED_PS_DEVS, CRED_AUS, CRED_PAUL, CRED_DUO, CRED_TEXT_FADE_MON - db CRED_KEP_THANKS, CRED_FRRF, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE - db CRED_KEP_THANKS, CRED_CHATOT, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON + db CRED_KEP_MUSIC, CRED_LUCI, CRED_ZUMI, CRED_BGVC, CRED_TEXT_FADE_MON + db CRED_KEP_THANKS, CRED_FRRF, CRED_MISTY, CRED_THORNAVERY, CRED_TEXT_FADE + db CRED_KEP_THANKS, CRED_PRET, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE + db CRED_KEP_THANKS, CRED_SKYE, CRED_BLUEZANGOOSE, CRED_CHATOT, CRED_TEXT_FADE + db CRED_KEP_THANKS, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON db CRED_COPYRIGHT, CRED_TEXT_FADE_MON db CRED_THE_END diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index 1f0e4dd3..248f00e0 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -74,17 +74,27 @@ CreditsTextPointers: dw CredAlba dw CredHelix dw CredFO + dw CredZetaNull dw CredPSDevs dw CredAus dw CredPaul dw CredDuo + dw CredKEPMusic + dw CredLuci + dw CredZumi + dw CredBGVC dw CredKEPThanks dw CredFrrf + dw CredMisty + dw CredThornAvery dw CredDannye dw CredEro + dw CredBlueZangoose + dw CredSkye dw CredChatot dw CredEni dw CredVort + dw CredPret assert_table_length NUM_CRED_STRINGS CredVersion: @@ -233,6 +243,8 @@ CredHelix: db -6, "HELIX CHAMBER@" CredFO: db -6, "FRENCH ORANGE@" +CredZetaNull: + db -4, "ZETA-NULL@" CredPSDevs: db -5, "SHOWDOWN MOD@" CredAus: @@ -241,17 +253,35 @@ CredPaul: db -4, "PAULLUXX@" CredDuo: db -2, "DUOM2@" +CredKEPMusic: + db -4, "KEP MUSIC@" +CredLuci: + db -4, "LUCISHRIMP@" +CredZumi: + db -5, "ZUMIISAWHAT?@" +CredBGVC: + db -2, "BGVC@" CredKEPThanks: db -6, "SPECIAL THANKS@" CredFrrf: db -2, "FRRF@" +CredMisty: + db -5, "LADYMISTICUS@" +CredThornAvery: + db -4, "THORNAVERY@" CredDannye: db -4, "DANNYE33@" CredEro: db -4, "EROSUNICA@" +CredBlueZangoose: + db -5, "BLUEZANGOOSE@" +CredSkye: + db -5, "HEADBOISKYE@" CredChatot: db -4, "CHATOT4444@" CredEni: db -3, "ENIGAMI@" CredVort: db -3, "VORTIENE@" +CredPret: + db -4, "PRET ET AL@" diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index ffe0315a..de0c4f76 100644 --- a/data/maps/objects/RedsHouse2F.asm +++ b/data/maps/objects/RedsHouse2F.asm @@ -8,11 +8,11 @@ RedsHouse2F_Object: ;warp_event 5, 1, ROCKET_HIDEOUT_B4F, 2 ; - Test Giovanni 1 ;warp_event 5, 1, MT_MOON_SQUARE, 1 ; - Test Shop, NPCs, and Crater ;warp_event 5, 1, CELESTE_HILL, 1 ; - Test GMolt - ;warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup + warp_event 5, 1, HALL_OF_FAME, 1 ; Test post-game setup ;warp_event 5, 1, GARNET_CAVERN_B1F, 1 ; Test GCuno ;warp_event 5, 1, FARAWAY_ISLAND_INSIDE, 1 ; Test Mew ;warp_event 5, 1, GIOVANNIS_ROOM, 1 ; Test spinner tiles - warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils + ;warp_event 5, 1, CINNABAR_LAB_FOSSIL_ROOM, 1 ; Test new tileset and fossils def_bg_events diff --git a/layout.link b/layout.link index 4c70ee45..70f04037 100644 --- a/layout.link +++ b/layout.link @@ -140,12 +140,12 @@ ROMX $1D "Maps 19" "Itemfinder 1" "Maps 20" - "Vending Machine" "Maps 21" "Itemfinder 2" ROMX $1E "bank1E" ROMX $1F + "Vending Machine" "Sound Effect Headers 3" ; "Music Headers 3" "Sound Effects 3" From 0fc225bbe8a61bf21862a8fe508925aad34f915c Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Wed, 29 Nov 2023 23:43:15 +0000 Subject: [PATCH 23/24] Update credits.asm oops, missed a few notes --- crysaudio/music/RBY/credits.asm | 156 +++++++++++--------------------- 1 file changed, 53 insertions(+), 103 deletions(-) diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 79b1bfd6..2578b6c8 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -1,10 +1,10 @@ -Music_RBYCredits:: +Music_RBYCredits: channel_count 3 channel 1, Music_RBYCredits_Ch1 channel 2, Music_RBYCredits_Ch2 channel 3, Music_RBYCredits_Ch3 -Music_RBYCredits_Ch1:: +Music_RBYCredits_Ch1: tempo 140 volume 7, 7 duty_cycle 3 @@ -163,7 +163,7 @@ Music_RBYCredits_Ch1:: note F#, 2 note G_, 2 note A_, 2 - note_type 12, 9, 0 + note_type 12, 9, 8 note G_, 8 note F#, 8 note E_, 8 @@ -175,7 +175,7 @@ Music_RBYCredits_Ch1:: note E_, 6 note D#, 1 note D_, 1 - note_type 12, 10, 0 + note_type 12, 10, 8 note C#, 8 note_type 12, 10, 7 note C#, 8 @@ -185,7 +185,7 @@ Music_RBYCredits_Ch1:: note E_, 6 note C#, 1 note E_, 1 - note_type 12, 10, 0 + note_type 12, 10, 8 note A_, 8 note_type 12, 10, 7 note A_, 8 @@ -198,7 +198,7 @@ Music_RBYCredits_Ch1:: note G_, 8 note F#, 4 note G#, 4 - note_type 12, 9, 0 + note_type 12, 9, 8 note A_, 8 note F#, 8 note E_, 8 @@ -210,12 +210,12 @@ Music_RBYCredits_Ch1:: note B_, 8 octave 3 note D_, 8 - note_type 12, 9, 0 + note_type 12, 9, 8 note E_, 8 note D_, 8 note F#, 8 note E_, 8 - note_type 12, 10, 0 + note_type 12, 10, 8 note D_, 8 note E_, 8 note D_, 8 @@ -224,7 +224,6 @@ Music_RBYCredits_Ch1:: note F_, 8 note E_, 8 note D_, 8 - note_type 12, 10, 0 note C#, 6 note_type 12, 10, 7 note C#, 6 @@ -234,13 +233,13 @@ Music_RBYCredits_Ch1:: note G_, 6 note F#, 1 note F_, 1 - note_type 12, 10, 0 + note_type 12, 10, 8 note E_, 6 note_type 12, 10, 7 note E_, 6 note_type 12, 11, 7 note D_, 4 - note_type 12, 10, 0 + note_type 12, 10, 8 note C#, 8 note_type 12, 10, 7 note C#, 8 @@ -261,7 +260,7 @@ Music_RBYCredits_Ch1:: note C#, 4 note E_, 4 note F#, 4 - note_type 12, 10, 0 + note_type 12, 10, 8 note E_, 6 note_type 12, 11, 7 note D_, 2 @@ -271,7 +270,7 @@ Music_RBYCredits_Ch1:: note F#, 4 note A_, 4 note B_, 4 - note_type 12, 10, 0 + note_type 12, 10, 8 octave 4 note C#, 16 note C#, 8 @@ -286,10 +285,10 @@ Music_RBYCredits_Ch1:: note A_, 1 note A_, 1 note_type 12, 11, 1 - note A_, 8 -;; P1-5 + note A_, 4 + note D_, 1 + rest 3 note_type 12, 12, 3 - octave 3 note D_, 1 rest 1 note G_, 1 @@ -306,7 +305,6 @@ Music_RBYCredits_Ch1:: rest 1 note G_, 1 rest 1 -;; P1-6 note E_, 1 rest 1 note A_, 1 @@ -323,7 +321,6 @@ Music_RBYCredits_Ch1:: rest 1 note A_, 1 rest 1 -;; P1-7 note F#, 1 rest 1 note F#, 1 @@ -340,7 +337,6 @@ Music_RBYCredits_Ch1:: rest 1 note F#, 1 rest 1 -;; P1-8 note D_, 1 rest 1 note F#, 1 @@ -357,7 +353,6 @@ Music_RBYCredits_Ch1:: rest 1 note F#, 1 rest 1 -;; P1-9 note D_, 1 rest 1 note G_, 1 @@ -374,7 +369,6 @@ Music_RBYCredits_Ch1:: rest 1 note G_, 1 rest 1 -;; P1-10 note E_, 1 rest 1 note A_, 1 @@ -391,7 +385,6 @@ Music_RBYCredits_Ch1:: rest 1 note A_, 1 rest 1 -;; P1-11 note F#, 1 rest 1 note B_, 1 @@ -408,7 +401,6 @@ Music_RBYCredits_Ch1:: rest 1 note B_, 1 rest 1 -;; P1-12 note D_, 1 rest 1 note A_, 1 @@ -425,35 +417,29 @@ Music_RBYCredits_Ch1:: rest 1 note A_, 1 rest 1 -;; P1-13 note D_, 1 rest 5 note D_, 1 rest 5 note D_, 1 rest 3 -;; P1-14 note E_, 1 rest 5 note E_, 1 rest 5 note E_, 1 rest 3 -;; P1-15 note F#, 1 rest 5 note F#, 1 rest 5 note F#, 1 rest 3 -;; P1-16 note D_, 1 rest 5 note D_, 1 rest 5 note F#, 4 -;; P1-1 - note_type 12, 12, 3 octave 4 note D_, 6 octave 3 @@ -463,7 +449,6 @@ Music_RBYCredits_Ch1:: note E_, 6 note C_, 1 note E_, 1 -;; P1-2 note F_, 6 note D_, 1 note F_, 1 @@ -472,15 +457,12 @@ Music_RBYCredits_Ch1:: note A#, 1 rest 2 note A#, 1 -;; P1-3 note B_, 16 -;; P1-4 note G_, 1 rest 15 sound_ret - -Music_RBYCredits_Ch2:: +Music_RBYCredits_Ch2: duty_cycle 3 vibrato 10, 2, 5 note_type 12, 12, 5 @@ -555,7 +537,7 @@ Music_RBYCredits_Ch2:: octave 3 note A_, 6 note E_, 2 - note_type 12, 11, 0 + note_type 12, 11, 8 octave 4 note C#, 8 note_type 12, 12, 7 @@ -568,13 +550,13 @@ Music_RBYCredits_Ch2:: note G_, 6 note D_, 2 note B_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 octave 4 note C#, 6 note_type 12, 11, 7 note C#, 6 note D_, 4 - note_type 12, 10, 0 + note_type 12, 10, 8 note E_, 8 note_type 12, 10, 7 note E_, 8 @@ -588,7 +570,7 @@ Music_RBYCredits_Ch2:: note G_, 6 note D_, 2 note B_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 octave 4 note E_, 7 note_type 12, 11, 7 @@ -596,7 +578,7 @@ Music_RBYCredits_Ch2:: note_type 12, 12, 3 note E_, 1 note G#, 1 - note_type 12, 11, 0 + note_type 12, 11, 8 note A_, 8 note_type 12, 11, 7 note A_, 8 @@ -605,16 +587,16 @@ Music_RBYCredits_Ch2:: note F#, 4 note E_, 4 note D_, 4 - note_type 12, 10, 0 + note_type 12, 10, 8 note C#, 8 note_type 12, 10, 7 note C#, 8 - note_type 12, 9, 0 + note_type 12, 9, 8 octave 3 note A_, 8 note_type 12, 9, 7 note A_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note E_, 8 note_type 12, 11, 7 note E_, 8 @@ -628,11 +610,11 @@ Music_RBYCredits_Ch2:: note G_, 6 note F#, 1 note F_, 1 - note_type 12, 11, 0 + note_type 12, 11, 8 note E_, 8 note_type 12, 11, 7 note E_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note D_, 8 note_type 12, 11, 7 note D_, 8 @@ -647,12 +629,12 @@ Music_RBYCredits_Ch2:: note B_, 6 note G_, 1 note B_, 1 - note_type 12, 11, 0 + note_type 12, 11, 8 octave 4 note C#, 8 note_type 12, 11, 7 note C#, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note D_, 8 note_type 12, 11, 7 note D_, 8 @@ -665,18 +647,18 @@ Music_RBYCredits_Ch2:: note B_, 1 octave 4 note D_, 1 - note_type 12, 11, 0 + note_type 12, 11, 8 note C#, 6 note_type 12, 11, 7 note C#, 6 note_type 12, 12, 7 octave 3 note B_, 4 - note_type 12, 11, 0 + note_type 12, 11, 8 note A_, 8 note_type 12, 11, 7 note A_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note F#, 6 note_type 12, 11, 7 note F#, 6 @@ -684,7 +666,7 @@ Music_RBYCredits_Ch2:: note G#, 4 note A_, 8 note F#, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note G#, 6 note_type 12, 11, 7 note G#, 6 @@ -692,7 +674,7 @@ Music_RBYCredits_Ch2:: note A_, 4 note B_, 8 note G#, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note A_, 6 note_type 12, 11, 7 note A_, 6 @@ -702,24 +684,23 @@ Music_RBYCredits_Ch2:: note C_, 8 octave 3 note A_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note B_, 6 note_type 12, 11, 7 note B_, 6 note_type 12, 12, 7 octave 4 note C_, 4 - note_type 12, 11, 0 + note_type 12, 11, 8 note D_, 8 octave 3 note B_, 8 - note_type 12, 11, 0 octave 4 note C#, 16 note C#, 8 note_type 12, 11, 7 note C#, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 octave 3 note A_, 16 note A_, 8 @@ -754,9 +735,9 @@ Music_RBYCredits_Ch2:: octave 4 note D_, 2 note G_, 8 - note_type 12, 11, 0 + note_type 12, 11, 8 note A_, 16 - note_type 12, 10, 0 + note_type 12, 10, 8 note A_, 8 note_type 12, 10, 7 note A_, 8 @@ -765,18 +746,19 @@ Music_RBYCredits_Ch2:: note A_, 4 note A_, 1 note A_, 1 - note_type 12, 12, 1 - note A_, 8 -;; P2-5 - note_type 12, 13, 3 + note A_, 4 octave 3 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note_type 12, 13, 3 note G_, 1 rest 5 note G_, 1 rest 5 note G_, 1 rest 3 -;; P2-6 note A_, 1 rest 5 note A_, 1 @@ -785,13 +767,11 @@ Music_RBYCredits_Ch2:: rest 2 octave 4 note C_, 1 -;; P2-7 octave 3 note B_, 12 rest 3 octave 4 note C_, 1 -;; P2-8 octave 3 note B_, 6 rest 1 @@ -800,24 +780,19 @@ Music_RBYCredits_Ch2:: note D_, 6 rest 1 note C_, 1 -;; P2-9 note D_, 12 rest 3 note C_, 1 -;; P2-10 note E_, 12 rest 3 note E_, 1 -;; P2-11 note F#, 12 rest 3 note E_, 1 -;; P2-12 note F#, 6 rest 1 note G_, 1 note A_, 8 -;; P2-13 octave 3 note G_, 1 rest 5 @@ -825,29 +800,24 @@ Music_RBYCredits_Ch2:: rest 5 note G_, 1 rest 3 -;; P2-14 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P2-15 note B_, 1 rest 5 note B_, 1 rest 5 note B_, 1 rest 3 -;; P2-16 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P2-1 - note_type 12, 13, 3 octave 4 note G_, 6 note D_, 1 @@ -855,7 +825,6 @@ Music_RBYCredits_Ch2:: note A_, 6 note F_, 1 note A_, 1 -;; P2-2 note A#, 6 note G_, 1 note A#, 1 @@ -865,16 +834,13 @@ Music_RBYCredits_Ch2:: note D#, 1 rest 2 note D#, 1 -;; P2-3 note G_, 16 -;; P2-4 note G_, 1 rest 11 octave 3 sound_ret - -Music_RBYCredits_Ch3:: +Music_RBYCredits_Ch3: note_type 12, 1, 0 octave 5 note C#, 6 @@ -1015,7 +981,6 @@ Music_RBYCredits_Ch3:: note A_, 1 note A_, 1 rest 7 -;; P3-5 note_type 12, 1, 0 octave 4 note G_, 1 @@ -1024,84 +989,72 @@ Music_RBYCredits_Ch3:: rest 5 note G_, 1 rest 3 -;; P3-6 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-7 note B_, 1 rest 5 note B_, 1 rest 5 note B_, 1 rest 3 -;; P3-8 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-9 note G_, 1 rest 5 note G_, 1 rest 5 note G_, 1 rest 3 -;; P3-10 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-11 note B_, 1 rest 5 note B_, 1 rest 5 note B_, 1 rest 3 -;; P3-12 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-13 note G_, 1 rest 5 note G_, 1 rest 5 note G_, 1 rest 3 -;; P3-14 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-15 note B_, 1 rest 5 note B_, 1 rest 5 note B_, 1 rest 3 -;; P3-16 note A_, 1 rest 5 note A_, 1 rest 5 note A_, 1 rest 3 -;; P3-1 note_type 12, 1, 0 octave 4 note B_, 6 @@ -1113,7 +1066,6 @@ Music_RBYCredits_Ch3:: note A_, 1 octave 5 note C_, 1 -;; P3-2 note D_, 6 octave 4 note A#, 1 @@ -1124,14 +1076,12 @@ Music_RBYCredits_Ch3:: note G_, 1 rest 2 note G_, 1 -;; P3-3 note G_, 16 -;; P3-4 note G_, 1 rest 15 sound_ret -Music_RBYCredits_branch_7ffa4:: +Music_RBYCredits_branch_7ffa4: octave 4 note E_, 2 note A_, 2 @@ -1143,7 +1093,7 @@ Music_RBYCredits_branch_7ffa4:: note A_, 2 sound_ret -Music_RBYCredits_branch_7ffae:: +Music_RBYCredits_branch_7ffae: octave 4 note D_, 2 note G_, 2 @@ -1155,7 +1105,7 @@ Music_RBYCredits_branch_7ffae:: note G_, 2 sound_ret -Music_RBYCredits_branch_7ffb8:: +Music_RBYCredits_branch_7ffb8: note G_, 2 note B_, 2 note G_, 2 @@ -1166,7 +1116,7 @@ Music_RBYCredits_branch_7ffb8:: note B_, 2 sound_ret -Music_RBYCredits_branch_7ffc1:: +Music_RBYCredits_branch_7ffc1: octave 4 note A_, 2 octave 5 @@ -1185,7 +1135,7 @@ Music_RBYCredits_branch_7ffc1:: note C#, 2 sound_ret -Music_RBYCredits_branch_7ffd2:: +Music_RBYCredits_branch_7ffd2: note D_, 2 note A_, 2 note D_, 2 @@ -1196,7 +1146,7 @@ Music_RBYCredits_branch_7ffd2:: note A_, 2 sound_ret -Music_RBYCredits_branch_7ffdb:: +Music_RBYCredits_branch_7ffdb: note E_, 2 note G#, 2 note E_, 2 @@ -1207,7 +1157,7 @@ Music_RBYCredits_branch_7ffdb:: note G#, 2 sound_ret -Music_RBYCredits_branch_7ffe4:: +Music_RBYCredits_branch_7ffe4: note E_, 2 note B_, 2 note E_, 2 @@ -1218,7 +1168,7 @@ Music_RBYCredits_branch_7ffe4:: note B_, 2 sound_ret -Music_RBYCredits_branch_7ffed:: +Music_RBYCredits_branch_7ffed: note A_, 1 rest 1 note A_, 1 From 7c0fc9d304e4c8e57363a06bcb9e2a585f4d3cfa Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Thu, 30 Nov 2023 08:23:35 -0500 Subject: [PATCH 24/24] Am I allowed to just fix the Porygon sprite by redoing it entirely lol --- gfx/pokemon/front/porygon.png | Bin 746 -> 1094 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index 8e5b3f5e7274202bb7fb7330cb202195d2172c0b..68ec471b614b717ec1069ac2922b4eaeb85897e9 100644 GIT binary patch delta 758 zcmaFGdW>U&1Sba@0|P@i)6e#aiuwwi1s;*b3=DinK$vl=HlH*D0|Qf%x4R1ivvEsN z$HoFV#(Jhjo-U3d8P0EKaOd4N5MX_J@1ot3+7n^QB~54B;zL&^IWP-M*>UAv^^zAi zcK(fvyf-7h{`dB$Mg?Zm8#nLdnR7NZLBIca^3JQW4Haa@jV;lb`QCxNvE3U0Aq zrj)I8`5gR$L)hki)px;O&ZFKjSH$Gmymm9V&*)h1&Y#_Tru7-$i8$dsY|5+ozq}KB zyw!Q`&y)q*xHlYUvCOLf>7^j?Fwo}w!qvy7-#^mPvwD(ZrFNpqx)l|^?`G^z*`O}B zZ;z8r!lpS>eqWs1!7UhQu``0_L}|muiLI~ZF;2c5U2&!5bGE?s7K8a_yH2|@SBhtJ zb=IC_X_7H_S9>P7?s2VI*y5k{it)_C#d8(ixVWm`?oj$vd}LFj(3!;Tv+ENUum)dq ziOzp~?^#6mpFcjYFV5fSv}jgGAw;j=#-l?%#ebY4&KlUBHS!aYVrhBfG% zj8sF8(tY`)1N~k{o{IJwxHDG9iKNNZA5Ze>`M;U*znX*Ik_jGSQy&Ki$-L}rS7csO zfglK+nXCLsxSW z-(A`>>B_?SQ=FKjPP&I}H*1%v6x`9DytLxwV=XPvriwmxo2l%>QCn9whuQL U^*<41U|?YIboFyt=akR{0Ly1$;Q#;t delta 407 zcmX@c@rreV1Sb;%0|SG_&3(TnD(WjRC3(BMFfbdp6m>8#FmM)lL>4nJ@ErzW#^d=b zQZ^RIG1fD>dAc};Xq=yV$G3j~zHodrDQug^BYg_vqwyfIL@p;qxl2nDP$u@cGqoa71H1P9I>6mb_XSZ|D z;zO@w3&V3f4U%2vO;(6o^+}MGIY+hgQ?v%(lPydP7uxU0teR)fE_z$&GVhBku1nPx zI^R3Ra3PVwYp-