Commit Graph

633 Commits

Author SHA1 Message Date
scnorton
a62fbd6ec1 Merge branch 'master' into pokeblock 2017-06-29 17:17:35 -04:00
yenatch
8d82578d3a Merge pull request #338 from PikalaxALT/field_specials
Field specials
2017-06-28 18:47:35 -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
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
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
scnorton
99f9d40be1 Merge remote-tracking branch 'origin/master' into field_specials 2017-06-21 12:43:59 -04:00
scnorton
294cbd8beb Ensure building from tidy wd 2017-06-21 12:38:31 -04:00
scnorton
d008cc7d60 Up through sub_810FAA0 2017-06-21 10:18:04 -04:00
scnorton
6343bdcf31 Fix conflicting type declaration 2017-06-21 09:56:37 -04:00
scnorton
4a1f57f17a Through sub_810F96C 2017-06-21 09:55:06 -04:00
PikalaxALT
5463563b32 Ensure include/battle_tower.h sync 2017-06-21 09:24:37 -04:00
PikalaxALT
9722c4b632 IsStarterInParty 2017-06-21 08:45:37 -04:00
camthesaxman
7bdcf7cd6d decompile sub_802F934 - PlayerHandlePrintStringPlayerOnly 2017-06-21 01:10:15 -05:00
PikalaxALT
ea76336a11 Effort Ribbon: Well, you tried. 2017-06-20 23:08:52 -04:00
PikalaxALT
dac14d217d Up through sub_810F424 2017-06-20 22:57:58 -04:00
PikalaxALT
70300abee8 camera dummy 2017-06-20 22:19:40 -04:00
camthesaxman
6046f214e3 decompile sub_8030A3C - PlayerHandleLinkStandbyMsg 2017-06-20 19:20:11 -05:00
scnorton
27ce872133 Elevator menu main task 2017-06-20 14:14:54 -04:00
scnorton
c8993068c9 Some elevator menu related functions 2017-06-20 13:41:30 -04:00
scnorton
3e5267b6a1 SetDepartmentStoreFloorVar 2017-06-20 12:44:26 -04:00
scnorton
36b2378f15 PCTurnOnEffect 2017-06-20 11:45:16 -04:00
scnorton
5aeef90908 Another three small functions in field_specials.s 2017-06-20 09:58:05 -04:00
scnorton
6c419f362a Three more small functions in field_specials.s 2017-06-20 09:55:43 -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
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