Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange

charmap.txt

@@ -805,7 +805,7 @@ MUS_LITTLEROOT = 95 01
 MUS_MT_CHIMNEY = 96 01
 MUS_ENCOUNTER_FEMALE = 97 01
 MUS_LILYCOVE = 98 01
-MUS_ROUTE111 = 99 01
+MUS_DESERT = 99 01
 MUS_HELP = 9A 01
 MUS_UNDERWATER = 9B 01
 MUS_VICTORY_TRAINER = 9C 01

data/battle_anim_scripts.s

@@ -854,6 +854,8 @@ gBattleAnims_Moves::
 	.4byte Move_NOXIOUS_TORQUE
 	.4byte Move_COMBAT_TORQUE
 	.4byte Move_MAGICAL_TORQUE
+	.4byte Move_PSYBLADE
+	.4byte Move_HYDRO_STEAM
 @@@@ Z MOVES
 	.4byte Move_BREAKNECK_BLITZ
 	.4byte Move_ALL_OUT_PUMMELING
@@ -14464,6 +14466,8 @@ Move_WICKED_TORQUE::
 Move_NOXIOUS_TORQUE::
 Move_COMBAT_TORQUE::
 Move_MAGICAL_TORQUE::
+Move_PSYBLADE::
+Move_HYDRO_STEAM::
 	end @to do
 
 @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@

data/battle_scripts_1.s

@@ -417,7 +417,9 @@ gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectVictoryDance            @ EFFECT_VICTORY_DANCE
 	.4byte BattleScript_EffectTeatime                 @ EFFECT_TEATIME
 	.4byte BattleScript_EffectAttackUpUserAlly        @ EFFECT_ATTACK_UP_USER_ALLY
-	.4byte BattleScript_EffectShellTrap				  @ EFFECT_SHELL_TRAP
+	.4byte BattleScript_EffectShellTrap               @ EFFECT_SHELL_TRAP
+	.4byte BattleScript_EffectHit                     @ EFFECT_PSYBLADE
+	.4byte BattleScript_EffectHit                     @ EFFECT_HYDRO_STEAM
 
 BattleScript_EffectAttackUpUserAlly:
 	jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp

data/battle_scripts_2.s

@@ -50,7 +50,7 @@ BattleScript_SuccessBallThrow::
 	setbyte sMON_CAUGHT, TRUE
 	incrementgamestat GAME_STAT_POKEMON_CAPTURES
 BattleScript_PrintCaughtMonInfo::
-	printstring STRINGID_GOTCHAPKMNCAUGHT
+	printstring STRINGID_GOTCHAPKMNCAUGHTPLAYER
 	jumpifbyte CMP_NOT_EQUAL, sEXP_CATCH, TRUE, BattleScript_TryPrintCaughtMonInfo
 	setbyte sGIVEEXP_STATE, 0
 	getexp BS_TARGET
@@ -77,7 +77,7 @@ BattleScript_SuccessBallThrowEnd::
 	finishturn
 
 BattleScript_WallyBallThrow::
-	printstring STRINGID_GOTCHAPKMNCAUGHT2
+	printstring STRINGID_GOTCHAPKMNCAUGHTWALLY
 	setbyte gBattleOutcome, B_OUTCOME_CAUGHT
 	finishturn
 

data/maps/MossdeepCity_Gym/scripts.inc

@@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_CheckSwitch4::
 
 @ All the below set metatile scripts are leftover from RS and are functionally unused
 MossdeepCity_Gym_EventScript_SetSwitch1Metatiles::
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch2
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch2Metatiles::
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch3
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch3Metatiles::
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_CheckSwitch4
 	end
 
 MossdeepCity_Gym_EventScript_SetSwitch4Metatiles::
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Up, FALSE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	end
 
 MossdeepCity_Gym_EventScript_TateAndLiza::
@@ -116,8 +116,8 @@ MossdeepCity_Gym_EventScript_Switch1::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -131,8 +131,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch1::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
-	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 5, 5, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
+	setmetatile 2, 7, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -142,8 +142,8 @@ MossdeepCity_Gym_EventScript_Switch2::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -151,8 +151,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch2::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Down, FALSE
-	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 8, 14, METATILE_RSMossdeepGym_RedArrow_Down, FALSE
+	setmetatile 8, 10, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -162,8 +162,8 @@ MossdeepCity_Gym_EventScript_Switch3::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Left, FALSE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -171,8 +171,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch3::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 15, 17, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 17, 15, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -182,8 +182,8 @@ MossdeepCity_Gym_EventScript_Switch4::
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, TRUE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Up, FALSE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Down, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
@@ -191,8 +191,8 @@ MossdeepCity_Gym_EventScript_ClearSwitch4::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
-	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Right, FALSE
-	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Up, TRUE
+	setmetatile 1, 23, METATILE_RSMossdeepGym_RedArrow_Right, FALSE
+	setmetatile 5, 24, METATILE_RSMossdeepGym_Switch_Up, TRUE
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 

data/maps/Route111/scripts.inc

@@ -260,7 +260,7 @@ Route111_EventScript_SunTrigger::
 
 Route111_EventScript_SandstormTrigger::
 	setweather WEATHER_SANDSTORM
-	fadenewbgm MUS_ROUTE111
+	fadenewbgm MUS_DESERT
 	doweather
 	end
 

graphics/pokemon/arcanine/hisuian/normal.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-48 40 32
-0 0 0
-136 136 128
-96 96 80
-232 72 56
-176 48 32
-216 216 208
-248 248 240
-72 64 56
-40 40 40
-208 88 64
+32 44 40
+128 140 128
+16 16 16
+80 100 96
+96 12 0
+248 120 96
+232 72 48
+168 40 32
+184 180 176
+248 248 248
+0 0 0
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/arcanine/hisuian/shiny.pal

@@ -2,17 +2,17 @@ JASC-PAL
 0100
 16
 152 208 160
-48 40 32
-0 0 0
-136 136 128
-96 96 80
-224 208 40
-176 152 0
-216 216 208
-248 248 240
-72 64 56
-40 40 40
-224 208 40
+32 44 40
+128 140 128
+16 16 16
+80 100 96
+90 65 16
+231 184 41
+231 184 41
+181 126 0
+184 180 176
+248 248 248
+0 0 0
 0 0 0
 0 0 0
 0 0 0

graphics/pokemon/avalugg/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 168 208
-80 112 144
-184 240 248
-104 80 64
-128 208 240
-248 248 248
-80 40 24
-8 8 8
+80 96 104
+176 224 240
+136 176 192
+16 16 16
+104 84 64
+232 244 248
+80 60 48
+72 44 32
 144 120 96
-144 64 32
-200 200 216
-144 152 168
-248 192 0
-88 56 56
+112 112 112
+184 188 184
+232 232 232
+144 68 32
+240 184 72
 0 0 0

graphics/pokemon/avalugg/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 152 208
-80 96 168
-184 232 248
-200 160 144
-128 192 240
-248 248 248
-112 80 72
-8 8 8
-232 192 176
-248 176 24
-248 176 120
-248 136 88
-248 176 24
-160 128 120
+80 96 104
+176 224 240
+136 176 192
+16 16 16
+104 84 64
+232 244 248
+80 60 48
+72 44 32
+144 120 96
+149 41 26
+213 79 53
+249 131 79
+144 68 32
+240 184 72
 0 0 0

graphics/pokemon/basculegion/female/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+98 98 98
+16 16 16
+46 92 120
+171 222 224
+230 230 230
+227 242 239
+164 164 164
+122 168 175
+32 49 57
+65 82 82
+55 140 89
+21 64 34
+34 96 61
+16 16 18
+99 62 41

graphics/pokemon/basculegion/female/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+98 98 98
+16 16 16
+112 96 64
+216 208 112
+230 230 230
+248 236 160
+164 164 164
+160 152 72
+32 49 57
+64 80 80
+96 144 48
+21 64 34
+72 108 56
+16 16 18
+99 62 41

