Commit Graph

106 Commits

Author SHA1 Message Date
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01: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
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master
Document list_menu.c and main_menu.c
2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05:00
Marcus Huderle
aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle
38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
DizzyEggg
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
Diegoisawesome
de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks
Decompile field tasks
2018-05-19 23:34:30 -05:00
DizzyEggg
1307fde8ca make field tasks compile 2018-05-19 18:13:48 +02:00
DizzyEggg
9385036ff7 make menu indicators compile 2018-05-19 11:53:22 +02:00
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Diegoisawesome
d66c1c642c Port/decompile fieldmap.c 2018-05-09 05:07:56 -05:00
DizzyEggg
18a92fdcc0 list menu is decompiled 2018-03-03 14:58:41 +01:00
DizzyEggg
ae29f35afd start decompiling list menu 2018-03-02 16:34:31 +01:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01:00
Diegoisawesome
d396a8f89c Merge new_menu_helpers and menu 2018-02-07 00:07:42 -06:00
DizzyEggg
76fc1d1c12 make time events compile 2018-01-29 16:25:09 +01:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
Diegoisawesome
09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
PikalaxALT
1406084fdd More camelCase, 2 2017-11-01 23:59:48 -04:00
PikalaxALT
9884147cd9 More camelCase 2017-11-01 23:54:11 -04:00
PikalaxALT
9945d57f07 Address review items 2017-11-01 23:50:13 -04:00