From 2b3da5e254d511d812df9f21e6fff8483092b1ee Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Fri, 4 Nov 2022 11:12:44 +0000 Subject: [PATCH] A few fixes + added Blahaj cameo Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark. (note that KEP is not sponsored by IKEA) --- README.md | 5 +- constants/map_constants.asm | 68 +++---- data/maps/objects/CopycatsHouse2F.asm | 4 +- data/maps/objects/FarawayIslandOutside.asm | 4 +- data/maps/objects/PewterCity.asm | 2 +- data/maps/objects/Route6.asm | 2 + data/maps/objects/Route8.asm | 2 + .../objects/UndergroundPathNorthSouth.asm | 2 +- data/maps/objects/UndergroundPathRoute7.asm | 5 +- data/maps/objects/VermilionCity.asm | 1 - data/pokemon/base_stats/missingno.asm | 22 +-- data/pokemon/menu_icons.asm | 3 +- engine/gfx/mon_icons.asm | 1 + gfx/sprites/truck_sprite.png | Bin 1728 -> 0 bytes gfx/trainer_card/badges.png | Bin 1125 -> 1266 bytes maps/PewterCity.blk | 6 +- maps/Route12.blk | 2 +- maps/Route6.blk | 2 +- maps/Route7.blk | 2 +- maps/Route8.blk | 2 +- maps/UndergroundPathNorthSouth.blk | 2 +- maps/UndergroundPathRoute7.blk | Bin 16 -> 16 bytes maps/VermilionCity.blk | 2 +- scripts/VermilionDock.asm | 167 ------------------ text/CopycatsHouse2F.asm | 9 +- 25 files changed, 73 insertions(+), 242 deletions(-) delete mode 100644 gfx/sprites/truck_sprite.png diff --git a/README.md b/README.md index d1185a87..09970fc4 100644 --- a/README.md +++ b/README.md @@ -134,6 +134,7 @@ Known Bugs - Some sprites in the Celadon University area spawn bugged out on certain emulators. - Battling multiple of the trainers in Celadon University causes a crash when attempting to go to Route 16 - The lone Rocket in Viridian Gym's basement needs to be directly spoken to to be battled +- Faraway Island Inside can't be entered Credits ==== @@ -144,10 +145,10 @@ Credits * ausma - Showdown Mod assistance * Paulluxx - Showdown Mod assistance * DuoM2 - Showdown Mod assistance -* Albatross - Much of the new sprites used in the hack +* Albatross - Several of the new sprites used in the hack (Electivire, Magmortar, Rhyperior, Tangrowth, Glaceon, Sylveon...) * ZumiIsawhat? - Restorations of beta OST * Helix Chamber, RacieBeep, et al - Prototype Pokémon sprites -* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with the eventual final Mew encounter. +* Vortyne - Reused a bit of code from their pureRGB hack, which was used to assist with making MissingNo. stable. * Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld! Original README.md proceeding; diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 44014761..8bcc3fed 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -88,16 +88,16 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst BIKE_SHOP, 4, 4 ; $42 mapconst CERULEAN_MART, 4, 4 ; $43 mapconst MT_MOON_POKECENTER, 4, 7 ; $44 - mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 ; Unused + mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 - Unused mapconst ROUTE_5_GATE, 3, 4 ; $46 mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47 mapconst DAYCARE, 4, 4 ; $48 mapconst ROUTE_6_GATE, 3, 4 ; $49 mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A - mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B ; Unused + mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B - Unused mapconst ROUTE_7_GATE, 4, 3 ; $4C mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D - mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E ; Unused + mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E - Unused mapconst ROUTE_8_GATE, 4, 3 ; $4F mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50 mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 @@ -124,19 +124,19 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66 mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67 mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68 - mapconst SILPH_GAUNTLET_1F, 9, 10 ; $69 ; Gauntlet Floor 1: Viridian Forest - mapconst SILPH_GAUNTLET_2F, 10, 13 ; $6A ; Gauntlet Floor 2: Mt. Moon - mapconst SILPH_GAUNTLET_3F, 13, 17 ; $6B ; Gauntlet Floor 3: S.S. Anne + mapconst SILPH_GAUNTLET_1F, 9, 10 ; $69 - Was UNUSED_MAP_69 + mapconst SILPH_GAUNTLET_2F, 10, 13 ; $6A - Was UNUSED_MAP_6A + mapconst SILPH_GAUNTLET_3F, 13, 17 ; $6B - Was UNUSED_MAP_6B mapconst VICTORY_ROAD_1F, 9, 10 ; $6C - mapconst SILPH_GAUNTLET_4F, 9, 10 ; $6D ; Gauntlet Floor 4: Lavender Tower - mapconst SILPH_GAUNTLET_5F, 9, 10 ; $6E ; Gauntlet Floor 5: Safari Zone - mapconst SILPH_GAUNTLET_6F, 12, 12 ; $6F ; Gauntlet Floor 6: Pokemon Mansion - mapconst SILPH_GAUNTLET_7F, 5, 6 ; $70 ; Gauntlet Floor 7: Chief's Office + mapconst SILPH_GAUNTLET_4F, 9, 10 ; $6D - Was UNUSED_MAP_6D + mapconst SILPH_GAUNTLET_5F, 9, 10 ; $6E - Was UNUSED_MAP_6E + mapconst SILPH_GAUNTLET_6F, 12, 12 ; $6F - Was UNUSED_MAP_6F + mapconst SILPH_GAUNTLET_7F, 5, 6 ; $70 - Was UNUSED_MAP_70 mapconst LANCES_ROOM, 13, 13 ; $71 - mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $72 ; Unused UNUSED_MAP_72 - mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $73 ; Unused UNUSED_MAP_73 - mapconst POKEMON_MANSION_B2F, 12, 15 ; $74 ; Unused UNUSED_MAP_74 - mapconst UNUSED_MAP_75, 0, 0 ; $75 ; Unused + mapconst FARAWAY_ISLAND_OUTSIDE, 18, 15 ; $72 - Was UNUSED_MAP_72 + mapconst FARAWAY_ISLAND_INSIDE, 11, 15 ; $73 - Was UNUSED_MAP_73 + mapconst POKEMON_MANSION_B2F, 12, 15 ; $74 - Was UNUSED_MAP_74 + mapconst UNUSED_MAP_75, 0, 0 ; $75 - Unused mapconst HALL_OF_FAME, 4, 5 ; $76 mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 mapconst CHAMPIONS_ROOM, 4, 4 ; $78 @@ -163,9 +163,9 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst LAVENDER_POKECENTER, 4, 7 ; $8D mapconst POKEMON_TOWER_1F, 9, 10 ; $8E mapconst POKEMON_TOWER_2F, 9, 10 ; $8F - mapconst POKEMON_TOWER_3F, 9, 10 ; $90 ; Unused - mapconst POKEMON_TOWER_4F, 9, 10 ; $91 ; Unused - mapconst POKEMON_TOWER_5F, 9, 10 ; $92 ; Unused + mapconst POKEMON_TOWER_3F, 9, 10 ; $90 - Now unused + mapconst POKEMON_TOWER_4F, 9, 10 ; $91 - Now unused + mapconst POKEMON_TOWER_5F, 9, 10 ; $92 - Now unused mapconst POKEMON_TOWER_6F, 9, 10 ; $93 mapconst POKEMON_TOWER_7F, 9, 10 ; $94 mapconst MR_FUJIS_HOUSE, 4, 4 ; $95 @@ -182,7 +182,7 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst SEAFOAM_ISLANDS_B2F, 9, 15 ; $A0 mapconst SEAFOAM_ISLANDS_B3F, 9, 15 ; $A1 mapconst SEAFOAM_ISLANDS_B4F, 9, 15 ; $A2 - mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A3 + mapconst VERMILION_OLD_ROD_HOUSE, 4, 4 ; $A3 - Now unused mapconst FUCHSIA_GOOD_ROD_HOUSE, 4, 4 ; $A4 mapconst POKEMON_MANSION_1F, 14, 15 ; $A5 mapconst CINNABAR_GYM, 9, 10 ; $A6 @@ -192,7 +192,7 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA mapconst CINNABAR_POKECENTER, 4, 7 ; $AB mapconst CINNABAR_MART, 4, 4 ; $AC - mapconst CINNABAR_MART_COPY, 4, 4 ; $AD ; Unused + mapconst CINNABAR_MART_COPY, 4, 4 ; $AD - Unused mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 @@ -219,13 +219,13 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst DIGLETTS_CAVE, 18, 20 ; $C5 mapconst VICTORY_ROAD_3F, 9, 15 ; $C6 mapconst ROCKET_HIDEOUT_B1F, 14, 11 ; $C7 - mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 ; Unused, Citrine PokeCenter? - mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 ; Unused, Citrine PokeMart? - mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA ; Unused, Citrine House 1? - mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB ; Unused, Citrine House 2? - mapconst UNUSED_MAP_CC, 0, 0 ; $CC ; Unused, Citrine Dock? - mapconst UNUSED_MAP_CD, 0, 0 ; $CD ; Unused, Citrine Cave 1F? - mapconst UNUSED_MAP_CE, 0, 0 ; $CE ; Unused, Citrine Cave B1F? + mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 - Now unused, Citrine PokeCenter? + mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 - Now unused, Citrine PokeMart? + mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA - Now unused, Citrine House 1? + mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB - Now unused, Citrine Dock? + mapconst UNUSED_MAP_CC, 0, 0 ; $CC - Unused, Citrine House 2? + mapconst UNUSED_MAP_CD, 0, 0 ; $CD - Unused, Citrine Cave 1F? + mapconst UNUSED_MAP_CE, 0, 0 ; $CE - Unused, Citrine Cave B1F? mapconst SILPH_CO_2F, 9, 15 ; $CF mapconst SILPH_CO_3F, 9, 15 ; $D0 mapconst SILPH_CO_4F, 9, 15 ; $D1 @@ -250,23 +250,23 @@ DEF FIRST_INDOOR_MAP EQU const_value mapconst CERULEAN_CAVE_1F, 9, 15 ; $E4 mapconst NAME_RATERS_HOUSE, 4, 4 ; $E5 mapconst CERULEAN_BADGE_HOUSE, 4, 4 ; $E6 - mapconst CINNABAR_VOLCANO, 12, 14 ; $E7 - was UNUSED_MAP_E7 + mapconst CINNABAR_VOLCANO, 12, 14 ; $E7 - Was UNUSED_MAP_E7 mapconst ROCK_TUNNEL_B1F, 18, 20 ; $E8 mapconst SILPH_CO_9F, 9, 13 ; $E9 mapconst SILPH_CO_10F, 9, 8 ; $EA mapconst SILPH_CO_11F, 9, 9 ; $EB mapconst SILPH_CO_ELEVATOR, 2, 2 ; $EC - mapconst UNUSED_MAP_ED, 0, 0 ; $ED ; Unused - mapconst UNUSED_MAP_EE, 0, 0 ; $EE ; Unused + mapconst UNUSED_MAP_ED, 0, 0 ; $ED - Unused + mapconst UNUSED_MAP_EE, 0, 0 ; $EE - Unused mapconst TRADE_CENTER, 4, 5 ; $EF mapconst COLOSSEUM, 4, 5 ; $F0 - mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - was UNUSED_MAP_F1 - mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - was UNUSED_MAP_F2 - mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - was UNUSED_MAP_F3 - mapconst UNUSED_MAP_F4, 0, 0 ; $F4 ; Unused, Bill's Garden + mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - Was UNUSED_MAP_F1 + mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - Was UNUSED_MAP_F2 + mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - Was UNUSED_MAP_F3 + mapconst UNUSED_MAP_F4, 0, 0 ; $F4 - Unused, will be Bill's Garden mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst BRUNOS_ROOM, 6, 5 ; $F6 - mapconst AGATHAS_ROOM, 6, 5 ; $F7 ; Maps F8 - FE currently have no data + mapconst AGATHAS_ROOM, 6, 5 ; $F7 - Maps F8 - FE currently have no data DEF NUM_MAPS EQU const_value ; Indoor maps, such as houses, use this as the Map ID in their exit warps diff --git a/data/maps/objects/CopycatsHouse2F.asm b/data/maps/objects/CopycatsHouse2F.asm index 86449065..60532519 100644 --- a/data/maps/objects/CopycatsHouse2F.asm +++ b/data/maps/objects/CopycatsHouse2F.asm @@ -10,9 +10,9 @@ CopycatsHouse2F_Object: def_object_events object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person - object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person + object_event 0, 6, SPRITE_SEEL, STAY, RIGHT, 2 ; person object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person - object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person + object_event 4, 6, SPRITE_FAIRY, STAY, LEFT, 5 ; person def_warps_to COPYCATS_HOUSE_2F diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index 76cedfab..3acbdab4 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -2,8 +2,8 @@ FarawayIslandOutside_Object: db $2d ; border block def_warp_events - warp_event 2, 35, VERMILION_CITY, 11 - warp_event 3, 35, VERMILION_CITY, 10 + warp_event 2, 35, VERMILION_CITY, 10 + warp_event 3, 35, VERMILION_CITY, 9 warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1 warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2 diff --git a/data/maps/objects/PewterCity.asm b/data/maps/objects/PewterCity.asm index ecbe5008..ba65c753 100644 --- a/data/maps/objects/PewterCity.asm +++ b/data/maps/objects/PewterCity.asm @@ -9,7 +9,7 @@ PewterCity_Object: warp_event 23, 17, PEWTER_MART, 1 warp_event 7, 29, PEWTER_SPEECH_HOUSE, 1 warp_event 13, 25, PEWTER_POKECENTER, 1 - warp_event 27, 21, ROUTE_12_SUPER_ROD_HOUSE, 1 + warp_event 7, 11, ROUTE_12_SUPER_ROD_HOUSE, 1 def_bg_events bg_event 19, 29, 6 ; PewterCityText6 diff --git a/data/maps/objects/Route6.asm b/data/maps/objects/Route6.asm index 3ced3768..33748f0f 100644 --- a/data/maps/objects/Route6.asm +++ b/data/maps/objects/Route6.asm @@ -5,8 +5,10 @@ Route6_Object: warp_event 9, 1, ROUTE_6_GATE, 3 warp_event 10, 1, ROUTE_6_GATE, 3 warp_event 10, 7, ROUTE_6_GATE, 1 + warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1 def_bg_events + bg_event 19, 15, 7 ; Route6Text7 def_object_events object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4 diff --git a/data/maps/objects/Route8.asm b/data/maps/objects/Route8.asm index 2d8bc9dc..61faa47f 100644 --- a/data/maps/objects/Route8.asm +++ b/data/maps/objects/Route8.asm @@ -6,8 +6,10 @@ Route8_Object: warp_event 1, 10, ROUTE_8_GATE, 2 warp_event 8, 9, ROUTE_8_GATE, 3 warp_event 8, 10, ROUTE_8_GATE, 4 + warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1 def_bg_events + bg_event 17, 3, 10 ; Route8Text10 def_object_events object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3 diff --git a/data/maps/objects/UndergroundPathNorthSouth.asm b/data/maps/objects/UndergroundPathNorthSouth.asm index fd512414..6fabb0e3 100644 --- a/data/maps/objects/UndergroundPathNorthSouth.asm +++ b/data/maps/objects/UndergroundPathNorthSouth.asm @@ -4,7 +4,7 @@ UndergroundPathNorthSouth_Object: def_warp_events warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 3 warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 3 - warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 2 + warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 3 def_bg_events diff --git a/data/maps/objects/UndergroundPathRoute7.asm b/data/maps/objects/UndergroundPathRoute7.asm index 7f0d4263..47ae45f9 100644 --- a/data/maps/objects/UndergroundPathRoute7.asm +++ b/data/maps/objects/UndergroundPathRoute7.asm @@ -4,12 +4,11 @@ UndergroundPathRoute7_Object: def_warp_events warp_event 3, 7, LAST_MAP, 5 warp_event 4, 7, LAST_MAP, 5 - warp_event 6, 2, UNDERGROUND_PATH_WEST_EAST, 1 - warp_event 1, 3, UNDERGROUND_PATH_NORTH_SOUTH, 2 + warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1 def_bg_events def_object_events - object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person + object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person def_warps_to UNDERGROUND_PATH_ROUTE_7 diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 29eb92dc..40e5df2d 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -10,7 +10,6 @@ VermilionCity_Object: warp_event 18, 31, VERMILION_DOCK, 1 warp_event 19, 31, VERMILION_DOCK, 1 warp_event 15, 13, VERMILION_TRADE_HOUSE, 1 - warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1 warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2 warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1 diff --git a/data/pokemon/base_stats/missingno.asm b/data/pokemon/base_stats/missingno.asm index 380e060e..fc0c486f 100644 --- a/data/pokemon/base_stats/missingno.asm +++ b/data/pokemon/base_stats/missingno.asm @@ -1,6 +1,6 @@ db DEX_MISSINGNO ; pokedex id - db 211, 157, 53, 31, 47 + db 211, 157, 53, 29, 73 ; hp atk def spd spc db BIRD, NORMAL ; type @@ -10,21 +10,17 @@ INCBIN "gfx/pokemon/front/missingno.pic", 0, 1 ; sprite dimensions dw MissingNoPicFront, MissingNoPicBack - db WATER_GUN, WATER_GUN, SKY_ATTACK, NO_MOVE ; level 1 learnset + db WATER_GUN, WATER_GUN, SKY_ATTACK, PAY_DAY ; level 1 learnset db GROWTH_SLOW ; growth rate ; tm/hm learnset - tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \ - TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \ - BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \ - PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \ - MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \ - EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \ - MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \ - SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \ - SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \ - PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \ - CUT, FLY, SURF, STRENGTH, FLASH + tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \ + TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \ + BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \ + RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \ + PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \ + BIDE, SWIFT, SKY_ATTACK, REST, THUNDER_WAVE, \ + TRI_ATTACK, SUBSTITUTE, CUT, FLY, SURF ; end db BANK(MissingNoPicFront) diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index a1f08a78..838c7c9f 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -1,6 +1,5 @@ MonPartyData: nybble_array MonPartyData - nybble ICON_MON ; MissingNo. nybble ICON_GRASS ; Bulbasaur nybble ICON_GRASS ; Ivysaur nybble ICON_GRASS ; Venusaur @@ -218,4 +217,4 @@ MonPartyData: nybble ICON_SNAKE ; Dragonite nybble ICON_MON ; Mewtwo nybble ICON_MON ; Mew - end_nybble_array NUM_POKEMON + end_nybble_array NUM_POKEMON - 1 diff --git a/engine/gfx/mon_icons.asm b/engine/gfx/mon_icons.asm index 3a7923ac..80ee40b6 100644 --- a/engine/gfx/mon_icons.asm +++ b/engine/gfx/mon_icons.asm @@ -262,6 +262,7 @@ GetPartyMonSpriteID: predef IndexToPokedex ld a, [wd11e] ld c, a + dec a srl a ld hl, MonPartyData ld e, a diff --git a/gfx/sprites/truck_sprite.png b/gfx/sprites/truck_sprite.png deleted file mode 100644 index f931b8bd7403092cc8f86a49dd83264fa30762dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1728 zcmbVNPi)&%79mMftS&3Vs`T>;|d4FVd4M?xNtzLR1Vyb2%qC5EfCm*rRVqj-tYT; zf8XaTYpWMd9DnpU$8jerD`pL59>zm+v+zFu!)tAr=GQLPt-)Zhx3|}BCmX+iY!aC6 z4_2OyIPQUkWXy1Hzxy!9-TSj!--tJ=7j>I?8RD=_n(27~pgHdBxn4l*HjVjB+I0P* zaIkk%;9aLET*_5(H85z)UD*lg`p#uqkyNb7${Ak9QXb(vlCmO}bgb%GjUPP% zXbYW&UNg%hUGP;DT5%lc2z9&NOgEchVG~K3rXegNSr!2yMtwgfJ<*RA#|$Qo?9dHj zm-&3cNH*D4Tol04)CDi7Rwu-MGzt`i4E0EWqzp!$m-sbAM{$iFnlTj})%yWOH5#$4 z(53)iJQTLJLG#FmyAZavsUJ_oA@u((Jl5mb6I`$rc7|bcY(zWM1HK4+k|quXEf%w= z#r}nQay$$~q5z_$KOMSIG^ArPdn=)=m_-3jGLGx$*|LNcTq?lOEJc!*B{OH`O|>km zNi;sw#_GPQg^gxInd3w{C=##4M~c))`mn+Bgclv99te#Y&Q{U=b@i9#L1B<2L&Lgl2VF(sRmRpm1Fr5|cZE9b0d(&?8Ve zu1A^_1%6ZDCyCJw)?pziPOLk+UoniekTu*697MGX%Y4N$R7q1+QO-!ojT>o!H4e28RgPEQ~g% z8GLu;kdk&=6ey3T_HX%0VG(P@T@un#6H0zcz!9qCnLI5fayIqAIcG3njZ2kHLf>Ez4&{OlY1gTelX zA6d8GT$umv^D|#Q@?^h!`}^|i&%N@M`_7I1)7&q!bI#z2ZC-O<;Pfnj4m_n$;oAYUQb zBgmJ5p-PQ`p`nF=;TKS-;RORjsR0ASs{{rHs~HRo;stYd1=;{5n3BBRT^N{+TZ%e> zJkA1-$YKTtz9S&aI8~cZ8YswK;_2(k{*0ShK;Qhn_NPlgA;$b7zYxari^^vKIjSYD z5hW>!C8<`)MX5lF!N|bKNY~I%*T6W$(9Fuj+{)BM+rYrez#!}3ot-Eea`RI%(<*Um zke-tQ@=#Q2glC$sFM}44&B4IRD8#@FWHACE1EUlJNCl9^;Ke8nX9qEAK-B;Pib)uu z9;glkJb)Oa2TaQceK%oXU@r1>aSX9I9XlmHBRE{<_g+yi+xIK>&9-kgZa2%!+`4zE z@RraID|tR|x_#$I`o}HD@9*@DdDj2oLt z5;kGWQ_kjSpVu3T(|(jbvDED-X>l}@E>V)!?6J_c|4 z=PXfeXPyu;-*m%%UAbek*6CYqSf_fUt8?0ev>x{8zQ>Uh%@yM%E^XKo9eH}1>(YP| zn~l`I8qIq7R4H@Hg#HPu|2#C>V;OmQ;h&A0rW{IaO*wwbx8`qT0>||5U)L99HZC`q z_FmfM{Na6ZN949;Y!LsQo3Yci?L)FX^S`(RkF4*i@5woFLizZPcR zLuI)Zj#ky`=~)?PXYRhTLbOk6=fOJOJhL+n)ta5#Tni#!hI8%m^4iFG=GP+5mR0v( zET4T$khLp!1>3&NjOPB&JUVqpn?xm43p`(hRiv|S_|xQ8abGEL=^mGzLSNYqU)ty? z>pjy-*8l$Bf9@$&%U*x@_N@QixT$V(Eq^XO%IM19(e!UA>q9TNA>T2 zTMUj0i#=oW^FJW9Vs5+fmy`Poq|Np=SXjJCm>GZG$t-VW<6D zM-ESRzW@A#f3AF4UvZ)Iz4(%Or{CU~6`glv?UCaS&u%A~ZpsO3U-oj2I2 lax5(3kLG+6B=LDk9MgwBH=omsX1am0q^GN&%Q~loCIE4=1XKV3 delta 1100 zcmV-S1hf0{3FQco7*hlT0000;eCvGx000McNliru<_aGXC;@rBS}Xtn02g#cSaefw zW^{L9a%BKVOhiylM<8}(av(D zPOz!e8n0WfwVV__@gwQI4U&Nv&LlIZT1hCCJZsTOs2fXKX_i?NGEglTf0zTHG6JNM zMy!o0WuSIiSy)&}yMqMKShBQ1)}6WRTeTv1Cfj`7v>=at@S_iKhJOH^e-N*}g*^qB8OXIurRE!}sq4$nvqRMYiY=eo{VSYRUtm0; z7>Qh}E)stZzdcgNdpvr+1 zS>`Osl-0e8pb%h3zi9W`8};o+Cxg2IaFVoaA!%KBA0@l!cJxn%m5~FLMajX2odvLh zW2NuHe*P2(F5xz!e>n_DwCTB)$qtZgxRm@zVDkVS zJ=cVP_vbI7AjCsdMGrebleZwM;p8U&54^!&uWJQ&eEg@ZG)>4TrwpKniK2kdU6SJ9w_u9A??,) +n,)tttt>??,) @@ -25,7 +25,9 @@ n,)tttttt>??,) ,),)ooooo - + + + >??,) !1wVww1(,,,) diff --git a/maps/Route12.blk b/maps/Route12.blk index 8d2ac6de..3c902408 100644 --- a/maps/Route12.blk +++ b/maps/Route12.blk @@ -1,7 +1,7 @@ ,,,)1(,,,,,+W%1$WWWW,)CCTCCCC,)CCTCCkk,)CCTCCCC,)TTzTCCC,)TxxTyTT,)TCCTxxx,)TC !CC,)xChiCC,)kk7:~kk,)CCCTCCC,)CCCTCCC,)TTTzTTC,)xxxxxTC,)TCCTTTC,)TCCTxxC,)zTTTCTCW%TxxxCTCTCCCCxCzTzTTTCTxTxxxCxCTTTCCCCxxzTCTTTCTxCTxTCTTCTCTTzTCTCxxxxCTTTzTTCxxxTxxC66kkkTCCCLLaaayCCCxxxTCCCCCCTCCCCCCTCCCCCCTCCC nCCCTTTC nCCCxxTC -nzTTTTTC +nTTTTTTC nTxxxxxC nTCCCCCC nTTTzTCC diff --git a/maps/Route6.blk b/maps/Route6.blk index 04414e4e..b488b37b 100644 --- a/maps/Route6.blk +++ b/maps/Route6.blk @@ -11,7 +11,7 @@ hittt/7:~/ -//1111111111 1 1 1 1111111 1  1 eCCCCCd 1 Qc +/ !11111111|~ 1 11 1 1 1111111 1  1 eCCCCCd 1 Qc 11111 MRR1 diff --git a/maps/Route7.blk b/maps/Route7.blk index eaf5aaf1..1e58b2f8 100644 --- a/maps/Route7.blk +++ b/maps/Route7.blk @@ -1 +1 @@ -111G _{11G _{\Kt111_{1111_ ! !\7}~w|~11 _{11111 _{ \ No newline at end of file +111G _{11G t_{\Kt111_{1111_ ! !\7}~w|~1111_{1111111_{ \ No newline at end of file diff --git a/maps/Route8.blk b/maps/Route8.blk index 6612bd4b..8a9da3d9 100644 --- a/maps/Route8.blk +++ b/maps/Route8.blk @@ -1,4 +1,4 @@ -(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%tt1N +(,,+WWWWWWWWWWWWWWWWWWWWW%(+$WW%N diff --git a/maps/UndergroundPathNorthSouth.blk b/maps/UndergroundPathNorthSouth.blk index f42b868a..6431328e 100644 --- a/maps/UndergroundPathNorthSouth.blk +++ b/maps/UndergroundPathNorthSouth.blk @@ -1 +1 @@ -                      \ No newline at end of file +                      \ No newline at end of file diff --git a/maps/UndergroundPathRoute7.blk b/maps/UndergroundPathRoute7.blk index 4e3c35fc5ebb322985a4a7991a1d5af879a8e882..a17a7ed27c385879cae6df49eaafbbd04069841f 100644 GIT binary patch literal 16 XcmZQ$W@Z-@6%pWIVCCfF=ivna1wsI- literal 16 XcmZQ$W@fkK<7E|QU`XN1FGvLd3T*;5 diff --git a/maps/VermilionCity.blk b/maps/VermilionCity.blk index 87953054..cdba83ed 100644 --- a/maps/VermilionCity.blk +++ b/maps/VermilionCity.blk @@ -1 +1 @@ -CCC ! ! !1 !11111111Ckk|~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV51|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC \ No newline at end of file +CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV21|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCTCCCTCCCCCCCCCC \ No newline at end of file diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index 52f548ff..3877e967 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -1,9 +1,7 @@ VermilionDock_Script: call EnableAutoTextBoxDrawing - ;ld hl, VermilionDockTrainerHeaders ld de, VermilionDock_ScriptPointers call ExecuteCurMapScriptInTable - ;call TruckCheck CheckEventHL EVENT_STARTED_WALKING_OUT_OF_DOCK jr nz, .asm_1db8d CheckEventReuseHL EVENT_GOT_HM01 @@ -228,168 +226,3 @@ VermilionDock_TextPointers: VermilionDockText1: text_far _VermilionDockText1 text_end - -; this massive new set of scripts allows the truck to be pushed with Strength. Credit to Vortyne's pureRGB hack for figuring this out! - -;VermilionDockTrainerHeaders: -; def_trainers -;MewTrainerHeader: -; trainer EVENT_ENCOUNTERED_MEW, 0, MewBattleText, MewBattleText, MewBattleText -; db -1 ; end - -;VermilionDockText2: -; text_asm -; ld hl, MewTrainerHeader -; call TalkToTrainer -; jp TextScriptEnd - -;MewBattleText: -; text_far _MewtwoBattleText ; Mew! -; text_asm -; ld a, MEW -; call PlayCry -; call WaitForSoundToFinish -; jp TextScriptEnd - -;TruckOAMTable: -; db $50, $28, $C0, $10 -; db $50, $30, $C1, $10 -; db $50, $38, $C2, $10 -; db $50, $40, $C3, $10 -; db $58, $28, $C4, $10 -; db $58, $30, $C5, $10 -; db $58, $38, $C6, $10 -; db $58, $40, $C7, $10 - -;RedLeftOAMTable: -; db $8,$0,$9,$0 -; db $a,$2,$b,$3 - -;TruckSpriteGFX: INCBIN "gfx/sprites/truck_sprite.2bpp" - -;TruckCheck: -; CheckEventHL EVENT_FOUND_MEW -; jp nz, ChangeTruckTile -; ld c, HS_MEW -; ld b, $2 -; ld hl, wMissableObjectFlags -; predef FlagActionPredef -; ld a, c -; and a -; jr nz, .skiphidingmew -; ld a, HS_MEW -; ld [wMissableObjectIndex], a -; predef HideObject -;.skiphidingmew -; ld a, [wd728] -; bit 0, a ; using Strength? -; ret z -; ; the position for moving truck is $00, $15 -; ld hl, wYCoord -; ld a, [hli] -; and a -; ret nz -; ld a, [hl] -; cp $16 -; ret nz -; ; if the player is trying to walk left -; ld a, [wPlayerDirection] -; cp 2 -; ret nz - -; xor a -; ld [$ff8c], a -; ld a, $8 -; ld [$ff8d], a -; call SetSpriteFacingDirection -; ld a, $ff -; ld [wJoyIgnore], a -; ld [wUpdateSpritesEnabled], a -; xor a -; ld bc, $4c48 -; ld de, RedLeftOAMTable -; call WriteOAMBlock -; ld bc, (Bank(TruckSpriteGFX) << 8) | 8 -; ld hl, vChars1 + $400 -; ld de, TruckSpriteGFX -; call CopyVideoData -; ld hl, TruckOAMTable -; ld bc, $20 -; ld de, wShadowOAM + $20 -; call CopyData -; ld a, $c -; ld [wNewTileBlockID], a ; used to be wd09f -; ld bc, $a -; predef ReplaceTileBlock -; ; moving the truck -; ld a, SFX_PUSH_BOULDER -; call PlaySound -; ld b, 32 -; ld de, 4 -;.movingtruck -; ld hl, wShadowOAM + $21 -; ld a, 8 -;.movingtruck2 -; dec [hl] -; add hl, de -; dec a -; jr nz, .movingtruck2 -; ld c, 2 -; call DelayFrames -; dec b -; jr nz, .movingtruck -; ld a, $3 -; ld [wNewTileBlockID], a ; used to be wd09f -; ld bc, $9 -; predef ReplaceTileBlock -; call ShowMew -; jp FinishShowMew -; ; show mew and print its dialogue -;ShowMew: -; ld a, 1 -; ld [wUpdateSpritesEnabled], a -; ld a, HS_MEW -; ld [wMissableObjectIndex], a -; predef ShowObject -; ret -;FinishShowMew: -; ld c, 60 -; call DelayFrames -; xor a -; ld [wJoyIgnore], a -; SetEvent EVENT_FOUND_MEW -; ret - -;ChangeTruckTile: -; ld bc, $9 -; call GetOWCoord -; ld a, [hl] -; cp $3 -; ret z -; ld a, $3 -; ld [hli], a -; ld a, $c -; ld [hl], a -; CheckEvent EVENT_ENCOUNTERED_MEW -; call z, ShowMew -; jpfar RedrawMapView -; -;GetOWCoord: -; ld hl, wOverworldMap + 2 -; ld a, [wCurMapWidth] -; add $6 -; ld e, a -; ld d, $0 -; add hl, de -; add hl, de -; inc b -; inc c -;.bloop -; add hl, de -; dec b -; jr nz, .bloop -;.cloop -; inc hl -; dec c -; jr nz, .cloop -; ret diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index 117dd64e..a304352b 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -63,12 +63,9 @@ _TM31NoRoomText:: text_end _CopycatsHouse2FText2:: - text "DODUO: Giiih!" - - para "MIRROR MIRROR ON" - line "THE WALL, WHO IS" - cont "THE FAIREST ONE" - cont "OF ALL?" + text "It's a JAGG" + line "doll with cute," + cont "round eyes!" done _CopycatsHouse2FText3::