DK! Donkey Kong! (Huh!)

Finally, he's here for you
It's the last member of the KEP crew
This Mon's so strong, it isn't funny
Can make a Dark-type cry out for mummy
Can push a boulder with relative ease
Makes Strength puzzles seem such a breeze
He may move slow, he can't learn Fly
But this Mon's one hell of a guy!

README.md

@@ -9,7 +9,7 @@ New Pokemon
 The Kanto Expansion Pak's ethos is to add every "Kanto-related" Pokemon to RBY without fundamentally changing the grander metagame. What's defined as "Kanto-related" is a Pokemon that evolves from an existing Kanto Pokemon, made an appearance in a Kanto-based game (LGPE), is a regional variant, or was a Kanto-related Pokemon cut during the development of an official game.
 
 With this criteria, we get:
-- The 34 known prototype Pokemon that were cut from Red and Green; eg. Gorochu, Kotora
+- 35 known prototype Pokemon that were cut from Red and Green; eg. Gorochu, Kotora
 - Evolutions or pre-evolutions of a Kanto Pokemon found in a future generation eg. Steelix, Glaceon, Kleavor, Annihilape
 - Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo of Gold and Silver; eg. Luxwan, Bellignan
 - All fully-evolved regional variants of Kanto Pokemon; eg. Alolan Muk, Galarian Slowbro, Hisuian Arcanine, Paldean Tauros
@@ -164,7 +164,7 @@ QoL Enhancements
 - A feminine character option is now available, featuring the sprite from Pokemon Anniversary Red, which is based on Green's manga appearance.
 	- To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal.
 	- The protagonist is also referred to in a gender neutral manner. This changes like, 2-3 lines in the whole game.
-- All 151 original Pokemon, plus an additional 99, can be obtained without the use of trading or glitches, including Mew!
+- All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew!
 - Various moves have had their animations altered to be less intensive for photosensitive individuals, including every animation that was dimmed on the 3DS (Most notably Blizzard and Thunderbolt). This was done with the aim of also improving the move's animations overall, so some look a little flashier.
 	- Full list includes Body Slam, Glare, Disable, Blizzard, BubbleBeam, Confusion, Dream Eater, Explosion, Guillotine, Hyper Beam, Mega Kick, Mega Punch, Psychic, Reflect, Rock Slide, Selfdestruct, Spore, and Thunderbolt.
 - PureRGB's AI enhancements are ported over; said hack was made by Vortiene. In general, it isn't as stupid as it was before.
@@ -336,7 +336,7 @@ Accessing Regional variants
 ====
 Adding regional variants was difficult; we hit the exact Pokemon cap by cutting their pre-evolutions. However, we managed to implement them quite nicely!
 
-Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will trade you a regional variant in exchange for a Kantonian one. This goes as follows:
+Much like in Let's Go Pikachu and Let's Go Eevee, traders are available who will trade you a regional variant in exchange for a Kantonian one. These trades will be able to be repeated after every Elite 4 victory. This goes as follows:
 - Viridian City: Raticate
 - Pewter City: Golem
 - Cerulean City: Ninetales
@@ -403,7 +403,7 @@ Albatross sprites: Articuno-G, Blissey, Dugtrio-A, Electivire, Electrode-H, Espe
 
 Martha’s Against Humanity sprites: Bellignan (front, with help from PvK), Mimmeo (front), Sylveon (front, with help from Albatross)
 
-Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio
+Albatross sprites refined by either Martha’s Against Humanity or PvK: Annihilape, Arcanine-H, Bellossom, Carapthor, Gorillaimo, Kingdra, Magmortar, Magnezone, Ministare, Porygon2, Scream Tail, Squeamata, Tauros-P (all forms), Wugtrio
 
 RacieBeep sprites: Balumba, Blastyke, Blottle, Buu, Cactormus, Cheep, Coinpur, Croakozuna, Decilla, Fossils, Gaotora, Gavillain (edited by Albatross), Gawarhed, Gorochu (edited by Martha’s Against Humanity), Gorotora, Guardia, Jabetta (edited by Martha’s Against Humanity), Kolta, Kotora, Luxwan, Nidoreign, Omegadge (front/back), Orfry, Pendraken, Ramoose, Ribbito, Sharpoon, Totartle, Trampel, Vulpiii, Weirduck, Fossil Aerodactyl, Fossil Kabutops, Ghost, Articuno (back), Meowth (back)
 

