Fairy Moves and Correcting an Oops

- Properly integrates all of the new moves that were left as comments or had placeholder levels in the move lists!
- Fixes the levels and Pokemon available on Route 36, as I may or may not have completely forgotten that the Crystal map layout is different than the HGSS one. lol.
- Adds animations for Fairy Wind and Draining Kiss made by SourApple for the Sour Crystal hack!
- In addition, adds several palettes from Sour Crystal that may be usable later if anyone wants to delve into them.

constants/battle_anim_constants.asm

@@ -219,6 +219,7 @@ DEF BATTLEANIM_BASE_TILE EQU 7 * 7  ; Maximum size of a pokemon picture
 	const ANIM_OBJ_ENEMYFEET_2ROW
 	const ANIM_OBJ_PLAYERHEAD_2ROW
 	const ANIM_OBJ_COIN_HURL
+	const ANIM_OBJ_SHOOTING_MIST
 DEF NUM_ANIM_OBJS EQU const_value
 
 ; DoBattleAnimFrame arguments (see engine/battle_anims/functions.asm)
@@ -493,6 +494,7 @@ DEF NUM_BATTLEANIMFUNCS EQU const_value
 	const BATTLEANIMFRAMESET_B6
 	const BATTLEANIMFRAMESET_B7
 	const BATTLEANIMFRAMESET_B8
+	const BATTLEANIMFRAMESET_MIST
 DEF NUM_BATTLEANIMFRAMESETS EQU const_value
 
 ; BattleAnimOAMData indexes (see data/battle_anims/oam.asm)
@@ -853,3 +855,67 @@ DEF NUM_BG_EFFECTS EQU 5 ; see wActiveBGEffects
 	const PAL_BATTLE_OB_GREEN  ; 5
 	const PAL_BATTLE_OB_BLUE   ; 6
 	const PAL_BATTLE_OB_BROWN  ; 7
+
+; custom palettes (from Sour Crystal)
+	const_def
+	const PAL_BTLCUSTOM_GRAY             ; 0
+	const PAL_BTLCUSTOM_YELLOW           ; 1
+	const PAL_BTLCUSTOM_RED              ; 2
+	const PAL_BTLCUSTOM_GREEN            ; 3
+	const PAL_BTLCUSTOM_BLUE             ; 4
+	const PAL_BTLCUSTOM_BROWN            ; 5
+	const PAL_BTLCUSTOM_PURPLE           ; 6
+	const PAL_BTLCUSTOM_ICE              ; 7
+	const PAL_BTLCUSTOM_FIRE             ; 8
+	const PAL_BTLCUSTOM_GLOBE            ; 9
+	const PAL_BTLCUSTOM_WATER            ; a
+	const PAL_BTLCUSTOM_BUBBLE           ; b
+	const PAL_BTLCUSTOM_DRAGONBREATH     ; c
+	const PAL_BTLCUSTOM_DRAGON_RAGE      ; d
+	const PAL_BTLCUSTOM_AURORA           ; e
+	const PAL_BTLCUSTOM_SPORE            ; f
+	const PAL_BTLCUSTOM_PEACH            ; 10
+	const PAL_BTLCUSTOM_LIGHT_SCREEN     ; 11
+	const PAL_BTLCUSTOM_MIRROR_COAT      ; 12
+	const PAL_BTLCUSTOM_RECYCLE          ; 13
+	const PAL_BTLCUSTOM_LAVA_ROCKS       ; 14
+	const PAL_BTLCUSTOM_SKILL_SWAP       ; 15
+	const PAL_BTLCUSTOM_WILL_O_WISP      ; 16
+	const PAL_BTLCUSTOM_GLOW_YELLOW      ; 17
+	const PAL_BTLCUSTOM_GLOW_LUSTER      ; 18
+	const PAL_BTLCUSTOM_BRIGHT           ; 19
+	const PAL_BTLCUSTOM_VERY_BRIGHT      ; 1a
+	const PAL_BTLCUSTOM_CHARRED          ; 1b
+	const PAL_BTLCUSTOM_COSMIC           ; 1c
+	const PAL_BTLCUSTOM_SIGNAL_BEAM_RED  ; 1d
+	const PAL_BTLCUSTOM_SIGNAL_BEAM_BLUE ; 1e
+	const PAL_BTLCUSTOM_BULK_UP          ; 1f
+	const PAL_BTLCUSTOM_GRASSWHISTLE     ; 20
+	const PAL_BTLCUSTOM_PSYCHO_BOOST_1   ; 21
+	const PAL_BTLCUSTOM_PSYCHO_BOOST_2   ; 22
+	const PAL_BTLCUSTOM_GRAVITY          ; 23
+	const PAL_BTLCUSTOM_GLOW_GREEN       ; 24
+	const PAL_BTLCUSTOM_HEAT_WAVE        ; 25
+	const PAL_BTLCUSTOM_PAYBACK          ; 26
+	const PAL_BTLCUSTOM_GASTRO_ACID      ; 27
+	const PAL_BTLCUSTOM_DARK_PULSE       ; 28
+	const PAL_BTLCUSTOM_GLOW_LIME        ; 29
+	const PAL_BTLCUSTOM_DRAGON_PULSE     ; 2a
+	const PAL_BTLCUSTOM_SNOW             ; 2b
+	const PAL_BTLCUSTOM_LAVA_PLUME       ; 2c
+	const PAL_BTLCUSTOM_INVERT_BLACK     ; 2d
+	const PAL_BTLCUSTOM_LIME             ; 2e
+	const PAL_BTLCUSTOM_BEE              ; 2f
+	const PAL_BTLCUSTOM_ROAR_OF_TIME     ; 30
+	const PAL_BTLCUSTOM_MOON             ; 31
+	const PAL_BTLCUSTOM_DARK_VOID        ; 32
+	const PAL_BTLCUSTOM_REFRESH          ; 33
+	const PAL_BTLCUSTOM_HEAT_BG          ; 34
+	const PAL_BTLCUSTOM_GOLD_BG          ; 35
+	const PAL_BTLCUSTOM_STRUGGLE_BUG     ; 36
+	const PAL_BTLCUSTOM_PINK             ; 37
+DEF NUM_CUSTOM_BATTLE_PALETTES EQU const_value
+
+DEF PAL_BTLCUSTOM_DEFAULT EQU -1
+
+	

