From 7554222e3c1752cb26c652cda936641d8a4b6c5e Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Tue, 26 Mar 2024 21:58:13 +0000 Subject: [PATCH] Random additions because Martha was bored - Gave the Debug Room its own name and placement on the map, simply being '?????' and up in the top-left corner of Nihon. - Added a feature where the shiny palette of a Pokemon can be seen by pressing Select on the Pokedex screen. - Added preliminary sprites for Belledam, Bipulla, Burgela, Coinpur, Jungela, Pupperon, Stromen, and Tricules. - Added preliminary shiny palettes for Bipulla, Bellignan, Burgela, Coinpur, Jungela and Tricules - Changed Debug Room's layout again slightly - Added another NPC to the Debug Room that gives you a bunch of useful items when spoken to, mainly all of the HMs and Apriballs, plus some Master Balls, Rare Candies and more. --- constants/landmark_constants.asm | 1 + constants/map_constants.asm | 24 ++++++++--------- data/maps/landmarks.asm | 10 ++++--- data/maps/maps.asm | 2 +- data/pokemon/palettes.asm | 2 +- engine/gfx/cgb_layouts.asm | 9 +++++++ engine/pokedex/pokedex.asm | 24 +++++++++++++++++ gfx/pics.asm | 6 ++--- gfx/pokemon/belledam/back.png | Bin 304 -> 353 bytes gfx/pokemon/belledam/front.png | Bin 315 -> 463 bytes gfx/pokemon/bellignan/shiny.pal | 6 +++-- gfx/pokemon/bipulla/back.png | Bin 304 -> 459 bytes gfx/pokemon/bipulla/front.png | Bin 315 -> 451 bytes gfx/pokemon/bipulla/shiny.pal | 6 +++-- gfx/pokemon/burgela/back.png | Bin 304 -> 554 bytes gfx/pokemon/burgela/front.png | Bin 315 -> 488 bytes gfx/pokemon/burgela/shiny.pal | 6 +++-- gfx/pokemon/coinpur/back.png | Bin 304 -> 355 bytes gfx/pokemon/coinpur/front.png | Bin 315 -> 357 bytes gfx/pokemon/coinpur/shiny.pal | 6 +++-- gfx/pokemon/jungela/back.png | Bin 304 -> 529 bytes gfx/pokemon/jungela/front.png | Bin 315 -> 725 bytes gfx/pokemon/jungela/shiny.pal | 6 +++-- gfx/pokemon/moibelle/back.png | Bin 304 -> 416 bytes gfx/pokemon/pupperon/back.png | Bin 304 -> 364 bytes gfx/pokemon/pupperon/front.png | Bin 315 -> 468 bytes gfx/pokemon/stromen/back.png | Bin 304 -> 453 bytes gfx/pokemon/stromen/front.png | Bin 315 -> 525 bytes gfx/pokemon/tricules/back.png | Bin 7749 -> 535 bytes gfx/pokemon/tricules/front.png | Bin 20463 -> 692 bytes gfx/pokemon/tricules/shiny.pal | 4 +-- layout.link | 7 +++-- maps/DebugRoom.ablk | 11 ++++---- maps/DebugRoom.asm | 45 +++++++++++++++++++++++++++---- ram/wram.asm | 17 +++--------- 35 files changed, 131 insertions(+), 61 deletions(-) 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..0b64d9f60ece030f78628031ffdd13d550bcd12b 100644 GIT binary patch delta 318 zcmV-E0m1&T0^tIXEPwyTF-kdv0001E*F3=h000DZQchF<|NsAOC`Nez0096=L_t(| z+NG7z7Q-M2LnZnDf1cKLt$+e&JasPD1hHFde-}uiqL*GM5bW}b2Qh&xK^c+q#89(B zu(jUsO=Ju@AiWJB*Z4>?cE>Cxfgh0thBP?}OgXZHE`)z>U4P+LTw2+FePtC-PY0ZX zT)bs0Tr$q;%vbfDyV~XnkDDOXleh-+(bHr1USieL3nXtxNgD9|$uTfTgk|K^WsYb$ z0}HH^p?<#{gLX*d0X!!10Gtw)0pSslM9)iPXdp0XW+CXHX-5gBW_phFx@R0`W_u3x zZCRDz7CivA12@<>(BIy(xPgt_{;`-}l_(R#Le+s~K#Gx6CKNLP35%Eh1GK^muUuAk QwEzGB07*qoM6N<$f(f{bK>z>% delta 269 zcmaFJw1H`YPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{#H*H$B>F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8P9x4S!%@!DM!L#ZRvk z3dSipRAta_5DBLYuqVt!%HTapSs?dYLg`O=%cu|pMvz*zj(=4WT239$Z<5X-G$DGH z{j*gNe9xfJw5CY8PrPOXJsYKJgudAVz%Pa87C})0{8_&;91xZ&O6Vv!zL8RD3+9v& z0#7_K)*5IMXarFLXEs<>0C-^pA!MLMR?s}jHU!GBGWzABkXs3<6kr}Q)d~x9NTrQH z;y1Ub!D2>P27ksnAhSbH8;vT+dn(R}7LG%eu_+hDC>RJipM%h*KC%~#aAVsBp^4gh z7s=2a(uT16+=hA07s#HFSmU^i=amUQ?qeWbG@6X_28VaA!_SPAnY}j`col7t@EpKb z1Ha~^!;H0{H@rCaDCOdG_4+NLeI&pl;QF)9x{&DWZzjMs{_vfxZFKvWF%8o_{^I-r X0%!=VHabt=00000NkvXXu0mjf9=^dy delta 280 zcmX@lyqjr)PW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{sB)H$B>F!Z>Ku)9X8-# z3H<)QK2P+jsoFi(MIn2qBpWGj*tqc~M}$5@P51#(#@75l>h~5_%qg7vpjqMRUIvj0 z;XiS~f6fVfeUp9qM@G;3er2(w{dN8Ps>{OuBrZ9$rvBK{h7}oM{WF=8&Z;y1apC3h z@u)H=-*!ZQ?E~8zThGasWL3;rwn5>?W0yQu(I2`+Zf~zSwwkPx>{+KM$rQMuBxlX; ztZOrkmuB91usBfu=ic^3r`7XM=pK6g@vYtd|35r!7}x&dEdH$=6%F(ZUuuMBny)W| b7Ld&W#0(6A3=EfoCxcj?u6{1-oD!M<=@57_ 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..ad81f85c224c29fe316e353b39f56027d2381645 100644 GIT binary patch delta 425 zcmV;a0apI70?PxCEPwwo2uf>X0001@`6M|2000DZQchF<|NsAOC`Nez00C-AL_t(| z+Rar_7Q-M2GvWSso{CyPbluuTQ+^1VIfO z1D6;ti3y;{c5VO#!)-s78eA1I+}j>AL;ytzP9B0HOE}4mm=?AR?Ox$F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8T1ONa4 diff --git a/gfx/pokemon/bipulla/front.png b/gfx/pokemon/bipulla/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..8e1b7fe55e14a752de8191abf75d02b5891defaf 100644 GIT binary patch delta 417 zcmV;S0bc&Q0>cB4EPwwo2uf>X0001@`6M|2000DZQchF<|NsAOC`Nez00Cl2L_t(| z+SQaxf&(E4M6tO4ohJ`TPpCfl02& zN6#&!o7@060eX=?@i1VN>p^_i!+?{>qQ??p{~g%(3x|fl0Dl}Fp6@#s90(F1A52eM z@6{ENWe|XP`9x%TIv~~1nW5tn$-$fFBhGNWS^(R#-VfJTvzXS3`G_Zb#F#wL11$Bd!E(H}$O*1j z7lx#i<<>oH5`TFv)LO>m3gylmN14dg+d3cVvl&INX@=wDG0rP(yA9?by19qN)^X+; z;F5#AnXJdKUemMf`e`Aj>5XOc2JF$w`Vx`{=1Ii+S7E>P{m-*00000 LNkvXXu0mjf2V&0^ delta 280 zcmX@iyqjr)PW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{sB)H$B>F!Z>Ku)9X8-# z3H<)QK2P+jsoFi(MIn2qBpWGj*tqc~M}$5@P51#(#@75l>h~5_%qg7vpjqMRUIvj0 z;XiS~f6fVfeUp9qM@G;3er2(w{dN8Ps>{OuBrZ9$rvBK{h7}oM{WF=8&Z;y1apC3h z@u)H=-*!ZQ?E~8zThGasWL3;rwn5>?W0yQu(I2`+Zf~zSwwkPx>{+KM$rQMuBxlX; ztZOrkmuB91usBfu=ic^3r`7XM=pK6g@vYtd|35r!7}x&dEdH$=6%F(ZUuuMBny)W| b7Ld&W#0(6A3=EfoCxcj?u6{1-oD!M<+wgcM 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..7c6239f03240e23110d48d16e6fafc27056fd476 100644 GIT binary patch literal 554 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD;nSONp`yuYIhQ0u&N2 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|NsB@%HG>!Xb4hB1UTYX8Vpp%nB?v5@_#A&r=vi&pQnps zNX4A9lRFEKDDb!zW-vsGuE}Kh`Tc%$Nx{vVOoz^#Yns>BKOy)RyY}MR?c5*3m0XV0 z?mwQkNtEr)M(GpLYf>Ni+n?_GI$4}?!R_EG9jgOtH_STRu~zpo=lO*d4BBN*szLFu zZZOU+wqkqW&9vbk_f!*R9m!)$Gt-hLC+;fx{+Q2;?N6V5p4c=Y1y|E;K5sY=1$6y$ z77Mr>X!62f_phz2LaM3m7i%poTq@o9yz^Jp-rr-P%p$7w?%Ch7&i{9GFz(-d<}vq^ z%`9U1)B^?`50iD{dBf9Lw|a@i8tyj*uv-$scC!bjA-r`?heb2_uA z=XvMzc}v%}@rCSXzi;9-W7RaZ4$UazS?^ag%k6$<`)jp>dhzU7+uW)K(SmU0iW@n9 zHBQWX_Eq!Q>b5VhT?-aA|591;w_~;4L7lGjBj0}RFZ~<2zjmAJMV_b0??AEP>FVdQ I&MBb@0Eb1_1^@s6 delta 289 zcmZ3*vVm!WL_G&H0|P_C9nP&liYLG)#P$FG|9hWv6i)&28G>?msskyOk|4iep!ok> z4Yx`lf2*g9V@SoVqgMj?nhkiEFRa-2f3EsM$AuPUMlIL$HR^a-GLBR;zj$`>?Bdz( z=Ks|W$es}OsGILBDbpk&F(HmiF<{s2mX70#owhaC3-XFhG(RN#Usj@E-sYc6bU8hC zGkuP#W81g(^piS^Z4VEs)~Ry!II?Jew4Lb~og_A+{XC=S3&s;QD=b(QADPIvJ{43= z_|L(*?Ru71N50ro#rG@2AO7R%ju2&E6|NG0Pi^zs_xl&@zA68Jxy^^~nZL(bTc8j4 gQX@Rme0>?Tq<|a_AO?X;!IMFhr>mdKI;Vst04^zTCjbBd diff --git a/gfx/pokemon/burgela/front.png b/gfx/pokemon/burgela/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..1c5f0299d829ee175358d4e94f844fc67aa1722e 100644 GIT binary patch literal 488 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NV3?%C=ER6$F>?NMQuIw+Er9_$4)^d3s1PY0l zxJHx&=ckpFCl;kLxcj&OjZr8|EmAPnGbwCc@(`$mqolyk9VlZAWHWd*XvzaAmUKs7 zM+SzC{oH>NS%G|m0G|-o|NsAcW$*1VGz2Lm0vz!x4F)P>O!9Vj`M;F?(@`Ls$J50z zq+-s|Nv|ii8gR6pT-vC>J7X*3gn!l1a-L!7@Ba7p9n(Kx$;tHRxWVs39daVYeNUXt zF85S8ujOCr-1+~3!p<|-E1bVn-bvvM6nmoKcuZx*o&=-iS<0_x@2D_r3gfdm=Og~* zk(tWhHE;NO-6bL%U02$?PW)fJcOq%|Zr#q|PI-C)Fv^r7QT)_KIL}T^py@gyG zO?EHL{B@zFj+5hCNTT=G3UB|zm*<7}o)?%e6ZJ^?nOR@J^sI2%ifxaLX7~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..26d6386550e808c98bb9ca212922048acf34dd4c 100644 GIT binary patch delta 320 zcmV-G0l)sR0^GwNBtEC0W0qVh$W`Bo_ps0UN41f%RO1C^` z)RIZ8NCT*~B)8^K0B6fgU=%>2KZ=lB4vk=FItPF}vTk-r0s{_$B5A@FKO%X5P5-11 z9vYG!@cKPAFlpC!N9`GfwJi+L4I++lIjge#by^(3Ha=TboD@}56#yI!fEJ*acwOEp zH-WliHCz(%lsT>6VC*hpO*WY+W@5(gX}=SiK@7rTnLkW(qSqPc^2f~Ll=1`EBLhKK S%(TM*0000F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8`XjQ3_wPap8UJ$qDKR(qW{W-NT9wc4-(_<9l~s6w^%D6zZMzp#1kAhr z)kL>TB+I4PTj^4{kKY1`*>KL;0*b7{*3SHOP6LJ z_}9vEjiYbg!8JFkE;t*PH=JqOCoOYF_mI`wla=u=Hs-FV(Ed~_W}@=E+bria_gnEA zIX3p~D|&sZCrWkhHc0u?r{L46A}k{an^LB{Ts5z~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..8a164321dadfc22bfd4c9fcb2ed4bacc77c34ec9 100644 GIT binary patch literal 529 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)I*h@TpUD;nSONk0t-FOlr0~8W3 zag8Vm&QB{TPb^AhaQATm8lzB_TBKmCXHwX@!lvI6-A0X`wF|NsB@%HG>!Xb4hB1UTYX8Vpp%nB?v5@_#A&r=vi&si%u$ zNX4ADlP+#OqQK!2C_Q0olPRyqi~ZYE8Sdt=zJLC6qVS$WJQ^4O|JuBC)$i{?vFZQQ zmZ_94|8#4KVL8{O9pcX>I_Nac=-smYujI)o=9}eX%9bSC2Wvf-di$rRex6r7`B*-244+#J+Od k9M0np{_f0cm?FHEU-z;_ul)Sa%Rzze>FVdQ&MBb@0J$a3;{X5v delta 289 zcmbQpvVm!WL_G&H0|P_C9nP&liYLG)#P$FG|9hWv6i)&28G>?msskyOk|4iep!ok> z4Yx`lf2*g9V@SoVqgMj?nhkiEFRa-2f3EsM$AuPUMlIL$HR^a-GLBR;zj$`>?Bdz( z=Ks|W$es}OsGILBDbpk&F(HmiF<{s2mX70#owhaC3-XFhG(RN#Usj@E-sYc6bU8hC zGkuP#W81g(^piS^Z4VEs)~Ry!II?Jew4Lb~og_A+{XC=S3&s;QD=b(QADPIvJ{43= z_|L(*?Ru71N50ro#rG@2AO7R%ju2&E6|NG0Pi^zs_xl&@zA68Jxy^^~nZL(bTc8j4 gQX@Rme0>?Tq<|a_AO?X;!IMFhr>mdKI;Vst01@zT4gdfE diff --git a/gfx/pokemon/jungela/front.png b/gfx/pokemon/jungela/front.png index e0a9da9b43992ebb15c6f0ee1221e0d9e64105eb..9837eb91390c5c6386b8f8984314a6bcbaaaee6f 100644 GIT binary patch literal 725 zcmeAS@N?(olHy`uVBq!ia0vp^79h;R3?!pgsObVJ_7YEDSN0doQlk8VJDCNS%G|m0G|-o|NsAcW$*1VGz2Lm0vz!x4F)P>O!9Vj`M;F?(@`M%r>Bc! zNX4ABQ(_lAR^Vtg%yBryR&|-zD|-=3+JlJ9vaY|G^JMP7RM_WGGSL@&-Q zT0BXO$HT=uV{6G|PgS1x>vRm|)xx(q_*CiF`*zEdb>Acx+W4rxoK=3pD8cMD^ZmsEugh!l z6s2-Mr~Kr-CY$%#tgGf;!fl04eZrx@)zt0yXONo$vP?dh#+DCXDSN!(^8&GUZG#`5PtLP;bBHQGQ{1Z3aaN||XF$uN zPkgD4*BLJ_z0cgud-?J)U*<1z0aN_G2(rd*c;X^&@OZmT_Q}q~%W)o3-o7iI$wuYL zZgMa9=-`;v7R+|UIznxY>dG|T2%}jCj~0i2`V*TW(;jxQSniPiufX-kxhFr$+%j=< z&vVxjE&Kk@S54PucTD}V=y8rnt=9I?ofj^y`&^UAy~C_~`-$*SXSw<7XS|-#6d#wf e=I*=s8TAY-yoowqI`ZbAgyZSz=d#Wzp$Pye2P9Ac literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rA2RvOILn>~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj 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 c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..187d94aeceb38e4d601bf9886b165fd4dc5176c7 100644 GIT binary patch delta 381 zcmV-@0fPRp0-ytsEPrFh2+lc#0002@tUIIt000DZQchF<|NsAOC`Nez00BQqL_t(| z+Le`o4#Xe`Lv8v0e?CP|rvj?EWS5P%3Y3}Bae?V+fr7_);R})Dp8$wF5oJS4T)v$x zUas=aO0#dW&wlI-u3jTz@5ySO0mu=Uj}6=a-*dw- zo;41ga0Hys-uS#P67&bN`{6unPC0{V_6Qu$z&VNd46P>#gNX}ugik~nlRJ%Z7JdF* biR>CbN+kF!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8O}^LTuw2d5Pv5XbwJqHnF9wP(`$lW zQ_*jbE>S=M&b&VZ36 z^T7K?r-O%pxk6_6Ea5F+1fD=dXid_dQ`ZRWTivceRgKB3!xz6vdeboGkI3FVn{fZP b`1|Vv++YPbd62+{00000NkvXXu0mjf-ZGV{ delta 269 zcmaFEw1H`YPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{#H*H$B>F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8?NMQuIw+Er9`YOBAh4d1BJv( zTq8u3?GZpE!8YHOC{>(6iWTjle%+MMICgW!45XRPjdg;zwMiQn7KE4EH%m$=wV zW{$dFwjCx3X^!u=9Mci~#`AIO9nR)@3HQ*RR9}&5lNQ(8Z@R^|KYA|vKlcxVQI_(e T7!8pYP`G)z`njxgN@xNAF=nV} literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rA2RvOILn>~)o$APU*nop2@caMzJkhJBYWG+dh3uV@Y^1zl z@-&oTG=oY!Xz2?|zvP!aNouVXD;D(Z%HM_H}%`{$`dFR36K>440+ZUZy&p)Ai z==I09cKiST@U&rE`-`*qw{lc8&@X(c5uRzjz6@GGHU|)cz@^~HAj;F#&t;ucLK6U- C0e)Bj diff --git a/gfx/pokemon/stromen/back.png b/gfx/pokemon/stromen/back.png index c7216be8a6b643ae0f808a7c3d303e86af6d8dfa..1af6983a664a1d44a4d3c315d8fa4f70f27893ba 100644 GIT binary patch delta 419 zcmV;U0bKsD0>uN6EPs@9IZ8??0000HYwp_s000DZQchF<|NsAOC`Nez00Cr4L_t(| z+U=BEqQf8vM8mNEJ(q_lpyu}f*0gC-=ZN6w^ZeSsZp=LIU+GCMxf8BL?GdRE{Gw<3 z6aaVuc-|%f*6U5*2xy3R{exDgzw{5Ggt!G*D&kzVYlsQZihp1U`1fT>L?eXA1(sJp zi*;Kxq7gzyc0Jk85z+r_MDc^^12E#4z0Cras^?qV*`OFw9l3PfECL-#ZP)a7g2_9- z1Jr8)bo~KPFIzci2lhg#^{q&-O?GPN>qfN7y0uc*2|1lELB;;?;#KwH2j$1k$`VuE~dcP;W4>PjNqV5AhKs0i=RYrC|r^O zebu`1EWQz8@U_J0h$;@81an`uah!Bu&MF76yB}+PQye6s15vfme*h^R2MUUz_HqCK N002ovPDHLkV1kG~$vpr7 delta 269 zcmX@gyn$(gPW|5J9K}-@fFLM$r#g^gDGBlm{tpDX8g7+9{#H*H$B>F!N3R6(H5>3S zUs$p4|6KKjjtecyj9RYgYt-?wWE`nxe(~($*~PQn&Ht+%kUb&lQ8(XNQl?2lVnQ63 zV!*E3Egi=fJ8f$gnqJ~EMSeJZG$@SlTq+x0B3j(oAFitks3Km5nj z9U;oTDqJQ0p4#TM@Aog*eN+AcbDIy}Gk=e>wm={7rABzB`T8X1d;7)#LXVGM4Rxh@o>5 z;5UW^L6bBk@miZeQAqS7p%aCc%oaKHNC+TTy#@SKLjck!O@HA3njTCoe8S~yP^H-M zsXZ8a?3)AcUib|0l0ws#G#2r*6UP+x5k!1;0fkM3P!#cP34&iwMzKYUzyw)KnR{iR zI~Yt5_?jc+(u516$_j?lBQQ!(chC1qKc+$h`z==ZJHdBC`eZ#riNDSKN&o_pABxGn zgq0v2@A*UBxqltZhLW3rv2M6f;I(lVf&ZOC{?0tzbeX%ln; zZX!&a>CEUFS)6)poC5>ygcdS5;b`{Aka9n3rXtPi#n9_XR>Fk4lTJk=g5_tzdeFp_ zJDnGHA)wz}a!S#J^h`nV`AFiKgo(h&VHX}QhYW|g hvhTh!{44yg)*m?J2HYSZVWj{7002ovPDHLkV1fpm=TZOw delta 280 zcmeBW+08UTr+)8qj^Zf{KoFF>QyoaLlmz(&{|ACx4Yx`l|A429V@SoVw^JSY4jXW= z1b+WtpC@|NRP7$?qL95)l8ux%Y}|O0BSN2{Cj5XXV{85&^?M5|<`m9-(5&!uFM~*h z@SnKgKj#F#zR5oQBco@1zp_};{jHJeLHJ7=H)@0001B+zGV+000b7OjJex|No3@bDS|s0000gpm-Vp000DZ zQchF<|NsAOC`Nez00Fj1L_t(|+O1WKlEfeg1M>g>eDbU!?cB{=ceYz=0s*s1^iP+F z{0*)*{1(m`Tv~{?@IhlI=IxCloN&OQZ~~LO<5}_k0u;QNaev_t!qA1luMVLq;tz%- zo~RTBK_6Jg{;c<00}yY7o@n6zO(HgRbQX!< z5}P84VBGq&DcTdP5nx(01HKhWlt36Vq#|hvoDle%U~8Sm%pL`yWe7#`u%84~v$O>I zs*K$f^_oi&fPY>A$)M<71(eO7^2VAofx>z19*~-nVHMOj`o)4;{OE&EUCvhDdC?{Z zI;sVo2n(u|*aVDJq3AXesg8g%wyi^-Xs{|A?s(W^QO@zB%$>XCFbfqEvG`0S`5XAmR!yb<^>52ENnaF*Bp=1Gu3<%%w zxd@8$jSrn*`+_mf(8vQ7SCibzx=FZfY~G#-KJPRO?!O$~=2OxS;MoQ61A?TG00000 MNkvXXt^-0~f};KT(f|Me literal 7749 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 LNkvXXu0mjfywt`U diff --git a/gfx/pokemon/tricules/front.png b/gfx/pokemon/tricules/front.png index a38ad7ef00a6e2dd34ecd65957d06549fa21d130..3009f5108b622213f31c0d8e64dba7a7fe872330 100644 GIT binary patch delta 681 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 z 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 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