120 Commits

Author SHA1 Message Date
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00: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
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
37d742cbd8 Document recorded battle 2018-11-01 15:06:50 +01:00
DizzyEggg
dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +02:00
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02:00
golem galvanize
dded980cde fix building 2018-10-17 23:36:18 -04:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
DizzyEggg
ea5ffa3375 Merge with master 2018-07-16 20:23:05 +02:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
ee3d505b58 little touches for HandleTurnActionSelectionState 2018-07-07 21:14:41 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
2d0be91217 Move all trainer defines to trainers.h and identify frontier brain trainer id 2018-06-30 18:55:34 +02:00
DizzyEggg
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg
0fe3e612eb battle tent start and create frontier struct in saveblock 2018-06-17 12:30:09 +02:00
Diegoisawesome
23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
Diegoisawesome
4e2886db81 Use song constants 2018-05-11 00:33:32 -05:00
DizzyEggg
1f052cc08d unnecessary externs 2018-03-02 10:21:12 +01:00
DizzyEggg
b846015343 more battle files cleaning 2018-03-01 00:59:52 +01:00
DizzyEggg
a28dfd6da4 Merge branch 'master' into clear_battle_files 2018-02-28 23:58:29 +01:00