graphics/pokemon/basculegion/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+48 140 88
+192 52 80
+160 164 160
+16 64 32
+16 16 16
+120 24 24
+248 164 200
+96 60 40
+224 228 224
+64 80 80
+32 48 56
+32 96 56
+248 80 120
+96 96 96
+56 84 72

graphics/pokemon/basculegion/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+96 144 48
+144 72 176
+160 164 160
+16 64 32
+16 16 16
+88 36 112
+224 176 240
+96 60 40
+224 228 224
+60 82 76
+32 48 56
+72 108 56
+184 84 232
+96 96 96
+56 84 72

graphics/pokemon/braviary/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-104 88 80
-8 8 8
-232 232 224
-184 176 168
-56 56 64
-80 88 88
-152 64 168
-168 96 184
-32 40 40
+184 156 16
+80 188 160
+96 80 32
+16 16 16
+144 60 160
+160 48 48
+232 212 88
 144 152 184
-80 184 160
-168 24 24
-240 248 248
-224 192 72
-184 128 56
+228 230 224
+168 100 184
+48 52 64
+104 92 80
+184 176 168
+88 84 104
+240 240 240

graphics/pokemon/braviary/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-24 24 24
-8 8 8
-64 64 56
-40 40 32
-56 56 64
-80 88 88
-48 176 216
-120 232 240
-32 40 40
-168 248 248
-232 248 248
-96 56 144
-240 248 248
-224 192 72
-184 128 56
+208 160 70
+233 254 252
+103 74 27
+16 16 16
+51 180 217
+96 63 150
+243 215 139
+174 251 251
+71 66 63
+122 234 243
+48 52 64
+30 28 26
+45 41 38
+88 84 104
+240 240 240

graphics/pokemon/decidueye/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+115 106 106
+16 16 16
+238 238 238
+189 189 189
+238 156 57
+65 41 32
+106 24 41
+189 106 41
+205 49 41
+148 32 41
+41 41 49
+213 148 98
+74 74 90
+172 106 74
+115 65 57

graphics/pokemon/decidueye/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+115 106 106
+16 16 16
+238 238 238
+189 189 189
+238 82 57
+65 41 32
+16 57 41
+172 41 41
+32 131 98
+24 90 65
+41 41 49
+172 139 106
+74 74 90
+131 106 90
+90 65 57

graphics/pokemon/enamorus/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+153 211 165
+74 74 74
+180 180 189
+252 252 252
+16 16 16
+118 50 58
+147 33 30
+224 116 156
+243 46 46
+174 74 87
+199 46 41
+243 84 143
+187 62 94
+255 197 60
+239 228 176
+0 0 0

graphics/pokemon/enamorus/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+74 74 74
+180 180 189
+255 255 255
+0 0 0
+131 57 82
+164 24 24
+230 131 164
+255 90 0
+189 82 106
+222 74 41
+255 139 238
+205 98 189
+255 197 32
+0 0 0
+0 0 0

graphics/pokemon/enamorus/therian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+131 41 49
+213 106 156
+16 16 16
+213 65 57
+74 74 74
+255 255 255
+180 180 189
+255 197 57
+123 164 131
+98 115 98
+148 197 156
+230 246 230
+49 57 49
+213 106 156
+0 0 0

graphics/pokemon/enamorus/therian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+131 41 49
+213 106 156
+16 16 16
+213 65 57
+74 74 74
+255 255 255
+180 180 189
+255 197 57
+123 164 131
+98 115 98
+148 197 156
+230 246 230
+49 57 49
+238 131 230
+0 0 0

graphics/pokemon/goodra/hisuian/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-0 176 232
-128 96 112
-216 192 208
-136 136 136
-8 8 8
-240 240 240
-200 200 200
-168 152 168
-64 64 64
-176 176 176
-96 96 104
-136 104 168
-64 56 88
-168 152 192
-232 208 232
+152 208 160
+136 148 168
+192 204 224
+224 228 240
+80 96 112
 16 16 16
+88 68 88
+192 168 200
+232 212 232
+136 108 144
+48 64 72
+248 252 248
+248 248 248
+64 60 88
+104 96 144
+144 132 200

graphics/pokemon/goodra/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-128 96 112
-216 192 208
-120 104 56
-8 8 8
-240 240 240
-200 176 88
-168 152 168
-56 40 32
-160 136 72
-80 64 40
-136 104 168
-64 56 88
-168 152 192
-232 208 232
+141 107 50
+184 139 71
+215 166 100
+101 80 35
 16 16 16
+88 68 88
+192 168 200
+232 212 232
+136 108 144
+68 54 21
+248 252 248
+248 248 248
+64 60 88
+110 99 147
+144 132 200

graphics/pokemon/growlithe/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 72 88
-200 192 184
+88 72 64
+240 232 224
+208 208 200
+168 156 144
 16 16 16
-120 104 128
-104 16 8
-248 80 48
-184 32 32
-160 144 160
-112 96 32
-208 128 112
-184 152 120
-224 200 160
-72 72 72
-0 0 0
-16 0 0
+184 176 168
+184 64 56
+120 48 8
+208 104 64
+112 84 56
+48 60 64
+192 160 120
+248 252 240
+232 208 176
+216 220 208

graphics/pokemon/growlithe/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 104 96
-232 232 232
+88 72 64
+240 232 224
+208 208 200
+168 156 144
 16 16 16
-160 152 144
-88 72 40
-232 184 128
-168 136 48
-208 200 192
-112 96 32
-208 128 112
-184 152 120
-224 200 160
-72 72 72
-0 0 0
-16 0 0
+184 176 168
+189 110 57
+120 48 8
+226 163 52
+112 84 56
+48 60 64
+192 160 120
+248 252 240
+232 208 176
+216 220 208

graphics/pokemon/qwilfish/hisuian/normal.pal

@@ -3,17 +3,17 @@ JASC-PAL
 16
 152 208 160
 120 32 96
-240 64 208
+240 68 208
 16 16 16
-184 48 152
-128 128 128
-64 64 72
-40 40 48
-88 88 96
+56 56 64
+40 44 48
+80 84 96
+184 52 152
 152 136 80
-176 160 120
-184 192 192
+184 180 144
+112 116 128
+168 172 168
+248 252 248
 88 80 40
-248 248 248
-184 176 144
+0 0 0
 0 0 0

graphics/pokemon/qwilfish/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-40 48 128
-120 112 208
+88 68 192
+128 92 240
 16 16 16
-96 88 184
-208 224 240
-136 136 152
-80 80 96
-168 184 208
-168 160 136
-184 184 168
-184 192 192
-96 96 80
-248 248 248
-200 192 184
+128 128 144
+40 44 48
+168 168 184
+88 68 192
+152 136 80
+184 180 144
+200 200 208
+168 172 168
+248 252 248
+88 80 40
+0 0 0
 0 0 0

graphics/pokemon/samurott/hisuian/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+128 164 160
+168 44 64
+72 72 72
+248 252 248
+104 28 48
+16 16 16
+40 44 96
+88 112 112
+32 88 152
+208 80 96
+24 20 48
+192 196 200
+28 56 96
+20 32 72
+0 0 0

graphics/pokemon/samurott/hisuian/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+128 164 160
+200 172 152
+72 72 72
+248 252 248
+168 116 96
+16 16 16
+224 220 224
+88 112 112
+32 88 152
+208 80 96
+24 20 48
+192 196 200
+28 56 96
+168 156 168
+0 0 0

graphics/pokemon/sliggoo/hisuian/normal.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-232 224 176
-128 96 112
-240 240 240
-216 192 208
-168 152 168
-8 8 8
-136 136 136
-72 152 80
+152 208 160
+96 72 88
+192 160 192
+16 16 16
+232 216 232
+144 120 136
+64 108 96
+96 156 144
+128 128 128
+72 76 72
+168 168 168
 200 200 200