constants/pokedex_constants.asm

@@ -176,7 +176,7 @@
 	const DEX_WEEZING_G  ;  	(170)
 	const DEX_TANGELA    ; 114 	(171)
 	const DEX_TANGROWTH  ;		(172)
-	const DEX_RAMOOSE	 ;		(173)
+	const DEX_RAMOOSE    ;		(173)
 	const DEX_HITMONLEE  ; 106	(174)	- Saffron City
 	const DEX_HITMONCHAN ; 107	(175)
 	const DEX_HITMONTOP  ;		(176)
@@ -192,7 +192,7 @@
 	const DEX_STARMIE    ; 121	(186)
 	const DEX_BLASTYKE   ;		(187)
 	const DEX_BLASTOISE  ; 9	(188)
-	const DEX_SHARPOON	 ;		(189)
+	const DEX_SHARPOON   ;		(189)
 	const DEX_EXEGGCUTE  ; 102	(190)	- Safari Zone
 	const DEX_EXEGGUTOR  ; 103	(191)
 	const DEX_EXEGGUTOR_A ; 	(192)
@@ -212,47 +212,48 @@
 	const DEX_TAUROS_PA  ;		(206)
 	const DEX_CHANSEY    ; 113	(207)
 	const DEX_BLISSEY    ;		(208)
