dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

give some more labels to battle struct fields

Browse Source
This commit is contained in:
DizzyEggg
2017-12-02 23:31:58 +01:00
parent d75e7ace1d
commit e10aea9a51
6 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
data/battle_scripts_1.s
View File

@@ -624,19 +624,19 @@ BattleScript_EffectMultiHit::
ppreduce
setmultihitcounter 0x0
initmultihitstring
setbyte sFIELD_16, 0x0
BattleScript_82D8DFD::
jumpifhasnohp ATTACKER, BattleScript_82D8E93
jumpifhasnohp TARGET, BattleScript_82D8E74
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_82D8E1F
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_82D8E74
BattleScript_82D8E1F::
setbyte sMULTIHIT_EFFECT, 0x0
BattleScript_MultiHitLoop::
jumpifhasnohp ATTACKER, BattleScript_MultiHitEnd
jumpifhasnohp TARGET, BattleScript_MultiHitPrintStrings
jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoMultiHit
jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_MultiHitPrintStrings
BattleScript_DoMultiHit::
movevaluescleanup
copybyte cEFFECT_CHOOSER, sFIELD_16
copybyte cEFFECT_CHOOSER, sMULTIHIT_EFFECT
critcalc
damagecalc
typecalc
jumpifmovehadnoeffect BattleScript_82D8E71
jumpifmovehadnoeffect BattleScript_MultiHitNoMoreHits
adjustnormaldamage
attackanimation
waitanimation
@@ -652,19 +652,19 @@ BattleScript_82D8E1F::
addbyte sMULTIHIT_STRING + 4, 0x1
setbyte sMOVEEND_STATE, 0x0
moveend 0x2, 0x10
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_82D8E74
decrementmultihit BattleScript_82D8DFD
goto BattleScript_82D8E74
BattleScript_82D8E71::
jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings
decrementmultihit BattleScript_MultiHitLoop
goto BattleScript_MultiHitPrintStrings
BattleScript_MultiHitNoMoreHits::
pause 0x20
BattleScript_82D8E74::
BattleScript_MultiHitPrintStrings::
resultmessage
waitmessage 0x40
jumpifmovehadnoeffect BattleScript_82D8E93
jumpifmovehadnoeffect BattleScript_MultiHitEnd
copyarray gBattleTextBuff1, sMULTIHIT_STRING, 0x6
printstring STRINGID_HITXTIMES
waitmessage 0x40
BattleScript_82D8E93::
BattleScript_MultiHitEnd::
seteffectwithchance
tryfaintmon TARGET, FALSE, NULL
setbyte sMOVEEND_STATE, 0x2
@@ -862,8 +862,8 @@ BattleScript_EffectDoubleHit::
ppreduce
setmultihitcounter 0x2
initmultihitstring
setbyte sFIELD_16, 0x0
goto BattleScript_82D8DFD
setbyte sMULTIHIT_EFFECT, 0x0
goto BattleScript_MultiHitLoop
BattleScript_EffectRecoilIfMiss::
attackcanceler
@@ -1094,12 +1094,12 @@ BattleScript_EffectConfuseHit::
BattleScript_EffectTwineedle::
attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
setbyte sFIELD_16, 0x2
setbyte sMULTIHIT_EFFECT, EFFECT_POISON
attackstring
ppreduce
setmultihitcounter 0x2
initmultihitstring
goto BattleScript_82D8DFD
goto BattleScript_MultiHitLoop
BattleScript_EffectSubstitute::
attackcanceler
@@ -1952,7 +1952,7 @@ BattleScript_EffectTeleport::
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
getifcantrunfrombattle ATTACKER
jumpifbyte EQUAL, gBattleCommunication, 0x1, BattleScript_ButItFailed
jumpifbyte EQUAL, gBattleCommunication, 0x2, BattleScript_82DA382
jumpifbyte EQUAL, gBattleCommunication, 0x2, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -2474,8 +2474,8 @@ BattleScript_EffectYawn::
attackcanceler
attackstring
ppreduce
jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_82DA378
jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_82DA378
jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_PrintBankAbilityMadeIneffective
jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_PrintBankAbilityMadeIneffective
jumpifstatus2 TARGET, STATUS2_SUBSTITUTE, BattleScript_ButItFailed
jumpifsideaffecting TARGET, SIDE_STATUS_SAFEGUARD, BattleScript_SafeguardProtected
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
@@ -2486,9 +2486,9 @@ BattleScript_EffectYawn::
printstring STRINGID_PKMNWASMADEDROWSY
waitmessage 0x40
goto BattleScript_MoveEnd
BattleScript_82DA378::
copybyte sBANK, sFIELD_15
BattleScript_82DA382::
BattleScript_PrintBankAbilityMadeIneffective::
copybyte sBANK, sBANK_WITH_ABILITY
BattleScript_PrintAbilityMadeIneffective::
pause 0x20
printstring STRINGID_PKMNSXMADEITINEFFECTIVE
waitmessage 0x40

