From dafc4aada760855fdc2491a565cbc381a6888e27 Mon Sep 17 00:00:00 2001 From: Llinos Evans Date: Sun, 29 Oct 2023 14:13:11 +0000 Subject: [PATCH] Gorochu This is the first use of the placeholder graphic. Works like a charm - copypaste the folder whenever you add something new. This required me to change the layout.link for cries but it seems to work just fine. Earthtron cry is now available for use on other Pokemon, which I think could be neat for Shi-Shi. --- audio/cries.asm | 36 +++++++++++++++++++++++++++ audio/cry_pointers.asm | 1 + constants/cry_constants.asm | 1 + constants/pokemon_constants.asm | 1 + data/pokemon/base_stats.asm | 1 + data/pokemon/cries.asm | 1 + data/pokemon/dex_entries.asm | 1 + data/pokemon/dex_entries/gorochu.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_kanto.asm | 1 + data/pokemon/evos_attacks_kanto.asm | 14 +++++++++++ data/pokemon/first_stages.asm | 1 + data/pokemon/gen1_base_special.asm | 1 + 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 | 5 ++-- gfx/footprints/gorochu.png | Bin 0 -> 87 bytes gfx/pics.asm | 5 ++++ gfx/pokemon/anim_pointers.asm | 1 + gfx/pokemon/anims.asm | 1 + gfx/pokemon/back.png | Bin 0 -> 304 bytes gfx/pokemon/bitmask_pointers.asm | 1 + gfx/pokemon/bitmasks.asm | 1 + gfx/pokemon/frame_pointers.asm | 1 + gfx/pokemon/front.png | Bin 0 -> 315 bytes gfx/pokemon/gorochu/anim.asm | 1 + gfx/pokemon/gorochu/anim_idle.asm | 1 + gfx/pokemon/gorochu/back.png | Bin 0 -> 304 bytes gfx/pokemon/gorochu/front.png | Bin 0 -> 315 bytes gfx/pokemon/gorochu/shiny.pal | 2 ++ gfx/pokemon/idle_pointers.asm | 1 + gfx/pokemon/idles.asm | 1 + gfx/pokemon/kanto_frames.asm | 1 + layout.link | 3 ++- maps/PlayersHouse2F.asm | 8 +++--- 40 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 data/pokemon/dex_entries/gorochu.asm create mode 100644 gfx/footprints/gorochu.png create mode 100644 gfx/pokemon/back.png create mode 100644 gfx/pokemon/front.png create mode 100644 gfx/pokemon/gorochu/anim.asm create mode 100644 gfx/pokemon/gorochu/anim_idle.asm create mode 100644 gfx/pokemon/gorochu/back.png create mode 100644 gfx/pokemon/gorochu/front.png create mode 100644 gfx/pokemon/gorochu/shiny.pal diff --git a/audio/cries.asm b/audio/cries.asm index cf2ead1..a452850 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -2108,3 +2108,39 @@ Cry_Rattata_Ch8: noise_note 1, 10, 2, 57 noise_note 8, 9, 1, 73 sound_ret + +Cry_Earthtron: + channel_count 3 + channel 5, Cry_Earthtron_Ch5 + channel 6, Cry_Earthtron_Ch6 + channel 8, Cry_Earthtron_Ch8 + +Cry_Earthtron_Ch5: ; using the unused 'Earthtron' cry + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret + +Cry_Earthtron_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret + +Cry_Earthtron_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm index 58b948a..b16529c 100644 --- a/audio/cry_pointers.asm +++ b/audio/cry_pointers.asm @@ -69,4 +69,5 @@ Cries: dba Cry_Aipom dba Cry_Dunsparce dba Cry_Donphan + dba Cry_Earthtron assert_table_length NUM_CRIES diff --git a/constants/cry_constants.asm b/constants/cry_constants.asm index 6b5aba6..71503e4 100644 --- a/constants/cry_constants.asm +++ b/constants/cry_constants.asm @@ -72,5 +72,6 @@ const CRY_AIPOM const CRY_DUNSPARCE const CRY_DONPHAN + const CRY_EARTHTRON DEF NUM_CRIES EQU const_value diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 0a7c1c1..ce6c35f 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -45,6 +45,7 @@ const ARBOK ; 18 const PIKACHU ; 19 const RAICHU ; 1a + const GOROCHU const SANDSHREW ; 1b const SANDSLASH ; 1c const NIDORAN_F ; 1d diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 0250a27..0bf4eb0 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -53,6 +53,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm" INCLUDE "data/pokemon/base_stats/arbok.asm" INCLUDE "data/pokemon/base_stats/pikachu.asm" INCLUDE "data/pokemon/base_stats/raichu.asm" +INCLUDE "data/pokemon/base_stats/gorochu.asm" INCLUDE "data/pokemon/base_stats/sandshrew.asm" INCLUDE "data/pokemon/base_stats/sandslash.asm" INCLUDE "data/pokemon/base_stats/nidoran_f.asm" diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index bc64bc1..b3ca586 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -32,6 +32,7 @@ PokemonCries:: mon_cry CRY_EKANS, 224, 144 ; ARBOK mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU mon_cry CRY_RAICHU, 238, 136 ; RAICHU + mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 59843ed..91f8eee 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -26,6 +26,7 @@ EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm" ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm" PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm" RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm" +GorochuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorochu.asm" SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm" SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm" NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm" diff --git a/data/pokemon/dex_entries/gorochu.asm b/data/pokemon/dex_entries/gorochu.asm new file mode 100644 index 0000000..808cdb5 --- /dev/null +++ b/data/pokemon/dex_entries/gorochu.asm @@ -0,0 +1,10 @@ + db "VOLTAGE@" ; species name + dw 511, 1960 ; height, weight + + db "Proud of its power," + next "GOROCHU will seek" + next "foes and shock" + + page "them with THUNDER." + next "It can easily take" + next "down a TRAMPEL.@" \ No newline at end of file diff --git a/data/pokemon/dex_entry_pointers.asm b/data/pokemon/dex_entry_pointers.asm index 502b566..efca2cc 100644 --- a/data/pokemon/dex_entry_pointers.asm +++ b/data/pokemon/dex_entry_pointers.asm @@ -27,6 +27,7 @@ PokedexDataPointerTable: dba ArbokPokedexEntry dba PikachuPokedexEntry dba RaichuPokedexEntry + dba GorochuPokedexEntry dba SandshrewPokedexEntry dba SandslashPokedexEntry dba NidoranFPokedexEntry diff --git a/data/pokemon/dex_order_alpha.asm b/data/pokemon/dex_order_alpha.asm index 53bc6cf..e8e6553 100644 --- a/data/pokemon/dex_order_alpha.asm +++ b/data/pokemon/dex_order_alpha.asm @@ -78,6 +78,7 @@ AlphabeticalPokedexOrder: dw GOLDEEN dw GOLDUCK dw GOLEM + dw GOROCHU dw GRANBULL dw GRAVELER dw GRIMER diff --git a/data/pokemon/dex_order_new.asm b/data/pokemon/dex_order_new.asm index 684ca10..13e7213 100644 --- a/data/pokemon/dex_order_new.asm +++ b/data/pokemon/dex_order_new.asm @@ -25,6 +25,7 @@ NewPokedexOrder: dw PICHU dw PIKACHU dw RAICHU + dw GOROCHU dw CATERPIE dw METAPOD dw BUTTERFREE diff --git a/data/pokemon/egg_moves_kanto.asm b/data/pokemon/egg_moves_kanto.asm index 1ae6925..758dc3a 100644 --- a/data/pokemon/egg_moves_kanto.asm +++ b/data/pokemon/egg_moves_kanto.asm @@ -27,6 +27,7 @@ EggMovePointers1: dw NoEggMoves1 dw NoEggMoves1 dw NoEggMoves1 + dw NoEggMoves1 dw SandshrewEggMoves dw NoEggMoves1 dw NidoranFEggMoves diff --git a/data/pokemon/evos_attacks_kanto.asm b/data/pokemon/evos_attacks_kanto.asm index 173ef89..29ec110 100644 --- a/data/pokemon/evos_attacks_kanto.asm +++ b/data/pokemon/evos_attacks_kanto.asm @@ -27,6 +27,7 @@ EvosAttacksPointers1:: dw ArbokEvosAttacks dw PikachuEvosAttacks dw RaichuEvosAttacks + dw GorochuEvosAttacks dw SandshrewEvosAttacks dw SandslashEvosAttacks dw NidoranFEvosAttacks @@ -504,12 +505,25 @@ PikachuEvosAttacks: db 0 ; no more level-up moves RaichuEvosAttacks: + dbbw EVOLVE_TRADE, -1, GOROCHU db 0 ; no more evolutions dbw 1, THUNDERSHOCK dbw 1, TAIL_WHIP dbw 1, QUICK_ATTACK dbw 1, THUNDERBOLT db 0 ; no more level-up moves + +GorochuEvosAttacks: + db 0 ; no more evolutions + dbw 1, THUNDERSHOCK + dbw 1, TAIL_WHIP + dbw 1, QUICK_ATTACK + dbw 1, THUNDERBOLT + dbw 53, SAND_ATTACK + dbw 57, FOCUS_ENERGY + dbw 60, LEER + dbw 65, HORN_DRILL + db 0 ; no more level-up moves SandshrewEvosAttacks: dbbw EVOLVE_LEVEL, 22, SANDSLASH diff --git a/data/pokemon/first_stages.asm b/data/pokemon/first_stages.asm index a528030..e8fbacf 100644 --- a/data/pokemon/first_stages.asm +++ b/data/pokemon/first_stages.asm @@ -27,6 +27,7 @@ FirstEvoStages:: dw EKANS ;18 dw PICHU dw PICHU + dw PICHU dw SANDSHREW dw SANDSHREW dw NIDORAN_F diff --git a/data/pokemon/gen1_base_special.asm b/data/pokemon/gen1_base_special.asm index afff585..7d46176 100644 --- a/data/pokemon/gen1_base_special.asm +++ b/data/pokemon/gen1_base_special.asm @@ -28,6 +28,7 @@ KantoMonSpecials: db 65 ; ARBOK db 50 ; PIKACHU db 90 ; RAICHU + db 100 ; GOROCHU db 30 ; SANDSHREW db 55 ; SANDSLASH db 40 ; NIDORAN_F diff --git a/data/pokemon/gen1_order.asm b/data/pokemon/gen1_order.asm index 7b68be0..45580d3 100644 --- a/data/pokemon/gen1_order.asm +++ b/data/pokemon/gen1_order.asm @@ -257,4 +257,5 @@ Pokered_MonIndices: db WALKING_WAKE db SHI_SHI db MUNCHLAX + db GOROCHU assert_table_length NUM_POKEMON - 1 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index 948eab3..a6c74fc 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -28,6 +28,7 @@ MonMenuIcons: db ICON_SERPENT ; ARBOK db ICON_PIKACHU ; PIKACHU db ICON_PIKACHU ; RAICHU + db ICON_PIKACHU ; GOROCHU db ICON_MONSTER ; SANDSHREW db ICON_MONSTER ; SANDSLASH db ICON_FOX ; NIDORAN_F diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index f8c0a1b..c26d0be 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -30,6 +30,7 @@ PokemonNames:: db "ARBOK@@@@@" db "PIKACHU@@@" db "RAICHU@@@@" + db "GOROCHU@@@" db "SANDSHREW@" db "SANDSLASH@" db "NIDORAN♀@@" diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index af9746f..11fda87 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -85,6 +85,8 @@ INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/pikachu/shiny.pal" INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/raichu/shiny.pal" +INCBIN "gfx/pokemon/gorochu/front.gbcpal", middle_colors +INCLUDE "gfx/pokemon/gorochu/shiny.pal" INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors INCLUDE "gfx/pokemon/sandshrew/shiny.pal" INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors diff --git a/data/pokemon/pic_pointers.asm b/data/pokemon/pic_pointers.asm index 996e07b..d0aeb86 100644 --- a/data/pokemon/pic_pointers.asm +++ b/data/pokemon/pic_pointers.asm @@ -65,6 +65,8 @@ PokemonPicPointers:: dba PikachuBackpic dba RaichuFrontpic dba RaichuBackpic + dba GorochuFrontpic + dba GorochuBackpic dba SandshrewFrontpic dba SandshrewBackpic dba SandslashFrontpic diff --git a/gfx/footprints.asm b/gfx/footprints.asm index 4d5e66d..ec9c0ce 100644 --- a/gfx/footprints.asm +++ b/gfx/footprints.asm @@ -1,6 +1,6 @@ Footprints: table_width LEN_1BPP_TILE * 4, Footprints - +; don't forget to update assert_table_length INCBIN "gfx/footprints/bulbasaur.1bpp" INCBIN "gfx/footprints/ivysaur.1bpp" INCBIN "gfx/footprints/venusaur.1bpp" @@ -27,6 +27,7 @@ INCBIN "gfx/footprints/ekans.1bpp" INCBIN "gfx/footprints/arbok.1bpp" INCBIN "gfx/footprints/pikachu.1bpp" INCBIN "gfx/footprints/raichu.1bpp" +INCBIN "gfx/footprints/gorochu.1bpp" INCBIN "gfx/footprints/sandshrew.1bpp" INCBIN "gfx/footprints/sandslash.1bpp" INCBIN "gfx/footprints/nidoran_f.1bpp" @@ -264,4 +265,4 @@ INCBIN "gfx/footprints/254.1bpp" INCBIN "gfx/footprints/255.1bpp" INCBIN "gfx/footprints/256.1bpp" - assert_table_length $105 ; don't forget to update this + assert_table_length $106 ; don't forget to update this diff --git a/gfx/footprints/gorochu.png b/gfx/footprints/gorochu.png new file mode 100644 index 0000000000000000000000000000000000000000..031468da7b66c607e0ae3a28ad82becc65c2e817 GIT binary patch literal 87 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx;Bp3=bcE|uJIZqeIkcwN$2@cF>|^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/gorochu/anim.asm b/gfx/pokemon/gorochu/anim.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorochu/anim.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorochu/anim_idle.asm b/gfx/pokemon/gorochu/anim_idle.asm new file mode 100644 index 0000000..875f7be --- /dev/null +++ b/gfx/pokemon/gorochu/anim_idle.asm @@ -0,0 +1 @@ + endanim \ No newline at end of file diff --git a/gfx/pokemon/gorochu/back.png b/gfx/pokemon/gorochu/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/gorochu/shiny.pal b/gfx/pokemon/gorochu/shiny.pal new file mode 100644 index 0000000..5c88669 --- /dev/null +++ b/gfx/pokemon/gorochu/shiny.pal @@ -0,0 +1,2 @@ + RGB 22, 22, 12 + RGB 07, 15, 25 \ No newline at end of file diff --git a/gfx/pokemon/idle_pointers.asm b/gfx/pokemon/idle_pointers.asm index 9ed50ed..61c445f 100644 --- a/gfx/pokemon/idle_pointers.asm +++ b/gfx/pokemon/idle_pointers.asm @@ -26,6 +26,7 @@ AnimationIdlePointers: dw ArbokAnimationIdle dw PikachuAnimationIdle dw RaichuAnimationIdle + dw GorochuAnimationIdle dw SandshrewAnimationIdle dw SandslashAnimationIdle dw NidoranFAnimationIdle diff --git a/gfx/pokemon/idles.asm b/gfx/pokemon/idles.asm index a192b14..e8ee7b6 100644 --- a/gfx/pokemon/idles.asm +++ b/gfx/pokemon/idles.asm @@ -24,6 +24,7 @@ EkansAnimationIdle: INCLUDE "gfx/pokemon/ekans/anim_idle.asm" ArbokAnimationIdle: INCLUDE "gfx/pokemon/arbok/anim_idle.asm" PikachuAnimationIdle: INCLUDE "gfx/pokemon/pikachu/anim_idle.asm" RaichuAnimationIdle: INCLUDE "gfx/pokemon/raichu/anim_idle.asm" +GorochuAnimationIdle: INCLUDE "gfx/pokemon/gorochu/anim_idle.asm" SandshrewAnimationIdle: INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm" SandslashAnimationIdle: INCLUDE "gfx/pokemon/sandslash/anim_idle.asm" NidoranFAnimationIdle: INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm" diff --git a/gfx/pokemon/kanto_frames.asm b/gfx/pokemon/kanto_frames.asm index 658de5c..a6697c1 100644 --- a/gfx/pokemon/kanto_frames.asm +++ b/gfx/pokemon/kanto_frames.asm @@ -26,6 +26,7 @@ EkansFrames: INCLUDE "gfx/pokemon/ekans/frames.asm" ArbokFrames: INCLUDE "gfx/pokemon/arbok/frames.asm" PikachuFrames: INCLUDE "gfx/pokemon/pikachu/frames.asm" RaichuFrames: INCLUDE "gfx/pokemon/raichu/frames.asm" +GorochuFrames: INCLUDE "gfx/pokemon/gorochu/frames.asm" SandshrewFrames: INCLUDE "gfx/pokemon/sandshrew/frames.asm" SandslashFrames: INCLUDE "gfx/pokemon/sandslash/frames.asm" NidoranFFrames: INCLUDE "gfx/pokemon/nidoran_f/frames.asm" diff --git a/layout.link b/layout.link index e88be65..21eca1b 100644 --- a/layout.link +++ b/layout.link @@ -169,7 +169,6 @@ ROMX $3b ROMX $3c "Songs 3" "Sound Effects" - "Cries" ROMX $3d "Songs 4" ROMX $3e @@ -317,6 +316,8 @@ ROMX $7e ROMX $7f org $7de0 "Stadium 2 Checksums" +ROMX $80 + "Cries" WRAM0 "Stack" "Audio RAM" diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm index 1ca14d9..e3e2a1b 100644 --- a/maps/PlayersHouse2F.asm +++ b/maps/PlayersHouse2F.asm @@ -125,12 +125,12 @@ DebugPokemon1Script: DebugPokemon2Script: opentext - getmonname STRING_BUFFER_3, MUNCHLAX + getmonname STRING_BUFFER_3, GOROCHU writetext ReceivedDebugPokemonText playsound SFX_CAUGHT_MON waitsfx promptbutton - givepoke MUNCHLAX, 35, POISON_STONE + givepoke GOROCHU, 35, POISON_STONE closetext end @@ -145,11 +145,11 @@ DebugPokemon3Script: faceplayer opentext writetext DebugTextA - cry WALKING_WAKE + cry GOROCHU pause 15 closetext loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE - loadwildmon WALKING_WAKE, 40 + loadwildmon GOROCHU, 40 startbattle reloadmapafterbattle end