-	const DEX_CACTORMUS  ;		(209)	- Rare/Special Pokemon
-	const DEX_MR_MIME    ; 122	(210)
-	const DEX_MR_RIME    ;		(211)
-	const DEX_JYNX       ; 124	(212)
-	const DEX_BUU	     ;		(213)
-	const DEX_ELECTABUZZ ; 125	(214)
-	const DEX_ELECTIVIRE ;		(215)
-	const DEX_MAGMAR     ; 126	(216)
-	const DEX_MAGMORTAR  ;		(217)
-	const DEX_LAPRAS     ; 131	(218)
-	const DEX_DITTO      ; 132	(219)
-	const DEX_MIMMEO     ;		(220)
-	const DEX_PORYGON    ; 137	(221)
-	const DEX_PORYGON2   ;		(222)
-	const DEX_PORYGONZ   ;		(223)
-	const DEX_OMANYTE    ; 138	(224)
-	const DEX_OMASTAR    ; 139	(225)
-	const DEX_KABUTO     ; 140	(226)
-	const DEX_KABUTOPS   ; 141	(227)
-	const DEX_AERODACTYL ; 142	(228)
-	const DEX_DECILLA    ;		(229)
-	const DEX_GAWARHED   ;		(230)
-	const DEX_OMEGADGE   ;		(231)
-	const DEX_SNORLAX    ; 143	(232)
- 	const DEX_SCREAM_TAIL ;		(233)	- Paradoxes, (Pseudo-)Legendary and Mythical Pokemon
-	const DEX_SANDY_SHOCKS ;	(234)
-	const DEX_SQUEAMATA  ;		(235)
-	const DEX_MINISTARE  ;		(236)
-	const DEX_IGUANARCH  ;		(237)
-	const DEX_DRATINI    ; 147	(238)
-	const DEX_DRAGONAIR  ; 148	(239)
-	const DEX_DRAGONITE  ; 149	(240)
-	const DEX_ARTICUNO   ; 144	(241)
-	const DEX_ARTICUNO_G ;		(242)
-	const DEX_ZAPDOS     ; 145	(243)
-	const DEX_ZAPDOS_G   ;		(244)
-	const DEX_MOLTRES    ; 146	(245)
-	const DEX_MOLTRES_G  ;		(246)
-	const DEX_MEWTWO     ; 150	(247)
-	const DEX_MEW        ; 151	(248)
-	const DEX_MELTAN     ;		(249)
-	const DEX_MELMETAL   ;		(250)
+	const DEX_GORILLAIMO ;		(209)	- Rare/Special Pokemon
+	const DEX_CACTORMUS  ;		(210)
+	const DEX_MR_MIME    ; 122	(211)
+	const DEX_MR_RIME    ;		(212)
+	const DEX_JYNX       ; 124	(213)
+	const DEX_BUU	     ;		(214)
+	const DEX_ELECTABUZZ ; 125	(215)
+	const DEX_ELECTIVIRE ;		(216)
+	const DEX_MAGMAR     ; 126	(217)
+	const DEX_MAGMORTAR  ;		(218)
+	const DEX_LAPRAS     ; 131	(219)
+	const DEX_DITTO      ; 132	(220)
+	const DEX_MIMMEO     ;		(221)
+	const DEX_PORYGON    ; 137	(222)
+	const DEX_PORYGON2   ;		(223)
+	const DEX_PORYGONZ   ;		(224)
+	const DEX_OMANYTE    ; 138	(225)
+	const DEX_OMASTAR    ; 139	(226)
+	const DEX_KABUTO     ; 140	(227)
+	const DEX_KABUTOPS   ; 141	(228)
+	const DEX_AERODACTYL ; 142	(229)
+	const DEX_DECILLA    ;		(230)
+	const DEX_GAWARHED   ;		(231)
+	const DEX_OMEGADGE   ;		(232)
+	const DEX_SNORLAX    ; 143	(233)
+ 	const DEX_SCREAM_TAIL ;		(234)	- Paradoxes, (Pseudo-)Legendary and Mythical Pokemon
+	const DEX_SANDY_SHOCKS ;	(235)
+	const DEX_SQUEAMATA  ;		(236)
+	const DEX_MINISTARE  ;		(237)
+	const DEX_IGUANARCH  ;		(238)
+	const DEX_DRATINI    ; 147	(239)
+	const DEX_DRAGONAIR  ; 148	(240)
+	const DEX_DRAGONITE  ; 149	(241)
+	const DEX_ARTICUNO   ; 144	(242)
+	const DEX_ARTICUNO_G ;		(243)
+	const DEX_ZAPDOS     ; 145	(244)
+	const DEX_ZAPDOS_G   ;		(245)
+	const DEX_MOLTRES    ; 146	(246)
+	const DEX_MOLTRES_G  ;		(247)
+	const DEX_MEWTWO     ; 150	(248)
+	const DEX_MEW        ; 151	(249)
+	const DEX_MELTAN     ;		(250)
+	const DEX_MELMETAL   ;		(251)
 
 DEF NUM_POKEMON EQU const_value - 1

constants/pokemon_constants.asm

@@ -257,9 +257,10 @@
 	const TAUROS_P           ; $F8
 	const TAUROS_PA          ; $F9
 	const TAUROS_PB          ; $FA
-	const FOSSIL_KABUTOPS    ; $FB	(was B6)
-	const FOSSIL_AERODACTYL  ; $FC	(was B7)
-	const MON_GHOST          ; $FD	(was B8)
+	const GORILLAIMO         ; $FB
+	const FOSSIL_KABUTOPS    ; $FC	(was B6)
+	const FOSSIL_AERODACTYL  ; $FD	(was B7)
+	const MON_GHOST          ; $FE	(was B8)
 	
 DEF NUM_POKEMON_INDEXES EQU const_value - 1
 

crysaudio/cry_headers.asm

@@ -138,8 +138,8 @@ PokemonCries::
 	mon_cry CRY_VOLTORB,     168,  272 ; ELECTRODE_H
 	mon_cry CRY_VENONAT,       0,  256 ; TENTACOOL
 	mon_cry CRY_VENONAT,     238,  383 ; TENTACRUEL
-	mon_cry CRY_NIDORAN_M,     0,    0 ; TOEDSCOOL	(incomplete)
-	mon_cry CRY_NIDORAN_M,     0,    0 ; TOEDSCRUEL	(incomplete)
+	mon_cry CRY_DIGLETT,     -22,  353 ; TOEDSCOOL
+	mon_cry CRY_SLOWKING,    -38,  704 ; TOEDSCRUEL
 	mon_cry CRY_BLASTOISE,   147,  128 ; BLOTTLE
 	mon_cry CRY_BLASTOISE,    60,  128 ; PENDRAKEN
 	mon_cry CRY_GOLEM,       147,  224 ; RIBBITO
