Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate
LOuroboros
2
Makefile
@ -464,7 +464,7 @@ LD_SCRIPT_TEST := ld_script_test.txt
|
|||||||
$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
|
$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
|
||||||
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld
|
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld
|
||||||
|
|
||||||
$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall check-tools
|
$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools
|
||||||
@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ <objects> <test-objects> <lib>"
|
@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ <objects> <test-objects> <lib>"
|
||||||
@cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB)
|
@cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB)
|
||||||
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
|
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
|
||||||
|
|||||||
@ -1318,6 +1318,12 @@
|
|||||||
.4byte \jumpInstr
|
.4byte \jumpInstr
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
.macro jumpifmorethanhalfHP battler:req, jumpInstr:req
|
||||||
|
callnative BS_JumpIfMoreThanHalfHP
|
||||||
|
.byte \battler
|
||||||
|
.4byte \jumpInstr
|
||||||
|
.endm
|
||||||
|
|
||||||
@ various command changed to more readable macros
|
@ various command changed to more readable macros
|
||||||
.macro cancelmultiturnmoves battler:req
|
.macro cancelmultiturnmoves battler:req
|
||||||
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
|
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
|
||||||
@ -2049,11 +2055,6 @@
|
|||||||
various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES
|
various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
.macro jumpifnovalidtargets jumpInstr:req
|
|
||||||
various BS_ATTACKER, VARIOUS_JUMP_IF_NO_VALID_TARGETS
|
|
||||||
.4byte \jumpInstr
|
|
||||||
.endm
|
|
||||||
|
|
||||||
.macro trytrainerslidezmovemsg battler:req
|
.macro trytrainerslidezmovemsg battler:req
|
||||||
various \battler, VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE
|
various \battler, VARIOUS_TRY_TRAINER_SLIDE_MSG_Z_MOVE
|
||||||
.endm
|
.endm
|
||||||
@ -2255,3 +2256,12 @@
|
|||||||
various \battler, VARIOUS_JUMP_IF_EMERGENCY_EXITED
|
various \battler, VARIOUS_JUMP_IF_EMERGENCY_EXITED
|
||||||
.4byte \jumpInstr
|
.4byte \jumpInstr
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
.macro jumpifshelltrap battler:req, ptr:req
|
||||||
|
various \battler, VARIOUS_JUMP_IF_SHELL_TRAP
|
||||||
|
.4byte \ptr
|
||||||
|
.endm
|
||||||
|
|
||||||
|
.macro hitswitchtargetfailed
|
||||||
|
various 0, VARIOUS_HIT_SWITCH_TARGET_FAILED
|
||||||
|
.endm
|
||||||
|
|||||||
@ -12036,168 +12036,168 @@ ShellTrapUnleash:
|
|||||||
monbg ANIM_TARGET
|
monbg ANIM_TARGET
|
||||||
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
|
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
|
||||||
delay 0x6
|
delay 0x6
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapYellowImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x0
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x4
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x8
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0xc
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x10
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x14
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x2
|
delay 0x2
|
||||||
launchtemplate gFireSpiralOutwardSpriteTemplate 0x3 0x4 0x0 0x0 0x38 0x18
|
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
launchtemplate gShellTrapRedImpactTemplate 0x2 0x4 0x0 0x0 0x0 0x2
|
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
|
||||||
delay 0x5
|
delay 0x5
|
||||||
waitforvisualfinish
|
waitforvisualfinish
|
||||||
call ShellTrapFireLaunch1
|
call ShellTrapFireLaunch1
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
call ShellTrapFireLaunch2
|
call ShellTrapFireLaunch2
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
delay 0x3
|
delay 0x3
|
||||||
waitforvisualfinish
|
waitforvisualfinish
|
||||||
clearmonbg ANIM_TARGET
|
clearmonbg ANIM_TARGET
|
||||||
end
|
end
|
||||||
ShellTrapFireLaunch1:
|
ShellTrapFireLaunch1:
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xf 0x0 0xf 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x14 0x0 0x14 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1
|
||||||
delay 0x3
|
delay 0x3
|
||||||
return
|
return
|
||||||
ShellTrapFireLaunch2:
|
ShellTrapFireLaunch2:
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x0 0x0 0x0 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xfff6 0x0 0xfff6 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xa 0x0 0xa 0x38 0xfffc 0x3 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0xfffc 0x5 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xf 0x0 0xf 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0xffec 0x0 0xffec 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
launchtemplate gShellTrapFireHitsTemplate 0x28 0x8 0x0 0x14 0x0 0x14 0x38 0x4 0x4 0x1
|
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1
|
||||||
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_TARGET 0x0003 0x0000 0x0006 0x0001
|
createvisualtaskontargets AnimTask_ShakeMon, 0x2, 0, ANIM_TARGET, 0x0003, 0x0000, 0x0006, 0x0001
|
||||||
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
|
||||||
delay 0x3
|
delay 0x3
|
||||||
return
|
return
|
||||||
@ -24206,21 +24206,21 @@ WaterBubblesEffectLong:
|
|||||||
ElectricityEffect:
|
ElectricityEffect:
|
||||||
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
|
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
|
||||||
ElectricityEffectNoSound:
|
ElectricityEffectNoSound:
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET
|
||||||
delay 2
|
delay 2
|
||||||
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET
|
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET
|
||||||
return
|
return
|
||||||
|
|
||||||
ElectricityEffect_OnTargets:
|
ElectricityEffect_OnTargets:
|
||||||
|
|||||||
@ -417,6 +417,7 @@ gBattleScriptsForMoveEffects::
|
|||||||
.4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE
|
.4byte BattleScript_EffectVictoryDance @ EFFECT_VICTORY_DANCE
|
||||||
.4byte BattleScript_EffectTeatime @ EFFECT_TEATIME
|
.4byte BattleScript_EffectTeatime @ EFFECT_TEATIME
|
||||||
.4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY
|
.4byte BattleScript_EffectAttackUpUserAlly @ EFFECT_ATTACK_UP_USER_ALLY
|
||||||
|
.4byte BattleScript_EffectShellTrap @ EFFECT_SHELL_TRAP
|
||||||
|
|
||||||
BattleScript_EffectAttackUpUserAlly:
|
BattleScript_EffectAttackUpUserAlly:
|
||||||
jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp
|
jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp
|
||||||
@ -557,6 +558,23 @@ BattleScript_AffectionBasedStatusHeal_Continue:
|
|||||||
waitstate
|
waitstate
|
||||||
end2
|
end2
|
||||||
|
|
||||||
|
BattleScript_ShellTrapSetUp::
|
||||||
|
printstring STRINGID_EMPTYSTRING3
|
||||||
|
waitmessage 0x1
|
||||||
|
playanimation BS_ATTACKER, B_ANIM_SHELL_TRAP_SETUP, NULL
|
||||||
|
printstring STRINGID_PREPARESHELLTRAP
|
||||||
|
waitmessage B_WAIT_TIME_LONG
|
||||||
|
end2
|
||||||
|
|
||||||
|
BattleScript_EffectShellTrap::
|
||||||
|
attackcanceler
|
||||||
|
jumpifshelltrap BS_ATTACKER, BattleScript_HitFromAccCheck
|
||||||
|
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_MoveEnd
|
||||||
|
ppreduce
|
||||||
|
printstring STRINGID_SHELLTRAPDIDNTWORK
|
||||||
|
waitmessage B_WAIT_TIME_LONG
|
||||||
|
goto BattleScript_MoveEnd
|
||||||
|
|
||||||
BattleScript_EffectSteelBeam::
|
BattleScript_EffectSteelBeam::
|
||||||
attackcanceler
|
attackcanceler
|
||||||
attackstring
|
attackstring
|
||||||
@ -2128,9 +2146,14 @@ BattleScript_EffectHitSwitchTarget:
|
|||||||
moveendall
|
moveendall
|
||||||
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
|
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
|
||||||
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
|
jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
|
||||||
tryhitswitchtarget BattleScript_EffectHitSwitchTargetMoveEnd
|
tryhitswitchtarget BattleScript_MoveEnd
|
||||||
BattleScript_EffectHitSwitchTargetMoveEnd:
|
forcerandomswitch BattleScript_HitSwitchTargetForceRandomSwitchFailed
|
||||||
end
|
goto BattleScript_MoveEnd
|
||||||
|
|
||||||
|
BattleScript_HitSwitchTargetForceRandomSwitchFailed:
|
||||||
|
hitswitchtargetfailed
|
||||||
|
setbyte sSWITCH_CASE, B_SWITCH_NORMAL
|
||||||
|
goto BattleScript_MoveEnd
|
||||||
|
|
||||||
BattleScript_EffectClearSmog:
|
BattleScript_EffectClearSmog:
|
||||||
setmoveeffect MOVE_EFFECT_CLEAR_SMOG
|
setmoveeffect MOVE_EFFECT_CLEAR_SMOG
|
||||||
@ -3413,26 +3436,19 @@ BattleScript_EffectParalyzeHit::
|
|||||||
setmoveeffect MOVE_EFFECT_PARALYSIS
|
setmoveeffect MOVE_EFFECT_PARALYSIS
|
||||||
goto BattleScript_EffectHit
|
goto BattleScript_EffectHit
|
||||||
|
|
||||||
BattleScript_EffectExplosion::
|
BattleScript_EffectExplosion_AnimDmgRet:
|
||||||
attackcanceler
|
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionAnimRet
|
||||||
attackstring
|
|
||||||
ppreduce
|
|
||||||
@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can)
|
|
||||||
tryexplosion
|
|
||||||
setatkhptozero
|
|
||||||
waitstate
|
|
||||||
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
|
|
||||||
call BattleScript_PreserveMissedBitDoMoveAnim
|
call BattleScript_PreserveMissedBitDoMoveAnim
|
||||||
goto BattleScript_ExplosionLoop
|
goto BattleScript_ExplosionDmgRet
|
||||||
BattleScript_ExplosionDoAnimStartLoop:
|
BattleScript_ExplosionAnimRet:
|
||||||
attackanimation
|
attackanimation
|
||||||
waitanimation
|
waitanimation
|
||||||
BattleScript_ExplosionLoop:
|
BattleScript_ExplosionDmgRet:
|
||||||
movevaluescleanup
|
movevaluescleanup
|
||||||
critcalc
|
critcalc
|
||||||
damagecalc
|
damagecalc
|
||||||
adjustdamage
|
adjustdamage
|
||||||
accuracycheck BattleScript_ExplosionMissed, ACC_CURR_MOVE
|
accuracycheck BattleScript_ExplosionMissedRet, ACC_CURR_MOVE
|
||||||
effectivenesssound
|
effectivenesssound
|
||||||
hitanimation BS_TARGET
|
hitanimation BS_TARGET
|
||||||
waitstate
|
waitstate
|
||||||
@ -3443,17 +3459,25 @@ BattleScript_ExplosionLoop:
|
|||||||
resultmessage
|
resultmessage
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
tryfaintmon BS_TARGET
|
tryfaintmon BS_TARGET
|
||||||
moveendto MOVEEND_NEXT_TARGET
|
BattleScript_ExplosionAnimEndRet_Return:
|
||||||
jumpifnexttargetvalid BattleScript_ExplosionLoop
|
return
|
||||||
tryfaintmon BS_ATTACKER
|
BattleScript_ExplosionMissedRet:
|
||||||
moveendcase MOVEEND_CLEAR_BITS
|
|
||||||
end
|
|
||||||
BattleScript_ExplosionMissed:
|
|
||||||
effectivenesssound
|
effectivenesssound
|
||||||
resultmessage
|
resultmessage
|
||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
moveendto MOVEEND_NEXT_TARGET
|
goto BattleScript_ExplosionAnimEndRet_Return
|
||||||
jumpifnexttargetvalid BattleScript_ExplosionLoop
|
|
||||||
|
BattleScript_EffectExplosion::
|
||||||
|
attackcanceler
|
||||||
|
attackstring
|
||||||
|
ppreduce
|
||||||
|
@ Below jumps to BattleScript_DampStopsExplosion if it fails (only way it can)
|
||||||
|
tryexplosion
|
||||||
|
waitstate
|
||||||
|
BattleScript_EffectExplosion_AnimDmgFaintAttacker:
|
||||||
|
call BattleScript_EffectExplosion_AnimDmgRet
|
||||||
|
moveendall
|
||||||
|
setatkhptozero
|
||||||
tryfaintmon BS_ATTACKER
|
tryfaintmon BS_ATTACKER
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -3461,14 +3485,28 @@ BattleScript_EffectMindBlown::
|
|||||||
attackcanceler
|
attackcanceler
|
||||||
attackstring
|
attackstring
|
||||||
ppreduce
|
ppreduce
|
||||||
tryexplosion
|
jumpifbyte CMP_GREATER_THAN, sB_ANIM_TARGETS_HIT, 0, BattleScript_EffectMindBlown_NoHpLoss
|
||||||
|
jumpifabilitypresent ABILITY_DAMP, BattleScript_MindBlownDamp
|
||||||
|
jumpifmorethanhalfHP BS_ATTACKER, BattleScript_EffectMindBlown_HpDown
|
||||||
|
setbyte sMULTIHIT_EFFECT, 0 @ Note to faint the attacker
|
||||||
|
instanthpdrop BS_ATTACKER
|
||||||
|
waitstate
|
||||||
|
goto BattleScript_EffectExplosion_AnimDmgFaintAttacker
|
||||||
|
BattleScript_EffectMindBlown_NoHpLoss:
|
||||||
|
jumpifbyte CMP_EQUAL, sMULTIHIT_EFFECT, 0, BattleScript_EffectExplosion_AnimDmgFaintAttacker
|
||||||
|
goto BattleScript_EffectMindBlown_AnimDmgNoFaint
|
||||||
|
BattleScript_MindBlownDamp:
|
||||||
|
copybyte gBattlerTarget, gBattlerAbility
|
||||||
|
goto BattleScript_DampStopsExplosion
|
||||||
|
BattleScript_EffectMindBlown_HpDown:
|
||||||
|
setbyte sMULTIHIT_EFFECT, 1 @ Note to not faint the attacker
|
||||||
dmg_1_2_attackerhp
|
dmg_1_2_attackerhp
|
||||||
healthbarupdate BS_ATTACKER
|
healthbarupdate BS_ATTACKER
|
||||||
datahpupdate BS_ATTACKER
|
datahpupdate BS_ATTACKER
|
||||||
waitstate
|
waitstate
|
||||||
jumpifbyte CMP_NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_ExplosionDoAnimStartLoop
|
BattleScript_EffectMindBlown_AnimDmgNoFaint:
|
||||||
call BattleScript_PreserveMissedBitDoMoveAnim
|
call BattleScript_EffectExplosion_AnimDmgRet
|
||||||
goto BattleScript_ExplosionLoop
|
goto BattleScript_MoveEnd
|
||||||
|
|
||||||
BattleScript_PreserveMissedBitDoMoveAnim:
|
BattleScript_PreserveMissedBitDoMoveAnim:
|
||||||
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
|
bichalfword gMoveResultFlags, MOVE_RESULT_MISSED
|
||||||
@ -3708,7 +3746,6 @@ BattleScript_EffectRoar::
|
|||||||
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
|
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
|
||||||
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
|
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
|
||||||
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
|
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
|
||||||
BattleScript_ForceRandomSwitch::
|
|
||||||
forcerandomswitch BattleScript_ButItFailed
|
forcerandomswitch BattleScript_ButItFailed
|
||||||
|
|
||||||
BattleScript_EffectMultiHit::
|
BattleScript_EffectMultiHit::
|
||||||
@ -8360,9 +8397,9 @@ BattleScript_AbilityRaisesDefenderStat::
|
|||||||
BattleScript_AbilityPopUp:
|
BattleScript_AbilityPopUp:
|
||||||
.if B_ABILITY_POP_UP == TRUE
|
.if B_ABILITY_POP_UP == TRUE
|
||||||
showabilitypopup BS_ABILITY_BATTLER
|
showabilitypopup BS_ABILITY_BATTLER
|
||||||
recordability BS_ABILITY_BATTLER
|
|
||||||
pause 40
|
pause 40
|
||||||
.endif
|
.endif
|
||||||
|
recordability BS_ABILITY_BATTLER
|
||||||
sethword sABILITY_OVERWRITE, 0
|
sethword sABILITY_OVERWRITE, 0
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -8573,7 +8610,6 @@ BattleScript_TryAdrenalineOrbRet:
|
|||||||
return
|
return
|
||||||
|
|
||||||
BattleScript_IntimidateActivates::
|
BattleScript_IntimidateActivates::
|
||||||
jumpifnovalidtargets BattleScript_IntimidateEnd
|
|
||||||
showabilitypopup BS_ATTACKER
|
showabilitypopup BS_ATTACKER
|
||||||
pause B_WAIT_TIME_LONG
|
pause B_WAIT_TIME_LONG
|
||||||
destroyabilitypopup
|
destroyabilitypopup
|
||||||
@ -9132,16 +9168,6 @@ BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
|
|||||||
waitmessage B_WAIT_TIME_LONG
|
waitmessage B_WAIT_TIME_LONG
|
||||||
end3
|
end3
|
||||||
|
|
||||||
BattleScript_TargetAbilityStatRaiseOnMoveEnd::
|
|
||||||
call BattleScript_AbilityPopUp
|
|
||||||
statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
|
|
||||||
setgraphicalstatchangevalues
|
|
||||||
playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
|
|
||||||
waitanimation
|
|
||||||
printstring STRINGID_ABILITYRAISEDSTATDRASTICALLY
|
|
||||||
waitmessage B_WAIT_TIME_LONG
|
|
||||||
return
|
|
||||||
|
|
||||||
BattleScript_ScriptingAbilityStatRaise::
|
BattleScript_ScriptingAbilityStatRaise::
|
||||||
copybyte gBattlerAbility, sBATTLER
|
copybyte gBattlerAbility, sBATTLER
|
||||||
call BattleScript_AbilityPopUp
|
call BattleScript_AbilityPopUp
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 881 B After Width: | Height: | Size: 761 B |
|
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 273 B |
|
Before Width: | Height: | Size: 266 B After Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 271 B After Width: | Height: | Size: 198 B |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 275 B |
|
Before Width: | Height: | Size: 483 B After Width: | Height: | Size: 399 B |
|
Before Width: | Height: | Size: 430 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 469 B After Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 498 B After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 402 B After Width: | Height: | Size: 315 B |
|
Before Width: | Height: | Size: 435 B After Width: | Height: | Size: 382 B |
|
Before Width: | Height: | Size: 466 B After Width: | Height: | Size: 373 B |
|
Before Width: | Height: | Size: 459 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 500 B After Width: | Height: | Size: 398 B |
|
Before Width: | Height: | Size: 589 B After Width: | Height: | Size: 479 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 291 B |
|
Before Width: | Height: | Size: 434 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 543 B After Width: | Height: | Size: 444 B |
|
Before Width: | Height: | Size: 440 B After Width: | Height: | Size: 356 B |
|
Before Width: | Height: | Size: 576 B After Width: | Height: | Size: 489 B |
|
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 412 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 506 B After Width: | Height: | Size: 419 B |
|
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 514 B After Width: | Height: | Size: 430 B |
|
Before Width: | Height: | Size: 336 B After Width: | Height: | Size: 250 B |
|
Before Width: | Height: | Size: 349 B After Width: | Height: | Size: 254 B |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 365 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 343 B After Width: | Height: | Size: 248 B |
|
Before Width: | Height: | Size: 457 B After Width: | Height: | Size: 361 B |
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 288 B |
|
Before Width: | Height: | Size: 393 B After Width: | Height: | Size: 298 B |
|
Before Width: | Height: | Size: 415 B After Width: | Height: | Size: 334 B |
|
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 324 B |
|
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 258 B |
|
Before Width: | Height: | Size: 289 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 264 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 258 B |
|
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 277 B |
|
Before Width: | Height: | Size: 388 B After Width: | Height: | Size: 287 B |
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 295 B |
|
Before Width: | Height: | Size: 418 B After Width: | Height: | Size: 317 B |
|
Before Width: | Height: | Size: 406 B After Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 329 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 375 B After Width: | Height: | Size: 276 B |
|
Before Width: | Height: | Size: 396 B After Width: | Height: | Size: 299 B |
|
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 258 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 266 B |
|
Before Width: | Height: | Size: 371 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 327 B |
|
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 228 B |
|
Before Width: | Height: | Size: 383 B After Width: | Height: | Size: 292 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 326 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 324 B |
|
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 288 B |
|
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 446 B After Width: | Height: | Size: 348 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 327 B |
|
Before Width: | Height: | Size: 368 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 304 B |
|
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 322 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 298 B |
|
Before Width: | Height: | Size: 434 B After Width: | Height: | Size: 324 B |
|
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 252 B |