merge with upcoming

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -23,8 +23,10 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.5.1 (Default)
+        - 1.5.3 (Default)
         - upcoming (Edge)
+        - 1.5.2
+        - 1.5.1
         - 1.5.0
         - 1.4.3
         - 1.4.2

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -23,8 +23,10 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.5.1 (Default)
+        - 1.5.3 (Default)
         - upcoming (Edge)
+        - 1.5.2
+        - 1.5.1
         - 1.5.0
         - 1.4.3
         - 1.4.2

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -23,8 +23,10 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using as a base?
       options:
-        - 1.5.1 (Default)
+        - 1.5.3 (Default)
         - upcoming (Edge)
+        - 1.5.2
+        - 1.5.1
         - 1.5.0
         - 1.4.3
         - 1.4.2

Makefile

@@ -450,7 +450,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 
 # NOTE: Based on C_DEP above, but without NODEP and KEEP_TEMPS handling.
 define TEST_DEP
-$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib -I test $2)
+$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
 	@echo "$$(CC1) <flags> -o $$@ $$<"
 	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
 endef

asm/macros/battle_script.inc

@@ -1318,7 +1318,7 @@
 	.2byte \holdEffect
 	.4byte \jumpInstr
 	.endm
-	
+
 	.macro dostockpilestatchangeswearoff, battler:req, statChangeInstr:req
 	callnative BS_DoStockpileStatChangesWearOff
 	.byte \battler
@@ -1354,7 +1354,7 @@
 	.macro setsnow
 	callnative BS_SetSnow
 	.endm
-	
+
 	.macro setzeffect
 	callnative BS_SetZEffect
 	.endm
@@ -1364,12 +1364,6 @@
 	callnative BS_TrySymbiosis
 	.endm
 
-	@ returns TRUE or FALSE to gBattleCommunication[0]
-	.macro canteleport battler:req
-	callnative BS_CanTeleport
-	.byte \battler
-	.endm
-
 	@ returns B_SIDE_x to gBattleCommunication[0]
 	.macro getbattlerside battler:req
 	callnative BS_GetBattlerSide
@@ -1643,6 +1637,11 @@
 	.byte \case
 	.endm
 
+	.macro handleultraburst battler:req, case:req
+	various \battler, VARIOUS_HANDLE_ULTRA_BURST
+	.byte \case
+	.endm
+
 	.macro handleformchange battler:req, case:req
 	various \battler, VARIOUS_HANDLE_FORM_CHANGE
 	.byte \case
@@ -2083,7 +2082,7 @@
 	.macro swapsidestatuses
 	various BS_ATTACKER, VARIOUS_SWAP_SIDE_STATUSES
 	.endm
-	
+
 	.macro swapstats stat:req
 	various BS_ATTACKER, VARIOUS_SWAP_STATS
 	.byte \stat
@@ -2184,6 +2183,11 @@
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpInstr
 	.endm
 
+	.macro jumpifside battler:req, side:req, equalJumpInstr:req
+	getbattlerside \battler
+	jumpifbyte CMP_EQUAL, gBattleCommunication, \side, \equalJumpInstr
+	.endm
+
 	.macro jumpifbattletype flags:req, jumpInstr:req
 	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpInstr
 	.endm

common_syms/battle_controllers.txt

@@ -0,0 +1,3 @@
+gBattlerControllerFuncs
+gBattleControllerData
+gBattlerControllerEndFuncs

common_syms/battle_main.txt

@@ -2,8 +2,6 @@ gPreBattleCallback1
 gBattleMainFunc
 gBattleResults
 gLeveledUpInBattle
-gBattlerControllerFuncs
 gHealthboxSpriteIds
 gMultiUsePlayerCursor
 gNumberOfMovesToChoose
-gBattleControllerData

data/battle_anim_scripts.s

@@ -947,6 +947,7 @@ gBattleAnims_General::
 	.4byte General_ZMoveActivate            @ B_ANIM_ZMOVE_ACTIVATE
 	.4byte General_AffectionHangedOn        @ B_ANIM_AFFECTION_HANGED_ON
 	.4byte General_Snow                     @ B_ANIM_SNOW_CONTINUES
+	.4byte General_UltraBurst               @ B_ANIM_ULTRA_BURST
 
 	.align 2
 gBattleAnims_Special::
