Commit Graph

623 Commits

Author SHA1 Message Date
DizzyEggg
05aba58d5d fix battle transition conflicts 2018-01-14 22:19:26 +01:00
DizzyEggg
d7644cd3d8 battle transition is decompiled 2018-01-14 22:09:35 +01:00
DizzyEggg
fdbe7fa7de up to 30 battle transitions 2018-01-14 20:45:44 +01:00
ProjectRevoTPP
e19c51cd10 scrub ld_script for bloat 2018-01-09 01:26:27 -05:00
ProjectRevoTPP
dd2d49144b Merge branch 'master' of https://github.com/pret/pokeemerald into assert 2018-01-07 20:01:56 -05:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
a11c65ff1a Port field_door 2018-01-07 17:50:13 -06:00
Diegoisawesome
efe19e95c8 Extract door animations 2018-01-07 01:29:26 -06:00
ProjectRevoTPP
7be61cfb1a add assert support to pokeemerald. 2018-01-06 21:12:42 -05:00
Diegoisawesome
4f726232b8 Merge remote-tracking branch 'EternalCode/master' 2018-01-01 16:31:35 -06:00
DizzyEggg
ba176dfe07 start working on battle transition 2018-01-01 17:41:34 +01:00
Diegoisawesome
f0df833f37 Extract easy chat and pokemon animation 2017-12-29 13:34:24 -06:00
Diegoisawesome
1496ea3a24 Merge branch 'master' of github.com:pret/pokeemerald 2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
Diegoisawesome
ca49f8438d Extract battle_transition data 2017-12-27 15:25:15 -06:00
Diegoisawesome
f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
Diegoisawesome
ba130d469d Split/extract pokedex cry screen data 2017-12-26 16:18:18 -06:00
Diegoisawesome
eff0caf759 Split and extract roulette data 2017-12-26 01:42:08 -06:00
Diegoisawesome
15c92318d3 Extract data from misc files
Also split data4d.s
2017-12-25 00:32:01 -06:00
DizzyEggg
43f23b8a78 Merge branch 'master' into dump_pointers 2017-12-24 11:15:00 +01:00
DizzyEggg
8cd4908fa3 merge bike with master, fix conflicts 2017-12-24 00:08:55 +01:00
DizzyEggg
e647cb2308 dump start menu and a bit of textwindow and trainercard 2017-12-23 19:23:55 +01:00
DizzyEggg
4f6ca126b5 dump all rayquaza scene data to C 2017-12-23 13:23:23 +01:00
DizzyEggg
e7111984a9 start rayquaza dumping 2017-12-23 00:22:07 +01:00
DizzyEggg
3ca5af4d5d do some pointer storage system hunting 2017-12-22 20:10:51 +01:00
DizzyEggg
9c45ca0c5f dump pokemon icon 2017-12-22 19:16:15 +01:00
DizzyEggg
cddd44834e Merge branch 'master' into dump_pointers 2017-12-22 16:22:16 +01:00
sceptillion
3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion
44415f1bbe rename songs to reflect internal names 2017-12-21 23:14:37 -08:00
sceptillion
4cb9f8db76 name phoneme songs 2017-12-21 20:51:09 -08:00
sceptillion
d6987ee9b9 dump songs 2017-12-21 14:30:11 -08:00
DizzyEggg
bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
DizzyEggg
19c25a8f2b start dumping pokedex 2017-12-21 22:56:20 +01: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
b615af4184 fix pokeblock merge conflicts 2017-12-20 17:16:56 +01:00
DizzyEggg
7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +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
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
scnorton
3c2b1731ee Merge branch 'master' into link 2017-12-17 14:09:06 -05:00
PikalaxALT
190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
DizzyEggg
c3abe2863f rename 2017-12-16 15:12:55 +01: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
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
PikalaxALT
ca2bc94c2b through sub_80E6BF8 2017-11-03 20:59:29 -04: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
PikalaxALT
607b7ac834 Decompile remaining bard music data 2017-10-28 10:42:12 -04:00
PikalaxALT
4ae9b1d9d0 Decompile Bard Sound structs 2017-10-28 10:27:28 -04:00
PikalaxALT
5da296e94e GetWordPhonemes; assign names and improve guess of types 2017-10-28 09:46:35 -04:00
PikalaxALT
002b394855 through sub_817C7F4 2017-10-28 09:05:40 -04:00
PikalaxALT
a5951592be Decompile data 2017-10-27 23:21:09 -04:00
PikalaxALT
4c274f6030 Last remaining function in secret base 2017-10-27 22:46:57 -04:00
DizzyEggg
e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
DizzyEggg
0f992c8f5c begin working on evolution graphics 2017-10-27 14:59:55 +02:00
DizzyEggg
1506184465 battle controller opponent is done 2017-10-26 23:12:48 +02:00
DizzyEggg
a9bc67dbb0 recorded opponent controller is done 2017-10-25 18:59:07 +02:00
DizzyEggg
91b010299f start recorded opponent controller 2017-10-25 16:24:17 +02:00
DizzyEggg
3ece244246 wally controller is done 2017-10-24 21:45:41 +02:00
DizzyEggg
bffcd426cf link opponent controller is done 2017-10-24 15:25:20 +02:00
PikalaxALT
eb49cfcab2 sub_80E8AF0 2017-10-23 18:35:06 -04:00
DizzyEggg
1f3a867a0b battle link partner controller is done 2017-10-23 16:38:11 +02:00
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +02:00
DizzyEggg
5b05811dd9 start link partner controller 2017-10-23 14:24:54 +02:00
DizzyEggg
5b70307962 revert merge coz its bugged 2017-10-23 13:36:55 +02:00
DizzyEggg
7d1373e3fa Merge branch 'master' into decompile_battle_controllers 2017-10-23 13:33:32 +02:00
DizzyEggg
918625196e recorded player controller is done 2017-10-23 13:32:11 +02:00
DizzyEggg
aa7e97945b start recorded player controller 2017-10-23 11:24:58 +02:00
DizzyEggg
a8ea415c81 player partner controller is done 2017-10-23 11:07:36 +02:00
Diegoisawesome
88230e8d16 Merge pull request #91 from golemgalvanize/summary
partially decompile pokemon_summary_screen
2017-10-22 20:16:16 -05:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89)
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
2017-10-22 17:55:07 -05:00
DizzyEggg
21f4995922 start player partner controller 2017-10-22 20:49:21 +02:00
DizzyEggg
26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg
f77dcef59d Merge branch 'master' into decompile_battle_controllers 2017-10-22 18:47:06 +02:00
DizzyEggg
df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
ProjectRevoTPP
821f1a6f4f Merge branch 'master' of https://github.com/pret/pokeemerald into clear_save_data_screen 2017-10-21 22:46:01 -04:00
Diegoisawesome
b8f23aa20d Merge branch 'master' of github.com:pret/pokeemerald 2017-10-21 20:20:52 -05:00
Diegoisawesome
667914075b Merge branch 'librfu-decomp' 2017-10-21 20:11:31 -05:00
shinyquagsire23
482b42a295 Split librfu into separate C files in its own directory, rfu_initializeAPI matching except for register differences 2017-10-21 13:46:41 -06:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
ProjectRevoTPP
ae53458622 decompile clear_save_data_screen. 2017-10-21 00:44:17 -04:00
Diegoisawesome
afd42c8e14 Merge pull request #92 from DizzyEggg/decompile_walda_phrase
decompile walda phrase
2017-10-20 14:01:40 -05:00
DizzyEggg
8c85a27346 walda phrase is done 2017-10-20 20:39:00 +02:00
Diegoisawesome
d2cf86bff9 Merge pull request #82 from PikalaxALT/mail
Decompile functions for reading mail
2017-10-20 13:22:56 -05:00
DizzyEggg
cda5c5f925 start working on walda phrase 2017-10-20 18:52:01 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
PikalaxALT
7bc152e2ed Merge branch 'master' into mail 2017-10-19 18:45:38 -04:00
DizzyEggg
dee6133076 fix merge conflicts 2017-10-19 19:46:37 +02:00
Diegoisawesome
8ceecd9fba Merge pull request #81 from DizzyEggg/decompile_rom3
Decompile rom_3
2017-10-19 12:40:56 -05:00
DizzyEggg
11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
U-User-PC\User
d4532c70cb fix merge conflicts 2017-10-18 19:28:36 -04:00
DizzyEggg
7c24b03742 Merge branch 'master' into decompile_battle_interface 2017-10-18 23:05:55 +02:00
DizzyEggg
4b45282dd3 start working on battle interface 2017-10-16 18:12:27 +02:00
DizzyEggg
003a8a501b fix merge conflict 2017-10-15 23:27:27 +02:00
DizzyEggg
dd0f19476c battle anim file is decompiled 2017-10-15 23:21:59 +02:00
DizzyEggg
752ce9b90d start working on battle anim 2017-10-14 16:55:25 +02:00
PikalaxALT
a252140f3b Merge branch 'master' into mail 2017-10-14 09:52:56 -04:00
DizzyEggg
455202eca0 Merge branch 'master' into decompile_rom3 2017-10-14 11:36:28 +02:00
DizzyEggg
14e41d6c50 rom3 is decompiled 2017-10-14 11:34:26 +02:00
Diegoisawesome
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
DizzyEggg
72ed861715 fix rom3 conflicts 2017-10-13 19:58:45 +02:00
Diegoisawesome
3040c1e1aa Merge pull request #75 from DizzyEggg/decompile_reshow_battle_screen
Decompile reshow battle screen
2017-10-13 12:42:42 -05:00
PikalaxALT
32168adbc8 Remaining functions 2017-10-13 12:03:15 -04:00
DizzyEggg
c78679ae66 rom3 decomp start 2017-10-13 17:22:50 +02:00
PikalaxALT
e24f3808f4 Merge branch 'master' into mail 2017-10-13 11:16:34 -04:00
PikalaxALT
52db3ad5aa Decompile TV (#80)
* ClearTVShowData

* special_0x44

* DoTVShow (nonmatching because align)

* DoTVShowBravoTrainerPokemonProfile

* Update field names

* DoTVShowBravoTrainerBattleTower

* Renaming of struct fields

* sub_80EBFF4 and UpdateTVScreensOnMap

* SetTVMetatilesOnMap

* Power buttons for the TV screens on the map

* special_0x45

* sub_80EC18C

* special_0x4a

* ResetGabbyAndTy

* GabbyAndTyBeforeInterview

* GabbyAndTyAfterInterview

* Through IsTVShowInSearchOfTrainersAiring

* GabbyAndTyGetLastQuote

* GabbyAndTyGetLastBattleTrivia

* GabbyAndTySetScriptVarsToFieldObjectLocalIds

* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous

* Make TV structs anonymous within the union

* Move the TV union to its own subheader

* Move TV show enums to the global.tv.h subheader

* Funcion renaming

* Apply static attributes where able

* PutPokemonTodayCaughtOnAir

* sub_80EC8A4

* PutPokemonTodayFailedOnTheAir

* sub_80EC9E8, sub_80ECA10

* sub_80ECA38

* sub_80ECB00

* Put3CheersForPokeblocksOnTheAir

* PutFanClubSpecialOnTheAir

* ContestLiveUpdates_BeforeInterview

* Other before-interview Contest Live Updates functions

* ContestLiveUpdates_BeforeInterview_5

* InterviewAfter_BravoTrainerPokemonProfile

* BravoTrainerPokemonProfile_BeforeInterview1

* BravoTrainerPokemonProfile_BeforeInterview2

* Disassemble TV data

* Decompile TV data

* InterviewAfter_BravoTrainerBattleTowerProfile

* SaveRecordedItemPurchasesForTVShow

* PutNameRaterShowOnTheAir

* StartMassOutbreak

* PutLilycoveContestLadyShowOnTheAir

* InterviewAfter_FanClubLetter

* Rip TV strings

* InterviewAfter_RecentHappenings

* InterviewAfter_PkmnFanClubOpinions

* sub_80ED718

* EndMassOutbreak

* sub_80ED888

* sub_80ED8B4

* UpdateMassOutbreakTimeLeft

* sub_80ED950

* PutFishingAdviceShowOnTheAir

* through sub_80EDA80

* ewram and common syms are now fetched from the object files

* BSS symbols are taken from the tv.o file

* through sub_80EDC60

* sub_80EDCE8

* sub_80EDD78

* through sub_80EDE84

* nomatching sub_80EDE98

* sub_80EDFB4

* sub_80EE104

* sub_80EE104

* sub_80EE184

* sub_80EE2CC

* sub_80EE35C

* sub_80EE44C

* sub_80EE4DC

* sub_80EE5A4

* sub_80EE69C

* sub_80EE72C

* sub_80EE7C0

* sub_80EE818

* sub_80EE8C8

* sub_80EEA70

* sub_80EEB98

* sub_80EEBF4

* through sub_80EED60

* Functions relating to Pokemon News

* sub_80EEF6C

* GetPriceReduction

* IsPriceDiscounted

* sub_80EF120

* through sub_80EF370

* sub_80EF40C

* HasMixableShowAlreadyBeenSpawnedWithPlayerID

* TV_SortPurchasesByQuantity

* FindActiveBroadcastByShowType_SetScriptResult

* InterviewBefore

* through sub_80EF88C

* through sub_80EF93C

* through sub_80EFA24

* through TV_BernoulliTrial

* sub_80EFB58

* sub_80EFBA4

* sub_80EFBDC

* through sub_80EFD98

* ChangePokemonNickname

* ChangeBoxPokemonNickname

* sub_80EFF9C

* through player_id_to_dword

* CheckForBigMovieOrEmergencyNewsOnTV

* GetMomOrDadStringForTVMessage

* sub_80F01E8

* sub_80F0358

* sub_80F049C

* TV record mixing functions

* sub_80F06D0

* sub_80F0708 nonmatching

* through sub_80F0B24

* sub_80F0B64

* through sub_80F0C04

* sub_80F0C7C

* sub_80F0D60

* sub_80F0E58

* sub_80F0E84

* through sub_80F0F24

* sub_80F0F64

* sub_80F1208

* sub_80F1254

* sub_80F1290

* sub_80F12A4

* sub_80F14F8

* DoTVShowTodaysSmartShopper

* DoTVShowTheNameRaterShow

* DoTVShowPokemonTodaySuccessfulCapture

* DoTVShowPokemonTodayFailedCapture

* DoTVShowPokemonFanClubLetter

* DoTVShowRecentHappenings

* DoTVShowPokemonFanClubOpinions

* DoTVShowPokemonNewsMassOutbreak

* DoTVShowPokemonContestLiveUpdates

* DoTVShowPokemonBattleUpdate

* DoTVShow3CheersForPokeblocks

* DoTVShowInSearchOfTrainers

* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc

* DoTVShowPokemonAngler

* DoTVShowTheWorldOfMasters; update RAM symbols and field names

* Decorate static functions

* DoTVShowTodaysRivalTrainer; region map enums

* TVDewfordTrendWatcherNetworkTextGroup

* DoTVShowHoennTreasureInvestigators

* DoTVShowFindThatGamer

* DoTVShowBreakingNewsTV

* DoTVShowSecretBaseVisit

* DoTVShowPokemonLotterWinnerFlashReport

* DoTVShowThePokemonBattleSeminar

* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub

* DoTVShowSpotTheCuties

* DoTVShowPokemonNewsBattleFrontier

* DoTVShowWhatsNo1InHoennToday

* Helpers for DoTVShowSecretBaseSecrets

* DoTVShowSecretBaseSecrets

* DoTVShowSafariFanClub

* Finish decompilation of tv.s

* Some renaming

* Rename text group pointers

* revoke statis; pokenews enums

* Labels are number one

* Label all TV struct fields

* Make data/text/tv.inc more readable

* Split data/text/tv.inc

* Rename pokenews text pointers

* Frontier Symbol constants; indicate static rodata objects with 's' prefix

* Fix leading spaces/tabs

F*** CLion sometimes

* Fix inconsequential warning
2017-10-13 10:09:36 -05:00
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02:00
PikalaxALT
3c4478b370 Decompile data 2017-10-13 00:11:55 -04:00
PikalaxALT
8d31a46c6f sub_8121478 2017-10-12 15:59:43 -04:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +02:00
DizzyEggg
57e5624e06 battle9 is being worked on 2017-10-10 18:01:45 +02:00
DizzyEggg
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
DizzyEggg
eb59f15799 mergin and chill 2017-10-09 21:40:05 +02:00
Diegoisawesome
41db025975 Merge remote-tracking branch 'pret/master' into baserom_extraction 2017-10-09 13:32:26 -05:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -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
ProjectRevoTPP
a9d94cc5d6 decompile save_location.c 2017-10-08 22:21:34 -04:00
DizzyEggg
95e4ae06ce battle message decompiled and dumped 2017-10-08 14:54:51 +02:00
ProjectRevoTPP
f0775000a1 decompile diploma.c 2017-10-07 22:54:32 -04:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -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
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
ProjectRevoTPP
e7175999f5 decompile braille_puzzles.c 2017-10-05 13:02:39 -04:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02: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
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04:00
Diegoisawesome
d32ec8bf72 Merge pull request #59 from PikalaxALT/sym_bss
BSS; decompile tileset_anims
2017-10-03 01:26:01 -05:00
PikalaxALT
2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT
df0b715207 Decompile data/tileset.s 2017-10-02 21:08:54 -04:00
PikalaxALT
3ec4d98de9 Split palette and tileset_anims 2017-10-01 22:10:53 -04:00
Diegoisawesome
ba758afc14 Extract baseroms from and combine fldeff_emotion and trainer_see
Also extract from bike
2017-10-01 14:48:29 -05:00
PikalaxALT
20ed9ad0ac Decompile asm/tileset.s into src/palette.c 2017-09-30 21:19:29 -04:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
Diegoisawesome
13017a3b19 Merge pull request #55 from DizzyEggg/decompile_metatile_behavior
decompile metatile behavior
2017-09-30 03:11:36 -05:00
Diegoisawesome
2a8ea4981e Merge pull request #54 from DizzyEggg/finish_pokemon2
finish pokemon 2 file
2017-09-30 03:04:15 -05:00
Diegoisawesome
f30b9eed2c Merge pull request #53 from DizzyEggg/decomp_save
finish save.c
2017-09-30 03:02:07 -05:00
Diegoisawesome
741c99cded Merge pull request #45 from DizzyEggg/decomp_battle4
Decompile Battle 4
2017-09-30 03:00:10 -05:00
Diegoisawesome
52a66f0d4c Merge pull request #50 from DizzyEggg/decomp_roamer
decompile roamer
2017-09-30 02:31:43 -05:00
DizzyEggg
2766bd78df split the second file 2017-09-30 09:22:59 +02:00