data/battle_anims/framesets.asm

@@ -186,6 +186,7 @@ BattleAnimFrameData:
 	dw .Frameset_b6 ; BATTLEANIMFRAMESET_B6
 	dw .Frameset_b7 ; BATTLEANIMFRAMESET_B7
 	dw .Frameset_b8 ; BATTLEANIMFRAMESET_B8
+	dw .Frameset_Mist ; BATTLEANIMFRAMESET_MIST
 	assert_table_length NUM_BATTLEANIMFRAMESETS
 
 .Frameset_00:
@@ -1268,3 +1269,8 @@ BattleAnimFrameData:
 .Frameset_b8:
 	oamframe BATTLEANIMOAMSET_D7,  8
 	oamend
+
+.Frameset_Mist:
+	oamframe BATTLEANIMOAMSET_91, 16
+	oamframe BATTLEANIMOAMSET_92, 16
+	oamend

data/battle_anims/objects.asm

@@ -397,4 +397,6 @@ BattleAnimObjects:
 	battleanimobj ABSOLUTE_X, $00, BATTLEANIMFRAMESET_B8, BATTLEANIMFUNC_NULL, PAL_BATTLE_OB_PLAYER, ANIM_GFX_ENEMYFEET
 ; ANIM_OBJ_COIN_HURL - just the Poke Ball toss but with Pay Day's gfx chucked in
 	battleanimobj ABSOLUTE_X, $ff, BATTLEANIMFRAMESET_75, BATTLEANIMFUNC_COINHURL, PAL_BATTLE_OB_BROWN, ANIM_GFX_STATUS
+; ANIM_OBJ_SHOOTING_MIST
+	battleanimobj RELATIVE_X | X_FLIP, $90, BATTLEANIMFRAMESET_MIST, BATTLEANIMFUNC_USER_TO_TARGET_DISAPPEAR, PAL_BATTLE_OB_GRAY, ANIM_GFX_HAZE
 	assert_table_length NUM_ANIM_OBJS

data/moves/animations.asm

@@ -295,8 +295,8 @@ BattleAnimations::
 	dw BattleAnim_Wind_Ride ; Wind Ride but real
 	dw BattleAnim_Flash ; Dazzling Gleam
 	dw BattleAnim_Sing ; Disarming Voice
-	dw BattleAnim_SweetKiss ; Draining Kiss
+	dw BattleAnim_DrainingKiss ; From Sour Crystal
-	dw BattleAnim_SweetScent ; Fairy Wind
+	dw BattleAnim_FairyWind ; From Sour Crystal
 	dw BattleAnim_Psywave ; Moonblast
 	dw BattleAnim_Rollout ; Play Rough
 	dw BattleAnim_ConfuseRay ; Strange Steam
@@ -4964,6 +4964,58 @@ BattleAnim_CoinHurl:
 	anim_wait 64
 	anim_ret
 	
+BattleAnim_FairyWind: ; from Sour Crystal
+	anim_2gfx ANIM_GFX_SPEED, ANIM_GFX_HAZE
+	anim_bgeffect ANIM_BG_CYCLE_OBPALS_GRAY_AND_YELLOW, $0, $2, $0
+	anim_sound 0, 1, SFX_GAME_FREAK_LOGO_GS
+.loop
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 80, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 88, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 96, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 80, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_MIST, 64, 88, $4
+	anim_wait 4
+	anim_obj ANIM_OBJ_SHOOTING_SPARKLE, 64, 96, $4
+	anim_wait 4
+	anim_loop 2, .loop
+	anim_bgeffect ANIM_BG_FADE_MON_TO_BLACK_REPEATING, $0, $0, $40
+	anim_wait 64
+	anim_ret
+	
+BattleAnim_DrainingKiss: ; from Sour Crystal
+	anim_3gfx ANIM_GFX_OBJECTS, ANIM_GFX_CHARGE, ANIM_GFX_SHINE
+	anim_sound 0, 1, SFX_SWEET_KISS
+	anim_obj ANIM_OBJ_HEART, 120, 40, $0
+	anim_wait 8
+.loop
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 128, 48, $2
+	anim_wait 5
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 136, 64, $3
+	anim_wait 5
+	anim_sound 0, 1, SFX_SWEET_KISS_2
+	anim_obj ANIM_OBJ_ABSORB, 136, 32, $4
+	anim_wait 5
+	anim_loop 5, .loop
+	anim_wait 32
+	anim_bgeffect ANIM_BG_CYCLE_MID_OBPALS_GRAY_AND_YELLOW, $0, $0, $0
+	anim_jump BattleAnim_Glimmer_branch3
+	
+BattleAnim_Glimmer_branch3:
+	anim_sound 0, 0, SFX_METRONOME
+	anim_obj ANIM_OBJ_GLIMMER, 44, 64, $0
+	anim_wait 5
+	anim_obj ANIM_OBJ_GLIMMER, 24, 96, $0
+	anim_wait 5
+	anim_obj ANIM_OBJ_GLIMMER, 56, 104, $0
+	anim_wait 21
+	anim_ret
+
 BattleAnim_TargetObj_1Row:
 	anim_battlergfx_2row
 	anim_bgeffect ANIM_BG_BATTLEROBJ_1ROW, $0, BG_EFFECT_TARGET, $0

data/pokemon/evos_attacks_johto.asm

@@ -509,7 +509,7 @@ NoctowlEvosAttacks:
 	dbw 46, REFLECT
 	dbw 52, MOONLIGHT ; SW97
 	dbw 58, DREAM_EATER
-	dbw 60, MOONBLAST ; SM
+	dbw 66, MOONBLAST ; SM
 	db 0 ; no more level-up moves
 
 LedybaEvosAttacks:
@@ -710,9 +710,9 @@ TogepiEvosAttacks:
 	dbw 7, METRONOME
 	dbw 13, SWEET_KISS
 	dbw 19, ENCORE
-	dbw 19, FAIRY_WIND ; XY
+	dbw 23, FAIRY_WIND ; XY
-	dbw 25, SPIKE_CANNON ; SW97
+	dbw 28, SPIKE_CANNON ; SW97
-	dbw 31, ANCIENTPOWER ; FRLG
+	dbw 32, ANCIENTPOWER ; FRLG
 	dbw 37, SAFEGUARD
 	dbw 43, PROTECT ; SW97
 	dbw 49, SKULL_BASH ; SW97
