Commit Graph

198 Commits

Author SHA1 Message Date
GriffinR f42eafc85b Merge branch 'master' into doc-banim 2021-11-13 23:26:46 -05:00
GriffinR 8e424b6985 Merge branch 'master' into doc-binterface 2021-11-09 16:09:48 -05:00
GriffinR 684f599a44 Label remaining battle_interface symbols 2021-11-08 16:03:44 -05:00
GriffinR e3b6337c3a Finish battle_anim_mons doc 2021-11-08 14:29:37 -05:00
GriffinR 50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR e1900efe1e Merge branch 'master' into doc-miscbattle 2021-10-15 22:46:43 -04:00
GriffinR a4a3c1c9e5 Merge pull request #1511 from GriffinRichards/doc-union
Document link_rfu / Union Room
2021-10-15 22:44:01 -04:00
GriffinR fc15b0d5f0 Add controller buffer constants, finish misc battle doc 2021-10-13 16:21:39 -04:00
GriffinR b0598b1aef Clean up recorded_battle, add MOVE_IS_PERMANENT 2021-10-12 01:14:17 -04:00
GriffinR d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
GriffinR 31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR a2655ba9ab Merge branch 'master' into doc-union 2021-10-07 16:10:35 -04:00
GriffinR 6e62c057f5 Document remaining symbols in pokemon.c 2021-10-02 23:48:12 -04:00
Pokestia 38a4dea402 Rename Battle Weather flags 2021-09-30 12:08:20 +02:00
GriffinR a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
LOuroboros 554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR dfdcfc1568 Document remaining functions in cable_club 2021-08-15 16:22:15 -04:00
PikalaxALT 810ca5f8ff Flatten pos fields in struct Sprite 2021-07-07 09:11:52 -04:00
GriffinR 6d92b466e7 Add missing use of F_TRAINER_FEMALE 2021-06-25 11:50:09 -04:00
gAlfonso-bit 9a195c0fef Cherry-pick roamer bug fix from pokefirered
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
2021-05-13 11:23:42 -05:00
GriffinR aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR 62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
Marcus Huderle e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
GriffinR 9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
GriffinR 8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
PikalaxALT 925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT 8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT e6b1b97aa1 Nonmatching resoltuion
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
2021-03-12 13:55:07 -05:00
GriffinR 55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
GriffinR b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR 8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
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