Commit Graph

3547 Commits

Author SHA1 Message Date
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak
f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py 2018-11-27 11:40:29 -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
Diegoisawesome
c909aa92de
Merge pull request #403 from nullableVoidPtr/master
Clean up aligned variables in src/
2018-11-27 10:11:29 -06:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Diegoisawesome
977e0bc345
Merge pull request #402 from Slawter666/pokedex-data
Convert pokédex data to C
2018-11-27 03:18:28 -06:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt
Match some functions
2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util
Match sub_080F8970
2018-11-26 16:57:36 -06:00
Marcus Huderle
65622d34cd
Merge pull request #401 from PlatinumMaster/patch-1
Fix labels, shifted off by one.
2018-11-26 16:57:22 -06:00
Jefferson Steelflex
af08f3bb13
Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex
8e5e4c2304
Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
DizzyEggg
132a486169 Match 0x0F8970 2018-11-26 21:54:51 +01:00
DizzyEggg
c9b3f3e3cb Fix indentation 2018-11-26 20:19:52 +01: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
c2d3606f39
Merge pull request #398 from huderlem/rock
Decompile rock
2018-11-25 17:05:15 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc
Document some battle ui
2018-11-25 15:58:37 -06:00
Marcus Huderle
65c4d49859
Merge pull request #397 from huderlem/script_pokemon_util
Script pokemon util
2018-11-25 15:58:23 -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
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
Diegoisawesome
dc7764f60c
Merge pull request #394 from DizzyEggg/text
DecompressGlyphTile - cleaner code
2018-11-21 18:25:28 -06:00
DizzyEggg
a900a51a59 match DecompressGlyphTile nicer 2018-11-21 23:30:50 +01:00
DizzyEggg
d70c3a94c5 match DecompressGlyphTile nicer 2018-11-21 23:30:04 +01:00
Diegoisawesome
0b59dbf2b8
Merge pull request #393 from DizzyEggg/text
Match one function in text.c
2018-11-21 16:11:03 -06:00
DizzyEggg
c7ca38ccf3 Match DecompressGlyphTile 2018-11-21 21:58:35 +01:00
Diegoisawesome
3c77ce5b5b
Merge pull request #392 from Kermalis/master
Sound Effects Part 3/6
2018-11-20 17:18:58 -06: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