ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 21:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,996 Commits 1 Branch 0 Tags 235 MiB
0dd9a3dd0c
Commit Graph

62 Commits

Author SHA1 Message Date
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
DizzyEggg
ff2dcf5413 Two fakematches out 2019-07-29 21:09:05 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
DizzyEggg
c80861d85e Add hopefully support for Cherrim 2019-06-15 14:46:35 +02:00
DizzyEggg
aaea5398f4 Fix Castfrom ability pop-up and refactor one function 2019-06-14 12:58:29 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
DizzyEggg
d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480) 
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
 2018-12-25 11:50:15 -06:00
DizzyEggg
6fa5f33519 Merge branch 'master' into battle_engine_v2 2018-12-24 09:07:18 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01: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
15b8046b2b Add third type 2018-11-17 12:10:24 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
DizzyEggg
b3ad32bbe6 Merge with master 2018-10-14 20:51:34 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +02:00
DizzyEggg
b80b94ee73 merge with master 2018-10-07 19:40:34 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
DizzyEggg
7925000a54 merge with master 2018-10-06 16:05:58 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
DizzyEggg
a69af8f2f5 Merge with master 2018-09-22 00:22:13 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
0800a44f7a Merge branch 'master' into battle_engine_v2 2018-09-16 09:22:05 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
DizzyEggg
d20189234e Shyly begin move animations 2018-09-10 17:11:16 +02:00
DizzyEggg
2293d1ddbc Get rid of duplicate bs command jumpiftype 2018-07-14 12:02:29 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
DizzyEggg
9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00