Commit Graph

610 Commits

Author SHA1 Message Date
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
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 fa2d7e0684 Merge pull request #343 from camthesaxman/fix_global_h
fix formatting of global.h
2017-06-25 00:42:14 -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 e72babd734 Merge pull request #341 from camthesaxman/decompile_battle_anim_8137220
decompile battle_anim_8137220
2017-06-25 00:08:40 -04:00
yenatch 98a170597f Merge pull request #336 from camthesaxman/decompile_battle_6
decompile battle_6
2017-06-25 00:04:39 -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 aa505443c8 wip src 2017-06-24 20:56:28 +02:00
Marijn van der Werf a7bc5ccde7 Make sBlockRequestLookupTable public 2017-06-24 19:46:58 +02:00
Marijn van der Werf f7528a440d wip src 2017-06-24 18:24:08 +02:00
Marijn van der Werf ec3fe21936 first src changes 2017-06-24 18:24:08 +02:00
camthesaxman 654209b1f6 fix formatting of global.h 2017-06-23 11:47:54 -05:00
camthesaxman 9b3a34eb3c finish decompiling battle_anim_8137220 2017-06-23 01:08:28 -05:00
camthesaxman 2e77bc6d5e decompile unref_sub_8137220 - unref_sub_81379E4 2017-06-22 19:16:53 -05:00
Marijn van der Werf c14b7b8d91 Move text data 2017-06-22 23:03:41 +02:00
Marijn van der Werf 0086f6e37a Add formatting rules 2017-06-22 23:03:41 +02:00
camthesaxman 56235a29d4 finish decompiling battle_6 2017-06-22 13:52:30 -05:00
camthesaxman 7bdcf7cd6d decompile sub_802F934 - PlayerHandlePrintStringPlayerOnly 2017-06-21 01:10:15 -05:00
camthesaxman 6046f214e3 decompile sub_8030A3C - PlayerHandleLinkStandbyMsg 2017-06-20 19:20:11 -05:00
camthesaxman e072ddd6fb move data to C and introduce CompressedSpriteSheet and CompressedSpritePalette 2017-06-20 15:13:44 +02:00
camthesaxman 1fafe80241 finish decompiling pokedex.s 2017-06-20 15:11:59 +02:00
camthesaxman 5041f91c4b decompile sub_8046FBC - sub_80470C4 2017-06-20 15:06:46 +02:00
camthesaxman 829371c3e0 decompile sub_8046400 - sub_8046E9C 2017-06-20 15:06:18 +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
yenatch 2c4dc714db Merge pull request #327 from camthesaxman/trig_data
convert trig data to C
2017-06-19 20:56:40 -04:00
PikalaxALT 2964f3839e Fix building from a clean repository 2017-06-18 13:32:04 -04:00
PikalaxALT 5d04fe94d9 Merge remote-tracking branch 'origin/master' into field_map_obj_data 2017-06-18 13:01:55 -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
PikalaxALT 69d04fec91 Adjust include hierarchy 2017-06-18 11:54:36 -04:00
camthesaxman 87bd7f4484 add functions to header 2017-06-17 22:55:11 -05:00
camthesaxman 14b1a94d72 finish decompiling choose_party 2017-06-17 21:38:01 -05:00
PikalaxALT a5ec66b985 Split field map object data into headers, using the original delineation as a guide 2017-06-17 21:01:53 -04:00
camthesaxman 82ddae9db4 fix merge conflicts 2017-06-17 19:46:25 -05:00
PikalaxALT 33520725b8 Decompile all data in data/graphics/field_objects/*.inc 2017-06-17 17:09:48 -04:00
PikalaxALT 15298927a8 Decompile map object data (nonmatching wip 1) 2017-06-17 10:51:16 -04:00
yenatch 8b97aa2804 Merge remote-tracking branch 'marijn/clean/headers' 2017-06-16 23:59:58 -04:00
camthesaxman 0de38858f6 decompile sub_8121E10 - sub_8122838 2017-06-16 17:46:13 -05:00
ProjectRevoTPP 0a779312c8 Merge branch 'master' of https://github.com/pret/pokeruby 2017-06-15 22:08:57 -04:00
camthesaxman 3344d86d90 move trig data to C 2017-06-15 19:37:42 -05:00
camthesaxman 9fbdcdbc70 use static and fix a few nonmatching functions 2017-06-15 18:42:10 -05:00
camthesaxman 376e4f1384 finish later 2017-06-15 15:50:43 -05:00
ProjectRevoTPP 33bda740ea field_effect.c merge 2017-06-15 03:36:53 -04:00
ProjectRevoTPP 8435b8835a move player_pc data to C file and do a lot of labeling 2017-06-15 03:34:11 -04:00
camthesaxman c8f941f5e3 make it build again 2017-06-15 01:41:20 -05:00