-64 64 64
-88 200 80
-176 176 176
-168 152 192
-64 56 88
-136 104 168
-104 96 104
+128 92 152
+168 128 192
+88 48 96
+0 0 0

graphics/pokemon/sliggoo/hisuian/shiny.pal

@@ -1,19 +1,19 @@
 JASC-PAL
 0100
 16
-232 224 176
-128 96 112
-240 240 240
-216 192 208
-168 152 168
-8 8 8
-120 104 56
-72 152 80
-200 176 88
-56 40 32
-88 200 80
-160 136 72
-168 152 192
-64 56 88
-136 104 168
-104 96 104
+152 208 160
+101 73 92
+197 162 197
+16 16 16
+237 218 237
+144 120 136
+134 124 71
+170 171 96
+134 97 62
+72 76 72
+181 153 103
+200 200 200
+128 92 152
+168 128 192
+88 48 96
+0 0 0

graphics/pokemon/sneasel/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-120 88 176
-80 48 104
-160 120 216
-56 40 64
-152 152 160
+192 136 8
+152 152 200
+72 72 72
 16 16 16
-216 216 224
-184 184 192
-128 96 160
-160 120 56
-232 192 48
-88 56 120
-240 240 248
-120 120 120
-232 56 64
+192 40 112
+248 220 120
+112 76 160
+40 32 72
+216 216 240
+184 188 192
+120 108 160
+84 74 128
+240 244 248
+80 52 120
+144 108 184

graphics/pokemon/sneasel/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-248 144 40
-168 72 16
-248 200 80
-32 24 32
-64 88 80
+28 136 168
+77 106 105
+72 72 72
 16 16 16
-112 160 120
-88 128 104
-80 72 88
-64 112 224
-136 160 240
-48 40 48
-240 240 248
-120 120 120
-72 176 96
+222 222 71
+121 197 217
+204 155 40
+40 32 72
+117 149 149
+184 188 192
+84 75 107
+64 58 80
+240 244 248
+119 92 49
+235 201 84

graphics/pokemon/sneasler/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+49 41 49
+74 74 98
+74 57 82
+123 139 180
+16 16 16
+164 189 222
+164 123 57
+123 98 189
+238 197 49
+255 255 255
+255 32 65
+90 65 131
+255 41 41
+189 41 41
+139 24 24

graphics/pokemon/sneasler/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 213 164
+49 41 49
+106 90 41
+74 57 82
+156 148 82
+16 16 16
+238 213 131
+74 148 156
+106 74 98
+123 213 230
+255 255 255
+90 172 32
+74 49 74
+246 189 8
+213 148 24
+213 148 24

graphics/pokemon/typhlosion/hisuian/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-240 88 160
-232 96 224
-176 56 152
-240 72 104
-56 48 96
-88 72 152
-16 16 80
-96 80 176
-136 128 80
-216 216 168
+160 28 200
+216 60 224
+224 76 144
+216 52 48
+88 72 128
+40 28 72
+128 104 168
+56 44 88
+160 136 72
+255 255 255
 16 16 16
-232 136 0
-248 248 248
-176 176 120
-80 64 48
+208 196 112
+104 80 40
+0 0 0
+0 0 0

graphics/pokemon/typhlosion/hisuian/pal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+160 28 200
+216 60 224
+224 76 144
+216 52 48
+88 72 128
+40 28 72
+128 104 168
+56 44 88
+160 136 72
+248 236 144
+16 16 16
+208 196 112
+104 80 40
+0 0 0
+0 0 0

graphics/pokemon/typhlosion/hisuian/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-240 88 160
-232 96 224
-176 56 152
-240 72 104
-40 64 96
-64 88 136
-8 32 88
-64 120 152
-136 128 80
-216 216 168
+160 28 200
+217 60 230
+224 76 144
+218 54 54
+65 89 152
+40 28 72
+128 104 168
+33 65 112
+164 139 74
+255 255 255
 16 16 16
-232 136 0
-248 248 248
-176 176 120
-80 64 48
+213 197 115
+104 80 40
+0 0 0
+0 0 0

graphics/pokemon/wyrdeer/normal.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+152 104 56
+248 216 168
+120 72 64
+232 184 128
+0 0 0
+72 72 72
+224 152 88
+160 168 168
+120 120 120
+112 128 136
+240 240 240
+192 200 208
+56 64 64
+88 88 88
+64 72 80

graphics/pokemon/wyrdeer/shiny.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+152 208 160
+152 104 56
+248 216 168
+120 72 64
+232 184 128
+0 0 0
+72 72 72
+224 152 88
+168 180 128
+120 140 80
+112 128 136
+232 236 208
+208 216 152
+56 64 64
+88 88 88
+64 72 80

include/constants/battle_move_effects.h

@@ -399,7 +399,9 @@
 #define EFFECT_TEATIME                      393
 #define EFFECT_ATTACK_UP_USER_ALLY          394 // Howl 8th Gen
 #define EFFECT_SHELL_TRAP                   395
+#define EFFECT_PSYBLADE                     396
+#define EFFECT_HYDRO_STEAM                  397
 
-#define NUM_BATTLE_MOVE_EFFECTS             396
+#define NUM_BATTLE_MOVE_EFFECTS             398
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H

include/constants/battle_string_ids.h

@@ -265,8 +265,8 @@
 #define STRINGID_ITAPPEAREDCAUGHT                     264
 #define STRINGID_AARGHALMOSTHADIT                     265
 #define STRINGID_SHOOTSOCLOSE                         266
-#define STRINGID_GOTCHAPKMNCAUGHT                     267
-#define STRINGID_GOTCHAPKMNCAUGHT2                    268
+#define STRINGID_GOTCHAPKMNCAUGHTPLAYER               267
+#define STRINGID_GOTCHAPKMNCAUGHTWALLY                268
 #define STRINGID_GIVENICKNAMECAPTURED                 269
 #define STRINGID_PKMNSENTTOPC                         270
 #define STRINGID_PKMNDATAADDEDTODEX                   271

include/constants/moves.h

@@ -858,8 +858,10 @@
 #define MOVE_NOXIOUS_TORQUE 824
 #define MOVE_COMBAT_TORQUE 825
 #define MOVE_MAGICAL_TORQUE 826
+#define MOVE_PSYBLADE 827
+#define MOVE_HYDRO_STEAM 828
 
-#define MOVES_COUNT_GEN9 827
+#define MOVES_COUNT_GEN9 829
 
 #define MOVES_COUNT         MOVES_COUNT_GEN9
 

include/constants/pokemon.h

@@ -191,6 +191,9 @@
 #define FRIENDSHIP_200_TO_254  5
 #define FRIENDSHIP_MAX         6
 
+// Friendship value that the majority of species use. This was changed in Generation 8 to 50.
+#define STANDARD_FRIENDSHIP 70
+
 #define MAX_FRIENDSHIP  255
 #define MAX_SHEEN       255
 #define MAX_CONDITION   255

include/constants/songs.h

@@ -280,47 +280,47 @@
 
 // Music
 #define START_MUS                   350
-#define MUS_LITTLEROOT_TEST         350 // MUS_TETSUJI
-#define MUS_GSC_ROUTE38             351 // MUS_FIELD13
+#define MUS_LITTLEROOT_TEST         350 // MUS_TETSUJI          // Unused, likely a test track.
+#define MUS_GSC_ROUTE38             351 // MUS_FIELD13          // Unused, likely a test track.
 #define MUS_CAUGHT                  352 // MUS_KACHI22
 #define MUS_VICTORY_WILD            353 // MUS_KACHI2
-#define MUS_VICTORY_GYM_LEADER      354 // MUS_KACHI3
+#define MUS_VICTORY_GYM_LEADER      354 // MUS_KACHI3           // Also used in Frontier Brain victories.
 #define MUS_VICTORY_LEAGUE          355 // MUS_KACHI5
