ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,054 Commits 1 Branch 0 Tags 235 MiB
1435c96b41
Commit Graph

991 Commits

Author SHA1 Message Date
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
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