Commit Graph

16 Commits

Author SHA1 Message Date
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +02:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Marcus Huderle
b24559d69b Merge remote-tracking branch 'upstream/master' into shop
# Conflicts:
#	asm/shop.s
2018-10-13 10:22:58 -05:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
Marcus Huderle
fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Slawter666
9350ac0a74 Move battle_pyramid_bag data to C 2018-09-06 01:24:11 +01:00
Slawter666
6106154801 Format WindowTemplate in battle_pyramid_bag.c 2018-09-02 16:26:23 +01:00
DizzyEggg
96f2b995dc Pyramid bag review changes 2018-08-30 21:28:03 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +02:00
DizzyEggg
ddd4733de3 rename battle pyramid to battle pyramid bag 2018-08-26 17:54:58 +02:00