@@ -730,9 +730,9 @@ TogeticEvosAttacks:
 	dbw 7, METRONOME
 	dbw 13, SWEET_KISS
 	dbw 19, ENCORE
-	dbw 19, FAIRY_WIND ; XY
+	dbw 23, FAIRY_WIND ; XY
-	dbw 25, SPIKE_CANNON ; SW97
+	dbw 28, SPIKE_CANNON ; SW97
-	dbw 31, ANCIENTPOWER ; FRLG
+	dbw 32, ANCIENTPOWER ; FRLG
 	dbw 37, SAFEGUARD
 	dbw 43, PROTECT ; SW97
 	dbw 49, SKULL_BASH ; SW97
@@ -760,7 +760,7 @@ NatuEvosAttacks:
 	dbw 15, MEAN_LOOK ; SW97
 	dbw 20, TELEPORT
 	dbw 25, PSYBEAM ; SW97
-	; dbw 30, SYNCHRONIZE
+	dbw 30, SYNCHRONIZE
 	dbw 35, PURSUIT ; SW97
 	dbw 40, CONFUSE_RAY
 	dbw 45, SPITE ; SW97
@@ -778,7 +778,7 @@ QatuEvosAttacks:
 	dbw 20, TELEPORT
 	dbw 20, FUTURE_SIGHT
 	dbw 27, PSYBEAM ; SW97
-	; dbw 32, SYNCHRONIZE
+	dbw 32, SYNCHRONIZE
 	dbw 39, PURSUIT ; SW97
 	dbw 44, CONFUSE_RAY
 	dbw 51, SPITE ; SW97
@@ -795,7 +795,7 @@ XatuEvosAttacks:
 	dbw 20, TELEPORT
 	dbw 20, FUTURE_SIGHT
 	dbw 27, PSYBEAM ; SW97
-	; dbw 32, SYNCHRONIZE
+	dbw 32, SYNCHRONIZE
 	dbw 39, PURSUIT ; SW97
 	dbw 44, CONFUSE_RAY
 	dbw 51, SPITE ; SW97
@@ -816,7 +816,7 @@ MoibelleEvoAttacks:
 	dbw 35, FURY_SWIPES
 	dbw 40, ATTRACT
 	dbw 46, THIEF
-	;dbw 52, COIN_HURL
+	dbw 52, COIN_HURL
 	db 0 ; no more level-up moves
 
 BelledamEvoAttacks:
@@ -832,7 +832,7 @@ BelledamEvoAttacks:
 	dbw 39, FURY_SWIPES
 	dbw 44, ATTRACT
 	dbw 52, THIEF
-	;dbw 58, COIN_HURL
+	dbw 58, COIN_HURL
 	db 0 ; no more level-up moves
 
 MareepEvosAttacks:
@@ -846,8 +846,8 @@ MareepEvosAttacks:
 	dbw 22, COTTON_SPORE
 	dbw 28, SWIFT ; SW97
 	dbw 34, LIGHT_SCREEN
-	dbw 34, DAZZLING_GLEAM ; SV
+	dbw 38, DAZZLING_GLEAM ; SV
-	dbw 40, THUNDERBOLT ; SW97
+	dbw 42, THUNDERBOLT ; SW97
 	dbw 46, HYPNOSIS ; SW97
 	dbw 52, THUNDER
 	db 0 ; no more level-up moves
@@ -863,9 +863,9 @@ FlaaffyEvosAttacks:
 	dbw 24, COTTON_SPORE
 	dbw 30, SWIFT ; SW97
 	dbw 38, LIGHT_SCREEN
-	dbw 34, DAZZLING_GLEAM ; SV
+	dbw 42, DAZZLING_GLEAM ; SV
-	dbw 44, THUNDERBOLT ; SW97
+	dbw 46, THUNDERBOLT ; SW97
-	dbw 50, HYPNOSIS ; SW97
+	dbw 52, HYPNOSIS ; SW97
 	dbw 58, THUNDER
 	db 0 ; no more level-up moves
 
@@ -879,9 +879,9 @@ AmpharosEvosAttacks:
 	dbw 24, COTTON_SPORE
 	dbw 30, SWIFT ; SW97
 	dbw 40, LIGHT_SCREEN
-	dbw 34, DAZZLING_GLEAM ; SV
+	dbw 44, DAZZLING_GLEAM ; SV
-	dbw 46, THUNDERBOLT ; SW97
+	dbw 48, THUNDERBOLT ; SW97
-	dbw 54, HYPNOSIS ; SW97
+	dbw 58, HYPNOSIS ; SW97
 	dbw 62, THUNDER
 	db 0 ; no more level-up moves
 
@@ -918,7 +918,8 @@ MarillEvosAttacks:
 	dbw 30, BUBBLEBEAM
 	dbw 36, DOUBLE_EDGE
 	dbw 42, RAIN_DANCE
-	dbw 48, HYDRO_PUMP ; FRLG
+	dbw 48, PLAY_ROUGH ; XY
+	dbw 54, HYDRO_PUMP ; FRLG
 	db 0 ; no more level-up moves
 
 AzumarillEvosAttacks:
@@ -929,10 +930,11 @@ AzumarillEvosAttacks:
 	dbw 13, WATER_GUN
 	dbw 21, ROLLOUT
 	dbw 27, SLAM ; from Azurill
-	dbw 34, BUBBLEBEAM
+	dbw 32, BUBBLEBEAM
 	dbw 40, DOUBLE_EDGE
-	dbw 48, RAIN_DANCE
+	dbw 46, RAIN_DANCE
-	dbw 54, HYDRO_PUMP ; FRLG
+	dbw 52, PLAY_ROUGH ; XY
+	dbw 60, HYDRO_PUMP ; FRLG
 	db 0 ; no more level-up moves
 
 BonslyEvosAttacks:
@@ -982,7 +984,7 @@ HoppipEvosAttacks:
 	dbw 5, TAIL_WHIP
 	dbw 8, ABSORB ; SW97
 	dbw 12, TACKLE
