From 03162890a2fb1ff03e3f7fe1fce34f26a0a2539a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Fri, 12 Jul 2024 18:20:35 +0100 Subject: [PATCH] Route 49 - Old City Gate - Added the gate for Route 49 and Old City in preparation for adding it - Fixed a glitch in Quiet Cave where a PokeFan/Beauty would become Jesus - Made the exit to Quiet Cave clearer Kris experiences a microaggression in the gate because it's funny --- constants/map_constants.asm | 3 ++- data/maps/attributes.asm | 1 + data/maps/blocks.asm | 1 + data/maps/maps.asm | 1 + data/maps/scripts.asm | 7 +++++++ maps/QuietCave.ablk | 2 +- maps/QuietCave.asm | 2 +- maps/Route49OldCityGate.asm | 42 +++++++++++++++++++++++++++++++++++++ maps/Route49_2.asm | 3 +++ 9 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 maps/Route49OldCityGate.asm diff --git a/constants/map_constants.asm b/constants/map_constants.asm index f36c6f7..cd10045 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -620,13 +620,14 @@ ENDM map_const DEBUG_ROOM, 20, 20 ; 2 map_const ROUTE_49, 15, 9 ; 3 map_const QUIET_CAVE, 27, 18 ; 4 - map_const ROUTE_49_2, 10, 18 ; 5 + map_const ROUTE_49_2, 10, 19 ; 5 map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 6 map_const SILVERS_HOUSE, 5, 5 ; 7 map_const CALS_HOUSE_1F, 5, 4 ; 8 map_const CALS_HOUSE_2F, 5, 4 ; 9 map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 10 map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 10 + map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 11 endgroup newgroup BLUE_FOREST ; 36 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index b4b6318..b8cfe96 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -814,3 +814,4 @@ ENDM map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0 map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0 map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0 + map_attributes Route49OldCityGate, ROUTE_49_OLD_CITY_GATE, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index ca3071c..18d1063 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -182,6 +182,7 @@ Route29Route46Gate_Blocks: Route5SaffronGate_Blocks: ViridianForestViridianGate_Blocks: ViridianForestPewterGate_Blocks: +Route49OldCityGate_Blocks: INCBIN "maps/NorthSouthGate.ablk" CinnabarIsland_Blocks: diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 788f546..c95a200 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -684,6 +684,7 @@ MapGroup_SilentHills: map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE assert_table_length NUM_SILENT_HILLS_MAPS MapGroup_BlueForest: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index d210bc2..f70c76b 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -521,6 +521,8 @@ INCLUDE "maps/JohtoSafariZone.asm" INCLUDE "maps/LavenderCrypt.asm" INCLUDE "maps/UnderwaterTunnel.asm" INCLUDE "maps/BillsGarden.asm" + +SECTION "Map Scripts 27", ROMX INCLUDE "maps/CeladonUniversityOutside.asm" INCLUDE "maps/CeladonUniversityInside.asm" INCLUDE "maps/MtMoonCrater.asm" @@ -551,6 +553,8 @@ INCLUDE "maps/IcefallCave1F.asm" INCLUDE "maps/IcefallCaveB1F.asm" INCLUDE "maps/IcefallCaveBack.asm" INCLUDE "maps/FiveIsland.asm" + +SECTION "Map Scripts 28", ROMX INCLUDE "maps/FiveIslandMeadow.asm" INCLUDE "maps/MemorialPillar.asm" INCLUDE "maps/WaterLabyrinth.asm" @@ -585,3 +589,6 @@ INCLUDE "maps/ThreeIslandPort.asm" INCLUDE "maps/AlteringCave.asm" INCLUDE "maps/SinjohRuinsExterior.asm" INCLUDE "maps/SinjohRuinsInterior.asm" + +SECTION "Map Scripts 29", ROMX +INCLUDE "maps/Route49OldCityGate.asm" diff --git a/maps/QuietCave.ablk b/maps/QuietCave.ablk index d6030a0..72ee82b 100644 --- a/maps/QuietCave.ablk +++ b/maps/QuietCave.ablk @@ -1 +1 @@ -iiiii$82822222221 $$$$g$82;C62221 ;8222?"266[==_28a2?"2c==<6[=_8a2222222266822aa8[====<21 7 6822aa;8226668?28822669268?2[===_ 7 7 2622268?282222aa262948?2 7 Z4268?2817 268?282a6"268228a26"1 7  7 Z?2866$$->8;4226$$$h;8222264822822226226 \ No newline at end of file +i82822222221 $$$$g82;C62221 ;8222?"266[==_28a2?"2c==<6[=_8a2222222266822aa8[====<21 7 6822aa;8226668?28822669268?2[===_ 7 7 2622268?282222aa262948?2 7 Z4268?2817 268?282a6"268228a26"1 7  7 Z?2866$$->8;4226$$$h;8222264822822226226 \ No newline at end of file diff --git a/maps/QuietCave.asm b/maps/QuietCave.asm index df31e0f..4f83eb7 100644 --- a/maps/QuietCave.asm +++ b/maps/QuietCave.asm @@ -220,7 +220,7 @@ QuietCave_MapEvents: def_object_events object_event 45, 28, SPRITE_ROCKER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, QuietCaveBoy1, -1 object_event 45, 19, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 3, TrainerBugCatcherSioned, -1 - object_event 33, 26, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerBeautyJulie, -1 + object_event 33, 26, SPRITE_POKEFAN_F, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 2, TrainerBeautyJulie, -1 object_event 31, 6, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_FAST, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerFirebreatherDick, -1 object_event 11, 27, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_TRAINER, 4, TrainerBugCatcherElwyn, -1 object_event 11, 6, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_TRAINER, 6, TrainerSchoolboyPero, -1 diff --git a/maps/Route49OldCityGate.asm b/maps/Route49OldCityGate.asm new file mode 100644 index 0000000..3792505 --- /dev/null +++ b/maps/Route49OldCityGate.asm @@ -0,0 +1,42 @@ + object_const_def + const ROUTE49OLDCITYGATE_OFFICER + +Route49OldCityGate_MapScripts: + def_scene_scripts + + def_callbacks + +Route49OldCityGateOfficerScript: + jumptextfaceplayer Route49OldCityOfficerText + +Route49OldCityOfficerText: + text "You're from JOHTO?" + + para "Haha, are you home" + line "sick? We like to" + cont "call this place a" + cont "'JOHTO TOWN'." + + para "Huh? What's with" + line "that glare?" + + para "It just looks like" + line "VIOLET CITY, that's" + cont "all!" + done + +Route49OldCityGate_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 4, 7, ROUTE_49_2, 3 + warp_event 5, 7, ROUTE_49_2, 4 + warp_event 4, 0, DEBUG_ROOM, 1 ; OLD_CITY + warp_event 5, 0, DEBUG_ROOM, 1 ; OLD_CITY + + def_coord_events + + def_bg_events + + def_object_events + object_event 0, 3, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route49OldCityGateOfficerScript, -1 diff --git a/maps/Route49_2.asm b/maps/Route49_2.asm index 23d9568..fe9d88b 100644 --- a/maps/Route49_2.asm +++ b/maps/Route49_2.asm @@ -58,6 +58,9 @@ Route49_2_MapEvents: def_warp_events warp_event 8, 27, QUIET_CAVE, 3 warp_event 9, 27, QUIET_CAVE, 4 + warp_event 9, 5, ROUTE_49_OLD_CITY_GATE, 2 + warp_event 8, 5, ROUTE_49_OLD_CITY_GATE, 1 + def_coord_events