Commit Graph

1022 Commits

Author SHA1 Message Date
DizzyEggg
f2d3babd30 rename to mossdeep gym 2018-11-18 20:04:53 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
DizzyEggg
69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
4fb463377c Start battle pike 2018-11-12 00:46:02 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce Merge remote-tracking branch 'origin/master' into render_text 2018-11-06 11:33:21 -06:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
90ef269426 Merge branch 'master' into battle_frontier_2 2018-10-30 21:48:18 +01:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim
Split battle_anim_80FE840 and move data to C
2018-10-30 11:53:05 -05:00
garak
678156ff0e remove linker script extra 2018-10-30 12:43:13 -04:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags
Synchronize sprite tags
2018-10-30 11:26:44 -05:00
DizzyEggg
3a9eeef844 Frontier, finish ranking hall 2018-10-28 21:11:53 +01:00
DizzyEggg
826d0ea2ab Begin frontier records 2018-10-27 15:44:29 +02:00
garak
7747a891a2 finish 80FE840 data (actually) 2018-10-25 18:59:05 -04:00
garak
de90ce9123 finish 80FE840 data (almost) 2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23 finish decompiling battle tower 2018-10-25 21:27:10 +02:00
garak
17c26fae1a fire, electric, ice data 2018-10-24 20:01:40 -04:00
garak
22a0b58e57 effects_2 and water data 2018-10-24 15:52:21 -04:00
garak
68814c42de begin 80FE840 data 2018-10-23 08:25:51 -04:00
garak
5ddf6655bc split battle_anim_80FE840.s 2018-10-22 22:08:38 -04:00
garak
2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
Diegoisawesome
32d2640dc7 Match GameClear (thanks Egg) 2018-10-21 16:24:43 -05:00
Diegoisawesome
97bbb326b8 GameClear nonsense 2018-10-20 19:53:41 -05:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
Diegoisawesome
e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop
[WIP] Shop
2018-10-14 19:03:48 -05:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
Decompile apprentice
2018-10-14 13:20:38 -05:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers
Decompile field effect helpers
2018-10-14 12:48:18 -05:00
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca Merge record mixing, pokemon and global with apprentice 2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop 2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c Merge branch 'master' of github.com:pret/pokeemerald 2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814 Port/decompile cable_club.s 2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
#	asm/shop.s
2018-10-13 10:22:58 -05:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
Kermalis
de8013c6d1 Match se_kouka_m.mid 2018-10-10 16:47:27 -04:00
Kermalis
dd0e53a144 Match se_kouka_l.mid 2018-10-10 16:46:11 -04:00
Kermalis
7f2ddee417 Match se_kouka_h.mid 2018-10-10 16:45:01 -04:00
Kermalis
e92eabe961 Match se_kon4.mid 2018-10-10 16:42:47 -04:00
Kermalis
695d42bf46 Match se_kon3.mid 2018-10-10 16:41:40 -04:00
Kermalis
e6685e5703 Match se_kon2.mid 2018-10-10 16:40:18 -04:00