-	dbw 12, FAIRY_WIND ; XY
+	dbw 14, FAIRY_WIND ; XY
 	dbw 16, POISONPOWDER
 	dbw 17, STUN_SPORE
 	dbw 18, SLEEP_POWDER
@@ -1002,6 +1004,7 @@ SkiploomEvosAttacks:
 	dbw 5, TAIL_WHIP
 	dbw 8, ABSORB ; SW97
 	dbw 12, TACKLE
+	dbw 14, FAIRY_WIND ; XY
 	dbw 16, POISONPOWDER
 	dbw 17, STUN_SPORE
 	dbw 18, SLEEP_POWDER
@@ -1020,6 +1023,7 @@ JumpluffEvosAttacks:
 	dbw 5, TAIL_WHIP
 	dbw 8, ABSORB ; SW97
 	dbw 12, TACKLE
+	dbw 14, FAIRY_WIND ; XY
 	dbw 16, POISONPOWDER
 	dbw 17, STUN_SPORE
 	dbw 18, SLEEP_POWDER
@@ -1328,9 +1332,8 @@ SylveonEvosAttacks:
 	dbw 30, DRAINING_KISS
 	dbw 36, DAZZLING_GLEAM
 	dbw 42, SWIFT
-	dbw 47, PSYCH_UP ; XY
+	dbw 47, MOONBLAST ; XY
 	dbw 52, LIGHT_SCREEN
-	dbw 60, MOONBLAST ; ? feels wrong
 	db 0 ; no more level-up moves
 
 MurkrowEvosAttacks:
@@ -1427,10 +1430,10 @@ PhandarinEvosAttacks:
 	dbw 14, SPLASH
 	dbw 19, SPITE
 	dbw 25, CONFUSION
-	dbw 30, POUND ; DRAINING_KISS
+	dbw 30, DRAINING_KISS
 	dbw 36, NIGHT_SHADE
 	dbw 40, SUBSTITUTE
-	dbw 44, POUND ; DAZZLING_GLEAM
+	dbw 44, MOONBLAST
 	dbw 50, PSYCHIC_M
 	dbw 54, PAIN_SPLIT
 	dbw 60, SHADOW_BALL
@@ -1642,10 +1645,11 @@ SnubbullEvosAttacks:
 	dbw 26, SWEET_KISS ; SW97
 	dbw 30, ROAR
 	dbw 34, RAGE
-	dbw 40, TAKE_DOWN
+	dbw 38, TAKE_DOWN
-	dbw 44, THRASH ; 99 proto
+	dbw 43, PLAY_ROUGH ; XY
-	dbw 49, CRUNCH ; FRLG
+	dbw 48, THRASH ; 99 proto
-	dbw 54, DOUBLE_EDGE ; SW97
+	dbw 52, CRUNCH ; FRLG
+	dbw 57, DOUBLE_EDGE ; SW97
 	db 0 ; no more level-up moves
 
 GranbullEvosAttacks:
@@ -1660,10 +1664,11 @@ GranbullEvosAttacks:
 	dbw 28, SWEET_KISS ; SW97
 	dbw 32, ROAR
 	dbw 36, RAGE
-	dbw 44, TAKE_DOWN
+	dbw 42, TAKE_DOWN
-	dbw 48, THRASH ; 99 proto
+	dbw 47, PLAY_ROUGH ; XY
-	dbw 53, CRUNCH ; FRLG
+	dbw 52, THRASH ; 99 proto
-	dbw 60, DOUBLE_EDGE ; SW97
+	dbw 58, CRUNCH ; FRLG
+	dbw 63, DOUBLE_EDGE ; SW97
 	db 0 ; no more level-up moves
 	
 CaretorkerEvosAttacks:
@@ -1679,7 +1684,7 @@ CaretorkerEvosAttacks:
 	dbw 41, PROTECT
 	dbw 47, DAZZLING_GLEAM
 	dbw 53, SOFTBOILED
-	dbw 53, MOONBLAST ; Yoshi's Island opening reference!
+	dbw 59, MOONBLAST ; Yoshi's Island opening reference!
 	db 0 ; no more level-up moves
 
 QwilfishEvosAttacks:
@@ -1819,7 +1824,8 @@ TeddiursaEvosAttacks:
 	dbw 31, SLASH
 	dbw 37, MOONLIGHT ; from BM Ursaluna
 	dbw 43, SNORE
-	dbw 48, THRASH
+	dbw 47, THRASH
+	dbw 51, PLAY_ROUGH ; PLA
 	dbw 54, DOUBLE_EDGE ; PLA
 	db 0 ; no more level-up moves
 
@@ -1835,8 +1841,9 @@ UrsaringEvosAttacks:
 	dbw 33, SLASH
 	dbw 39, MOONLIGHT ; from BM Ursaluna
 	dbw 45, SNORE
-	dbw 52, THRASH
+	dbw 51, THRASH
-	dbw 58, DOUBLE_EDGE ; PLA
+	dbw 55, PLAY_ROUGH ; PLA
+	dbw 60, DOUBLE_EDGE ; PLA
 	db 0 ; no more level-up moves
 	
 UrsalunaEvosAttacks:
@@ -1850,9 +1857,10 @@ UrsalunaEvosAttacks:
 	dbw 33, SLASH
 	dbw 39, MOONLIGHT ; from BM Ursaluna
 	dbw 45, SNORE
-	dbw 52, THRASH
+	dbw 51, THRASH
-	dbw 58, DOUBLE_EDGE
+	dbw 55, PLAY_ROUGH
-	dbw 64, EARTHQUAKE
+	dbw 60, DOUBLE_EDGE
+	dbw 65, EARTHQUAKE
 	db 0 ; no more level-up moves
 
 SlugmaEvosAttacks:
@@ -2382,6 +2390,7 @@ MiltankEvosAttacks:
 	dbw 45, BODY_SLAM
 	dbw 51, HEAL_BELL
 	dbw 57, TAKE_DOWN ; SW97
+	dbw 61, PLAY_ROUGH ; Later gen level-up
 	db 0 ; no more level-up moves
 
 BlisseyEvosAttacks:
