4d5bfc149e
Merge branch 'master' into decomp_record_mixing
2018-05-20 12:16:45 +02:00
1a8d5132d6
fix record mixing for real
2018-05-20 10:51:09 +02:00
de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks
...
Decompile field tasks
2018-05-19 23:34:30 -05:00
1307fde8ca
make field tasks compile
2018-05-19 18:13:48 +02:00
d1798d0ed9
decompile field tasks
2018-05-19 18:02:43 +02:00
11d8f489c4
failed attempt
2018-05-19 14:30:41 +02:00
e44f35c7b7
fix record mixing merge conflicts
2018-05-19 12:32:44 +02:00
9385036ff7
make menu indicators compile
2018-05-19 11:53:22 +02:00
4857757431
merge list menu and list indicators
2018-05-19 11:36:31 +02:00
1ead30ad40
decompile menu indicators
2018-05-19 10:54:02 +02:00
303c9f0917
start menu indicators decomp
2018-05-16 22:16:22 +02:00
0cf3836a03
decompile menu helpers
2018-05-15 20:22:19 +02:00
7735fb2ad3
start menu helpers decomp
2018-05-14 23:03:40 +02:00
23b050a99e
Update naked attribute and ASM_DIRECT to NAKED macro
2018-05-11 17:24:32 -05:00
5539e282a3
through sub_80DB798
2018-05-11 10:51:38 -04:00
8d0da7d8e0
Propagate ASM_DIRECT --> NAKED renaming
2018-05-11 09:41:32 -04:00
4488bbe9e6
Merge branch 'master' into contest
2018-05-11 09:25:26 -04:00
c15b50ac68
through prints_contest_move_description
2018-05-11 08:44:21 -04:00
4e2886db81
Use song constants
2018-05-11 00:33:32 -05:00
2b6d2dfadd
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-05-10 18:38:24 -05:00
416d67c832
Finish porting/decompiling field_effect.c
2018-05-10 18:36:57 -05:00
9bee601b16
through sub_80DB174
2018-05-10 19:28:52 -04:00
508a8e5182
through sub_80DAFA0
2018-05-10 18:16:58 -04:00
7fdebe0d15
through sub_80DAE0C
2018-05-10 17:54:30 -04:00
dfc83cf28f
Merge branch 'master' into contest
2018-05-10 09:47:12 -04:00
80062972ae
Begin porting field_effect
2018-05-10 03:02:33 -05:00
13efa1ef62
fixing conflicts
2018-05-10 03:34:36 -04:00
d31600e70e
finish decompiling pokedex
2018-05-10 03:30:42 -04:00
4470f77b3d
Merge branch 'master' into mauville_old_man
2018-05-09 15:30:21 -04:00
279276c539
Fix capitalization on filename
2018-05-09 05:14:24 -05:00
b570f87152
Merge master from pret
2018-05-09 05:10:23 -05:00
d66c1c642c
Port/decompile fieldmap.c
2018-05-09 05:07:56 -05:00
5efe8f3a0d
through sub_80DAB8C
2018-05-08 19:00:23 -04:00
f6fbecbc41
through sub_80DA874
2018-05-07 20:49:23 -04:00
e8bb464de9
through sub_80DA4F4
2018-05-07 19:46:48 -04:00
fd1d75ce37
Merge branch 'master' into mauville_old_man
2018-05-07 18:18:00 -04:00
61cc1d5574
Rename symbols using Ruby as a reference
2018-05-07 18:11:20 -04:00
0231ed13ee
Remaining functions in mauville_old_man
2018-05-07 16:35:29 -04:00
279a6e1ddc
Convert item_icon_table.inc to C
2018-05-06 13:37:28 +01:00
aab1238ec0
Revert "Convert item_graphics.inc to C"
...
This reverts commit 546217d281
2018-05-06 09:12:23 +01:00
546217d281
Convert item_graphics.inc to C
...
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
2018-05-05 23:27:26 +01:00
22ec43a6ed
resolve merge conflicts
2018-05-05 18:50:26 +01:00
e6cca15232
sub_80D8B38
2018-05-04 18:59:59 -04:00
58200616d5
Merge branch 'master' into trader
2018-05-04 17:45:50 -04:00
f05acd88d5
sub_80D8A88
2018-05-03 22:29:53 -04:00
210cedd077
through sub_80D883C
2018-05-03 21:01:22 -04:00
8aa462cd74
through sub_8121178
2018-05-03 18:05:07 -04:00
876e1eb7cc
through sub_8121064
2018-05-03 17:51:14 -04:00
1943118a1e
through sub_8120D34
2018-05-03 17:26:02 -04:00
c6115a2fec
through sub_8120C0C
2018-05-03 17:03:52 -04:00
DizzyEggg