40
data/battle_scripts_2.s
View File

@@ -24,13 +24,13 @@ gBattlescriptsForBallThrow:: @ 82DBD08
.4byte BattleScript_BallThrow
.align 2
gUnknown_082DBD3C:: @ 82DBD3C
.4byte BattleScript_82DBE12
.4byte BattleScript_82DBE1C
.4byte BattleScript_82DBE1C
.4byte BattleScript_82DBE4B
.4byte BattleScript_82DBE6F
.4byte BattleScript_82DBE91
gBattlescriptsForUsingItem:: @ 82DBD3C
.4byte BattleScript_PlayerUsesItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesHealItem
.4byte BattleScript_OpponentUsesStatusCureItem
.4byte BattleScript_OpponentUsesXItem
.4byte BattleScript_OpponentUsesGuardSpecs
.align 2
gBattlescriptsForRunningByItem:: @ 82DBD54
@@ -58,27 +58,27 @@ BattleScript_SafariBallThrow::
handleballthrow
BattleScript_SuccessBallThrow::
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_82DBD92
jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat 0xB
BattleScript_82DBD92::
BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT
trysetcaughtmondexflags BattleScript_82DBDA5
trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon
printstring STRINGID_PKMNDATAADDEDTODEX
waitstate
setbyte gBattleCommunication, 0x0
displaydexinfo
BattleScript_82DBDA5::
BattleScript_TryNicknameCaughtMon::
printstring STRINGID_GIVENICKNAMECAPTURED
waitstate
setbyte gBattleCommunication, 0x0
trygivecaughtmonnick BattleScript_82DBDC2
trygivecaughtmonnick BattleScript_GiveCaughtMonEnd
givecaughtmon
printfromtable gCaughtMonStringIds
waitmessage 0x40
goto BattleScript_82DBDC3
BattleScript_82DBDC2::
goto BattleScript_SuccessBallThrowEnd
BattleScript_GiveCaughtMonEnd::
givecaughtmon
BattleScript_82DBDC3::
BattleScript_SuccessBallThrowEnd::
setbyte gBattleOutcome, CAUGHT
finishturn
@@ -106,12 +106,12 @@ BattleScript_TrainerBallBlock::
waitmessage 0x40
finishaction
BattleScript_82DBE12::
BattleScript_PlayerUsesItem::
setbyte sMOVEEND_STATE, 0xF
moveend 0x1, 0x0
end
BattleScript_82DBE1C::
BattleScript_OpponentUsesHealItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -128,7 +128,7 @@ BattleScript_82DBE1C::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE4B::
BattleScript_OpponentUsesStatusCureItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -142,7 +142,7 @@ BattleScript_82DBE4B::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE6F::
BattleScript_OpponentUsesXItem::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU
@@ -155,7 +155,7 @@ BattleScript_82DBE6F::
moveend 0x1, 0x0
finishaction
BattleScript_82DBE91::
BattleScript_OpponentUsesGuardSpecs::
printstring STRINGID_EMPTYSTRING3
pause 0x30
playse SE_KAIFUKU