@@ -2479,7 +2488,7 @@ SakurazeEvosAttacks:
 
 TanobiEvosAttacks:
 	db 0 ; no more evolutions
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 1, LEER
 	dbw 7, QUICK_ATTACK
 	dbw 12, ROLLING_KICK
@@ -2542,7 +2551,7 @@ MolambinoEvosAttacks:
 	dbbw EVOLVE_LEVEL, 20, LUANBO
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	; dbw 7, DRAINING_KISS ; move not yet implemented
+	dbw 7, DRAINING_KISS
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 24, MORNING_SUN
@@ -2550,14 +2559,14 @@ MolambinoEvosAttacks:
 	dbw 35, DOUBLE_TEAM
 	dbw 41, THRASH
 	dbw 47, HYDRO_PUMP
-	; dbw 53, DAZZLING_GLEAM ; move not yet implemented
+	dbw 53, DAZZLING_GLEAM
 	db 0 ; no more level-up moves
 
 LuanboEvosAttacks:
 	dbbw EVOLVE_LEVEL, 35, GRANBO
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	; dbw 7, DRAINING_KISS ; move not yet implemented
+	dbw 7, DRAINING_KISS
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 26, MORNING_SUN
@@ -2565,14 +2574,14 @@ LuanboEvosAttacks:
 	dbw 37, DOUBLE_TEAM
 	dbw 45, THRASH
 	dbw 51, HYDRO_PUMP
-	; dbw 57, DAZZLING_GLEAM ; move not yet implemented
+	dbw 57, DAZZLING_GLEAM
 	db 0 ; no more level-up moves
 
 GranboEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, BUBBLE
 	dbw 1, SUPERSONIC
-	; dbw 7, DRAINING_KISS ; move not yet implemented
+	dbw 7, DRAINING_KISS
 	dbw 13, FLAIL
 	dbw 19, WATER_GUN
 	dbw 26, MORNING_SUN
@@ -2580,7 +2589,7 @@ GranboEvosAttacks:
 	dbw 39, DOUBLE_TEAM
 	dbw 47, THRASH
 	dbw 55, HYDRO_PUMP
-	; dbw 61, DAZZLING_GLEAM ; move not yet implemented
+	dbw 61, DAZZLING_GLEAM
 	db 0 ; no more level-up moves
 
 AngoreEvosAttacks:
@@ -2705,6 +2714,7 @@ MimearEvosAttacks:
 	dbw 43, MIRROR_COAT
 	dbw 49, SAFEGUARD
 	dbw 55, DAZZLING_GLEAM
+	dbw 60, MOONBLAST
 	db 0 ; no more level-up moves
 
 InoshikaEvosAttacks:
@@ -2799,10 +2809,10 @@ ScreamTailEvosAttacks:
 	dbw 21, BITE
 	dbw 28, BODY_SLAM
 	dbw 35, REST
-	; dbw 42, DRAINING_KISS ; move not yet implemented
+	dbw 42, PLAY_ROUGH
 	dbw 49, PSYCHIC_M
 	dbw 56, CRUNCH
-	; dbw 63, DAZZLING_GLEAM ; move not yet implemented
+	dbw 63, DAZZLING_GLEAM
 	dbw 70, PERISH_SONG
 	db 0 ; no more level-up moves
 
@@ -3096,12 +3106,12 @@ HyoshuYangEvosAttacks:
 	dbw 8, WHIRLWIND
 	dbw 16, POWDER_SNOW
 	dbw 24, SAFEGUARD
-	dbw 32, RECOVER ; Fairy Wind
+	dbw 32, FAIRY_WIND
 	dbw 40, RECOVER
 	dbw 48, MIST
 	dbw 54, ICE_BEAM
 	dbw 60, MYSTIC_ICE ; Signature move
-	dbw 68, RECOVER ; Dazzling Gleam
+	dbw 68, DAZZLING_GLEAM
 	dbw 74, SWIFT
 	dbw 80, ANCIENTPOWER
 	dbw 88, FUTURE_SIGHT

data/pokemon/evos_attacks_kanto.asm

@@ -466,8 +466,8 @@ PupalEvosAttacks:
 
 CarapthorEvosAttacks:
 	db 0 ; no more evolutions
-	dbw  1, COMET_PUNCH ; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
-	; dbw 10, UPPERCUT
+	dbw 10, UPPERCUT
 	dbw 12, COMET_PUNCH
 	dbw 15, PIN_MISSILE
 	dbw 20, DEFENSE_CURL
@@ -877,12 +877,12 @@ ClefairyEvosAttacks:
 	dbw 8, SING
 	dbw 13, DOUBLESLAP
 	dbw 19, MINIMIZE
-	dbw 19, FAIRY_WIND ; PLA
+	dbw 24, FAIRY_WIND ; PLA
-	dbw 24, DEFENSE_CURL
+	dbw 28, DEFENSE_CURL
-	dbw 28, TAKE_DOWN ; RG proto
+	dbw 32, TAKE_DOWN ; RG proto
-	dbw 33, METRONOME
+	dbw 37, METRONOME
-	dbw 39, BODY_SLAM ; KEP
+	dbw 41, BODY_SLAM ; KEP
-	dbw 45, MOONLIGHT
+	dbw 46, MOONLIGHT
 	dbw 51, LIGHT_SCREEN
 	dbw 55, MOONBLAST ; XY
 	db 0 ; no more level-up moves
@@ -893,6 +893,7 @@ ClefableEvosAttacks:
 	dbw 1, DOUBLESLAP
 	dbw 1, METRONOME
 	dbw 1, MOONLIGHT
+	dbw 55, MOONBLAST ; XY
 	db 0 ; no more level-up moves
 
 VulpiiiEvosAttacks:
@@ -944,14 +945,15 @@ JigglypuffEvosAttacks:
 	dbw 4, DEFENSE_CURL
 	dbw 9, POUND
 	dbw 14, DISABLE