-#define MUS_C_COMM_CENTER           356 // MUS_PCC
-#define MUS_GSC_PEWTER              357 // MUS_NIBI
-#define MUS_C_VS_LEGEND_BEAST       358 // MUS_SUIKUN
-#define MUS_ROUTE101                359 // MUS_DOORO1
-#define MUS_ROUTE110                360 // MUS_DOORO_X1
-#define MUS_ROUTE120                361 // MUS_DOORO_X3
-#define MUS_PETALBURG               362 // MUS_MACHI_S2
-#define MUS_OLDALE                  363 // MUS_MACHI_S4
+#define MUS_C_COMM_CENTER           356 // MUS_PCC              // Unused, likely a test track.
+#define MUS_GSC_PEWTER              357 // MUS_NIBI             // Used in unused Contest Halls.
+#define MUS_C_VS_LEGEND_BEAST       358 // MUS_SUIKUN           // Unused, likely a test track.
+#define MUS_ROUTE101                359 // MUS_DOORO1           // Also used in Routes 102 and 103.
+#define MUS_ROUTE110                360 // MUS_DOORO_X1         // Also used in Routes 112, 114, 117, 111's non-desert section and 118's west half.
+#define MUS_ROUTE120                361 // MUS_DOORO_X3         // Also used in Routes 121, 124, 125, 126, 127 and 128.
+#define MUS_PETALBURG               362 // MUS_MACHI_S2         // Also used in Mr. Briney's House and Pretty Petal Flower Shop.
+#define MUS_OLDALE                  363 // MUS_MACHI_S4         // Also used in Lavaridge Town.
 #define MUS_GYM                     364 // MUS_GIM
 #define MUS_SURF                    365 // MUS_NAMINORI
-#define MUS_PETALBURG_WOODS         366 // MUS_DAN01
+#define MUS_PETALBURG_WOODS         366 // MUS_DAN01            // Also used in Artisan Cave, Fiery Path, Granite Cave, Jagged Pass, Marine Cave, Rusturf Tunnel, Scorched Slab and Terra Cave.
 #define MUS_LEVEL_UP                367 // MUS_FANFA1
 #define MUS_HEAL                    368 // MUS_ME_ASA
 #define MUS_OBTAIN_BADGE            369 // MUS_ME_BACHI
 #define MUS_OBTAIN_ITEM             370 // MUS_FANFA4
-#define MUS_EVOLVED                 371 // MUS_FANFA5
+#define MUS_EVOLVED                 371 // MUS_FANFA5           // Also used in egg hatching, trades and upon catching.
 #define MUS_OBTAIN_TMHM             372 // MUS_ME_WAZA
-#define MUS_LILYCOVE_MUSEUM         373 // MUS_BIJYUTU
-#define MUS_ROUTE122                374 // MUS_DOORO_X4
+#define MUS_LILYCOVE_MUSEUM         373 // MUS_BIJYUTU          // Also used in the Battle Frontier's Ranking Hall.
+#define MUS_ROUTE122                374 // MUS_DOORO_X4         // Also used in Route 123 and Birch's intro speech.
 #define MUS_OCEANIC_MUSEUM          375 // MUS_FUNE_KAN
-#define MUS_EVOLUTION_INTRO         376 // MUS_ME_SHINKA
-#define MUS_EVOLUTION               377 // MUS_SHINKA
+#define MUS_EVOLUTION_INTRO         376 // MUS_ME_SHINKA        // Also used in egg hatching.
+#define MUS_EVOLUTION               377 // MUS_SHINKA           // Also used in egg hatching and trades.
 #define MUS_MOVE_DELETED            378 // MUS_ME_WASURE
 #define MUS_ENCOUNTER_GIRL          379 // MUS_SYOUJOEYE
 #define MUS_ENCOUNTER_MALE          380 // MUS_BOYEYE
-#define MUS_ABANDONED_SHIP          381 // MUS_DAN02
-#define MUS_FORTREE                 382 // MUS_MACHI_S3
+#define MUS_ABANDONED_SHIP          381 // MUS_DAN02            // Also used in Faraway and Southern Islands.
+#define MUS_FORTREE                 382 // MUS_MACHI_S3         // Also used in Secret Bases and the Safari Zone's entrance.
 #define MUS_BIRCH_LAB               383 // MUS_ODAMAKI
-#define MUS_B_TOWER_RS              384 // MUS_B_TOWER
+#define MUS_B_TOWER_RS              384 // MUS_B_TOWER          // Used in Battle Tents, Trainer Hill and Battle Frontier's lounges and Exchange Service Corner.
 #define MUS_ENCOUNTER_SWIMMER       385 // MUS_SWIMEYE
-#define MUS_CAVE_OF_ORIGIN          386 // MUS_DAN03
+#define MUS_CAVE_OF_ORIGIN          386 // MUS_DAN03            // Also used in Meteor Falls.
 #define MUS_OBTAIN_BERRY            387 // MUS_ME_KINOMI
 #define MUS_AWAKEN_LEGEND           388 // MUS_ME_TAMA
-#define MUS_SLOTS_JACKPOT           389 // MUS_ME_B_BIG
-#define MUS_SLOTS_WIN               390 // MUS_ME_B_SMALL
+#define MUS_SLOTS_JACKPOT           389 // MUS_ME_B_BIG         // Also used in the Roulette.
+#define MUS_SLOTS_WIN               390 // MUS_ME_B_SMALL       // Also used in the Roulette.
 #define MUS_TOO_BAD                 391 // MUS_ME_ZANNEN
 #define MUS_ROULETTE                392 // MUS_BD_TIME
 #define MUS_LINK_CONTEST_P1         393 // MUS_TEST1
@@ -329,17 +329,17 @@
 #define MUS_LINK_CONTEST_P4         396 // MUS_TEST4
 #define MUS_ENCOUNTER_RICH          397 // MUS_TEST
 #define MUS_VERDANTURF              398 // MUS_GOMACHI0
-#define MUS_RUSTBORO                399 // MUS_GOTOWN
-#define MUS_POKE_CENTER             400 // MUS_POKECEN
-#define MUS_ROUTE104                401 // MUS_NEXTROAD
-#define MUS_ROUTE119                402 // MUS_GRANROAD
+#define MUS_RUSTBORO                399 // MUS_GOTOWN           // Also used in Mauville City, Mossdeep City, Daycare, Weather Institute and several Route houses.
+#define MUS_POKE_CENTER             400 // MUS_POKECEN          // Also used in the Pokémon League's lobby.
+#define MUS_ROUTE104                401 // MUS_NEXTROAD         // Also used in Routes 105, 106, 107, 108, 109, 115 and 116.
+#define MUS_ROUTE119                402 // MUS_GRANROAD         // Also used in Routes 129, 130, 131, 132, 133, 134 and 118's east half.
 #define MUS_CYCLING                 403 // MUS_CYCLING
-#define MUS_POKE_MART               404 // MUS_FRIENDLY
+#define MUS_POKE_MART               404 // MUS_FRIENDLY         // Also used in Lilycove's Department Store.
 #define MUS_LITTLEROOT              405 // MUS_MISHIRO
-#define MUS_MT_CHIMNEY              406 // MUS_TOZAN
+#define MUS_MT_CHIMNEY              406 // MUS_TOZAN            // Also used in Desert Underpass, Mirage Tower, Seafloor Cavern and Sky Pillar.
 #define MUS_ENCOUNTER_FEMALE        407 // MUS_GIRLEYE
-#define MUS_LILYCOVE                408 // MUS_MINAMO
-#define MUS_ROUTE111                409 // MUS_ASHROAD
+#define MUS_LILYCOVE                408 // MUS_MINAMO           // Also used in Pacifidlog Town and the Diving Treasure Hunter's house.
+#define MUS_DESERT                  409 // MUS_ASHROAD
 #define MUS_HELP                    410 // MUS_EVENT0
 #define MUS_UNDERWATER              411 // MUS_DEEPDEEP
 #define MUS_VICTORY_TRAINER         412 // MUS_KACHI1
