Commit Graph

55 Commits

Author SHA1 Message Date
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
Diegoisawesome
9ed9f7de94 Finish renaming strings in strings.s 2017-09-20 16:46:59 -05:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
c253bf5e75 add important headers, const ptrs and egg hatch start 2017-09-18 18:36:05 +02:00
scnorton
71b40f50c0 Merge branch 'master' into field_map_obj 2017-09-17 13:38:33 -04:00
PikalaxALT
559833ccf6 Merge branch 'master' into field_map_obj 2017-09-16 15:41:54 -04:00
Diegoisawesome
5a74c0e913 Merge remote-tracking branch 'pret/master' 2017-09-16 14:24:47 -05:00
Cameron Hall
19d2d73c70 Merge pull request #28 from DizzyEggg/decomp_pokemon
decompile pokemon1/2/3
2017-09-16 14:14:50 -05:00
Diegoisawesome
6ba1dc8169 Merge remote-tracking branch 'pret/master' 2017-09-16 03:21:42 -05:00
scnorton
9f6a4be9f0 BerryTree 2017-09-15 14:26:01 -04:00
PikalaxALT
64ffa8f963 Merge branch 'master' into field_map_obj 2017-09-13 19:29:19 -04:00
DizzyEggg
5f4c5e280c berry.s decompiled 2017-09-13 11:16:26 +02:00
DizzyEggg
c9603c40d8 Merge branch 'master' into decomp_pokemon 2017-09-12 23:02:08 +02:00
DizzyEggg
0fe7030230 pokemon 3 is almost decompiled 2017-09-12 15:05:40 +02:00
Diegoisawesome
a9f09ca051 Begin renaming string.s unknowns 2017-09-12 01:23:34 -05:00
DizzyEggg
738e776630 more pokemon2 decomp 2017-09-11 22:28:36 +02:00
DizzyEggg
a2a66181fb decompile script.s 2017-09-10 23:05:23 +02:00
DizzyEggg
10a525d5a0 decomp safari zone 2017-09-09 15:45:50 +02:00
DizzyEggg
a55c5925a6 label gMapHeader 2017-09-08 18:31:57 +02:00
scnorton
e0216d6045 unref_sub_808D958 2017-09-06 18:26:37 -04:00
scnorton
6448563ede unref_sub_808D77C 2017-09-06 16:14:55 -04:00
DizzyEggg
cdd36116f2 label pokemon3.s 2017-09-06 21:48:30 +02:00
DizzyEggg
33ee3115ab add glink defines from pokeruby 2017-09-06 21:18:50 +02:00
DizzyEggg
0cc4cadd2f label pokemon2 and some box stuff 2017-09-06 18:34:18 +02:00
scnorton
1087d1c822 GetFieldObjectIdByLocalIdAndMapInternal; rename gUnknown_02037350 to gMapObjects 2017-09-06 10:48:51 -04:00
DizzyEggg
b6661e7736 name some pokemon and battle labels 2017-09-05 20:13:34 +02:00
DizzyEggg
1680fc0b81 start start menu decomp 2017-09-05 13:01:24 +02:00
DizzyEggg
4bf54bfdd4 split roamer and decor inventories 2017-09-04 13:01:57 +02:00
DizzyEggg
75a94ce58e split and label 2017-09-04 12:22:04 +02:00
DizzyEggg
5afd2d5bfb begin new save.c, label lots of things 2017-09-03 22:50:17 +02:00
DizzyEggg
a3f602f17c begin save.s decomp, thanks revo! 2017-09-03 14:13:01 +02:00
DizzyEggg
907e281de6 decompile label more of item.s 2017-09-03 13:33:13 +02:00
DizzyEggg
048700fe57 decompile rtc 2017-09-02 23:28:44 +02:00
DizzyEggg
b5fea95a46 finish event data 2017-09-02 22:31:37 +02:00
DizzyEggg
a4cc67008e begin event data 2017-09-02 21:43:53 +02:00
DizzyEggg
591837e3c3 decompile sound.s 2017-09-02 17:03:46 +02:00
DizzyEggg
84240b1a5a sprite.c: move ewram, iwram, rom data 2017-09-02 13:11:19 +02:00
DizzyEggg
24a1e3e544 decompile more of sprite.s 2017-09-02 12:12:09 +02:00
DizzyEggg
c146c247f2 decompile more of sprite.s 2017-09-02 01:42:44 +02:00
DizzyEggg
26bf61e06f start decompiling sprite.s 2017-09-02 00:21:11 +02:00
DizzyEggg
449d546556 split some battle files 2017-09-01 23:40:13 +02:00
DizzyEggg
cb12aaec65 git commit -m "label sprite for real this time"
git commit -m
2017-09-01 22:29:13 +02:00
DizzyEggg
ee7580753b rename sprite labels 2017-09-01 19:43:26 +02:00
DizzyEggg
6f03356237 begin working on pokeemerald 2017-08-31 16:48:24 +02:00
Diegoisawesome
d12fd5c5ce Merge remote-tracking branch 'refs/remotes/pret/master' 2017-03-04 23:32:12 -06:00
Diegoisawesome
56f5e8bdab Disassemble palette.s
All but two functions match.
2017-03-04 22:43:34 -06:00
ProjectRevoTPP
9a80b550f0 finish decompiling main.c (#17)
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting

* decompile up to nonmatching VBlankIntr

* finish decompiling main.c

* formatting
2017-02-15 13:25:21 -08:00
ProjectRevoTPP
689df5cff8 finish decompiling battle_ai.c (#16)
* partially decompile battle_ai.c up to tai60_unk

* nonmatching tai60_unk

* decompile more of battle_ai.c

* formatting

* finish porting battle_ai.c

* formatting
2017-02-03 18:34:56 -08:00
YamaArashi
e2b834d21d begin decompiling main.s 2017-02-03 16:44:06 -08:00
camthesaxman
bcff8d1b45 start decompiling battle_ai 2017-02-01 22:15:38 -06:00