diff --git a/constants/event_flags.asm b/constants/event_flags.asm index c950278..02a77ff 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -208,7 +208,9 @@ const EVENT_GAVE_GS_BALL_TO_KURT const EVENT_FOREST_IS_RESTLESS const EVENT_ANSWERED_DRAGON_MASTER_QUIZ_WRONG -; Unused: next 4 events + + const EVENT_GOT_TICKET ; Pewter Museum, temporary +; Unused: next 3 events const_next 200 ; Kanto story events diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index c8421a0..28304c7 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -85,4 +85,5 @@ MapScenes:: scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID scene_var CERULEAN_CAVE_1F, wCeruleanCave1FSceneID + scene_var PEWTER_MUSEUM_OF_SCIENCE_1F, wPewterMuseum1FSceneID db -1 ; end diff --git a/data/tilesets/museum_attributes.bin b/data/tilesets/museum_attributes.bin index 8433b9d..f972116 100644 Binary files a/data/tilesets/museum_attributes.bin and b/data/tilesets/museum_attributes.bin differ diff --git a/data/tilesets/museum_collision.asm b/data/tilesets/museum_collision.asm index d68912c..6cff9e8 100644 --- a/data/tilesets/museum_collision.asm +++ b/data/tilesets/museum_collision.asm @@ -1,128 +1,42 @@ tilecoll WALL, WALL, WALL, WALL ; 00 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WALL, WALL, WALL, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, WALL, FLOOR, WALL ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WALL, WALL, FLOOR, WALL ; 08 tilecoll WALL, FLOOR, WALL, FLOOR ; 09 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c + tilecoll FLOOR, FLOOR, WALL, WALL ; 0d + tilecoll WALL, FLOOR, WALL, FLOOR ; 0e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, WALL, FLOOR, WALL ; 12 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, WALL, FLOOR, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, FLOOR, WALL, FLOOR ; 16 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, FLOOR, WALL, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, WALL, FLOOR, WALL ; 24 + tilecoll WALL, WALL, WALL, FLOOR ; 25 + tilecoll WALL, FLOOR, WALL, FLOOR ; 26 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 27 tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b - tilecoll WALL, WALL, FLOOR, FLOOR ; 3c - tilecoll WALL, WALL, WALL, WALL ; 3d - tilecoll WALL, WALL, WALL, FLOOR ; 3e - tilecoll WALL, WALL, FLOOR, FLOOR ; 3f - tilecoll FLOOR, WALL, FLOOR, WALL ; 40 - tilecoll WALL, WALL, WALL, WALL ; 41 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42 - tilecoll WALL, WALL, FLOOR, WALL ; 43 - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 44 - tilecoll FLOOR, FLOOR, WALL, WALL ; 45 - tilecoll WALL, FLOOR, WALL, FLOOR ; 46 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 47 - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 48 - tilecoll WALL, WALL, FLOOR, FLOOR ; 49 - tilecoll FLOOR, WALL, FLOOR, WALL ; 4a - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4b - tilecoll FLOOR, WALL, FLOOR, WALL ; 4c - tilecoll WALL, WALL, WALL, WALL ; 4d - tilecoll WALL, FLOOR, WALL, FLOOR ; 4e - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4f - tilecoll WALL, WALL, FLOOR, FLOOR ; 50 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51 - tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 52 - tilecoll WALL, FLOOR, WALL, FLOOR ; 53 - tilecoll FLOOR, FLOOR, WALL, WALL ; 54 - tilecoll FLOOR, FLOOR, WALL, WALL ; 55 - tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 56 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 57 - tilecoll FLOOR, WALL, FLOOR, WALL ; 58 - tilecoll WALL, WALL, WALL, WALL ; 59 - tilecoll WALL, FLOOR, WALL, FLOOR ; 5a - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 60 - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 61 - tilecoll FLOOR, WALL, FLOOR, WALL ; 62 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73 - tilecoll FLOOR, WALL, FLOOR, WALL ; 74 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f + tilecoll WALL, WALL, WALL, WALL ; 29 diff --git a/data/tilesets/museum_metatiles.bin b/data/tilesets/museum_metatiles.bin index a9ed5c7..bf31f71 100644 Binary files a/data/tilesets/museum_metatiles.bin and b/data/tilesets/museum_metatiles.bin differ diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 7fff4f1..b276e8b 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -493,7 +493,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, RUINS_OF_ALPH_RESEARCH_CENTER, 1 + warp_event 34, 11, PEWTER_MUSEUM_OF_SCIENCE_1F, 1 def_coord_events diff --git a/maps/PewterMuseumOfScience1F.ablk b/maps/PewterMuseumOfScience1F.ablk index 23f7d72..185c87d 100644 --- a/maps/PewterMuseumOfScience1F.ablk +++ b/maps/PewterMuseumOfScience1F.ablk @@ -1 +1 @@ -<<?KXYZ`VF \ No newline at end of file +(' "& \ No newline at end of file diff --git a/maps/PewterMuseumOfScience2F.asm b/maps/PewterMuseumOfScience2F.asm index 0079ee9..ee8afd8 100644 --- a/maps/PewterMuseumOfScience2F.asm +++ b/maps/PewterMuseumOfScience2F.asm @@ -4,15 +4,162 @@ PewterMuseumOfScience2F_MapScripts: def_scene_scripts def_callbacks + +Museum2FText1Script: + faceplayer + opentext + writetext Museum2FText1 + waitbutton + closetext + end + +Museum2FText1: + text "MOON STONE?" + + para "What's so special" + line "about it?" + done + +Museum2FText2Script: + faceplayer + opentext + writetext Museum2FText2 + waitbutton + closetext + end + +Museum2FText2: + text "July 20, 1969!" + + para "The 1st lunar" + line "landing!" + + para "I bought a color" + line "TV to watch it!" + done + +Museum2FText3Script: + faceplayer + opentext + writetext Museum2FText3 + waitbutton + closetext + end + +Museum2FText3: + text "Our space exhibit" + line "was very popular" + cont "before, so we're" + cont "keeping it." + para "What if something" ; uncanny music + line "happens, though?" + cont "Like, an accident" + cont "or something?" ; Could add a commentary on technology advancing for the sake of it, but it's long enough already. + done + +Museum2FText4Script: + faceplayer + opentext + writetext Museum2FText4 + waitbutton + closetext + end + +Museum2FText4: + text "My dad caught me" + line "a PIKACHU, but" + cont "it needs a friend!" + + para "How about…KOTORA?" + done + +Museum2FText5Script: + faceplayer + opentext + writetext Museum2FText5 + waitbutton + closetext + end + +Museum2FText5: + text "Everyone is on" + line "about that KOTORA!" + + para "It is quite cute," + line "though…" + done + +Museum2FText6Script: + opentext + writetext Museum2FText6 + waitbutton + closetext + end + +Museum2FText6: + text "SPACE SHUTTLE" + line "COLUMBIA" + done + +Museum2FText7Script: + faceplayer + opentext + writetext Museum2FText7 + waitbutton + closetext + end + +Museum2FText7: + text "Meteorite that" + line "fell on MT.MOON." + cont "(MOON STONE?)" + done + +Museum2FText8Script: + faceplayer + opentext + writetext Museum2FText8 + waitbutton + closetext + end + +; Movie 3 reference! +Museum2FText8: + text "It's an artist's" + line "interpretation" + cont "of ENTEI." + + para "It's flying" + line "through an odd" + cont "dimension!" + done + +MuseumBookshelf: + jumpstd DifficultBookshelfScript + PewterMuseumOfScience2F_MapEvents: db 0, 0 ; filler def_warp_events - warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 1 + warp_event 7, 7, PEWTER_MUSEUM_OF_SCIENCE_1F, 5 def_coord_events def_bg_events + bg_event 11, 2, BGEVENT_UP, Museum2FText6Script + bg_event 2, 5, BGEVENT_UP, Museum2FText7Script + bg_event 7, 0, BGEVENT_UP, Museum2FText8Script + bg_event 5, 1, BGEVENT_UP, MuseumBookshelf + bg_event 4, 1, BGEVENT_UP, MuseumBookshelf + bg_event 3, 1, BGEVENT_UP, MuseumBookshelf + bg_event 1, 1, BGEVENT_UP, MuseumBookshelf + bg_event 2, 1, BGEVENT_UP, MuseumBookshelf + bg_event 0, 1, BGEVENT_UP, MuseumBookshelf def_object_events + object_event 4, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum2FText1Script, -1 + object_event 1, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum2FText2Script, -1 + object_event 6, 4, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum2FText3Script, -1 + object_event 11, 4, SPRITE_LASS, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Museum2FText4Script, -1 + object_event 12, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Museum2FText5Script, -1 diff --git a/ram/wram.asm b/ram/wram.asm index 90c56cb..d76f8ee 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -3110,8 +3110,8 @@ wMountMoonSquareSceneID:: db wMobileTradeRoomSceneID:: db wMobileBattleRoomSceneID:: db wCeruleanCave1FSceneID:: db - - ds 49 +wPewterMuseum1FSceneID:: db + ds 48 ; fight counts wJackFightCount:: db