Add Shuckle

constants/pokemon_constants.asm

@@ -212,50 +212,51 @@
 	const GRANBULL   ; $d2
 	const QWILFISH   ; $d3
 	const SCIZOR     ; $d4
-	const HERACROSS  ; $d5
-	const SNEASEL    ; $d6
-	const WEAVILE    ; $d7
-	const TEDDIURSA  ; $d8
-	const URSARING   ; $d9
-	const SLUGMA     ; $da
-	const MAGCARGO   ; $db
-	const SWINUB     ; $dc
-	const PILOSWINE  ; $dd
-	const MAMOSWINE  ; $de
-	const CORSOLA    ; $df
-	const REMORAID   ; $e0
-	const OCTILLERY  ; $e1
-	const MANTINE    ; $e2
-	const SKARMORY   ; $e3
-	const HOUNDOUR   ; $e4
-	const HOUNDOOM   ; $e5
-	const KINGDRA    ; $e6
-	const PHANPY     ; $e7
-	const DONPHAN    ; $e8
-	const PORYGON2   ; $e9
-	const SMEARGLE   ; $ea
-	const TYROGUE    ; $eb
-	const HITMONTOP  ; $ec
-	const ELEKID     ; $ed
-	const ELECTIVIRE ; $ee
-	const MAGBY      ; $ef
-	const MAGMORTAR  ; $f0
-	const MILTANK    ; $f1
-	const BLISSEY    ; $f2
-	const RAIKOU     ; $f3
-	const ENTEI      ; $f4
-	const SUICUNE    ; $f5
-	const LARVITAR   ; $f6
-	const PUPITAR    ; $f7
-	const TYRANITAR  ; $f8
-	const LUGIA      ; $f9
-	const HO_OH      ; $fa
-	const CELEBI     ; $fb
-	const SYLVEON    ; $fc
-	const PORYGON_Z  ; $fd
+	const SHUCKLE    ; $d5
+	const HERACROSS  ; $d6
+	const SNEASEL    ; $d7
+	const WEAVILE    ; $d8
+	const TEDDIURSA  ; $d9
+	const URSARING   ; $da
+	const SLUGMA     ; $db
+	const MAGCARGO   ; $dc
+	const SWINUB     ; $dd
+	const PILOSWINE  ; $de
+	const MAMOSWINE  ; $df
+	const CORSOLA    ; $e0
+	const REMORAID   ; $e1
+	const OCTILLERY  ; $e2
+	const MANTINE    ; $e3
+	const SKARMORY   ; $e4
+	const HOUNDOUR   ; $e5
+	const HOUNDOOM   ; $e6
+	const KINGDRA    ; $e7
+	const PHANPY     ; $e8
+	const DONPHAN    ; $e9
+	const PORYGON2   ; $ea
+	const SMEARGLE   ; $eb
+	const TYROGUE    ; $ec
+	const HITMONTOP  ; $ed
+	const ELEKID     ; $ee
+	const ELECTIVIRE ; $ef
+	const MAGBY      ; $f0
+	const MAGMORTAR  ; $f1
+	const MILTANK    ; $f2
+	const BLISSEY    ; $f3
+	const RAIKOU     ; $f4
+	const ENTEI      ; $f5
+	const SUICUNE    ; $f6
+	const LARVITAR   ; $f7
+	const PUPITAR    ; $f8
+	const TYRANITAR  ; $f9
+	const LUGIA      ; $fa
+	const HO_OH      ; $fb
+	const CELEBI     ; $fc
+	const SYLVEON    ; $fd
+	const PORYGON_Z  ; $fe
 NUM_POKEMON EQU const_value +- 1
-	const EGG        ; $fe
 	const CANCEL     ; $ff
+EGG EQU CANCEL ; EGG is used as sentinel for egg pic/icon/etc
 
 
 ; form values

contents/bank_ends.txt

@@ -5,67 +5,67 @@
 > -- Morimoto, Pokémon Ultra Sun/Ultra Moon
 > <https://www.serebii.net/ultrasunultramoon/virtualconsole.shtml>
 
-Free space: 193166/2097152 (9.21%)
+Free space: 192145/2097152 (9.16%)
 
 bank	end	free
 $00	$3f9d	$0063
 $01	$7ffa	$0006
