summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_4.c696
-rw-r--r--src/field/field_fadetransition.c2
-rw-r--r--src/field/overworld.c2
3 files changed, 350 insertions, 350 deletions
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 18585cebb..f37ba8682 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -282,41 +282,41 @@ static void atk01_accuracycheck(void);
static void atk02_attackstring(void);
static void atk03_ppreduce(void);
static void atk04_critcalc(void);
-static void atk05_damagecalc1(void);
+static void atk05_damagecalc(void);
static void atk06_typecalc(void);
-static void atk07_dmg_adjustment(void);
-static void atk08_dmg_adjustment2(void);
+static void atk07_adjustnormaldamage(void);
+static void atk08_adjustnormaldamage2(void);
static void atk09_attackanimation(void);
static void atk0A_waitanimation(void);
static void atk0B_healthbarupdate(void);
static void atk0C_datahpupdate(void);
static void atk0D_critmessage(void);
-static void atk0E_effectiveness_sound(void);
+static void atk0E_effectivenesssound(void);
static void atk0F_resultmessage(void);
static void atk10_printstring(void);
-static void atk11_printstring_playeronly(void);
+static void atk11_printselectionstring(void);
static void atk12_waitmessage(void);
static void atk13_printfromtable(void);
-static void atk14_printfromtable_playeronly(void);
-static void atk15_seteffectwithchancetarget(void);
+static void atk14_printselectionstringfromtable(void);
+static void atk15_seteffectwithchance(void);
static void atk16_seteffectprimary(void);
static void atk17_seteffectsecondary(void);
-static void atk18_status_effect_clear(void);
-static void atk19_faint_pokemon(void);
-static void atk1A_faint_animation(void);
-static void atk1B_faint_effects_clear(void);
+static void atk18_clearstatusfromeffect(void);
+static void atk19_tryfaintmon(void);
+static void atk1A_dofaintanimation(void);
+static void atk1B_cleareffectsonfaint(void);
static void atk1C_jumpifstatus(void);
static void atk1D_jumpifstatus2(void);
static void atk1E_jumpifability(void);
static void atk1F_jumpifsideaffecting(void);
static void atk20_jumpifstat(void);
-static void atk21_jumpifstatus3(void);
+static void atk21_jumpifstatus3condition(void);
static void atk22_jumpiftype(void);
static void atk23_getexp(void);
static void atk24(void);
-static void atk25_move_values_cleanup(void);
-static void atk26_set_multihit(void);
-static void atk27_decrement_multihit(void);
+static void atk25_movevaluescleanup(void);
+static void atk26_setmultihit(void);
+static void atk27_decrementmultihit(void);
static void atk28_goto(void);
static void atk29_jumpifbyte(void);
static void atk2A_jumpifhalfword(void);
@@ -327,7 +327,7 @@ static void atk2E_setbyte(void);
static void atk2F_addbyte(void);
static void atk30_subbyte(void);
static void atk31_copyarray(void);
-static void atk32_copyarray_withindex(void);
+static void atk32_copyarraywithindex(void);
static void atk33_orbyte(void);
static void atk34_orhalfword(void);
static void atk35_orword(void);
@@ -341,75 +341,75 @@ static void atk3C_return(void);
static void atk3D_end(void);
static void atk3E_end2(void);
static void atk3F_end3(void);
-static void atk40_jump_if_move_affected_by_protect(void);
+static void atk40_jumpifaffectedbyprotect(void);
static void atk41_call(void);
static void atk42_jumpiftype2(void);
static void atk43_jumpifabilitypresent(void);
-static void atk44(void);
+static void atk44_endselectionscript(void);
static void atk45_playanimation(void);
static void atk46_playanimation2(void);
static void atk47_setgraphicalstatchangevalues(void);
static void atk48_playstatchangeanimation(void);
-static void atk49_moveendturn(void);
+static void atk49_moveend(void);
static void atk4A_typecalc2(void);
-static void atk4B_return_atk_to_ball(void);
-static void atk4C_copy_poke_data(void);
-static void atk4D_switch_data_update(void);
-static void atk4E_switchin_anim(void);
-static void atk4F_jump_if_cannot_switch(void);
+static void atk4B_returnatktoball(void);
+static void atk4C_getswitchedmondata(void);
+static void atk4D_switchindataupdate(void);
+static void atk4E_switchinanim(void);
+static void atk4F_jumpifcantswitch(void);
static void atk50_openpartyscreen(void);
-static void atk51_switch_handle_order(void);
-static void atk52_switch_in_effects(void);
-static void atk53_trainer_slide(void);
-static void atk54_effectiveness_sound(void);
-static void atk55_play_sound(void);
-static void atk56_fainting_cry(void);
+static void atk51_switchhandleorder(void);
+static void atk52_switchineffects(void);
+static void atk53_trainerslidein(void);
+static void atk54_playse(void);
+static void atk55_fanfare(void);
+static void atk56_playfaintcry(void);
static void atk57(void);
-static void atk58_return_to_ball(void);
-void atk59_learnmove_inbattle(void);
-static void atk5A(void);
-static void atk5B_80256E0(void);
+static void atk58_returntoball(void);
+void atk59_handlelearnnewmove(void);
+static void atk5A_yesnoboxlearnmove(void);
+static void atk5B_yesnoboxstoplearningmove(void);
static void atk5C_hitanimation(void);
static void atk5D_getmoneyreward(void);
static void atk5E_8025A70(void);
static void atk5F_8025B24(void);
-static void atk60_increment_gamestat(void);
-static void atk61_8025BA4(void);
+static void atk60_incrementgamestat(void);
+static void atk61_drawpartystatussummary(void);
static void atk62_08025C6C(void);
static void atk63_jumptorandomattack(void);
static void atk64_statusanimation(void);
static void atk65_status2animation(void);
static void atk66_chosenstatusanimation(void);
-static void atk67_8025ECC(void);
-static void atk68_80246A0(void);
-static void atk69_dmg_adjustment2(void);
+static void atk67_yesnobox(void);
+static void atk68_cancelallactions(void);
+static void atk69_adjustsetdamage(void);
void atk6A_removeitem(void);
static void atk6B_atknameinbuff1(void);
-static void atk6C_lvlbox_display(void);
-static void atk6D_set_sentpokes_values(void);
-static void atk6E_set_atk_to_player0(void);
-static void atk6F_set_visible(void);
-static void atk70_record_ability(void);
-static void atk71_buffer_move_to_learn(void);
-static void atk72_jump_if_can_run_frombattle(void);
-static void atk73_hp_thresholds(void);
-static void atk74_hp_thresholds2(void);
-static void atk75_8026A58(void);
+static void atk6C_drawlvlupbox(void);
+static void atk6D_resetsentmonsvalue(void);
+static void atk6E_setatktoplayer0(void);
+static void atk6F_makevisible(void);
+static void atk70_recordlastability(void);
+static void atk71_buffermovetolearn(void);
+static void atk72_jumpifplayerran(void);
+static void atk73_hpthresholds(void);
+static void atk74_hpthresholds2(void);
+static void atk75_useitemonopponent(void);
static void atk76_various(void);
-static void atk77_setprotect(void);
+static void atk77_setprotectlike(void);
static void atk78_faintifabilitynotdamp(void);
static void atk79_setatkhptozero(void);
-static void atk7A_jumpwhiletargetvalid(void);
-static void atk7B_healhalfHP_if_possible(void);
-static void atk7C_8025508(void);
-static void atk7D_set_rain(void);
+static void atk7A_jumpifnexttargetvalid(void);
+static void atk7B_tryhealhalfhealth(void);
+static void atk7C_trymirrormove(void);
+static void atk7D_setrain(void);
static void atk7E_setreflect(void);
static void atk7F_setseeded(void);
static void atk80_manipulatedamage(void);
-static void atk81_setrest(void);
+static void atk81_trysetrest(void);
static void atk82_jumpifnotfirstturn(void);
static void atk83_nop(void);
-static void atk84_jump_if_cant_sleep(void);
+static void atk84_jumpifcantmakeasleep(void);
static void atk85_stockpile(void);
static void atk86_stockpiletobasedamage(void);
static void atk87_stockpiletohpheal(void);
@@ -419,64 +419,64 @@ static void atk89_statbuffchange(void);
static void atk8A_normalisebuffs(void);
static void atk8B_setbide(void);
static void atk8C_confuseifrepeatingattackends(void);
-static void atk8D_setmultihit_counter(void);
-static void atk8E_prepare_multihit(void);
+static void atk8D_setmultihitcounter(void);
+static void atk8E_initmultihitstring(void);
static void atk8F_forcerandomswitch(void);
-static void atk90_conversion_type_change(void);
+static void atk90_tryconversiontypechange(void);
static void atk91_givepaydaymoney(void);
static void atk92_setlightscreen(void);
-static void atk93_ko_move(void);
-static void atk94_gethalfcurrentenemyhp(void);
+static void atk93_tryKO(void);
+static void atk94_damagetohalftargethp(void);
static void atk95_setsandstorm(void);
static void atk96_weatherdamage(void);
-static void atk97_try_infatuation(void);
-static void atk98_status_icon_update(void);
+static void atk97_tryinfatuating(void);
+static void atk98_updatestatusicon(void);
static void atk99_setmist(void);
-static void atk9A_set_focusenergy(void);
+static void atk9A_setfocusenergy(void);
static void atk9B_transformdataexecution(void);
-static void atk9C_set_substitute(void);
-static void atk9D_copyattack(void);
+static void atk9C_setsubstitute(void);
+static void atk9D_mimicattackcopy(void);
static void atk9E_metronome(void);
static void atk9F_dmgtolevel(void);
static void atkA0_psywavedamageeffect(void);
static void atkA1_counterdamagecalculator(void);
static void atkA2_mirrorcoatdamagecalculator(void);
static void atkA3_disablelastusedattack(void);
-static void atkA4_setencore(void);
+static void atkA4_trysetencore(void);
static void atkA5_painsplitdmgcalc(void);
static void atkA6_settypetorandomresistance(void);
static void atkA7_setalwayshitflag(void);
static void atkA8_copymovepermanently(void);
-static void atkA9_sleeptalk_choose_move(void);
-static void atkAA_set_destinybond(void);
-static void atkAB_DestinyBondFlagUpdate(void);
+static void atkA9_trychoosesleeptalkmove(void);
+static void atkAA_setdestinybond(void);
+static void atkAB_trysetdestinybondtohappen(void);
static void atkAC_remaininghptopower(void);
-static void atkAD_spite_ppreduce(void);
-static void atkAE_heal_party_status(void);
+static void atkAD_tryspiteppreduce(void);
+static void atkAE_healpartystatus(void);
static void atkAF_cursetarget(void);
-static void atkB0_set_spikes(void);
-static void atkB1_set_foresight(void);
-static void atkB2_setperishsong(void);
+static void atkB0_trysetspikes(void);
+static void atkB1_setforesight(void);
+static void atkB2_trysetperishsong(void);
static void atkB3_rolloutdamagecalculation(void);
static void atkB4_jumpifconfusedandstatmaxed(void);
static void atkB5_furycuttercalc(void);
static void atkB6_happinesstodamagecalculation(void);
static void atkB7_presentdamagecalculation(void);
-static void atkB8_set_safeguard(void);
+static void atkB8_setsafeguard(void);
static void atkB9_magnitudedamagecalculation(void);
static void atkBA_jumpifnopursuitswitchdmg(void);
static void atkBB_setsunny(void);
static void atkBC_maxattackhalvehp(void);
static void atkBD_copyfoestats(void);
-static void atkBE_breakfree(void);
-static void atkBF_set_defense_curl(void);
+static void atkBE_rapidspinfree(void);
+static void atkBF_setdefensecurlbit(void);
static void atkC0_recoverbasedonsunlight(void);
-static void atkC1_hidden_power(void);
-static void atkC2_selectnexttarget(void);
-static void atkC3_setfutureattack(void);
-static void atkC4_beat_up(void);
-static void atkC5_hidepreattack(void);
-static void atkC6_unhidepostattack(void);
+static void atkC1_hiddenpowercalc(void);
+static void atkC2_selectfirstvalidtarget(void);
+static void atkC3_trysetfutureattack(void);
+static void atkC4_trydobeatup(void);
+static void atkC5_setsemiinvulnerablebit(void);
+static void atkC6_clearsemiinvulnerablebit(void);
static void atkC7_setminimize(void);
static void atkC8_sethail(void);
static void atkC9_jumpifattackandspecialattackcannotfall(void);
@@ -487,45 +487,45 @@ static void atkCD_cureifburnedparalysedorpoisoned(void);
static void atkCE_settorment(void);
static void atkCF_jumpifnodamage(void);
static void atkD0_settaunt(void);
-static void atkD1_set_helpinghand(void);
-static void atkD2_swap_items(void);
-static void atkD3_copy_ability(void);
-static void atkD4_wish_effect(void);
-static void atkD5_setroots(void);
+static void atkD1_trysethelpinghand(void);
+static void atkD2_tryswapitems(void);
+static void atkD3_trycopyability(void);
+static void atkD4_trywish(void);
+static void atkD5_trysetroots(void);
static void atkD6_doubledamagedealtifdamaged(void);
static void atkD7_setyawn(void);
static void atkD8_setdamagetohealthdifference(void);
static void atkD9_scaledamagebyhealthratio(void);
-static void atkDA_abilityswap(void);
-static void atkDB_imprisoneffect(void);
-static void atkDC_setgrudge(void);
+static void atkDA_tryswapabilities(void);
+static void atkDB_tryimprision(void);
+static void atkDC_trysetgrudge(void);
static void atkDD_weightdamagecalculation(void);
static void atkDE_asistattackselect(void);
-static void atkDF_setmagiccoat(void);
-static void atkE0_setstealstatchange(void);
-static void atkE1_intimidate_string_loader(void);
-static void atkE2_switchout_abilities(void);
-static void atkE3_jumpiffainted(void);
+static void atkDF_trysetmagiccoat(void);
+static void atkE0_trysetsnatch(void);
+static void atkE1_trygetintimidatetarget(void);
+static void atkE2_switchoutabilities(void);
+static void atkE3_jumpifhasnohp(void);
static void atkE4_getsecretpowereffect(void);
static void atkE5_pickup(void);
-static void atkE6_castform_change_animation(void);
-static void atkE7_castform_data_change(void);
+static void atkE6_docastformchangeanimation(void);
+static void atkE7_trycastformdatachange(void);
static void atkE8_settypebasedhalvers(void);
static void atkE9_setweatherballtype(void);
-static void atkEA_recycleitem(void);
+static void atkEA_tryrecycleitem(void);
static void atkEB_settypetoterrain(void);
-static void atkEC_pursuit_sth(void);
-static void atkED_802B4B4(void);
+static void atkEC_pursuitrelated(void);
+static void atkED_snatchsetbanks(void);
static void atkEE_removelightscreenreflect(void);
-void atkEF_pokeball_catch_calculation(void);
-static void atkF0_copy_caught_poke(void);
-static void atkF1_setpoke_as_caught(void);
-static void atkF2_display_dex_info(void);
-static void atkF3_nickname_caught_poke(void);
-static void atkF4_802BEF0(void);
+void atkEF_handleballthrow(void);
+static void atkF0_givecaughtmon(void);
+static void atkF1_trysetcaughtmondexflags(void);
+static void atkF2_displaydexinfo(void);
+static void atkF3_trygivecaughtmonnick(void);
+static void atkF4_subattackerhpbydmg(void);
static void atkF5_removeattackerstatus1(void);
-static void atkF6_802BF48(void);
-static void atkF7_802BF54(void);
+static void atkF6_finishaction(void);
+static void atkF7_finishturn(void);
const BattleCmdFunc gBattleScriptingCommandsTable[] =
{
@@ -534,41 +534,41 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] =
atk02_attackstring,
atk03_ppreduce,
atk04_critcalc,
- atk05_damagecalc1,
+ atk05_damagecalc,
atk06_typecalc,
- atk07_dmg_adjustment,
- atk08_dmg_adjustment2,
+ atk07_adjustnormaldamage,
+ atk08_adjustnormaldamage2,
atk09_attackanimation,
atk0A_waitanimation,
atk0B_healthbarupdate,
atk0C_datahpupdate,
atk0D_critmessage,
- atk0E_effectiveness_sound,
+ atk0E_effectivenesssound,
atk0F_resultmessage,
atk10_printstring,
- atk11_printstring_playeronly,
+ atk11_printselectionstring,
atk12_waitmessage,
atk13_printfromtable,
- atk14_printfromtable_playeronly,
- atk15_seteffectwithchancetarget,
+ atk14_printselectionstringfromtable,
+ atk15_seteffectwithchance,
atk16_seteffectprimary,
atk17_seteffectsecondary,
- atk18_status_effect_clear,
- atk19_faint_pokemon,
- atk1A_faint_animation,
- atk1B_faint_effects_clear,
+ atk18_clearstatusfromeffect,
+ atk19_tryfaintmon,
+ atk1A_dofaintanimation,
+ atk1B_cleareffectsonfaint,
atk1C_jumpifstatus,
atk1D_jumpifstatus2,
atk1E_jumpifability,
atk1F_jumpifsideaffecting,
atk20_jumpifstat,
- atk21_jumpifstatus3,
+ atk21_jumpifstatus3condition,
atk22_jumpiftype,
atk23_getexp,
atk24,
- atk25_move_values_cleanup,
- atk26_set_multihit,
- atk27_decrement_multihit,
+ atk25_movevaluescleanup,
+ atk26_setmultihit,
+ atk27_decrementmultihit,
atk28_goto,
atk29_jumpifbyte,
atk2A_jumpifhalfword,
@@ -579,7 +579,7 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] =
atk2F_addbyte,
atk30_subbyte,
atk31_copyarray,
- atk32_copyarray_withindex,
+ atk32_copyarraywithindex,
atk33_orbyte,
atk34_orhalfword,
atk35_orword,
@@ -593,75 +593,75 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] =
atk3D_end,
atk3E_end2,
atk3F_end3,
- atk40_jump_if_move_affected_by_protect,
+ atk40_jumpifaffectedbyprotect,
atk41_call,
atk42_jumpiftype2,
atk43_jumpifabilitypresent,
- atk44,
+ atk44_endselectionscript,
atk45_playanimation,
atk46_playanimation2,
atk47_setgraphicalstatchangevalues,
atk48_playstatchangeanimation,
- atk49_moveendturn,
+ atk49_moveend,
atk4A_typecalc2,
- atk4B_return_atk_to_ball,
- atk4C_copy_poke_data,
- atk4D_switch_data_update,
- atk4E_switchin_anim,
- atk4F_jump_if_cannot_switch,
+ atk4B_returnatktoball,
+ atk4C_getswitchedmondata,
+ atk4D_switchindataupdate,
+ atk4E_switchinanim,
+ atk4F_jumpifcantswitch,
atk50_openpartyscreen,
- atk51_switch_handle_order,
- atk52_switch_in_effects,
- atk53_trainer_slide,
- atk54_effectiveness_sound,
- atk55_play_sound,
- atk56_fainting_cry,
+ atk51_switchhandleorder,
+ atk52_switchineffects,
+ atk53_trainerslidein,
+ atk54_playse,
+ atk55_fanfare,
+ atk56_playfaintcry,
atk57,
- atk58_return_to_ball,
- atk59_learnmove_inbattle,
- atk5A,
- atk5B_80256E0,
+ atk58_returntoball,
+ atk59_handlelearnnewmove,
+ atk5A_yesnoboxlearnmove,
+ atk5B_yesnoboxstoplearningmove,
atk5C_hitanimation,
atk5D_getmoneyreward,
atk5E_8025A70,
atk5F_8025B24,
- atk60_increment_gamestat,
- atk61_8025BA4,
+ atk60_incrementgamestat,
+ atk61_drawpartystatussummary,
atk62_08025C6C,
atk63_jumptorandomattack,
atk64_statusanimation,
atk65_status2animation,
atk66_chosenstatusanimation,
- atk67_8025ECC,
- atk68_80246A0,
- atk69_dmg_adjustment2,
+ atk67_yesnobox,
+ atk68_cancelallactions,
+ atk69_adjustsetdamage,
atk6A_removeitem,
atk6B_atknameinbuff1,
- atk6C_lvlbox_display,
- atk6D_set_sentpokes_values,
- atk6E_set_atk_to_player0,
- atk6F_set_visible,
- atk70_record_ability,
- atk71_buffer_move_to_learn,
- atk72_jump_if_can_run_frombattle,
- atk73_hp_thresholds,
- atk74_hp_thresholds2,
- atk75_8026A58,
+ atk6C_drawlvlupbox,
+ atk6D_resetsentmonsvalue,
+ atk6E_setatktoplayer0,
+ atk6F_makevisible,
+ atk70_recordlastability,
+ atk71_buffermovetolearn,
+ atk72_jumpifplayerran,
+ atk73_hpthresholds,
+ atk74_hpthresholds2,
+ atk75_useitemonopponent,
atk76_various,
- atk77_setprotect,
+ atk77_setprotectlike,
atk78_faintifabilitynotdamp,
atk79_setatkhptozero,
- atk7A_jumpwhiletargetvalid,
- atk7B_healhalfHP_if_possible,
- atk7C_8025508,
- atk7D_set_rain,
+ atk7A_jumpifnexttargetvalid,
+ atk7B_tryhealhalfhealth,
+ atk7C_trymirrormove,
+ atk7D_setrain,
atk7E_setreflect,
atk7F_setseeded,
atk80_manipulatedamage,
- atk81_setrest,
+ atk81_trysetrest,
atk82_jumpifnotfirstturn,
atk83_nop,
- atk84_jump_if_cant_sleep,
+ atk84_jumpifcantmakeasleep,
atk85_stockpile,
atk86_stockpiletobasedamage,
atk87_stockpiletohpheal,
@@ -670,64 +670,64 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] =
atk8A_normalisebuffs,
atk8B_setbide,
atk8C_confuseifrepeatingattackends,
- atk8D_setmultihit_counter,
- atk8E_prepare_multihit,
+ atk8D_setmultihitcounter,
+ atk8E_initmultihitstring,
atk8F_forcerandomswitch,
- atk90_conversion_type_change,
+ atk90_tryconversiontypechange,
atk91_givepaydaymoney,
atk92_setlightscreen,
- atk93_ko_move,
- atk94_gethalfcurrentenemyhp,
+ atk93_tryKO,
+ atk94_damagetohalftargethp,
atk95_setsandstorm,
atk96_weatherdamage,
- atk97_try_infatuation,
- atk98_status_icon_update,
+ atk97_tryinfatuating,
+ atk98_updatestatusicon,
atk99_setmist,
- atk9A_set_focusenergy,
+ atk9A_setfocusenergy,
atk9B_transformdataexecution,
- atk9C_set_substitute,
- atk9D_copyattack,
+ atk9C_setsubstitute,
+ atk9D_mimicattackcopy,
atk9E_metronome,
atk9F_dmgtolevel,
atkA0_psywavedamageeffect,
atkA1_counterdamagecalculator,
atkA2_mirrorcoatdamagecalculator,
atkA3_disablelastusedattack,
- atkA4_setencore,
+ atkA4_trysetencore,
atkA5_painsplitdmgcalc,
atkA6_settypetorandomresistance,
atkA7_setalwayshitflag,
atkA8_copymovepermanently,
- atkA9_sleeptalk_choose_move,
- atkAA_set_destinybond,
- atkAB_DestinyBondFlagUpdate,
+ atkA9_trychoosesleeptalkmove,
+ atkAA_setdestinybond,
+ atkAB_trysetdestinybondtohappen,
atkAC_remaininghptopower,
- atkAD_spite_ppreduce,
- atkAE_heal_party_status,
+ atkAD_tryspiteppreduce,
+ atkAE_healpartystatus,
atkAF_cursetarget,
- atkB0_set_spikes,
- atkB1_set_foresight,
- atkB2_setperishsong,
+ atkB0_trysetspikes,
+ atkB1_setforesight,
+ atkB2_trysetperishsong,
atkB3_rolloutdamagecalculation,
atkB4_jumpifconfusedandstatmaxed,
atkB5_furycuttercalc,
atkB6_happinesstodamagecalculation,
atkB7_presentdamagecalculation,
- atkB8_set_safeguard,
+ atkB8_setsafeguard,
atkB9_magnitudedamagecalculation,
atkBA_jumpifnopursuitswitchdmg,
atkBB_setsunny,
atkBC_maxattackhalvehp,
atkBD_copyfoestats,
- atkBE_breakfree,
- atkBF_set_defense_curl,
+ atkBE_rapidspinfree,
+ atkBF_setdefensecurlbit,
atkC0_recoverbasedonsunlight,
- atkC1_hidden_power,
- atkC2_selectnexttarget,
- atkC3_setfutureattack,
- atkC4_beat_up,
- atkC5_hidepreattack,
- atkC6_unhidepostattack,
+ atkC1_hiddenpowercalc,
+ atkC2_selectfirstvalidtarget,
+ atkC3_trysetfutureattack,
+ atkC4_trydobeatup,
+ atkC5_setsemiinvulnerablebit,
+ atkC6_clearsemiinvulnerablebit,
atkC7_setminimize,
atkC8_sethail,
atkC9_jumpifattackandspecialattackcannotfall,
@@ -738,45 +738,45 @@ const BattleCmdFunc gBattleScriptingCommandsTable[] =
atkCE_settorment,
atkCF_jumpifnodamage,
atkD0_settaunt,
- atkD1_set_helpinghand,
- atkD2_swap_items,
- atkD3_copy_ability,
- atkD4_wish_effect,
- atkD5_setroots,
+ atkD1_trysethelpinghand,
+ atkD2_tryswapitems,
+ atkD3_trycopyability,
+ atkD4_trywish,
+ atkD5_trysetroots,
atkD6_doubledamagedealtifdamaged,
atkD7_setyawn,
atkD8_setdamagetohealthdifference,
atkD9_scaledamagebyhealthratio,
- atkDA_abilityswap,
- atkDB_imprisoneffect,
- atkDC_setgrudge,
+ atkDA_tryswapabilities,
+ atkDB_tryimprision,
+ atkDC_trysetgrudge,
atkDD_weightdamagecalculation,
atkDE_asistattackselect,
- atkDF_setmagiccoat,
- atkE0_setstealstatchange,
- atkE1_intimidate_string_loader,
- atkE2_switchout_abilities,
- atkE3_jumpiffainted,
+ atkDF_trysetmagiccoat,
+ atkE0_trysetsnatch,
+ atkE1_trygetintimidatetarget,
+ atkE2_switchoutabilities,
+ atkE3_jumpifhasnohp,
atkE4_getsecretpowereffect,
atkE5_pickup,
- atkE6_castform_change_animation,
- atkE7_castform_data_change,
+ atkE6_docastformchangeanimation,
+ atkE7_trycastformdatachange,
atkE8_settypebasedhalvers,
atkE9_setweatherballtype,
- atkEA_recycleitem,
+ atkEA_tryrecycleitem,
atkEB_settypetoterrain,
- atkEC_pursuit_sth,
- atkED_802B4B4,
+ atkEC_pursuitrelated,
+ atkED_snatchsetbanks,
atkEE_removelightscreenreflect,
- atkEF_pokeball_catch_calculation,
- atkF0_copy_caught_poke,
- atkF1_setpoke_as_caught,
- atkF2_display_dex_info,
- atkF3_nickname_caught_poke,
- atkF4_802BEF0,
+ atkEF_handleballthrow,
+ atkF0_givecaughtmon,
+ atkF1_trysetcaughtmondexflags,
+ atkF2_displaydexinfo,
+ atkF3_trygivecaughtmonnick,
+ atkF4_subattackerhpbydmg,
atkF5_removeattackerstatus1,
- atkF6_802BF48,
- atkF7_802BF54,
+ atkF6_finishaction,
+ atkF7_finishturn,
};
struct statFractions
@@ -1127,7 +1127,7 @@ static void JumpIfMoveFailed(u8 adder, u16 move)
gBattlescriptCurrInstr = to_store;
}
-static void atk40_jump_if_move_affected_by_protect(void)
+static void atk40_jumpifaffectedbyprotect(void)
{
if (TargetProtectAffected)
{
@@ -1383,7 +1383,7 @@ static void atk04_critcalc(void)
gBattlescriptCurrInstr++;
}
-static void atk05_damagecalc1(void)
+static void atk05_damagecalc(void)
{
u16 side_hword = gSideAffecting[GetBankIdentity(gBankTarget) & 1];
gBattleMoveDamage = CalculateBaseDamage(&gBattleMons[gBankAttacker], &gBattleMons[gBankTarget], gCurrentMove,
@@ -1744,7 +1744,7 @@ void Unused_ApplyRandomDmgMultiplier(void)
ApplyRandomDmgMultiplier();
}
-static void atk07_dmg_adjustment(void)
+static void atk07_adjustnormaldamage(void)
{
u8 hold_effect, quality;
ApplyRandomDmgMultiplier();
@@ -1791,7 +1791,7 @@ static void atk07_dmg_adjustment(void)
gBattlescriptCurrInstr++;
}
-static void atk08_dmg_adjustment2(void) //literally the same as 0x7 except it doesn't check for false swipe move effect...
+static void atk08_adjustnormaldamage2(void) //literally the same as 0x7 except it doesn't check for false swipe move effect...
{
u8 hold_effect, quality;
ApplyRandomDmgMultiplier();
@@ -2050,7 +2050,7 @@ static void atk0D_critmessage(void)
}
}
-static void atk0E_effectiveness_sound(void)
+static void atk0E_effectivenesssound(void)
{
if (gBattleExecBuffer)
return;
@@ -2192,7 +2192,7 @@ static void atk10_printstring(void)
}
}
-static void atk11_printstring_playeronly(void)
+static void atk11_printselectionstring(void)
{
gActiveBank = gBankAttacker;
EmitPrintStringPlayerOnly(0, T2_READ_16(gBattlescriptCurrInstr + 1));
@@ -2234,7 +2234,7 @@ static void atk13_printfromtable(void)
}
}
-static void atk14_printfromtable_playeronly(void)
+static void atk14_printselectionstringfromtable(void)
{
if (gBattleExecBuffer == 0)
{
@@ -4919,7 +4919,7 @@ _0801F610: .4byte BattleScript_SAtkDown2\n\
#endif // NONMATCHING
-static void atk15_seteffectwithchancetarget(void)
+static void atk15_seteffectwithchance(void)
{
u32 PercentChance;
if (gBattleMons[gBankAttacker].ability == ABILITY_SERENE_GRACE)
@@ -4954,7 +4954,7 @@ static void atk17_seteffectsecondary(void)
SetMoveEffect(0, 0);
}
-static void atk18_status_effect_clear(void)
+static void atk18_clearstatusfromeffect(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
if (gBattleCommunication[MOVE_EFFECT_BYTE] <= 6)
@@ -4967,7 +4967,7 @@ static void atk18_status_effect_clear(void)
BATTLE_STRUCT->unk16112 = 0;
}
-static void atk19_faint_pokemon(void)
+static void atk19_tryfaintmon(void)
{
u8 *r4;
@@ -5070,7 +5070,7 @@ static void atk19_faint_pokemon(void)
}
}
-static void atk1A_faint_animation(void)
+static void atk1A_dofaintanimation(void)
{
if (gBattleExecBuffer == 0)
{
@@ -5081,7 +5081,7 @@ static void atk1A_faint_animation(void)
}
}
-static void atk1B_faint_effects_clear(void)
+static void atk1B_cleareffectsonfaint(void)
{
//Clears things like attraction or trapping to other banks
if (gBattleExecBuffer == 0)
@@ -5220,7 +5220,7 @@ static void atk20_jumpifstat(void)
gBattlescriptCurrInstr += 9;
}
-static void atk21_jumpifstatus3(void)
+static void atk21_jumpifstatus3condition(void)
{
u32 flags;
void* jump_loc;
@@ -5265,14 +5265,14 @@ static void atk23_getexp(void)
u16* exp = &BATTLE_STRUCT->exp;
gBank1 = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
sent_in = gSentPokesToOpponent[(gBank1 & 2) >> 1];
- switch (BATTLE_STRUCT->atk23StateTracker)
+ switch (BATTLE_STRUCT->getexpStateTracker)
{
case 0: //check if should receive exp at all
if (GetBankSide(gBank1) != 1 || (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_SAFARI | BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_EREADER_TRAINER)))
- BATTLE_STRUCT->atk23StateTracker = 6; //goto last case
+ BATTLE_STRUCT->getexpStateTracker = 6; //goto last case
else
{
- BATTLE_STRUCT->atk23StateTracker++;
+ BATTLE_STRUCT->getexpStateTracker++;
((u8*)ewram)[0x16113] |= gBitTable[gBattlePartyID[gBank1]];
}
break;
@@ -5317,7 +5317,7 @@ static void atk23_getexp(void)
*exp = 1;
gExpShareExp = 0;
}
- BATTLE_STRUCT->atk23StateTracker++;
+ BATTLE_STRUCT->getexpStateTracker++;
BATTLE_STRUCT->expGetterID = 0;
BATTLE_STRUCT->sentInPokes = sent_in;
} //no break statement
@@ -5334,7 +5334,7 @@ static void atk23_getexp(void)
if ((hold_effect != HOLD_EFFECT_EXP_SHARE && !(BATTLE_STRUCT->sentInPokes & 1)))
{
BATTLE_STRUCT->sentInPokes >>= 1;
- tracker = &BATTLE_STRUCT->atk23StateTracker;
+ tracker = &BATTLE_STRUCT->getexpStateTracker;
zero = 0;
*tracker = 5; //increment looper
gBattleMoveDamage = zero; //used for exp
@@ -5342,7 +5342,7 @@ static void atk23_getexp(void)
else if (GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_LEVEL) == 100)
{
BATTLE_STRUCT->sentInPokes >>= 1;
- tracker = &BATTLE_STRUCT->atk23StateTracker;
+ tracker = &BATTLE_STRUCT->getexpStateTracker;
zero = 0;
*tracker = 5; //increment looper
gBattleMoveDamage = zero; //used for exp
@@ -5428,7 +5428,7 @@ static void atk23_getexp(void)
MonGainEVs(&gPlayerParty[BATTLE_STRUCT->expGetterID], gBattleMons[gBank1].species);
}
BATTLE_STRUCT->sentInPokes >>= 1;
- BATTLE_STRUCT->atk23StateTracker++;
+ BATTLE_STRUCT->getexpStateTracker++;
}
}
break;
@@ -5450,7 +5450,7 @@ static void atk23_getexp(void)
EmitExpBarUpdate(0, BATTLE_STRUCT->expGetterID, gBattleMoveDamage);
MarkBufferBankForExecution(gActiveBank);
}
- BATTLE_STRUCT->atk23StateTracker++;
+ BATTLE_STRUCT->getexpStateTracker++;
}
break;
case 4: //lvl up if necessary
@@ -5508,24 +5508,24 @@ static void atk23_getexp(void)
gBattleMons[2].spAttack = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPEED /*RIP*/);
gBattleMons[2].spDefense = GetMonData(&gPlayerParty[BATTLE_STRUCT->expGetterID], MON_DATA_SPATK);
}
- BATTLE_STRUCT->atk23StateTracker = 5;
+ BATTLE_STRUCT->getexpStateTracker = 5;
}
else
{
gBattleMoveDamage = 0;
- BATTLE_STRUCT->atk23StateTracker = 5;
+ BATTLE_STRUCT->getexpStateTracker = 5;
}
}
break;
case 5: //looper increment
if (gBattleMoveDamage) //there is exp to give, goto case 3 that gives exp
- BATTLE_STRUCT->atk23StateTracker = 3;
+ BATTLE_STRUCT->getexpStateTracker = 3;
else
{
if (++BATTLE_STRUCT->expGetterID <= 5)
- BATTLE_STRUCT->atk23StateTracker = 2; //loop again
+ BATTLE_STRUCT->getexpStateTracker = 2; //loop again
else
- BATTLE_STRUCT->atk23StateTracker = 6; //we're done
+ BATTLE_STRUCT->getexpStateTracker = 6; //we're done
}
break;
case 6: //increment instruction
@@ -6966,19 +6966,19 @@ static void MoveValuesCleanUp(void)
gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
}
-static void atk25_move_values_cleanup(void)
+static void atk25_movevaluescleanup(void)
{
MoveValuesCleanUp();
gBattlescriptCurrInstr += 1;
}
-static void atk26_set_multihit(void)
+static void atk26_setmultihit(void)
{
gMultiHitCounter = T2_READ_8(gBattlescriptCurrInstr + 1);
gBattlescriptCurrInstr += 2;
}
-static void atk27_decrement_multihit(void)
+static void atk27_decrementmultihit(void)
{
if (--gMultiHitCounter == 0)
gBattlescriptCurrInstr += 5;
@@ -7184,7 +7184,7 @@ static void atk31_copyarray(void)
gBattlescriptCurrInstr += 10;
}
-static void atk32_copyarray_withindex(void)
+static void atk32_copyarraywithindex(void)
{
u8* mem1 = T2_READ_PTR(gBattlescriptCurrInstr + 1);
u8* mem2 = T2_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -7332,7 +7332,7 @@ static void atk43_jumpifabilitypresent(void)
gBattlescriptCurrInstr += 6;
}
-static void atk44(void)
+static void atk44_endselectionscript(void)
{
ewram16060(gBankAttacker) = 1;
}
@@ -7796,7 +7796,7 @@ _080217E6:\n\
#endif // NONMATCHING
#ifdef NONMATCHING
-static void atk49_moveendturn(void)
+static void atk49_moveend(void)
{
int i;
int effect = 0;
@@ -7936,7 +7936,7 @@ static void atk49_moveendturn(void)
}
#else
__attribute__((naked))
-static void atk49_moveendturn(void)
+static void atk49_moveend(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -9322,7 +9322,7 @@ static void atk4A_typecalc2(void)
gBattlescriptCurrInstr++;
}
-static void atk4B_return_atk_to_ball(void)
+static void atk4B_returnatktoball(void)
{
gActiveBank = gBankAttacker;
if (!(gHitMarker & HITMARKER_FAINTED(gActiveBank)))
@@ -9333,7 +9333,7 @@ static void atk4B_return_atk_to_ball(void)
gBattlescriptCurrInstr++;
}
-static void atk4C_copy_poke_data(void)
+static void atk4C_getswitchedmondata(void)
{
if (gBattleExecBuffer)
return;
@@ -9357,7 +9357,7 @@ static inline u8 get_knocked_off_byte(u8 bank)
return *cc;
}
-static void atk4D_switch_data_update(void)
+static void atk4D_switchindataupdate(void)
{
struct BattlePokemon OldData;
int i;
@@ -9401,7 +9401,7 @@ static void atk4D_switch_data_update(void)
gBattlescriptCurrInstr += 2;
}
-static void atk4E_switchin_anim(void)
+static void atk4E_switchinanim(void)
{
if (gBattleExecBuffer)
return;
@@ -9417,7 +9417,7 @@ static void atk4E_switchin_anim(void)
gBattlescriptCurrInstr += 3;
}
-static void atk4F_jump_if_cannot_switch(void)
+static void atk4F_jumpifcantswitch(void)
{
int val, to_cmp;
register struct Pokemon *party;
@@ -10565,7 +10565,7 @@ _08023318: .4byte gBitTable\n\
.syntax divided");
}
-static void atk51_switch_handle_order(void)
+static void atk51_switchhandleorder(void)
{
int i;
if (gBattleExecBuffer)
@@ -10616,7 +10616,7 @@ static void atk51_switch_handle_order(void)
gBattlescriptCurrInstr += 3;
}
-static void atk52_switch_in_effects(void)
+static void atk52_switchineffects(void)
{
int i;
@@ -10687,7 +10687,7 @@ static void atk52_switch_in_effects(void)
}
}
-static void atk53_trainer_slide(void)
+static void atk53_trainerslidein(void)
{
if (!T2_READ_8(gBattlescriptCurrInstr + 1))
gActiveBank = GetBankByPlayerAI(0);
@@ -10699,7 +10699,7 @@ static void atk53_trainer_slide(void)
gBattlescriptCurrInstr += 2;
}
-static void atk54_effectiveness_sound(void)
+static void atk54_playse(void)
{
gActiveBank = gBankAttacker;
EmitEffectivenessSound(0, T2_READ_16(gBattlescriptCurrInstr + 1));
@@ -10707,7 +10707,7 @@ static void atk54_effectiveness_sound(void)
gBattlescriptCurrInstr += 3;
}
-static void atk55_play_sound(void)
+static void atk55_fanfare(void)
{
gActiveBank = gBankAttacker;
Emitcmd44(0, T2_READ_16(gBattlescriptCurrInstr + 1));
@@ -10715,7 +10715,7 @@ static void atk55_play_sound(void)
gBattlescriptCurrInstr += 3;
}
-static void atk56_fainting_cry(void)
+static void atk56_playfaintcry(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
EmitFaintingCry(0);
@@ -10731,7 +10731,7 @@ static void atk57(void)
gBattlescriptCurrInstr += 1;
}
-static void atk58_return_to_ball(void)
+static void atk58_returntoball(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
EmitReturnPokeToBall(0, 1);
@@ -10739,7 +10739,7 @@ static void atk58_return_to_ball(void)
gBattlescriptCurrInstr += 2;
}
-void atk59_learnmove_inbattle(void)
+void atk59_handlelearnnewmove(void)
{
u8* loc1 = T1_READ_PTR(gBattlescriptCurrInstr + 1);
u8* loc2 = T1_READ_PTR(gBattlescriptCurrInstr + 5);
@@ -10785,7 +10785,7 @@ void sub_8023AD8(void)
DestroyMenuCursor();
}
-static void atk5A(void)
+static void atk5A_yesnoboxlearnmove(void)
{
gActiveBank = 0;
switch (BATTLE_STRUCT->atk5A_StateTracker)
@@ -10898,7 +10898,7 @@ static void atk5A(void)
}
}
-static void atk5B_80256E0(void)
+static void atk5B_yesnoboxstoplearningmove(void)
{
switch (BATTLE_STRUCT->atk5A_StateTracker)
{
@@ -11253,7 +11253,7 @@ static void atk5F_8025B24(void)
gBattlescriptCurrInstr++;
}
-static void atk60_increment_gamestat(void)
+static void atk60_incrementgamestat(void)
{
if (GetBankSide(gBankAttacker) == 0)
{
@@ -11262,7 +11262,7 @@ static void atk60_increment_gamestat(void)
gBattlescriptCurrInstr += 2;
}
-static void atk61_8025BA4(void)
+static void atk61_drawpartystatussummary(void)
{
int i;
struct Pokemon* party;
@@ -11357,7 +11357,7 @@ static void atk66_chosenstatusanimation(void)
}
}
-static void atk67_8025ECC(void)
+static void atk67_yesnobox(void)
{
switch (gBattleCommunication[0])
{
@@ -11399,7 +11399,7 @@ static void atk67_8025ECC(void)
}
}
-static void atk68_80246A0(void)
+static void atk68_cancelallactions(void)
{
int i;
for (i = 0; i < gNoOfAllBanks; i++)
@@ -11409,7 +11409,7 @@ static void atk68_80246A0(void)
gBattlescriptCurrInstr++;
}
-static void atk69_dmg_adjustment2(void) //literally a copy of atk07 except theres no rand dmg modifier...
+static void atk69_adjustsetdamage(void) //literally a copy of atk07 except theres no rand dmg modifier...
{
u8 hold_effect, quality;
if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
@@ -11474,7 +11474,7 @@ static void atk6B_atknameinbuff1(void)
}
#ifdef NONMATCHING
-static void atk6C_lvlbox_display(void)
+static void atk6C_drawlvlupbox(void)
{
u8 r1 = 0;
u8 r7 = 0;
@@ -11489,7 +11489,7 @@ static void atk6C_lvlbox_display(void)
#else
__attribute__((naked))
-static void atk6C_lvlbox_display(void)
+static void atk6C_drawlvlupbox(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -11899,19 +11899,19 @@ _08024C48: .4byte gBattlescriptCurrInstr\n\
#endif
-static void atk6D_set_sentpokes_values(void)
+static void atk6D_resetsentmonsvalue(void)
{
sub_80156DC();
gBattlescriptCurrInstr++;
}
-static void atk6E_set_atk_to_player0(void)
+static void atk6E_setatktoplayer0(void)
{
gBankAttacker = GetBankByPlayerAI(0);
gBattlescriptCurrInstr++;
}
-static void atk6F_set_visible(void)
+static void atk6F_makevisible(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
EmitSpriteInvisibility(0, 0);
@@ -11919,7 +11919,7 @@ static void atk6F_set_visible(void)
gBattlescriptCurrInstr += 2;
}
-static void atk70_record_ability(void)
+static void atk70_recordlastability(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
RecordAbilityBattle(gActiveBank, gLastUsedAbility);
@@ -11935,13 +11935,13 @@ void sub_8024CEC(void)
gBattleTextBuff2[4] = 0xFF;
}
-static void atk71_buffer_move_to_learn(void)
+static void atk71_buffermovetolearn(void)
{
sub_8024CEC();
gBattlescriptCurrInstr++;
}
-static void atk72_jump_if_can_run_frombattle(void)
+static void atk72_jumpifplayerran(void)
{
if (sub_8014AB8(gBank1))
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -11949,7 +11949,7 @@ static void atk72_jump_if_can_run_frombattle(void)
gBattlescriptCurrInstr += 5;
}
-static void atk73_hp_thresholds(void)
+static void atk73_hpthresholds(void)
{
u8 opposing_bank;
s32 result;
@@ -11975,7 +11975,7 @@ static void atk73_hp_thresholds(void)
gBattlescriptCurrInstr += 2;
}
-static void atk74_hp_thresholds2(void)
+static void atk74_hpthresholds2(void)
{
u8 opposing_bank;
u8 hp_switchout;
@@ -12000,7 +12000,7 @@ static void atk74_hp_thresholds2(void)
gBattlescriptCurrInstr += 2;
}
-static void atk75_8026A58(void)
+static void atk75_useitemonopponent(void)
{
gBankInMenu = gBankAttacker;
sub_803E1B0(&gEnemyParty[gBattlePartyID[gBankAttacker]], gLastUsedItem, gBattlePartyID[gBankAttacker], 0, 1);
@@ -12073,7 +12073,7 @@ static void atk76_various(void)
gBattlescriptCurrInstr += 3;
}
-static void atk77_setprotect(void) //protect and endure
+static void atk77_setprotectlike(void) //protect and endure
{
bool8 not_last_turn = 1;
u16 last_move = gUnknown_02024C4C[gBankAttacker];
@@ -12155,7 +12155,7 @@ static void atk79_setatkhptozero(void)
gBattlescriptCurrInstr++;
}
-static void atk7A_jumpwhiletargetvalid(void) //used by intimidate to loop through all targets
+static void atk7A_jumpifnexttargetvalid(void) //used by intimidate to loop through all targets
{
u8* jump_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -12178,7 +12178,7 @@ static void atk7A_jumpwhiletargetvalid(void) //used by intimidate to loop throug
gBattlescriptCurrInstr += 5;
}
-static void atk7B_healhalfHP_if_possible(void)
+static void atk7B_tryhealhalfhealth(void)
{
u8* fail_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -12196,7 +12196,7 @@ static void atk7B_healhalfHP_if_possible(void)
gBattlescriptCurrInstr += 6;
}
-static void atk7C_8025508(void)
+static void atk7C_trymirrormove(void)
{
u16 r7 = ewram160ACarr2(0, gBankAttacker) | (ewram160ACarr2(1, gBankAttacker) << 8);
u16 r6 = ewram16100arr2(0, gBankAttacker) | (ewram16100arr2(1, gBankAttacker) << 8);
@@ -12240,7 +12240,7 @@ static void atk7C_8025508(void)
}
}
-static void atk7D_set_rain(void)
+static void atk7D_setrain(void)
{
if (gBattleWeather & WEATHER_RAIN_ANY)
{
@@ -12319,7 +12319,7 @@ static void atk80_manipulatedamage(void)
gBattlescriptCurrInstr += 2;
}
-static void atk81_setrest(void)
+static void atk81_trysetrest(void)
{
u8* fail_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1);
gActiveBank = gBankTarget = gBankAttacker;
@@ -12377,7 +12377,7 @@ bool8 UproarWakeUpCheck(u8 bank)
return 1;
}
-static void atk84_jump_if_cant_sleep(void)
+static void atk84_jumpifcantmakeasleep(void)
{
u8* jump_loc = T1_READ_PTR(gBattlescriptCurrInstr + 1);
if (UproarWakeUpCheck(gBankTarget))
@@ -13264,7 +13264,7 @@ static void atk8C_confuseifrepeatingattackends(void)
gBattlescriptCurrInstr++;
}
-static void atk8D_setmultihit_counter(void)
+static void atk8D_setmultihitcounter(void)
{
if (T2_READ_8(gBattlescriptCurrInstr + 1))
gMultiHitCounter = T2_READ_8(gBattlescriptCurrInstr + 1);
@@ -13279,7 +13279,7 @@ static void atk8D_setmultihit_counter(void)
gBattlescriptCurrInstr += 2;
}
-static void atk8E_prepare_multihit(void)
+static void atk8E_initmultihitstring(void)
{
ewram160E0(0) = 0xFD;
ewram160E0(1) = 1;
@@ -13399,7 +13399,7 @@ static void atk8F_forcerandomswitch(void)
}
}
-static void atk90_conversion_type_change(void)
+static void atk90_tryconversiontypechange(void)
{
//randomly changes user's type to one of its moves' type
u8 valid_moves = 0;
@@ -13498,7 +13498,7 @@ static void atk92_setlightscreen(void)
}
#ifdef NOTMATCHING
-static void atk93_ko_move(void)
+static void atk93_tryKO(void)
{
if (gBattleMons[gBankTarget].item == ITEM_ENIGMA_BERRY)
hold_effect = gEnigmaBerries[gBankTarget].holdEffect, quality = gEnigmaBerries[gBankTarget].holdEffectParam;
@@ -13552,7 +13552,7 @@ MOVESTATUS_MISSED_LABEL:
#else
__attribute((naked))
-static void atk93_ko_move(void)
+static void atk93_tryKO(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -13903,7 +13903,7 @@ _08026E54: .4byte gBattlescriptCurrInstr\n\
}
#endif // NOTMATCHING
-static void atk94_gethalfcurrentenemyhp(void) //super fang
+static void atk94_damagetohalftargethp(void) //super fang
{
gBattleMoveDamage = gBattleMons[gBankTarget].hp / 2;
if (gBattleMoveDamage == 0)
@@ -13969,7 +13969,7 @@ static void atk96_weatherdamage(void)
gBattlescriptCurrInstr++;
}
-static void atk97_try_infatuation(void)
+static void atk97_tryinfatuating(void)
{
struct Pokemon *attacker, *target;
u16 atk_species, def_species;
@@ -14012,7 +14012,7 @@ static void atk97_try_infatuation(void)
}
}
-static void atk98_status_icon_update(void)
+static void atk98_updatestatusicon(void)
{
if (gBattleExecBuffer)
return;
@@ -14061,7 +14061,7 @@ static void atk99_setmist(void)
gBattlescriptCurrInstr++;
}
-static void atk9A_set_focusenergy(void)
+static void atk9A_setfocusenergy(void)
{
if (gBattleMons[gBankAttacker].status2 & STATUS2_FOCUS_ENERGY)
{
@@ -14122,7 +14122,7 @@ static void atk9B_transformdataexecution(void)
}
}
-static void atk9C_set_substitute(void)
+static void atk9C_setsubstitute(void)
{
u32 hp = gBattleMons[gBankAttacker].maxHP / 4;
if (gBattleMons[gBankAttacker].maxHP / 4 == 0)
@@ -14153,7 +14153,7 @@ static bool8 IsMoveUncopyable(u16 move)
return (sUnknown_081FACFE[i] != 0xFFFE);
}
-static void atk9D_copyattack(void)
+static void atk9D_mimicattackcopy(void)
{
gUnknown_02024BE8 = 0xFFFF;
if (IsMoveUncopyable(gLastUsedMove[gBankTarget]) || gBattleMons[gBankAttacker].status2 & STATUS2_TRANSFORMED
@@ -14375,7 +14375,7 @@ static void atkA3_disablelastusedattack(void)
}
}
-static void atkA4_setencore(void)
+static void atkA4_trysetencore(void)
{
int i;
for (i = 0; i < 4; i++)
@@ -14813,7 +14813,7 @@ static u8 AttacksThisTurn(u8 bank, u16 move) //Note: returns 1 if it's a chargin
return 2;
}
-static void atkA9_sleeptalk_choose_move(void)
+static void atkA9_trychoosesleeptalkmove(void)
{
u8 unusable_moves = 0;
int i;
@@ -14843,7 +14843,7 @@ static void atkA9_sleeptalk_choose_move(void)
}
}
-static void atkAA_set_destinybond(void)
+static void atkAA_setdestinybond(void)
{
gBattleMons[gBankAttacker].status2 |= STATUS2_DESTINY_BOND;
gBattlescriptCurrInstr++;
@@ -14857,7 +14857,7 @@ static void DestinyBondFlagUpdate(void)
gHitMarker |= HITMARKER_DESTINYBOND;
}
-static void atkAB_DestinyBondFlagUpdate(void)
+static void atkAB_trysetdestinybondtohappen(void)
{
DestinyBondFlagUpdate();
gBattlescriptCurrInstr++;
@@ -14876,7 +14876,7 @@ static void atkAC_remaininghptopower(void)
gBattlescriptCurrInstr++;
}
-static void atkAD_spite_ppreduce(void)
+static void atkAD_tryspiteppreduce(void)
{
if (gLastUsedMove[gBankTarget] != 0 && gLastUsedMove[gBankTarget] != 0xFFFF && !(gStatuses3[gBankTarget] & STATUS3_SEMI_INVULNERABLE))
{
@@ -14922,7 +14922,7 @@ static void atkAD_spite_ppreduce(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
-static void atkAE_heal_party_status(void)
+static void atkAE_healpartystatus(void)
{
register u32 zero2 asm("r4") = 0;
u32 zero = zero2;
@@ -15015,7 +15015,7 @@ static void atkAF_cursetarget(void)
}
}
-static void atkB0_set_spikes(void)
+static void atkB0_trysetspikes(void)
{
u8 side = GetBankSide(gBankAttacker) ^ 1;
if (gSideTimer[side].spikesAmount == 3)
@@ -15031,13 +15031,13 @@ static void atkB0_set_spikes(void)
}
}
-static void atkB1_set_foresight(void)
+static void atkB1_setforesight(void)
{
gBattleMons[gBankTarget].status2 |= STATUS2_FORESIGHT;
gBattlescriptCurrInstr++;
}
-static void atkB2_setperishsong(void)
+static void atkB2_trysetperishsong(void)
{
int not_affected_pokes = 0, i;
@@ -15157,7 +15157,7 @@ static void atkB7_presentdamagecalculation(void)
}
}
-static void atkB8_set_safeguard(void)
+static void atkB8_setsafeguard(void)
{
if (gSideAffecting[GetBankIdentity(gBankAttacker) & 1] & SIDE_STATUS_SAFEGUARD)
{
@@ -15310,7 +15310,7 @@ static void atkBD_copyfoestats(void) //psych up
gBattlescriptCurrInstr += 5; //why not 1? possible unused fail possibility?
}
-static void atkBE_breakfree(void) //rapid spin
+static void atkBE_rapidspinfree(void) //rapid spin
{
if (gBattleMons[gBankAttacker].status2 & STATUS2_WRAPPED)
{
@@ -15342,7 +15342,7 @@ static void atkBE_breakfree(void) //rapid spin
gBattlescriptCurrInstr++;
}
-static void atkBF_set_defense_curl(void)
+static void atkBF_setdefensecurlbit(void)
{
gBattleMons[gBankAttacker].status2 |= STATUS2_DEFENSE_CURL;
gBattlescriptCurrInstr++;
@@ -15371,7 +15371,7 @@ static void atkC0_recoverbasedonsunlight(void)
}
__attribute__((naked))
-static void atkC1_hidden_power(void)
+static void atkC1_hiddenpowercalc(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -15519,7 +15519,7 @@ _080298A8: .4byte gBattlescriptCurrInstr\n\
.syntax divided");
}
-static void atkC2_selectnexttarget(void)
+static void atkC2_selectfirstvalidtarget(void)
{
for (gBankTarget = 0; gBankTarget < gNoOfAllBanks; gBankTarget++)
{
@@ -15531,7 +15531,7 @@ static void atkC2_selectnexttarget(void)
gBattlescriptCurrInstr++;
}
-static void atkC3_setfutureattack(void)
+static void atkC3_trysetfutureattack(void)
{
if (gWishFutureKnock.futureSightCounter[gBankTarget] != 0)
{
@@ -15559,7 +15559,7 @@ static void atkC3_setfutureattack(void)
}
#ifdef NONMATCHING
-static void atkC4_beat_up(void)
+static void atkC4_trydobeatup(void)
{
register struct Pokemon* party asm("r7");
if (GetBankSide(gBankAttacker) == 0)
@@ -15605,7 +15605,7 @@ static void atkC4_beat_up(void)
}
#else
__attribute__((naked))
-static void atkC4_beat_up(void)
+static void atkC4_trydobeatup(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -15858,7 +15858,7 @@ _08029C54: .4byte gBattlescriptCurrInstr\n\
}
#endif // NONMATCHING
-static void atkC5_hidepreattack(void)
+static void atkC5_setsemiinvulnerablebit(void)
{
switch (gCurrentMove)
{
@@ -15876,7 +15876,7 @@ static void atkC5_hidepreattack(void)
gBattlescriptCurrInstr++;
}
-static void atkC6_unhidepostattack(void)
+static void atkC6_clearsemiinvulnerablebit(void)
{
switch (gCurrentMove)
{
@@ -16002,7 +16002,7 @@ static void atkD0_settaunt(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
-static void atkD1_set_helpinghand(void)
+static void atkD1_trysethelpinghand(void)
{
gBankTarget = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gBankTarget])
@@ -16016,7 +16016,7 @@ static void atkD1_set_helpinghand(void)
}
#ifdef NONMATCHING
-static void atkD2_swap_items(void)
+static void atkD2_tryswapitems(void)
{
if ((GetBankSide(gBankAttacker) != 1 || gBattleTypeFlags & (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER) || gTrainerBattleOpponent == 0x400))
{
@@ -16029,7 +16029,7 @@ static void atkD2_swap_items(void)
#else
__attribute__((naked))
-static void atkD2_swap_items(void)
+static void atkD2_tryswapitems(void)
{
asm(".syntax unified\n\
push {r4-r7,lr}\n\
@@ -16348,7 +16348,7 @@ _0802A4AC: .4byte gBattleCommunication\n\
}
#endif // NONMATCHING
-static void atkD3_copy_ability(void) //role play
+static void atkD3_trycopyability(void) //role play
{
if (gBattleMons[gBankTarget].ability != 0 && gBattleMons[gBankTarget].ability != ABILITY_WONDER_GUARD)
{
@@ -16360,7 +16360,7 @@ static void atkD3_copy_ability(void) //role play
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
-static void atkD4_wish_effect(void)
+static void atkD4_trywish(void)
{
switch (T2_READ_8(gBattlescriptCurrInstr + 1))
{
@@ -16392,7 +16392,7 @@ static void atkD4_wish_effect(void)
}
}
-static void atkD5_setroots(void) //ingrain
+static void atkD5_trysetroots(void) //ingrain
{
if (gStatuses3[gBankAttacker] & STATUS3_ROOTED)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -16447,7 +16447,7 @@ static void atkD9_scaledamagebyhealthratio(void)
gBattlescriptCurrInstr++;
}
-static void atkDA_abilityswap(void)
+static void atkDA_tryswapabilities(void)
{
if ((gBattleMons[gBankAttacker].ability == 0 && gBattleMons[gBankTarget].ability == 0)
|| gBattleMons[gBankAttacker].ability == ABILITY_WONDER_GUARD || gBattleMons[gBankTarget].ability == ABILITY_WONDER_GUARD
@@ -16462,7 +16462,7 @@ static void atkDA_abilityswap(void)
}
}
-static void atkDB_imprisoneffect(void)
+static void atkDB_tryimprision(void)
{
u8 r8 = 0;
if ((gStatuses3[gBankAttacker] & STATUS3_IMPRISIONED))
@@ -16502,7 +16502,7 @@ static void atkDB_imprisoneffect(void)
}
}
-static void atkDC_setgrudge(void)
+static void atkDC_trysetgrudge(void)
{
if (gStatuses3[gBankAttacker] & STATUS3_GRUDGE)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -16770,7 +16770,7 @@ _0802ABF8: .4byte gBattlescriptCurrInstr\n\
#endif // NONMATCHING
-static void atkDF_setmagiccoat(void)
+static void atkDF_trysetmagiccoat(void)
{
gBankTarget = gBankAttacker;
gSpecialStatuses[gBankAttacker].flag20 = 1;
@@ -16783,7 +16783,7 @@ static void atkDF_setmagiccoat(void)
}
}
-static void atkE0_setstealstatchange(void)
+static void atkE0_trysetsnatch(void)
{
gSpecialStatuses[gBankAttacker].flag20 = 1;
if (gCurrentMoveTurn == gNoOfAllBanks - 1) //last turn
@@ -16795,7 +16795,7 @@ static void atkE0_setstealstatchange(void)
}
}
-static void atkE1_intimidate_string_loader(void)
+static void atkE1_trygetintimidatetarget(void)
{
u8 side;
@@ -16820,7 +16820,7 @@ static void atkE1_intimidate_string_loader(void)
gBattlescriptCurrInstr += 5;
}
-static void atkE2_switchout_abilities(void)
+static void atkE2_switchoutabilities(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
switch (gBattleMons[gActiveBank].ability)
@@ -16834,7 +16834,7 @@ static void atkE2_switchout_abilities(void)
gBattlescriptCurrInstr += 2;
}
-static void atkE3_jumpiffainted(void)
+static void atkE3_jumpifhasnohp(void)
{
gActiveBank = GetBattleBank(T2_READ_8(gBattlescriptCurrInstr + 1));
if (gBattleMons[gActiveBank].hp == 0)
@@ -16906,7 +16906,7 @@ static void atkE5_pickup(void)
gBattlescriptCurrInstr++;
}
-static void atkE6_castform_change_animation(void)
+static void atkE6_docastformchangeanimation(void)
{
gActiveBank = BATTLE_STRUCT->scriptingActive;
if (gBattleMons[gActiveBank].status2 & STATUS2_SUBSTITUTE)
@@ -16916,7 +16916,7 @@ static void atkE6_castform_change_animation(void)
gBattlescriptCurrInstr++;
}
-static void atkE7_castform_data_change(void)
+static void atkE7_trycastformdatachange(void)
{
u8 form;
gBattlescriptCurrInstr++;
@@ -16975,7 +16975,7 @@ static void atkE9_setweatherballtype(void)
gBattlescriptCurrInstr++;
}
-static void atkEA_recycleitem(void)
+static void atkEA_tryrecycleitem(void)
{
u16* used_item;
gActiveBank = gBankAttacker;
@@ -17009,7 +17009,7 @@ static void atkEB_settypetoterrain(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
-static void atkEC_pursuit_sth(void)
+static void atkEC_pursuitrelated(void)
{
gActiveBank = GetBankByPlayerAI(GetBankIdentity(gBankAttacker) ^ 2);
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE && !(gAbsentBankFlags & gBitTable[gActiveBank]) && gActionForBanks[gActiveBank] == 0 && gChosenMovesByBanks[gActiveBank] == MOVE_PURSUIT)
@@ -17025,7 +17025,7 @@ static void atkEC_pursuit_sth(void)
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
}
-static void atkED_802B4B4(void)
+static void atkED_snatchsetbanks(void)
{
gEffectBank = gBankAttacker;
if (gBankAttacker == gBankTarget)
@@ -17056,7 +17056,7 @@ static void atkEE_removelightscreenreflect(void) //brick break
gBattlescriptCurrInstr++;
}
-void atkEF_pokeball_catch_calculation(void)
+void atkEF_handleballthrow(void)
{
u8 ball_multiplier = 0;
if (gBattleExecBuffer)
@@ -17187,7 +17187,7 @@ void atkEF_pokeball_catch_calculation(void)
}
}
-static void atkF0_copy_caught_poke(void)
+static void atkF0_givecaughtmon(void)
{
GiveMonToPlayer(&gEnemyParty[gBattlePartyID[gBankAttacker ^ 1]]);
gBattleResults.caughtPoke = gBattleMons[gBankAttacker ^ 1].species;
@@ -17195,7 +17195,7 @@ static void atkF0_copy_caught_poke(void)
gBattlescriptCurrInstr++;
}
-static void atkF1_setpoke_as_caught(void)
+static void atkF1_trysetcaughtmondexflags(void)
{
if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[gBankTarget].species), 1))
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
@@ -17214,7 +17214,7 @@ extern const u32 gBattleTerrainTiles_Building[];
extern const u32 gBattleTerrainTilemap_Building[];
extern const u32 gBattleTerrainPalette_BattleTower[];
-static void atkF2_display_dex_info(void)
+static void atkF2_displaydexinfo(void)
{
switch (gBattleCommunication[0])
{
@@ -17348,7 +17348,7 @@ void nullsub_6(void)
return;
}
-static void atkF3_nickname_caught_poke(void)
+static void atkF3_trygivecaughtmonnick(void)
{
switch (gBattleCommunication[0])
{
@@ -17414,7 +17414,7 @@ static void atkF3_nickname_caught_poke(void)
}
}
-static void atkF4_802BEF0(void)
+static void atkF4_subattackerhpbydmg(void)
{
gBattleMons[gBankAttacker].hp -= gBattleMoveDamage;
gBattlescriptCurrInstr++;
@@ -17426,12 +17426,12 @@ static void atkF5_removeattackerstatus1(void)
gBattlescriptCurrInstr++;
}
-static void atkF6_802BF48(void)
+static void atkF6_finishaction(void)
{
gFightStateTracker = 0xC;
}
-static void atkF7_802BF54(void)
+static void atkF7_finishturn(void)
{
gFightStateTracker = 0xC;
gCurrentMoveTurn = gNoOfAllBanks;
diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c
index 829ce2dfa..5014e97e3 100644
--- a/src/field/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
@@ -327,7 +327,7 @@ void sub_8080DC4(u8 taskId)
}
}
-void atk17_seteffectuser(void)
+void atk17_seteffectsecondary(void)
{
pal_fill_black();
CreateStartMenuTask(sub_8080DC4);
diff --git a/src/field/overworld.c b/src/field/overworld.c
index d0e40eac3..c4d01f907 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -1329,7 +1329,7 @@ void sub_805465C(void)
void sub_805469C(void)
{
FieldClearVBlankHBlankCallbacks();
- gFieldCallback = atk17_seteffectuser;
+ gFieldCallback = atk17_seteffectsecondary;
c2_exit_to_overworld_2_switch();
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 18:42:01 +0000