From 0721a89fea64815b58914d32e6a9f7acb55b5d16 Mon Sep 17 00:00:00 2001 From: Misty Date: Sun, 19 Nov 2023 03:20:34 -0500 Subject: [PATCH] WE FORGOT WYNAUT --- constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/base_stats/wynaut.asm | 20 ++++++++++++++++++++ data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/wynaut.asm | 10 ++++++++++ data/pokemon/dex_entry_pointers.asm | 1 + data/pokemon/dex_order_alpha.asm | 1 + data/pokemon/dex_order_new.asm | 1 + data/pokemon/egg_moves_johto.asm | 1 + data/pokemon/evos_attacks_johto.asm | 13 +++++++++++++ data/pokemon/first_stages.asm | 3 ++- data/pokemon/gen1_order.asm | 1 + data/pokemon/menu_icons.asm | 1 + data/pokemon/names.asm | 1 + data/pokemon/palettes.asm | 2 ++ data/pokemon/pic_pointers.asm | 2 ++ gfx/footprints.asm | 1 + gfx/footprints/wynaut.png | Bin 0 -> 80 bytes gfx/pics.asm | 6 ++++-- gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/johto_frames.asm | 1 + gfx/pokemon/wynaut/anim.asm | 1 + gfx/pokemon/wynaut/anim_idle.asm | 1 + gfx/pokemon/wynaut/back.png | Bin 0 -> 304 bytes gfx/pokemon/wynaut/front.png | Bin 0 -> 315 bytes gfx/pokemon/wynaut/shiny.pal | 2 ++ maps/DebugRoom.asm | 4 ++-- 34 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 data/pokemon/base_stats/wynaut.asm create mode 100644 data/pokemon/dex_entries/wynaut.asm create mode 100644 gfx/footprints/wynaut.png create mode 100644 gfx/pokemon/wynaut/anim.asm create mode 100644 gfx/pokemon/wynaut/anim_idle.asm create mode 100644 gfx/pokemon/wynaut/back.png create mode 100644 gfx/pokemon/wynaut/front.png create mode 100644 gfx/pokemon/wynaut/shiny.pal diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index ee1558e..59edef6 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -265,6 +265,7 @@ DEF JOHTO_POKEMON EQU const_value const STROMEN const PHANDARIN const UNOWN ; c9 + const WYNAUT const WOBBUFFET ; ca const BIPULLA const CALFLAC diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index e1b3fb4..427b8f3 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -272,6 +272,7 @@ INCLUDE "data/pokemon/base_stats/mismagius.asm" INCLUDE "data/pokemon/base_stats/stromen.asm" INCLUDE "data/pokemon/base_stats/phandarin.asm" INCLUDE "data/pokemon/base_stats/unown.asm" +INCLUDE "data/pokemon/base_stats/wynaut.asm" INCLUDE "data/pokemon/base_stats/wobbuffet.asm" INCLUDE "data/pokemon/base_stats/bipulla.asm" INCLUDE "data/pokemon/base_stats/calflac.asm" diff --git a/data/pokemon/base_stats/wynaut.asm b/data/pokemon/base_stats/wynaut.asm new file mode 100644 index 0000000..c9b0ff2 --- /dev/null +++ b/data/pokemon/base_stats/wynaut.asm @@ -0,0 +1,20 @@ + db 0 ; species ID placeholder + + db 95, 23, 48, 23, 23, 48 + ; hp atk def spd sat sdf + + db PSYCHIC_TYPE, PSYCHIC_TYPE ; type + db 125 ; catch rate + db 44 ; base exp + db NO_ITEM, NO_ITEM ; items + db GENDER_F50 ; gender ratio + db 100 ; unknown 1 + db 20 ; step cycles to hatch + db 5 ; unknown 2 + INCBIN "gfx/pokemon/wynaut/front.dimensions" + dw NULL, NULL ; unused (beta front/back pics) + db GROWTH_MEDIUM_FAST ; growth rate + dn EGG_NONE, EGG_NONE ; egg groups + ; tm/hm learnset + tmhm + ; end diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index 7d44062..7807212 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -251,6 +251,7 @@ PokemonCries:: mon_cry CRY_NIDORAN_M, 0, 0 ; STROMEN (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; PHANDARIN (incomplete) mon_cry CRY_HOOTHOOT, 354, 256 ; UNOWN + mon_cry CRY_NIDORAN_M, 0, 0 ; WYNAUT (incomplete) mon_cry CRY_AMPHAROS, 635, 324 ; WOBBUFFET mon_cry CRY_NIDORAN_M, 0, 0 ; BIPULLA (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; CALFLAC (incomplete) diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index d028b0d..b507b25 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -257,6 +257,7 @@ MismagiusPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mismagius.asm" StromenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/stromen.asm" PhandarinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/phandarin.asm" UnownPokedexEntry:: INCLUDE "data/pokemon/dex_entries/unown.asm" +WynautPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wynaut.asm" WobbuffetPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wobbuffet.asm" BipullaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bipulla.asm" CalflacPokedexEntry:: INCLUDE "data/pokemon/dex_entries/calflac.asm" diff --git a/data/pokemon/dex_entries/wynaut.asm b/data/pokemon/dex_entries/wynaut.asm new file mode 100644 index 0000000..727706d --- /dev/null +++ b/data/pokemon/dex_entries/wynaut.asm @@ -0,0 +1,10 @@ + db "BRIGHT@" ; species name + dw 200, 309 ; height, weight + + db "It often steals" + next "objects it thinks" + next "are food, the" + + page "punishments it" + next "recieves only" + next "strengthening it.@" diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 6859a0d..cda4ea8 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -246,6 +246,7 @@ PokedexDataPointerTable: dba StromenPokedexEntry dba PhandarinPokedexEntry dba UnownPokedexEntry + dba WynautPokedexEntry dba WobbuffetPokedexEntry dba BipullaPokedexEntry dba CalflacPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 16aa05f..74a80b9 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -300,6 +300,7 @@ AlphabeticalPokedexOrder: dw WIGGLYTUFF dw WOBBUFFET dw WOOPER + dw WYNAUT dw XATU dw YANMA dw ZAPDOS diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 65e923f..52ffd9f 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -129,6 +129,7 @@ NewPokedexOrder: dw EXEGGCUTE dw EXEGGUTOR dw SUDOWOODO + dw WYNAUT dw WOBBUFFET dw VENONAT dw VENOMOTH diff --git a/data/pokemon/egg_moves_johto.asm b/data/pokemon/egg_moves_johto.asm index 97113c6..76358fb 100644 --- a/data/pokemon/egg_moves_johto.asm +++ b/data/pokemon/egg_moves_johto.asm @@ -69,6 +69,7 @@ EggMovePointers2:: dw StromenEggMoves dw NoEggMoves2 ; Phandarin dw NoEggMoves2 + dw NoEggMoves2 ; Wynaut dw NoEggMoves2 dw BipullaEggMoves dw NoEggMoves2 ; Calflac diff --git a/data/pokemon/evos_attacks_johto.asm b/data/pokemon/evos_attacks_johto.asm index f914dc3..2d290ec 100644 --- a/data/pokemon/evos_attacks_johto.asm +++ b/data/pokemon/evos_attacks_johto.asm @@ -68,6 +68,7 @@ EvosAttacksPointers2:: dw StromenEvosAttacks dw PhandarinEvosAttacks dw UnownEvosAttacks + dw WynautEvosAttacks dw WobbuffetEvosAttacks dw BipullaEvosAttacks dw CalflacEvosAttacks @@ -1011,6 +1012,18 @@ UnownEvosAttacks: dbw 1, HIDDEN_POWER db 0 ; no more level-up moves +WynautEvosAttacks: + dbbw EVOLVE_LEVEL, 15, WOBBUFFET + db 0 ; no more evolutions + dbw 1, SPLASH + dbw 1, CHARM + dbw 1, ENCORE + dbw 15, COUNTER + dbw 15, MIRROR_COAT + dbw 15, SAFEGUARD + dbw 15, DESTINY_BOND + db 0 ; no more level-up moves + WobbuffetEvosAttacks: db 0 ; no more evolutions dbw 1, COUNTER diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index fdd5b8e..7476ea3 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -246,7 +246,8 @@ FirstEvoStages:: dw STROMEN dw STROMEN dw UNOWN - dw WOBBUFFET + dw WYNAUT + dw WYNAUT dw BIPULLA dw BIPULLA dw BIPULLA diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 5b49fac..750e3a2 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -257,6 +257,7 @@ Pokered_MonIndices: db STROMEN db PHANDARIN db UNOWN + db WYNAUT db WOBBUFFET db BIPULLA db CALFLAC diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 3cc8409..a55a782 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -247,6 +247,7 @@ MonMenuIcons: db ICON_GHOST ; STROMEN db ICON_GHOST ; PHANDARIN db ICON_UNOWN ; UNOWN + db ICON_GHOST ; WYNAUT db ICON_GHOST ; WOBBUFFET db ICON_GHOST ; BIPULLA db ICON_EQUINE ; CALFLAC diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 7b83bd7..e9ef276 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -249,6 +249,7 @@ PokemonNames:: db "STROMEN@@@" db "PHANDARIN@" db "UNOWN@@@@@" + db "WYNAUT@@@@" db "WOBBUFFET@" db "BIPULLA@@@" db "CALFLAC@@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index 75b6778..0ce268b 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -523,6 +523,8 @@ INCBIN "gfx/pokemon/phandarin/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/phandarin/shiny.pal" INCLUDE "gfx/pokemon/unown/normal.pal" ; not front.gbcpal INCLUDE "gfx/pokemon/unown/shiny.pal" +INCBIN "gfx/pokemon/wynaut/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/wynaut/shiny.pal" INCBIN "gfx/pokemon/wobbuffet/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/wobbuffet/shiny.pal" INCBIN "gfx/pokemon/bipulla/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 7974f87..7b37206 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -506,6 +506,8 @@ PokemonPicPointers:: dbw -1, -1 dbw -1, -1 + dba WynautFrontpic + dba WynautBackpic dba WobbuffetFrontpic dba WobbuffetBackpic dba BipullaFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 35021fa..448dd19 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -246,6 +246,7 @@ INCBIN "gfx/footprints/mismagius.1bpp" INCBIN "gfx/footprints/stromen.1bpp" INCBIN "gfx/footprints/phandarin.1bpp" INCBIN "gfx/footprints/unown.1bpp" +INCBIN "gfx/footprints/wynaut.1bpp" INCBIN "gfx/footprints/wobbuffet.1bpp" INCBIN "gfx/footprints/bipulla.1bpp" INCBIN "gfx/footprints/calflac.1bpp" diff --git a/gfx/footprints/wynaut.png b/gfx/footprints/wynaut.png new file mode 100644 index 0000000000000000000000000000000000000000..dc526f71879f80e3466e09e72850765dac7b93bc GIT binary patch literal 80 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJaZeY=kcwN$2?zLR*fVhcv)5qx cEPv+}5+yE){boFyt=akR{0Gt*TJOBUy literal 0 HcmV?d00001 diff --git a/gfx/pics.asm b/gfx/pics.asm index 1595a84..4597198 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -761,8 +761,10 @@ FarigirafFrontpic: INCBIN "gfx/pokemon/farigiraf/front.animated.2bpp.lz" FarigirafBackpic: INCBIN "gfx/pokemon/farigiraf/back.2bpp.lz" DudunsparceFrontpic: INCBIN "gfx/pokemon/dudunsparce/front.animated.2bpp.lz" DudunsparceBackpic: INCBIN "gfx/pokemon/dudunsparce/back.2bpp.lz" -UrsalunaFrontpic: INCBIN "gfx/pokemon/ursaluna/front.animated.2bpp.lz" -UrsalunaBackpic: INCBIN "gfx/pokemon/ursaluna/back.2bpp.lz" +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 diff --git a/gfx/pokemon/anim_pointers.asm b/gfx/pokemon/anim_pointers.asm index 93a78b7..d35c930 100644 --- a/gfx/pokemon/anim_pointers.asm +++ b/gfx/pokemon/anim_pointers.asm @@ -245,6 +245,7 @@ AnimationPointers: dw StromenAnimation dw PhandarinAnimation dw UnownAnimation + dw WynautAnimation dw WobbuffetAnimation dw BipullaAnimation dw CalflacAnimation diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm index 0e76b02..a012598 100644 --- a/gfx/pokemon/anims.asm +++ b/gfx/pokemon/anims.asm @@ -243,6 +243,7 @@ MismagiusAnimation: INCLUDE "gfx/pokemon/mismagius/anim.asm" StromenAnimation: INCLUDE "gfx/pokemon/stromen/anim.asm" PhandarinAnimation: INCLUDE "gfx/pokemon/phandarin/anim.asm" UnownAnimation: INCLUDE "gfx/pokemon/unown/anim.asm" +WynautAnimation: INCLUDE "gfx/pokemon/wynaut/anim.asm" WobbuffetAnimation: INCLUDE "gfx/pokemon/wobbuffet/anim.asm" BipullaAnimation: INCLUDE "gfx/pokemon/bipulla/anim.asm" CalflacAnimation: INCLUDE "gfx/pokemon/calflac/anim.asm" diff --git a/gfx/pokemon/bitmask_pointers.asm b/gfx/pokemon/bitmask_pointers.asm index 3663475..ac8707e 100644 --- a/gfx/pokemon/bitmask_pointers.asm +++ b/gfx/pokemon/bitmask_pointers.asm @@ -245,6 +245,7 @@ BitmasksPointers: dw StromenBitmasks dw PhandarinBitmasks dw UnownBitmasks + dw WynautBitmasks dw WobbuffetBitmasks dw BipullaBitmasks dw CalflacBitmasks diff --git a/gfx/pokemon/bitmasks.asm b/gfx/pokemon/bitmasks.asm index 8bfb1b2..760464a 100644 --- a/gfx/pokemon/bitmasks.asm +++ b/gfx/pokemon/bitmasks.asm @@ -243,6 +243,7 @@ MismagiusBitmasks: INCLUDE "gfx/pokemon/mismagius/bitmask.asm" StromenBitmasks: INCLUDE "gfx/pokemon/stromen/bitmask.asm" PhandarinBitmasks: INCLUDE "gfx/pokemon/phandarin/bitmask.asm" UnownBitmasks: INCLUDE "gfx/pokemon/unown/bitmask.asm" +WynautBitmasks: INCLUDE "gfx/pokemon/wynaut/bitmask.asm" WobbuffetBitmasks: INCLUDE "gfx/pokemon/wobbuffet/bitmask.asm" BipullaBitmasks: INCLUDE "gfx/pokemon/bipulla/bitmask.asm" CalflacBitmasks: INCLUDE "gfx/pokemon/calflac/bitmask.asm" diff --git a/gfx/pokemon/frame_pointers.asm b/gfx/pokemon/frame_pointers.asm index 7a0d425..15adca9 100644 --- a/gfx/pokemon/frame_pointers.asm +++ b/gfx/pokemon/frame_pointers.asm @@ -245,6 +245,7 @@ FramesPointers: dba StromenFrames dba PhandarinFrames dba UnownFrames + dba WynautFrames dba WobbuffetFrames dba BipullaFrames dba CalflacFrames diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 05645c0..2f9e7fa 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -245,6 +245,7 @@ AnimationIdlePointers: dw StromenAnimationIdle dw PhandarinAnimationIdle dw UnownAnimationIdle + dw WynautAnimationIdle dw WobbuffetAnimationIdle dw BipullaAnimationIdle dw CalflacAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index 9fe72fd..98c3228 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -243,6 +243,7 @@ MismagiusAnimationIdle: INCLUDE "gfx/pokemon/mismagius/anim_idle.asm" StromenAnimationIdle: INCLUDE "gfx/pokemon/stromen/anim_idle.asm" PhandarinAnimationIdle: INCLUDE "gfx/pokemon/phandarin/anim_idle.asm" UnownAnimationIdle: INCLUDE "gfx/pokemon/unown/anim_idle.asm" +WynautAnimationIdle: INCLUDE "gfx/pokemon/wynaut/anim_idle.asm" WobbuffetAnimationIdle: INCLUDE "gfx/pokemon/wobbuffet/anim_idle.asm" BipullaAnimationIdle: INCLUDE "gfx/pokemon/bipulla/anim_idle.asm" CalflacAnimationIdle: INCLUDE "gfx/pokemon/calflac/anim_idle.asm" diff --git a/gfx/pokemon/johto_frames.asm b/gfx/pokemon/johto_frames.asm index e08e971..9981f95 100644 --- a/gfx/pokemon/johto_frames.asm +++ b/gfx/pokemon/johto_frames.asm @@ -67,6 +67,7 @@ MismagiusFrames: INCLUDE "gfx/pokemon/mismagius/frames.asm" StromenFrames: INCLUDE "gfx/pokemon/stromen/frames.asm" PhandarinFrames: INCLUDE "gfx/pokemon/phandarin/frames.asm" UnownFrames: INCLUDE "gfx/pokemon/unown/frames.asm" +WynautFrames: INCLUDE "gfx/pokemon/wynaut/frames.asm" WobbuffetFrames: INCLUDE "gfx/pokemon/wobbuffet/frames.asm" BipullaFrames: INCLUDE "gfx/pokemon/bipulla/frames.asm" CalflacFrames: INCLUDE "gfx/pokemon/calflac/frames.asm" diff --git a/gfx/pokemon/wynaut/anim.asm b/gfx/pokemon/wynaut/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/wynaut/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/wynaut/anim_idle.asm b/gfx/pokemon/wynaut/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/wynaut/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/wynaut/back.png b/gfx/pokemon/wynaut/back.png new file mode 100644 index 0000000000000000000000000000000000000000..c7216be8a6b643ae0f808a7c3d303e86af6d8dfa GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sJOMr-uK)l4-}{`ScnXlu5R|)9 z9Z0d11o;I6#sBAOxK#rATRmMILn>|^y%NaRY{0{OVa2}xbJZ6*F0?2!YPqJbQOC=Y zaip60#j}fN7teM#|F3pH_JpWM-F#seB z5(V=%|6HQW>9L#Xb5tGMzO|>H)LCqMcu=)Ym8-{*Mf;=eOvmUXu^H{>8AV?(o~T)2 z!K(PkM85T@plZT@4%Thgv%EU;#hxm@Um5=JA5V9LDEq2#mH2yVo7cYIzhL)G`3KBx qK77yoJ~)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 literal 0 HcmV?d00001 diff --git a/gfx/pokemon/wynaut/shiny.pal b/gfx/pokemon/wynaut/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/wynaut/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/maps/DebugRoom.asm b/maps/DebugRoom.asm index b7d94d2..1ede143 100644 --- a/maps/DebugRoom.asm +++ b/maps/DebugRoom.asm @@ -8,12 +8,12 @@ DebugRoom_MapScripts: DebugPokemon1Script: opentext - getmonname STRING_BUFFER_3, MISDREAVUS + getmonname STRING_BUFFER_3, WYNAUT writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke MISDREAVUS, 42, DUSK_STONE + givepoke WYNAUT, 14, RARE_CANDY closetext end