ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-14 01:32:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #521 from AsparagusEduardo/BE-Identation

Browse Source 
Fixed indentation for various files.
This commit is contained in:
ultima-soul 2020-10-23 08:46:17 -07:00 committed by GitHub
commit 84c134779a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 933 additions and 933 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

512
src/battle_script_commands.c
View File

@ -337,262 +337,262 @@ static void Cmd_metalburstdamagecalculator(void);
void (* const gBattleScriptingCommandsTable[])(void) =
{
Cmd_attackcanceler, // 0x0
Cmd_accuracycheck, // 0x1
Cmd_attackstring, // 0x2
Cmd_ppreduce, // 0x3
Cmd_critcalc, // 0x4
Cmd_damagecalc, // 0x5
Cmd_typecalc, // 0x6
Cmd_adjustdamage, // 0x7
Cmd_multihitresultmessage, // 0x8
Cmd_attackanimation, // 0x9
Cmd_waitanimation, // 0xA
Cmd_healthbarupdate, // 0xB
Cmd_datahpupdate, // 0xC
Cmd_critmessage, // 0xD
Cmd_effectivenesssound, // 0xE
Cmd_resultmessage, // 0xF
Cmd_printstring, // 0x10
Cmd_printselectionstring, // 0x11
Cmd_waitmessage, // 0x12
Cmd_printfromtable, // 0x13
Cmd_printselectionstringfromtable, // 0x14
Cmd_seteffectwithchance, // 0x15
Cmd_seteffectprimary, // 0x16
Cmd_seteffectsecondary, // 0x17
Cmd_clearstatusfromeffect, // 0x18
Cmd_tryfaintmon, // 0x19
Cmd_dofaintanimation, // 0x1A
Cmd_cleareffectsonfaint, // 0x1B
Cmd_jumpifstatus, // 0x1C
Cmd_jumpifstatus2, // 0x1D
Cmd_jumpifability, // 0x1E
Cmd_jumpifsideaffecting, // 0x1F
Cmd_jumpifstat, // 0x20
Cmd_jumpifstatus3condition, // 0x21
Cmd_jumpbasedontype, // 0x22
Cmd_getexp, // 0x23
atk24, // 0x24
Cmd_movevaluescleanup, // 0x25
Cmd_setmultihit, // 0x26
Cmd_decrementmultihit, // 0x27
Cmd_goto, // 0x28
Cmd_jumpifbyte, // 0x29
Cmd_jumpifhalfword, // 0x2A
Cmd_jumpifword, // 0x2B
Cmd_jumpifarrayequal, // 0x2C
Cmd_jumpifarraynotequal, // 0x2D
Cmd_setbyte, // 0x2E
Cmd_addbyte, // 0x2F
Cmd_subbyte, // 0x30
Cmd_copyarray, // 0x31
Cmd_copyarraywithindex, // 0x32
Cmd_orbyte, // 0x33
Cmd_orhalfword, // 0x34
Cmd_orword, // 0x35
Cmd_bicbyte, // 0x36
Cmd_bichalfword, // 0x37
Cmd_bicword, // 0x38
Cmd_pause, // 0x39
Cmd_waitstate, // 0x3A
Cmd_update, // 0x3B
Cmd_return, // 0x3C
Cmd_end, // 0x3D
Cmd_end2, // 0x3E
Cmd_end3, // 0x3F
Cmd_jumpifaffectedbyprotect, // 0x40
Cmd_call, // 0x41
Cmd_setroost, // 0x42
Cmd_jumpifabilitypresent, // 0x43
Cmd_endselectionscript, // 0x44
Cmd_playanimation, // 0x45
Cmd_playanimation2, // 0x46
Cmd_setgraphicalstatchangevalues, // 0x47
Cmd_playstatchangeanimation, // 0x48
Cmd_moveend, // 0x49
Cmd_sethealblock, // 0x4A
Cmd_returnatktoball, // 0x4B
Cmd_getswitchedmondata, // 0x4C
Cmd_switchindataupdate, // 0x4D
Cmd_switchinanim, // 0x4E
Cmd_jumpifcantswitch, // 0x4F
Cmd_openpartyscreen, // 0x50
Cmd_switchhandleorder, // 0x51
Cmd_switchineffects, // 0x52
Cmd_trainerslidein, // 0x53
Cmd_playse, // 0x54
Cmd_fanfare, // 0x55
Cmd_playfaintcry, // 0x56
atk57, // 0x57
Cmd_returntoball, // 0x58
Cmd_handlelearnnewmove, // 0x59
Cmd_yesnoboxlearnmove, // 0x5A
Cmd_yesnoboxstoplearningmove, // 0x5B
Cmd_hitanimation, // 0x5C
Cmd_getmoneyreward, // 0x5D
atk5E, // 0x5E
Cmd_swapattackerwithtarget, // 0x5F
Cmd_incrementgamestat, // 0x60
Cmd_drawpartystatussummary, // 0x61
Cmd_hidepartystatussummary, // 0x62
Cmd_jumptocalledmove, // 0x63
Cmd_statusanimation, // 0x64
Cmd_status2animation, // 0x65
Cmd_chosenstatusanimation, // 0x66
Cmd_yesnobox, // 0x67
Cmd_cancelallactions, // 0x68
Cmd_setgravity, // 0x69
Cmd_removeitem, // 0x6A
Cmd_atknameinbuff1, // 0x6B
Cmd_drawlvlupbox, // 0x6C
Cmd_resetsentmonsvalue, // 0x6D
Cmd_setatktoplayer0, // 0x6E
Cmd_makevisible, // 0x6F
Cmd_recordability, // 0x70
Cmd_buffermovetolearn, // 0x71
Cmd_jumpifplayerran, // 0x72
Cmd_hpthresholds, // 0x73
Cmd_hpthresholds2, // 0x74
Cmd_useitemonopponent, // 0x75
Cmd_various, // 0x76
Cmd_setprotectlike, // 0x77
Cmd_faintifabilitynotdamp, // 0x78
Cmd_setatkhptozero, // 0x79
Cmd_jumpifnexttargetvalid, // 0x7A
Cmd_tryhealhalfhealth, // 0x7B
Cmd_trymirrormove, // 0x7C
Cmd_setrain, // 0x7D
Cmd_setreflect, // 0x7E
Cmd_setseeded, // 0x7F
Cmd_manipulatedamage, // 0x80
Cmd_trysetrest, // 0x81
Cmd_jumpifnotfirstturn, // 0x82
Cmd_setmiracleeye, // 0x83
Cmd_jumpifcantmakeasleep, // 0x84
Cmd_stockpile, // 0x85
Cmd_stockpiletobasedamage, // 0x86
Cmd_stockpiletohpheal, // 0x87
Cmd_setdrainedhp, // 0x88
Cmd_statbuffchange, // 0x89
Cmd_normalisebuffs, // 0x8A
Cmd_setbide, // 0x8B
Cmd_confuseifrepeatingattackends, // 0x8C
Cmd_setmultihitcounter, // 0x8D
Cmd_initmultihitstring, // 0x8E
Cmd_forcerandomswitch, // 0x8F
Cmd_tryconversiontypechange, // 0x90
Cmd_givepaydaymoney, // 0x91
Cmd_setlightscreen, // 0x92
Cmd_tryKO, // 0x93
Cmd_damagetohalftargethp, // 0x94
Cmd_setsandstorm, // 0x95
Cmd_weatherdamage, // 0x96
Cmd_tryinfatuating, // 0x97
Cmd_updatestatusicon, // 0x98
Cmd_setmist, // 0x99
Cmd_setfocusenergy, // 0x9A
Cmd_transformdataexecution, // 0x9B
Cmd_setsubstitute, // 0x9C
Cmd_mimicattackcopy, // 0x9D
Cmd_metronome, // 0x9E
Cmd_dmgtolevel, // 0x9F
Cmd_psywavedamageeffect, // 0xA0
Cmd_counterdamagecalculator, // 0xA1
Cmd_mirrorcoatdamagecalculator, // 0xA2
Cmd_disablelastusedattack, // 0xA3
Cmd_trysetencore, // 0xA4
Cmd_painsplitdmgcalc, // 0xA5
Cmd_settypetorandomresistance, // 0xA6
Cmd_setalwayshitflag, // 0xA7
Cmd_copymovepermanently, // 0xA8
Cmd_trychoosesleeptalkmove, // 0xA9
Cmd_setdestinybond, // 0xAA
Cmd_trysetdestinybondtohappen, // 0xAB
Cmd_settailwind, // 0xAC
Cmd_tryspiteppreduce, // 0xAD
Cmd_healpartystatus, // 0xAE
Cmd_cursetarget, // 0xAF
Cmd_trysetspikes, // 0xB0
Cmd_setforesight, // 0xB1
Cmd_trysetperishsong, // 0xB2
Cmd_handlerollout, // 0xB3
Cmd_jumpifconfusedandstatmaxed, // 0xB4
Cmd_handlefurycutter, // 0xB5
Cmd_setembargo, // 0xB6
Cmd_presentdamagecalculation, // 0xB7
Cmd_setsafeguard, // 0xB8
Cmd_magnitudedamagecalculation, // 0xB9
Cmd_jumpifnopursuitswitchdmg, // 0xBA
Cmd_setsunny, // 0xBB
Cmd_maxattackhalvehp, // 0xBC
Cmd_copyfoestats, // 0xBD
Cmd_rapidspinfree, // 0xBE
Cmd_setdefensecurlbit, // 0xBF
Cmd_recoverbasedonsunlight, // 0xC0
Cmd_setstickyweb, // 0xC1
Cmd_selectfirstvalidtarget, // 0xC2
Cmd_trysetfutureattack, // 0xC3
Cmd_trydobeatup, // 0xC4
Cmd_setsemiinvulnerablebit, // 0xC5
Cmd_clearsemiinvulnerablebit, // 0xC6
Cmd_setminimize, // 0xC7
Cmd_sethail, // 0xC8
Cmd_jumpifattackandspecialattackcannotfall, // 0xC9
Cmd_setforcedtarget, // 0xCA
Cmd_setcharge, // 0xCB
Cmd_callterrainattack, // 0xCC
Cmd_cureifburnedparalysedorpoisoned, // 0xCD
Cmd_settorment, // 0xCE
Cmd_jumpifnodamage, // 0xCF
Cmd_settaunt, // 0xD0
Cmd_trysethelpinghand, // 0xD1
Cmd_tryswapitems, // 0xD2
Cmd_trycopyability, // 0xD3
Cmd_trywish, // 0xD4
Cmd_settoxicspikes, // 0xD5
Cmd_setgastroacid, // 0xD6
Cmd_setyawn, // 0xD7
Cmd_setdamagetohealthdifference, // 0xD8
Cmd_setroom, // 0xD9
Cmd_tryswapabilities, // 0xDA
Cmd_tryimprison, // 0xDB
Cmd_setstealthrock, // 0xDC
Cmd_setuserstatus3, // 0xDD
Cmd_assistattackselect, // 0xDE
Cmd_trysetmagiccoat, // 0xDF
Cmd_trysetsnatch, // 0xE0
Cmd_trygetintimidatetarget, // 0xE1
Cmd_switchoutabilities, // 0xE2
Cmd_jumpifhasnohp, // 0xE3
Cmd_getsecretpowereffect, // 0xE4
Cmd_pickup, // 0xE5
Cmd_docastformchangeanimation, // 0xE6
Cmd_trycastformdatachange, // 0xE7
Cmd_settypebasedhalvers, // 0xE8
Cmd_jumpifsubstituteblocks, // 0xE9
Cmd_tryrecycleitem, // 0xEA
Cmd_settypetoterrain, // 0xEB
Cmd_pursuitrelated, // 0xEC
Cmd_snatchsetbattlers, // 0xED
Cmd_removelightscreenreflect, // 0xEE
Cmd_handleballthrow, // 0xEF
Cmd_givecaughtmon, // 0xF0
Cmd_trysetcaughtmondexflags, // 0xF1
Cmd_displaydexinfo, // 0xF2
Cmd_trygivecaughtmonnick, // 0xF3
Cmd_subattackerhpbydmg, // 0xF4
Cmd_removeattackerstatus1, // 0xF5
Cmd_finishaction, // 0xF6
Cmd_finishturn, // 0xF7
Cmd_trainerslideout, // 0xF8
Cmd_settelekinesis, // 0xF9
Cmd_swapstatstages, // 0xFA
Cmd_averagestats, // 0xFB
Cmd_jumpifoppositegenders, // 0xFC
Cmd_trygetbaddreamstarget, // 0xFD
Cmd_tryworryseed, // 0xFE
Cmd_metalburstdamagecalculator, // 0xFF
Cmd_attackcanceler, // 0x0
Cmd_accuracycheck, // 0x1
Cmd_attackstring, // 0x2
Cmd_ppreduce, // 0x3
Cmd_critcalc, // 0x4
Cmd_damagecalc, // 0x5
Cmd_typecalc, // 0x6
Cmd_adjustdamage, // 0x7
Cmd_multihitresultmessage, // 0x8
Cmd_attackanimation, // 0x9
Cmd_waitanimation, // 0xA
Cmd_healthbarupdate, // 0xB
Cmd_datahpupdate, // 0xC
Cmd_critmessage, // 0xD
Cmd_effectivenesssound, // 0xE
Cmd_resultmessage, // 0xF
Cmd_printstring, // 0x10
Cmd_printselectionstring, // 0x11
Cmd_waitmessage, // 0x12
Cmd_printfromtable, // 0x13
Cmd_printselectionstringfromtable, // 0x14
Cmd_seteffectwithchance, // 0x15
Cmd_seteffectprimary, // 0x16
Cmd_seteffectsecondary, // 0x17
Cmd_clearstatusfromeffect, // 0x18
Cmd_tryfaintmon, // 0x19
Cmd_dofaintanimation, // 0x1A
Cmd_cleareffectsonfaint, // 0x1B
Cmd_jumpifstatus, // 0x1C
Cmd_jumpifstatus2, // 0x1D
Cmd_jumpifability, // 0x1E
Cmd_jumpifsideaffecting, // 0x1F
Cmd_jumpifstat, // 0x20
Cmd_jumpifstatus3condition, // 0x21
Cmd_jumpbasedontype, // 0x22
Cmd_getexp, // 0x23
atk24, // 0x24
Cmd_movevaluescleanup, // 0x25
Cmd_setmultihit, // 0x26
Cmd_decrementmultihit, // 0x27
Cmd_goto, // 0x28
Cmd_jumpifbyte, // 0x29
Cmd_jumpifhalfword, // 0x2A
Cmd_jumpifword, // 0x2B
Cmd_jumpifarrayequal, // 0x2C
Cmd_jumpifarraynotequal, // 0x2D
Cmd_setbyte, // 0x2E
Cmd_addbyte, // 0x2F
Cmd_subbyte, // 0x30
Cmd_copyarray, // 0x31
Cmd_copyarraywithindex, // 0x32
Cmd_orbyte, // 0x33
Cmd_orhalfword, // 0x34
Cmd_orword, // 0x35
Cmd_bicbyte, // 0x36
Cmd_bichalfword, // 0x37
Cmd_bicword, // 0x38
Cmd_pause, // 0x39
Cmd_waitstate, // 0x3A
Cmd_update, // 0x3B
Cmd_return, // 0x3C
Cmd_end, // 0x3D
Cmd_end2, // 0x3E
Cmd_end3, // 0x3F
Cmd_jumpifaffectedbyprotect, // 0x40
Cmd_call, // 0x41
Cmd_setroost, // 0x42
Cmd_jumpifabilitypresent, // 0x43
Cmd_endselectionscript, // 0x44
Cmd_playanimation, // 0x45
Cmd_playanimation2, // 0x46
Cmd_setgraphicalstatchangevalues, // 0x47
Cmd_playstatchangeanimation, // 0x48
Cmd_moveend, // 0x49
Cmd_sethealblock, // 0x4A
Cmd_returnatktoball, // 0x4B
Cmd_getswitchedmondata, // 0x4C
Cmd_switchindataupdate, // 0x4D
Cmd_switchinanim, // 0x4E
Cmd_jumpifcantswitch, // 0x4F
Cmd_openpartyscreen, // 0x50
Cmd_switchhandleorder, // 0x51
Cmd_switchineffects, // 0x52
Cmd_trainerslidein, // 0x53
Cmd_playse, // 0x54
Cmd_fanfare, // 0x55
Cmd_playfaintcry, // 0x56
atk57, // 0x57
Cmd_returntoball, // 0x58
Cmd_handlelearnnewmove, // 0x59
Cmd_yesnoboxlearnmove, // 0x5A
Cmd_yesnoboxstoplearningmove, // 0x5B
Cmd_hitanimation, // 0x5C
Cmd_getmoneyreward, // 0x5D
atk5E, // 0x5E
Cmd_swapattackerwithtarget, // 0x5F
Cmd_incrementgamestat, // 0x60
Cmd_drawpartystatussummary, // 0x61
Cmd_hidepartystatussummary, // 0x62
Cmd_jumptocalledmove, // 0x63
Cmd_statusanimation, // 0x64
Cmd_status2animation, // 0x65
Cmd_chosenstatusanimation, // 0x66
Cmd_yesnobox, // 0x67
Cmd_cancelallactions, // 0x68
Cmd_setgravity, // 0x69
Cmd_removeitem, // 0x6A
Cmd_atknameinbuff1, // 0x6B
Cmd_drawlvlupbox, // 0x6C
Cmd_resetsentmonsvalue, // 0x6D
Cmd_setatktoplayer0, // 0x6E
Cmd_makevisible, // 0x6F
Cmd_recordability, // 0x70
Cmd_buffermovetolearn, // 0x71
Cmd_jumpifplayerran, // 0x72
Cmd_hpthresholds, // 0x73
Cmd_hpthresholds2, // 0x74
Cmd_useitemonopponent, // 0x75
Cmd_various, // 0x76
Cmd_setprotectlike, // 0x77
Cmd_faintifabilitynotdamp, // 0x78
Cmd_setatkhptozero, // 0x79
Cmd_jumpifnexttargetvalid, // 0x7A
Cmd_tryhealhalfhealth, // 0x7B
Cmd_trymirrormove, // 0x7C
Cmd_setrain, // 0x7D
Cmd_setreflect, // 0x7E
Cmd_setseeded, // 0x7F
Cmd_manipulatedamage, // 0x80
Cmd_trysetrest, // 0x81
Cmd_jumpifnotfirstturn, // 0x82
Cmd_setmiracleeye, // 0x83
Cmd_jumpifcantmakeasleep, // 0x84
Cmd_stockpile, // 0x85
Cmd_stockpiletobasedamage, // 0x86
Cmd_stockpiletohpheal, // 0x87
Cmd_setdrainedhp, // 0x88
Cmd_statbuffchange, // 0x89
Cmd_normalisebuffs, // 0x8A
Cmd_setbide, // 0x8B
Cmd_confuseifrepeatingattackends, // 0x8C
Cmd_setmultihitcounter, // 0x8D
Cmd_initmultihitstring, // 0x8E
Cmd_forcerandomswitch, // 0x8F
Cmd_tryconversiontypechange, // 0x90
Cmd_givepaydaymoney, // 0x91
Cmd_setlightscreen, // 0x92
Cmd_tryKO, // 0x93
Cmd_damagetohalftargethp, // 0x94
Cmd_setsandstorm, // 0x95
Cmd_weatherdamage, // 0x96
Cmd_tryinfatuating, // 0x97
Cmd_updatestatusicon, // 0x98
Cmd_setmist, // 0x99
Cmd_setfocusenergy, // 0x9A
Cmd_transformdataexecution, // 0x9B
Cmd_setsubstitute, // 0x9C
Cmd_mimicattackcopy, // 0x9D
Cmd_metronome, // 0x9E
Cmd_dmgtolevel, // 0x9F
Cmd_psywavedamageeffect, // 0xA0
Cmd_counterdamagecalculator, // 0xA1
Cmd_mirrorcoatdamagecalculator, // 0xA2
Cmd_disablelastusedattack, // 0xA3
Cmd_trysetencore, // 0xA4
Cmd_painsplitdmgcalc, // 0xA5
Cmd_settypetorandomresistance, // 0xA6
Cmd_setalwayshitflag, // 0xA7
Cmd_copymovepermanently, // 0xA8
Cmd_trychoosesleeptalkmove, // 0xA9
Cmd_setdestinybond, // 0xAA
Cmd_trysetdestinybondtohappen, // 0xAB
Cmd_settailwind, // 0xAC
Cmd_tryspiteppreduce, // 0xAD
Cmd_healpartystatus, // 0xAE
Cmd_cursetarget, // 0xAF
Cmd_trysetspikes, // 0xB0
Cmd_setforesight, // 0xB1
Cmd_trysetperishsong, // 0xB2
Cmd_handlerollout, // 0xB3
Cmd_jumpifconfusedandstatmaxed, // 0xB4
Cmd_handlefurycutter, // 0xB5
Cmd_setembargo, // 0xB6
Cmd_presentdamagecalculation, // 0xB7
Cmd_setsafeguard, // 0xB8
Cmd_magnitudedamagecalculation, // 0xB9
Cmd_jumpifnopursuitswitchdmg, // 0xBA
Cmd_setsunny, // 0xBB
Cmd_maxattackhalvehp, // 0xBC
Cmd_copyfoestats, // 0xBD
Cmd_rapidspinfree, // 0xBE
Cmd_setdefensecurlbit, // 0xBF
Cmd_recoverbasedonsunlight, // 0xC0
Cmd_setstickyweb, // 0xC1
Cmd_selectfirstvalidtarget, // 0xC2
Cmd_trysetfutureattack, // 0xC3
Cmd_trydobeatup, // 0xC4
Cmd_setsemiinvulnerablebit, // 0xC5
Cmd_clearsemiinvulnerablebit, // 0xC6
Cmd_setminimize, // 0xC7
Cmd_sethail, // 0xC8
Cmd_jumpifattackandspecialattackcannotfall, // 0xC9
Cmd_setforcedtarget, // 0xCA
Cmd_setcharge, // 0xCB
Cmd_callterrainattack, // 0xCC
Cmd_cureifburnedparalysedorpoisoned, // 0xCD
Cmd_settorment, // 0xCE
Cmd_jumpifnodamage, // 0xCF
Cmd_settaunt, // 0xD0
Cmd_trysethelpinghand, // 0xD1
Cmd_tryswapitems, // 0xD2
Cmd_trycopyability, // 0xD3
Cmd_trywish, // 0xD4
Cmd_settoxicspikes, // 0xD5
Cmd_setgastroacid, // 0xD6
Cmd_setyawn, // 0xD7
Cmd_setdamagetohealthdifference, // 0xD8
Cmd_setroom, // 0xD9
Cmd_tryswapabilities, // 0xDA
Cmd_tryimprison, // 0xDB
Cmd_setstealthrock, // 0xDC
Cmd_setuserstatus3, // 0xDD
Cmd_assistattackselect, // 0xDE
Cmd_trysetmagiccoat, // 0xDF
Cmd_trysetsnatch, // 0xE0
Cmd_trygetintimidatetarget, // 0xE1
Cmd_switchoutabilities, // 0xE2
Cmd_jumpifhasnohp, // 0xE3
Cmd_getsecretpowereffect, // 0xE4
Cmd_pickup, // 0xE5
Cmd_docastformchangeanimation, // 0xE6
Cmd_trycastformdatachange, // 0xE7
Cmd_settypebasedhalvers, // 0xE8
Cmd_jumpifsubstituteblocks, // 0xE9
Cmd_tryrecycleitem, // 0xEA
Cmd_settypetoterrain, // 0xEB
Cmd_pursuitrelated, // 0xEC
Cmd_snatchsetbattlers, // 0xED
Cmd_removelightscreenreflect, // 0xEE
Cmd_handleballthrow, // 0xEF
Cmd_givecaughtmon, // 0xF0
Cmd_trysetcaughtmondexflags, // 0xF1
Cmd_displaydexinfo, // 0xF2
Cmd_trygivecaughtmonnick, // 0xF3
Cmd_subattackerhpbydmg, // 0xF4
Cmd_removeattackerstatus1, // 0xF5
Cmd_finishaction, // 0xF6
Cmd_finishturn, // 0xF7
Cmd_trainerslideout, // 0xF8
Cmd_settelekinesis, // 0xF9
Cmd_swapstatstages, // 0xFA
Cmd_averagestats, // 0xFB
Cmd_jumpifoppositegenders, // 0xFC
Cmd_trygetbaddreamstarget, // 0xFD
Cmd_tryworryseed, // 0xFE
Cmd_metalburstdamagecalculator, // 0xFF
};
struct StatFractions

