Commit graph

423 commits

Author SHA1 Message Date
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
PikalaxALT
dc0d544119 sub_800E87C, remaining data in link_rfu 2017-12-05 23:54:31 -05:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
DizzyEggg
ad07843f2d start working on use pokeblock 2017-12-04 23:09:44 +01:00
EternalCode
077089f0e5 fldeff_teleport file completed 2017-12-03 20:46:56 -05:00
PikalaxALT
519c8d42f8 through sub_800DD94 2017-12-03 20:04:54 -05: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
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
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
PikalaxALT
cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -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
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
PikalaxALT
f9c3aeb919 sub_8135380 2017-11-24 22:30:20 -05:00
PikalaxALT
2746967bef through sub_8134CE8 2017-11-24 20:46:29 -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
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
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
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
PikalaxALT
d6d315d817 Merge branch 'master' into link 2017-11-19 00:07:56 -05:00
PikalaxALT
728532be77 Return stuff to its rightful place, and set up struct definitions for later 2017-11-18 20:33:53 -05:00
DizzyEggg
3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
PikalaxALT
f25cdb4837 resolve questionable file boundary decision 2017-11-18 15:15:54 -05:00
Diegoisawesome
5dc8beb034
Merge pull request #112 from DizzyEggg/decompile_recorded_battle
Decompile recorded battle
2017-11-18 13:29:27 -06:00
DizzyEggg
f8b40754c7 wild encounter done 2017-11-18 12:27:10 +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
PikalaxALT
236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05: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
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
a972de7bca start working on daycare 2017-11-14 20:23:25 +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
3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg
c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
DizzyEggg
47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
DizzyEggg
fa3691ca40 start pss 2017-11-11 14:45:08 +01:00
PikalaxALT
b92d85fd30 Decompile link data 2017-11-10 20:55:03 -05:00
PikalaxALT
50c1622507 Split link.s and link_rfu.s 2017-11-10 20:47:24 -05:00
Diegoisawesome
a6c30ba951 More file organization 2017-11-10 13:20:27 -06:00
Diegoisawesome
6ecad1a59d Organize map data 2017-11-10 12:39:00 -06:00
DizzyEggg
045e7d6382 split starter choose data 2017-11-08 20:53:39 +01:00
DizzyEggg
61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00
PikalaxALT
fce326fbd4 through sub_8009414 2017-11-07 20:25:24 -05:00
DizzyEggg
a729e9838e move data to hall of fame c file 2017-11-06 18:41:32 +01:00
DizzyEggg
bd56bb073f start working on hall of fame 2017-11-05 12:05:07 +01:00
DizzyEggg
4d4d642285 dump berry blender and script menu 2017-11-04 22:40:36 +01:00
DizzyEggg
352102a07a Merge branch 'master' into decompile_battle_7 2017-11-04 16:12:45 +01:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
DizzyEggg
5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
PikalaxALT
ab3b8cd51a Merge branch 'master' into heal_location 2017-11-02 07:59:29 -04:00
Diegoisawesome
af197ccd3b
Merge pull request #98 from PikalaxALT/bard_music
Decompile bard music
2017-11-01 23:18:10 -05:00
PikalaxALT
75262c1920 Merge branch 'master' into bard_music 2017-11-02 00:09:14 -04:00
PikalaxALT
6543d7f2d6 Merge branch 'master' into heal_location 2017-11-01 23:43:08 -04:00
PikalaxALT
8a4f0287da Merge branch 'master' into secret_base 2017-11-01 23:42:04 -04:00
Diegoisawesome
c71f6baa8c
Merge pull request #99 from PikalaxALT/math_util
Meme Util
2017-11-01 22:41:28 -05:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
22f6517423 Decompile remaining region map data 2017-11-01 23:21:07 -04:00
PikalaxALT
7eacb24cf7 Start ripping graphics/data for region_map 2017-11-01 21:10:47 -04:00
PikalaxALT
e3005e88c7 Decompile remaining functions in region_map 2017-11-01 00:34:57 -04:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
PikalaxALT
76bb397e83 region_map.c through sub_8122CF8 2017-10-29 19:33:53 -04:00
DizzyEggg
51df918c04 evo scene file is done 2017-10-29 16:15:23 +01:00
PikalaxALT
c0a229f108 Decompile field region map bg and window templates 2017-10-29 11:12:28 -04:00
PikalaxALT
0a060ae254 Start decompiling field_region_map 2017-10-29 10:38:25 -04:00
PikalaxALT
00f4bba6d8 Decompile heal location functions 2017-10-28 20:55:01 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
PikalaxALT
6d3778948d finish math_util 2017-10-28 16:15:36 -04:00
PikalaxALT
f57776c74c through sub_8151574 2017-10-28 15:58:07 -04:00