Commit Graph

165 Commits

Author SHA1 Message Date
GriffinR a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR c106f7f130 Document battle_controller_opponent.c 2021-01-22 21:35:16 -05:00
GriffinR 63a7828772 Document battle_controller_player.c 2021-01-22 20:03:27 -05:00
GriffinR 4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
GriffinR bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
GriffinR b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
SphericalIce 3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
GriffinR 769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation
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-26 05:52:00 -04:00
Kurausukun 64ba8c8061 port fakematch fixes from #1155 2020-10-22 05:45:53 -04:00
GriffinR 5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz 847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix.
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04:00
aaaaaa123456789 7dc95a0103 Undo PokeCodec's PRs
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-13 06:30:55 -03:00
PokeCodec bb5da949f2 Fix build 2020-09-08 19:44:33 -04:00
PokeCodec e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec 3336eb341d More adjustments 2020-09-08 14:26:37 -04:00
PokeCodec 5f7a410359 Preparation for matching BattleIntroOpponent1SendsOutMonAnimation 2020-09-06 20:01:16 -04:00
PokeCodec 8200682b21 u8 position 2020-09-06 19:02:30 -04:00
PokeCodec 8b729cf225 While to do_while 2020-09-05 18:15:53 -04:00
PokeCodec fe9ab67063 Change division to explicit shifts for consistency 2020-09-05 18:13:51 -04:00
PokeCodec 3ce29ee7bf Refactor Use Item 2020-09-05 17:36:10 -04:00
PokeCodec 0039542e19 Match CheckBagHasSpace 2020-09-05 14:41:43 -04:00
PokeCodec 28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PikalaxALT 135ed6a162 Merge pull request #1163 from GriffinRichards/doc-animthrow
Minor battle_anim_throw cleanup
2020-09-04 19:44:33 -04:00
Thomas Winwood a529bcf0b6 Tidy up naked functions 2020-09-02 14:49:04 +01:00
GriffinR afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
GriffinR 09cfed64b5 Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
PokeCodec a04b0ff487 More formatting fixes 2020-08-28 14:35:37 -04:00
pi1024e 5faf250708 format 2020-08-28 11:59:16 -04:00
pi1024e 4ac10eb807 Make formatting corrections 2020-08-28 11:52:48 -04:00
PokeCodec 5054cff7e8 removed fakematch 2020-08-26 20:30:04 -04:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR 65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR 4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
GriffinR 5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
GriffinR aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR a583dfcc42 Merge pull request #1094 from DizzyEggg/rename
Give proper names to some functions
2020-07-14 19:56:46 -04:00
GriffinR c177872c9c Merge pull request #1080 from AsparagusEduardo/EndBalls
Created constant for easier Ball Expansion.
2020-07-14 19:56:20 -04:00
DizzyEggg 0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
Eduardo Quezada b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
Eduardo Quezada 7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
GriffinR 9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
AsparagusEduardo f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
GriffinR 27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
Marcus Huderle 01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
huderlem a4b4ecd470 Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
2019-11-04 16:31:27 -06:00