ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 16:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,685 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

871 Commits

Author SHA1 Message Date
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
DizzyEggg
f7a7ddde0c Fix Quick Guard 2018-12-22 15:10:24 +01:00
DizzyEggg
0748069705
Merge pull request #53 from ultima-soul/battle_engine 
Added new battle items.
 2018-12-22 13:54:19 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c 
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
 2018-12-19 22:50:54 -05:00
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
ultima-soul
a00eb2f5d8 Added new battle items. 2018-12-13 09:31:47 -08:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
DizzyEggg
b60915539d Fix Phantom Force 2018-12-08 16:19:50 +01:00
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
DizzyEggg
d52fe8ac58 Flash Cannon effect 2018-12-08 00:14:35 +01:00
DizzyEggg
43d620f13a Surf hits 3 opponent 2018-12-08 00:13:06 +01:00
DizzyEggg
470df386c9 Fix conflicts 2018-12-07 23:01:14 +01:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05: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
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01: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
DizzyEggg
ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01: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
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
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
ad67f4f26f Merge with master and REQ arguments 2018-12-02 22:05:23 +01:00
DizzyEggg
a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
DizzyEggg
8f8e6fb88b Merge branch 'master' into battle_engine_v2 2018-12-02 16:59:38 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Melody
c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg
9d9fcc540e
Merge pull request #43 from Kurausukun/battle_engine_v2 
Update Dive's Base Power
 2018-11-30 20:46:34 +01:00
DizzyEggg
7fa55704b2 merge with master 2018-11-30 20:46:09 +01:00
Kurausukun
c8bc40e3e8
Update battle_moves.h 2018-11-30 00:56:53 -05:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00