@@ -213,6 +213,7 @@ PokemonCries::
 	mon_cry CRY_SQUIRTLE,     17,  192 ; TAUROS_PA
 	mon_cry CRY_PIDGEOTTO,    10,  320 ; CHANSEY
 	mon_cry CRY_SLOWKING,    659,  320 ; BLISSEY
+	mon_cry CRY_RHYDON,       17,  383 ; GORILLAIMO
 	mon_cry CRY_NIDORAN_M,   128,  144 ; CACTORMUS
 	mon_cry CRY_KRABBY,        8,  192 ; MR_MIME
 	mon_cry CRY_KRABBY,     -256,  232 ; MR_RIME
@@ -254,4 +255,4 @@ PokemonCries::
 	mon_cry CRY_PARAS,       153,  383 ; MEWTWO
 	mon_cry CRY_PARAS,       238,  383 ; MEW
 	mon_cry CRY_NATU,        -18,   89 ; MELTAN
-	mon_cry CRY_RHYDON,      240,  224 ; MELMETAL	(revise if possible)
+	mon_cry CRY_AMPHAROS,    158,  592 ; MELMETAL

data/pokemon/base_stats.asm

@@ -208,6 +208,7 @@ INCLUDE "data/pokemon/base_stats/taurospb.asm"
 INCLUDE "data/pokemon/base_stats/taurospa.asm"
 INCLUDE "data/pokemon/base_stats/chansey.asm"
 INCLUDE "data/pokemon/base_stats/blissey.asm"
+INCLUDE "data/pokemon/base_stats/gorillaimo.asm"
 INCLUDE "data/pokemon/base_stats/cactormus.asm"
 INCLUDE "data/pokemon/base_stats/mrmime.asm"
 INCLUDE "data/pokemon/base_stats/mrrime.asm"

data/pokemon/base_stats/gorillaimo.asm

@@ -0,0 +1,26 @@
+    db DEX_GORILLAIMO ; pokedex id
+
+    db 130, 100,  75,  65,  40
+    ;   hp  atk  def  spd  spc
+
+    db NORMAL, FIGHTING ; type
+    db 45 ; catch rate
+    db 204 ; base exp
+
+    INCBIN "gfx/pokemon/front/gorillaimo.pic", 0, 1 ; sprite dimensions
+    dw GorillaimoPicFront, GorillaimoPicBack
+
+    db COMET_PUNCH, GROWL, UPPERCUT, NO_MOVE ; level 1 learnset
+    db GROWTH_SLOW ; growth rate
+
+    ; tm/hm learnset
+    tmhm MEGA_PUNCH,   MEGA_KICK,    TOXIC,        BODY_SLAM,    TAKE_DOWN,    \
+         DOUBLE_EDGE,  BUBBLEBEAM,   WATER_GUN,    HYPER_BEAM,   SUBMISSION,   \
+         COUNTER,      SEISMIC_TOSS, RAGE,         THUNDERBOLT,  THUNDER,      \
+         EARTHQUAKE,   FISSURE,      DIG,          MIMIC,        DOUBLE_TEAM,  \
+         BIDE,         METRONOME,    SWIFT,        SKULL_BASH,   REST,         \
+         THUNDER_WAVE, ROCK_SLIDE,   SUBSTITUTE,   SURF,         STRENGTH
+    ; end
+
+    db BANK(GorillaimoPicFront)
+    assert BANK(GorillaimoPicFront) == BANK(GorillaimoPicBack)

data/pokemon/cries.asm

@@ -259,6 +259,7 @@ CryData::
 	mon_cry SFX_CRY_1D, $11, $40 ; Tauros-P
 	mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PA
 	mon_cry SFX_CRY_1D, $11, $40 ; Tauros-PB