-$02	$7fff	$0001
-$03	$7ffc	$0004
-$04	$7feb	$0015
-$05	$7ff5	$000b
-$06	$7fec	$0014
+$02	$7ff4	$000c
+$03	$7ffd	$0003
+$04	$7ffe	$0002
+$05	$7ff3	$000d
+$06	$7ff0	$0010
 $07	$7fd6	$002a
-$08	$7fea	$0016
+$08	$7fe6	$001a
 $09	$7fc7	$0039
-$0a	$7fe9	$0017
+$0a	$7feb	$0015
 $0b	$8000	$0000
 $0c	$7fd1	$002f
-$0d	$7fff	$0001
+$0d	$7ff8	$0008
 $0e	$7ff0	$0010
 $0f	$7ffb	$0005
 $10	$7ffb	$0005
-$11	$7ff6	$000a
-$12	$7fd6	$002a
+$11	$7ff8	$0008
+$12	$7f3e	$00c2
 $13	$7ffa	$0006
 $14	$7ff4	$000c
 $15	$7f60	$00a0
 $16	$7fed	$0013
 $17	$7fdf	$0021
 $18	$7fd8	$0028
-$19	$7f0d	$00f3
+$19	$7fd0	$0030
 $1a	$7feb	$0015
 $1b	$7fff	$0001
 $1c	$7fdc	$0024
 $1d	$7f81	$007f
 $1e	$7fef	$0011
 $1f	$7fd6	$002a
-$20	$7fa8	$0058
-$21	$8000	$0000
-$22	$7fe3	$001d
-$23	$7ff9	$0007
-$24	$7ff1	$000f
+$20	$7fc2	$003e
+$21	$7ffc	$0004
+$22	$7fbc	$0044
+$23	$7fc2	$003e
+$24	$7ff7	$0009
 $25	$7fe0	$0020
 $26	$7ff7	$0009
 $27	$7fe9	$0017
-$28	$7fbd	$0043
+$28	$7fc3	$003d
 $29	$7fce	$0032
 $2a	$7ffc	$0004
-$2b	$7fda	$0026
-$2c	$7fd6	$002a
-$2d	$7fd9	$0027
+$2b	$7fdc	$0024
+$2c	$7fb9	$0047
+$2d	$7fdb	$0025
 $2e	$7fe8	$0018
 $2f	$7fe2	$001e
 $30	$7f9f	$0061
-$31	$7e20	$01e0
+$31	$7f87	$0079
 $32	$7ff8	$0008
-$33	$7ffe	$0002
+$33	$7ff4	$000c
 $34	$7f19	$00e7
-$35	$7fca	$0036
-$36	$7fe2	$001e
+$35	$7fbe	$0042
+$36	$7ffe	$0002
 $37	$7ffe	$0002
-$38	$7fd9	$0027
-$39	$7f80	$0080
+$38	$7fd7	$0029
+$39	$8000	$0000
 $3a	$7f80	$0080
 $3b	$7fea	$0016
 $3c	$7ff4	$000c
@@ -77,25 +77,25 @@ $41	$7f63	$009d
 $42	$7f00	$0100
 $43	$7e59	$01a7
 $44	$7d8c	$0274
-$45	$7d2f	$02d1
+$45	$7d35	$02cb
 $46	$7fe9	$0017
 $47	$7ff9	$0007
 $48	$7fee	$0012
-$49	$7fff	$0001
+$49	$7fe6	$001a
 $4a	$7feb	$0015
 $4b	$7ffd	$0003
 $4c	$7fc8	$0038
 $4d	$7ff4	$000c
 $4e	$7ffc	$0004
-$4f	$7f92	$006e
+$4f	$7f9a	$0066
 $50	$7ff7	$0009
 $51	$7feb	$0015
 $52	$7ffc	$0004
 $53	$7fe4	$001c
 $54	$7fe3	$001d
-$55	$7ff1	$000f
-$56	$7fe1	$001f
-$57	$7ff9	$0007
+$55	$7ff3	$000d
+$56	$7ff9	$0007
+$57	$7fdf	$0021
 $58	$7ff4	$000c
 $59	$7fd1	$002f
 $5a	$7fb5	$004b
@@ -107,24 +107,24 @@ $5f	$7fd2	$002e
 $60	$7fff	$0001
 $61	$8000	$0000
 $62	$7fee	$0012
-$63	$7fdf	$0021
-$64	$7fdf	$0021
-$65	$7fe9	$0017
+$63	$7fe0	$0020
+$64	$7ff5	$000b
+$65	$7ff8	$0008
 $66	$7f56	$00aa
 $67	$7f3e	$00c2
 $68	$7fe3	$001d
 $69	$7fe1	$001f