@@ -352,29 +352,29 @@
 #define MUS_ENCOUNTER_AQUA          419 // MUS_AQA_0
 #define MUS_FOLLOW_ME               420 // MUS_TSURETEK
 #define MUS_ENCOUNTER_BRENDAN       421 // MUS_BOY_SUP
-#define MUS_EVER_GRANDE             422 // MUS_RAINBOW
+#define MUS_EVER_GRANDE             422 // MUS_RAINBOW          // Also used in link rooms.
 #define MUS_ENCOUNTER_SUSPICIOUS    423 // MUS_AYASII
 #define MUS_VICTORY_AQUA_MAGMA      424 // MUS_KACHI4
 #define MUS_CABLE_CAR               425 // MUS_ROPEWAY
 #define MUS_GAME_CORNER             426 // MUS_CASINO
-#define MUS_DEWFORD                 427 // MUS_HIGHTOWN
+#define MUS_DEWFORD                 427 // MUS_HIGHTOWN         // Also used in Route 109's Seashore house.
 #define MUS_SAFARI_ZONE             428 // MUS_SAFARI
-#define MUS_VICTORY_ROAD            429 // MUS_C_ROAD
+#define MUS_VICTORY_ROAD            429 // MUS_C_ROAD           // Also used in Pokémon League's E4/Champion rooms and halls.
 #define MUS_AQUA_MAGMA_HIDEOUT      430 // MUS_AJITO
 #define MUS_SAILING                 431 // MUS_M_BOAT
-#define MUS_MT_PYRE                 432 // MUS_M_DUNGON
-#define MUS_SLATEPORT               433 // MUS_FINECITY
+#define MUS_MT_PYRE                 432 // MUS_M_DUNGON         // Also used in New Mauville and Shoal Cave.
+#define MUS_SLATEPORT               433 // MUS_FINECITY         // Also used in Cycling Road's entrances.
 #define MUS_MT_PYRE_EXTERIOR        434 // MUS_MACHUPI
 #define MUS_SCHOOL                  435 // MUS_P_SCHOOL
 #define MUS_HALL_OF_FAME            436 // MUS_DENDOU
-#define MUS_FALLARBOR               437 // MUS_TONEKUSA
-#define MUS_SEALED_CHAMBER          438 // MUS_MABOROSI
+#define MUS_FALLARBOR               437 // MUS_TONEKUSA         // Also used in Route 114's houses.
+#define MUS_SEALED_CHAMBER          438 // MUS_MABOROSI         // Also used in Ancient Tomb, Desert Ruins and Island Cave.
 #define MUS_CONTEST_WINNER          439 // MUS_CON_FAN
 #define MUS_CONTEST                 440 // MUS_CONTEST0
 #define MUS_ENCOUNTER_MAGMA         441 // MUS_MGM0
 #define MUS_INTRO_BATTLE            442 // MUS_T_BATTLE
-#define MUS_ABNORMAL_WEATHER        443 // MUS_OOAME (Replaces MUS_WEATHER_KYOGRE from R/S)
-#define MUS_WEATHER_GROUDON         444 // MUS_HIDERI (Unused, from R/S)
+#define MUS_ABNORMAL_WEATHER        443 // MUS_OOAME            // Replaces MUS_WEATHER_KYOGRE from R/S.
+#define MUS_WEATHER_GROUDON         444 // MUS_HIDERI           // Unused, from R/S.
 #define MUS_SOOTOPOLIS              445 // MUS_RUNECITY
 #define MUS_CONTEST_RESULTS         446 // MUS_CON_K
 #define MUS_HALL_OF_FAME_ROOM       447 // MUS_EIKOU_R
@@ -383,7 +383,7 @@
 #define MUS_ENCOUNTER_ELITE_FOUR    450 // MUS_SITENNOU
 #define MUS_ENCOUNTER_HIKER         451 // MUS_YAMA_EYE
 #define MUS_CONTEST_LOBBY           452 // MUS_CONLOBBY
-#define MUS_ENCOUNTER_INTERVIEWER   453 // MUS_INTER_V
+#define MUS_ENCOUNTER_INTERVIEWER   453 // MUS_INTER_V          // Also used during Petalburg City report at the beginning of the game.
 #define MUS_ENCOUNTER_CHAMPION      454 // MUS_DAIGO
 #define MUS_CREDITS                 455 // MUS_THANKFOR
 #define MUS_END                     456 // MUS_END
@@ -400,7 +400,7 @@
 #define MUS_B_DOME                  467 // MUS_B_DOME
 #define MUS_B_PIKE                  468 // MUS_B_TUBE
 #define MUS_B_FACTORY               469 // MUS_B_FACTORY
-#define MUS_VS_RAYQUAZA             470 // MUS_VS_REKKU (Identical to MUS_VS_KYOGRE_GROUDON)
+#define MUS_VS_RAYQUAZA             470 // MUS_VS_REKKU         // Identical to MUS_VS_KYOGRE_GROUDON.
 #define MUS_VS_FRONTIER_BRAIN       471 // MUS_VS_FRONT
 #define MUS_VS_MEW                  472 // MUS_VS_MEW
 #define MUS_B_DOME_LOBBY            473 // MUS_B_DOME1
@@ -453,9 +453,9 @@
 #define MUS_RG_SILPH                519 // MUS_RG_SHIRUHU
 #define MUS_RG_FUCHSIA              520 // MUS_RG_HANADA
 #define MUS_RG_CELADON              521 // MUS_RG_TAMAMUSI
-#define MUS_RG_VICTORY_TRAINER      522 // MUS_RG_WIN_TRE (Identical to MUS_VICTORY_TRAINER)
-#define MUS_RG_VICTORY_WILD         523 // MUS_RG_WIN_YASEI (Identical to MUS_VICTORY_WILD)
-#define MUS_RG_VICTORY_GYM_LEADER   524 // MUS_RG_WIN_GYM (Identical to MUS_VICTORY_GYM_LEADER)
+#define MUS_RG_VICTORY_TRAINER      522 // MUS_RG_WIN_TRE       // Identical to MUS_VICTORY_TRAINER.
+#define MUS_RG_VICTORY_WILD         523 // MUS_RG_WIN_YASEI     // Identical to MUS_VICTORY_WILD.
+#define MUS_RG_VICTORY_GYM_LEADER   524 // MUS_RG_WIN_GYM       // Identical to MUS_VICTORY_GYM_LEADER.
 #define MUS_RG_VERMILLION           525 // MUS_RG_KUCHIBA
 #define MUS_RG_PEWTER               526 // MUS_RG_NIBI
 #define MUS_RG_ENCOUNTER_RIVAL      527 // MUS_RG_RIVAL1
@@ -474,11 +474,11 @@
 #define MUS_RG_NET_CENTER           540 // MUS_RG_NETWORK
 #define MUS_RG_MYSTERY_GIFT         541 // MUS_RG_OKURIMONO
 #define MUS_RG_BERRY_PICK           542 // MUS_RG_KINOMIKUI
-#define MUS_RG_SEVII_CAVE           543 // MUS_RG_NANADUNGEON (Identical to MUS_RG_MT_MOON)
-#define MUS_RG_TEACHY_TV_SHOW       544 // MUS_RG_OSHIE_TV (Identical to MUS_RG_FOLLOW_ME)
+#define MUS_RG_SEVII_CAVE           543 // MUS_RG_NANADUNGEON   // Identical to MUS_RG_MT_MOON.
+#define MUS_RG_TEACHY_TV_SHOW       544 // MUS_RG_OSHIE_TV      // Identical to MUS_RG_FOLLOW_ME.
 #define MUS_RG_SEVII_ROUTE          545 // MUS_RG_NANASHIMA