168
src/battle_util.c
View File

@ -909,25 +909,25 @@ static const u16 sPercentToModifier[] =
static const u16 sTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES] =
{
// normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark fairy
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // normal
{X(2.0), X(1.0), X(0.5), X(0.5), X(1.0), X(2.0), X(0.5), X(0.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(0.5)}, // fight
{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // flying
{X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(0.5), X(0.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0)}, // poison
{X(1.0), X(1.0), X(0.0), X(2.0), X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // ground
{X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0)}, // rock
{X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5)}, // bug
{X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0)}, // ghost
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0)}, // steel
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // mystery
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0)}, // fire
{X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // water
{X(1.0), X(1.0), X(0.5), X(0.5), X(2.0), X(2.0), X(0.5), X(1.0), X(0.5), X(1.0), X(0.5), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // grass
{X(1.0), X(1.0), X(2.0), X(1.0), X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // electric
{X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(0.0), X(1.0)}, // psychic
{X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0)}, // ice
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(0.0)}, // dragon
{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(0.5)}, // dark
{X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0)}, // fairy
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // normal
{X(2.0), X(1.0), X(0.5), X(0.5), X(1.0), X(2.0), X(0.5), X(0.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(0.5)}, // fight
{X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // flying
{X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(0.5), X(0.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0)}, // poison
{X(1.0), X(1.0), X(0.0), X(2.0), X(1.0), X(2.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // ground
{X(1.0), X(0.5), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0)}, // rock
{X(1.0), X(0.5), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5)}, // bug
{X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0)}, // ghost
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(1.0), X(0.5), X(1.0), X(2.0), X(1.0), X(1.0), X(2.0)}, // steel
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0)}, // mystery
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(2.0), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(2.0), X(0.5), X(1.0), X(1.0)}, // fire
{X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // water
{X(1.0), X(1.0), X(0.5), X(0.5), X(2.0), X(2.0), X(0.5), X(1.0), X(0.5), X(1.0), X(0.5), X(2.0), X(0.5), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // grass
{X(1.0), X(1.0), X(2.0), X(1.0), X(0.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(0.5), X(0.5), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0)}, // electric
{X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(0.0), X(1.0)}, // psychic
{X(1.0), X(1.0), X(2.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(0.5), X(2.0), X(1.0), X(1.0), X(0.5), X(2.0), X(1.0), X(1.0)}, // ice
{X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(0.0)}, // dragon
{X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(1.0), X(1.0), X(0.5), X(0.5)}, // dark
{X(1.0), X(2.0), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(0.5), X(1.0), X(0.5), X(1.0), X(1.0), X(1.0), X(1.0), X(1.0), X(2.0), X(2.0), X(1.0)}, // fairy
};
static const u16 sInverseTypeEffectivenessTable[NUMBER_OF_MON_TYPES][NUMBER_OF_MON_TYPES] =
@ -1331,7 +1331,7 @@ static bool32 IsBelchPreventingMove(u32 battler, u32 move)
u8 TrySetCantSelectMoveBattleScript(void)
{
u32 limitations = 0;
u8 moveId = gBattleResources->bufferB[gActiveBattler][2] & ~(RET_MEGA_EVOLUTION);
u8 moveId = gBattleResources->bufferB[gActiveBattler][2] & ~(RET_MEGA_EVOLUTION);
u32 move = gBattleMons[gActiveBattler].moves[moveId];
u32 holdEffect = GetBattlerHoldEffect(gActiveBattler, TRUE);
u16 *choicedMove = &gBattleStruct->choicedMove[gActiveBattler];
@ -1587,32 +1587,32 @@ u8 GetImprisonedMovesCount(u8 battlerId, u16 move)
enum
{
ENDTURN_ORDER,
ENDTURN_REFLECT,
ENDTURN_LIGHT_SCREEN,
ENDTURN_AURORA_VEIL,
ENDTURN_MIST,
ENDTURN_LUCKY_CHANT,
ENDTURN_SAFEGUARD,
ENDTURN_TAILWIND,
ENDTURN_WISH,
ENDTURN_RAIN,
ENDTURN_SANDSTORM,
ENDTURN_SUN,
ENDTURN_HAIL,
ENDTURN_GRAVITY,
ENDTURN_WATER_SPORT,
ENDTURN_MUD_SPORT,
ENDTURN_TRICK_ROOM,
ENDTURN_WONDER_ROOM,
ENDTURN_MAGIC_ROOM,
ENDTURN_ELECTRIC_TERRAIN,
ENDTURN_MISTY_TERRAIN,
ENDTURN_GRASSY_TERRAIN,
ENDTURN_PSYCHIC_TERRAIN,
ENDTURN_ION_DELUGE,
ENDTURN_FAIRY_LOCK,
ENDTURN_FIELD_COUNT,
ENDTURN_ORDER,
ENDTURN_REFLECT,
ENDTURN_LIGHT_SCREEN,
ENDTURN_AURORA_VEIL,
ENDTURN_MIST,
ENDTURN_LUCKY_CHANT,
ENDTURN_SAFEGUARD,
ENDTURN_TAILWIND,
ENDTURN_WISH,
ENDTURN_RAIN,
ENDTURN_SANDSTORM,
ENDTURN_SUN,
ENDTURN_HAIL,
ENDTURN_GRAVITY,
ENDTURN_WATER_SPORT,
ENDTURN_MUD_SPORT,
ENDTURN_TRICK_ROOM,
ENDTURN_WONDER_ROOM,
ENDTURN_MAGIC_ROOM,
ENDTURN_ELECTRIC_TERRAIN,
ENDTURN_MISTY_TERRAIN,
ENDTURN_GRASSY_TERRAIN,
ENDTURN_PSYCHIC_TERRAIN,
ENDTURN_ION_DELUGE,
ENDTURN_FAIRY_LOCK,
ENDTURN_FIELD_COUNT,
};
u8 DoFieldEndTurnEffects(void)
@ -2049,36 +2049,36 @@ enum
ENDTURN_INGRAIN,
ENDTURN_AQUA_RING,
ENDTURN_ABILITIES,
ENDTURN_ITEMS1,
ENDTURN_LEECH_SEED,
ENDTURN_POISON,
ENDTURN_BAD_POISON,
ENDTURN_BURN,
ENDTURN_NIGHTMARES,
ENDTURN_CURSE,
ENDTURN_WRAP,
ENDTURN_UPROAR,
ENDTURN_THRASH,
ENDTURN_FLINCH,
ENDTURN_DISABLE,
ENDTURN_ENCORE,
ENDTURN_MAGNET_RISE,
ENDTURN_TELEKINESIS,
ENDTURN_HEALBLOCK,
ENDTURN_EMBARGO,
ENDTURN_LOCK_ON,
ENDTURN_CHARGE,
ENDTURN_LASER_FOCUS,
ENDTURN_TAUNT,
ENDTURN_YAWN,
ENDTURN_ITEMS2,
ENDTURN_ORBS,
ENDTURN_ROOST,
ENDTURN_ELECTRIFY,
ENDTURN_POWDER,
ENDTURN_THROAT_CHOP,
ENDTURN_SLOW_START,
ENDTURN_BATTLER_COUNT
ENDTURN_ITEMS1,
ENDTURN_LEECH_SEED,
ENDTURN_POISON,
ENDTURN_BAD_POISON,
ENDTURN_BURN,
ENDTURN_NIGHTMARES,
ENDTURN_CURSE,
ENDTURN_WRAP,
ENDTURN_UPROAR,
ENDTURN_THRASH,
ENDTURN_FLINCH,
ENDTURN_DISABLE,
ENDTURN_ENCORE,
ENDTURN_MAGNET_RISE,
ENDTURN_TELEKINESIS,
ENDTURN_HEALBLOCK,
ENDTURN_EMBARGO,
ENDTURN_LOCK_ON,
ENDTURN_CHARGE,
ENDTURN_LASER_FOCUS,
ENDTURN_TAUNT,
ENDTURN_YAWN,
ENDTURN_ITEMS2,
ENDTURN_ORBS,
ENDTURN_ROOST,
ENDTURN_ELECTRIFY,
ENDTURN_POWDER,
ENDTURN_THROAT_CHOP,
ENDTURN_SLOW_START,
ENDTURN_BATTLER_COUNT
};
// Ingrain, Leech Seed, Strength Sap and Aqua Ring
@ -4547,7 +4547,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
// Set bit and save Dancer mon's original target
gSpecialStatuses[battler].dancerUsedMove = 1;
gSpecialStatuses[battler].dancerOriginalTarget = *(gBattleStruct->moveTarget + battler) | 0x4;
gBattleStruct->atkCancellerTracker = 0;
gBattleStruct->atkCancellerTracker = 0;
gBattlerAttacker = gBattlerAbility = battler;
gCalledMove = gCurrentMove;
@ -4798,8 +4798,8 @@ u32 GetBattlerAbility(u8 battlerId)
&& gActionsByTurnOrder[gBattlerByTurnOrder[gBattlerAttacker]] == B_ACTION_USE_MOVE
&& gCurrentTurnActionNumber < gBattlersCount)
return ABILITY_NONE;
else
return gBattleMons[battlerId].ability;
else
return gBattleMons[battlerId].ability;
}
u32 IsAbilityOnSide(u32 battlerId, u32 ability)
@ -6097,8 +6097,8 @@ bool32 IsMoveMakingContact(u16 move, u8 battlerAtk)
return FALSE;
else if (GetBattlerHoldEffect(battlerAtk, TRUE) == HOLD_EFFECT_PROTECTIVE_PADS)
return FALSE;
else
return TRUE;
else
return TRUE;
}
bool32 IsBattlerGrounded(u8 battlerId)
@ -6124,7 +6124,7 @@ bool32 IsBattlerGrounded(u8 battlerId)
return FALSE;
else
return TRUE;
return TRUE;
}
bool32 IsBattlerAlive(u8 battlerId)
@ -6135,8 +6135,8 @@ bool32 IsBattlerAlive(u8 battlerId)
return FALSE;
else if (gAbsentBattlerFlags & gBitTable[battlerId])
return FALSE;
else
return TRUE;
else
return TRUE;
}
u8 GetBattleMonMoveSlot(struct BattlePokemon *battleMon, u16 move)

1186
src/data/text/move_descriptions.h
View File

File diff suppressed because it is too large Load Diff