From ef62d0a43f55d70b244a478d906af4d8679aa6e3 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Mon, 20 Nov 2023 11:00:20 +0000 Subject: [PATCH] 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 zcmZXQOA>-G42E|;XVe*|^);hxVB<;(;itQvj4OB)J&b#gVju>Jrlh55zQ1YSo5%K^ zPD0q-LU>+Z(+dym*w@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 zcmV-r1)BQ7688#_BYyw~bV*G`2j>e84KXf4$zGNK000+sMObuGZ)S9NVRB^vM@&Re zPDdbiWpW@hE;Mn4q~QPn00?w&PDe*fL^A*Y002sWDIWj;00d`2O+f$vv5yP+QQ<^JEECCmnx z`CK(Yo&1Cs&80qD@w`Rz>~q{GXDYBi4Wa<9Qg}B$&9B6=e6qQq{OE75Ul!N3N5OwS zhb3fz0J8Wre}Cr)A!D(8l%1Nzvpy^Kh*x+7R2I0qgRiattBwFt;%PaiJjV8H=P#Jw z{scx7chwP+`8-kpQJ*UWtcY%j0BHH7B|Pe9m2iS;1yeajajf?0_*4N$+#|5rJ@{DM z1)%QG$cOY_wFBr5v^XjKNfq?s(<-(K3SaaV;3e_w-G6g8i|^UV=gKqXO!#JTsjyUj z0k3Oz-~wWLL))T! z9UJxO3gD6oU>UPJfO1DbB!F*6093@C^Ls^%ryK!ua8gR=_RbNY#HfghR){D*IR?G> zbkV4bCWzU=OW=w-1d4b`;$lo?M|E?pj{m4jpn|s&0J(c~a;-jJtA3A!dk6UC zR5*8tzuLcghj?@asNONMzS$ai_Hb^L0YwQqF|z*IrAF=Vp<4ke@x5_mbF7Zve*C5g#vrS3p+ztai&ztI0CEYq^xtUPrbt^{3sVI$2`u+Zszw$T7&3Zo|OJo0gy`+ zy??|-ApYtm$Z}sb$5;SlQdSM_3ITNTkL_MuT0vDVQ68m#C;)E|gj7VfOU@*m>}=|1 z#g8U8TbKx|1ki~)+J3Dq39jybqT(z@#wlti&&q;kJKXb8>|~7HIX1@@1=$63Vm}dk zjrQOVjsP~t5y0j+0@xf!0Gs0oU~?P+Y=4d;fX!k4DfnO?-2WN0^IyYu#%)~iBZB>K zvv&Uxz&^OG__yT2`@;M}$XWb-aNYto$64*o@#{6vbO7IAncpHL0*!CCsOZG{gz9L1 z6YIy2T?VPWGD(&1)XjGFD_JVP&iIu0s-3>Yx$UDvmcX+|&lyJl`SYCDsx+Qo)PMGh z0*GQqyoms!O=`XcSma2sELMhSB24md@#pqxmGZ>uaaLkSaWd{?@x9L}YefKLHnD-v1#5_6@d231YTL3(WdTRihqX-z_VYCtB!z9-tN&y>0BK=ngfKI*@M_%3WS$~y3 zX^TX*tO5|_MmA!nRY2jGEj%r;?gTeWbkwH$n)&G@M9*2$>h4y2qA`#KB4w0RiA-b_ nyBBvwd|UylShe_y-vP%zlu&4tLAyd+00000NkvXXu0mjf5!04K delta 2359 zcmV-73CQ;M3c(VPBYy#IX+uL$X=7sm04R}lk-JMmVHn1LUcyMlp@N782a5)UD2T?g z!9_yMAge`BUIH(NbCi(Qprt`*h+4W0{Rg!Mtp!0)1QBiR-Ij>c`)Oc=euwY8Kc4S< zUf%N@uty78(R5Bju~aeQk+6R;x#V}f;KoZoPC_Zo)MsL`D1RN-=N&dxZ$qkA=X-6J zdo^QfVCxp1)O4dFEYlEOujq=mh5NL8YE}49IB3X#!dFU9H~Cp{uF3C;jYNDF?5d|f z_lMJeSj!tl;Zfm0u~5~1=TTqc$&?o6r4Gs-!X!?FFn-chS))LOkkpc7*4{VP@Xb*c zk0x)O8iqJ>e00009aDPZya{vGi!~g&e!~vBn4jTXf z2YE?EK~#8N?OlP6<2neuuI~ST`MphbRCEf=U_04to0U%YHnuSgFyO?xcl+=A=g+^N z+wJzp{d#}8J;NWI6V0G#j{oz>Cwi!fvRSC|`~nS4JU+3)qq z@UuC8QGbyr2r2_3W$+nWA2}#;=1U}!z-4lMpk;P!&k@i{ZiHW^cNPTbG$s?r@%JhL zzL;`sJX5X$iDfq1(~pnr-;v*$%N&)-@_1wkm}PQzKI(91052q>or;D#096@`V~oaT z%g_qFF%V~DR&;MHG#X%48Gb4ORfOW$s4~$WjDM=xI8wO zWkE6`_sbOCg!?~g)@O8Ht)BrYVhUAP#o;4!e1NVjZ&|Wmm4KV6pa+JEvf`yG^!{~p{g5uExM&0IUw61ir+T>Ij>t(PYVUDWCtFgVC z!%<&NH-VX9D}!LvxXux(DhEd~7{iQ>kAL9w5&&6-R3Jo(u}tbH>z$*NoQUpN&%pFq zX%E{g8}F0=b&s#?NRdSw&d+L#s=yJ{h&@SHXVv+YEsBh7PFFV-=WO1c0Y-yhTeqSF zC_zwBGzKfy{K$C4A=VK4zpF+IvGjVZpl<~y&(unAT<-xCluj~74cd;n($~N}Xn$!` z<_JxW?xg~$%2(%Q`>tRSlr05-3dG*?ECV`J*wIOGkTR#U=TFb2Zvs^X5tweYcGsi) z$T3|Vl=;e>PPgv$u6hQBPc>d)^9TTMSa#IP8X$Hw%bKX_Xz68o0}wEi%>p7?hrzAX z*lJG4@e!72bJW~Mm?`*2_-xOl`+oq|-Fl@NSlxiCsMTb#Ju9|i`lw8o&709}cJG<> z>9>Fxp;=a{4(jf`S5MHPl0F6BN z&7MaY(vffdP!wRBPFVMCo_ca&rw2S5MztS%C~vdJA;K^`1!P7uu(K>w!I;hBNI%@0 z0iHP;8%%brL{`YyPi25iZ+}~#Va(*qJwOEZGEg1BO$Y7d_PPi5tMAiNfiwWl&Liso#7 zmPJbQqLv_~##fzvw4Rj)h5;MLK*s&l^}c*ZK6tTB34j&RduAC*@PD0I{~6uh;ziI5 z0H410(DwkJ4)z)CzXITlUO7;wD*z4z`;1#%0dPjI9H`S300)A7#;vXZIHOk%)aeR< z1HnGyR_WKkBVKKu5s**Q>COPr>)GzdicbUXUF_Zd8PNN;fb4_F#RTu->e!A)4{&At zdpkO_?j8XCW=r(@XMaNT8CE}C2)XF~Go0?NeEA0=Y;fg;j?aVj_gI|X2)fwd_c(Dz z)5oPytNkdbrVf#Ol(ePoj@zjj4ztIrXFDq#s;B2m!9qlvY984mHt9pMi z(%IW%awG;&K~u8XvNtodOR*Rv5fflAblEDi%N*~MBC?CwygCTHeOcn#bJ_#2tHn4T zIj{qGXKq#Vqko{yWUDpSSO;y)dJW7t#Wp1YB00VfL)%fN|9$9la8<9ATBb5ecb@MJ zqP1+i3L3xG+lbCroSfM;>U=C!9o#4bbc97Urn8>)A+uDT>B5|rWt?wVv!2731jaNY zdMNm2{nEXJeGlHh2CB`4vf&o^yFtV4` z^(f;b9WpGLd~DuWd8+!M%D$%nP&@OE^RimJGK;ZGkMyf-LuXpOHytBqMa^%O7$Xg+ zmzM=h6x3dSHZFY)^d06;IKQl6@V~aLI(3%mQ7ObaUuAyP0J9RCjc0-8gEMMw)dYL` z7En32I)7%UB_WevHAmQ3s)ngLsr^sJ0!;TvUt}1@KvlEJGTbLbgvry3pbA`bUPYx< z?=Zt0KEg5Dvs$SJ3fAo?<0`wnbNoE}?7*{{bnLa8s{|xY+;z002ovPDHLkV1g>>>>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?"