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,143 Commits 1 Branch 0 Tags 235 MiB
18839a4872
Commit Graph

3143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deokishisu
e129f4864f Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:16:07 -04:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap 
Move HEAP_SIZE to malloc and use void instead of empty argument list
 2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02: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
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos 
Use defines for text chars
 2018-10-14 12:21:37 -05:00
Diegoisawesome
355f014909
Merge pull request #354 from DizzyEggg/move_blendpal 
Move blend_palette to util
 2018-10-14 12:11:50 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
cd4f65ecef Make apprentice compile 2018-10-14 17:06:47 +02:00
DizzyEggg
f47ed3268c Finish documenting apprentice for now 2018-10-14 17:00:41 +02:00
DizzyEggg
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data 
Move apprentice data to C
 2018-10-14 16:28:27 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01:00
DizzyEggg
af7aa624cd make aprentice compile 2018-10-14 15:23:14 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
145df49063 Document more of apprentice 2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832 Decompile apprentice 2018-10-14 11:37:44 +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
0c1d33da4f
Merge pull request #353 from Diegoisawesome/master 
Port/decompile cable_club.s
 2018-10-13 12:53:09 -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
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
Diegoisawesome
a2a6700966
Merge pull request #350 from Kermalis/master 
Sound Effects Part 2/6
 2018-10-10 16:04:01 -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