From f6b1c94c0ccff9df86b1902201dd87c90322430c Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 28 Nov 2023 12:33:01 +0000 Subject: [PATCH] progress is progress Bug fixes and new sprites mostly, just trying to do what I can, when I can. --- constants/map_constants.asm | 36 ++++++++++----------- data/maps/headers/CitrineFerryDock.asm | 2 +- data/maps/headers/FarawayFerryDock.asm | 2 ++ data/maps/hide_show_data.asm | 4 +-- data/maps/map_header_banks.asm | 6 ++-- data/maps/map_header_pointers.asm | 6 ++-- data/maps/objects/CitrineFerryDock.asm | 4 +-- data/maps/objects/FarawayFerryDock.asm | 12 +++++++ data/maps/objects/FarawayIslandOutside.asm | 4 +-- data/maps/objects/VermilionFerryDock.asm | 2 +- data/maps/songs.asm | 6 ++-- data/maps/town_map_entries.asm | 7 ++-- data/wild/grass_water.asm | 4 +-- engine/gfx/palettes.asm | 2 ++ engine/overworld/ferry_script.asm | 4 +-- gfx/blocksets/seagallop_port.bst | Bin 480 -> 480 bytes gfx/pokemon/back/steelixb.png | Bin 581 -> 637 bytes gfx/pokemon/back/taurospaquab.png | Bin 477 -> 613 bytes gfx/pokemon/back/taurospblazeb.png | Bin 462 -> 604 bytes gfx/pokemon/back/wugtriob.png | Bin 537 -> 582 bytes gfx/pokemon/front/mew.png | Bin 395 -> 758 bytes gfx/pokemon/front/porygon.png | Bin 387 -> 746 bytes gfx/pokemon/front/slowpoke.png | Bin 313 -> 680 bytes maps.asm | 8 ++--- maps/CitrineFerryDock.blk | Bin 84 -> 84 bytes maps/FarawayFerryDock.blk | Bin 0 -> 84 bytes maps/VermilionFerryDock.blk | Bin 84 -> 84 bytes scripts/FarawayFerryDock.asm | 6 ++++ 28 files changed, 70 insertions(+), 45 deletions(-) create mode 100644 data/maps/headers/FarawayFerryDock.asm create mode 100644 data/maps/objects/FarawayFerryDock.asm create mode 100644 maps/FarawayFerryDock.blk create mode 100644 scripts/FarawayFerryDock.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 24135f65..07a46bcc 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -131,7 +131,7 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const SILPH_GAUNTLET_2F, 13, 10 ; $6C - Was UNUSED_MAP_6A map_const SILPH_GAUNTLET_3F, 17, 13 ; $6D - Was UNUSED_MAP_6B map_const VICTORY_ROAD_1F, 10, 9 ; $6E - map_const SILPH_GAUNTLET_4F, 10, 9 ; $6F - Was UNUSED_MAP_6D + map_const BRUNSWICK_GROTTO, 15, 12 ; $6F - Was UNUSED_MAP_6D map_const SILPH_GAUNTLET_5F, 10, 9 ; $70 - Was UNUSED_MAP_6E map_const SILPH_GAUNTLET_6F, 12, 12 ; $71 - Was UNUSED_MAP_6F map_const SILPH_GAUNTLET_7F, 6, 5 ; $72 - Was UNUSED_MAP_70 @@ -166,9 +166,9 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const LAVENDER_POKECENTER, 7, 4 ; $8F map_const POKEMON_TOWER_1F, 10, 9 ; $90 map_const POKEMON_TOWER_2F, 10, 9 ; $91 - map_const BRUNSWICK_GROTTO, 15, 12 ; $92 - Was Pokemon Tower 3F + map_const SILPH_GAUNTLET_4F, 10, 9 ; $92 - Was Pokemon Tower 3F map_const CELESTE_HILL_GATE, 5, 4 ; $93 - Was Pokemon Tower 4F - map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused + map_const POKEMON_TOWER_5F, 10, 9 ; $94 map_const POKEMON_TOWER_6F, 10, 9 ; $95 map_const POKEMON_TOWER_7F, 10, 9 ; $96 map_const MR_FUJIS_HOUSE, 4, 4 ; $97 @@ -252,28 +252,28 @@ DEF FIRST_INDOOR_MAP EQU const_value map_const NAME_RATERS_HOUSE, 4, 4 ; $E6 map_const CERULEAN_BADGE_HOUSE, 4, 4 ; $E7 map_const CINNABAR_VOLCANO, 14, 12 ; $E8 - Was UNUSED_MAP_E7 - map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $F8 - Switched with ROCK_TUNNEL_B1F - map_const SILPH_CO_9F, 13, 9 ; $EA - map_const SILPH_CO_10F, 8, 9 ; $EB + map_const CINNABAR_VOLCANO_FLOORS, 20, 20 ; $E9 - Switched with ROCK_TUNNEL_B1F + map_const SILPH_CO_9F, 13, 9 ; $EA (now goes unused) + map_const SILPH_CO_10F, 8, 9 ; $EB (now goes unused) map_const SILPH_CO_11F, 9, 9 ; $EC - map_const SILPH_CO_ELEVATOR, 2, 2 ; $ED + map_const FARAWAY_FERRY_DOCK, 14, 6 ; $ED - was SILPH_CO_ELEVATOR map_const GARNET_CAVERN_2F, 15, 9 ; $EE - was UNUSED_MAP_ED map_const UNDERWATER_TUNNEL, 15, 9 ; $EF - Was UNUSED_MAP_EE map_const TRADE_CENTER, 5, 4 ; $F0 map_const COLOSSEUM, 5, 4 ; $F1 map_const CELADON_UNIVERSITY_INSIDE, 11, 10 ; $F2 - Was UNUSED_MAP_F1 map_const CELADON_UNIVERSITY_POKECENTER, 7, 4 ; $F3 - Was UNUSED_MAP_F2 - map_const LORELEIS_ROOM, 5, 6 ; $F5 - map_const BRUNOS_ROOM, 5, 6 ; $F6 - map_const AGATHAS_ROOM, 5, 6 ; $F7 - map_const ROCK_TUNNEL_B1F, 20, 18 ; $F8 - Switched with CINNABAR_VOLCANO_FLOORS - map_const GIOVANNIS_ROOM, 11, 14 ; $F9 - map_const BATTLE_TENT, 5, 10 ; $FA - map_const MT_MOON_SQUARE, 13, 7 ; $FB - map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FC - map_const CELESTE_HILL_CAVE, 20, 18 ; $FD - map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FE - map_const BRUNSWICK_GLADE, 19, 20 ; $FE should be this, i cut silph 8f before this but never updated the $s. + map_const LORELEIS_ROOM, 5, 6 ; $F4 + map_const BRUNOS_ROOM, 5, 6 ; $F5 + map_const AGATHAS_ROOM, 5, 6 ; $F6 + map_const ROCK_TUNNEL_B1F, 20, 18 ; $F7 - Switched with CINNABAR_VOLCANO_FLOORS + map_const GIOVANNIS_ROOM, 11, 14 ; $F8 + map_const BATTLE_TENT, 5, 10 ; $F9 + map_const MT_MOON_SQUARE, 13, 7 ; $FA + map_const MT_MOON_SQUARE_HOUSE, 4, 4 ; $FB + map_const CELESTE_HILL_CAVE, 20, 18 ; $FC + map_const CELESTE_HILL_OUTSIDE, 20, 18 ; $FD + map_const BRUNSWICK_GLADE, 19, 20 ; $FE DEF NUM_MAPS EQU const_value ; Indoor maps, such as houses, use this as the Map ID in their exit warps diff --git a/data/maps/headers/CitrineFerryDock.asm b/data/maps/headers/CitrineFerryDock.asm index 36259099..fde92a33 100644 --- a/data/maps/headers/CitrineFerryDock.asm +++ b/data/maps/headers/CitrineFerryDock.asm @@ -1,2 +1,2 @@ - map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0 + map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SEAGALLOPPORT, 0 end_map_header diff --git a/data/maps/headers/FarawayFerryDock.asm b/data/maps/headers/FarawayFerryDock.asm new file mode 100644 index 00000000..088b58d0 --- /dev/null +++ b/data/maps/headers/FarawayFerryDock.asm @@ -0,0 +1,2 @@ + map_header FarawayFerryDock, FARAWAY_FERRY_DOCK, SEAGALLOPPORT, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index f2851bd5..42140dbe 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -115,7 +115,7 @@ MapHSPointers: dw NoHS dw NoHS dw VictoryRoad1FHS - dw NoHS + dw BrunswickGrottoHS dw NoHS dw NoHS dw NoHS @@ -150,7 +150,7 @@ MapHSPointers: dw NoHS dw NoHS dw PokemonTower2FHS - dw BrunswickGrottoHS + dw NoHS dw NoHS dw PokemonTower5FHS dw PokemonTower6FHS diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index 5f646309..8c06fc59 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -113,7 +113,7 @@ MapHeaderBanks:: db BANK(SilphGauntlet2F_h) db BANK(SilphGauntlet3F_h) db BANK(VictoryRoad1F_h) - db BANK(SilphGauntlet4F_h) + db BANK(BrunswickGrotto_h) db BANK(SilphGauntlet5F_h) db BANK(SilphGauntlet6F_h) db BANK(SilphGauntlet7F_h) @@ -148,7 +148,7 @@ MapHeaderBanks:: db BANK(LavenderPokecenter_h) db BANK(PokemonTower1F_h) db BANK(PokemonTower2F_h) - db BANK(BrunswickGrotto_h) + db BANK(SilphGauntlet4F_h) db BANK(CelesteHillGate_h) ; was pokemon tower 4f db BANK(PokemonTower5F_h) db BANK(PokemonTower6F_h) @@ -238,7 +238,7 @@ MapHeaderBanks:: db BANK(SilphCo9F_h) db BANK(SilphCo10F_h) db BANK(SilphCo11F_h) - db BANK(SilphCoElevator_h) + db BANK(FarawayFerryDock_h) db BANK(GarnetCavern2F_h) ; was UNUSED_MAP_ED db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE db BANK(TradeCenter_h) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index 40c2537d..4f89390d 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -113,7 +113,7 @@ MapHeaderPointers:: dw SilphGauntlet2F_h dw SilphGauntlet3F_h dw VictoryRoad1F_h - dw SilphGauntlet4F_h + dw BrunswickGrotto_h dw SilphGauntlet5F_h dw SilphGauntlet6F_h dw SilphGauntlet7F_h @@ -148,7 +148,7 @@ MapHeaderPointers:: dw LavenderPokecenter_h dw PokemonTower1F_h dw PokemonTower2F_h - dw BrunswickGrotto_h + dw SilphGauntlet4F_h dw CelesteHillGate_h ; was pokemon tower 4f dw PokemonTower5F_h dw PokemonTower6F_h @@ -238,7 +238,7 @@ MapHeaderPointers:: dw SilphCo9F_h dw SilphCo10F_h dw SilphCo11F_h - dw SilphCoElevator_h + dw FarawayFerryDock_h dw GarnetCavern2F_h ; UNUSED_MAP_ED, used silph 2f dw UnderwaterTunnel_h ; UNUSED_MAP_EE dw TradeCenter_h diff --git a/data/maps/objects/CitrineFerryDock.asm b/data/maps/objects/CitrineFerryDock.asm index 20c3e6c4..250d25ce 100644 --- a/data/maps/objects/CitrineFerryDock.asm +++ b/data/maps/objects/CitrineFerryDock.asm @@ -1,9 +1,9 @@ CitrineFerryDock_Object: - db $f ; border block + db $15 ; border block def_warp_events warp_event 14, 0, CITRINE_CITY, 7 - warp_event 14, 2, SEAGALLOP_FERRY, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 def_bg_events diff --git a/data/maps/objects/FarawayFerryDock.asm b/data/maps/objects/FarawayFerryDock.asm new file mode 100644 index 00000000..d4099900 --- /dev/null +++ b/data/maps/objects/FarawayFerryDock.asm @@ -0,0 +1,12 @@ +FarawayFerryDock_Object: + db $15 ; border block + + def_warp_events + warp_event 14, 0, FARAWAY_ISLAND_OUTSIDE, 1 + warp_event 14, 5, SEAGALLOP_FERRY, 1 + + def_bg_events + + def_object_events + + def_warps_to FARAWAY_FERRY_DOCK diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index 45313b17..f9dd71c0 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -2,8 +2,8 @@ FarawayIslandOutside_Object: db $2d ; border block def_warp_events - warp_event 6, 35, SEAGALLOP_FERRY, 1 - warp_event 7, 35, SEAGALLOP_FERRY, 1 + warp_event 6, 35, FARAWAY_FERRY_DOCK, 1 + warp_event 7, 35, FARAWAY_FERRY_DOCK, 1 warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1 warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2 diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm index a8d070a7..89379dcc 100644 --- a/data/maps/objects/VermilionFerryDock.asm +++ b/data/maps/objects/VermilionFerryDock.asm @@ -1,5 +1,5 @@ VermilionFerryDock_Object: - db $13 ; border block + db $15 ; border block def_warp_events warp_event 14, 0, LAST_MAP, 9 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index dbdd4f77..47fec6da 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -112,7 +112,7 @@ MapSongBanks:: db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F - db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F + db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F @@ -147,7 +147,7 @@ MapSongBanks:: db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F - db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO + db MUSIC_POKEMON_TOWER, 0 ; BRUNSWICK_GROTTO db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F @@ -237,7 +237,7 @@ MapSongBanks:: db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F - db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR + db MUSIC_DUNGEON2, 0 ; FARAWAY_FERRY_DOCK db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL db MUSIC_CITRINE, 0 ; TRADE_CENTER diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 37792e69..d6170694 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -83,6 +83,7 @@ InternalMapEntries: internal_map SS_ANNE_B1F_ROOMS, 9, 10, SSAnneName internal_map SILPH_GAUNTLET_3F, 10, 5, SilphCoName internal_map VICTORY_ROAD_1F, 0, 4, VictoryRoadName + internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName internal_map SILPH_GAUNTLET_7F, 10, 5, SilphCoName internal_map LANCES_ROOM, 0, 2, PokemonLeagueName internal_map FARAWAY_ISLAND_INSIDE, 15, 15, FarawayIslandName @@ -95,7 +96,8 @@ InternalMapEntries: internal_map CELADON_HOTEL, 7, 5, CeladonCityName internal_map LAVENDER_POKECENTER, 14, 5, LavenderTownName internal_map POKEMON_TOWER_2F, 15, 5, PokemonTowerName - internal_map BRUNSWICK_GROTTO, 6, 10, BrunswickGladeName + internal_map SILPH_GAUNTLET_4F, 10, 5, SilphCoName + internal_map CELESTE_HILL_GATE, 7, 9, CelesteHillName internal_map POKEMON_TOWER_7F, 15, 5, PokemonTowerName internal_map LAVENDER_CUBONE_HOUSE, 14, 5, LavenderTownName internal_map WARDENS_HOUSE, 8, 13, FuchsiaCityName @@ -133,7 +135,8 @@ InternalMapEntries: internal_map NAME_RATERS_HOUSE, 14, 5, LavenderTownName internal_map CERULEAN_BADGE_HOUSE, 10, 2, CeruleanCityName internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName - internal_map SILPH_CO_ELEVATOR, 10, 5, SilphCoName + internal_map SILPH_CO_11F, 10, 5, SilphCoName + internal_map FARAWAY_FERRY_DOCK, 15, 15, FarawayIslandName internal_map GARNET_CAVERN_2F, 6, 10, GarnetCavernName internal_map UNDERWATER_TUNNEL, 14, 1, UnderwaterTunnelName internal_map CELADON_UNIVERSITY_POKECENTER, 7, 4, CeladonUniversityName diff --git a/data/wild/grass_water.asm b/data/wild/grass_water.asm index e8c37b47..46405b89 100644 --- a/data/wild/grass_water.asm +++ b/data/wild/grass_water.asm @@ -112,7 +112,7 @@ WildDataPointers: dw Gauntlet2FWildMons dw Gauntlet3FWildMons dw VictoryRoad1FWildMons - dw Gauntlet4FWildMons + dw BrunswickGrottoWildMons dw Gauntlet5FWildMons dw Gauntlet6FWildMons dw NothingWildMons @@ -147,7 +147,7 @@ WildDataPointers: dw NothingWildMons dw PokemonTower1FWildMons dw PokemonTower2FWildMons - dw BrunswickGrottoWildMons + dw Gauntlet4FWildMons dw NothingWildMons dw PokemonTower5FWildMons dw PokemonTower6FWildMons diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index 80a37c10..8e13c232 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -178,6 +178,8 @@ SetPal_Overworld: jp z, .faraway cp FARAWAY_ISLAND_INSIDE jp z, .faraway + cp FARAWAY_FERRY_DOCK + jp z, .faraway cp SILPH_GAUNTLET_1F jp z, .faraway cp CELESTE_HILL_OUTSIDE diff --git a/engine/overworld/ferry_script.asm b/engine/overworld/ferry_script.asm index ef462ef5..db2e9de0 100644 --- a/engine/overworld/ferry_script.asm +++ b/engine/overworld/ferry_script.asm @@ -143,8 +143,8 @@ DoIslandMenu: jr .islandSelected .choseFarawayIsland - ld b, 0 - ld c, FARAWAY_ISLAND_OUTSIDE + ld b, 1 + ld c, FARAWAY_FERRY_DOCK jr .islandSelected .choseCitrineCity diff --git a/gfx/blocksets/seagallop_port.bst b/gfx/blocksets/seagallop_port.bst index e0ac6cd6266862088c72c240741eabbc9988c85b..cee0fa696c788875ddd25ca5cf4b724cd83d902a 100644 GIT binary patch delta 60 kcmaFB{D66b0;7S52tPjv!vKsAqj`Y<#s<-o4H+i@0R1)xKL7v# delta 32 icmaFB{D66b0;7PpkFQ^JOl+JC6ig0e?4O*#s0aX^6$rHe diff --git a/gfx/pokemon/back/steelixb.png b/gfx/pokemon/back/steelixb.png index 0a3c1e8261ca944ae5e7177eeca0e402874cbba4..ef5a54e653d5c275b7ebc4f114f11c25a995a77b 100644 GIT binary patch delta 395 zcmX@g@|R_T%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gt#Bd%4u;!VfI$tqIDx`u|j zMiwE4Mpj0~RwhQ;1_o9J2DOvTI3`{c_d}C4gvi>eP0<7zr%~b>QIe8al4@0wnVVW% zl9*e-U}Ru~rUzu-9xIEF}EPX58q%H!}y_|T3&|L57x2>f{Yp8T1B zx&QSg&ItVYZ_IEe;s5LxTp>q3ykCEF)rOxA$KJpHyE;sl-DqF^xB9IvLML|oJ!zk< z#66+#)4cbmHn{!%&vX3Go@J}#zWzU7aOJ$IiiwHDkpiAVo`QepKTN#rJVia?vHjus zlk?-&-i*<2V2i5aTo<$TiT&YPZ{34BYbX5YdG2HCq!in@t0hF#Stj&pI&lbKIW zJ!7YZ+{9)TDI;A2OI-uw5JM9yV*@K=3vB}fD+7Zy#Yz?v4~pZEy{k8?WwIJ$X8lo5 z7sn8Z%gI0ZS$Td)$}9BPe|!GpV9)uzf4UF$`o+O!$?eU?ENgw|I z|K25d;>YLz^wcbJP&iFj{q^6T|2*yICEwX^GyfB9fB0vx*v-bogAT_Gb$zd2`1haZSzZv| zqJ<8Vb9Y~fn5)L{cGIgVKb{Ejq{uuF`IpRJqU~(D+Te)zuiSqEZC9_H{Nqv~$-}^K XeDAFa8KbP0l+XkKPAZQh diff --git a/gfx/pokemon/back/taurospaquab.png b/gfx/pokemon/back/taurospaquab.png index 92bcb4ad68e4e5cfb4a5bbf284b208694e48693f..31e0cdd9028b9a4dda16c715ca3c58c77c5f3143 100644 GIT binary patch delta 457 zcmcc1{FG%vn$}?k2EN0L$MaXDFfcH%mw5WRvOnjR;gMv!_<8M9pb%qzkzWYo`9&u`8WOFdEG72#;gKP#u21Y3cRxq1^!HZEE&JJSKfU03)U|W0wrLElXn>KPagdb&79F7C-nhpc*WRgdo$Z(@ zy@S1zxqyZB=sDF17qn%aH?}%`I&&uPZRq}*_wpSR^=qy!JET4*tYVR0-u9v=8>3Zp z`+rVPm;3wuN!-J#&O35ZnTKp57*axnia1uD(n~yDqEMxOXzR)%#p{vZS|d(r$lhY{ z-f(c9K<~l6ovsq|D+JeZJUAxOIXCn0jLkU$R-QRqSQ_Ok9x94#3EQT+g}Hb}b|85kJYOFVsD*`Kp;@>(4@4xKkUEq7Q0~s6V~e#{^G_3WJTh7QkzrImr9wt<0_fdLo$ zNv??pB_puORYw(W1A17a#5JNMC9x#csw6WvwYVfPw}8ROz{pq^n;sqifJ~qs22WQ% Jmvv4FO#tFnen$WR diff --git a/gfx/pokemon/back/taurospblazeb.png b/gfx/pokemon/back/taurospblazeb.png index 4f55ecb2c6c6c365bb80ad020b8bc9a1a18a991a..38f594ed7cf2c6bc6ea4d44fd13286483f6a0930 100644 GIT binary patch delta 448 zcmX@de1~O1n$}?k2EN0L$MaXDFfcH%mw5WRvOnjR;gMut_GNA{P>3VaxO zzypYZx*@cD(03DtdIp9ao-U3d5|?YwTJs$;;9*N}_pI>n$aJlmw=8R>W>yWS9%Bc0 z0sD-qE#%R% zTc@-WXB8Yc8`d6YNm*&jvS8{IHf6(PIp3zuIrp4bP194Jc5BW{@c<>gWy<{Btowx@ zMKHgSEm@QxCQ{mFVdQ&MBb@08Dv;YXATM delta 326 zcmcb^a*laITKy3Q2EHSVQ?>b|85kJYOFVsD*`Kp;@>(WJ!T3DPp^$xR9tSCuFK@jsAy zV5O4Pa*x98;YU)VH!N#@bT3SR^=QwE#5#>Vk42r$?$sF_b=R z-nn05Tr8GOoFFM-V4`ba8DeN`Wol_Y;x66h1-BW)F^R{ rC`m~yNwq4;%uOvWNz5%^FfuSQ*2Shr$3GwwsE5JR)z4*}Q$iB}m&I|w diff --git a/gfx/pokemon/back/wugtriob.png b/gfx/pokemon/back/wugtriob.png index 4e3cc5796d7d3b764afd20f0fec0f0e034663aac..755dbd6072ec9963a07a478353e307b376bc5aba 100644 GIT binary patch delta 340 zcmbQqa*Sny%0v?<*~1JBe1{p2=dVa%U|?V`@$_|Nf6gt#BWalF$MI_7WECl6T|+}% zBa0A2BP%0QD-%m?0|P4qgQ6~>trIVb`(c-5zP^eRXq-lgYeY#(Vo9o1NoH|=!00#Les1AhdQ`ejqI4-3h=U8y|EX0kjTJLD!kmcdSk*#peGqTUHx3vIVCg! E09(9xCjbBd delta 293 zcmX@cGLvP33NK5#qpu?a!^VE@KZ&dp6&pI&hgFzI zB<#h>kcrJIQbxLlM!E*3A%>P#hDKIK2HFM&Rt5%Fn%111cu*Wo*3c3nyYEDp<773) z%=($0E{-7*mut@`@*Q#zV7=fe;1R+qch!3hgQG!9o8_T6CdTCv8)t2Kc}_LJv|zH; zEUil^5^3el3J+IL|1+Q8hN+%u&*IjkU0=hG9;jViVc>cvUZkf<$ZJv6w2fUH>kPWs z64!l**v8eJzKdheVPVO}qskZOCB9^F3|O!rPW^{|u1m6c*Qw++THS>;1(H8nZOZK{ g(tIT6d}7b{UNFDAXVcYMptl)3UHx3vIVCg!0Au!Ri~s-t diff --git a/gfx/pokemon/front/mew.png b/gfx/pokemon/front/mew.png index a00783a977ec2670c732dfc7ac32de533e395d0c..60ecb3438f2d0d27f7035207959e279e534c33bf 100644 GIT binary patch literal 758 zcmeAS@N?(olHy`uVBq!ia0vp^8X(LBBp4p6{ucmJ3dtTpz6=aiY77hwEes65fInC}Q!>*kaccWNB?@J#ddWzYh$IT%>x%Bs2X5k zG6^Hp1J#0n2M_~wLumP+?HRo%`_dH7;IOs@FTQ=ref)0UJ=?ec4t;#6 z_h;XC)fpSlI682B`ZnFkAx7Bzjiz4A6=uH--kBQCN26HkPb{t5SNJ8DJ&`S-lBxXT zlgA#0hbA?zS{n9CVP--`-sw&=4U2{s)0RGO%F3BGmRf_Mwo2EAZ zJmG!xi++x8eBoXvJ(n#dY!eG-S^i&Zw0P#XZ8`ed(X-BVXNOxYW8e6{D)D!C+ozN@ zGpu!I@ywXK#Ed)5uuS3ovh&w?Y!mV?MfF>GD^5HXa^*?FAHh=VSLTr_w@$cB`52UG j`bwPRgo*6O{C`jRTg*)+tv&Hm6cps1u6{1-oD!MNklH6bA6;pe{lkbm?-V(80w?6oX6aR>40v zcC?$L;*wDpIUJmdRyeD+psSl5J9y>VsY-<^U5cP+dwOk2@|m3Oz9IZb0`I+#V9GKF z0V&AaUkU+nP28}jxNuPqIH5IUq6`&l5&R*S`uWDuw;hBTK!4>4+{Kfxjuay-IjCA{ zr4Nz`hUT`MXoG?Sh;CVWnzc5*7onCfLDd0151~p9$lpcivSF5k?&l%SYa=l|Lql;n znmlHjp<=;vykI8ly|a(*Y$>hz)npGnHgGjXgH=P`?`z5i^O2W|=`CzcUvb?+E=06k z{Ws$@bN*XpMrt$dZP{K{wltj=*RFI-4r2fH!uGEW<;hqvcUm+vU`~?SESSdFfxMeO zTQl^4y-905$}ELM8dFh{gYiey?I_=5k!T|mQN~N9)hJ&eAd_^&zxtOy(-Sn&T%o`Y P00000NkvXXu0mjfO318c diff --git a/gfx/pokemon/front/porygon.png b/gfx/pokemon/front/porygon.png index f991dd6e4f06c59227cd5d1ca485c4542826fb10..8e5b3f5e7274202bb7fb7330cb202195d2172c0b 100644 GIT binary patch literal 746 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA?Bp57i?)wF#6p}rHd>I(3)EF2VS{N8WLJcn% z7)pT(UnMXwSj}Ky5HFasE6@fg!Ib3f?!v%q+)~s54nJ@ErzW#^d=bQh$TUjdpVrG?^%xqOt=aUT6w*9;IeGbcf7Q1y3XC?Ys*1r)Dej{MBku5Bx`NFgn zo1G#L>{qbJdcoeN>or;JU>@@}COxm;rWY4X%09niZEK&ymQ~w2K5u$olB$q3*(Ps& zbQI5$27cZt9TP70>~`*1eCU;IVR(+GL9)xd$qK7J39>ThsCIse*5G@xg^A%p`yH88 z^X%D0Zwp=KeR0KgsoFy4d#4yKBrgTe~DWM4fGlB6D delta 361 zcmV-v0ha#i1%m^SBYy!(Nklfpj;V)_Z3YzfGUggd&? z$pIF>flMqcI_Tg8ND1W}*jaQT(U=hY1dN7G3PzKr<#~75%80l9^3T0{dG7$%4s481 z@`qsm&WJJh8_gKsUZWG^#nasw(;4ALgmbr+Ohqsptmh+Kw137i!r`r7kM0D+hOWiX zt3adDU*;iO;R9jL2rDW)A-vL)UmPJk(=^M<0>MneqSYgvzN%@)9N_ZX|38 zfC>d5)KJ*HCJZ38+T0^yY&8afNp}tJ>j=fGu>HSJu?czm0Xkxq!^40jEr>+ z4RwtyLJWJjI<35tPBilC!2AgXvob^$xN%nqQMZN!B%aGCQyS0+=i0O+|=Td z#M}ZbdZ3m>-(H^$)Dx8&;hE;^%b*2hb1<+n3NbJPS&Tr)z$nGQ3T87fcri-D*+GmN zP&L57WD-WG2dV`D4KZckZXD_Ua)g%wRkyu zwSt}=-yOL_e;-Cl7IMg{u9-Y zhdmzI^xY{|R^IYUl>Jb=$cmP?v21gV%|#c42mQ|7GeSFOngE`+_w#GJZC{#2_+$!>l^UTEOEPp4z zDGt7S?aSY-{~u;NG&hG(j|Kq-hfm>EG!HaGZJGS zfyFyZR3x?zRZ>*@e-Mx=q>6zTV9eG8QBm0#-<^{z`E>g45}y-4JV|^{B2V1N2(5m_ zsqhB{Dq;JWLFddv1?Zh*zf2bCuj}o4BFxG*b&<=xf0t}gr+?PQVGHl~%qf&#r$h_n zzn^c!7AUW7FNs^Ac4s`d2%l9m&Sn7SUd1Y&NA#1f34FOBTH^iPz^9x^ZCVXkENQ~w zNZiobI%cJWVe*QyU4ziL5t>jfg?b8e?s diff --git a/maps.asm b/maps.asm index 1aa91c5d..23c2bfc1 100644 --- a/maps.asm +++ b/maps.asm @@ -313,10 +313,10 @@ INCLUDE "scripts/RocketHideoutElevator.asm" INCLUDE "data/maps/objects/RocketHideoutElevator.asm" RocketHideoutElevator_Blocks: INCBIN "maps/RocketHideoutElevator.blk" -INCLUDE "data/maps/headers/SilphCoElevator.asm" -INCLUDE "scripts/SilphCoElevator.asm" -INCLUDE "data/maps/objects/SilphCoElevator.asm" -SilphCoElevator_Blocks: INCBIN "maps/SilphCoElevator.blk" +INCLUDE "data/maps/headers/FarawayFerryDock.asm" +INCLUDE "scripts/FarawayFerryDock.asm" +INCLUDE "data/maps/objects/FarawayFerryDock.asm" +FarawayFerryDock_Blocks: INCBIN "maps/FarawayFerryDock.blk" INCLUDE "data/maps/headers/SafariZoneEast.asm" INCLUDE "scripts/SafariZoneEast.asm" diff --git a/maps/CitrineFerryDock.blk b/maps/CitrineFerryDock.blk index f4a9573982a3f37685047ffe84e95bca52063a8b..3a5dec84c8e04bdd6b2e93ddd3944a82edacb0df 100644 GIT binary patch literal 84 ycmWe+0|EgKb^#DA$jc1^T%2G^gog_ZIKiYagvY?h1mZ$@%q*;69v?pv5CQ;>X#X#6gl*hox1mZ$@%q*;69v?pv5Ci~