DizzyEggg
|
7581218569
|
Merge branch 'master' into decompile_battle1
|
2017-12-19 17:37:53 +01:00 |
|
Diegoisawesome
|
6a674e1e83
|
Merge remote-tracking branch 'Egg/decompile_mail_data'
|
2017-12-17 22:51:40 -06:00 |
|
DizzyEggg
|
54dccc8512
|
give batter script command names
|
2017-12-17 20:38:01 +01:00 |
|
DizzyEggg
|
7517f6a030
|
fix battle setup conflicts
|
2017-12-17 20:26:13 +01:00 |
|
DizzyEggg
|
46fa2557d7
|
merge mail with master, fix conflicts
|
2017-12-17 20:22:56 +01:00 |
|
DizzyEggg
|
eb8055eb07
|
battle 1 is decompiled
|
2017-12-17 20:10:57 +01:00 |
|
PikalaxALT
|
6d73bb4b57
|
Import function labels from Ruby
|
2017-12-16 10:23:05 -05:00 |
|
PikalaxALT
|
da2e0dfe50
|
Merge branch 'master' into clock
|
2017-12-15 21:04:25 -05:00 |
|
DizzyEggg
|
44abbae60b
|
nerge with master, fix conflicts
|
2017-12-16 01:08:55 +01:00 |
|
Diegoisawesome
|
e3c366df64
|
Merge remote-tracking branch 'pret/master'
|
2017-12-15 00:08:48 -06:00 |
|
camthesaxman
|
c681b482c2
|
convert more constants
|
2017-12-11 12:27:51 -06:00 |
|
camthesaxman
|
00896cb3b5
|
rename rng.c to random.c and rom4.c to overworld.c
|
2017-12-05 12:27:33 -06:00 |
|
Cameron Hall
|
fd75493bc6
|
Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
|
2017-12-05 12:05:06 -06:00 |
|
DizzyEggg
|
4faa442d5a
|
decompile and label mail
|
2017-12-03 19:19:11 +01:00 |
|
DizzyEggg
|
2fe25da65a
|
move pokeball data to rom
|
2017-12-02 21:27:00 +01:00 |
|
DizzyEggg
|
c2fdde3a49
|
pokeball file is decompiled
|
2017-12-02 20:38:26 +01:00 |
|
DizzyEggg
|
c27f7a8131
|
start working on pokeball
|
2017-12-02 19:39:07 +01:00 |
|
DizzyEggg
|
d75e7ace1d
|
label battle stuff
|
2017-12-02 14:08:55 +01:00 |
|
DizzyEggg
|
273474d57a
|
give names to some battlescripts
|
2017-12-02 00:03:46 +01:00 |
|
DizzyEggg
|
039c9f4bd8
|
merge with master
|
2017-12-01 21:27:29 +01:00 |
|
DizzyEggg
|
646664ff29
|
battle setup file is decompiled
|
2017-12-01 21:25:13 +01:00 |
|
DizzyEggg
|
e8ecb01ab2
|
more work on battle setup
|
2017-11-29 19:54:15 +01:00 |
|
PikalaxALT
|
10068b0345
|
Merge branch 'master' into field_poison
|
2017-11-29 08:19:54 -05:00 |
|
Diegoisawesome
|
70743f4b95
|
Merge branch 'master' of https://github.com/pret/pokeemerald
|
2017-11-29 00:52:32 -06:00 |
|
DizzyEggg
|
10470ef536
|
start working on battle setup
|
2017-11-28 23:02:09 +01:00 |
|
Diegoisawesome
|
54da963091
|
Merge pull request #122 from PikalaxALT/unk_81BAD84
Unk 81 bad84
|
2017-11-28 10:11:49 -06:00 |
|
PikalaxALT
|
88636dfc2a
|
Merge branch 'master' into clock
|
2017-11-27 20:09:53 -05:00 |
|
PikalaxALT
|
b9d08ed83b
|
Merge branch 'master' into unk_81BAD84
|
2017-11-27 20:08:34 -05:00 |
|
PikalaxALT
|
1ac177723d
|
Merge branch 'master' into field_poison
|
2017-11-27 20:07:33 -05:00 |
|
PikalaxALT
|
41eb2ed59e
|
Merge branch 'master' into coins
|
2017-11-27 20:06:38 -05:00 |
|
Diegoisawesome
|
18c6b8efc2
|
Merge pull request #120 from PikalaxALT/unk_text_util
Decompile asm/unk_text_util.s
|
2017-11-27 18:39:50 -06:00 |
|
Diegoisawesome
|
db87e2db4c
|
Merge pull request #117 from ProjectRevoTPP/load_save
finish load_save.c
|
2017-11-27 15:19:08 -06:00 |
|
ProjectRevoTPP
|
e6bcfee668
|
Encyprtion
|
2017-11-27 15:20:10 -05:00 |
|
Cameron Hall
|
6e317c6463
|
Merge pull request #124 from DizzyEggg/dump_battlescripts
Dump Battle Scripts
|
2017-11-27 14:00:29 -06:00 |
|
DizzyEggg
|
237261e193
|
berry blender review changes
|
2017-11-27 20:03:41 +01:00 |
|
DizzyEggg
|
77a6c30bd4
|
make various macros
|
2017-11-26 21:04:00 +01:00 |
|
DizzyEggg
|
b0657350a4
|
berry blender fix merge conflicts
|
2017-11-26 19:21:51 +01:00 |
|
DizzyEggg
|
9886eeb5d8
|
fix, rename, label battle labels and battlescripts
|
2017-11-26 13:26:58 +01:00 |
|
DizzyEggg
|
cc572f7c00
|
clear battle code and battlescripts
|
2017-11-26 11:55:17 +01:00 |
|
DizzyEggg
|
938d346b6d
|
fixes and labels
|
2017-11-26 01:19:57 +01:00 |
|
DizzyEggg
|
847bfa1540
|
add more battlescript macros
|
2017-11-25 21:32:17 +01:00 |
|
DizzyEggg
|
fe658cc2fd
|
create setword macro
|
2017-11-25 21:11:20 +01:00 |
|
DizzyEggg
|
9151a6d094
|
dump battlescripts, rename battlescripts
|
2017-11-25 18:42:31 +01:00 |
|
PikalaxALT
|
f9c3aeb919
|
sub_8135380
|
2017-11-24 22:30:20 -05:00 |
|
PikalaxALT
|
1063bcaab8
|
through sub_81352DC
|
2017-11-24 22:28:13 -05:00 |
|
PikalaxALT
|
53a7f188f8
|
through sub_81351AC
|
2017-11-24 22:08:12 -05:00 |
|
PikalaxALT
|
23c7c6a41c
|
_12HourClockFixAMPM
|
2017-11-24 21:52:22 -05:00 |
|
PikalaxALT
|
1b3fcb83f2
|
sub_813504C
|
2017-11-24 21:37:42 -05:00 |
|
PikalaxALT
|
dfa5f24e59
|
sub_8134FFC
|
2017-11-24 21:27:05 -05:00 |
|
PikalaxALT
|
046e5ebf69
|
through sub_8134FB0
|
2017-11-24 21:17:50 -05:00 |
|