+	mon_cry SFX_CRY_00, $00, $00 ; Gorillaimo
 	mon_cry SFX_CRY_18, $EE, $01 ; MissingNo. (Kabutops Fossil)
 	mon_cry SFX_CRY_23, $20, $F0 ; MissingNo. (Aerodactyl Fossil)
 	mon_cry SFX_CRY_06, $00, $00 ; MissingNo. (Ghost)

data/pokemon/dex_entries.asm

@@ -250,6 +250,7 @@ PokedexEntryPointers:
 	dw TaurosPDexEntry
 	dw TaurosPADexEntry
 	dw TaurosPBDexEntry
+	dw GorillaimoDexEntry
 	dw MissingNoDexEntry
 	dw MissingNoDexEntry
 	dw MissingNoDexEntry
@@ -2016,4 +2017,11 @@ MoltresGDexEntry:
 	dw 1460
 	text_far _MoltresGDexEntry
 	text_end
+	
+GorillaimoDexEntry:
+    db "GREAT APE@"
+	db 7,11
+	dw 4080
+	text_far _GorillaimoDexEntry
+	text_end
 	

data/pokemon/dex_order.asm

@@ -250,6 +250,7 @@ PokedexOrder:
 	db DEX_TAUROS_P
 	db DEX_TAUROS_PA
 	db DEX_TAUROS_PB
+	db DEX_GORILLAIMO
 	db 0 ; MISSINGNO.
 	db 0 ; MISSINGNO.
 	db 0 ; MISSINGNO.

data/pokemon/evos_moves.asm

@@ -262,6 +262,7 @@ EvosMovesPointerTable:
 	dw TaurosPEvosMoves
 	dw TaurosPAEvosMoves
 	dw TaurosPBEvosMoves
+	dw GorillaimoEvosMoves
 	dw FossilKabutopsEvosMoves
 	dw FossilAerodactylEvosMoves
 	dw MonGhostEvosMoves
@@ -384,11 +385,11 @@ IvysaurEvosMoves:
 	db 13, VINE_WHIP
 	db 22, POISONPOWDER
 	db 30, RAZOR_LEAF
-	db 30, TAKE_DOWN ; Prototype
-	db 38, GROWTH
-	db 46, SLEEP_POWDER
-	db 46, MEGA_DRAIN ; Prototype
-	db 54, SOLARBEAM
+	db 37, TAKE_DOWN ; Prototype
+	db 41, GROWTH
+	db 48, SLEEP_POWDER
+	db 55, MEGA_DRAIN ; Prototype
+	db 59, SOLARBEAM
 	db 0
 
 ExeggutorEvosMoves:
@@ -704,6 +705,7 @@ FearowEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
+	db 5, RAGE
 	db 9, LEER
 	db 15, FURY_ATTACK
 	db 25, MIRROR_MOVE
@@ -1705,9 +1707,9 @@ BeedrillEvosMoves:
 	db 25, RAGE
 	db 30, PIN_MISSILE
 	db 35, AGILITY
-	db 35, SWORDS_DANCE ; Prototype - reformed to be like Butterfree's powders
-	db 40, TAKE_DOWN ; Prototype
-	db 45, TOXIC ; Prototype
+	db 40, SWORDS_DANCE ; Prototype
+	db 45, TAKE_DOWN ; Prototype
+	db 50, TOXIC ; Prototype
 	db 0
 
 LuxwanEvosMoves:
@@ -2169,7 +2171,7 @@ BulbasaurEvosMoves:
 	db 34, TAKE_DOWN ; Prototype
 	db 41, GROWTH
 	db 48, SLEEP_POWDER
-	db 48, MEGA_DRAIN ; Prototype, learn together? May need restructuring.
+	db 51, MEGA_DRAIN ; Prototype
 	db 55, SOLARBEAM
 	db 0
 
@@ -2181,10 +2183,10 @@ VenusaurEvosMoves:
 	db 13, VINE_WHIP
 	db 22, POISONPOWDER
 	db 30, RAZOR_LEAF
-	db 30, TAKE_DOWN ; Prototype
-	db 43, GROWTH
+	db 41, TAKE_DOWN ; Prototype
+	db 47, GROWTH
 	db 55, SLEEP_POWDER
