diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 9252f83..f1b53b3 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -516,6 +516,7 @@ ENDM newgroup SILENT_HILLS ; 27 map_const SILENT_HILLS, 10, 10 ; 1 + map_const DEBUG_ROOM, 20, 20 ; 2 endgroup DEF NUM_MAP_GROUPS EQU const_value ; 27 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 8ed2cbe..ee0acc6 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -709,3 +709,4 @@ ENDM map_attributes CeruleanCave2F, CERULEAN_CAVE_2F, $00, 0 map_attributes CeruleanCaveB1F, CERULEAN_CAVE_B1F, $00, 0 map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later. + map_attributes DebugRoom, DEBUG_ROOM, $05, 0 ; Debug Room :V diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index 0446e0d..a54c498 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1077,3 +1077,6 @@ SilentHills_Blocks: LakeOfRagePrycesHouse_Blocks: INCBIN "maps/LakeOfRagePrycesHouse.ablk" + +DebugRoom_Blocks: + INCBIN "maps/DebugRoom.ablk" \ No newline at end of file diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 0355106..0f41282 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -554,4 +554,5 @@ MapGroup_Cherrygrove: MapGroup_SilentHills: table_width MAP_LENGTH, MapGroup_SilentHills 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_SILENT_HILLS, MUSIC_MOBILE_ADAPTER_MENU, TRUE, PALETTE_MORN, FISHGROUP_SHORE assert_table_length NUM_SILENT_HILLS_MAPS diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index c3a5a4d..db03d15 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -498,3 +498,4 @@ INCLUDE "maps/LakeOfRageTraderHouse.asm" INCLUDE "maps/LakeOfRagePokecenter1F.asm" INCLUDE "maps/LakeOfRageMart.asm" INCLUDE "maps/LakeOfRagePrycesHouse.asm" +INCLUDE "maps/DebugRoom.asm" diff --git a/maps/DebugRoom.ablk b/maps/DebugRoom.ablk new file mode 100644 index 0000000..db8ca54 --- /dev/null +++ b/maps/DebugRoom.ablk @@ -0,0 +1,6 @@ + ! ! !WWE +R + ! +ERETvUXYG~IJ +HEF|}BEJ~EJ@AAB +DBIIIIJHIBTvUDJX5YHIJ|}~EEE \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm new file mode 100644 index 0000000..9a3f947 --- /dev/null +++ b/maps/DebugRoom.asm @@ -0,0 +1,115 @@ + object_const_def + ;const GLOBALTERMINALOUTSIDE_ROCKET + +DebugRoom_MapScripts: + def_scene_scripts + + def_callbacks + +DebugPokemon1Script: + opentext + getmonname STRING_BUFFER_3, BURGELA + writetext ReceivedDebugPokemonText + playsound SFX_CAUGHT_MON + waitsfx + promptbutton + givepoke BURGELA, 42, DUSK_STONE + closetext + end + +DebugPokemon2Script: + opentext + getmonname STRING_BUFFER_3, LICKITUNG + writetext ReceivedDebugPokemonText + playsound SFX_CAUGHT_MON + waitsfx + promptbutton + givepoke LICKITUNG, 42, POISON_STONE + closetext + end + +ReceivedDebugPokemonText: + text " received" + line "@" + text_ram wStringBuffer3 + text "!" + done + +DebugPokemon3Script: + faceplayer + opentext + writetext DebugTextA + cry GOROCHU + pause 15 + closetext + loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE + loadwildmon GOROCHU, 40 + startbattle + reloadmapafterbattle + end + +DebugTextA: + text "Waaaake!!" + done + +DebugPokemon4Script: + faceplayer + opentext + writetext DebugTextB + cry SHI_SHI + pause 15 + closetext + loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE + loadwildmon SHI_SHI, 40 + startbattle + reloadmapafterbattle + end + +DebugTextB: + text "Komaiiii!" + done + +DebugFlyScript: + faceplayer + opentext + writetext DebugTextC + playsound SFX_GET_BADGE + promptbutton + setflag ENGINE_STORMBADGE + readvar VAR_BADGES + givepoke PIDGEY, 1, HM_FLY + closetext + end + +DebugTextC: + text "I believe" + line "I can FLY" + done + +DebugRoom_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 23, 14, PLAYERS_HOUSE_1F, 1 + warp_event 3, 20, SILENT_HILLS, 1 + warp_event 15, 15, LAKE_OF_RAGE, 3 + warp_event 27, 5, PEWTER_CITY, 2 + warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp + warp_event 4, 9, PALLET_TOWN, 1 ; left lab/league warp + warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp + warp_event 35, 17, ILEX_FOREST, 1 ; east warp + warp_event 5, 35, ILEX_FOREST, 1 ; southwest warp + warp_event 19, 34, ILEX_FOREST, 1 ; southern warp + warp_event 33, 33, ILEX_FOREST, 1 ; southeast warp + + def_coord_events + + def_bg_events + + def_object_events + object_event 21, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon1Script, -1 + object_event 24, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1 + object_event 29, 24, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon3Script, -1 + object_event 29, 27, SPRITE_SUICUNE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, PAL_OW_SILVER, OBJECTTYPE_SCRIPT, 0, DebugPokemon4Script, -1 + object_event 24, 15, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugFlyScript, -1 + diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 999b223..39563eb 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -111,75 +111,12 @@ PlayersRadioText4: text "#MON!" line "#MON CHANNEL…" done - -DebugPokemon1Script: - opentext - getmonname STRING_BUFFER_3, BURGELA - writetext ReceivedDebugPokemonText - playsound SFX_CAUGHT_MON - waitsfx - promptbutton - givepoke BURGELA, 42, DUSK_STONE - closetext - end - -DebugPokemon2Script: - opentext - getmonname STRING_BUFFER_3, LICKITUNG - writetext ReceivedDebugPokemonText - playsound SFX_CAUGHT_MON - waitsfx - promptbutton - givepoke LICKITUNG, 42, POISON_STONE - closetext - end - -ReceivedDebugPokemonText: - text " received" - line "@" - text_ram wStringBuffer3 - text "!" - done - -DebugPokemon3Script: - faceplayer - opentext - writetext DebugTextA - cry GOROCHU - pause 15 - closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon GOROCHU, 40 - startbattle - reloadmapafterbattle - end - -DebugTextA: - text "Waaaake!!" - done - -DebugPokemon4Script: - faceplayer - opentext - writetext DebugTextB - cry SHI_SHI - pause 15 - closetext - loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon SHI_SHI, 40 - startbattle - reloadmapafterbattle - end - -DebugTextB: - text "Komaiiii!" - done PlayersHouse2F_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 7, 0, LAKE_OF_RAGE, 3 + warp_event 7, 0, DEBUG_ROOM, 1 ;warp_event 7, 0, PLAYERS_HOUSE_1F, 3 def_coord_events @@ -195,8 +132,4 @@ PlayersHouse2F_MapEvents: object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, EVENT_PLAYERS_HOUSE_2F_DOLL_1 object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, EVENT_PLAYERS_HOUSE_2F_DOLL_2 object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, EVENT_PLAYERS_HOUSE_2F_BIG_DOLL - object_event 2, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon1Script, -1 - object_event 7, 5, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1 - object_event 3, 5, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon3Script, -1 - object_event 6, 5, SPRITE_MONSTER, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon4Script, -1 \ No newline at end of file