-#define MUS_RG_SEVII_DUNGEON        546 // MUS_RG_NANAISEKI (Identical to MUS_RG_VIRIDIAN_FOREST)
-#define MUS_RG_SEVII_123            547 // MUS_RG_NANA123 (Identical to MUS_RG_PEWTER)
+#define MUS_RG_SEVII_DUNGEON        546 // MUS_RG_NANAISEKI     // Identical to MUS_RG_VIRIDIAN_FOREST.
+#define MUS_RG_SEVII_123            547 // MUS_RG_NANA123       // Identical to MUS_RG_PEWTER
 #define MUS_RG_SEVII_45             548 // MUS_RG_NANA45
 #define MUS_RG_SEVII_67             549 // MUS_RG_NANA67
 #define MUS_RG_POKE_FLUTE           550 // MUS_RG_POKEFUE

include/constants/species.h

@@ -1368,8 +1368,11 @@
 #define SPECIES_CALYREX_ICE_RIDER            FORMS_START + 327
 #define SPECIES_CALYREX_SHADOW_RIDER         FORMS_START + 328
 
+// Basculegion
+#define SPECIES_BASCULEGION_FEMALE           FORMS_START + 329
+
 #define FORMS_START SPECIES_ENAMORUS
-#define SPECIES_EGG SPECIES_CALYREX_SHADOW_RIDER + 1
+#define SPECIES_EGG SPECIES_BASCULEGION_FEMALE + 1
 
 #define NUM_SPECIES SPECIES_EGG
 

include/global.h

@@ -27,8 +27,8 @@
 /// IDE support
 #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
 // We define these when using certain IDEs to fool preproc
-#define _(x)        (x)
-#define __(x)       (x)
+#define _(x)        {x}
+#define __(x)       {x}
 #define INCBIN(...) {0}
 #define INCBIN_U8   INCBIN
 #define INCBIN_U16  INCBIN

include/graphics.h

@@ -986,14 +986,13 @@ extern const u32 gMonFrontPic_Regidrago[];
 extern const u32 gMonFrontPic_Glastrier[];
 extern const u32 gMonFrontPic_Spectrier[];
 extern const u32 gMonFrontPic_Calyrex[];
-//extern const u32 gMonFrontPic_Wyrdeer[];
+extern const u32 gMonFrontPic_Wyrdeer[];
 extern const u32 gMonFrontPic_Kleavor[];
 extern const u32 gMonFrontPic_Ursaluna[];
-//extern const u32 gMonFrontPic_Basculegion[];
-//extern const u32 gMonFrontPic_BasculegionF[];
-//extern const u32 gMonFrontPic_Sneasler[];
+extern const u32 gMonFrontPic_Basculegion[];
+extern const u32 gMonFrontPic_Sneasler[];
 extern const u32 gMonFrontPic_Overqwil[];
-//extern const u32 gMonFrontPic_Enamorus[];
+extern const u32 gMonFrontPic_Enamorus[];
 #endif
 extern const u32 gMonFrontPic_VenusaurMega[];
 extern const u32 gMonFrontPic_CharizardMegaX[];
@@ -1098,7 +1097,7 @@ extern const u32 gMonFrontPic_TyphlosionHisuian[];
 extern const u32 gMonFrontPic_QwilfishHisuian[];
 extern const u32 gMonFrontPic_SneaselHisuian[];
 #if P_GEN_5_POKEMON == TRUE
-//extern const u32 gMonFrontPic_SamurottHisuian[];
+extern const u32 gMonFrontPic_SamurottHisuian[];
 extern const u32 gMonFrontPic_LilligantHisuian[];
 extern const u32 gMonFrontPic_ZoruaHisuian[];
 extern const u32 gMonFrontPic_ZoroarkHisuian[];
@@ -1110,7 +1109,7 @@ extern const u32 gMonFrontPic_GoodraHisuian[];
 extern const u32 gMonFrontPic_AvaluggHisuian[];
 #endif
 #if P_GEN_7_POKEMON == TRUE
-//extern const u32 gMonFrontPic_DecidueyeHisuian[];
+extern const u32 gMonFrontPic_DecidueyeHisuian[];
 #endif
 extern const u32 gMonFrontPic_PikachuCosplay[];
 extern const u32 gMonFrontPic_PikachuRockStar[];
@@ -1276,7 +1275,8 @@ extern const u32 gMonFrontPic_UrshifuRapidStrikeStyle[];
 extern const u32 gMonFrontPic_ZarudeDada[];
 extern const u32 gMonFrontPic_CalyrexIceRider[];
 extern const u32 gMonFrontPic_CalyrexShadowRider[];
-//extern const u32 gMonFrontPic_EnamorusTherian[];
+extern const u32 gMonFrontPic_EnamorusTherian[];
+extern const u32 gMonFrontPic_BasculegionFemale[];
 #endif
 extern const u32 gMonFrontPic_Egg[];
 
@@ -2200,14 +2200,13 @@ extern const u32 gMonBackPic_Regidrago[];
 extern const u32 gMonBackPic_Glastrier[];
 extern const u32 gMonBackPic_Spectrier[];
 extern const u32 gMonBackPic_Calyrex[];
-//extern const u32 gMonBackPic_Wyrdeer[];
+extern const u32 gMonBackPic_Wyrdeer[];
 extern const u32 gMonBackPic_Kleavor[];
 extern const u32 gMonBackPic_Ursaluna[];
-//extern const u32 gMonBackPic_Basculegion[];
-//extern const u32 gMonBackPic_BasculegionF[];
-//extern const u32 gMonBackPic_Sneasler[];
+extern const u32 gMonBackPic_Basculegion[];
+extern const u32 gMonBackPic_Sneasler[];
 extern const u32 gMonBackPic_Overqwil[];
-//extern const u32 gMonBackPic_Enamorus[];
+extern const u32 gMonBackPic_Enamorus[];
 #endif
 extern const u32 gMonBackPic_VenusaurMega[];
 extern const u32 gMonBackPic_CharizardMegaX[];
@@ -2312,7 +2311,7 @@ extern const u32 gMonBackPic_TyphlosionHisuian[];
 extern const u32 gMonBackPic_QwilfishHisuian[];
 extern const u32 gMonBackPic_SneaselHisuian[];
 #if P_GEN_5_POKEMON == TRUE
-//extern const u32 gMonBackPic_SamurottHisuian[];
+extern const u32 gMonBackPic_SamurottHisuian[];
 extern const u32 gMonBackPic_LilligantHisuian[];
 extern const u32 gMonBackPic_ZoruaHisuian[];
 extern const u32 gMonBackPic_ZoroarkHisuian[];
@@ -2324,7 +2323,7 @@ extern const u32 gMonBackPic_GoodraHisuian[];
 extern const u32 gMonBackPic_AvaluggHisuian[];
 #endif
 #if P_GEN_7_POKEMON == TRUE
-//extern const u32 gMonBackPic_DecidueyeHisuian[];
+extern const u32 gMonBackPic_DecidueyeHisuian[];
 #endif
 extern const u32 gMonBackPic_PikachuCosplay[];
 extern const u32 gMonBackPic_PikachuRockStar[];
@@ -2488,7 +2487,8 @@ extern const u32 gMonBackPic_UrshifuRapidStrikeStyle[];
 extern const u32 gMonBackPic_ZarudeDada[];
 extern const u32 gMonBackPic_CalyrexIceRider[];
 extern const u32 gMonBackPic_CalyrexShadowRider[];
-//extern const u32 gMonBackPic_EnamorusTherian[];
+extern const u32 gMonBackPic_EnamorusTherian[];
+extern const u32 gMonBackPic_BasculegionFemale[];
 #endif
 
 extern const u32 gMonPalette_CircledQuestionMark[];
@@ -3406,14 +3406,13 @@ extern const u32 gMonPalette_Regidrago[];
 extern const u32 gMonPalette_Glastrier[];
 extern const u32 gMonPalette_Spectrier[];
 extern const u32 gMonPalette_Calyrex[];