-$6a	$7ff7	$0009
-$6b	$7dba	$0246
-$6c	$7fea	$0016
-$6d	$7fe2	$001e
+$6a	$7ff5	$000b
+$6b	$7e3e	$01c2
+$6c	$7d20	$02e0
+$6d	$7fec	$0014
 $6e	$7f5f	$00a1
-$6f	$7fff	$0001
-$70	$7de7	$0219
+$6f	$8000	$0000
+$70	$7e30	$01d0
 $71	$7dd1	$022f
-$72	$7fe7	$0019
-$73	$7d43	$02bd
-$74	$72b7	$0d49
+$72	$7ff0	$0010
+$73	$7e2d	$01d3
+$74	$75d5	$0a2b
 $75	$4000	$4000
 $76	$4000	$4000
 $77	$4000	$4000

data/pokemon/base_stats.asm

@@ -268,6 +268,7 @@ INCLUDE "data/pokemon/base_stats/snubbull.asm"
 INCLUDE "data/pokemon/base_stats/granbull.asm"
 INCLUDE "data/pokemon/base_stats/qwilfish.asm"
 INCLUDE "data/pokemon/base_stats/scizor.asm"
+INCLUDE "data/pokemon/base_stats/shuckle.asm"
 INCLUDE "data/pokemon/base_stats/heracross.asm"
 INCLUDE "data/pokemon/base_stats/sneasel.asm"
 INCLUDE "data/pokemon/base_stats/weavile.asm"

data/pokemon/cries.asm

@@ -217,6 +217,7 @@ CryHeaders::
 	mon_cry CRY_DUNSPARCE,   $000,  $180 ; Granbull
 	mon_cry CRY_SLOWKING,    $160,  $0e0 ; Qwilfish
 	mon_cry CRY_AMPHAROS,    $000,  $160 ; Scizor
+	mon_cry CRY_DUNSPARCE,   $290,  $0a8 ; Shuckle
 	mon_cry CRY_AMPHAROS,    $035,  $0e0 ; Heracross
 	mon_cry CRY_WOOPER,      $053,  $0af ; Sneasel
 	mon_cry CRY_WOOPER,      $053,  $0af ; Weavile
@@ -259,4 +260,3 @@ CryHeaders::
 	mon_cry CRY_VENONAT,     $0b0,  $16f ; Sylveon
 	mon_cry CRY_GIRAFARIG,   $073,  $240 ; PorygonZ
 	mon_cry CRY_NIDORAN_M,      0,     0 ; Egg
-	mon_cry CRY_NIDORAN_M,      0,     0 ; 255

data/pokemon/dex_entries.asm

@@ -208,7 +208,7 @@ EspeonPokedexEntry::     INCLUDE "data/pokemon/dex_entries/196.asm"
 UmbreonPokedexEntry::    INCLUDE "data/pokemon/dex_entries/197.asm"
 
 
-SECTION "Pokedex Entries 193-253", ROMX
+SECTION "Pokedex Entries 193-254", ROMX
 
 PokedexEntries4::
 LeafeonPokedexEntry::    INCLUDE "data/pokemon/dex_entries/470.asm"
@@ -231,6 +231,7 @@ SnubbullPokedexEntry::   INCLUDE "data/pokemon/dex_entries/209.asm"
 GranbullPokedexEntry::   INCLUDE "data/pokemon/dex_entries/210.asm"
 QwilfishPokedexEntry::   INCLUDE "data/pokemon/dex_entries/211.asm"
 ScizorPokedexEntry::     INCLUDE "data/pokemon/dex_entries/212.asm"
+ShucklePokedexEntry::    INCLUDE "data/pokemon/dex_entries/213.asm"
 HeracrossPokedexEntry::  INCLUDE "data/pokemon/dex_entries/214.asm"
 SneaselPokedexEntry::    INCLUDE "data/pokemon/dex_entries/215.asm"
 WeavilePokedexEntry::    INCLUDE "data/pokemon/dex_entries/461.asm"

data/pokemon/dex_entry_pointers.asm

@@ -212,6 +212,7 @@
 	dw GranbullPokedexEntry
 	dw QwilfishPokedexEntry
 	dw ScizorPokedexEntry
