Commit Graph

3552 Commits

Author SHA1 Message Date
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
DizzyEggg
c46499b05c field screen review changes 2018-12-09 12:16:01 +01:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
KDSKardabox
8712757d24 Merge remote-tracking branch 'upstream/master' 2018-12-09 13:44:41 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
2018-12-08 21:44:12 -06:00
nullableVoidPtr
cceb8ac331 Remove trailing whitespace 2018-12-09 11:32:58 +08:00
DizzyEggg
606fb71392 Fix ld script 2018-12-08 22:17:49 +01:00
DizzyEggg
4d2f1bad7f fix header 2018-12-08 22:12:44 +01:00
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master
De-compile fire
2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
KDSKardabox
2dfbe75b05 Shift externs to header file 2018-12-08 23:52:52 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Meowsy
6babb97182 Fix typo "ggText_DexSortSmallestDescription". (#433)
Should be "gText_DexSortSmallestDescription".
2018-12-08 11:57:19 -06:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
nullableVoidPtr
907ed3f5f5 Format pokemon.c 2018-12-08 11:39:35 +08:00
nullableVoidPtr
4d307a6f63 Clean some more arrays 2018-12-08 11:33:41 +08:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
Diegoisawesome
fe06bbe3f6
Merge pull request #431 from melthelesbian/apostrophe
Use normal apostrophes like adults
2018-12-07 14:18:31 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
nullableVoidPtr
4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08:00
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05:00
Diegoisawesome
6df2042b3b
Merge pull request #427 from Slawter666/pokedex
Document some more of pokedex.c
2018-12-06 13:39:32 -06:00
Diegoisawesome
800c6a901b
Merge pull request #428 from melthelesbian/pokedex_documentation
document pokédex options
2018-12-06 13:38:58 -06:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
405f1bb529 Fix sym_ indentation 2018-12-06 09:46:05 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
garak
7ee2f9f2e6
Merge pull request #4 from DizzyEggg/help_garak
Finish porting battle frontier data
2018-12-05 16:24:37 -05:00
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
DizzyEggg
fc806b966e Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald into help_garak 2018-12-05 21:24:01 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
Slawter666
9cfed81789 Document some more of pokedex.c 2018-12-05 00:15:22 +00:00
Diegoisawesome
1b33ad6c26
Merge pull request #426 from DizzyEggg/patch-1
Match and clean rotating_gate.c
2018-12-04 12:26:12 -06:00
garak
d9287f3261 extern gTower trainer data 2018-12-04 12:15:13 -05:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
garak
d6a88e0eaa remove frontier asm constants to fix build 2018-12-03 16:39:51 -05:00
DizzyEggg
bac1f1b6c9
Match and clean rotating_gate.c
One more down, many more to go.
2018-12-03 21:44:47 +01:00
Diegoisawesome
d9a5de5317
Merge pull request #425 from DizzyEggg/patch-1
Match battle_tower.c function
2018-12-03 14:18:03 -06:00