Commit Graph

691 Commits

Author SHA1 Message Date
yenatch 343bf63601 Fix fldeff_softboiled warnings 2017-07-06 22:10:33 -04:00
yenatch 06bf25405c Merge remote-tracking branch 'origin/master' into merge-pika
Conflicts:
	include/use_pokeblock.h
2017-07-05 21:37:14 -04:00
yenatch 1eacd4ee74 Merge pull request #351 from Touched/decompile/rotating_gate
Decompile rotating_gate.s
2017-07-05 21:31:11 -04:00
yenatch 550333dd91 Merge pull request #349 from PikalaxALT/pokeblock
Pokeblock
2017-07-05 19:39:43 -04:00
yenatch eb778cac30 Merge pull request #348 from marijnvdwerf/clean/file-modes
Make files non-executable
2017-07-05 18:45:38 -04:00
yenatch 792a2c6976 Merge pull request #347 from PikalaxALT/field_tasks
Field tasks
2017-07-05 18:16:22 -04:00
yenatch 3b3eb45b91 Merge pull request #346 from ProjectRevoTPP/sound_check_menu
Sound check menu
2017-07-05 18:11:34 -04:00
yenatch 124e2eb02c Merge branch 'master' into master 2017-07-05 17:48:21 -04:00
yenatch 123d5cc8b2 Fix tab-aligned comments 2017-07-05 17:43:37 -04:00
yenatch 40347c124d Fix STATUS2_FOCUS_ENERGRY 2017-07-05 17:41:44 -04:00
yenatch 813c1846c9 Merge pull request #344 from camthesaxman/decompile_battle_10
decompile battle_10
2017-07-04 21:06:42 -04:00
yenatch d8bfc0998d Restore double brackets in evolution data and flat indent 2017-07-03 22:30:16 -04:00
yenatch 39322db640 Use 0b for tm/hm learnsets 2017-07-03 22:17:33 -04:00
ProjectRevoTPP 2bedaf3824 oops 2017-07-01 22:03:40 -04:00
ProjectRevoTPP 3725149f03 formatting 2017-07-01 21:16:28 -04:00
ProjectRevoTPP 87dc53438e text defines 2017-07-01 21:15:03 -04:00
ProjectRevoTPP 22da2dfafc finish decompiling sound_check_menu.c except for sub_80BAE78 2017-06-30 15:39:17 -04:00
Touched c2daf4f6c9 Rename rotating gate exported functions 2017-06-30 21:34:15 +02:00
PikalaxALT 5adf807274 Merge remote-tracking branch 'origin/master' into use_pokeblock 2017-06-29 23:09:31 -04:00
PikalaxALT fe40c60536 sub_8136F74 2017-06-29 22:06:27 -04:00
PikalaxALT eb9df8bc66 sub_8136EF0 2017-06-29 21:48:53 -04:00
PikalaxALT 1bb72454b4 sub_8136E40 2017-06-29 21:39:25 -04:00
PikalaxALT eefb510a3c Nonmatching sub_8136DC0 2017-06-29 21:19:45 -04:00
scnorton a62fbd6ec1 Merge branch 'master' into pokeblock 2017-06-29 17:17:35 -04:00
scnorton a9b4133924 Merge branch 'master' into pokemon_data 2017-06-29 15:13:49 -04:00
PikalaxALT 062f0b5bd9 sub_8136C6C 2017-06-29 08:34:48 -04:00
PikalaxALT 66f219dba7 through sub_8136C40 2017-06-28 21:53:45 -04:00
scnorton 5c8320f9e1 sub_81369CC 2017-06-28 21:40:36 -04:00
yenatch 8d82578d3a Merge pull request #338 from PikalaxALT/field_specials
Field specials
2017-06-28 18:47:35 -04:00
scnorton c44f9abfbb sub_8136808 2017-06-28 18:29:30 -04:00
scnorton 7caa3fd85b sub_8136638 2017-06-28 18:20:16 -04:00
scnorton 7bb9c048b7 Matching sub_8136294 2017-06-28 17:53:44 -04:00
scnorton 26a48d7e92 Merge branch 'master' into use_pokeblock 2017-06-28 17:37:17 -04:00
scnorton 496fd707b7 Remove excess declarations of gScriptItemId 2017-06-28 14:45:38 -04:00
scnorton a7a374266f Move static function declarations to top of c file, and exported declarations to appropriate headers 2017-06-28 14:37:06 -04:00
scnorton 180a1aba16 Finish decompilation of pokeblock.s 2017-06-28 12:33:11 -04:00
scnorton 0197921d32 through sub_810C788 2017-06-28 11:33:39 -04:00
scnorton f01cdd2a38 sub_810C368 2017-06-28 10:31:51 -04:00
ProjectRevoTPP d5e220ebbe decompile up to sub_80BAE10 2017-06-27 22:56:08 -04:00
PikalaxALT 5f3b6f124f through sub_810BD08 2017-06-27 21:27:07 -04:00
PikalaxALT b61b1fd911 through sub_810BB88 2017-06-27 21:08:41 -04:00
PikalaxALT 25355e8530 sub_810B998 and ALL the data 2017-06-27 20:17:39 -04:00
PikalaxALT fc5d035bda sub_810B6C0 2017-06-27 19:25:30 -04:00
scnorton 0e92e2f50e Spinda spots to binary files pending utility to convert to/from png 2017-06-27 16:35:16 -04:00
scnorton 1fd22171ac Split pokemon_data.c into headers for each data subtype 2017-06-27 15:28:21 -04:00
scnorton 00c7dee919 Merge branch 'master' into pokemon_data 2017-06-27 15:01:18 -04:00
Marijn van der Werf 7d2166b97f Make files non-executable 2017-06-27 16:11:15 +02:00
scnorton 08c23fb1c4 Merge branch 'master' into field_tasks 2017-06-27 09:48:16 -04:00
scnorton 41cc0382a4 Finish decompiling field_tasks.s 2017-06-27 09:43:57 -04:00
PikalaxALT 57a6a5e656 PerStepCallback_8069F64 2017-06-26 22:26:02 -04:00