diff --git a/README.md b/README.md index a4ed6170..6f8073e9 100644 --- a/README.md +++ b/README.md @@ -265,7 +265,6 @@ Known Bugs - Fake Tears and Nasty Plot don't quite look right when done from the opponent's side. - The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle. - Silph Co. Worker doesn't give Lapras as a gift on occasion (this happened like one time, more testing needed) -- The final battle against Blue uses the wrong team when Eevee is chosen. Evolution Methods for new Pokemon ==== diff --git a/constants/event_constants.asm b/constants/event_constants.asm index a04bf97b..52ef9732 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -819,6 +819,7 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1 const_skip 4 const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH const EVENT_BEAT_CHIEF ; moved out of the below union to prevent bugs + const EVENT_MEWTWO_UNLOCKED ; Silph Gauntlet events const_next $930 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index c45418cd..7eca96d1 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -180,82 +180,77 @@ DEF SHOW EQU $15 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 - const HS_GLADE_ITEM1 - const HS_GLADE_ITEM2 - const HS_GLADE_ITEM3 - const HS_GLADE_ITEM4 - const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F1 + const HS_SILPH_CO_11F_1 ; A8 + const HS_SILPH_CO_11F_JAMES ; A9 + const HS_SILPH_CO_11F_3 ; AA + const HS_SILPH_CO_11F_JESSIE ; AB + const HS_OMEGA ; AC + const HS_OMEGA_2 ; AD + const HS_DRAGONITE ; AE + const HS_MOLTRES ; AF + const HS_POKEMON_MANSION_2F_ITEM ; B0 X + const HS_POKEMON_MANSION_3F_ITEM_1 ; B1 X + const HS_POKEMON_MANSION_3F_ITEM_2 ; B2 X + const HS_POKEMON_MANSION_B1F_ITEM_1 ; B3 X + const HS_POKEMON_MANSION_B1F_ITEM_2 ; B4 X + const HS_POKEMON_MANSION_B1F_ITEM_3 ; B5 X + const HS_POKEMON_MANSION_B1F_ITEM_4 ; B6 X + const HS_POKEMON_MANSION_B1F_ITEM_5 ; B7 X + const HS_MANSION_GUARD ; B8 + const HS_SAFARI_ZONE_EAST_ITEM_1 ; B9 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; BA X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; BB X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; BC X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; BD X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; BE X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; BF X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; C0 X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; C1 X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; C2 X + const HS_SAFARI_ZONE_CENTER_ITEM ; C3 X + const HS_CERULEAN_CAVE_2F_ITEM_1 ; C4 X + const HS_CERULEAN_CAVE_2F_ITEM_2 ; C5 X + const HS_CERULEAN_CAVE_2F_ITEM_3 ; C6 X + const HS_MEWTWO ; C7 X + const HS_CERULEAN_CAVE_B1F_ITEM_1 ; C8 X + const HS_CERULEAN_CAVE_B1F_ITEM_2 ; C9 X + const HS_VICTORY_ROAD_1F_ITEM_1 ; CA X + const HS_VICTORY_ROAD_1F_ITEM_2 ; CB X + const HS_CHAMPIONS_ROOM_OAK ; CC + const HS_SEAFOAM_ISLANDS_1F_BOULDER_1 ; CD + const HS_SEAFOAM_ISLANDS_1F_BOULDER_2 ; CE + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_1 ; CF + const HS_SEAFOAM_ISLANDS_B1F_BOULDER_2 ; D0 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_1 ; D1 + const HS_SEAFOAM_ISLANDS_B2F_BOULDER_2 ; D2 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_1 ; D3 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_2 ; D4 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_3 ; D5 + const HS_SEAFOAM_ISLANDS_B3F_BOULDER_4 ; D6 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_1 ; D7 + const HS_SEAFOAM_ISLANDS_B4F_BOULDER_2 ; D8 + const HS_ARTICUNO ; D9 + const HS_MEW ; DA + const HS_POKEMON_MANSION_B2F_ITEM_1 ; DB + const HS_POKEMON_MANSION_B2F_ITEM_2 ; DC + const HS_MT_MOON_CRATER_ITEM_1 ; DD + const HS_MT_MOON_CRATER_ITEM_2 ; DE + const HS_MT_MOON_CRATER_ITEM_3 ; DF + const HS_MT_MOON_CRATER_ITEM_4 ; E0 + const HS_GIOVANNIS_ROOM_ITEM_1 ; E1 + const HS_GIOVANNIS_ROOM_ITEM_2 ; E2 + const HS_ROCK_TUNNEL_B1F_DOME ; E3 + const HS_ROCK_TUNNEL_B1F_HELIX ; E4 + const HS_ROCK_TUNNEL_B1F_AMBER ; E5 + const HS_ROCK_TUNNEL_B1F_WING ; E6 + const HS_MT_MOON_CRATER_GUARD ; E7 + const HS_DAYCARE_BULBASAUR ; E8 + const HS_GLADE_GZAP_1 ; E9 + const HS_GLADE_GZAP_2 ; EA sports. to the game. + const HS_GLADE_GZAP_3 ; EB + const HS_GLADE_ITEM1 ; EC + const HS_GLADE_ITEM2 ; ED + const HS_GLADE_ITEM3 ; EE + const HS_GLADE_ITEM4 ; EF + const HS_CINNABAR_VOLCANO_FLOORS_ITEM ; F0 DEF NUM_HS_OBJECTS EQU const_value ; F2 - FE all go unused. diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0a99337e..e4a607bc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -253,27 +253,26 @@ DEF FIRST_INDOOR_MAP EQU const_value 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 ; $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 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 ; $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, 20 ; $FD - map_const BRUNSWICK_GLADE, 19, 20 ; $FE + map_const ROUTE_10_GATE, 5, 4 ; $EA + map_const SILPH_CO_11F, 9, 9 ; $EB + map_const FARAWAY_FERRY_DOCK, 14, 6 ; $EC - was SILPH_CO_ELEVATOR + map_const GARNET_CAVERN_2F, 15, 9 ; $ED - was UNUSED_MAP_ED + map_const UNDERWATER_TUNNEL, 15, 9 ; $EE - Was UNUSED_MAP_EE + map_const TRADE_CENTER, 5, 4 ; $EF + map_const COLOSSEUM, 5, 4 ; $F0 + map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F1 - Was UNUSED_MAP_F1 + map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F2 - Was UNUSED_MAP_F2 + map_const LORELEIS_ROOM, 5, 6 ; $F3 + map_const BRUNOS_ROOM, 5, 6 ; $F4 + map_const AGATHAS_ROOM, 5, 6 ; $F5 + map_const ROCK_TUNNEL_B1F, 20, 18 ; $F6 - Switched with CINNABAR_VOLCANO_FLOORS + map_const GIOVANNIS_ROOM, 11, 14 ; $F7 + map_const BATTLE_TENT, 5, 10 ; $F8 + map_const MT_MOON_SQUARE, 13, 7 ; $F9 + map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FA + map_const CELESTE_HILL_CAVE, 20, 18 ; $FB + map_const CELESTE_HILL_OUTSIDE, 20, 20 ; $FC + map_const BRUNSWICK_GLADE, 19, 20 ; $FD 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/events/card_key_coords.asm b/data/events/card_key_coords.asm index 95569169..79cc80eb 100644 --- a/data/events/card_key_coords.asm +++ b/data/events/card_key_coords.asm @@ -7,10 +7,6 @@ CardKeyTable1: db SILPH_CO_7F, $06, $0A, 4 db SILPH_CO_7F, $06, $0B, 5 - db SILPH_CO_9F, $04, $12, 6 - db SILPH_CO_9F, $04, $13, 7 - db SILPH_CO_10F, $08, $0A, 8 - db SILPH_CO_10F, $08, $0B, 9 db -1 ; end CardKeyTable2: @@ -18,8 +14,6 @@ CardKeyTable2: db SILPH_CO_3F, $09, $09, 11 db SILPH_CO_5F, $04, $07, 12 db SILPH_CO_5F, $05, $07, 13 - db SILPH_CO_9F, $08, $03, 18 - db SILPH_CO_9F, $09, $03, 19 db -1 ; end CardKeyTable3: diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm index dd601c12..4c326b69 100644 --- a/data/events/card_key_maps.asm +++ b/data/events/card_key_maps.asm @@ -2,7 +2,5 @@ SilphCoMapList: db SILPH_CO_3F db SILPH_CO_5F db SILPH_CO_7F - db SILPH_CO_9F - db SILPH_CO_10F db SILPH_CO_11F db -1 ; end diff --git a/data/events/hidden_item_coords.asm b/data/events/hidden_item_coords.asm index 85358a8c..c2e3531d 100644 --- a/data/events/hidden_item_coords.asm +++ b/data/events/hidden_item_coords.asm @@ -11,8 +11,8 @@ HiddenItemCoords: hidden_item ROUTE_9, 14, 7 hidden_item SS_ANNE_KITCHEN, 13, 9 hidden_item SS_ANNE_B1F_ROOMS, 3, 1 - hidden_item ROUTE_10, 9, 17 - hidden_item ROUTE_10, 16, 53 + hidden_item ROUTE_10, 9, 25 + hidden_item ROUTE_10, 12, 71 hidden_item ROCKET_HIDEOUT_B1F, 21, 15 hidden_item ROCKET_HIDEOUT_B3F, 27, 17 hidden_item ROCKET_HIDEOUT_B4F, 25, 1 @@ -23,7 +23,6 @@ HiddenItemCoords: hidden_item SAFARI_ZONE_GATE, 10, 1 ; inaccessible hidden_item SAFARI_ZONE_WEST, 6, 5 hidden_item SILPH_CO_5F, 12, 3 - hidden_item SILPH_CO_9F, 2, 15 hidden_item COPYCATS_HOUSE_2F, 1, 1 hidden_item CERULEAN_CAVE_1F, 14, 11 hidden_item CERULEAN_CAVE_B1F, 27, 3 diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm index c94a1df5..865d85dc 100644 --- a/data/events/hidden_objects.asm +++ b/data/events/hidden_objects.asm @@ -46,7 +46,6 @@ HiddenObjectMaps: db SAFARI_ZONE_GATE db SAFARI_ZONE_WEST db SILPH_CO_5F - db SILPH_CO_9F db COPYCATS_HOUSE_2F db CERULEAN_CAVE_1F db CERULEAN_CAVE_B1F @@ -142,7 +141,6 @@ HiddenObjectPointers: dw SafariZoneEntranceHiddenObjects dw SafariZoneWestHiddenObjects dw SilphCo5FHiddenObjects - dw SilphCo9FHiddenObjects dw CopycatsHouse2FHiddenObjects dw CeruleanCave1HiddenObjects dw CeruleanCave3HiddenObjects @@ -431,8 +429,8 @@ SSAnne10HiddenObjects: db -1 ; end Route10HiddenObjects: - hidden_object 9, 17, SUPER_POTION, HiddenItems - hidden_object 16, 53, MAX_ETHER, HiddenItems + hidden_object 9, 25, SUPER_POTION, HiddenItems + hidden_object 12, 71, MAX_ETHER, HiddenItems db -1 ; end RocketHideout1HiddenObjects: @@ -473,10 +471,6 @@ SilphCo5FHiddenObjects: hidden_object 12, 3, ELIXER, HiddenItems db -1 ; end -SilphCo9FHiddenObjects: - hidden_object 2, 15, MAX_POTION, HiddenItems - db -1 ; end - CopycatsHouse2FHiddenObjects: hidden_object 1, 1, NUGGET, HiddenItems db -1 ; end diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm index aba0ac00..b4825117 100644 --- a/data/maps/dungeon_maps.asm +++ b/data/maps/dungeon_maps.asm @@ -13,6 +13,7 @@ DungeonMaps1: db DIGLETTS_CAVE db UNDERWATER_TUNNEL db CINNABAR_VOLCANO_FLOORS + db SILPH_CO_11F db CELESTE_HILL db CELESTE_HILL_OUTSIDE db CELESTE_HILL_CAVE @@ -34,8 +35,6 @@ DungeonMaps2: ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_3F, CERULEAN_CAVE_1F - ; SILPH_CO_[9-11]F - db SILPH_CO_9F, SILPH_CO_11F ; SEAFOAM_ISLANDS_[B1F-B4F] db SEAFOAM_ISLANDS_B1F, SEAFOAM_ISLANDS_B4F ; all ROCKET_HIDEOUT maps diff --git a/data/maps/headers/Route10Gate.asm b/data/maps/headers/Route10Gate.asm new file mode 100644 index 00000000..af5406e7 --- /dev/null +++ b/data/maps/headers/Route10Gate.asm @@ -0,0 +1,2 @@ + map_header Route10Gate, ROUTE_10_GATE, FOREST_GATE, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index 10eacdee..a298fca2 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -238,7 +238,6 @@ MapHSPointers: dw CinnabarVolcanoHS dw CinnabarVolcanoFloorsHS dw NoHS - dw SilphCo10FHS dw SilphCo11FHS dw NoHS dw NoHS @@ -493,12 +492,6 @@ SilphCo7FHS: db SILPH_CO_7F, $09, SHOW ; HS_SILPH_CO_7F_RIVAL db SILPH_CO_7F, $0A, SHOW ; HS_SILPH_CO_7F_ITEM_1 db SILPH_CO_7F, $0B, SHOW ; HS_SILPH_CO_7F_ITEM_2 -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_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/map_header_banks.asm b/data/maps/map_header_banks.asm index 8c06fc59..99c25975 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -235,8 +235,7 @@ MapHeaderBanks:: db BANK(CeruleanBadgeHouse_h) db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7 db BANK(CinnabarVolcanoFloors_h) - db BANK(SilphCo9F_h) - db BANK(SilphCo10F_h) + db BANK(Route10Gate_h) db BANK(SilphCo11F_h) db BANK(FarawayFerryDock_h) db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 4f89390d..41dd1682 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -235,8 +235,7 @@ MapHeaderPointers:: dw CeruleanBadgeHouse_h dw CinnabarVolcano_h ; UNUSED_MAP_E7 dw CinnabarVolcanoFloors_h - dw SilphCo9F_h - dw SilphCo10F_h + dw Route10Gate_h dw SilphCo11F_h dw FarawayFerryDock_h dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f diff --git a/data/maps/objects/CinnabarLabTradeRoom.asm b/data/maps/objects/CinnabarLabTradeRoom.asm index 048f34c4..7db91102 100644 --- a/data/maps/objects/CinnabarLabTradeRoom.asm +++ b/data/maps/objects/CinnabarLabTradeRoom.asm @@ -9,8 +9,6 @@ CinnabarLabTradeRoom_Object: def_object_events object_event 3, 2, SPRITE_SUPER_NERD, STAY, DOWN, 1 ; person - object_event 1, 4, SPRITE_GRAMPS, STAY, NONE, 2 ; person -; object_event 5, 5, SPRITE_BEAUTY, STAY, UP, 3 ; person - object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 3 ; Trader + object_event 3, 5, SPRITE_GAMEBOY_KID, STAY, DOWN, 2 ; Trader def_warps_to CINNABAR_LAB_TRADE_ROOM diff --git a/data/maps/objects/RedsHouse2F.asm b/data/maps/objects/RedsHouse2F.asm index 2bc15fdb..e891303c 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_1F, 1 ; - Go through Gauntlet + ;warp_event 5, 1, SILPH_CO_1F, 1 ; - Go through Gauntlet ;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 @@ -14,7 +14,8 @@ RedsHouse2F_Object: ;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, CERULEAN_CAVE_B1F, 1 ; Test Mewtwo theme + def_bg_events def_object_events diff --git a/data/maps/objects/RockTunnelB1F.asm b/data/maps/objects/RockTunnelB1F.asm index 73a136ed..092abc8e 100644 --- a/data/maps/objects/RockTunnelB1F.asm +++ b/data/maps/objects/RockTunnelB1F.asm @@ -19,9 +19,9 @@ RockTunnelB1F_Object: object_event 33, 5, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 11 object_event 26, 30, SPRITE_SUPER_NERD, STAY, DOWN, 8, OPP_POKEMANIAC, 5 object_event 22, 5, SPRITE_YOUNGSTER, STAY, DOWN, 9 - object_event 7, 23, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL - object_event 6, 23, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL - object_event 8, 24, SPRITE_OLD_AMBER, STAY, NONE, 12, OLD_AMBER - object_event 5, 24, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL + object_event 7, 25, SPRITE_FOSSIL, STAY, NONE, 10, HELIX_FOSSIL + object_event 6, 25, SPRITE_FOSSIL, STAY, NONE, 11, DOME_FOSSIL + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 12, BLK_AUGURITE + object_event 5, 23, SPRITE_FOSSIL, STAY, NONE, 13, WING_FOSSIL def_warps_to ROCK_TUNNEL_B1F diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 724e0494..65c22ac0 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -7,6 +7,9 @@ Route10_Object: warp_event 8, 61, ROCK_TUNNEL_1F, 3 warp_event 6, 47, POWER_PLANT, 1 warp_event 6, 3, UNDERWATER_TUNNEL, 2 + warp_event 14, 61, ROUTE_10_GATE, 2 + warp_event 14, 57, ROUTE_10_GATE, 1 + warp_event 15, 57, ROUTE_10_GATE, 1 def_bg_events bg_event 7, 27, 7 ; Route10Text7 @@ -15,7 +18,7 @@ Route10_Object: bg_event 5, 49, 10 ; Route10Text10 def_object_events - object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 + object_event 10, 50, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1 object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7 object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2 object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7 diff --git a/data/maps/objects/Route10Gate.asm b/data/maps/objects/Route10Gate.asm new file mode 100644 index 00000000..d1ebe555 --- /dev/null +++ b/data/maps/objects/Route10Gate.asm @@ -0,0 +1,14 @@ +Route10Gate_Object: + db $a ; border block + + def_warp_events + warp_event 5, 0, ROUTE_10, 7 + warp_event 4, 7, ROUTE_10, 6 + warp_event 5, 7, ROUTE_10, 6 + + def_bg_events + + def_object_events + object_event 3, 4, SPRITE_GRAMPS, STAY, LEFT, 1 ; person + + def_warps_to ROUTE_10_GATE diff --git a/data/maps/songs.asm b/data/maps/songs.asm index f510fc8b..1e2df766 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -234,8 +234,7 @@ MapSongBanks:: 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_CITIES1, 0 ; ROUTE_10_GATE db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index d6170694..a87065b5 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -135,6 +135,7 @@ 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 ROUTE_10_GATE, 14, 4, Route10Name internal_map SILPH_CO_11F, 10, 5, SilphCoName internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName diff --git a/data/text/item_descriptions.asm b/data/text/item_descriptions.asm index 1c7744a0..96404035 100644 --- a/data/text/item_descriptions.asm +++ b/data/text/item_descriptions.asm @@ -524,7 +524,7 @@ _TM26Description:: prompt _TM27Description:: - text "A ground-type," + text "A GROUND-type," next "one-hit KO attack." prompt diff --git a/data/text/text_7.asm b/data/text/text_7.asm index e6f9487a..9398c1ce 100644 --- a/data/text/text_7.asm +++ b/data/text/text_7.asm @@ -142,8 +142,7 @@ _AfterTrade2Text:: text_ram wInGameTradeGiveMonName text " you" line "traded to me" - - para "went and evolved!" + cont "went and evolved!" done _WannaTrade3Text:: diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 9d4be3fc..92b995b6 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -75,7 +75,7 @@ YoungsterData: db 14, RATTATA, EKANS, ZUBAT, 0 ; Route 25 db 15, RATTATA, SPEAROW, 0 - db 17, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. Our changes make em not work anymore, but keep em for the iconography. + db 15, SHELLDER, SLOWPOKE, 0 ; The famous "Slowpoke Kid" who was used for the Mew glitch. db 14, EKANS, SANDSHREW, 0 ; SS Anne 1F Rooms db 21, NIDORINO, 0 @@ -563,6 +563,7 @@ BlackbeltData: ChiefData: ; Silph Gauntlet 7F db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, OMEGADGE, 0 + db $FF, 73, ELECTRODE, 72, LAPRAS, 73, SCIZOR, 72, GENGAR, 75, PORYGONZ, 78, 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 diff --git a/data/trainers/special_moves.asm b/data/trainers/special_moves.asm index fc70fdf0..76c500b2 100644 --- a/data/trainers/special_moves.asm +++ b/data/trainers/special_moves.asm @@ -1362,6 +1362,27 @@ SpecialTrainerMoves: db 6, 2, THUNDER_WAVE db 6, 4, ICE_BEAM db 0 + + db CHIEF, 2 + db 1, 1, THUNDERBOLT + db 1, 2, THUNDER_WAVE + db 1, 3, HEADBUTT + db 2, 1, BLIZZARD + db 2, 2, THUNDERBOLT + db 2, 3, SING + db 2, 4, HYPER_BEAM + db 3, 1, IRON_HEAD + db 3, 3, HYPER_BEAM + db 4, 1, EXPLOSION + db 4, 2, THUNDERBOLT + db 4, 4, ICE_PUNCH + db 5, 1, THUNDERBOLT + db 5, 2, ICE_BEAM + db 5, 3, RECOVER + db 6, 1, THUNDERBOLT + db 6, 2, THUNDER_WAVE + db 6, 4, ICE_BEAM + db 0 db JESSIE_JAMES, 5 ; J&J postgame db 1, 1, BUBBLEBEAM diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index 46405b89..207bbfb9 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -237,7 +237,6 @@ WildDataPointers: dw NothingWildMons dw NothingWildMons dw NothingWildMons - dw NothingWildMons dw GarnetCavern2FWildMons dw UnderwaterTunnelWildMons dw NothingWildMons diff --git a/data/wild/maps/FarawayIslandInside.asm b/data/wild/maps/FarawayIslandInside.asm index a0b692b8..97b71bf6 100644 --- a/data/wild/maps/FarawayIslandInside.asm +++ b/data/wild/maps/FarawayIslandInside.asm @@ -1,15 +1,15 @@ -FarawayIslandInsideMons: ; DEFINITELY needs reworking +FarawayIslandInsideMons: def_grass_wildmons 10 ; encounter rate - db 30, EEVEE - db 30, MANKEY - db 30, MANKEY - db 30, PRIMEAPE - db 30, BUTTERFREE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE - db 30, EEVEE + db 25, MANKEY + db 28, GLOOM + db 26, BUTTERFREE + db 29, PRIMEAPE + db 24, MANKEY + db 30, DECILLA + db 26, MANKEY + db 30, GORILLAIMO + db 27, BUTTERFREE + db 30, AERODACTYL end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/gfx/pokemon/front/mewtwo.png b/gfx/pokemon/front/mewtwo.png index 40c6f217..57617fe7 100644 Binary files a/gfx/pokemon/front/mewtwo.png and b/gfx/pokemon/front/mewtwo.png differ diff --git a/layout.link b/layout.link index 70f04037..184bf5d5 100644 --- a/layout.link +++ b/layout.link @@ -141,7 +141,6 @@ ROMX $1D "Itemfinder 1" "Maps 20" "Maps 21" - "Itemfinder 2" ROMX $1E "bank1E" ROMX $1F @@ -151,6 +150,7 @@ ROMX $1F "Sound Effects 3" ; "Audio Engine 3" ; "Music 3" + "Itemfinder 2" ROMX $20 "Text 1" ROMX $21 diff --git a/maps.asm b/maps.asm index 23c2bfc1..0f2940b7 100644 --- a/maps.asm +++ b/maps.asm @@ -789,10 +789,10 @@ INCLUDE "scripts/SilphCo3F.asm" INCLUDE "data/maps/objects/SilphCo3F.asm" SilphCo3F_Blocks: INCBIN "maps/SilphCo3F.blk" -INCLUDE "data/maps/headers/SilphCo10F.asm" -INCLUDE "scripts/SilphCo10F.asm" -INCLUDE "data/maps/objects/SilphCo10F.asm" -SilphCo10F_Blocks: INCBIN "maps/SilphCo10F.blk" +INCLUDE "data/maps/headers/Route10Gate.asm" +INCLUDE "scripts/Route10Gate.asm" +INCLUDE "data/maps/objects/Route10Gate.asm" +Route10Gate_Blocks: INCBIN "maps/Route10Gate.blk" INCLUDE "data/maps/headers/LancesRoom.asm" INCLUDE "scripts/LancesRoom.asm" @@ -947,11 +947,6 @@ INCLUDE "data/maps/objects/UndergroundPathRoute7.asm" ;INCLUDE "scripts/UndergroundPathRoute7Copy.asm" ;INCLUDE "data/maps/objects/UndergroundPathRoute7Copy.asm" -INCLUDE "data/maps/headers/SilphCo9F.asm" -INCLUDE "scripts/SilphCo9F.asm" -INCLUDE "data/maps/objects/SilphCo9F.asm" -SilphCo9F_Blocks: INCBIN "maps/SilphCo9F.blk" - INCLUDE "data/maps/headers/VictoryRoad1F.asm" INCLUDE "scripts/VictoryRoad1F.asm" INCLUDE "data/maps/objects/VictoryRoad1F.asm" diff --git a/maps/Route10.blk b/maps/Route10.blk index 0c3df17f..071a9d15 100644 --- a/maps/Route10.blk +++ b/maps/Route10.blk @@ -24,8 +24,7 @@ Me() -Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{(){e(){{{{$%{e(){{{{{{{e().(,?????;CC(,,,,,,)CC(+WWWW% -L()11111 +Oe(,?????;{e(+WWWW*){e() !(){e()hi(){e()7}:~(){e(){y{{$%{e(){{{{{{{e().()CCCCCCCC(,????;CTC(,,,,,) !(+WWW%7:~()11111 ()1111>;/()>??,) diff --git a/maps/Route10Gate.blk b/maps/Route10Gate.blk new file mode 100644 index 00000000..19af9540 Binary files /dev/null and b/maps/Route10Gate.blk differ diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 0c0ce766..fc774ebe 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -25,8 +25,21 @@ MewtwoTrainerHeader: MewtwoText: text_asm + ld a, 5 + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a +.waitloop + ld a, [wMusicFade] + and a + jr nz, .waitloop + + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld hl, MewtwoTrainerHeader call TalkToTrainer + ld a, SFX_STOP_ALL_MUSIC + call PlaySound jp TextScriptEnd MewtwoBattleText: diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm index 3cedbbb0..cef930e4 100644 --- a/scripts/ChampionsRoom.asm +++ b/scripts/ChampionsRoom.asm @@ -80,8 +80,8 @@ GaryScript2: jr .saveTrainerId .Charmander cp STARTER1 ; changes start here - ld a, $3 jr nz, .Pikachu + ld a, $3 jr .saveTrainerId .Pikachu ; cp STARTER4 diff --git a/scripts/CinnabarLabTradeRoom.asm b/scripts/CinnabarLabTradeRoom.asm index f6d83695..9de5f4bd 100644 --- a/scripts/CinnabarLabTradeRoom.asm +++ b/scripts/CinnabarLabTradeRoom.asm @@ -3,28 +3,12 @@ CinnabarLabTradeRoom_Script: CinnabarLabTradeRoom_TextPointers: dw Lab2Text1 - dw Lab2Text2 -; dw Lab2Text3 dw CinnabarLabTrader Lab2Text1: text_far _Lab2Text1 text_end -Lab2Text2: - text_asm - ld a, TRADE_FOR_JENNY - ld [wWhichTrade], a - jr Lab2DoTrade - -;Lab2Text3: -; text_asm -; ld a, TRADE_FOR_CRINKLES -; ld [wWhichTrade], a -Lab2DoTrade: - predef DoInGameTradeDialogue - jp TextScriptEnd - CinnabarLabTrader: text_asm ld a, TRADE_WITH_SELF diff --git a/scripts/CinnabarPokecenter.asm b/scripts/CinnabarPokecenter.asm index eddf5d55..f79cbd6a 100644 --- a/scripts/CinnabarPokecenter.asm +++ b/scripts/CinnabarPokecenter.asm @@ -40,7 +40,7 @@ PoryZSalesmanText: jp nz, .choseNo ldh [hMoney], a ldh [hMoney + 2], a - ld a, $21 + ld a, $30 ldh [hMoney + 1], a call HasEnoughMoney jr nc, .enoughMoney @@ -49,11 +49,13 @@ PoryZSalesmanText: .enoughMoney lb bc, DUBIOUS_DISC, 1 call GiveItem - jr nc, .done + jr nc, .BagFull + ld hl, ReceivedDubiousDiscText + call PrintText xor a ld [wPriceTemp], a ld [wPriceTemp + 2], a - ld a, $21 + ld a, $30 ld [wPriceTemp + 1], a ld hl, wPriceTemp + 2 ld de, wPlayerMoney + 2 @@ -65,10 +67,17 @@ PoryZSalesmanText: SetEvent EVENT_BOUGHT_DUBIOUS_DISC jr .done .choseNo - ld hl, .RefuseText - jr .printText + ld hl, RefuseText2 + call PrintText + jr .done .alreadyBoughtPoryZ ld hl, .Text2 + call PrintText + jr .done +.BagFull + ld hl, PoryZBagFull + call PrintText + jr .done .printText call PrintText .done @@ -77,17 +86,22 @@ PoryZSalesmanText: .Text1 text_far _PoryZSalesmanText1 text_end - -.RefuseText - text_far _PoryZSalesmanNoText + +.Text2 + text_far _PoryZSalesmanText2 text_end - + .NoMoneyText text_far _PoryZSalesmanNoMoneyText text_end -.Text2 - text_far _PoryZSalesmanText2 +RefuseText2: + text_far _PoryZSalesmanNoText + text_end + +ReceivedDubiousDiscText: + text_far _ReceivedDubiousDiscText + sound_get_item_1 text_end PoryZBagFull: diff --git a/scripts/FuchsiaCity.asm b/scripts/FuchsiaCity.asm index 65d84811..bcf37a7d 100644 --- a/scripts/FuchsiaCity.asm +++ b/scripts/FuchsiaCity.asm @@ -190,7 +190,9 @@ SafariBallSalesman: .enoughMoney lb bc, SAFARI_BALL, 3 call GiveItem - jr nc, .done + jr nc, .BagFull + ld hl, ReceivedSafariBallsText + call PrintText xor a ld [wPriceTemp], a ld [wPriceTemp + 2], a @@ -205,7 +207,13 @@ SafariBallSalesman: call DisplayTextBoxID jr .done .choseNo - ld hl, .RefuseText + ld hl, RefuseText + call PrintText + jr .done +.BagFull + ld hl, SafariBallBagFull + call PrintText + jr .done .printText call PrintText .done @@ -214,13 +222,18 @@ SafariBallSalesman: .Text1 text_far _SafariBallSalesmanText1 text_end + +.NoMoneyText + text_far _SafariBallSalesmanNoMoneyText + text_end -.RefuseText +RefuseText: text_far _SafariBallSalesmanNoText text_end -.NoMoneyText - text_far _SafariBallSalesmanNoMoneyText +ReceivedSafariBallsText: + text_far _ReceivedSafariBallsText + sound_get_item_1 text_end SafariBallBagFull: diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 7ef89237..1df646da 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -220,7 +220,6 @@ ObjectsToHide: db HS_BILLS_NIDORINO ; Bill's Garden access db HS_MANSION_GUARD ; Pokemon Mansion basement access db HS_MT_MOON_CRATER_GUARD ; Mt. Moon Crater access - db HS_CERULEAN_CAVE_GUY ; Cerulean Cave access db -1 ; end ; Farcalling this caused weird issues so I'm just using a clone diff --git a/scripts/Route10Gate.asm b/scripts/Route10Gate.asm new file mode 100644 index 00000000..8380639b --- /dev/null +++ b/scripts/Route10Gate.asm @@ -0,0 +1,15 @@ +Route10Gate_Script: + jp EnableAutoTextBoxDrawing + +Route10Gate_TextPointers: + dw Route10GateText1 + +Route10GateText1: + text_asm + ld a, TRADE_FOR_JENNY + ld [wWhichTrade], a + jr Route10GateDoTrade + +Route10GateDoTrade: + predef DoInGameTradeDialogue + jp TextScriptEnd diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index 3a3de2a5..1ea03279 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -173,10 +173,6 @@ MissableObjectIDs_6219b: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 - db HS_SILPH_CO_11F_1 - db HS_SILPH_CO_11F_3 db -1 ; end SilphCo11Script_62185: @@ -633,8 +629,6 @@ SaffronCityRockets: db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 db HS_SILPH_CO_11F_3 db -1 ; end diff --git a/scripts/SilphGauntlet7F.asm b/scripts/SilphGauntlet7F.asm index e3e6f860..3610c1e4 100644 --- a/scripts/SilphGauntlet7F.asm +++ b/scripts/SilphGauntlet7F.asm @@ -21,6 +21,17 @@ SilphGauntlet7F_ScriptPointers: ChiefScript1: CheckEvent EVENT_BEAT_CHIEF jr nz, .skip + ld a, 5 + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a +.waitloop + ld a, [wMusicFade] + and a + jr nz, .waitloop + + ld a, SFX_STOP_ALL_MUSIC + call PlaySound ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a call UpdateSprites @@ -95,6 +106,7 @@ ChiefScript4: ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject + SetEvent EVENT_MEWTWO_UNLOCKED ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 ld a, $0 @@ -117,8 +129,10 @@ SilphGauntlet7F_TextPointers: ChiefText1: text_asm + CheckEvent EVENT_MEWTWO_UNLOCKED + jr nz, .chiefSecondFight CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten - jr nz, .chiefBeaten ; If Chief has been beaten, skip the trainer loading + jr nz, .chiefBeaten1 ; If Chief has been beaten, skip the trainer loading ; standard processing ld hl, ChiefMonologue call PrintText @@ -127,6 +141,9 @@ ChiefText1: call z, WaitForTextScrollButtonPress ; and here. call EnableAutoTextBoxDrawing ; and here. + CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected. + ld hl, ChiefMonologueMasterBallNotCollected ; If no, load this text... + jr z, .masterBallSkip ; ...then skip. CheckEvent EVENT_USED_MASTER_BALL ; Check if the Master Ball has been used. ld hl, ChiefMonologueMasterBallNotUsed ; Load not used by default. jr z, .masterBallSkip ; In which case, we can skip. @@ -153,12 +170,48 @@ ChiefText1: ld de, ChiefVictoryText call SaveEndBattleTextPointers jr .done -.chiefBeaten - ld hl, ChiefAfterBattleText +.chiefBeaten1 + CheckEvent EVENT_GOT_MASTER_BALL ; Check if Master Ball was collected. + ld hl, ChiefAltAfterBattleText ; If no, load this text... + jr z, .noMBallskip ; ...then skip. + ld hl, ChiefAfterBattleText ; otherwise, load this. +.noMBallskip call PrintText ; fallthrough .done jp TextScriptEnd +.chiefSecondFight + CheckEvent EVENT_BEAT_CHIEF ; Check if Chief was beaten + jr nz, .chiefBeaten2 ; If Chief has been beaten, skip the trainer loading + ld hl, ChiefMonologueRematch + call PrintText + ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip. + and a ; yep, here too. + call z, WaitForTextScrollButtonPress ; and here. + call EnableAutoTextBoxDrawing ; and here. + ld c, BANK(Music_MeetEvilTrainer) + ld a, MUSIC_MEET_EVIL_TRAINER + call PlayMusic + + call Delay3 + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld a, OPP_CHIEF + ld [wCurOpponent], a + ld a, 2 + ld [wTrainerNo], a + ld [wIsTrainerBattle], a + ld a, $1 + ld [wSilphGauntlet7FCurScript], a + ld hl, ChiefDefeatedText2 + ld de, ChiefVictoryText2 + call SaveEndBattleTextPointers + jr .done +.chiefBeaten2 + ld hl, ChiefAfterBattleText2 + call PrintText + jr .done ChiefMonologue: text_far _ChiefMonologue @@ -171,6 +224,10 @@ ChiefMonologueMasterBallUsed: ChiefMonologueMasterBallNotUsed: text_far _ChiefMonologueMasterBallNotUsed text_end + +ChiefMonologueMasterBallNotCollected: + text_far _ChiefMonologueMasterBallNotCollected + text_end ChiefDefeatedText: text_far _ChiefDefeatedText @@ -183,6 +240,26 @@ ChiefVictoryText: ChiefAfterBattleText: text_far _ChiefAfterBattleText text_end + +ChiefAltAfterBattleText: + text_far _ChiefAltAfterBattleText + text_end + +ChiefMonologueRematch: + text_far _ChiefMonologueRematch + text_end + +ChiefDefeatedText2: + text_far _ChiefDefeatedText2 + text_end + +ChiefVictoryText2: + text_far _ChiefVictoryText2 + text_end + +ChiefAfterBattleText2: + text_far _ChiefAfterBattleText2 + text_end ChiefPC: text_far _ChiefPCText diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm index f59e7135..40c97b8f 100644 --- a/text/BrunswickTrail.asm +++ b/text/BrunswickTrail.asm @@ -41,7 +41,7 @@ _Lover2:: _BrunswickBattleText1:: text "I'm searching" - line "for rare BIRD" + line "for rare bird" cont "#MON!" done @@ -69,7 +69,7 @@ _BrunswickEndBattleText2:: prompt _BrunswickAfterBattleText2:: - text "I saw a BIRD" + text "I saw a bird" line "#MON with huge" cont "legs sprint past" cont "me!" diff --git a/text/CeladonCity.asm b/text/CeladonCity.asm index a0e4826e..6d05a2b0 100644 --- a/text/CeladonCity.asm +++ b/text/CeladonCity.asm @@ -67,7 +67,8 @@ _CeladonCityText6:: para "It evolved from" line "POLIWHIRL when I" - cont "used WATER STONE!" + cont "gave it a WATER" + cont "STONE!" done _CeladonCityText7:: @@ -138,7 +139,8 @@ _CeladonCityText16:: line "protects #MON" cont "against SPECIAL" cont "attacks such as" - cont "fire and water!" + cont "FIRE- and WATER-" + cont "type techniques!" para "It even improves" line "their own!" diff --git a/text/CeladonGym.asm b/text/CeladonGym.asm index 80bfd30a..fea9feee 100644 --- a/text/CeladonGym.asm +++ b/text/CeladonGym.asm @@ -14,7 +14,7 @@ _ErikaPreBattleText:: para "I teach the art of" line "flower arranging." cont "My #MON are of" - cont "the grass-type." + cont "the GRASS-type." para "Oh, I'm sorry, I" line "had no idea that" @@ -110,13 +110,14 @@ _CeladonGymEndBattleText3:: prompt _CeladonGymAfterBattleText3:: - text "Grass-type #MON" + text "GRASS-type #MON" line "are tough against" - cont "the water-type!" + cont "the WATER-type!" para "They also have an" - line "edge on rock and" - cont "ground #MON!" + line "advantage against" + cont "ROCK- and GROUND-" + cont "type #MON!" done _CeladonGymBattleText4:: @@ -137,8 +138,8 @@ _CeladonGymAfterBattleText4:: done _CeladonGymBattleText5:: - text "Look at my grass" - line "#MON!" + text "Look at my GRASS-" + line "type #MON!" para "They're so easy" line "to raise!" @@ -149,7 +150,7 @@ _CeladonGymEndBattleText5:: prompt _CeladonGymAfterBattleText5:: - text "We only use grass-" + text "We only use GRASS-" line "type #MON at" cont "our GYM!" @@ -160,8 +161,8 @@ _CeladonGymAfterBattleText5:: _CeladonGymBattleText6:: text "Don't bring any" - line "bugs or fire" - cont "#MON in here!" + line "BUG- or FIRE-" + cont "type #MON!" done _CeladonGymEndBattleText6:: diff --git a/text/CeladonMansionRoofHouse.asm b/text/CeladonMansionRoofHouse.asm index 99ec671b..31d4a561 100644 --- a/text/CeladonMansionRoofHouse.asm +++ b/text/CeladonMansionRoofHouse.asm @@ -51,31 +51,20 @@ _JackyAfterBattle:: cont "slow motion..." para "Ok! I will give" - line "you a #MON" - cont "to help you on" - cont "your quest!" + line "you a gift to" + cont "help you on your" + cont "quest!" para "Over there is a" - line "@" - text_ram wcd6d - text "!" + line "rare #MON!" para "Go, go, take it!" -; para "I look forward" -; line "to our next bout!" done _JackyGift:: - text_ram wcd6d - text " has" - line "incredibly good" - cont "evolutionary" - cont "potential!" - - para "It will help" - line "you greatly in" - cont "your next bout!" + line "I look forward to" + line "our next bout!" done _JackyN64:: diff --git a/text/CelesteHillCave.asm b/text/CelesteHillCave.asm index fb58d735..cb3073ac 100644 --- a/text/CelesteHillCave.asm +++ b/text/CelesteHillCave.asm @@ -26,7 +26,7 @@ _CelesteHillCaveBattleText2:: _CelesteHillCaveEndBattleText2:: text "...!" line "You are not an" - cont "ordinary TRAINER!" + cont "ordinary trainer!" prompt _CelesteHillCaveAfterBattleText2:: ; Allusion to the lack of a Teachy TV diff --git a/text/CeruleanCaveB1F.asm b/text/CeruleanCaveB1F.asm index cb407c60..9d048c26 100644 --- a/text/CeruleanCaveB1F.asm +++ b/text/CeruleanCaveB1F.asm @@ -1,3 +1,7 @@ _MewtwoBattleText:: - text "Mew!@" + text "MEWTWO: ..." + + para "..." + + para "...Mew!!!@" text_end diff --git a/text/CeruleanGym.asm b/text/CeruleanGym.asm index d8643b6c..f71453b1 100644 --- a/text/CeruleanGym.asm +++ b/text/CeruleanGym.asm @@ -13,7 +13,7 @@ _MistyPreBattleText:: para "My policy is an" line "all-out offensive" - cont "with water-type" + cont "with WATER-type" cont "#MON!" done @@ -111,8 +111,8 @@ _CeruleanGymEndBattleText3:: _CeruleanGymAfterBattleText3:: text "Why is a FIRE-" line "FIGHTER in a" - cont "GYM for water" - cont "#MON?" + cont "GYM for WATER-" + cont "type #MON?" para "Haha! You have to" ; Actually happens in real life! line "check for short" @@ -121,13 +121,13 @@ _CeruleanGymAfterBattleText3:: _CeruleanGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "Here's my advice!" para "The LEADER, MISTY," line "is a pro who uses" - cont "water #MON!" + cont "WATER-types!" para "You can drain all" line "their water with" @@ -141,7 +141,7 @@ _CeruleanGymGuidePostBattleText:: text "You beat MISTY!" line "What'd I tell ya?" - para "You and me kid," + para "You and me, kid," line "we make a pretty" cont "darn good team!" done diff --git a/text/CinnabarGym.asm b/text/CinnabarGym.asm index 7328f9e5..703a5a19 100644 --- a/text/CinnabarGym.asm +++ b/text/CinnabarGym.asm @@ -23,11 +23,11 @@ _ReceivedVolcanoBadgeText:: _BlainePostBattleAdviceText:: text "FIRE BLAST is the" - line "ultimate fire" + line "ultimate fiery" cont "technique!" para "Don't waste it on" - line "water #MON!" + line "WATER-types!" done _BlaineVolcanoBadgeInfoText:: @@ -55,7 +55,7 @@ _TM38ExplanationText:: para "TM38 contains" line "FIRE BLAST!" - para "Teach it to fire-" + para "Teach it to FIRE-" line "type #MON!" para "CHARMELEON or" @@ -124,7 +124,7 @@ _CinnabarGymAfterBattleText3:: _CinnabarGymBattleText4:: text "I just like using" - line "fire #MON!" + line "the FIRE-type!" done _CinnabarGymEndBattleText4:: @@ -133,9 +133,9 @@ _CinnabarGymEndBattleText4:: prompt _CinnabarGymAfterBattleText4:: - text "I wish there was" - line "a thief #MON!" - cont "I'd use that!" + text "I wonder...does a" + line "FIRE-type thief" + cont "#MON exist?" done _CinnabarGymBattleText5:: @@ -170,9 +170,9 @@ _CinnabarGymEndBattleText6:: prompt _CinnabarGymAfterBattleText6:: - text "Us fire #MON" - line "fans like PONYTA" - cont "and NINETALES!" + text "Us FIRE-type fans" + line "like PONYTA and" + cont "NINETALES a lot!" done _CinnabarGymBattleText7:: @@ -186,21 +186,27 @@ _CinnabarGymEndBattleText7:: prompt _CinnabarGymAfterBattleText7:: - text "Water beats fire!" - line "But, fire melts" - cont "ice #MON!" + text "Water beats fire," + line "but fire easily" + cont "melts ice!" + + para "WATER- and ICE-" + line "type #MON like" + cont "DEWGONG can be" + cont "tricky..." done _CinnabarGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "The hot-headed" - line "BLAINE is a fire" - cont "#MON pro!" + line "BLAINE is a FIRE-" + cont "type #MON pro!" para "Douse his spirits" - line "with water!" + line "with WATER-type" + cont "techniques!" para "You better take" line "some BURN HEALs!" diff --git a/text/CinnabarPokecenter.asm b/text/CinnabarPokecenter.asm index f56bfcb7..d8f99c91 100644 --- a/text/CinnabarPokecenter.asm +++ b/text/CinnabarPokecenter.asm @@ -33,7 +33,7 @@ _PoryZSalesmanText1:: para "Tell you what." line "You can get a" - cont "copy for ¥2100." + cont "copy for ¥3000." cont "What do you say?" done @@ -44,6 +44,11 @@ _PoryZSalesmanNoText:: cont "chance!" done +_ReceivedDubiousDiscText:: + text " received" + line "DUBIOUS DISC!@" + text_end + _PoryZSalesmanNoMoneyText:: text "You'll need more" line "money than that!" @@ -59,4 +64,6 @@ _PoryZBagFull:: text "Hey, your bag's" line "full! Can't sell" cont "you anything like" - cont "that!" \ No newline at end of file + cont "that!" + done + \ No newline at end of file diff --git a/text/CitrineCity.asm b/text/CitrineCity.asm index 10525626..fc9d55f4 100644 --- a/text/CitrineCity.asm +++ b/text/CitrineCity.asm @@ -75,7 +75,7 @@ _CitrineCityText3:: done _CitrineCityText4:: - text "Some BIRD #MON" + text "Some bird #MON" line "roost on the" cont "hill north of" cont "here every year." diff --git a/text/CitrineTradebackHouse.asm b/text/CitrineTradebackHouse.asm index 5efef4ea..fc1604f8 100644 --- a/text/CitrineTradebackHouse.asm +++ b/text/CitrineTradebackHouse.asm @@ -10,6 +10,6 @@ _CitrineTradebackHouseGuy:: _CitrineTradebackHouseBooklet:: text "It's a book showing" - line "two strange BIRD" + line "two strange bird" cont "#MON." done diff --git a/text/FightingDojo.asm b/text/FightingDojo.asm index 7d7ba24a..d9c56be9 100644 --- a/text/FightingDojo.asm +++ b/text/FightingDojo.asm @@ -28,7 +28,8 @@ _FightingDojoText_5ce98:: para "In return, I will" line "give you a prized" - cont "fighting #MON!" + cont "FIGHTING-type" + cont "#MON!" para "Choose whichever" line "one you like!" diff --git a/text/FuchsiaCity.asm b/text/FuchsiaCity.asm index 7d04a0db..498d0277 100644 --- a/text/FuchsiaCity.asm +++ b/text/FuchsiaCity.asm @@ -145,6 +145,11 @@ _SafariBallSalesmanNoText:: cont "me?" done +_ReceivedSafariBallsText:: + text " received" + line "3 SAFARI BALLS!@" + text_end + _SafariBallSalesmanNoMoneyText:: text "Not enough money?" line "Sorry, kid! Paint" @@ -160,6 +165,7 @@ _SafariBallBagFull:: line "give you these" cont "when your bag's" cont "that full!" + done _ReceivedTM50Text:: text " received" diff --git a/text/FuchsiaGym_2.asm b/text/FuchsiaGym_2.asm index c256e019..4f76173c 100644 --- a/text/FuchsiaGym_2.asm +++ b/text/FuchsiaGym_2.asm @@ -172,7 +172,7 @@ _FuchsiaGymAfterBattleText6:: _FuchsiaGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "FUCHSIA GYM is" line "riddled with" diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8..a237090c 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -88,11 +88,12 @@ _CeladonGameCornerText_48dca:: para "You have better" line "things to do," - cont "champ in making!" + cont "champ in the" + cont "making!" para "CELADON GYM's" line "LEADER is ERIKA!" - cont "She uses grass-" + cont "She uses GRASS-" cont "type #MON!" para "She might appear" diff --git a/text/LoreleisRoom.asm b/text/LoreleisRoom.asm index 868cb7f3..b9bb8a17 100644 --- a/text/LoreleisRoom.asm +++ b/text/LoreleisRoom.asm @@ -60,7 +60,7 @@ _LoreleiRematchAfterBattleText:: text "I may have lost" line "to you, but I'll" cont "never give up on" - cont "ice #MON!" + cont "icy #MON!" para "You should aim to" line "win using #MON" diff --git a/text/OaksLab.asm b/text/OaksLab.asm index f384f56c..c40f65c2 100644 --- a/text/OaksLab.asm +++ b/text/OaksLab.asm @@ -27,32 +27,32 @@ _OaksLabText39:: _OaksLabCharmanderText:: text "So! You want the" - line "fire #MON," + line "FIRE #MON," cont "CHARMANDER?" done _OaksLabSquirtleText:: text "So! You want the" - line "water #MON," + line "WATER #MON," cont "SQUIRTLE?" done _OaksLabBulbasaurText:: text "So! You want the" - line "plant #MON," + line "GRASS #MON," cont "BULBASAUR?" done _OaksLabPikachuText:: text "So! You want the" - line "electric #MON," + line "mouse #MON," cont "PIKACHU?" done _OaksLabEeveeText:: text "So! You want the" - line "normal #MON," - cont "EEVEE?" + line "evolution #-" + cont "MON, EEVEE?" done _OaksLabMonEnergeticText:: diff --git a/text/PewterCity.asm b/text/PewterCity.asm index 14240c9e..3e579462 100644 --- a/text/PewterCity.asm +++ b/text/PewterCity.asm @@ -1,6 +1,6 @@ _PewterCityText1:: text "It's rumored that" - line "CLEFAIRYs came" + line "CLEFAIRY came" cont "from the moon!" para "They appeared " diff --git a/text/PewterGym.asm b/text/PewterGym.asm index 8110b116..47293b6a 100644 --- a/text/PewterGym.asm +++ b/text/PewterGym.asm @@ -9,7 +9,7 @@ _BrockPreBattleText:: para "That's why my" line "#MON are all" - cont "the rock-type!" + cont "the ROCK-type!" para "Do you still want" line "to challenge me?" diff --git a/text/PokemonMansionB2F.asm b/text/PokemonMansionB2F.asm index 01974718..9242d0f9 100644 --- a/text/PokemonMansionB2F.asm +++ b/text/PokemonMansionB2F.asm @@ -6,7 +6,7 @@ _B2FBook1:: para "We are getting" line "high energy" cont "readings from" - cont "MEWTWO's PSYCHIC" + cont "MEWTWO's psychic" cont "power!" para "But..." diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm index 1a565eb3..bbfd98b6 100644 --- a/text/RockTunnelB1F.asm +++ b/text/RockTunnelB1F.asm @@ -77,7 +77,7 @@ _RockTunnel2EndBattleText6:: _RockTunnel2AfterBattleText6:: text "In mountains," line "you'll often find" - cont "rock-type #MON." + cont "ROCK-type #MON." done _RockTunnel2BattleText7:: diff --git a/text/Route1.asm b/text/Route1.asm index da7ba7c2..85b6a7a2 100644 --- a/text/Route1.asm +++ b/text/Route1.asm @@ -146,7 +146,7 @@ _OakCitrineExplain:: cont "go to become far" cont "stronger." - para "Some strange BIRD" + para "Some strange bird" line "#MON are said" cont "to roost there," cont "but they are so" diff --git a/text/Route9.asm b/text/Route9.asm index 9975000d..cbdc42e5 100644 --- a/text/Route9.asm +++ b/text/Route9.asm @@ -135,8 +135,8 @@ _Route9AfterBattleText8:: done _Route9BattleText9:: - text "Go, my super bug" - line "#MON!" + text "Go, my super BUG-" + line "type #MON!" done _Route9EndBattleText9:: @@ -146,7 +146,7 @@ _Route9EndBattleText9:: _Route9AfterBattleText9:: text "If you don't like" - line "bug #MON, you" + line "bugs, you really" cont "bug me!" done diff --git a/text/SaffronCity.asm b/text/SaffronCity.asm index 3b8cc3e0..0fc7ee73 100644 --- a/text/SaffronCity.asm +++ b/text/SaffronCity.asm @@ -102,7 +102,7 @@ _SaffronCityText18:: cont "LEADER: SABRINA" para "The Master of" - line "Psychic #MON!" + line "PSI #MON!" done _SaffronCityText20:: diff --git a/text/SaffronGym.asm b/text/SaffronGym.asm index 8a39e02f..517ec61e 100644 --- a/text/SaffronGym.asm +++ b/text/SaffronGym.asm @@ -72,15 +72,15 @@ _TM46NoRoomText:: _SaffronGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "SABRINA's #MON" line "use psychic power" cont "instead of force!" - para "Fighting #MON" + para "FIGHTING-types" line "are weak against" - cont "psychic #MON!" + cont "psychic power!" para "They get creamed" line "before they can" @@ -129,8 +129,9 @@ _SaffronGymEndBattleText2:: prompt _SaffronGymAfterBattleText2:: - text "Psychic #MON" - line "fear only bugs!" ; changed to the Yellow version because this guy LIES in RGB + text "PSYCHIC-types are" + line "afraid of DARK-" + cont "and BUG-types!" done _SaffronGymBattleText3:: diff --git a/text/SilphCo11F.asm b/text/SilphCo11F.asm index 1a55b07d..5b94eeb9 100644 --- a/text/SilphCo11F.asm +++ b/text/SilphCo11F.asm @@ -148,7 +148,7 @@ _SilphCo10Text_6237b:: _OmegaBattleText:: text "Bzzt! Clank!" - text_end + done ; Fun fact: For some reason, this text is stored in 10F. Seems to be a beta element - they ARE encountered in 11F. _SilphCoJessieJamesText1:: diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index ca64953a..5967a8e2 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -8,9 +8,13 @@ _ChiefMonologue:: para "However, I can't" line "let you leave" - cont "this place. You" - cont "are still looking" - cont "for the ultimate" + cont "this place quite" + cont "yet..." + prompt + +_ChiefMonologueMasterBallNotUsed:: + text "You're looking for" + line "for the ultimate" cont "#MON, aren't" cont "you?" @@ -22,10 +26,8 @@ _ChiefMonologue:: cont "GIOVANNI gone," cont "our company is" cont "going under!" - prompt -_ChiefMonologueMasterBallNotUsed:: - text "Now there's only" + para "Now there's only" line "one way to catch" cont "MEWTWO, and it's" cont "in your hands!" @@ -33,10 +35,24 @@ _ChiefMonologueMasterBallNotUsed:: para "!" para "Give me that BALL!" - prompt + done _ChiefMonologueMasterBallUsed:: - text "...what? You used" + text "You're looking for" + line "for the ultimate" + cont "#MON, aren't" + cont "you?" + + para "That MASTER" + line "BALL... I should" + cont "never have given" + cont "it to you! With" + cont "MEWTWO loose and" + cont "GIOVANNI gone," + cont "our company is" + cont "going under!" + + para "...what? You used" line "the MASTER BALL?!" para "You stupid child!" @@ -50,7 +66,31 @@ _ChiefMonologueMasterBallUsed:: para "You are in for" line "a world of hurt!" ; Like Giovanni, but with a slightly more pompous tone in using "hurt". - prompt + done + +_ChiefMonologueMasterBallNotCollected:: + text "As I watched you" + line "battle GIOVANNI," + cont "I know how you" + cont "and your #MON" + cont "fight." + + para "I must say, your" + line "strength seems..." + cont "promising. That's" + cont "why I invited you" + cont "here, after all." + + para "Before my next big" + line "plan, I must see" + cont "how well I stand" + cont "against the new" + cont "champion!" + + para "!" + + para "Give it your all!" + done _ChiefDefeatedText:: text "No! I..." @@ -92,6 +132,27 @@ _ChiefAfterBattleText:: cont "world." done + +_ChiefAltAfterBattleText:: + text "CHIEF: Just as" + line "I thought..." + cont "No product I" + cont "have is capable" + cont "of trouncing you." + + para "Money means I can" + line "be as powerful as" + cont "I want, but what" + cont "I do with that" + cont "power...is very" + cont "important." + + para "I still have much" + line "yet to learn..." + + para "Go." + + done _ChiefPCText:: text "It's a PC with" @@ -119,3 +180,46 @@ _ChiefPainting2:: line "of GAWARHED, an" cont "extinct #MON!" done + +_ChiefMonologueRematch:: + text "CHIEF: What?" + line "you're back?" + + para "Hmm...you're" + line "looking for a" + cont "rematch, is that" + cont "it?" + + para "Alright, if you" + line "insist. OMEGADGE" + cont "could always use" + cont "some more battle" + cont "data..." + + para "So, no holding" + line "back!" + done + +_ChiefDefeatedText2:: + text "Impressive" + line "work..." + prompt + +_ChiefVictoryText2:: + text "CHIEF: I" + line "expected better." + prompt + +_ChiefAfterBattleText2:: + text "CHIEF: It really" + line "is no wonder" + cont "how you've been" + cont "capable of" + cont "accomplishing so" + cont "much..." + + para "You truly trust" + line "and care for" + cont "your #MON." + + done diff --git a/text/VermilionGym_2.asm b/text/VermilionGym_2.asm index be6198df..5f7a113e 100644 --- a/text/VermilionGym_2.asm +++ b/text/VermilionGym_2.asm @@ -6,7 +6,7 @@ _LTSurgePostBattleAdviceText:: line "sure powerful!" para "But, it's useless" - line "against ground-" + line "against GROUND-" cont "type #MON!" done @@ -37,7 +37,9 @@ _TM24ExplanationText:: line "THUNDERBOLT!" para "Teach it to an" - line "electric #MON!" + line "ELECTRIC-type," + cont "like PIKACHU or" + cont "GAOTORA!" done _TM24NoRoomText:: @@ -119,7 +121,7 @@ _VermilionGymAfterBattleText3:: _VermilionGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" + line "the making!" para "LT.SURGE has a" line "nickname. People" @@ -128,9 +130,10 @@ _VermilionGymGuidePreBattleText:: cont "American!" para "He's an expert on" - line "electric #MON!" + line "ELECTRIC-type" + cont "#MON!" - para "Birds and water" + para "Birds and aquatic" line "#MON are at" cont "risk! Beware of" cont "paralysis too!" diff --git a/text/ViridianGym.asm b/text/ViridianGym.asm index 5544e433..d02a6f9f 100644 --- a/text/ViridianGym.asm +++ b/text/ViridianGym.asm @@ -143,7 +143,7 @@ _ViridianGymEndBattleText4:: _ViridianGymAfterBattleText4:: text "If my #MON" line "were as good at" - cont "Karate as I..." + cont "karate as I..." done _ViridianGymBattleText5:: @@ -214,11 +214,7 @@ _ViridianGymAfterBattleText8:: _ViridianGymGuidePreBattleText:: text "Yo! Champ in" - line "making!" - - para "Even I don't know" - line "VIRIDIAN LEADER's" - cont "identity!" + line "the making!" para "This will be the" line "toughest of all" @@ -226,7 +222,7 @@ _ViridianGymGuidePreBattleText:: para "I heard that the" line "trainers here" - cont "like ground-type" + cont "like GROUND-type" cont "#MON!" done