@@ -27002,6 +27003,43 @@ General_PrimalReversion_Omega:
 	blendoff
 	end
 
+General_UltraBurst::
+	loadspritegfx ANIM_TAG_ULTRA_BURST_SYMBOL
+	loadspritegfx ANIM_TAG_SPARK_2 @spark
+	loadspritegfx ANIM_TAG_LEAF @green
+	loadspritegfx ANIM_TAG_ELECTRIC_ORBS @charge particles
+	loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @psycho boost
+	monbg ANIM_ATTACKER
+	setalpha 12, 8
+	createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ADJACENT), 0x2, 0x0, 0xF, 0x0000
+	waitforvisualfinish
+	createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12 	@ charge particles to attacker
+	delay 0x1e
+	loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 0xe, 0xa
+	createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 3, 0x0
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	call LightThatBurnsTheSkyGreenSparks
+	delay 20
+	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
+	createvisualtask AnimTask_TransformMon, 2, 1, 0
+	createsprite gUltraBurstSymbolSpriteTemplate, ANIM_ATTACKER, 0x0, 0x0, 0x0, 0x0, 0x0
+	waitforvisualfinish
+	createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
+	createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
+	waitforvisualfinish
+	createvisualtask SoundTask_PlayNormalCry, 0
+	waitforvisualfinish
+	clearmonbg ANIM_ATK_PARTNER
+	blendoff
+	end
+
 General_AffectionHangedOn::
 	loadspritegfx ANIM_TAG_RED_HEART
 	loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 12, 3

data/battle_scripts_1.s

@@ -4023,6 +4023,8 @@ BattleScript_MoveMissedDoDamage::
 .if B_CRASH_IF_TARGET_IMMUNE < GEN_4
 	jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
 .endif
+	moveendcase MOVEEND_PROTECT_LIKE_EFFECT @ Spiky Shield's damage happens before recoil.
+	jumpifhasnohp BS_ATTACKER, BattleScript_MoveEnd
 	printstring STRINGID_PKMNCRASHED
 	waitmessage B_WAIT_TIME_LONG
 	damagecalc
@@ -5048,7 +5050,7 @@ BattleScript_EffectBatonPass::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectRapidSpin::
-.if B_SPEED_BUFFING_RAPID_SPIN == GEN_8
+.if B_SPEED_BUFFING_RAPID_SPIN >= GEN_8
 	call BattleScript_EffectHit_Ret
 	jumpifhalfword CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
 	setmoveeffect MOVE_EFFECT_RAPIDSPIN | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN
@@ -5300,15 +5302,14 @@ BattleScript_EffectHurricane:
 BattleScript_EffectTeleport:
 	attackcanceler
 	attackstring
-	ppreduce
 .if B_TELEPORT_BEHAVIOR >= GEN_7
-	canteleport BS_ATTACKER
-	jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_EffectTeleportNew
-	goto BattleScript_ButItFailed
+	jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_EffectBatonPass
+	jumpifside BS_ATTACKER, B_SIDE_PLAYER, BattleScript_EffectBatonPass
 .else
 	jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
 .endif
 BattleScript_EffectTeleportTryToRunAway:
+	ppreduce
 	getifcantrunfrombattle BS_ATTACKER
 	jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
 	jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
@@ -5319,29 +5320,6 @@ BattleScript_EffectTeleportTryToRunAway:
 	setoutcomeonteleport BS_ATTACKER
 	goto BattleScript_MoveEnd
 
-BattleScript_EffectTeleportNew:
-	getbattlerside BS_ATTACKER
-	jumpifbyte CMP_EQUAL, gBattleCommunication, B_SIDE_OPPONENT, BattleScript_EffectTeleportTryToRunAway
-	attackanimation
-	waitanimation
-	openpartyscreen BS_ATTACKER, BattleScript_EffectTeleportNewEnd
-	switchoutabilities BS_ATTACKER
-	waitstate
-	switchhandleorder BS_ATTACKER, 2
-	returntoball BS_ATTACKER
-	getswitchedmondata BS_ATTACKER
-	switchindataupdate BS_ATTACKER
-	hpthresholds BS_ATTACKER
-	trytoclearprimalweather
-	printstring STRINGID_EMPTYSTRING3
-	waitmessage 1
-	printstring STRINGID_SWITCHINMON
-	switchinanim BS_ATTACKER, TRUE
-	waitstate
-	switchineffects BS_ATTACKER
-BattleScript_EffectTeleportNewEnd:
-	goto BattleScript_MoveEnd
-
 BattleScript_EffectBeatUp::
 	attackcanceler
 	accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
