Commit Graph

905 Commits

Author SHA1 Message Date
Cameron Hall
21a04940d4 Merge pull request #41 from PikalaxALT/split_data_emerald
Split data emerald
2017-09-22 20:10:40 -05:00
ProjectRevoTPP
55348b0771 correct gitattributes assignment of languages. 2017-09-22 21:07:12 -04:00
DizzyEggg
21f668d6a5 add things git ate 2017-09-23 00:13:11 +02:00
DizzyEggg
fc57c6c817 atk 48 is really troublesome 2017-09-23 00:06:52 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
PikalaxALT
aa64f61b84 Finish decomp of unk_text_util_2 2017-09-22 00:01:07 -04:00
PikalaxALT
15212c4f8d Font6Func 2017-09-21 23:43:13 -04:00
PikalaxALT
4e1c9920b2 Split data/data_emerald2.s 2017-09-21 13:51:32 -04:00
PikalaxALT
ab6a7d2d8c Split data/data_emerald.s 2017-09-21 13:28:02 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
yenatch
ed9e0e2054 Merge pull request #37 from PikalaxALT/berry_fix_program
Berry fix program
2017-09-20 23:37:59 -04:00
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
yenatch
40c1e81d03 Merge pull request #40 from PikalaxALT/lilycove_lady
Lilycove lady
2017-09-20 23:14:22 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
PikalaxALT
6f481cceb1 Decompile lilycove lady data 2017-09-20 22:52:42 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards
Battle dome cards
2017-09-20 22:41:18 -04:00
yenatch
b35935e3ef Merge pull request #39 from Diegoisawesome/master
Extract baserom calls from various battle data files and crt0.s
2017-09-20 22:24:38 -04:00
PikalaxALT
63a25a34a7 Disassemble lilycove lady data 2017-09-20 21:42:14 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
PikalaxALT
d263750f19 remaining lilycove lady functions 2017-09-20 20:48:32 -04:00
PikalaxALT
faf844f332 through sub_818E880 2017-09-20 20:32:22 -04:00
PikalaxALT
c56b6fc9a4 sub_818E794 2017-09-20 20:24:22 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
PikalaxALT
25ffdf7342 sub_818E704 2017-09-20 20:16:11 -04:00
PikalaxALT
bf4319f25e sub_818E6B0 2017-09-20 20:08:05 -04:00
yenatch
d485f17784 Merge pull request #31 from PikalaxALT/sub_81700F8
rom_81700F8
2017-09-20 19:26:28 -04:00
Diegoisawesome
9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg
cf26b0e125 forgot save lol 2017-09-20 22:55:37 +02:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
44e75e1f03 through sub_818E570 2017-09-20 16:32:37 -04:00
PikalaxALT
d22a9acc63 through sub_818E490 2017-09-20 16:12:18 -04:00
scnorton
5fb39d5ef9 sub_818E3EC 2017-09-20 12:56:45 -04:00
scnorton
fdea92edff through sub_818E3E0 2017-09-20 11:48:11 -04:00
scnorton
213fef6042 through sub_818E308 2017-09-20 11:44:20 -04:00
scnorton
8a31e58689 sub_818E298 2017-09-20 11:30:09 -04:00
scnorton
0895d8d861 sub_818E258 2017-09-20 11:25:46 -04:00
scnorton
0b81c2920a sub_818E1F4 2017-09-20 10:45:00 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
PikalaxALT
c05f2d4473 sub_818E06C 2017-09-19 23:31:05 -04:00
Diegoisawesome
4ec2fe8f37 Replace data with move constants 2017-09-19 22:00:02 -05:00
PikalaxALT
9b00767b55 sub_818E004; sanity 2017-09-19 22:57:22 -04:00
PikalaxALT
28d0fa33fe SetLilicoveQuizLady 2017-09-19 22:35:40 -04:00
PikalaxALT
73ee165ef6 sub_818DF00 2017-09-19 22:25:31 -04:00
PikalaxALT
83a420400c through sub_818DEF4 2017-09-19 21:58:32 -04:00
PikalaxALT
534dd2c4b0 sub_818DD84 2017-09-19 21:47:15 -04:00
PikalaxALT
316f9f4d83 through sub_818DD14 2017-09-19 21:28:01 -04:00
PikalaxALT
f43de6e582 Merge branch 'master' into lilycove_lady 2017-09-19 21:18:34 -04:00
PikalaxALT
54bd2c1781 Address review by diego 2017-09-19 21:10:30 -04:00