Merge with master
@ -4275,7 +4275,7 @@ BattleScript_BerryCurePrlzEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureParRet::
|
BattleScript_BerryCureParRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
|
printstring STRINGID_PKMNSITEMCUREDPARALYSIS
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4287,7 +4287,7 @@ BattleScript_BerryCurePsnEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCurePsnRet::
|
BattleScript_BerryCurePsnRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMCUREDPOISON
|
printstring STRINGID_PKMNSITEMCUREDPOISON
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4299,7 +4299,7 @@ BattleScript_BerryCureBrnEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureBrnRet::
|
BattleScript_BerryCureBrnRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMHEALEDBURN
|
printstring STRINGID_PKMNSITEMHEALEDBURN
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4311,7 +4311,7 @@ BattleScript_BerryCureFrzEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureFrzRet::
|
BattleScript_BerryCureFrzRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMDEFROSTEDIT
|
printstring STRINGID_PKMNSITEMDEFROSTEDIT
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4323,7 +4323,7 @@ BattleScript_BerryCureSlpEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureSlpRet::
|
BattleScript_BerryCureSlpRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMWOKEIT
|
printstring STRINGID_PKMNSITEMWOKEIT
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4335,7 +4335,7 @@ BattleScript_BerryCureConfusionEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureConfusionRet::
|
BattleScript_BerryCureConfusionRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMSNAPPEDOUT
|
printstring STRINGID_PKMNSITEMSNAPPEDOUT
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
removeitem BS_SCRIPTING
|
removeitem BS_SCRIPTING
|
||||||
@ -4346,7 +4346,7 @@ BattleScript_BerryCureChosenStatusEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryCureChosenStatusRet::
|
BattleScript_BerryCureChosenStatusRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printfromtable gBerryEffectStringIds
|
printfromtable gBerryEffectStringIds
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
updatestatusicon BS_SCRIPTING
|
updatestatusicon BS_SCRIPTING
|
||||||
@ -4358,14 +4358,14 @@ BattleScript_WhiteHerbEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_WhiteHerbRet::
|
BattleScript_WhiteHerbRet::
|
||||||
playanimation BS_SCRIPTING, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
|
printstring STRINGID_PKMNSITEMRESTOREDSTATUS
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
removeitem BS_SCRIPTING
|
removeitem BS_SCRIPTING
|
||||||
return
|
return
|
||||||
|
|
||||||
BattleScript_ItemHealHP_RemoveItem::
|
BattleScript_ItemHealHP_RemoveItem::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
|
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
||||||
@ -4375,7 +4375,7 @@ BattleScript_ItemHealHP_RemoveItem::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryPPHealEnd2::
|
BattleScript_BerryPPHealEnd2::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMRESTOREDPP
|
printstring STRINGID_PKMNSITEMRESTOREDPP
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
removeitem BS_ATTACKER
|
removeitem BS_ATTACKER
|
||||||
@ -4386,7 +4386,7 @@ BattleScript_ItemHealHP_End2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_ItemHealHP_Ret::
|
BattleScript_ItemHealHP_Ret::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
|
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
||||||
@ -4398,14 +4398,14 @@ BattleScript_SelectingNotAllowedMoveChoiceItem::
|
|||||||
printselectionstring STRINGID_ITEMALLOWSONLYYMOVE
|
printselectionstring STRINGID_ITEMALLOWSONLYYMOVE
|
||||||
endselectionscript
|
endselectionscript
|
||||||
|
|
||||||
BattleScript_HangedOnMsg::
|
BattleScript_FocusBandActivates::
|
||||||
playanimation BS_TARGET, B_ANIM_HANGED_ON, NULL
|
playanimation BS_TARGET, B_ANIM_FOCUS_BAND, NULL
|
||||||
printstring STRINGID_PKMNHUNGONWITHX
|
printstring STRINGID_PKMNHUNGONWITHX
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
return
|
return
|
||||||
|
|
||||||
BattleScript_BerryConfuseHealEnd2::
|
BattleScript_BerryConfuseHealEnd2::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
|
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
|
||||||
@ -4419,7 +4419,7 @@ BattleScript_BerryConfuseHealEnd2::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryStatRaiseEnd2::
|
BattleScript_BerryStatRaiseEnd2::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B
|
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_82DB85B
|
||||||
BattleScript_82DB85B::
|
BattleScript_82DB85B::
|
||||||
setbyte cMULTISTRING_CHOOSER, 0x4
|
setbyte cMULTISTRING_CHOOSER, 0x4
|
||||||
@ -4428,7 +4428,7 @@ BattleScript_82DB85B::
|
|||||||
end2
|
end2
|
||||||
|
|
||||||
BattleScript_BerryFocusEnergyEnd2::
|
BattleScript_BerryFocusEnergyEnd2::
|
||||||
playanimation BS_ATTACKER, B_ANIM_ITEM_EFFECT, NULL
|
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
|
||||||
printstring STRINGID_PKMNUSEDXTOGETPUMPED
|
printstring STRINGID_PKMNUSEDXTOGETPUMPED
|
||||||
waitmessage 0x40
|
waitmessage 0x40
|
||||||
removeitem BS_ATTACKER
|
removeitem BS_ATTACKER
|
||||||
|
Before Width: | Height: | Size: 188 B After Width: | Height: | Size: 188 B |
Before Width: | Height: | Size: 308 B |
Before Width: | Height: | Size: 405 B After Width: | Height: | Size: 405 B |
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 397 B After Width: | Height: | Size: 397 B |
Before Width: | Height: | Size: 317 B After Width: | Height: | Size: 317 B |
Before Width: | Height: | Size: 308 B After Width: | Height: | Size: 308 B |
Before Width: | Height: | Size: 306 B After Width: | Height: | Size: 306 B |
Before Width: | Height: | Size: 306 B |
@ -1,19 +0,0 @@
|
|||||||
JASC-PAL
|
|
||||||
0100
|
|
||||||
16
|
|
||||||
0 255 0
|
|
||||||
255 255 255
|
|
||||||
0 0 0
|
|
||||||
255 255 255
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
@ -1,19 +0,0 @@
|
|||||||
JASC-PAL
|
|
||||||
0100
|
|
||||||
16
|
|
||||||
0 255 0
|
|
||||||
255 255 255
|
|
||||||
0 0 0
|
|
||||||
255 255 255
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
||||||
0 0 0
|
|
Before Width: | Height: | Size: 345 B After Width: | Height: | Size: 345 B |
Before Width: | Height: | Size: 376 B After Width: | Height: | Size: 376 B |
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 337 B |
Before Width: | Height: | Size: 245 B After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 362 B After Width: | Height: | Size: 362 B |
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
Before Width: | Height: | Size: 355 B After Width: | Height: | Size: 355 B |
Before Width: | Height: | Size: 256 B After Width: | Height: | Size: 256 B |
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 403 B |
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 505 B |
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 395 B |
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 276 B |
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 451 B After Width: | Height: | Size: 451 B |
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 400 B |
Before Width: | Height: | Size: 325 B After Width: | Height: | Size: 325 B |
Before Width: | Height: | Size: 249 B After Width: | Height: | Size: 249 B |
Before Width: | Height: | Size: 301 B After Width: | Height: | Size: 301 B |
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
Before Width: | Height: | Size: 294 B After Width: | Height: | Size: 294 B |
Before Width: | Height: | Size: 220 B After Width: | Height: | Size: 220 B |
Before Width: | Height: | Size: 372 B After Width: | Height: | Size: 372 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 364 B After Width: | Height: | Size: 364 B |
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
Before Width: | Height: | Size: 369 B After Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 431 B After Width: | Height: | Size: 431 B |
Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 359 B |
Before Width: | Height: | Size: 241 B After Width: | Height: | Size: 241 B |
Before Width: | Height: | Size: 433 B After Width: | Height: | Size: 433 B |
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 534 B |
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 270 B After Width: | Height: | Size: 270 B |
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
Before Width: | Height: | Size: 328 B After Width: | Height: | Size: 328 B |
Before Width: | Height: | Size: 305 B After Width: | Height: | Size: 305 B |
Before Width: | Height: | Size: 223 B After Width: | Height: | Size: 223 B |
Before Width: | Height: | Size: 342 B After Width: | Height: | Size: 342 B |
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
Before Width: | Height: | Size: 334 B After Width: | Height: | Size: 334 B |
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
Before Width: | Height: | Size: 354 B After Width: | Height: | Size: 354 B |
Before Width: | Height: | Size: 388 B After Width: | Height: | Size: 388 B |
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 347 B |
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
Before Width: | Height: | Size: 321 B After Width: | Height: | Size: 321 B |
Before Width: | Height: | Size: 356 B After Width: | Height: | Size: 356 B |
Before Width: | Height: | Size: 315 B After Width: | Height: | Size: 315 B |
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 243 B |
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 423 B |
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 499 B |
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 414 B |
Before Width: | Height: | Size: 268 B After Width: | Height: | Size: 268 B |
Before Width: | Height: | Size: 385 B After Width: | Height: | Size: 385 B |
Before Width: | Height: | Size: 474 B After Width: | Height: | Size: 474 B |
Before Width: | Height: | Size: 379 B After Width: | Height: | Size: 379 B |
Before Width: | Height: | Size: 259 B After Width: | Height: | Size: 259 B |
Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 426 B |
Before Width: | Height: | Size: 517 B After Width: | Height: | Size: 517 B |
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 417 B |
Before Width: | Height: | Size: 260 B After Width: | Height: | Size: 260 B |
Before Width: | Height: | Size: 318 B After Width: | Height: | Size: 318 B |
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 333 B |
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
Before Width: | Height: | Size: 227 B After Width: | Height: | Size: 227 B |
Before Width: | Height: | Size: 327 B After Width: | Height: | Size: 327 B |
Before Width: | Height: | Size: 335 B After Width: | Height: | Size: 335 B |
Before Width: | Height: | Size: 320 B After Width: | Height: | Size: 320 B |
Before Width: | Height: | Size: 238 B After Width: | Height: | Size: 238 B |
Before Width: | Height: | Size: 339 B After Width: | Height: | Size: 339 B |
Before Width: | Height: | Size: 382 B After Width: | Height: | Size: 382 B |
Before Width: | Height: | Size: 332 B After Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 245 B After Width: | Height: | Size: 245 B |
Before Width: | Height: | Size: 319 B After Width: | Height: | Size: 319 B |
Before Width: | Height: | Size: 337 B After Width: | Height: | Size: 337 B |
Before Width: | Height: | Size: 313 B After Width: | Height: | Size: 313 B |