-	dbw 14, DISARMING_VOICE ; Chose to give Clefairy Fairy Wind and Jigglypuff Disarming Voice for a dichotomy
+	dbw 19, DISARMING_VOICE ; Chose to give Clefairy Fairy Wind and Jigglypuff Disarming Voice for a dichotomy
-	dbw 19, ROLLOUT
+	dbw 24, ROLLOUT
-	dbw 24, DOUBLESLAP
+	dbw 29, DOUBLESLAP
-	dbw 29, REST
+	dbw 34, REST
-	dbw 34, COUNTER ; RG proto
+	dbw 39, COUNTER ; RG proto
-	dbw 39, BODY_SLAM
+	dbw 44, BODY_SLAM
-	dbw 44, DOUBLE_EDGE
+	dbw 49, PLAY_ROUGH ; XY, from Wigglytuff
-	dbw 49, PAIN_SPLIT ; SW97
+	dbw 54, DOUBLE_EDGE
+	dbw 59, PAIN_SPLIT ; SW97
 	db 0 ; no more level-up moves
 
 WigglytuffEvosAttacks:
@@ -960,6 +962,7 @@ WigglytuffEvosAttacks:
 	dbw 1, DISABLE
 	dbw 1, DEFENSE_CURL
 	dbw 1, DOUBLESLAP
+	dbw 50, PLAY_ROUGH ; XY
 	db 0 ; no more level-up moves
 
 BittybatEvosAttacks:
@@ -1020,7 +1023,7 @@ OddishEvosAttacks:
 	dbw 36, GROWTH ; SW97
 	dbw 40, PETAL_DANCE
 	dbw 44, MOONBLAST ; XY
-	dbw 46, GIGA_DRAIN ; HGSS
+	dbw 49, GIGA_DRAIN ; HGSS
 	db 0 ; no more level-up moves
 
 GloomEvosAttacks:
@@ -1037,8 +1040,8 @@ GloomEvosAttacks:
 	dbw 34, MOONLIGHT
 	dbw 40, GROWTH ; SW97
 	dbw 44, PETAL_DANCE
-	dbw 44, MOONBLAST ; XY
+	dbw 48, MOONBLAST ; XY
-	dbw 50, GIGA_DRAIN ; HGSS
+	dbw 55, GIGA_DRAIN ; HGSS
 	db 0 ; no more level-up moves
 
 VileplumeEvosAttacks:
@@ -1221,7 +1224,7 @@ PerrserkerEvosAttacks:
 	dbw 43, SLASH
 	dbw 50, DOUBLE_TEAM
 	dbw 56, THRASH
-	; dbw 61, COIN_HURL
+	dbw 61, COIN_HURL
 	db 0 ; no more level-up moves
 
 PsyduckEvosAttacks:
@@ -1284,7 +1287,7 @@ MankeyEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, SCRATCH
 	dbw 1, LEER
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 9, LOW_KICK
 	dbw 15, KARATE_CHOP
 	dbw 21, FURY_SWIPES
@@ -1302,7 +1305,7 @@ PrimeapeEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, SCRATCH
 	dbw 1, LEER
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 9, LOW_KICK
 	dbw 15, KARATE_CHOP
 	dbw 21, FURY_SWIPES
@@ -1321,7 +1324,7 @@ AnnihilapeEvosAttacks:
 	dbw 1, SCRATCH
 	dbw 1, LEER
 	dbw 1, SPITE
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 9, LOW_KICK
 	dbw 15, KARATE_CHOP
 	dbw 21, FURY_SWIPES
@@ -1349,6 +1352,7 @@ PupperonEvosAttacks:
 	dbw 28, FLAME_WHEEL
 	dbw 34, AGILITY
 	dbw 40, FLAMETHROWER
+	dbw 45, PLAY_ROUGH
 	db 0 ; no more level-up moves
 
 GrowlitheEvosAttacks:
@@ -1363,6 +1367,7 @@ GrowlitheEvosAttacks:
 	dbw 32, FLAME_WHEEL
 	dbw 38, AGILITY
 	dbw 46, FLAMETHROWER
+	dbw 52, PLAY_ROUGH ; Later gen level-up
 	db 0 ; no more level-up moves
 
 ArcanineEvosAttacks:
@@ -1436,7 +1441,7 @@ KadabraEvosAttacks:
 	dbw 32, MEDITATE ; RG proto
 	dbw 37, RECOVER
 	dbw 42, FUTURE_SIGHT
-	; dbw 46, SYNCHRONIZE 
+	dbw 46, SYNCHRONIZE 
 	dbw 50, PSYCHIC_M
 	dbw 56, REFLECT
 	db 0 ; no more level-up moves
@@ -1452,7 +1457,7 @@ AlakazamEvosAttacks:
 	dbw 32, MEDITATE ; RG proto
 	dbw 37, RECOVER
 	dbw 42, FUTURE_SIGHT
-	; dbw 46, SYNCHRONIZE 
+	dbw 46, SYNCHRONIZE 
 	dbw 50, PSYCHIC_M
 	dbw 56, REFLECT
 	db 0 ; no more level-up moves
@@ -1462,7 +1467,7 @@ MachopEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, LOW_KICK
 	dbw 1, LEER
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 7, FOCUS_ENERGY
 	dbw 13, KARATE_CHOP
 	dbw 19, SEISMIC_TOSS
@@ -1480,7 +1485,7 @@ MachokeEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, LOW_KICK
 	dbw 1, LEER
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 7, FOCUS_ENERGY
 	dbw 13, KARATE_CHOP
 	dbw 19, SEISMIC_TOSS
@@ -1497,7 +1502,7 @@ MachampEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, LOW_KICK
 	dbw 1, LEER
-	; dbw 1, UPPERCUT
+	dbw 1, UPPERCUT
 	dbw 7, FOCUS_ENERGY
 	dbw 13, KARATE_CHOP
 	dbw 19, SEISMIC_TOSS
@@ -2397,7 +2402,7 @@ HitmonchanEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, COMET_PUNCH
 	dbw 6, AGILITY
-	; dbw 11, UPPERCUT
+	dbw 11, UPPERCUT
 	dbw 16, SONICBOOM ; Street Fighter II
 	dbw 20, MACH_PUNCH
 	dbw 26, THUNDERPUNCH
@@ -2760,7 +2765,7 @@ StaryuEvosAttacks:
 	dbw 30, BUBBLEBEAM
 	dbw 35, AURORA_BEAM ; Unused Egg move
 	dbw 40, MINIMIZE
-	; dbw 45, SYNCHRONIZE
+	dbw 45, SYNCHRONIZE
 	dbw 50, LIGHT_SCREEN
 	dbw 55, HYDRO_PUMP
 	db 0 ; no more level-up moves
