Commit Graph

695 Commits

Author SHA1 Message Date
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 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
scnorton fce70e6bd5 Another batch of functions; last of the field specials data 2017-06-21 11:25:27 -04:00
PikalaxALT dac14d217d Up through sub_810F424 2017-06-20 22:57:58 -04:00
PikalaxALT f5e71601ec Blow through the glass workshop functions 2017-06-20 22:14:36 -04:00
scnorton c8993068c9 Some elevator menu related functions 2017-06-20 13:41:30 -04:00
scnorton 9e5917e656 Petalburg Gym field specials 2017-06-20 09:47:54 -04:00
camthesaxman e072ddd6fb move data to C and introduce CompressedSpriteSheet and CompressedSpritePalette 2017-06-20 15:13:44 +02:00
camthesaxman a97a040dc1 merge upstream 2017-06-19 23:39:22 -05:00
DizzyEggg 102f5b1e15 Battle labels named (#333)
* Changed battle labels
2017-06-19 23:46:48 -04:00
PikalaxALT 6a0734b626 MauvilleGymSpecial1 2017-06-19 22:32:58 -04:00
PikalaxALT 9e681335d6 SpawnBerryBlenderLinkPlayerSprites 2017-06-19 22:17:50 -04:00
yenatch 2c4dc714db Merge pull request #327 from camthesaxman/trig_data
convert trig data to C
2017-06-19 20:56:40 -04:00
PikalaxALT 02af81bc95 Decompile field map object special anim subroutine pointer tables 2017-06-18 12:55:34 -04:00
PikalaxALT c25bcbe315 Disassemble last of the data that isn't pointer tables in field_map_obj 2017-06-18 12:33:29 -04:00
PikalaxALT 1f9329ac27 Decompile odd-length arrays and metatile behavior pointer tables 2017-06-18 12:25:20 -04:00
PikalaxALT c57d632a6a Field map object callback pointers 2017-06-18 12:15:12 -04:00
camthesaxman 420d4b3864 integrate data 2017-06-17 22:33:09 -05:00
PikalaxALT ed2ee1ca58 Decompile two s16[4]s 2017-06-17 22:28:54 -04:00