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

3180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite 
Update createsprite macro and rename BANK to BATTLER
 2018-11-15 14:45:13 -06:00
Diegoisawesome
09d09122bc
Merge pull request #384 from garakmon/subdirs 
Subdirectories in build
 2018-11-15 14:25:21 -06:00
Diegoisawesome
39f54b346d
Merge pull request #382 from Slawter666/synchronise 
Move field effects enum to defines
 2018-11-15 14:24:22 -06:00
Diegoisawesome
216c388001
Merge pull request #385 from garakmon/nodep 
fix dependency scanning
 2018-11-15 14:19:57 -06:00
garak
c067c4e617 fix dependency scanning 2018-11-14 19:12:12 -05:00
garak
87ec71f71b subdirs in build 2018-11-14 17:59:30 -05:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
garak
c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak
269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
Diegoisawesome
f639c7c309
Merge pull request #380 from DizzyEggg/frontier_2 
More battle frontier
 2018-11-12 14:05:40 -06:00
DizzyEggg
b5ea69cf74 Fix conflicts 2018-11-12 19:22:23 +01:00
Diegoisawesome
54ad6794bc
Merge pull request #361 from Slawter666/synchronise 
Synchronise with pokeruby
 2018-11-12 11:37:18 -06:00
DizzyEggg
734403fdfa Merge branch 'master' into frontier_2 2018-11-12 15:42:44 +01:00
DizzyEggg
69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Slawter666
be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
3b3cffac44 Decompile battle pike 2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c Start battle pike 2018-11-12 00:46:02 +01:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
DizzyEggg
1437755cdd Start arena 2018-11-07 22:54:42 +01:00
Diegoisawesome
65f053fd89 Thanks Egg 2018-11-07 14:48:06 -06:00
Diegoisawesome
a052e45f27
Merge pull request #379 from DizzyEggg/derp 
ScriptMenu_MultichoiceGrid
 2018-11-07 14:41:29 -06:00
DizzyEggg
01fdb01364 Diego pls 2018-11-07 21:09:54 +01:00
Diegoisawesome
7ab8ff0d81 Merge branch 'master' of github.com:pret/pokeemerald 2018-11-07 12:35:49 -06:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06:00
Diegoisawesome
1507a290d5
Merge pull request #378 from Diegoisawesome/script_menu 
[WIP] Decompile/port script_menu
 2018-11-06 20:24:04 -06:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Slawter666
15117a8d09 Remove redundancy in berry.c 2018-11-06 23:15:57 +00:00
Diegoisawesome
93ff71fcfd
Merge pull request #377 from DizzyEggg/render_text 
Match Render text and attempt to clean up
 2018-11-06 11:44:14 -06:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce Merge remote-tracking branch 'origin/master' into render_text 2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33 Begin cleaning text.c 2018-11-06 10:44:48 -06:00
Diegoisawesome
ccc5d27fcb
Merge pull request #376 from DizzyEggg/battle_frontier_2 
Decompile part of battle_frontier_2
 2018-11-06 10:06:21 -06:00
DizzyEggg
258ec3162f frontier util review changes 2018-11-05 22:13:59 +01:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
487a6c2b2c this file is 2018-11-05 21:42:12 +01:00
DizzyEggg
6d0d69f3a5 Match Render Text 2018-11-04 23:09:10 +01:00
Slawter666
bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
DizzyEggg
3159e958b8 Match a record mixing function 2018-11-03 18:21:33 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8 Document recorded battle 2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +01:00
DizzyEggg
90ef269426 Merge branch 'master' into battle_frontier_2 2018-10-30 21:48:18 +01:00