Commit Graph

202 Commits

Author SHA1 Message Date
GriffinR 3b15fd34cc Merge branch 'master' of https://github.com/pret/pokeemerald into constants-num-frames 2023-02-01 16:09:01 -05:00
Eduardo Quezada D'Ottone 18e7fc5efc Introduce NUM_BATTLE_SIDES 2022-10-20 08:41:18 -03:00
GriffinR 60e1ad20e4 Add NUM_MON_PIC_FRAMES, and trainer pic size constants 2022-10-10 23:16:08 -04:00
Eduardo Quezada 65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada 41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
Eduardo Quezada 3bc2cf921c Sync src/battle_controllers.c with pokefirered 2022-08-18 14:30:22 -04:00
Eduardo Quezada 59f89bde9e Misc cleanup 2022-08-18 14:23:45 -04:00
Eduardo Quezada 13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada 7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada D'Ottone 7d75e16312 Small documentation and cleanup 2022-01-20 12:25:48 -03:00
GriffinR def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -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 31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
GriffinR 739e7d3c31 Document summary screen sprite manager 2021-10-02 23:47:59 -04:00
GriffinR 9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -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
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
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
MCboy e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
MCboy 3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun 90211248af re-match Cmd_unknown_24 (from #1140)
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
2020-10-23 20:47:10 -04:00
GriffinR 65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04: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
GriffinR afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
hondew e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew 328aecc96e Document throwing pokeball
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
2020-08-30 14:08:06 -04:00
PokeCodec e27975afaa Match battle script commands by correcting a function and the pokemon struct 2020-08-18 22:05:01 -04:00
GriffinR aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR 1016b23918 Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR 85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
GriffinR 869d0eebc0 Rename atk## constants and states 2019-08-23 08:46:21 -04:00
Marcus Huderle 033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
Marcus Huderle 462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
PikalaxALT 2f57d6bc0f sub_8018220 2019-03-30 09:18:58 -04:00
Phlosioneer 4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
DizzyEggg a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
Marcus Huderle e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
melthelesbian 2dd706ca54 use max mon moves constant where able (#480)
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
2018-12-25 11:50:15 -06:00