-	db 55, MEGA_DRAIN ; Prototype
+	db 60, MEGA_DRAIN ; Prototype
 	db 65, SOLARBEAM
 	db 0
 
@@ -2482,10 +2484,16 @@ SquirtleEvosMoves:
 ; Learnset
 	db 8, BUBBLE
 	db 15, WATER_GUN
-	db 22, BITE
-	db 28, WITHDRAW
+	db 18, BITE
+	db 21, WITHDRAW
+	db 25, BUBBLEBEAM
+	db 28, TAKE_DOWN
+	db 31, BODY_SLAM
 	db 35, SKULL_BASH
+	db 39, MEGA_PUNCH
 	db 42, HYDRO_PUMP
+	db 47, DOUBLE_EDGE
+	db 52, MEGA_KICK
 	db 0
 
 CharmeleonEvosMoves:
@@ -2508,10 +2516,16 @@ WartortleEvosMoves:
 ; Learnset
 	db 8, BUBBLE
 	db 15, WATER_GUN
-	db 24, BITE
-	db 31, WITHDRAW
+	db 20, BITE
+	db 23, WITHDRAW
+	db 28, BUBBLEBEAM
+	db 31, TAKE_DOWN
+	db 35, BODY_SLAM
 	db 39, SKULL_BASH
+	db 44, MEGA_PUNCH
 	db 47, HYDRO_PUMP
+	db 53, DOUBLE_EDGE
+	db 58, MEGA_KICK
 	db 0
 
 CharizardEvosMoves:
@@ -2532,13 +2546,20 @@ TotartleEvosMoves:
 ; Learnset
 	db 8, BUBBLE
 	db 15, WATER_GUN
-	db 24, BITE
-	db 31, WITHDRAW
+	db 20, BITE
+	db 23, WITHDRAW
+	db 28, BUBBLEBEAM
+	db 31, TAKE_DOWN
+	db 35, BODY_SLAM
+	db 39, LEER
 	db 42, SKULL_BASH
-	db 46, HYDRO_PUMP
-	db 50, COMET_PUNCH
-	db 54, LEER
-	db 60, PETAL_DANCE
+	db 47, MEGA_PUNCH
+	db 50, HYDRO_PUMP
+	db 53, COMET_PUNCH
+	db 56, DOUBLE_EDGE
+	db 62, MEGA_KICK
+	db 65, PETAL_DANCE
+	db 70, BLIZZARD
 	db 0
 	
 ArticunoGEvosMoves:
@@ -2974,6 +2995,9 @@ CarapthorEvosMoves:
 	db 25, SWIFT
 	db 30, MEGA_PUNCH
 	db 35, SUBSTITUTE
+	db 40, SEISMIC_TOSS
+	db 45, TAKE_DOWN
+	db 50, SUBMISSION
 	db 0
 	
 MagnezoneEvosMoves:
@@ -3395,6 +3419,19 @@ TaurosPBEvosMoves:
 	db 51, FIRE_SPIN
 	db 0
 	
+GorillaimoEvosMoves:
+; Evolutions
+	db 0
+; Learnset
+	db 7, ROAR
+	db 15, BITE
+	db 22, THUNDERPUNCH ; In King Kong vs. Godzilla (1962), King Kong has an affinity for using electricity. He's not only immune to electricity, but is also powered up by it, so Gorillaimo would be given Lightning Rod/Motor Drive as an ability if it were brought into a later generation.
+	db 29, SEISMIC_TOSS
+	db 35, BODY_SLAM
+	db 42, AMNESIA
+	db 49, SUBMISSION
+	db 0
+	
 FossilKabutopsEvosMoves:
 ; Evolutions
 	db 0

data/pokemon/menu_icons.asm

@@ -208,6 +208,7 @@ MonPartyData:
 	nybble ICON_QUADRUPED ; Tauros-PA
 	nybble ICON_FAIRY     ; Chansey
 	nybble ICON_FAIRY     ; Blissey