-//extern const u32 gMonPalette_Wyrdeer[];
+extern const u32 gMonPalette_Wyrdeer[];
 extern const u32 gMonPalette_Kleavor[];
 extern const u32 gMonPalette_Ursaluna[];
-//extern const u32 gMonPalette_Basculegion[];
-//extern const u32 gMonPalette_BasculegionF[];
-//extern const u32 gMonPalette_Sneasler[];
+extern const u32 gMonPalette_Basculegion[];
+extern const u32 gMonPalette_Sneasler[];
 extern const u32 gMonPalette_Overqwil[];
-//extern const u32 gMonPalette_Enamorus[];
+extern const u32 gMonPalette_Enamorus[];
 #endif
 extern const u32 gMonPalette_VenusaurMega[];
 extern const u32 gMonPalette_CharizardMegaX[];
@@ -3518,7 +3517,7 @@ extern const u32 gMonPalette_TyphlosionHisuian[];
 extern const u32 gMonPalette_QwilfishHisuian[];
 extern const u32 gMonPalette_SneaselHisuian[];
 #if P_GEN_5_POKEMON == TRUE
-//extern const u32 gMonPalette_SamurottHisuian[];
+extern const u32 gMonPalette_SamurottHisuian[];
 extern const u32 gMonPalette_LilligantHisuian[];
 extern const u32 gMonPalette_ZoruaHisuian[];
 extern const u32 gMonPalette_ZoroarkHisuian[];
@@ -3530,7 +3529,7 @@ extern const u32 gMonPalette_GoodraHisuian[];
 extern const u32 gMonPalette_AvaluggHisuian[];
 #endif
 #if P_GEN_7_POKEMON == TRUE
-//extern const u32 gMonPalette_DecidueyeHisuian[];
+extern const u32 gMonPalette_DecidueyeHisuian[];
 #endif
 extern const u32 gMonPalette_PikachuCosplay[];
 extern const u32 gMonPalette_PikachuRockStar[];
@@ -3720,7 +3719,8 @@ extern const u32 gMonPalette_UrshifuRapidStrikeStyle[];
 extern const u32 gMonPalette_ZarudeDada[];
 extern const u32 gMonPalette_CalyrexIceRider[];
 extern const u32 gMonPalette_CalyrexShadowRider[];
-//extern const u32 gMonPalette_EnamorusTherian[];
+extern const u32 gMonPalette_EnamorusTherian[];
+extern const u32 gMonPalette_BasculegionFemale[];
 #endif
 extern const u32 gMonPalette_Egg[];
 
@@ -4639,14 +4639,13 @@ extern const u32 gMonShinyPalette_Regidrago[];
 extern const u32 gMonShinyPalette_Glastrier[];
 extern const u32 gMonShinyPalette_Spectrier[];
 extern const u32 gMonShinyPalette_Calyrex[];
-//extern const u32 gMonShinyPalette_Wyrdeer[];
+extern const u32 gMonShinyPalette_Wyrdeer[];
 extern const u32 gMonShinyPalette_Kleavor[];
 extern const u32 gMonShinyPalette_Ursaluna[];
-//extern const u32 gMonShinyPalette_Basculegion[];
-//extern const u32 gMonShinyPalette_BasculegionF[];
-//extern const u32 gMonShinyPalette_Sneasler[];
+extern const u32 gMonShinyPalette_Basculegion[];
+extern const u32 gMonShinyPalette_Sneasler[];
 extern const u32 gMonShinyPalette_Overqwil[];
-//extern const u32 gMonShinyPalette_Enamorus[];
+extern const u32 gMonShinyPalette_Enamorus[];
 #endif
 extern const u32 gMonShinyPalette_VenusaurMega[];
 extern const u32 gMonShinyPalette_CharizardMegaX[];
@@ -4751,7 +4750,7 @@ extern const u32 gMonShinyPalette_TyphlosionHisuian[];
 extern const u32 gMonShinyPalette_QwilfishHisuian[];
 extern const u32 gMonShinyPalette_SneaselHisuian[];
 #if P_GEN_5_POKEMON == TRUE
-//extern const u32 gMonShinyPalette_SamurottHisuian[];
+extern const u32 gMonShinyPalette_SamurottHisuian[];
 extern const u32 gMonShinyPalette_LilligantHisuian[];
 extern const u32 gMonShinyPalette_ZoruaHisuian[];
 extern const u32 gMonShinyPalette_ZoroarkHisuian[];
@@ -4763,7 +4762,7 @@ extern const u32 gMonShinyPalette_GoodraHisuian[];
 extern const u32 gMonShinyPalette_AvaluggHisuian[];
 #endif
 #if P_GEN_7_POKEMON == TRUE
-//extern const u32 gMonShinyPalette_DecidueyeHisuian[];
+extern const u32 gMonShinyPalette_DecidueyeHisuian[];
 #endif
 extern const u32 gMonShinyPalette_PikachuCosplay[];
 extern const u32 gMonShinyPalette_PikachuRockStar[];
@@ -4947,7 +4946,8 @@ extern const u32 gMonShinyPalette_UrshifuRapidStrikeStyle[];
 extern const u32 gMonShinyPalette_ZarudeDada[];
 extern const u32 gMonShinyPalette_CalyrexIceRider[];
 extern const u32 gMonShinyPalette_CalyrexShadowRider[];
-//extern const u32 gMonShinyPalette_EnamorusTherian[];
+extern const u32 gMonShinyPalette_EnamorusTherian[];
+extern const u32 gMonShinyPalette_BasculegionFemale[];
 #endif
 
 extern const u8 gMonIcon_QuestionMark[];
@@ -5870,7 +5870,6 @@ extern const u8 gMonIcon_Wyrdeer[];
 extern const u8 gMonIcon_Kleavor[];
 extern const u8 gMonIcon_Ursaluna[];
 extern const u8 gMonIcon_Basculegion[];
-extern const u8 gMonIcon_BasculegionF[];
 extern const u8 gMonIcon_Sneasler[];
 extern const u8 gMonIcon_Overqwil[];
 extern const u8 gMonIcon_Enamorus[];
@@ -6168,6 +6167,7 @@ extern const u8 gMonIcon_ZarudeDada[];
 extern const u8 gMonIcon_CalyrexIceRider[];
 extern const u8 gMonIcon_CalyrexShadowRider[];
 extern const u8 gMonIcon_EnamorusTherian[];
+extern const u8 gMonIcon_BasculegionFemale[];
 #endif
 extern const u8 gMonIcon_Egg[];
 

sound/cry_tables.inc

@@ -1334,13 +1334,13 @@ gCryTable::
 	cry Cry_Glastrier
 	cry Cry_Spectrier
 	cry Cry_Calyrex
-	cry Cry_Unown //Cry_Wyrdeer
-	cry Cry_Unown //Cry_Kleavor
-	cry Cry_Unown //Cry_Ursaluna
-	cry Cry_Unown //Cry_Basculegion
-	cry Cry_Unown //Cry_Sneasler
-	cry Cry_Unown //Cry_Overqwil
-	cry Cry_Unown //Cry_Enamorus
+	cry Cry_Wyrdeer
+	cry Cry_Kleavor
+	cry Cry_Ursaluna
+	cry Cry_Basculegion
+	cry Cry_Sneasler
+	cry Cry_Overqwil
+	cry Cry_Enamorus
 .else
 	cry Cry_Unown
 	cry Cry_Unown
@@ -1749,7 +1749,7 @@ gCryTable::
 	cry Cry_TornadusTherian
 	cry Cry_ThundurusTherian
 	cry Cry_LandorusTherian
-	cry Cry_Bulbasaur //Cry_EnamorusTherian
+	cry Cry_EnamorusTherian
 	@ Kyurem
 	cry Cry_KyuremWhite
 	cry Cry_KyuremBlack
