Commit Graph

179 Commits

Author SHA1 Message Date
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
DizzyEggg 9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
Marcus Huderle c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle 2c6849bee8 Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
DizzyEggg 6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg 37d49b34e0 Move vars to battle_main.c 2018-11-19 17:36:39 +01:00
Marcus Huderle 72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg 81410fee17 Factory done 2018-11-11 16:44:27 +01:00
DizzyEggg 0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
DizzyEggg ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
DizzyEggg b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
Marcus Huderle b9e38a569e Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
2018-10-06 08:20:41 -05:00
DizzyEggg e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg 8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
DizzyEggg 10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg 9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg 68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
vblm12 07ea34e4c2 Make TrainerMonPtr fields const 2018-07-20 22:08:38 -05:00
DizzyEggg 118fa3afce IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL 2018-07-16 22:00:27 +02:00
DizzyEggg bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg 008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00