+	nybble ICON_MON       ; Gorillaimo
 	nybble ICON_GRASS	  ; Cactormus
 	nybble ICON_MON       ; Mr.Mime
 	nybble ICON_MON       ; Mr.Rime

data/pokemon/names.asm

@@ -250,6 +250,7 @@ MonsterNames::
 	db "TAUROS@@@@" ; Paldean, Combat
 	db "TAUROS@@@@" ; Paldean, Aqua
 	db "TAUROS@@@@" ; Paldean, Blaze
+	db "GORILLAIMO"
 	db "MISSINGNO."
 	db "MISSINGNO."
 	db "MISSINGNO."

data/pokemon/new_dex_text.asm

@@ -987,6 +987,16 @@ _TaurosPADexEntry::
 	next "of water from the"
 	next "tips of its horns"
 	dex
+	
+_GorillaimoDexEntry::
+	text "Intelligent enough"
+	next "to craft items of"
+	next "clothing. Ancient"
+	
+	page "scripture shows a"
+	next "giant GORILLAIMO"
+	next "battling GAWARHED"
+	dex
 
 _MissingNoDexEntry::	; unused
 	text "This is a newly"

data/pokemon/palettes.asm

@@ -209,6 +209,7 @@ MonsterPalettes:
 	db PAL_CYANMON   ; TAUROS_PA
 	db PAL_PINKMON   ; CHANSEY
 	db PAL_PINKMON   ; BLISSEY
+	db PAL_BROWNMON  ; GORILLAIMO
 	db PAL_GREENMON  ; CACTORMUS
 	db PAL_PINKMON   ; MR_MIME
 	db PAL_CYANMON   ; MR_RIME

data/pokemon/tradeback_moves.asm

@@ -255,6 +255,7 @@ TradebackMovesPointerTable:
 	dw TaurosPTradebackMoves
 	dw TaurosPATradebackMoves
 	dw TaurosPBTradebackMoves
+	dw GorillaimoTradebackMoves
 	dw FossilKabutopsTradebackMoves
 	dw FossilAerodactylTradebackMoves
 	dw MonGhostTradebackMoves
@@ -2218,6 +2219,13 @@ TaurosPBTradebackMoves:
 	db 1, QUICK_ATTACK
 	db 0
 
+GorillaimoTradebackMoves:
+    db 1, HEADBUTT,
+    db 1, DEFENSE_CURL
+    db 1, KARATE_CHOP
+    db 1, FOCUS_ENERGY
+    db 0
+
 FossilKabutopsTradebackMoves:
 	db 0
 

data/trainers/parties.asm

@@ -411,7 +411,7 @@ CueBallData:
 ; Route 21
 	db 31, TENTACOOL, TENTACOOL, TENTACRUEL, 0
 ; Silph Gauntlet 5F (Safari Zone)
-	db 60, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, TENTACRUEL, 0
+	db 60, ANNIHILAPE, RATICATE_A, CROAKOZUNA, PERSIAN_A, MACHAMP, GORILLAIMO, 0
 
 ; Big variety, kind of aimless; seems to be a counterparts thing.
 GamblerData:

data/trainers/scaled_parties.asm

@@ -92,9 +92,9 @@ LoreleiData:
 	db $FF, 63, DEWGONG, 64, CLOYSTER, 63, NINETALES_A, 64, JYNX, 64, GLACEON, 66, LAPRAS, 0
 
 BrunoData:
-	db $FF, 53, JABETTA, 52, STEELIX, 52, TRICULES, 54, HITMONCHAN, 56, HITMONLEE, 56, MACHAMP, 0
+	db $FF, 53, JABETTA, 52, STEELIX, 52, GORILLAIMO, 54, HITMONCHAN, 56, HITMONLEE, 56, MACHAMP, 0
 ; post-game rematch team (currently unused)
-	db $FF, 65, JABETTA, 66, STEELIX, 65, SIRFETCHD, 66, TRICULES, 66, HITMONTOP, 68, MACHAMP, 0
+	db $FF, 65, JABETTA, 66, STEELIX, 65, SIRFETCHD, 66, GORILLAIMO, 66, HITMONTOP, 68, MACHAMP, 0
 
 AgathaData:
 	db $FF, 55, ANNIHILAPE, 54, CROBAT, 54, GENGAR, 56, ARBOK, 56, UMBREON, 58, GENGAR, 0		; Agatha has double Gengars in every single battle in the main-series, it's fine here...