@@ -2789,9 +2794,9 @@ MimeJrEvosAttacks:
 	dbw 31, ENCORE
 	dbw 36, PSYBEAM
 	dbw 41, BATON_PASS
-	dbw 41, DAZZLING_GLEAM ; XY
+	dbw 46, DAZZLING_GLEAM ; XY
-	dbw 46, SAFEGUARD
+	dbw 52, SAFEGUARD
-	dbw 52, PSYCHIC_M ; FRLG
+	dbw 58, PSYCHIC_M ; FRLG
 	db 0 ; no more level-up moves
 
 MrMimeEvosAttacks:
@@ -2807,9 +2812,9 @@ MrMimeEvosAttacks:
 	dbw 33, ENCORE
 	dbw 40, PSYBEAM
 	dbw 45, BATON_PASS
-	dbw 41, DAZZLING_GLEAM ; XY
+	dbw 50, DAZZLING_GLEAM ; XY
-	dbw 51, SAFEGUARD
+	dbw 58, SAFEGUARD
-	dbw 58, PSYCHIC_M ; FRLG
+	dbw 64, PSYCHIC_M ; FRLG
 	db 0 ; no more level-up moves
 
 ScytherEvosAttacks:
@@ -2851,12 +2856,12 @@ JynxEvosAttacks:
 	db 0 ; no more evolutions
 	dbw 1, POUND
 	dbw 1, LICK
-	dbw 1, DRAINING_KISS ; XY
 	dbw 7, SWEET_KISS ; from Smoochum
 	dbw 12, POWDER_SNOW
 	dbw 17, CONFUSION
 	dbw 22, SING
 	dbw 26, PSYWAVE ; 99 proto
+	dbw 30, DRAINING_KISS ; XY
 	dbw 33, MEAN_LOOK
 	dbw 38, LOVELY_KISS
 	dbw 42, PSYCHIC_M

data/wild/johto_grass.asm

@@ -1468,29 +1468,29 @@ JohtoGrassWildMons:
 	def_grass_wildmons ROUTE_36
 	db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
 	; morn
-	dbw 14, LEDYBA
+	dbw 5, LEDYBA
-	dbw 16, FARFETCH_D
+	dbw 6, BELLSPROUT
-	dbw 15, AERCROW
+	dbw 6, PUPPERON
-	dbw 15, KOTORA
+	dbw 6, KOTORA
-	dbw 17, KOTORA
+	dbw 7, KOTORA
-	dbw 14, NATU
+	dbw 5, NATU
-	dbw 16, NATU
+	dbw 7, FARFETCH_D
 	; day
-	dbw 15, FARFETCH_D
+	dbw 6, BELLSPROUT
-	dbw 14, KOTORA
+	dbw 5, KOTORA
-	dbw 15, BELLSPROUT
+	dbw 5, BELLSPROUT
-	dbw 16, AERCROW
+	dbw 5, PUPPERON
-	dbw 17, AERCROW
+	dbw 6, PUPPERON
-	dbw 15, NATU
+	dbw 6, NATU
-	dbw 16, NATU
+	dbw 7, FARFETCH_D
 	; nite
-	dbw 15, SPINARAK
+	dbw 5, SPINARAK
-	dbw 14, HOOTHOOT
+	dbw 6, HOOTHOOT
-	dbw 16, BELLSPROUT
+	dbw 6, ODDISH
-	dbw 14, VULPIII ; Silver data, but specifically at night
+	dbw 5, VULPIII ; Silver data, but specifically at night
-	dbw 15, HOOTHOOT
+	dbw 5, HOOTHOOT
-	dbw 16, MISDREAVUS
+	dbw 6, MISDREAVUS
-	dbw 17, MISDREAVUS
+	dbw 7, MISDREAVUS
 	end_grass_wildmons
 
 ; Restored the 30% Stantler from GS.

gfx/battle_anims/custom.pal

