Commit Graph

712 Commits

Author SHA1 Message Date
yenatch 67ced1d77e Merge pull request #363 from drifloony/trader
decompile trader
2017-07-17 20:46:06 -04:00
yenatch c043463631 Merge pull request #362 from drifloony/menu_helpers
Decompile menu_helpers
2017-07-17 20:09:25 -04:00
yenatch d5c9a02e51 Merge pull request #357 from camthesaxman/integrate_data
define more data in C
2017-07-17 19:40:47 -04:00
yenatch a774610eaa Merge pull request #356 from camthesaxman/fix_various
formatting and nonmatching fixes
2017-07-17 19:28:36 -04:00
camthesaxman 6546ff5d0a fix merge conflicts 2017-07-16 13:53:55 -05:00
drifloony 1853efa954 move ROM variables into menu_helpers.c 2017-07-13 21:37:49 -07:00
drifloony 761140fd1b decompile trader 2017-07-13 00:36:26 -07: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 bb096eb136 decompile sub_80A52C4 - sub_80A5B78 2017-07-09 16:30:01 -05:00
camthesaxman 9a57e78557 decompile sub_80A3740 - swap32 2017-07-08 12:16:19 -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 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
camthesaxman f719abf104 fix merge conflicts 2017-07-07 16:54:14 -05:00
camthesaxman 2d60419159 delete data/diploma.s 2017-07-07 16:40:09 -05: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 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
ProjectRevoTPP 6607a00674 add data to C file 2017-06-30 18:59:17 -04:00
Touched c2daf4f6c9 Rename rotating gate exported functions 2017-06-30 21:34:15 +02:00
Touched 4ccd42ebf6 Decompile data/rotating_gate.s 2017-06-30 21:25:45 +02:00
PikalaxALT 5adf807274 Merge remote-tracking branch 'origin/master' into use_pokeblock 2017-06-29 23:09:31 -04:00
PikalaxALT eee02552ca Decompile use_pokeblock data 2017-06-29 22:32:23 -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
yenatch 8d82578d3a Merge pull request #338 from PikalaxALT/field_specials
Field specials
2017-06-28 18:47:35 -04:00
PikalaxALT 25355e8530 sub_810B998 and ALL the data 2017-06-27 20:17:39 -04:00
scnorton 00c7dee919 Merge branch 'master' into pokemon_data 2017-06-27 15:01:18 -04:00
scnorton 08c23fb1c4 Merge branch 'master' into field_tasks 2017-06-27 09:48:16 -04:00
PikalaxALT 0687a65dc9 Through sub_806A18C 2017-06-27 08:34:22 -04:00
ProjectRevoTPP d10bffc7d8 decompile up to sub_80BA800 2017-06-26 21:09:49 -04:00
PikalaxALT 10f7829592 sub_8069CB8 2017-06-26 20:42:50 -04:00
ProjectRevoTPP f85513f769 Merge branch 'master' of https://github.com/pret/pokeruby into sound_check_menu 2017-06-25 20:12:52 -04:00
ProjectRevoTPP 637774362f start decompiling sound_check_menu.c 2017-06-25 20:12:08 -04:00
yenatch 06b6cada0d Merge pull request #331 from PikalaxALT/field_map_obj_data
Field map obj data
2017-06-25 02:24:30 -04:00
yenatch 2cae14cf5a Merge remote-tracking branch 'origin/master' into de/integrate-data-includes
Conflicts:
	asm/battle_anim_8137220.s
	asm-de/battle_message.s
2017-06-25 00:26:50 -04:00
yenatch 45b4b7ed85 Merge pull request #329 from camthesaxman/decompile_choose_party
decompile choose_party
2017-06-25 00:02:59 -04:00
Marijn van der Werf 946623e9b5 Make gfx match 2017-06-24 02:54:45 +02:00
Marijn van der Werf f5dc0e4358 conditionally include other font 2017-06-24 02:31:59 +02:00
Marijn van der Werf e41566cddf Combine English and German data files 2017-06-23 21:52:37 +02:00
PikalaxALT d5db71923c up through sub_80695E0 2017-06-23 08:44:35 -04:00
PikalaxALT 9e14c471e6 Start decompiling field_tasks.s 2017-06-22 22:28:15 -04:00
scnorton 99f9d40be1 Merge remote-tracking branch 'origin/master' into field_specials 2017-06-21 12:43:59 -04:00