@@ -134,7 +134,7 @@ BlackbeltData:
 ; Fighting Dojo Trainers
 	db 31, CHEEP, CHEEP, JABETTA, 0
 	db 32, MACHOKE, MACHAMP, 0
-	db 36, SIRFETCHD, 0
+	db 35, GORILLAIMO, 0
 	db 31, MACHOP, MANKEY, PRIMEAPE, 0
 ; Viridian Gym	- changed to fit the Ground-type gym theme
 	db 40, SANDSLASH, GOLEM, 0

data/trainers/special_moves.asm

@@ -887,8 +887,8 @@ SpecialTrainerMoves:
 	db 2, 3, ICE_BEAM
 	db 3, 1, BLIZZARD
 	db 3, 2, PSYCHIC_M
-	db 3, 1, BODY_SLAM
-	db 3, 2, MIST
+	db 3, 3, BODY_SLAM
+	db 3, 4, MIST
 	db 4, 1, LOVELY_KISS 
 	db 4, 3, PSYCHIC_M
 	db 4, 4, COUNTER 

data/wild/maps/BrunswickGrotto.asm

@@ -7,7 +7,7 @@ BrunswickGrottoWildMons:
 	db 51, VENOMOTH
 	db 53, PARASECT
 	db 53, PARASECT
-	db 53, CACTORMUS
+	db 53, GORILLAIMO
 	db 54, SCYTHER
 	db 54, PINSIR
 	db 55, PINSIR

data/wild/maps/Route15.asm

@@ -9,7 +9,7 @@ Route15WildMons:
 	db 26, GAOTORA
 	db 30, VENOMOTH
 	db 28, TANGELA
-	db 30, TANGELA
+	db 28, GORILLAIMO
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SafariZoneCenter.asm

@@ -7,7 +7,7 @@ SafariZoneCenterWildMons:
 	db 24, CUBONE
 	db 25, SLOWPOKE
 	db 21, LICKITUNG
-	db 23, RAMOOSE
+	db 23, GORILLAIMO
 	db 23, CHANSEY
 	db 23, TRAMPEL
 	end_grass_wildmons

engine/events/pokedex_rating.asm

@@ -70,7 +70,7 @@ DexRatingsTable:
 	dbw 200, DexRatingText_Own180To199
 	dbw 215, DexRatingText_Own200To214
 	dbw 230, DexRatingText_Own215To229
-	dbw 250, DexRatingText_Own230To249
+	dbw 251, DexRatingText_Own230To249
 	dbw NUM_POKEMON + 1, DexRatingText_OwnComplete
 
 DexRatingText_Own0To14:

engine/menus/pokedex.asm

@@ -202,7 +202,7 @@ HandlePokedexListMenu:
 	ld de, PokedexMenuItemsText
 	call PlaceString
 ; find the highest pokedex number among the pokemon the player has seen
-	ld b, 251 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly.
+	ld b, 252 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly.
 .maxSeenPokemonLoop
 	ld a, [hld]
 	ld c, 8

gfx/pics.asm

@@ -584,6 +584,8 @@ BittybatPicFront::     INCBIN "gfx/pokemon/front/bittybat.pic"
 BittybatPicBack::      INCBIN "gfx/pokemon/back/bittybatb.pic"
 SirfetchdPicFront::    INCBIN "gfx/pokemon/front/sirfetchd.pic"
 SirfetchdPicBack::     INCBIN "gfx/pokemon/back/sirfetchdb.pic"
+GorillaimoPicFront::   INCBIN "gfx/pokemon/front/gorillaimo.pic"
+GorillaimoPicBack::    INCBIN "gfx/pokemon/back/gorillaimob.pic"
 
 LancePic::         INCBIN "gfx/trainers/lance.pic"
 YujirouPic::	    INCBIN "gfx/trainers/yujirou.pic"