@@ -0,0 +1,256 @@
+	; Custom pallettes from Sour Crystal
+	; first 6 custom pals look like regular ones
+INCLUDE "gfx/battle_anims/battle_anims.pal"
+
+; purple
+	RGB 31, 31, 31
+	RGB 25, 09, 27
+	RGB 13, 02, 15
+	RGB 00, 00, 00
+; ice
+	RGB 31, 31, 31
+	RGB 13, 27, 31
+	RGB 10, 21, 29
+	RGB 00, 00, 00
+; fire
+	RGB 31, 31, 31
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; globe
+	RGB 31, 31, 31
+	RGB 03, 22, 31
+	RGB 04, 19, 08
+	RGB 00, 00, 00
+; water
+	RGB 31, 31, 31
+	RGB 00, 19, 28
+	RGB 08, 09, 28
+	RGB 00, 00, 00
+; bubble
+	RGB 31, 31, 31
+	RGB 19, 28, 28
+	RGB 00, 23, 28
+	RGB 03, 10, 30
+; dragonbreath
+	RGB 31, 31, 31
+	RGB 31, 26, 09
+	RGB 27, 08, 22
+	RGB 00, 00, 00
+; dragonrage
+	RGB 31, 31, 31
+	RGB 31, 29, 09
+	RGB 03, 09, 26
+	RGB 00, 00, 00
+; aurora
+	RGB 28, 22, 31
+	RGB 31, 31, 07
+	RGB 13, 27, 31
+	RGB 31, 20, 24
+; spore
+	RGB 31, 12 ,10
+	RGB 05, 27, 06
+	RGB 31, 31, 08
+	RGB 00, 28, 22
+; peach
+	RGB 31, 31, 31
+	RGB 31, 25, 14
+	RGB 31, 13, 04
+	RGB 00, 00, 00
+; lightscreen
+	RGB 31, 31, 31
+	RGB 16, 31, 28
+	RGB 00, 28, 22
+	RGB 00, 00, 00
+; mirrorcoat
+	RGB 31, 31, 31
+	RGB 31, 22, 25
+	RGB 29, 11, 11
+	RGB 00, 00, 00
+; recycle
+	RGB 31, 31, 31
+	RGB 08, 09, 28
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; lavarocks
+	RGB 31, 31, 31
+	RGB 31, 13, 01
+	RGB 06, 05, 07
+	RGB 00, 00, 00
+; skillswap
+	RGB 31, 31, 31
+	RGB 01, 22, 25
+	RGB 26, 28, 00
+	RGB 31, 30, 13
+; willowisp
+	RGB 31, 31, 31
+	RGB 00, 22, 29
+	RGB 15, 09, 27
+	RGB 31, 31, 31
+; glowyellow
+	RGB 31, 31, 31
+	RGB 31, 31, 07
+	RGB 31, 24, 02
+	RGB 31, 16, 01
+; glowluster
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 23, 30, 31
+	RGB 29, 25, 31
+; bright
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 16, 16, 16
+	RGB 10, 10, 10
+; verybright
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 10, 10, 10
+; charred
+	RGB 31, 31, 31
+	RGB 14, 14, 15
+	RGB 12, 12, 13
+	RGB 09, 09, 11
+; cosmic
+	RGB 31, 31, 31
+	RGB 31, 30, 23
+	RGB 13, 27, 31
+	RGB 28, 05, 13
+; signalbeamred
+	RGB 31, 31, 31
+	RGB 31, 20, 22
+	RGB 31, 07, 05
+	RGB 20, 00, 00
+; signalbeamblue
+	RGB 31, 31, 31
+	RGB 18, 30, 31
+	RGB 04, 22, 31
+	RGB 04, 17, 31
+; bulkup
+	RGB 31, 31, 31
+	RGB 29, 03, 04
+	RGB 31, 24, 02
+	RGB 31, 24, 02
+; grasswhistle
+	RGB 31, 31, 31
+	RGB 12, 25, 01
+	RGB 12, 25, 01
+	RGB 12, 25, 01
+; psychoboost1
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 29, 20, 31
+	RGB 30, 00, 13
+; psychoboost2
+	RGB 31, 31, 31
+	RGB 31, 18, 25
+	RGB 31, 00, 27
+	RGB 15, 06, 31
+; gravity
+	RGB 31, 31, 31
+	RGB 26, 10, 29
+	RGB 10, 10, 21
+	RGB 05, 07, 13
+; glowgreen
+	RGB 31, 31, 31
+	RGB 23, 31, 20
+	RGB 16, 28, 09
+	RGB 07, 23, 03
+; heatwave
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; payback
+	RGB 31, 31, 31
+	RGB 31, 31, 31
+	RGB 31, 15, 28
+	RGB 22, 00, 23
+; gastroacid
+	RGB 31, 31, 31
+	RGB 27, 31, 05
+	RGB 15, 31, 01
+	RGB 09, 25, 00
+; darkpulse
+	RGB 31, 31, 31
+	RGB 25, 00, 08
+	RGB 09, 00, 06
+	RGB 19, 00, 06
+; glowlime
+	RGB 31, 31, 31
+	RGB 29, 31, 06
+	RGB 22, 25, 00
+	RGB 15, 20, 00
+; dragonpulse
+	RGB 31, 31, 31
+	RGB 28, 28, 28
+	RGB 19, 14, 28
+	RGB 07, 06, 22
+; snow
+	RGB 31, 31, 31
+	RGB 27, 31, 31
+	RGB 20, 27, 31
+	RGB 18, 16, 24
+; lavaplume
+	RGB 31, 31, 31
+	RGB 10, 13, 17
+	RGB 08, 09, 11
+	RGB 05, 05, 06
+; invertblack
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+	RGB 13, 13, 13
+	RGB 25, 25, 25
+; lime
+	RGB 31, 31, 31
+	RGB 20, 30, 05
+	RGB 13, 18, 02
+	RGB 00, 00, 00
+; bee
+	RGB 31, 31, 31
+	RGB 25, 29, 31
+	RGB 31, 26, 01
+	RGB 00, 00, 00
+; roaroftime
+	RGB 31, 31, 31
+	RGB 28, 31, 31
+	RGB 13, 26, 31
+	RGB 10, 14, 31
+; moon
+	RGB 31, 31, 31
+	RGB 29, 31, 31
+	RGB 17, 28, 31
+	RGB 03, 03, 06
+; darkvoid
+	RGB 15, 15, 15
+	RGB 13, 13, 13
+	RGB 00, 00, 00
+	RGB 00, 00, 00
+; refresh
+	RGB 31, 31, 31
+	RGB 17, 31, 10
+	RGB 00, 25, 19
+	RGB 00, 00, 00
+; heatBG
+	RGB 31, 24, 16
+	RGB 31, 24, 02
+	RGB 29, 03, 04
+	RGB 00, 00, 00
+; goldBG
+	RGB 31, 31, 16
+	RGB 31, 31, 07
+	RGB 31, 16, 01
+	RGB 16, 07, 00
+; strugglebug
+	RGB 31, 31, 31
+	RGB 27, 31, 05
+	RGB 15, 31, 01
+	RGB 00, 12, 12
+; pink
+	RGB 31, 31, 31
+	RGB 31, 26, 29
+	RGB 29, 16, 22
+	RGB 00, 00, 00
+rept NUM_CUSTOM_BATTLE_PALETTES - 6
+endr

main.asm

@@ -408,11 +408,11 @@ INCLUDE "engine/events/trainer_scripts.asm"
 
 
 SECTION "bank32", ROMX
-
-INCLUDE "engine/battle_anims/bg_effects.asm"
 INCLUDE "data/moves/animations.asm"
-INCLUDE "engine/events/poisonstep_pals.asm"
 
+SECTION "bank32expansion", ROMX
+INCLUDE "engine/battle_anims/bg_effects.asm"
+INCLUDE "engine/events/poisonstep_pals.asm"
 
 SECTION "Move Animations", ROMX
 

maps/DebugRoom.asm

@@ -8,12 +8,12 @@ DebugRoom_MapScripts:
 
 DebugPokemon1Script:
 	opentext
-	getmonname STRING_BUFFER_3, MACHAMP
+	getmonname STRING_BUFFER_3, OCTILLERY
 	writetext ReceivedDebugPokemonText
 	playsound SFX_CAUGHT_MON
 	waitsfx
 	promptbutton
-	givepoke MACHAMP, 90, TM_ROCK_SMASH
+	givepoke OCTILLERY, 90, TM_ROCK_SMASH
 	closetext
 	end