diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index fe486a2..2c92c0b 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -121,6 +121,7 @@ DEF KANTO_LANDMARK EQU const_value ;const LANDMARK_ONE_ISLAND DEF NIHON_LANDMARK EQU const_value const LANDMARK_SILENT_HILLS + const LANDMARK_DEBUG_ROOM const LANDMARK_ROUTE_49 const LANDMARK_QUIET_CAVE const LANDMARK_BLUE_FOREST diff --git a/constants/map_constants.asm b/constants/map_constants.asm index ad13af7..9199954 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -517,20 +517,20 @@ ENDM map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11 endgroup - newgroup SILENT_HILLS ; 27 - 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, 18 ; 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 ; 8 + newgroup SILENT_HILLS ; 27 + 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, 18 ; 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 ; 8 endgroup - newgroup BLUE_FOREST ; 27 - map_const BLUE_FOREST, 20, 18 ; 1 + newgroup BLUE_FOREST ; 28 + map_const BLUE_FOREST, 20, 18 ; 1 endgroup DEF NUM_MAP_GROUPS EQU const_value ; 27 diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index ce105de..4c91e3c 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -109,6 +109,7 @@ Landmarks: landmark 140, 116, FastShipName assert_table_length NIHON_LANDMARK landmark 92, 108, SilentHillsName + landmark 20, 28, UnknownName landmark 91, 108, Route49Name ; probably not correct landmark 91, 108, QuietCaveName ; probably not correct landmark 140, 60, BlueForestName @@ -217,7 +218,8 @@ TohjoFallsName: db "TOHJO FALLS@" UndergroundName: db "UNDERGROUND@" BattleTowerName: db "BATTLE¯TOWER@" SpecialMapName: db "SPECIAL@" -SilentHillsName: db "SILENT¯HILLS@" -Route49Name: db "ROUTE 49@" -QuietCaveName: db "QUIET¯CAVE@" -BlueForestName: db "BLUE¯FOREST@" +SilentHillsName: db "SILENT¯HILLS@" +UnknownName: db "?????@" +Route49Name: db "ROUTE 49@" +QuietCaveName: db "QUIET¯CAVE@" +BlueForestName: db "BLUE¯FOREST@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 0697d4f..6ab95bc 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -558,7 +558,7 @@ 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_SINJOH_RUINS, TRUE, PALETTE_MORN, 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 map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 5f5a848..7245eda 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -208,7 +208,7 @@ INCLUDE "gfx/pokemon/weepinbell/shiny.pal" INCBIN "gfx/pokemon/victreebel/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/victreebel/shiny.pal" INCBIN "gfx/pokemon/bellignan/front.gbcpal", middle_colors -INCLUDE "gfx/pokemon/victreebel/shiny.pal" +INCLUDE "gfx/pokemon/bellignan/shiny.pal" INCBIN "gfx/pokemon/tentacool/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/tentacool/shiny.pal" INCBIN "gfx/pokemon/tentacruel/front.gbcpal", middle_colors diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index f76a5bc..e205733 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -271,6 +271,15 @@ _CGB_Pokedex: .is_pokemon call GetMonPalettePointer + ld a, [wPokedexShinyToggle] + and a + jr z, .not_shiny + ; Get shiny palette pointer + inc hl + inc hl + inc hl + inc hl +.not_shiny call LoadPalette_White_Col1_Col2_Black ; mon palette .got_palette call WipeAttrmap diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm index 26decc3..fd49395 100644 --- a/engine/pokedex/pokedex.asm +++ b/engine/pokedex/pokedex.asm @@ -62,6 +62,9 @@ Pokedex: ld [wLastDexMode], a call Pokedex_ClearLockedIDs + xor a + ld [wPokedexShinyToggle], a + pop af ldh [hInMenu], a pop af @@ -429,6 +432,9 @@ Pokedex_UpdateDexEntryScreen: ld a, [hl] and A_BUTTON jr nz, .do_menu_action + ld a, [hl] + and SELECT + jr nz, .toggle_shininess call Pokedex_NextOrPreviousDexEntry ret nc call Pokedex_IncrementDexPointer @@ -453,6 +459,24 @@ Pokedex_UpdateDexEntryScreen: ld [wJumptableIndex], a ret +.toggle_shininess +; toggle the current shininess setting + ld a, [wPokedexShinyToggle] + xor 1 + ld [wPokedexShinyToggle], a + ; refresh palettes + ld a, SCGB_POKEDEX + call Pokedex_GetSGBLayout + ; play sound based on setting + ld a, [wPokedexShinyToggle] + and a + ld de, SFX_BUMP + jr z, .got_sound + ld de, SFX_SHINE +.got_sound + call PlaySFX + jp WaitSFX + Pokedex_Page: ld a, [wPokedexStatus] xor 1 ; toggle page diff --git a/gfx/pics.asm b/gfx/pics.asm index 976de60..9e9ae5e 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -753,6 +753,9 @@ StromenFrontpic: INCBIN "gfx/pokemon/stromen/front.animated.2bpp.lz" StromenBackpic: INCBIN "gfx/pokemon/stromen/back.2bpp.lz" PhandarinFrontpic: INCBIN "gfx/pokemon/phandarin/front.animated.2bpp.lz" PhandarinBackpic: INCBIN "gfx/pokemon/phandarin/back.2bpp.lz" + +SECTION "Pics 20", ROMX + BipullaFrontpic: INCBIN "gfx/pokemon/bipulla/front.animated.2bpp.lz" BipullaBackpic: INCBIN "gfx/pokemon/bipulla/back.2bpp.lz" CalflacFrontpic: INCBIN "gfx/pokemon/calflac/front.animated.2bpp.lz" @@ -765,9 +768,6 @@ UrsalunaFrontpic: INCBIN "gfx/pokemon/ursaluna/front.animated.2bpp.lz" UrsalunaBackpic: INCBIN "gfx/pokemon/ursaluna/back.2bpp.lz" WynautFrontpic: INCBIN "gfx/pokemon/wynaut/front.animated.2bpp.lz" WynautBackpic: INCBIN "gfx/pokemon/wynaut/back.2bpp.lz" - -SECTION "Pics 20", ROMX - GorochuFrontpic: INCBIN "gfx/pokemon/gorochu/front.animated.2bpp.lz" GorochuBackpic: INCBIN "gfx/pokemon/gorochu/back.2bpp.lz" LeafeonFrontpic: INCBIN "gfx/pokemon/leafeon/front.animated.2bpp.lz" diff --git a/gfx/pokemon/belledam/back.png b/gfx/pokemon/belledam/back.png index c7216be..0b64d9f 100644 Binary files a/gfx/pokemon/belledam/back.png and b/gfx/pokemon/belledam/back.png differ diff --git a/gfx/pokemon/belledam/front.png b/gfx/pokemon/belledam/front.png index e0a9da9..7a7b95d 100644 Binary files a/gfx/pokemon/belledam/front.png and b/gfx/pokemon/belledam/front.png differ diff --git a/gfx/pokemon/bellignan/shiny.pal b/gfx/pokemon/bellignan/shiny.pal index 028b437..13f70b4 100644 --- a/gfx/pokemon/bellignan/shiny.pal +++ b/gfx/pokemon/bellignan/shiny.pal @@ -1,2 +1,4 @@ - RGB 20, 23, 03 - RGB 14, 12, 31 \ No newline at end of file + + RGB 16, 10, 31 + RGB 20, 23, 10 + diff --git a/gfx/pokemon/bipulla/back.png b/gfx/pokemon/bipulla/back.png index c7216be..ad81f85 100644 Binary files a/gfx/pokemon/bipulla/back.png and b/gfx/pokemon/bipulla/back.png differ diff --git a/gfx/pokemon/bipulla/front.png b/gfx/pokemon/bipulla/front.png index e0a9da9..8e1b7fe 100644 Binary files a/gfx/pokemon/bipulla/front.png and b/gfx/pokemon/bipulla/front.png differ diff --git a/gfx/pokemon/bipulla/shiny.pal b/gfx/pokemon/bipulla/shiny.pal index 5c88669..c721c9b 100644 --- a/gfx/pokemon/bipulla/shiny.pal +++ b/gfx/pokemon/bipulla/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 23, 07, 25 + RGB 07, 09, 16 + diff --git a/gfx/pokemon/burgela/back.png b/gfx/pokemon/burgela/back.png index c7216be..7c6239f 100644 Binary files a/gfx/pokemon/burgela/back.png and b/gfx/pokemon/burgela/back.png differ diff --git a/gfx/pokemon/burgela/front.png b/gfx/pokemon/burgela/front.png index e0a9da9..1c5f029 100644 Binary files a/gfx/pokemon/burgela/front.png and b/gfx/pokemon/burgela/front.png differ diff --git a/gfx/pokemon/burgela/shiny.pal b/gfx/pokemon/burgela/shiny.pal index 5c88669..089ec35 100644 --- a/gfx/pokemon/burgela/shiny.pal +++ b/gfx/pokemon/burgela/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 18, 30, 00 + RGB 17, 06, 06 + diff --git a/gfx/pokemon/coinpur/back.png b/gfx/pokemon/coinpur/back.png index c7216be..26d6386 100644 Binary files a/gfx/pokemon/coinpur/back.png and b/gfx/pokemon/coinpur/back.png differ diff --git a/gfx/pokemon/coinpur/front.png b/gfx/pokemon/coinpur/front.png index e0a9da9..8034544 100644 Binary files a/gfx/pokemon/coinpur/front.png and b/gfx/pokemon/coinpur/front.png differ diff --git a/gfx/pokemon/coinpur/shiny.pal b/gfx/pokemon/coinpur/shiny.pal index 5c88669..6ede92a 100644 --- a/gfx/pokemon/coinpur/shiny.pal +++ b/gfx/pokemon/coinpur/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 31, 28, 10 + RGB 28, 09, 27 + diff --git a/gfx/pokemon/jungela/back.png b/gfx/pokemon/jungela/back.png index c7216be..8a16432 100644 Binary files a/gfx/pokemon/jungela/back.png and b/gfx/pokemon/jungela/back.png differ diff --git a/gfx/pokemon/jungela/front.png b/gfx/pokemon/jungela/front.png index e0a9da9..9837eb9 100644 Binary files a/gfx/pokemon/jungela/front.png and b/gfx/pokemon/jungela/front.png differ diff --git a/gfx/pokemon/jungela/shiny.pal b/gfx/pokemon/jungela/shiny.pal index 5c88669..089ec35 100644 --- a/gfx/pokemon/jungela/shiny.pal +++ b/gfx/pokemon/jungela/shiny.pal @@ -1,2 +1,4 @@ - RGB 22, 22, 12 - RGB 07, 15, 25 \ No newline at end of file + + RGB 18, 30, 00 + RGB 17, 06, 06 + diff --git a/gfx/pokemon/moibelle/back.png b/gfx/pokemon/moibelle/back.png index c7216be..187d94a 100644 Binary files a/gfx/pokemon/moibelle/back.png and b/gfx/pokemon/moibelle/back.png differ diff --git a/gfx/pokemon/pupperon/back.png b/gfx/pokemon/pupperon/back.png index c7216be..7155248 100644 Binary files a/gfx/pokemon/pupperon/back.png and b/gfx/pokemon/pupperon/back.png differ diff --git a/gfx/pokemon/pupperon/front.png b/gfx/pokemon/pupperon/front.png index e0a9da9..ab59913 100644 Binary files a/gfx/pokemon/pupperon/front.png and b/gfx/pokemon/pupperon/front.png differ diff --git a/gfx/pokemon/stromen/back.png b/gfx/pokemon/stromen/back.png index c7216be..1af6983 100644 Binary files a/gfx/pokemon/stromen/back.png and b/gfx/pokemon/stromen/back.png differ diff --git a/gfx/pokemon/stromen/front.png b/gfx/pokemon/stromen/front.png index e0a9da9..fd4499d 100644 Binary files a/gfx/pokemon/stromen/front.png and b/gfx/pokemon/stromen/front.png differ diff --git a/gfx/pokemon/tricules/back.png b/gfx/pokemon/tricules/back.png index e38315a..8c59030 100644 Binary files a/gfx/pokemon/tricules/back.png and b/gfx/pokemon/tricules/back.png differ diff --git a/gfx/pokemon/tricules/front.png b/gfx/pokemon/tricules/front.png index a38ad7e..3009f51 100644 Binary files a/gfx/pokemon/tricules/front.png and b/gfx/pokemon/tricules/front.png differ diff --git a/gfx/pokemon/tricules/shiny.pal b/gfx/pokemon/tricules/shiny.pal index 4f58677..84aa229 100644 --- a/gfx/pokemon/tricules/shiny.pal +++ b/gfx/pokemon/tricules/shiny.pal @@ -1,4 +1,4 @@ - RGB 23, 23, 09 - RGB 11, 11, 15 + RGB 18, 16, 02 + RGB 10, 10, 01 diff --git a/layout.link b/layout.link index da2878c..4711b31 100644 --- a/layout.link +++ b/layout.link @@ -322,18 +322,17 @@ WRAM0 "Stack" "Audio RAM" "WRAM" - align 8 + align 4 "wSpriteAnims" - align 8 + align 4 "Sprites" "Tilemap" "Miscellaneous" "Unused Map Buffer" - align 8 + align 4 "Overworld Map" align 4 "Video" - align 5 "16-bit WRAM home data" WRAMX 1 "WRAM 1" diff --git a/maps/DebugRoom.ablk b/maps/DebugRoom.ablk index 025c3a4..6ccf64e 100644 --- a/maps/DebugRoom.ablk +++ b/maps/DebugRoom.ablk @@ -1,6 +1,7 @@ - ! ! !WWE -R + ! ! !E + +  ! -ERETnUXYG~IJ -HEF|}BEJ~EJ@AAB -DBIIIIJDFTnUDFX5YHIIIJ|}~EEE \ No newline at end of file +E +E@AABHJ~IIIEF|}ABEJ~EF@AAB +DBIIIIJDFTnUDFX5YHIIIJ|}~EEE \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index 5e839cf..889028e 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -111,7 +111,7 @@ DebugFlyScript: addcellnum PHONE_MOM readvar VAR_BADGES - givepoke SHI_SHI, 70, HM_FLY + givepoke SHI_SHI, 70 closetext end @@ -127,7 +127,7 @@ DebugDexScript: playsound SFX_FANFARE promptbutton callasm CheatFillPokedex - givepoke CELEBI, 50, MASTER_BALL + givepoke CELEBI, 50 closetext end @@ -149,13 +149,47 @@ CheatFillPokedex: call ByteFill ret +DebugItemScript: + faceplayer + opentext + writetext DebugTextE + playsound SFX_FANFARE_2 + promptbutton + giveitem MASTER_BALL, 99 + giveitem LEVEL_BALL, 99 + giveitem MOON_BALL, 99 + giveitem FRIEND_BALL, 99 + giveitem LURE_BALL, 99 + giveitem LOVE_BALL, 99 + giveitem FAST_BALL, 99 + giveitem HEAVY_BALL, 99 + giveitem HM_CUT, 1 + giveitem HM_FLY, 1 + giveitem HM_SURF, 1 + giveitem HM_STRENGTH, 1 + giveitem HM_WHIRLPOOL, 1 + giveitem HM_WATERFALL, 1 + giveitem FULL_RESTORE, 99 + giveitem MAX_REVIVE, 99 + giveitem MAX_REPEL, 99 + giveitem RARE_CANDY, 99 + giveitem BICYCLE, 1 + giveitem SUPER_ROD, 1 + closetext + end + +DebugTextE: + text " received" + line "many items!" + 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 11, 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 @@ -176,6 +210,7 @@ DebugRoom_MapEvents: object_event 27, 21, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DebugPokemon2Script, -1 object_event 23, 27, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_RED, OBJECTTYPE_SCRIPT, 0, DebugPokemon3Script, -1 object_event 26, 27, SPRITE_SUICUNE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_BROWN, 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 - object_event 22, 15, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugDexScript, -1 + object_event 17, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugFlyScript, -1 + object_event 16, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugDexScript, -1 + object_event 19, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugItemScript, -1 diff --git a/ram/wram.asm b/ram/wram.asm index 31fa3e4..fa12e18 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -732,6 +732,9 @@ wBackupDexListingCursor:: db wBackupDexListingPage:: dw wDexCurLocation:: db wPokedexStatus:: db +wPokedexShinyToggle:: +; bit 0: set if displaying shiny palettes + db wPokedexDisplayNumber:: dw wDexLastSeenIndex:: db ; index into wPokedexSeen containing the last non-zero value wDexLastSeenValue:: db ; value at index @@ -1456,8 +1459,6 @@ wEnemyHPPal:: db wHPPals:: ds PARTY_LENGTH wCurHPPal:: db - ds 7 - wSGBPals:: ds 48 wAttrmap:: @@ -1505,8 +1506,6 @@ wCurSpecies:: db wNamedObjectType:: db - ds 1 - wJumptableIndex:: wBattleTowerBattleEnded:: db @@ -1735,8 +1734,6 @@ wGameTimerPaused:: ; bit 7: something mobile db - ds 1 - wJoypadDisable:: ; bits 4, 6, or 7 can be used to disable joypad input ; bit 4 @@ -1744,15 +1741,11 @@ wJoypadDisable:: ; bit 7: ongoing sgb data transfer db - ds 1 - wInBattleTowerBattle:: ; 0 not in BattleTower-Battle ; 1 BattleTower-Battle db - ds 1 - wFXAnimID:: dw wPlaceBallsX:: db @@ -1767,8 +1760,6 @@ wOBP1:: db wNumHits:: db - ds 1 - wOptions:: ; bit 0-2: number of frames to delay when printing text ; fast 1; mid 3; slow 5 @@ -1807,8 +1798,6 @@ wMinutesSince:: db wHoursSince:: db wDaysSince:: db - ds 7 - wTempLoopCounter:: db