Diegoisawesome
|
0403f6eea9
|
Merge remote-tracking branch 'Egg/decompile_use_pokeblock'
|
2017-12-21 16:19:50 -06:00 |
|
DizzyEggg
|
bcffcb0c1c
|
pokeblock merge conflicts
|
2017-12-21 23:12:36 +01:00 |
|
Diegoisawesome
|
2c0e5a41a2
|
Merge remote-tracking branch 'Shanty/script_macros'
|
2017-12-21 16:03:37 -06:00 |
|
DizzyEggg
|
19c25a8f2b
|
start dumping pokedex
|
2017-12-21 22:56:20 +01:00 |
|
Marcus Huderle
|
173761a5a1
|
Port generic event script macros from pokeruby
|
2017-12-21 13:47:52 -06:00 |
|
Diegoisawesome
|
a705a863d1
|
Fix incorrect slash in battle_bg.c
|
2017-12-21 12:26:00 -06:00 |
|
DizzyEggg
|
6b5157b2a3
|
decompile bike.s
|
2017-12-21 17:46:03 +01:00 |
|
DizzyEggg
|
504363f2a6
|
Merge branch 'master' into decompile_trainer_see
|
2017-12-20 17:21:46 +01:00 |
|
DizzyEggg
|
df479661ff
|
pokeblock review changes
|
2017-12-20 17:20:41 +01:00 |
|
DizzyEggg
|
b615af4184
|
fix pokeblock merge conflicts
|
2017-12-20 17:16:56 +01:00 |
|
Diegoisawesome
|
7e6a68a99a
|
Merge remote-tracking branch 'Egg/static_to_s'
|
2017-12-20 00:25:54 -06:00 |
|
DizzyEggg
|
4949411f3e
|
make battle bg compile
|
2017-12-19 17:41:05 +01:00 |
|
DizzyEggg
|
7581218569
|
Merge branch 'master' into decompile_battle1
|
2017-12-19 17:37:53 +01:00 |
|
DizzyEggg
|
4abc2eea8a
|
ram vars to C files
|
2017-12-19 17:33:07 +01:00 |
|
DizzyEggg
|
b7a2335347
|
clean up trainer see file
|
2017-12-19 17:18:44 +01:00 |
|
DizzyEggg
|
5744356989
|
decompile trainer see
|
2017-12-18 23:26:44 +01:00 |
|
DizzyEggg
|
a612ef12a0
|
start working on trainer see
|
2017-12-18 19:35:50 +01:00 |
|
DizzyEggg
|
cb229f56e8
|
fix pokeblock conflicts
|
2017-12-18 16:58:14 +01:00 |
|
Diegoisawesome
|
6a674e1e83
|
Merge remote-tracking branch 'Egg/decompile_mail_data'
|
2017-12-17 22:51:40 -06:00 |
|
DizzyEggg
|
314b96af46
|
static names given s prefix
|
2017-12-17 23:45:27 +01:00 |
|
DizzyEggg
|
720bd555bc
|
add constants trainers file
|
2017-12-17 21:19:08 +01: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 |
|
DizzyEggg
|
c3abe2863f
|
rename
|
2017-12-16 15:12:55 +01:00 |
|
DizzyEggg
|
5b409d49ed
|
pokeblock.s is decompiled
|
2017-12-16 15:10:29 +01:00 |
|
DizzyEggg
|
f4ab21ee67
|
Merge branch 'master' into decompile_use_pokeblock
|
2017-12-16 11:42:59 +01:00 |
|
PikalaxALT
|
da2e0dfe50
|
Merge branch 'master' into clock
|
2017-12-15 21:04:25 -05:00 |
|
DizzyEggg
|
930fea6fad
|
mail review changes
|
2017-12-16 01:18:31 +01:00 |
|
DizzyEggg
|
bb82032208
|
battle setup review changes
|
2017-12-16 01:15:19 +01:00 |
|
DizzyEggg
|
44abbae60b
|
nerge with master, fix conflicts
|
2017-12-16 01:08:55 +01:00 |
|
DizzyEggg
|
4351676749
|
decompile more of pokeblock.s
|
2017-12-16 00:08:23 +01:00 |
|
camthesaxman
|
c681b482c2
|
convert more constants
|
2017-12-11 12:27:51 -06:00 |
|
DizzyEggg
|
8ac17e0948
|
move data from asm to pokeblock.c
|
2017-12-11 16:52:28 +01:00 |
|
DizzyEggg
|
b4d10ab7ab
|
split pokeblock files
|
2017-12-10 19:02:51 +01:00 |
|
DizzyEggg
|
37ae6a7758
|
move more pokeblock data to C and label
|
2017-12-10 16:38:27 +01:00 |
|
DizzyEggg
|
fb30acbc30
|
pokeblock feed is decompiled
|
2017-12-10 15:04:03 +01:00 |
|
DizzyEggg
|
bb1ae5f857
|
Merge branch 'master' into decompile_use_pokeblock
|
2017-12-09 21:24:47 +01:00 |
|
DizzyEggg
|
6561b62986
|
start pokeblock feed
|
2017-12-09 21:23:40 +01:00 |
|
camthesaxman
|
19fbf024ff
|
fix merge conflicts
|
2017-12-05 12:42:30 -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 |
|
camthesaxman
|
caa13f8777
|
convert some constants to C headers
|
2017-12-05 11:55:48 -06:00 |
|
EternalCode
|
266dd492a7
|
void parameter in function header
|
2017-12-04 17:12:05 -05:00 |
|
DizzyEggg
|
ad07843f2d
|
start working on use pokeblock
|
2017-12-04 23:09:44 +01:00 |
|
EternalCode
|
d74c0d053e
|
missed moving an extern to top
|
2017-12-03 20:48:08 -05:00 |
|
EternalCode
|
077089f0e5
|
fldeff_teleport file completed
|
2017-12-03 20:46:56 -05:00 |
|
DizzyEggg
|
4faa442d5a
|
decompile and label mail
|
2017-12-03 19:19:11 +01:00 |
|
DizzyEggg
|
790df7159e
|
more battlescript labels
|
2017-12-03 00:47:21 +01:00 |
|
DizzyEggg
|
e10aea9a51
|
give some more labels to battle struct fields
|
2017-12-02 23:31:58 +01:00 |
|
DizzyEggg
|
ce6e97fa0b
|
sprite data fields to array
|
2017-12-02 21:44:50 +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
|
921011592c
|
unsigned -> unsigned int; create header
|
2017-11-29 08:30:18 -05:00 |
|
PikalaxALT
|
10068b0345
|
Merge branch 'master' into field_poison
|
2017-11-29 08:19:54 -05: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 |
|
DizzyEggg
|
7144b3b7af
|
fix flavour flavor not building, fuccing americans
|
2017-11-27 21:24:34 +01: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
|
d48392e677
|
change battle variables names
|
2017-11-26 18:07:00 +01:00 |
|
DizzyEggg
|
59f64c622b
|
name more battlescripts
|
2017-11-26 17:26:11 +01:00 |
|
DizzyEggg
|
1bb5b1fd07
|
more battle labels
|
2017-11-26 17:15:28 +01:00 |
|
DizzyEggg
|
8c30c42c36
|
more labelling and changes
|
2017-11-26 14:17:02 +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
|
76f4a8b195
|
clean up and use names for printfromtable
|
2017-11-26 00:33:40 +01:00 |
|
DizzyEggg
|
9151a6d094
|
dump battlescripts, rename battlescripts
|
2017-11-25 18:42:31 +01:00 |
|
PikalaxALT
|
9840be1f00
|
Slight cleanup
|
2017-11-24 22:43:05 -05: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 |
|
PikalaxALT
|
4a81b595c3
|
through c2_080111BC
|
2017-11-24 21:11:32 -05:00 |
|
PikalaxALT
|
b210d5f86b
|
through c3_80BF560
|
2017-11-24 21:06:46 -05:00 |
|
PikalaxALT
|
2746967bef
|
through sub_8134CE8
|
2017-11-24 20:46:29 -05:00 |
|
PikalaxALT
|
efd23cb91b
|
Cb2_ViewWallClock
|
2017-11-24 20:06:29 -05:00 |
|
PikalaxALT
|
24009ea941
|
through Cb2_StartWallClock and associated data
|
2017-11-24 19:49:03 -05:00 |
|
PikalaxALT
|
2280614a14
|
Start decompiling data
|
2017-11-24 19:06:01 -05:00 |
|
PikalaxALT
|
f54f2c424f
|
LoadWallClockGraphics
|
2017-11-24 18:00:26 -05:00 |
|
PikalaxALT
|
ab569cc466
|
clock.s
|
2017-11-24 14:57:00 -05:00 |
|
PikalaxALT
|
da04898840
|
Clean up includes
|
2017-11-23 23:10:51 -05:00 |
|
PikalaxALT
|
772da493f9
|
data/unk_81BAD84
|
2017-11-23 21:15:57 -05:00 |
|
PikalaxALT
|
c5dcbb78ce
|
unk_81BAD84
|
2017-11-23 21:04:15 -05:00 |
|
PikalaxALT
|
89d938ea9e
|
Finish decompiling coins
|
2017-11-23 13:53:51 -05:00 |
|
PikalaxALT
|
e8b1059345
|
CHAR_SPECIAL_F7 constant
Preface for string decompilation
|
2017-11-23 13:29:11 -05:00 |
|
PikalaxALT
|
ef18d3b8ec
|
Decompile asm/unk_text_util.s
|
2017-11-23 11:23:05 -05:00 |
|
ProjectRevoTPP
|
9644f44982
|
finish load_save.c
|
2017-11-22 21:06:30 -05:00 |
|
PikalaxALT
|
eff1ad3300
|
Decompile field poison
|
2017-11-22 20:13:15 -05:00 |
|
ProjectRevoTPP
|
adba0bacfc
|
Merge branch 'master' of https://github.com/pret/pokeemerald into load_save
|
2017-11-21 21:25:48 -05:00 |
|
ProjectRevoTPP
|
161a37809b
|
nonmatching MoveSaveBlocks_ResetHeap (i tried...)
|
2017-11-21 21:25:01 -05:00 |
|
DizzyEggg
|
4e25ef10f2
|
wild encounter review changes
|
2017-11-20 16:40:02 +01:00 |
|
DizzyEggg
|
ad3a97e178
|
berry blender merge conflicts
|
2017-11-19 22:58:13 +01:00 |
|
DizzyEggg
|
a3b5af17ea
|
berry blender is done
|
2017-11-19 22:48:46 +01:00 |
|
DizzyEggg
|
3de416662b
|
wild encounter, fix merge conflicts
|
2017-11-18 21:45:52 +01:00 |
|
DizzyEggg
|
185402fe21
|
more work on berry blender
|
2017-11-18 21:38:57 +01:00 |
|
Diegoisawesome
|
5dc8beb034
|
Merge pull request #112 from DizzyEggg/decompile_recorded_battle
Decompile recorded battle
|
2017-11-18 13:29:27 -06:00 |
|
DizzyEggg
|
8fd3081306
|
start working on berry blender
|
2017-11-18 16:11:34 +01:00 |
|
DizzyEggg
|
f8b40754c7
|
wild encounter done
|
2017-11-18 12:27:10 +01:00 |
|
DizzyEggg
|
ca43536242
|
make recorded battle compile
|
2017-11-17 22:33:36 +01:00 |
|
DizzyEggg
|
6b075ae0ff
|
wild encounter file is decompiled
|
2017-11-17 22:28:55 +01:00 |
|
DizzyEggg
|
d0245cf8d2
|
recorded battle merge conflicts fix
|
2017-11-17 19:34:55 +01:00 |
|
DizzyEggg
|
1b7246395d
|
merge conflicts, review changes, daycare
|
2017-11-17 19:31:03 +01:00 |
|
DizzyEggg
|
a2a17bba92
|
more work on wild encounter
|
2017-11-17 17:50:07 +01:00 |
|
DizzyEggg
|
b37d8c0821
|
start decompiling wild encounter
|
2017-11-16 20:38:10 +01:00 |
|
Diegoisawesome
|
c0d180a870
|
Merge pull request #100 from PikalaxALT/heal_location
Heal location and Field Region Map
|
2017-11-15 23:24:45 -06:00 |
|
PikalaxALT
|
a7f72e7da1
|
Remove spaces between incrementor and incrementee
|
2017-11-16 00:01:47 -05:00 |
|
Diegoisawesome
|
6a73c89e54
|
Merge pull request #113 from DizzyEggg/decompile_pss
Start Pokemon Storage System
|
2017-11-15 20:55:38 -06:00 |
|
DizzyEggg
|
ba00a1c688
|
daycare file fully done
|
2017-11-15 22:12:18 +01:00 |
|
DizzyEggg
|
616edd6c3f
|
daycare file is decompiled
|
2017-11-15 20:08:31 +01:00 |
|
DizzyEggg
|
1e79d53d2f
|
merge daycare with master
|
2017-11-15 17:18:05 +01:00 |
|
PikalaxALT
|
89b695278d
|
Merge branch 'master' into heal_location
|
2017-11-15 09:01:56 -05:00 |
|
Diegoisawesome
|
ce0e5cbfe4
|
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps
|
2017-11-15 00:47:34 -06:00 |
|
Diegoisawesome
|
3fb2a488f9
|
Merge pull request #111 from DizzyEggg/decompile_battle5
Decompile battle5
|
2017-11-14 16:52:40 -06:00 |
|
Diegoisawesome
|
118bf4f4b1
|
Merge pull request #108 from DizzyEggg/decompile_starter_choose
Decompile starter choose
|
2017-11-14 16:41:53 -06:00 |
|
DizzyEggg
|
0310be3007
|
more of daycare done
|
2017-11-14 23:25:07 +01:00 |
|
DizzyEggg
|
95949c772e
|
more of daycare done
|
2017-11-14 21:43:23 +01:00 |
|
DizzyEggg
|
a972de7bca
|
start working on daycare
|
2017-11-14 20:23:25 +01:00 |
|
DizzyEggg
|
5c44c64050
|
add hof graphics
|
2017-11-13 21:55:38 +01:00 |
|
DizzyEggg
|
516a5b2219
|
fix merge conflicts, review changes
|
2017-11-13 20:00:20 +01:00 |
|
Diegoisawesome
|
d1fe93bf4a
|
Merge pull request #105 from DizzyEggg/dump_things
Get rid of a couple of baseroms
|
2017-11-13 12:46:40 -06:00 |
|
DizzyEggg
|
ea575ee217
|
fix typo in a string
|
2017-11-13 19:42:03 +01:00 |
|
DizzyEggg
|
3e1f3d0e1e
|
recorded battle file is decompiled
|
2017-11-13 19:01:23 +01:00 |
|
DizzyEggg
|
bb9c928330
|
starter choose review changes
|
2017-11-13 18:30:17 +01:00 |
|
DizzyEggg
|
ac68187895
|
review changes adding a pal file
|
2017-11-13 18:18:12 +01:00 |
|
DizzyEggg
|
209b6eb467
|
more of recorded battle done
|
2017-11-13 18:07:23 +01:00 |
|
PikalaxALT
|
79609d52c8
|
MAPSEC_DYNAMIC
|
2017-11-12 21:39:44 -05:00 |
|
PikalaxALT
|
1ca032c6ff
|
Address review items, 1
|
2017-11-12 21:13:18 -05:00 |
|
DizzyEggg
|
8ceea171b3
|
leave out pss for now
|
2017-11-13 00:15:07 +01:00 |
|