2249 Commits

Author SHA1 Message Date
camthesaxman
6546ff5d0a fix merge conflicts 2017-07-16 13:53:55 -05:00
yenatch
e50b9e28bc Merge pull request #354 from camthesaxman/decompile_item_menu
decompile item_menu
2017-07-16 13:33:38 -04:00
camthesaxman
078e07ce10 move RAM variables into item_menu.c 2017-07-11 18:20:21 -05:00
camthesaxman
cb6e1059e6 do some labeling 2017-07-10 23:33:46 -05:00
camthesaxman
24ac9f1767 finish decompiling item_menu 2017-07-10 18:14:18 -05:00
camthesaxman
c8bcd2e54f decompile sub_80A6D98 - sub_80A79B4 2017-07-10 15:34:42 -05:00
camthesaxman
5c2c970d01 decompile sub_80A6354 - sub_80A6D1C 2017-07-09 22:59:49 -05:00
camthesaxman
968f050850 decompile sub_80A5BF8 - sub_80A631C 2017-07-09 19:09:10 -05:00
camthesaxman
283cdb4945 delete test.txt 2017-07-09 16:30:26 -05:00
camthesaxman
bb096eb136 decompile sub_80A52C4 - sub_80A5B78 2017-07-09 16:30:01 -05:00
camthesaxman
86487b528a decompile sub_80A50C8 2017-07-09 11:12:07 -05:00
camthesaxman
df1eb2b49e completely get rid of TextStruct 2017-07-09 01:09:26 -05:00
camthesaxman
3130e928b5 whitespace 2017-07-09 00:41:46 -05:00
camthesaxman
55db40b330 decompile ItemListMenu_ChangeDescription - sub_80A4F74 2017-07-09 00:40:28 -05:00
camthesaxman
4a9e027728 get rid of TextStruct 2017-07-08 22:01:23 -05:00
camthesaxman
42aaa52c94 decompile sub_80A46FC - ItemListMenu_InitDescription 2017-07-08 21:59:22 -05:00
camthesaxman
fb441feac3 can't get sub_80A4548 to match 2017-07-08 20:10:39 -05:00
camthesaxman
e41832e3c7 decompile RemoveEmptyItemSlots - sub_80A444C 2017-07-08 18:06:19 -05:00
camthesaxman
9a57e78557 decompile sub_80A3740 - swap32 2017-07-08 12:16:19 -05:00
yenatch
a0e590b739 Merge pull request #352 from JaceCearK1/master
Fix German Sapphire's Default Nr.1 Player Names
2017-07-08 12:46:08 -04:00
camthesaxman
196f2a1c24 fix build 2017-07-07 19:21:47 -05:00
camthesaxman
ee0d3f82b5 option_menu.c data 2017-07-07 19:13:45 -05:00
camthesaxman
297d757a8e berry_tag_screen.c data 2017-07-07 19:10:00 -05:00
camthesaxman
6c7d05587a item data 2017-07-07 19:02:30 -05:00
camthesaxman
cd37b81fee util.c formatting 2017-07-07 17:24:18 -05:00
camthesaxman
bc14a02ef3 util.c data 2017-07-07 17:19:08 -05:00
camthesaxman
e9908459ed task.c data 2017-07-07 17:06:07 -05:00
yenatch
bd4a6520ea Merge pull request #355 from yenatch/fix-warnings
Fix uncaught cpp warnings
2017-07-06 22:25:16 -04:00
yenatch
8f1190efd6 Error on tool warnings 2017-07-06 22:20:50 -04:00
yenatch
3e6d1757d0 Fix gbagfx warning 2017-07-06 22:12:34 -04:00
yenatch
5db79b8ff4 Error on cpp warnings 2017-07-06 22:12:16 -04:00
yenatch
a661bbf4ea Fix battle_anim_80A7E7C warnings
Use TASK from task.h
2017-07-06 22:11:33 -04:00
yenatch
343bf63601 Fix fldeff_softboiled warnings 2017-07-06 22:10:33 -04:00
camthesaxman
4aa1b44315 fix merge conflicts 2017-07-06 19:28:57 -05:00
camthesaxman
ad7a7222a5 decompile sub_80A34B4 - ClearBag 2017-07-06 19:25:06 -05:00
camthesaxman
42562fd8df decompile sub_80A3118 - sub_80A317C 2017-07-06 18:10:03 -05:00
yenatch
e39f55f550 Merge pull request #350 from PikalaxALT/use_pokeblock
Use pokeblock
2017-07-05 21:50:45 -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
be05c5bd52 Merge pull request #353 from yenatch/travis-allow-fail-formatting
travis: allow formatting job to fail instead of falsely reporting passed
2017-07-05 21:33:22 -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
5a93497093 Merge pull request #340 from DizzyEggg/master
Battle header and moar labels
2017-07-05 18:01:17 -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
d5f7232c1d travis: allow formatting job to fail instead of falsely reporting passed 2017-07-04 20:55:59 -04:00