ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,215 Commits 1 Branch 0 Tags 235 MiB
b15cb16bfd
Commit Graph

1035 Commits

Author SHA1 Message Date
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
Kermalis
a9bdd34f9e Match se_kon.mid 2018-10-10 16:39:11 -04:00
Kermalis
f471165e6c Match se_ki_gasyan.mid 2018-10-10 16:37:38 -04:00
Kermalis
dac1ddba49 Match se_kaifuku.mid 2018-10-10 16:35:12 -04:00
Kermalis
76e3091d6d Match se_kaidan.mid 2018-10-10 16:29:16 -04:00
Kermalis
1aae1c19ea Match se_jyuni.mid 2018-10-10 16:27:34 -04:00
Kermalis
395e754760 Match se_jitensya.mid 2018-10-10 16:22:40 -04:00
Kermalis
2f10c5c24c Match se_jite_pyoko.mid 2018-10-10 16:20:54 -04:00
Kermalis
471aa8eeac Match se_jihanki.mid 2018-10-10 16:18:51 -04:00
Kermalis
2f21d2e9ab Match se_jido_doa.mid 2018-10-10 16:17:07 -04:00
Kermalis
27f2b3b00a Match se_i.mid 2018-10-10 16:15:30 -04:00
Kermalis
ab5c24daa6 Match se_hinsi.mid 2018-10-10 16:11:23 -04:00
Kermalis
937e9d05e8 Match se_hi_turun.mid 2018-10-10 16:09:46 -04:00
Kermalis
da9b55ea61 Match se_hazure.mid 2018-10-10 16:07:23 -04:00
Kermalis
88a4693cde Match se_hashi.mid 2018-10-10 16:05:36 -04:00
Kermalis
9817919c23 Match se_hantei2.mid 2018-10-10 16:03:27 -04:00
Kermalis
13c617cee0 Match se_hantei1.mid 2018-10-10 16:02:20 -04:00
Kermalis
ad717c719f Match se_fuusen3.mid 2018-10-10 15:57:41 -04:00
Kermalis
77c2afcaa9 Match se_fuusen2.mid 2018-10-10 15:56:10 -04:00
Kermalis
973fdffb2c Match se_fuusen1.mid 2018-10-10 15:53:49 -04:00
Kermalis
72366a320b Match se_fu_zuzuzu.mid 2018-10-10 15:50:00 -04:00
Kermalis
f31e4914aa Match se_fu_zaku2.mid 2018-10-10 15:47:30 -04:00
Kermalis
12ec9ec536 Match se_fu_zaku.mid 2018-10-10 15:45:34 -04:00
Kermalis
e66fb45f24 Match se_expmax.mid 2018-10-10 15:42:53 -04:00
Kermalis
fd74c65631 Match se_exp.mid 2018-10-10 15:37:03 -04:00
Kermalis
599d80b937 Match se_esuka.mid 2018-10-10 15:32:04 -04:00
Kermalis
1d241702f2 Match se_elebeta.mid 2018-10-10 15:30:17 -04:00
Kermalis
c44d355f6f Match se_e.mid 2018-10-10 15:28:17 -04:00
Kermalis
264bd34bdd Match se_door.mid 2018-10-10 15:26:20 -04:00
Kermalis
615ad808bf Match se_doku.mid 2018-10-10 15:24:27 -04:00
Kermalis
b985d45ddb Match se_dendou.mid 2018-10-10 15:21:53 -04:00
Kermalis
3b929049da Match se_daugi.mid 2018-10-10 15:17:05 -04:00
Kermalis
c0064134d1 Match se_dansa.mid 2018-10-10 15:14:49 -04:00
Kermalis
41a30f56bd Match se_curtain1.mid 2018-10-10 15:07:53 -04:00
Kermalis
94e491357e Match se_curtain.mid 2018-10-10 15:04:57 -04:00
Kermalis
6c890f7d9a Match se_card.mid 2018-10-10 15:01:35 -04:00
Kermalis
f53a0ad0b6 Match se_c_syu.mid 2018-10-10 14:59:17 -04:00
Kermalis
c98f5c25d6 Match se_c_pikon.mid 2018-10-10 14:56:12 -04:00
Kermalis
b9989eaa56 Match se_c_pasi.mid 2018-10-10 14:53:47 -04:00
Kermalis
acb7b7eb5c Match se_c_maku_u.mid 2018-10-10 14:50:48 -04:00
Kermalis
f967501b73 Match se_c_maku_d.mid 2018-10-10 14:49:10 -04:00
Kermalis
df9e2678fa Match se_c_gaji.mid 2018-10-10 14:47:02 -04:00
Kermalis
4a8dff5ebb Match se_bt_start.mid 2018-10-10 14:44:13 -04:00
Kermalis
33872e8899 Match se_bowa2.mid 2018-10-10 14:40:41 -04:00
Kermalis
ecf9d206e2 Match se_bowa.mid 2018-10-10 14:38:28 -04:00
Kermalis
50393acc65 Match se_boo.mid 2018-10-10 14:36:44 -04:00
Kermalis
44d003140b Match se_bidoro.mid 2018-10-10 14:34:21 -04:00
Kermalis
66c1e8008c Match se_basabasa.mid 2018-10-10 14:31:18 -04:00
Kermalis
005ac398fb Match se_ban.mid 2018-10-10 14:27:30 -04:00
Kermalis
938c4a2bc6 Match se_a.mid 2018-10-10 14:24:39 -04:00
golem galvanize
803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Kermalis
2f99b81dd4 Match ph_cure_blend.mid to ph_trap_solo.mid 2018-10-03 17:47:57 -04:00
Kermalis
a94c66139e Match ph_cloth_solo.mid 2018-10-03 17:26:34 -04:00
Kermalis
dbe15410de Match ph_cloth_held.mid 2018-10-03 17:26:06 -04:00
Kermalis
458b25ec09 Match ph_cloth_blend.mid 2018-10-03 17:24:20 -04:00
Kermalis
6fd2d4ad3b Match ph_choice_solo.mid 2018-10-03 17:22:56 -04:00
Kermalis
86f80debe2 Match ph_choice_held.mid 2018-10-03 17:21:42 -04:00
Kermalis
b32e85ac90 Match ph_choice_blend.mid 2018-10-03 17:20:10 -04:00
Kermalis
7fbc853611 Match mus_kachi2.mid & mus_rg_win_yasei.mid 2018-10-03 01:27:26 -04:00
Kermalis
7a06678768 Match mus_rg_win_tre.mid 2018-10-03 01:19:03 -04:00
Kermalis
34ee74a490 Match mus_kachi3.mid & mus_rg_win_gym.mid 2018-10-03 00:54:32 -04:00
Kermalis
937b785774 Match mus_rg_vs_yasei.mid 2018-10-03 00:13:14 -04:00
Kermalis
4045ded2fe Match mus_rg_vs_tore.mid 2018-10-03 00:11:50 -04:00
Kermalis
2ed3b58742 Match mus_rg_vs_myu2.mid 2018-10-03 00:10:16 -04:00
Kermalis
2aeeb5f7b1 Match mus_rg_vs_last.mid 2018-10-03 00:08:37 -04:00
Kermalis
babe3d0e92 Match mus_rg_vs_gym.mid 2018-10-03 00:06:42 -04:00
Kermalis
ea765f5d88 Match mus_rg_vs_deo.mid 2018-10-03 00:04:47 -04:00
Kermalis
912f92d4ed Match mus_rg_vs_den.mid 2018-10-03 00:03:18 -04:00
Kermalis
70ade99afb Match mus_rg_union.mid 2018-10-03 00:01:14 -04:00
Kermalis
8f78809f29 Match mus_rg_tvnoize.mid 2018-10-02 23:59:34 -04:00
Kermalis
6c460c9461 Match mus_rg_titlerog.mid 2018-10-02 23:56:45 -04:00
Kermalis
214eefb05a Match mus_rg_title.mid 2018-10-02 23:53:50 -04:00
Kermalis
2066705756 Match mus_rg_tamamusi.mid 2018-10-02 23:51:42 -04:00
Kermalis
a69b672ab0 Match mus_gim.mid & mus_rg_t_tower.mid 2018-10-02 22:37:41 -04:00
Kermalis
b1aa0c5b78 Match mus_rg_t_mori.mid 2018-10-02 21:42:10 -04:00
Kermalis
f043106adc Match mus_rg_sousa.mid 2018-10-02 21:39:08 -04:00
Kermalis
f759bb4da0 Match mus_rg_slowmasara.mid 2018-10-02 21:35:32 -04:00
Kermalis
f1eb64919b Match mus_rg_slot.mid 2018-10-02 21:31:11 -04:00
Kermalis
2a3cd99fed Match mus_rg_shounen.mid 2018-10-02 21:29:13 -04:00
Kermalis
2811370ac0 Match mus_rg_shoujo.mid 2018-10-02 21:27:13 -04:00
Kermalis
0a40fc3073 Match mus_rg_shiruhu.mid 2018-10-02 21:24:37 -04:00
Kermalis
456a792d8e Match mus_rg_shion.mid 2018-10-02 21:20:32 -04:00
Kermalis
e6a678abf7 Match mus_rg_sekaikan.mid 2018-10-02 21:18:48 -04:00