ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-12 14:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,040 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

2976 Commits

Author SHA1 Message Date
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
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
nullableVoidPtr
f24584cd31 Tabs -> spaces & align in include/ 2018-12-07 21:01:59 +08:00
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05: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
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
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05: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
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
Diegoisawesome
ffa8655f4c
Merge pull request #423 from Slawter666/pokedex-doc 
Document some of pokedex.c
 2018-12-03 10:53:21 -06:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
Slawter666
715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody
0e5e487b78 tweak alignment 2018-12-03 08:04:11 -05:00
Melody
2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg
b9e711bbf4 Add Powder 2018-12-03 12:50:32 +01:00
Melody
52fa5137c9 tweak alignment 2018-12-03 00:31:15 -05:00
garak
462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
DizzyEggg
52d1e69591 Add AI support for newly added moves 2018-12-02 23:50:51 +01:00
DizzyEggg
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
DizzyEggg
9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
Diegoisawesome
ee05197eba
Merge pull request #418 from DizzyEggg/link_rfu 
Finish Link rfu
 2018-12-02 12:29:31 -06:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg
d46c3ebe5b Fix Future Sight 2018-12-02 18:47:39 +01:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
DizzyEggg
d137ebc7a9 Some more rom 8011dc0 work 2018-12-02 13:59:55 +01:00
DizzyEggg
e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
DizzyEggg
b082f000af Start working on link rfu 2018-12-01 18:54:59 +01:00
DizzyEggg
6ae949e360 Psychic Terrain blocks priority moves 2018-12-01 11:35:49 +01:00
DizzyEggg
3be070f0c3 Fix string overflowing issue 2018-12-01 11:12:31 +01:00
DizzyEggg
3934eac8d4 Merge branch 'master' into battle_engine_v2 2018-12-01 10:28:11 +01:00
Marcus Huderle
0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00