Commit Graph

1223 Commits

Author SHA1 Message Date
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg
6d57a9dfc8 start data converting 2018-12-23 13:52:53 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
2018-12-22 16:12:27 -06:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
golem galvanize
314b718471 finish porting ice 2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
garak
5eac3ce1a2 rename fldeff_misc 2018-12-19 22:19:54 -05:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
2018-12-19 19:57:31 -06:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
Diegoisawesome
2592803460 Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935 Begin trade.c 2018-12-18 19:29:41 -06:00
golem galvanize
f7df299be8 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water 2018-12-18 20:23:32 -05:00
golem galvanize
15a7b1bc08 begin water.s 2018-12-18 20:23:07 -05:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1
Battle tower data
2018-12-10 11:22:16 -06:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
Marcus Huderle
342d23e0ba
Merge pull request #436 from KDSKardabox/master
Decompile ghost
2018-12-09 07:59:32 -06:00
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
c46499b05c field screen review changes 2018-12-09 12:16:01 +01:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
KDSKardabox
8712757d24 Merge remote-tracking branch 'upstream/master' 2018-12-09 13:44:41 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
2018-12-08 21:44:12 -06:00
DizzyEggg
606fb71392 Fix ld script 2018-12-08 22:17:49 +01:00
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master
De-compile fire
2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05: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
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01:00
DizzyEggg
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
DizzyEggg
e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
DizzyEggg
3934eac8d4 Merge branch 'master' into battle_engine_v2 2018-12-01 10:28:11 +01:00
Marcus Huderle
0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Marcus Huderle
9fafa63743 Finish decompiling internation_string_util.c 2018-11-27 17:21:23 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
DizzyEggg
2216d49890 Merge branch 'master' into battle_engine_v2 2018-11-23 21:40:06 +01:00
Kermalis
27d46fa3a8 Match se_t_ooame_e.mid 2018-11-20 18:10:25 -05:00
Kermalis
60a7134710 Match se_t_ooame.mid 2018-11-20 18:09:21 -05:00
Kermalis
fc57e8dd52 Match se_t_koame_e.mid 2018-11-20 18:07:28 -05:00
Kermalis
bfb84d3073 Match se_t_kami2.mid 2018-11-20 18:06:03 -05:00
Kermalis
83f73b7fd7 Match se_t_kami.mid 2018-11-20 18:04:42 -05:00
Kermalis
67d2009d7d Match se_t_ame_e.mid 2018-11-20 18:02:42 -05:00
Kermalis
5395fc8b57 Match se_t_koame.mid 2018-11-20 18:01:10 -05:00
Kermalis
25d4702ac4 Match se_t_ame.mid 2018-11-20 18:00:58 -05:00
Kermalis
a00079e63b Match se_suikomu.mid 2018-11-20 17:55:18 -05:00
Kermalis
88167d3183 Match se_select.mid 2018-11-20 17:52:47 -05:00
Kermalis
5e423fb5ea Match se_seikai.mid 2018-11-20 17:50:34 -05:00
Kermalis
53ca39a8ac Match se_save.mid 2018-11-20 17:49:15 -05:00
Kermalis
3941ce5cf2 Match se_ru_hyuu.mid 2018-11-20 17:47:42 -05:00
Kermalis
98831e29bb Match se_ru_gasyan.mid 2018-11-20 17:45:44 -05:00
Kermalis
80ea58a198 Match se_ru_gashin.mid 2018-11-20 17:44:09 -05:00
Kermalis
410492dea9 Match se_ru_bari.mid 2018-11-20 17:42:11 -05:00
Kermalis
83c843474a Match se_rg_w_door.mid 2018-11-20 17:40:34 -05:00
Kermalis
a5ddb0b4b8 Match se_rg_shop.mid 2018-11-20 17:37:10 -05:00
Kermalis
5e9076990e Match se_rg_nawamiss.mid 2018-11-20 17:35:18 -05:00