diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 0ffc35eba..8d846be95 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -62,6 +62,9 @@ const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns const ENGINE_FLYPOINT_LEVEL_1 +if DEF(_DEBUG) + const ENGINE_FLYPOINT_DEBUGLEVEL_1 +endc const ENGINE_FLYPOINT_UNUSED ; wLuckyNumberShowFlag const ENGINE_LUCKY_NUMBER_SHOW diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index bc9649ae4..7c5c83b28 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -1,10 +1,13 @@ ; Landmarks indexes (see data/maps/landmarks.asm) const_def const LANDMARK_LEVEL_1 ; 00 - const LANDMARK_LEVEL_2 ; 01 - const LANDMARK_LEVEL_3 ; 02 - const LANDMARK_LEVEL_4 ; 03 - const LANDMARK_LEVEL_5 ; 04 +if DEF(_DEBUG) + const LANDMARK_DEBUGLEVEL_1 ; 00 + const LANDMARK_DEBUGLEVEL_2 ; 01 + const LANDMARK_DEBUGLEVEL_3 ; 02 + const LANDMARK_DEBUGLEVEL_4 ; 03 + const LANDMARK_DEBUGLEVEL_5 ; 04 +endc DEF NUM_LANDMARKS EQU const_value ; used in CaughtData diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 51063cef5..5bbc48882 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -44,4 +44,10 @@ ENDM ; map_const LEVEL_2_MAP_1, 4, 4 ; 1 ; endgroup +if DEF(_DEBUG) + newgroup DEBUGLEVEL_1 + map_const DEBUGLEVEL_1_MAP_1, 5, 4 ; 1 + endgroup +endc + DEF NUM_MAP_GROUPS EQU const_value diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index f9cbd0c42..16225ef4b 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -79,8 +79,10 @@ DEF NUM_FISHGROUPS EQU const_value - 1 const_def const SPAWN_LEVEL_1 ; const SPAWN_LEVEL_2 +if DEF(_DEBUG) + const SPAWN_DEBUGLEVEL_1 +endc DEF NUM_SPAWNS EQU const_value - DEF SPAWN_N_A EQU -1 ; Flypoints indexes (see data/maps/flypoints.asm) diff --git a/data/events/engine_flags.asm b/data/events/engine_flags.asm index 16f14558e..e30b84802 100644 --- a/data/events/engine_flags.asm +++ b/data/events/engine_flags.asm @@ -72,6 +72,9 @@ EngineFlags: ; fly engine_flag wVisitedSpawns, SPAWN_LEVEL_1 +if DEF(_DEBUG) + engine_flag wVisitedSpawns, SPAWN_DEBUGLEVEL_1 +endc engine_flag wVisitedSpawns, NUM_SPAWNS ; unused engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F diff --git a/data/level_selection_menu.asm b/data/level_selection_menu.asm index cf98af85a..fdc5f8515 100755 --- a/data/level_selection_menu.asm +++ b/data/level_selection_menu.asm @@ -18,18 +18,24 @@ ENDM LevelSelectionMenu_Landmarks: .landmark1 - level_selection_menu_landmark 0, 16, 11, .Level1LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_1 + level_selection_menu_landmark 0, 16, 12, .Level1LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_1 .landmark2 - level_selection_menu_landmark 0, 11, 9, .Level2LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_2 - level_selection_menu_landmark 0, 9, 11, .Level3LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_3 - level_selection_menu_landmark 1, 16, 11, .Level4LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_4 - level_selection_menu_landmark 2, 9, 5, .Level5LandmarkName, SPAWN_LEVEL_1 ; LANDMARK_LEVEL_5 +if DEF(_DEBUG) + level_selection_menu_landmark 0, 16, 11, .DebugLevel1LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_1 + level_selection_menu_landmark 0, 11, 9, .DebugLevel2LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_2 + level_selection_menu_landmark 0, 9, 11, .DebugLevel3LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_3 + level_selection_menu_landmark 1, 16, 11, .DebugLevel4LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_4 + level_selection_menu_landmark 2, 9, 5, .DebugLevel5LandmarkName, SPAWN_DEBUGLEVEL_1 ; LANDMARK_DEBUGLEVEL_5 +endc .Level1LandmarkName: db "LEVEL 1@" -.Level2LandmarkName: db "LEVEL 2@" -.Level3LandmarkName: db "LEVEL 3@" -.Level4LandmarkName: db "LEVEL 4@" -.Level5LandmarkName: db "LEVEL 5@" +if DEF(_DEBUG) +.DebugLevel1LandmarkName: db "DEBUG LEVEL 1@" +.DebugLevel2LandmarkName: db "DEBUG LEVEL 2@" +.DebugLevel3LandmarkName: db "DEBUG LEVEL 3@" +.DebugLevel4LandmarkName: db "DEBUG LEVEL 4@" +.DebugLevel5LandmarkName: db "DEBUG LEVEL 5@" +endc MACRO level_selection_menu_landmark_transition ; any number of (direction, num_steps (in tiles)) pairs @@ -52,33 +58,45 @@ LevelSelectionMenu_LandmarkTransitions: ; LANDMARK_LEVEL_1 level_selection_menu_landmark_transition DOWN, FALSE +if !DEF(_DEBUG) level_selection_menu_landmark_transition UP, FALSE - level_selection_menu_landmark_transition LEFT, 5, UP, 2, LANDMARK_LEVEL_2 - level_selection_menu_landmark_transition RIGHT, FALSE - -; LANDMARK_LEVEL_2 - level_selection_menu_landmark_transition DOWN, 2, RIGHT, 5, LANDMARK_LEVEL_1 - level_selection_menu_landmark_transition UP, 3, LEFT, 2, DOWN, 5, LANDMARK_LEVEL_3 +else + level_selection_menu_landmark_transition UP, 1, LANDMARK_DEBUGLEVEL_1 +endc level_selection_menu_landmark_transition LEFT, FALSE level_selection_menu_landmark_transition RIGHT, FALSE -; LANDMARK_LEVEL_3 - level_selection_menu_landmark_transition DOWN, 7, DOWN, 1, LANDMARK_LEVEL_5 - level_selection_menu_landmark_transition UP, 5, RIGHT, 2, DOWN, 3, LANDMARK_LEVEL_2 - level_selection_menu_landmark_transition LEFT, 7, LEFT, 4, LANDMARK_LEVEL_4 - level_selection_menu_landmark_transition RIGHT, 7, LANDMARK_LEVEL_1 +if DEF(_DEBUG) +; LANDMARK_DEBUGLEVEL_1 + level_selection_menu_landmark_transition DOWN, 1, LANDMARK_LEVEL_1 + level_selection_menu_landmark_transition UP, FALSE + level_selection_menu_landmark_transition LEFT, 5, UP, 2, LANDMARK_DEBUGLEVEL_2 + level_selection_menu_landmark_transition RIGHT, FALSE -; LANDMARK_LEVEL_4 +; LANDMARK_DEBUGLEVEL_2 + level_selection_menu_landmark_transition DOWN, 2, RIGHT, 5, LANDMARK_DEBUGLEVEL_1 + level_selection_menu_landmark_transition UP, 3, LEFT, 2, DOWN, 5, LANDMARK_DEBUGLEVEL_3 + level_selection_menu_landmark_transition LEFT, FALSE + level_selection_menu_landmark_transition RIGHT, FALSE + +; LANDMARK_DEBUGLEVEL_3 + level_selection_menu_landmark_transition DOWN, 7, DOWN, 1, LANDMARK_DEBUGLEVEL_5 + level_selection_menu_landmark_transition UP, 5, RIGHT, 2, DOWN, 3, LANDMARK_DEBUGLEVEL_2 + level_selection_menu_landmark_transition LEFT, 7, LEFT, 4, LANDMARK_DEBUGLEVEL_4 + level_selection_menu_landmark_transition RIGHT, 7, LANDMARK_DEBUGLEVEL_1 + +; LANDMARK_DEBUGLEVEL_4 level_selection_menu_landmark_transition DOWN, FALSE level_selection_menu_landmark_transition UP, FALSE level_selection_menu_landmark_transition LEFT, FALSE - level_selection_menu_landmark_transition RIGHT, 7, RIGHT, 4, LANDMARK_LEVEL_3 + level_selection_menu_landmark_transition RIGHT, 7, RIGHT, 4, LANDMARK_DEBUGLEVEL_3 -; LANDMARK_LEVEL_5 +; LANDMARK_DEBUGLEVEL_5 level_selection_menu_landmark_transition DOWN, FALSE - level_selection_menu_landmark_transition UP, 7, UP, 1, LANDMARK_LEVEL_3 + level_selection_menu_landmark_transition UP, 7, UP, 1, LANDMARK_DEBUGLEVEL_3 level_selection_menu_landmark_transition LEFT, FALSE level_selection_menu_landmark_transition RIGHT, FALSE +endc assert const_value == NUM_LANDMARKS * NUM_DIRECTIONS diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index a60e17dc9..6d736dd21 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -103,3 +103,9 @@ ENDM ; map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST ; connection west, Route29, ROUTE_29, 0 ; connection east, Route27, ROUTE_27, 0 + +if DEF(_DEBUG) + map_attributes DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, $00, SOUTH | NORTH + connection south, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 + connection north, DebugLevel1_Map1, DEBUGLEVEL_1_MAP_1, 0 +endc diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index a93cd101a..a20cb588d 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1,4 +1,9 @@ SECTION "Map Blocks 1", ROMX Level1_Map1_Blocks: - INCBIN "maps/Level1_Map1.blk" +INCBIN "maps/Level1_Map1.blk" + +if DEF(_DEBUG) +DebugLevel1_Map1_Blocks: +INCBIN "maps/DebugLevel1_Map1.blk" +endc diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index 09d6d22aa..6a44ccc9b 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -1,6 +1,8 @@ Flypoints: ; entries correspond to FLY_* constants -; Johto ; landmark, spawn point db LANDMARK_LEVEL_1, SPAWN_LEVEL_1 +if DEF(_DEBUG) + db LANDMARK_DEBUGLEVEL_1, SPAWN_DEBUGLEVEL_1 +endc db -1 ; end diff --git a/data/maps/maps.asm b/data/maps/maps.asm index f15e93e5a..66a6d6b45 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -17,8 +17,11 @@ ENDM MapGroupPointers:: ; pointers to the first map of each map group table_width 2, MapGroupPointers - dw MapGroup_Level1 ; 1 -; dw MapGroup_Level2 ; 2 + dw MapGroup_Level1 ; 1 +; dw MapGroup_Level2 ; 2 +if DEF(_DEBUG) + dw MapGroup_DebugLevel1 ; 1 +endc assert_table_length NUM_MAP_GROUPS MapGroup_Level1: @@ -31,3 +34,10 @@ MapGroup_Level1: ; table_width MAP_LENGTH, MapGroup_Level2 ; map Level2_Map1 ... ; assert_table_length NUM_LEVEL_2_MAPS + +if DEF(_DEBUG) +MapGroup_DebugLevel1: + table_width MAP_LENGTH, MapGroup_DebugLevel1 + map DebugLevel1_Map1, TILESET_PLAYERS_ROOM, INDOOR_BUILDING, LANDMARK_DEBUGLEVEL_1, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE + assert_table_length NUM_DEBUGLEVEL_1_MAPS +endc \ No newline at end of file diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index c1a02a6c7..a99a7168d 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -6,10 +6,12 @@ OutdoorSprites: table_width 2, OutdoorSprites dw Level1GroupSprites ; dw Level2GroupSprites +if DEF(_DEBUG) + dw DebugLevel1GroupSprites +endc assert_table_length NUM_MAP_GROUPS Level1GroupSprites: -; Level2GroupSprites: db SPRITE_YOUNGSTER db SPRITE_BUG_CATCHER db SPRITE_FISHER @@ -25,3 +27,25 @@ Level1GroupSprites: db SPRITE_ROCK ; max 3 of 10 still sprites db 0 ; end + +; Level2GroupSprites: +; db 0 ; end + +if DEF(_DEBUG) +DebugLevel1GroupSprites: + db SPRITE_YOUNGSTER + db SPRITE_BUG_CATCHER + db SPRITE_FISHER + db SPRITE_COOLTRAINER_M + db SPRITE_COOLTRAINER_F + db SPRITE_SUPER_NERD + db SPRITE_GRAMPS + db SPRITE_TEACHER + db SPRITE_LASS + ; max 9 of 9 walking sprites + db SPRITE_POKE_BALL + db SPRITE_FRUIT_TREE + db SPRITE_ROCK + ; max 3 of 10 still sprites + db 0 ; end +endc diff --git a/data/maps/roofs.asm b/data/maps/roofs.asm index d395d639e..fe2eb1a66 100644 --- a/data/maps/roofs.asm +++ b/data/maps/roofs.asm @@ -13,6 +13,9 @@ MapGroupRoofs: table_width 1, MapGroupRoofs db -1 ; 0 db ROOF_OLIVINE ; 1 (Level1) +if DEF(_DEBUG) + db ROOF_OLIVINE ; 1 (DebugLevel1) +endc assert_table_length NUM_MAP_GROUPS + 1 Roofs: diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index fb1eb9e5e..8b648148f 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -1,3 +1,7 @@ SECTION "Map Scripts 1", ROMX INCLUDE "maps/Level1_Map1.asm" + +if DEF(_DEBUG) +INCLUDE "maps/DebugLevel1_Map1.asm" +endc diff --git a/data/maps/spawn_points.asm b/data/maps/spawn_points.asm index d0ee81461..254248f0e 100644 --- a/data/maps/spawn_points.asm +++ b/data/maps/spawn_points.asm @@ -10,7 +10,9 @@ SpawnPoints: spawn LEVEL_1_MAP_1, 3, 3 ; SPAWN_LEVEL_1 ; spawn LEVEL_2_MAP_1, 5, 3 ; SPAWN_LEVEL_2 - +if DEF(_DEBUG) + spawn DEBUGLEVEL_1_MAP_1, 3, 3, ; SPAWN_DEBUGLEVEL_1 +endc spawn N_A, -1, -1 assert_table_length NUM_SPAWNS + 1 diff --git a/gfx/tilesets/roofs.pal b/gfx/tilesets/roofs.pal index dfe559ba3..270fb7bc0 100644 --- a/gfx/tilesets/roofs.pal +++ b/gfx/tilesets/roofs.pal @@ -10,6 +10,14 @@ RGB 09,09,17, 05,07,13 ; nite RGB 12,13,23, 06,08,11 ; eve +if DEF(_DEBUG) +; debug group 1 (DebugLevel1) + RGB 14,17,31, 07,11,15 ; morn + RGB 14,17,31, 07,11,15 ; day + RGB 09,09,17, 05,07,13 ; nite + RGB 12,13,23, 06,08,11 ; eve +endc + ; group 2 (Mahogany) ; RGB 12,19,00, 06,10,00 ; morn ; RGB 12,19,00, 06,10,00 ; day diff --git a/maps/DebugLevel1_Map1.asm b/maps/DebugLevel1_Map1.asm new file mode 100755 index 000000000..843b1ebec --- /dev/null +++ b/maps/DebugLevel1_Map1.asm @@ -0,0 +1,113 @@ + object_const_def + const DEBUGLEVEL1_MAP1_CONSOLE + const DEBUGLEVEL1_MAP1_DOLL_1 + const DEBUGLEVEL1_MAP1_DOLL_2 + const DEBUGLEVEL1_MAP1_BIG_DOLL + const DEBUGLEVEL1_MAP1_TRAINER + +DebugLevel1_Map1_MapScripts: + def_scene_scripts + + def_callbacks + +DebugLevel1_Map1_Doll1Script:: + opentext + callasm .BoardMenu + waitbutton + pokemart MARTTYPE_STANDARD, MART_AZALEA + closetext + end +.BoardMenu: + farcall BoardMenu + ret +; describedecoration DECODESC_LEFT_DOLL + +DebugLevel1_Map1_Doll2Script: + jumpstd PokecenterNurseScript +; describedecoration DECODESC_RIGHT_DOLL + +DebugLevel1_Map1_BigDollScript: + jumpstd PCScript +; describedecoration DECODESC_BIG_DOLL + +DebugLevel1_Map1_GameConsoleScript: + randomwildmon + startbattle + reloadmapafterbattle + end +; describedecoration DECODESC_CONSOLE + +DebugLevel1_Map1_PosterScript: + describedecoration DECODESC_POSTER + +DebugLevel1_Map1_RadioScript: + jumpstd Radio1Script + +DebugLevel1_Map1_BookshelfScript: + jumpstd PictureBookshelfScript + +DebugLevel1_Map1_PCScript: + opentext + special PlayersHousePC + iftrue .Warp + closetext + end +.Warp: + warp NONE, 0, 0 + end + +DebugLevel1_Map1_TrainerYoungsterMikey: + trainer YOUNGSTER, MIKEY, EVENT_DECO_BED_1, .YoungsterMikeySeenText, .YoungsterMikeyBeatenText, 0, .Script + +.Script: + endifjustbattled + opentext + writetext .YoungsterMikeyAfterText + waitbutton + closetext + end + + +.YoungsterMikeySeenText: + text "You're a #MON" + line "trainer, right?" + + para "Then you have to" + line "battle!" + done + +.YoungsterMikeyBeatenText: + text "That's strange." + line "I won before." + done + +.YoungsterMikeyAfterText: + text "Becoming a good" + line "trainer is really" + cont "tough." + + para "I'm going to bat-" + line "tle other people" + cont "to get better." + done + +DebugLevel1_Map1_MapEvents: + db 0, 0 ; filler + + def_warp_events + warp_event 7, 0, LEVEL_1_MAP_1, 1 + + def_coord_events + + def_bg_events + bg_event 2, 1, BGEVENT_UP, DebugLevel1_Map1_PCScript + bg_event 3, 1, BGEVENT_READ, DebugLevel1_Map1_RadioScript + bg_event 5, 1, BGEVENT_READ, DebugLevel1_Map1_BookshelfScript + bg_event 6, 0, BGEVENT_IFSET, DebugLevel1_Map1_PosterScript + + def_object_events + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugLevel1_Map1_GameConsoleScript, -1 + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugLevel1_Map1_Doll1Script, -1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugLevel1_Map1_Doll2Script, -1 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugLevel1_Map1_BigDollScript, -1 + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, DebugLevel1_Map1_TrainerYoungsterMikey, -1 diff --git a/maps/DebugLevel1_Map1.blk b/maps/DebugLevel1_Map1.blk new file mode 100755 index 000000000..c2f432bb0 --- /dev/null +++ b/maps/DebugLevel1_Map1.blk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/maps/Level1_Map1.asm b/maps/Level1_Map1.asm index abb98a08b..769154269 100755 --- a/maps/Level1_Map1.asm +++ b/maps/Level1_Map1.asm @@ -1,16 +1,16 @@ object_const_def - const PLAYERSHOUSE2F_CONSOLE - const PLAYERSHOUSE2F_DOLL_1 - const PLAYERSHOUSE2F_DOLL_2 - const PLAYERSHOUSE2F_BIG_DOLL - const PLAYERSHOUSE2F_TRAINER + const LEVEL1_MAP1_CONSOLE + const LEVEL1_MAP1_DOLL_1 + const LEVEL1_MAP1_DOLL_2 + const LEVEL1_MAP1_BIG_DOLL + const LEVEL1_MAP1_TRAINER Level1_Map1_MapScripts: def_scene_scripts def_callbacks -PlayersHouseDoll1Script:: +Level1_Map1_Doll1Script:: opentext callasm .BoardMenu waitbutton @@ -22,38 +22,31 @@ PlayersHouseDoll1Script:: ret ; describedecoration DECODESC_LEFT_DOLL -PlayersHouseDoll2Script: +Level1_Map1_Doll2Script: jumpstd PokecenterNurseScript ; describedecoration DECODESC_RIGHT_DOLL -PlayersHouseBigDollScript: +Level1_Map1_BigDollScript: jumpstd PCScript ; describedecoration DECODESC_BIG_DOLL -PlayersHouseGameConsoleScript: +Level1_Map1_GameConsoleScript: randomwildmon startbattle reloadmapafterbattle end ; describedecoration DECODESC_CONSOLE -PlayersHousePosterScript: +Level1_Map1_PosterScript: describedecoration DECODESC_POSTER -PlayersHouseRadioScript: +Level1_Map1_RadioScript: jumpstd Radio1Script -.AbbreviatedRadio: - opentext - writetext PlayersRadioText4 - pause 45 - closetext - end - -PlayersHouseBookshelfScript: +Level1_Map1_BookshelfScript: jumpstd PictureBookshelfScript -PlayersHousePCScript: +Level1_Map1_PCScript: opentext special PlayersHousePC iftrue .Warp @@ -63,39 +56,19 @@ PlayersHousePCScript: warp NONE, 0, 0 end -PlayersRadioText1: - text "PROF.OAK'S #MON" - line "TALK! Please tune" - cont "in next time!" - done - -PlayersRadioText2: - text "#MON CHANNEL!" - done - -PlayersRadioText3: - text "This is DJ MARY," - line "your co-host!" - done - -PlayersRadioText4: - text "#MON!" - line "#MON CHANNEL…" - done - -TrainerYoungsterMikey: - trainer YOUNGSTER, MIKEY, EVENT_DECO_BED_1, YoungsterMikeySeenText, YoungsterMikeyBeatenText, 0, .Script +Level1_Map1_TrainerYoungsterMikey: + trainer YOUNGSTER, MIKEY, EVENT_DECO_BED_1, .YoungsterMikeySeenText, .YoungsterMikeyBeatenText, 0, .Script .Script: endifjustbattled opentext - writetext YoungsterMikeyAfterText + writetext .YoungsterMikeyAfterText waitbutton closetext end -YoungsterMikeySeenText: +.YoungsterMikeySeenText: text "You're a #MON" line "trainer, right?" @@ -103,12 +76,12 @@ YoungsterMikeySeenText: line "battle!" done -YoungsterMikeyBeatenText: +.YoungsterMikeyBeatenText: text "That's strange." line "I won before." done -YoungsterMikeyAfterText: +.YoungsterMikeyAfterText: text "Becoming a good" line "trainer is really" cont "tough." @@ -127,14 +100,14 @@ Level1_Map1_MapEvents: def_coord_events def_bg_events - bg_event 2, 1, BGEVENT_UP, PlayersHousePCScript - bg_event 3, 1, BGEVENT_READ, PlayersHouseRadioScript - bg_event 5, 1, BGEVENT_READ, PlayersHouseBookshelfScript - bg_event 6, 0, BGEVENT_IFSET, PlayersHousePosterScript + bg_event 2, 1, BGEVENT_UP, Level1_Map1_PCScript + bg_event 3, 1, BGEVENT_READ, Level1_Map1_RadioScript + bg_event 5, 1, BGEVENT_READ, Level1_Map1_BookshelfScript + bg_event 6, 0, BGEVENT_IFSET, Level1_Map1_PosterScript def_object_events - object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseGameConsoleScript, -1 - object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll1Script, -1 - object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseDoll2Script, -1 - object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PlayersHouseBigDollScript, -1 - object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerYoungsterMikey, -1 + object_event 4, 2, SPRITE_CONSOLE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Level1_Map1_GameConsoleScript, -1 + object_event 4, 4, SPRITE_DOLL_1, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Level1_Map1_Doll1Script, -1 + object_event 5, 4, SPRITE_DOLL_2, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Level1_Map1_Doll2Script, -1 + object_event 0, 1, SPRITE_BIG_DOLL, SPRITEMOVEDATA_BIGDOLL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, Level1_Map1_BigDollScript, -1 + object_event 6, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, Level1_Map1_TrainerYoungsterMikey, -1 diff --git a/maps/Level1_Map1.blk.bak b/maps/Level1_Map1.blk.bak deleted file mode 100755 index 63d33c2f8..000000000 --- a/maps/Level1_Map1.blk.bak +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file