ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags 235 MiB
27b1d74dad
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
DizzyEggg
c7dd347bb1
Match battle_tower.c function 
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
 2018-12-03 21:09:26 +01:00
Diegoisawesome
8064b011d1
Merge pull request #424 from DizzyEggg/labels 
Clean up src/data
 2018-12-03 12:33:47 -06:00
DizzyEggg
ba1fc05558 tabs 2018-12-03 18:10:03 +01: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
Diegoisawesome
cd378ec676
Merge pull request #421 from melthelesbian/trainer_class_lookups 
clean up trainer class lookups
 2018-12-03 10:52:24 -06:00
DizzyEggg
e1829c40ab Clean up safari zone 2018-12-03 17:31:34 +01:00
DizzyEggg
2821eafb99 Clean up roamer 2018-12-03 17:19:10 +01:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +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
44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05: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
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01: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
Melody
72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -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
Diegoisawesome
7914220acd
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup 
cleans up trainer battle scripts
 2018-12-02 14:31:19 -06:00
Melody
a2a99bde11 adds req for macro arguments 2018-12-02 15:14:29 -05: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