summaryrefslogtreecommitdiff
path: root/src/battle_main.c
AgeCommit message (Collapse)Author
2021-01-19Use GET_UNOWN_LETTER macroGriffinR
2021-01-13Label remaining battle typesGriffinR
2021-01-07Use constants for max IVs & the random IV generation flagSphericalIce
2020-12-24Label remaining subs in battle_tower.cGriffinR
2020-12-10Merge remote-tracking branch 'upstream/master' into berry_crushKurausukun
2020-11-02Re-apply joypad macros (minus merge conflicts)aaaaaa123456789
2020-10-26Merge branch 'master' into revertsaaaaaa123456789
2020-10-26re-match BattleIntroOpponent1SendsOutMonAnimationKurausukun
a lot of functions and a bit of data had to be moved from battle_main.c to battle_util.c; I have added a note to battle_util.c stating the reason for this
2020-10-22port fakematch fixes from #1155Kurausukun
2020-10-01Replace POKEMON_SLOTS_NUMBERGriffinR
2020-09-19battle_gfx_sfx_util.c: Very annoying fakematch fix.Kaz
daycare.c: -g eliminates the need for the brace hack. battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-13Undo PokeCodec's PRsaaaaaa123456789
This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
2020-09-08Fix buildPokeCodec
2020-09-08Match BattleIntroOpponent1SendsOutMonAnimationPokeCodec
2020-09-08More adjustmentsPokeCodec
2020-09-06Preparation for matching BattleIntroOpponent1SendsOutMonAnimationPokeCodec
2020-09-06u8 positionPokeCodec
2020-09-05While to do_whilePokeCodec
2020-09-05Change division to explicit shifts for consistencyPokeCodec
2020-09-05Refactor Use ItemPokeCodec
2020-09-05Match CheckBagHasSpacePokeCodec
2020-09-04Switch to button macrosPokeCodec
2020-09-04Merge pull request #1163 from GriffinRichards/doc-animthrowPikalaxALT
Minor battle_anim_throw cleanup
2020-09-02Tidy up naked functionsThomas Winwood
2020-08-30Minor battle_anim_throw cleanupGriffinR
2020-08-28Merge pull request #1146 from GriffinRichards/rename-songsGriffinR
Give songs meaningful english names
2020-08-28More formatting fixesPokeCodec
2020-08-28formatpi1024e
2020-08-28Make formatting correctionspi1024e
2020-08-26removed fakematchPokeCodec
2020-08-20Give songs meaningful english namesGriffinR
2020-08-16Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contestGriffinR
2020-08-13Document link contest connectionGriffinR
2020-08-04Add stat stage constantsGriffinR
2020-07-18Clean up some battle scr cmd dataGriffinR
2020-07-14Merge pull request #1094 from DizzyEggg/renameGriffinR
Give proper names to some functions
2020-07-14Merge pull request #1080 from AsparagusEduardo/EndBallsGriffinR
Created constant for easier Ball Expansion.
2020-07-14Give proper names to some functionsDizzyEggg
2020-07-12Renamed constant,Eduardo Quezada
2020-06-21Created constant for easier Ball Expansion.Eduardo Quezada
2020-06-03Label union room battle trainerGriffinR
2020-03-17Using Battle Action constantsAsparagusEduardo
2020-02-04Use friendship event constantsGriffinR
2019-12-17Document Battle Tower scriptsGriffinR
2019-11-07Document some battle_bg-related thingsMarcus Huderle
2019-11-04Merge pull request #787 from GriffinRichards/rename-tablecmdshuderlem
Rename table cmds
2019-10-31Review changes for party menu docGriffinR
2019-10-31Document party_menu second passGriffinR
2019-10-25Document party_menu first passGriffinR
2019-10-09More trade documentationGriffinR
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-01 03:25:29 +0000