diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 38e6570..2878238 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -126,6 +126,7 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_SIX_ISLAND const LANDMARK_SEVEN_ISLAND DEF NIHON_LANDMARK EQU const_value + const LANDMARK_WINNERS_PATH const LANDMARK_SILENT_HILLS const LANDMARK_DEBUG_ROOM const LANDMARK_ROUTE_49 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0585b02..27f19ca 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -616,18 +616,19 @@ ENDM endgroup newgroup SILENT_HILLS ; 35 - map_const SILENT_HILLS, 10, 10 ; 1 - 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, 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 + map_const WINNERS_PATH, 10, 26 ; 1 + map_const SILENT_HILLS, 10, 10 ; 2 + map_const DEBUG_ROOM, 20, 20 ; 3 + map_const ROUTE_49, 15, 9 ; 4 + map_const QUIET_CAVE, 27, 18 ; 5 + map_const ROUTE_49_2, 10, 19 ; 6 + map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 7 + map_const SILVERS_HOUSE, 5, 5 ; 8 + map_const CALS_HOUSE_1F, 5, 4 ; 9 + map_const CALS_HOUSE_2F, 5, 4 ; 10 + map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 11 + map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 12 + map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 13 endgroup newgroup BLUE_FOREST ; 36 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 60b5a1f..0bcbaff 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -806,6 +806,7 @@ ENDM map_attributes NavalRockB1F, NAVAL_ROCK_B1F, $00, 0 ; Nihon + map_attributes WinnersPath, WINNERS_PATH, $00, 0 map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes QuietCave, QUIET_CAVE, $76, 0 map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 18d1063..ddec052 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1198,3 +1198,6 @@ SinjohRuinsExterior_Blocks: SinjohRuinsInterior_Blocks: INCBIN "maps/SinjohRuinsInterior.ablk" + +WinnersPath_Blocks: + INCBIN "maps/WinnersPath.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index e29a498..3bd67c4 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -130,6 +130,7 @@ Landmarks: landmark 0, 0, UnknownName ; Six Island landmark 0, 0, UnknownName ; Seven Island assert_table_length NIHON_LANDMARK + landmark 0, 0, WinnersPathName landmark 92, 108, SilentHillsName landmark 20, 28, UnknownName ; Debug Room landmark 91, 108, Route49Name ; probably not correct @@ -240,6 +241,7 @@ TohjoFallsName: db "TOHJO FALLS@" UndergroundName: db "UNDERGROUND@" BattleTowerName: db "BATTLE¯TOWER@" SpecialMapName: db "SPECIAL@" +WinnersPathName: db "WINNER'S¯PATH@" SilentHillsName: db "SILENT¯HILLS@" UnknownName: db "?????@" Route49Name: db "ROUTE 49@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 8981ef4..98c3eac 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -673,6 +673,7 @@ MapGroup_SevenIsland: ; 34 MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills + map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index f70c76b..e08f580 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -592,3 +592,4 @@ INCLUDE "maps/SinjohRuinsInterior.asm" SECTION "Map Scripts 29", ROMX INCLUDE "maps/Route49OldCityGate.asm" +INCLUDE "maps/WinnersPath.asm" diff --git a/data/tilesets/cave_attributes.bin b/data/tilesets/cave_attributes.bin index b5e430c..88761b4 100644 Binary files a/data/tilesets/cave_attributes.bin and b/data/tilesets/cave_attributes.bin differ diff --git a/data/tilesets/cave_collision.asm b/data/tilesets/cave_collision.asm index 693e727..78e59de 100644 --- a/data/tilesets/cave_collision.asm +++ b/data/tilesets/cave_collision.asm @@ -77,3 +77,11 @@ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4d tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 50 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 51 + tilecoll WALL, FLOOR, FLOOR, LADDER ; 52 + tilecoll WATER, WATER, WATER, WATER ; 53 + tilecoll WATER, WATER, WATER, WATER ; 54 + tilecoll WATER, WALL, WATER, WALL ; 55 + tilecoll WATER, WALL, WALL, WALL ; 56 diff --git a/data/tilesets/cave_metatiles.bin b/data/tilesets/cave_metatiles.bin index 66ec703..97c6f72 100644 Binary files a/data/tilesets/cave_metatiles.bin and b/data/tilesets/cave_metatiles.bin differ diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index ffe399a..a0487cb 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -1480,25 +1480,29 @@ CooltrainerMGroup: dw SANDSLASH dw SAND_ATTACK, POISON_STING, SLASH, SWIFT db -1 ; end - + + ; Previously unused, now Winner's Path next_list_item ; COOLTRAINERM (13) db "ERICK@", TRAINERTYPE_NORMAL - db 10 - dw BULBASAUR - db 10 - dw CHARMANDER - db 10 - dw SQUIRTLE + db 56 + dw VENUSAUR + db 56 + dw CHARIZARD + db 56 + dw TOTARTLE db -1 ; end - + + ; Previously unused, now Winner's Path next_list_item ; COOLTRAINERM (14) db "ANDY@", TRAINERTYPE_NORMAL - db 10 - dw BULBASAUR - db 10 - dw CHARMANDER - db 10 - dw SQUIRTLE + db 53 + dw CACAWPHONY + db 54 + dw WARUCHU + db 53 + dw SNEASEL ; WEARLYCAN + db 56 + dw PILOSWINE ; BUNDRAKE db -1 ; end next_list_item ; COOLTRAINERM (15) @@ -1530,15 +1534,18 @@ CooltrainerMGroup: db 35 dw WARTORTLE db -1 ; end - + + ; Previously unused, now Winner's Path next_list_item ; COOLTRAINERM (18) db "STEVE@", TRAINERTYPE_NORMAL - db 14 - dw BULBASAUR - db 14 - dw CHARMANDER - db 14 - dw SQUIRTLE + db 53 + dw TREBIR + db 54 + dw GOROCHU + db 53 + dw SNEASEL ; WEAVILE + db 56 + dw PILOSWINE ; BUNBERG db -1 ; end next_list_item ; COOLTRAINERM (19) diff --git a/data/wild/nihon_grass.asm b/data/wild/nihon_grass.asm index d534170..8ac384c 100644 --- a/data/wild/nihon_grass.asm +++ b/data/wild/nihon_grass.asm @@ -1,31 +1,30 @@ NihonGrassWildMons: - - def_grass_wildmons ROUTE_49 - db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + def_grass_wildmons WINNERS_PATH + db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite ; morn - dbw 30, PIDGEY - dbw 31, RATTATA - dbw 30, PIKACHU - dbw 31, MAREEP - dbw 32, HOPPIP - dbw 32, MARILL - dbw 35, SUNFLORA + dbw 50, MUNCHLAX + dbw 51, SKARMORY + dbw 50, CHANSEY + dbw 51, MUNCHLAX + dbw 52, TAUROS + dbw 52, FORRETRESS + dbw 55, STEELIX ; day - dbw 30, PIDGEY - dbw 31, RATTATA - dbw 30, PIKACHU - dbw 31, MAREEP - dbw 32, HOPPIP - dbw 32, MARILL - dbw 35, GIRAFARIG + dbw 50, MUNCHLAX + dbw 51, SKARMORY + dbw 50, CHANSEY + dbw 51, MUNCHLAX + dbw 52, TAUROS + dbw 52, FORRETRESS + dbw 55, STEELIX ; nite - dbw 30, HOOTHOOT - dbw 31, RATTATA - dbw 30, PIKACHU - dbw 31, MAREEP - dbw 32, HOPPIP - dbw 32, MARILL - dbw 35, SKARMORY + dbw 50, MUNCHLAX + dbw 51, SKARMORY + dbw 50, KITSEN + dbw 51, MUNCHLAX + dbw 52, HAUNTER + dbw 52, MISDREAVUS + dbw 55, STEELIX end_grass_wildmons def_grass_wildmons QUIET_CAVE @@ -84,4 +83,32 @@ NihonGrassWildMons: dbw 35, SKARMORY end_grass_wildmons + def_grass_wildmons ROUTE_49 + db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite + ; morn + dbw 30, PIDGEY + dbw 31, RATTATA + dbw 30, PIKACHU + dbw 31, MAREEP + dbw 32, HOPPIP + dbw 32, MARILL + dbw 35, SUNFLORA + ; day + dbw 30, PIDGEY + dbw 31, RATTATA + dbw 30, PIKACHU + dbw 31, MAREEP + dbw 32, HOPPIP + dbw 32, MARILL + dbw 35, GIRAFARIG + ; nite + dbw 30, HOOTHOOT + dbw 31, RATTATA + dbw 30, PIKACHU + dbw 31, MAREEP + dbw 32, HOPPIP + dbw 32, MARILL + dbw 35, SKARMORY + end_grass_wildmons + db -1 ; end diff --git a/data/wild/nihon_water.asm b/data/wild/nihon_water.asm index 6cf9f25..d2b2764 100644 --- a/data/wild/nihon_water.asm +++ b/data/wild/nihon_water.asm @@ -1,32 +1,17 @@ NihonWaterWildMons: + def_water_wildmons WINNERS_PATH + db 4 percent ; encounter rates: morn/day/nite + dbw 40, MAGIKARP + dbw 41, SEADRA + dbw 40, GRANBO ; SHARPOON + end_water_wildmons ; Placeholder - def_grass_wildmons ROUTE_49_2 - db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite - ; morn + def_water_wildmons ROUTE_49_2 + db 4 percent ; encounter rates: morn/day/nite dbw 30, MAGIKARP dbw 31, MAGIKARP dbw 30, MAGIKARP - dbw 31, MAGIKARP - dbw 32, MAGIKARP - dbw 32, MAGIKARP - dbw 35, MAGIKARP - ; day - dbw 30, MAGIKARP - dbw 31, MAGIKARP - dbw 30, MAGIKARP - dbw 31, MAGIKARP - dbw 32, MAGIKARP - dbw 32, MAGIKARP - dbw 35, MAGIKARP - ; nite - dbw 30, MAGIKARP - dbw 31, MAGIKARP - dbw 30, MAGIKARP - dbw 31, MAGIKARP - dbw 32, MAGIKARP - dbw 32, MAGIKARP - dbw 35, MAGIKARP - end_grass_wildmons + end_water_wildmons db -1 ; end diff --git a/gfx/pokegear/nihon.bin b/gfx/pokegear/nihon.bin index 1eeee5b..04ef749 100644 Binary files a/gfx/pokegear/nihon.bin and b/gfx/pokegear/nihon.bin differ diff --git a/gfx/tilesets/cave.png b/gfx/tilesets/cave.png index 63143d6..dc3348a 100644 Binary files a/gfx/tilesets/cave.png and b/gfx/tilesets/cave.png differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index d43cdda..6d2aeae 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -76,7 +76,14 @@ DebugFlyScript: writetext DebugTextC playsound SFX_GET_BADGE promptbutton + setflag ENGINE_ZEPHYRBADGE + setflag ENGINE_HIVEBADGE + setflag ENGINE_PLAINBADGE + setflag ENGINE_FOGBADGE setflag ENGINE_STORMBADGE + setflag ENGINE_MINERALBADGE + setflag ENGINE_GLACIERBADGE + setflag ENGINE_RISINGBADGE setflag ENGINE_POKEDEX setflag ENGINE_MAP_CARD setflag ENGINE_POKEGEAR @@ -130,7 +137,7 @@ DebugDexScript: playsound SFX_FANFARE promptbutton callasm CheatFillPokedex - givepoke CELEBI, 50 + givepoke FURRET, 100 ; gets all the hms closetext end @@ -495,7 +502,7 @@ DebugRoom_MapEvents: warp_event 19, 34, BLUE_FOREST, 1 ; southern warp warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp warp_event 5, 3, AZALEA_TOWN, 1 - warp_event 34, 11, PEWTER_MUSEUM_OF_SCIENCE_1F, 1 + warp_event 34, 11, WINNERS_PATH, 1 def_coord_events diff --git a/maps/WinnersPath (unfinished, 10x30).ablk b/maps/WinnersPath (unfinished, 10x30).ablk deleted file mode 100644 index d84c262..0000000 Binary files a/maps/WinnersPath (unfinished, 10x30).ablk and /dev/null differ diff --git a/maps/WinnersPath.ablk b/maps/WinnersPath.ablk new file mode 100644 index 0000000..781ddbe --- /dev/null +++ b/maps/WinnersPath.ablk @@ -0,0 +1,18 @@ +..........  +@&%R +A&1@2' +ST 0U +A&VN#M ....................  ++)K +)))! +))( +( !+JN#M ....................   +*E*B + + + +   +F +J +Q + !!!"N#MNM \ No newline at end of file diff --git a/maps/WinnersPath.asm b/maps/WinnersPath.asm new file mode 100644 index 0000000..73281ba --- /dev/null +++ b/maps/WinnersPath.asm @@ -0,0 +1,144 @@ + object_const_def + +WinnersPath_MapScripts: + def_scene_scripts + + def_callbacks + +WinnersPathSign1Script: + jumptext WinnersPathSign1Text + +WinnersPathSign2Script: + jumptext WinnersPathSign2Text + +WinnersPathSign1Text: + text "WINNER'S PATH" + line "You've faced the" + cont "best! Now fight" + cont "the winners!" ; There has to be a better way to do this, right? + done + +WinnersPathSign2Text: + text "WINNER'S PATH" + line "NIHON ahead." + + para "Congratulations," + line "champion!" + done + +TrainerCoolTrainerErick: + trainer COOLTRAINERM, ERICK, EVENT_BEAT_COOLTRAINERM_ERICK, CoolTrainerErickSeenText, CoolTrainerErickBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext CoolTrainerErickAfterBattleText + waitbutton + closetext + end + +CoolTrainerErickSeenText: + text "You must have" + line "gone through a" + cont "lot to get here!" + + para "Can you keep up?" + done + +CoolTrainerErickBeatenText: + text "Sure can!" + prompt + +CoolTrainerErickAfterBattleText: + text "This is your big" + line "moment! Go on!" + done + +TrainerCoolTrainerAndy: + trainer COOLTRAINERM, ANDY, EVENT_BEAT_COOLTRAINERM_ANDY, CoolTrainerAndySeenText, CoolTrainerAndyBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext CoolTrainerAndyAfterBattleText + waitbutton + closetext + end + +CoolTrainerAndySeenText: + text "What the? You're" + line "the newest JOHTO" + cont "LEAGUE CHAMPION?" + + para "No way! Let me" + line "take you back" + cont "home, kid!" + done + +CoolTrainerAndyBeatenText: + text "Wh-whoa! Strong!" + prompt + +CoolTrainerAndyAfterBattleText: + text "I'm so, so sorry." + + para "It's exactly my" + line "fault!" + done + +TrainerCoolTrainerSteve: + trainer COOLTRAINERM, STEVE, EVENT_BEAT_COOLTRAINERM_STEVE, CoolTrainerSteveSeenText, CoolTrainerSteveBeatenText, 0, .AfterScript + +.AfterScript: + endifjustbattled + opentext + writetext CoolTrainerSteveAfterBattleText + waitbutton + closetext + end + +CoolTrainerSteveSeenText: + text "NIHON is a great" + line "place! But do" + cont "you have what it" + cont "takes to get" + cont "there?" + done + +CoolTrainerSteveBeatenText: + text "Haha! Whoa!" + prompt + +CoolTrainerSteveAfterBattleText: + text "WINNER'S PATH is" + line "known for having" + cont "some of the stro-" + cont "-ngest #MON of" + cont "all!" + + para "Obvious when" + line "you think about" + cont "it, right?" + done + +WinnersPath_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 3, 49, DEBUG_ROOM, 1 ; Will be...Indigo Plateau? + warp_event 17, 39, WINNERS_PATH, 3 + warp_event 17, 29, WINNERS_PATH, 2 + warp_event 3, 21, WINNERS_PATH, 5 + warp_event 3, 11, WINNERS_PATH, 4 + warp_event 17, 5, DEBUG_ROOM, 3 ; Some Route... + + def_coord_events + + def_bg_events + bg_event 2, 48, BGEVENT_READ, WinnersPathSign1Text + bg_event 16, 4, BGEVENT_READ, WinnersPathSign2Text + + def_object_events + object_event 9, 43, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerErick, -1 + object_event 5, 22, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerAndy, -1 + object_event 7, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerSteve, -1