@@ -3456,13 +3456,13 @@ gCryTable_Reverse::
 	cry_reverse Cry_Glastrier
 	cry_reverse Cry_Spectrier
 	cry_reverse Cry_Calyrex
-	cry_reverse Cry_Unown //Cry_Wyrdeer
-	cry_reverse Cry_Unown //Cry_Kleavor
-	cry_reverse Cry_Unown //Cry_Ursaluna
-	cry_reverse Cry_Unown //Cry_Basculegion
-	cry_reverse Cry_Unown //Cry_Sneasler
-	cry_reverse Cry_Unown //Cry_Overqwil
-	cry_reverse Cry_Unown //Cry_Enamorus
+	cry_reverse Cry_Wyrdeer
+	cry_reverse Cry_Kleavor
+	cry_reverse Cry_Ursaluna
+	cry_reverse Cry_Basculegion
+	cry_reverse Cry_Sneasler
+	cry_reverse Cry_Overqwil
+	cry_reverse Cry_Enamorus
 .else
 	cry_reverse Cry_Unown
 	cry_reverse Cry_Unown
@@ -3862,7 +3862,7 @@ gCryTable_Reverse::
 	cry_reverse Cry_TornadusTherian
 	cry_reverse Cry_ThundurusTherian
 	cry_reverse Cry_LandorusTherian
-	cry_reverse Cry_Bulbasaur //Cry_EnamorusTherian
+	cry_reverse Cry_EnamorusTherian
 	@ Kyurem
 	cry_reverse Cry_KyuremWhite
 	cry_reverse Cry_KyuremBlack

sound/direct_sound_data.inc

@@ -3986,7 +3986,7 @@ Cry_Spectrier::
 	.align 2
 Cry_Calyrex::
 	.incbin "sound/direct_sound_samples/cries/calyrex.bin"
-/*
+
 	.align 2
 Cry_Wyrdeer::
 	.incbin "sound/direct_sound_samples/cries/wyrdeer.bin"
@@ -4014,7 +4014,7 @@ Cry_Overqwil::
 	.align 2
 Cry_Enamorus::
 	.incbin "sound/direct_sound_samples/cries/enamorus.bin"
-*/
+
 .endif
 
 	.align 2
@@ -4360,11 +4360,10 @@ Cry_CalyrexIceRider::
 Cry_CalyrexShadowRider::
 	.incbin "sound/direct_sound_samples/cries/calyrex_shadow_rider.bin"
 
-/*
 	.align 2
 Cry_EnamorusTherian::
 	.incbin "sound/direct_sound_samples/cries/enamorus_therian.bin"
-*/
+
 .endif
 
 	.align 2

src/battle_message.c

@@ -476,8 +476,8 @@ static const u8 sText_PkmnBrokeFree[] = _("Oh, no!\nThe POKéMON broke free!");
 static const u8 sText_ItAppearedCaught[] = _("Aww!\nIt appeared to be caught!");
 static const u8 sText_AarghAlmostHadIt[] = _("Aargh!\nAlmost had it!");
 static const u8 sText_ShootSoClose[] = _("Shoot!\nIt was so close, too!");
-static const u8 sText_GotchaPkmnCaught[] = _("Gotcha!\n{B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p");
-static const u8 sText_GotchaPkmnCaught2[] = _("Gotcha!\n{B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}");
+static const u8 sText_GotchaPkmnCaughtPlayer[] = _("Gotcha!\n{B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}\p");
+static const u8 sText_GotchaPkmnCaughtWally[] = _("Gotcha!\n{B_DEF_NAME} was caught!{WAIT_SE}{PLAY_BGM MUS_CAUGHT}{PAUSE 127}");
 static const u8 sText_GiveNicknameCaptured[] = _("Give a nickname to the\ncaptured {B_DEF_NAME}?");
 static const u8 sText_PkmnSentToPC[] = _("{B_DEF_NAME} was sent to\n{B_PC_CREATOR_NAME} PC.");
 static const u8 sText_Someones[] = _("someone's");
@@ -1145,8 +1145,8 @@ const u8 *const gBattleStringsTable[BATTLESTRINGS_COUNT] =
     [STRINGID_ITAPPEAREDCAUGHT - BATTLESTRINGS_TABLE_START] = sText_ItAppearedCaught,
     [STRINGID_AARGHALMOSTHADIT - BATTLESTRINGS_TABLE_START] = sText_AarghAlmostHadIt,
     [STRINGID_SHOOTSOCLOSE - BATTLESTRINGS_TABLE_START] = sText_ShootSoClose,
-    [STRINGID_GOTCHAPKMNCAUGHT - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaught,
-    [STRINGID_GOTCHAPKMNCAUGHT2 - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaught2,
+    [STRINGID_GOTCHAPKMNCAUGHTPLAYER - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaughtPlayer,
+    [STRINGID_GOTCHAPKMNCAUGHTWALLY - BATTLESTRINGS_TABLE_START] = sText_GotchaPkmnCaughtWally,
     [STRINGID_GIVENICKNAMECAPTURED - BATTLESTRINGS_TABLE_START] = sText_GiveNicknameCaptured,
     [STRINGID_PKMNSENTTOPC - BATTLESTRINGS_TABLE_START] = sText_PkmnSentToPC,
     [STRINGID_PKMNDATAADDEDTODEX - BATTLESTRINGS_TABLE_START] = sText_PkmnDataAddedToDex,

src/battle_util.c

@@ -8710,6 +8710,10 @@ static u16 CalcMoveBasePower(u16 move, u8 battlerAtk, u8 battlerDef)
         basePower = CalcBeatUpPower();
         #endif
         break;
+    case EFFECT_PSYBLADE:
+        if (IsBattlerTerrainAffected(gBattlerAttacker, STATUS_FIELD_ELECTRIC_TERRAIN))
+            MulModifier(&basePower, UQ_4_12(1.5));
+        break;
     }
 
     // Move-specific base power changes
@@ -9524,7 +9528,7 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
     }
     else if (IsBattlerWeatherAffected(battlerAtk, B_WEATHER_SUN))
     {
-        if (moveType == TYPE_FIRE)
+        if (moveType == TYPE_FIRE || gBattleMoves[move].effect == EFFECT_HYDRO_STEAM)
             dmg = ApplyModifier(UQ_4_12(1.5), dmg);
         else if (moveType == TYPE_WATER)
             dmg = ApplyModifier(UQ_4_12(0.5), dmg);

src/data/battle_moves.h

@@ -6426,7 +6426,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
     [MOVE_WRING_OUT] =
     {
         .effect = EFFECT_WRING_OUT,
-        .power = 0,
+        .power = 1,
         .type = TYPE_NORMAL,
         .accuracy = 100,
         .pp = 5,
@@ -13593,6 +13593,36 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_Z] =
         .zMoveEffect = Z_EFFECT_NONE
     },
 
+    [MOVE_PSYBLADE] =
+    {
+        .effect = EFFECT_PSYBLADE,
+        .power = 80,
+        .type = TYPE_PSYCHIC,
+        .accuracy = 100,
+        .pp = 15,
+        .secondaryEffectChance = 0,
+        .target = MOVE_TARGET_SELECTED,
+        .priority = 0,
+        .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED | FLAG_SLICING_MOVE,
+        .split = SPLIT_PHYSICAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+    },
+
+    [MOVE_HYDRO_STEAM] =
+    {
+        .effect = EFFECT_HYDRO_STEAM,
+        .power = 80,
+        .type = TYPE_WATER,
+        .accuracy = 100,
+        .pp = 15,
+        .secondaryEffectChance = 0,
+        .target = MOVE_TARGET_SELECTED,
+        .priority = 0,
+        .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGS_ROCK_AFFECTED,
+        .split = SPLIT_SPECIAL,
+        .zMoveEffect = Z_EFFECT_NONE,
+    },
+
     // Z-Moves
     [MOVE_BREAKNECK_BLITZ] =
     {