+	dw ShucklePokedexEntry
 	dw HeracrossPokedexEntry
 	dw SneaselPokedexEntry
 	dw WeavilePokedexEntry

data/pokemon/dex_order_alpha.asm

@@ -195,6 +195,7 @@ AlphabeticalPokedexOrder:
 	db SEEL
 	db SENTRET
 	db SHELLDER
+	db SHUCKLE
 	db SKARMORY
 	db SLOWBRO
 	db SLOWKING

data/pokemon/dex_order_new.asm

@@ -157,6 +157,7 @@ NewPokedexOrder:
 	db TENTACRUEL
 	db KRABBY
 	db KINGLER
+	db SHUCKLE
 	db STARYU
 	db STARMIE
 	db SHELLDER

data/pokemon/egg_move_pointers.asm

@@ -211,6 +211,7 @@ EggMovePointers:: ; 0x23b11
 	dw NoEggMoves
 	dw QwilfishEggMoves
 	dw NoEggMoves
+	dw ShuckleEggMoves
 	dw HeracrossEggMoves
 	dw SneaselEggMoves
 	dw NoEggMoves

data/pokemon/egg_moves.asm

@@ -743,6 +743,10 @@ QwilfishEggMoves:
 	db WATER_PULSE
 	db $ff
 
+ShuckleEggMoves: ; TODO
+	db ROLLOUT
+	db $ff
+
 HeracrossEggMoves:
 	db DEFENSE_CURL
 	db PURSUIT

data/pokemon/evos_attacks.asm

@@ -4172,6 +4172,7 @@ ScizorEvosAttacks:
 	db 57, SWORDS_DANCE
 	db 0 ; no more level-up moves
 
+ShuckleEvosAttacks: ; todo
 HeracrossEvosAttacks:
 	db 0 ; no more evolutions
 	db 1, NIGHT_SLASH

data/pokemon/evos_attacks_pointers.asm

@@ -215,6 +215,7 @@ EvosAttacksPointers:: ; 0x425b1
 	dw GranbullEvosAttacks
 	dw QwilfishEvosAttacks
 	dw ScizorEvosAttacks
+	dw ShuckleEvosAttacks
 	dw HeracrossEvosAttacks
 	dw SneaselEvosAttacks
 	dw WeavileEvosAttacks

data/pokemon/menu_icon_pointers.asm

@@ -212,6 +212,7 @@ IconPointers:
 	dw GranbullIcon
 	dw QwilfishIcon
 	dw ScizorIcon
+	dw ShuckleIcon
 	dw HeracrossIcon
 	dw SneaselIcon
 	dw WeavileIcon

data/pokemon/menu_icons.asm

@@ -221,6 +221,7 @@ SnubbullIcon:     INCBIN "gfx/icons/snubbull.2bpp"
 GranbullIcon:     INCBIN "gfx/icons/granbull.2bpp"
 QwilfishIcon:     INCBIN "gfx/icons/qwilfish.2bpp"
 ScizorIcon:       INCBIN "gfx/icons/scizor.2bpp"
+ShuckleIcon:      INCBIN "gfx/icons/shuckle.2bpp"
 HeracrossIcon:    INCBIN "gfx/icons/heracross.2bpp"
 SneaselIcon:      INCBIN "gfx/icons/sneasel.2bpp"
 WeavileIcon:      INCBIN "gfx/icons/weavile.2bpp"

data/pokemon/names.asm

@@ -211,6 +211,7 @@ PokemonNames::
 	db "G", "r", "a", "n", "b", "u", "l", "l", "@", "@"
 	db "Q", "w", "i", "l", "f", "i", "s", "h", "@", "@"
 	db "S", "c", "i", "z", "o", "r", "@", "@", "@", "@"
+	db "S", "h", "u", "c", "k", "l", "e", "@", "@", "@"
 	db "H", "e", "r", "a", "c", "r", "o", "s", "s", "@"
 	db "S", "n", "e", "a", "s", "e", "l", "@", "@", "@"
 	db "W", "e", "a", "v", "i", "l", "e", "@", "@", "@"
@@ -254,4 +255,3 @@ PokemonNames::
 	db "P", "o", "r", "y", "g", "o", "n", "-", "Z", "@"
 	db "E", "g", "g", "@", "@", "@", "@", "@", "@", "@"
 	db "?", "?", "?", "?", "?", "@", "@", "@", "@", "@"
-	db "?", "?", "?", "?", "?", "@", "@", "@", "@", "@"