Commit Graph

1669 Commits

Author SHA1 Message Date
ProjectRevoTPP
2145af4a3e Merge branch 'master' of https://github.com/pret/pokeemerald into use_build 2017-10-09 15:33:42 -04:00
Diegoisawesome
08a5efbd81 Merge pull request #62 from Diegoisawesome/baserom_extraction
Continued baserom extraction
2017-10-09 14:32:44 -05:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
Diegoisawesome
ae06c13e99 Add front pic anims with help from marijnvdwerf 2017-10-09 13:10:02 -05:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
U-User-PC\User
d361f7030a decompiled up to sub_81C20F0 2017-10-09 13:17:13 -04:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg
9d4acb9635 some work on international string util 2017-10-09 15:40:08 +02:00
DizzyEggg
7fb4a54e39 Merge branch 'master' into decompile_battle_message 2017-10-09 13:58:24 +02:00
DizzyEggg
fdfbbb4951 add diploma header and static names fix 2017-10-09 13:55:31 +02:00
DizzyEggg
7b690dbe3a add save location header, change static names 2017-10-09 13:48:41 +02:00
DizzyEggg
6941be8e33 match and clean up ai script commands 2017-10-09 13:41:07 +02:00
ProjectRevoTPP
96f4b6d118 :q!Merge branch 'master' of https://github.com/pret/pokeemerald into use_build 2017-10-09 02:32:17 -04:00
ProjectRevoTPP
97c6201cfe add build/ support. 2017-10-09 02:19:44 -04:00
Diegoisawesome
96c5966ff3 Merge pull request #69 from ProjectRevoTPP/save_location
decompile save_location.c
2017-10-09 00:33:23 -05:00
ProjectRevoTPP
a9d94cc5d6 decompile save_location.c 2017-10-08 22:21:34 -04:00
Diegoisawesome
023c4b69ab Merge pull request #68 from ProjectRevoTPP/diploma
decompile diploma.c
2017-10-08 14:48:48 -05:00
DizzyEggg
95e4ae06ce battle message decompiled and dumped 2017-10-08 14:54:51 +02:00
ProjectRevoTPP
f775ccd571 forgot to remove unnecessary local ptr 2017-10-07 22:58:21 -04:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
DizzyEggg
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
Diegoisawesome
07e29b70bc Merge pull request #63 from ProjectRevoTPP/save_failed_screen
decompile save_failed_screen.c
2017-10-06 23:08:23 -05:00
ProjectRevoTPP
2ecb9fcd13 oops 2017-10-06 23:30:35 -04:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
ProjectRevoTPP
058fed1fd8 oops 2017-10-06 20:35:29 -04:00
ProjectRevoTPP
35bb9b02e3 ewram defines 2017-10-06 20:26:53 -04:00
ProjectRevoTPP
f383cb8354 update labels 2017-10-06 19:48:18 -04:00
ProjectRevoTPP
4b4d9907a8 merge 2017-10-06 18:35:51 -04:00
ProjectRevoTPP
d0dfc758fc decompile save_failed_screen.c 2017-10-06 18:33:35 -04:00
Diegoisawesome
dea28a0a23 Merge pull request #57 from DizzyEggg/decomp_battle2
Decompile battle2
2017-10-06 17:08:27 -05:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
19e2255c34 Merge branch 'master' into decomp_battle2 2017-10-06 17:07:56 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
Diegoisawesome
d5e7ddddb7 Extract baseroms from data2c 2017-10-06 01:57:52 -05:00
Diegoisawesome
1bd7739ea6 Merge pull request #61 from ProjectRevoTPP/braille_puzzle
decompile braille_puzzles.c
2017-10-06 00:35:29 -05:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
ProjectRevoTPP
c88a39b5d5 formatting 2017-10-05 13:05:25 -04:00
ProjectRevoTPP
e7175999f5 decompile braille_puzzles.c 2017-10-05 13:02:39 -04:00
U-User-PC\User
ddc2e96825 egg pls save me 2017-10-04 13:27:50 -04:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
Diegoisawesome
f41709d322 Rename files for consistency with pokeruby 2017-10-04 02:43:45 -05:00
Diegoisawesome
cfc70c9806 Extract baseroms from miscellaneous files
Had to leave some unfinished due to complexity at the moment
2017-10-04 02:38:25 -05:00
Diegoisawesome
09d5d81c9c Merge pull request #60 from DizzyEggg/branchname
Create battle_transition.h
2017-10-03 15:37:21 -05:00
U-User-PC\User
750937c58c fix battle.h 2017-10-03 16:10:18 -04:00
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04:00
U-User-PC\User
0a88d1042a decompiled up to sub_81C13B0 2017-10-03 15:42:28 -04:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02:00
DizzyEggg
c8114eb3a5 create battle_transition.h 2017-10-03 12:11:13 +02:00