@@ -7818,6 +7796,21 @@ BattleScript_PrimalReversionRet::
 	switchinabilities BS_ATTACKER
 	return
 
+BattleScript_UltraBurst::
+	printstring STRINGID_EMPTYSTRING3
+	trytrainerslidezmovemsg BS_ATTACKER
+	printstring STRINGID_ULTRABURSTREACTING
+	waitmessage B_WAIT_TIME_LONG
+	setbyte gIsCriticalHit, 0
+	handleultraburst BS_ATTACKER, 0
+	playanimation BS_ATTACKER, B_ANIM_ULTRA_BURST
+	waitanimation
+	handleultraburst BS_ATTACKER, 1
+	printstring STRINGID_ULTRABURSTCOMPLETED
+	waitmessage B_WAIT_TIME_LONG
+	switchinabilities BS_ATTACKER
+	end3
+
 BattleScript_AttackerFormChange::
 	pause 5
 	copybyte gBattlerAbility, gBattlerAttacker

graphics/pokemon/abra/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-88 56 8
-120 96 24
-255 230 41
-90 57 8
-205 189 32
-246 246 164
-168 136 24
+255 0 255
+255 0 255
+255 0 255
+213 180 82
 172 131 41
-16 16 16
 131 98 8
-208 176 80
-176 160 152
-0 0 0
-0 0 0
-0 0 0
+90 57 0
+255 0 255
+246 246 164
+255 230 41
+205 189 32
+172 139 24
+131 90 16
+90 57 8
+16 16 16

graphics/pokemon/abra/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-136 80 24
-168 104 40
-248 240 128
-88 48 56
-232 200 48
-248 240 216
-200 152 32
-184 136 144
+255 0 255
+255 0 255
+255 0 255
+222 180 189
+189 139 148
+139 98 106
+90 49 57
+255 0 255
+255 246 222
+255 246 131
+238 205 49
+205 156 32
+172 106 41
+139 82 24
 16 16 16
-136 96 104
-208 176 80
-216 176 184
-0 0 0
-0 0 0
-0 0 0

graphics/pokemon/alakazam/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-112 88 8
-255 238 41
-213 189 16
-16 16 16
-255 246 172
-131 98 8
-82 49 8
+255 255 255
+222 222 222
+180 180 180
+90 90 90
 213 180 82
 180 131 41
-88 88 88
-248 248 248
-176 176 168
-216 216 216
-96 96 88
-80 48 8
+120 88 8
+82 49 8
+104 80 8
+152 112 0
+255 246 172
+255 238 24
+200 176 16
+112 88 8
+16 16 16

graphics/pokemon/alakazam/shiny.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-160 104 0
-240 208 32
-200 144 24
+255 255 255
+222 222 222
+180 180 180
+90 90 90
+255 148 230
+222 74 172
+172 41 115
+115 16 82
+104 64 8
+152 104 0
+255 238 131
+255 213 0
+213 148 8
+164 106 0
 16 16 16
-248 232 128
-152 48 112
-112 16 80
-248 144 224
-200 88 160
-88 88 88
-248 248 248
-176 176 176
-216 216 216
-88 88 88
-112 88 8

graphics/pokemon/arbok/normal.pal

@@ -2,18 +2,18 @@ JASC-PAL
 0100
 16
 152 208 160
-16 16 16
-164 131 197
-197 164 238
-123 98 172
-82 57 123
-197 197 197
-255 255 255
-156 16 0
-197 65 24
-156 16 0
+255 172 131
+197 180 0
+246 115 74
 197 65 24
 246 115 74
-197 180 0
-120 96 168
-0 0 0
+197 65 24
+156 16 0
+16 16 16
+197 164 238
+164 131 197
+123 98 172
+82 57 123
+156 16 0
+197 197 197
+255 255 255