Commit Graph

4144 Commits

Author SHA1 Message Date
DizzyEggg
27bafdc04d Begin pokemon expansion 2019-04-02 21:22:16 +02:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
Phlosioneer
c429e6d69c Move gPlayerFacingPosition out of sym_ewram.txt (#617)
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
2019-04-01 19:30:41 -05:00
Phlosioneer
fe1c14db76 Fix warning for extra parens (#646)
* Fix warning for extra parens

* Committed too many files
2019-04-01 19:27:55 -05:00
huderlem
4d938cb622
Merge pull request #642 from PikalaxALT/union_room_player_avatar
Union Room event objects
2019-04-01 17:54:30 -05:00
PikalaxALT
08f4d3e105 Rename these objects to union_room_battle 2019-04-01 14:41:37 -04:00
PikalaxALT
18fdb4e369 union_room_player_avatar sym_ewram 2019-04-01 14:29:03 -04:00
PikalaxALT
4ea8217f81 file split 2019-04-01 14:25:58 -04:00
PikalaxALT
9f1d1219ce create header and fix prototypes 2019-04-01 14:20:34 -04:00
PikalaxALT
ce89cf6f75 through sub_801A3D0 2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data
Contest data
2019-04-01 07:37:15 -05:00
huderlem
bee1d1cbb0
Merge pull request #611 from Phlosioneer/pokedex-area-const-array
Document sAreaGlowTilemapMapping
2019-04-01 07:33:33 -05:00
huderlem
b34961792c
Merge pull request #641 from PikalaxALT/mystery_gift
Mystery gift documentation
2019-04-01 07:32:43 -05:00
Phlosioneer
cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer
3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
Phlosioneer
b7057e8d92 Update OAMs to use new constants 2019-03-31 20:33:25 -04:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer
23ac2cc94e Prep for merge 2019-03-31 20:15:44 -04:00
Phlosioneer
207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
PikalaxALT
6d70b8adb1 Merge branch 'master' into mystery_gift 2019-03-31 18:57:50 -04:00
PikalaxALT
93c4e35d84 infer additional file split after task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
0a8427c8ef fakematching task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
90fb329b70 through task_add_00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
fb5c19a33b through mevent_message 2019-03-31 15:43:51 -05:00
PikalaxALT
813de11154 Through mevent_save_game 2019-03-31 15:43:51 -05:00
PikalaxALT
f88f815cff WIP sub_8018DAC 2019-03-31 15:43:51 -05:00
PikalaxALT
608a217240 sub_8018B08 2019-03-31 15:43:51 -05:00
PikalaxALT
82a3f29b88 through sub_8018A50 2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454 through sub_8018798 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
PikalaxALT
5a0142da08 infer additional file split after task00_mystery_gift 2019-03-31 15:53:38 -04:00
PikalaxALT
4f12f0ae28 fakematching task00_mystery_gift 2019-03-31 15:50:25 -04:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
PikalaxALT
5b361db6b3 through task_add_00_mystery_gift 2019-03-31 12:55:27 -04:00
PikalaxALT
8799a1c791 through mevent_message 2019-03-31 12:36:48 -04:00
PikalaxALT
148c417c50 Through mevent_save_game 2019-03-31 12:27:36 -04:00
PikalaxALT
c9f16cb1a8 WIP sub_8018DAC 2019-03-31 11:16:19 -04:00
PikalaxALT
db4e9505ad Merge branch 'master' into mystery_gift 2019-03-31 10:39:11 -04:00
PikalaxALT
0ba4d0cadc sub_8018B08 2019-03-31 10:33:27 -04:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt
Use Pokeblock clean-up and some menu_specialised decomp
2019-03-31 08:39:18 -05:00
huderlem
9259ea4c4e
Merge pull request #634 from PikalaxALT/continue_union_room
Continue union room
2019-03-31 08:33:16 -05:00
DizzyEggg
e3c07c83f2 More work on use pokeblock 2019-03-31 14:32:26 +02:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
PikalaxALT
1ce07deeac through sub_8018A50 2019-03-30 20:04:30 -04:00
PikalaxALT
5bf7886a70 through sub_8018798 2019-03-30 14:36:52 -04:00
PikalaxALT
ed53220be2 Start decompiling mystery gift 2019-03-30 13:15:48 -04:00