Merge branch 'master' into decomp_battle2

2017-10-04 11:18:50 +02:00
parent 46fe1f441f 09d5d81c9c
commit aaa191f0d8
297 changed files with 2056 additions and 2880 deletions
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -365,7 +365,19 @@ gUnknown_08D85600:: @ 8D85600
 	.incbin "baserom.gba", 0xd85600, 0x20

 gUnknown_08D85620:: @ 8D85620
-	.incbin "baserom.gba", 0xd85620, 0xa8
+	.incbin "baserom.gba", 0xd85620, 0x20
+
+gUnknown_08D85640:: @ 8D85640
+	.incbin "baserom.gba", 0xd85640, 0x20
+
+gUnknown_08D85660:: @ 8D85660
+	.incbin "baserom.gba", 0xd85660, 0x20
+
+gUnknown_08D85680:: @ 8D85680
+	.incbin "baserom.gba", 0xd85680, 0x20
+
+gUnknown_08D856A0:: @ 8D856A0
+	.incbin "baserom.gba", 0xd856a0, 0x28

 gUnknown_08D856C8:: @ 8D856C8
 	.incbin "baserom.gba", 0xd856c8, 0xe0
--- a/data/palette.s
+++ b/data/palette.s
@@ -1,18 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0852487C:: @ 852487C
-	.incbin "baserom.gba", 0x52487c, 0x10
-
-gDummyPaletteStructTemplate:: @ 852488C
-	.2byte 0xFFFF
-	.space 9
-	.byte 0x20
-	.space 4
-
-	.align 2
-gUnknown_0852489C:: @ 852489C
-	.incbin "baserom.gba", 0x52489c, 0x20
--- a/data/start_menu.s
+++ b/data/start_menu.s
@@ -26,4 +26,4 @@ gUnknown_085105AC:: @ 85105AC
 	.incbin "baserom.gba", 0x5105ac, 0x10

 gUnknown_085105BC:: @ 85105BC
-	.incbin "baserom.gba", 0x5105bc, 0x1a8
+	.incbin "baserom.gba", 0x5105bc, 0x8
--- a/data/tileset.s
+++ b/data/tileset.s
@@ -1,116 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_08510764:: @ 8510764
-	.incbin "baserom.gba", 0x510764, 0xb60
-
-gUnknown_085112C4:: @ 85112C4
-	.incbin "baserom.gba", 0x5112c4, 0x908
-
-gUnknown_08511BCC:: @ 8511BCC
-	.incbin "baserom.gba", 0x511bcc, 0x9a8
-
-gUnknown_08512574:: @ 8512574
-	.incbin "baserom.gba", 0x512574, 0x8e0
-
-gUnknown_08512E54:: @ 8512E54
-	.incbin "baserom.gba", 0x512e54, 0x320
-
-gUnknown_08513174:: @ 8513174
-	.incbin "baserom.gba", 0x513174, 0x510
-
-gUnknown_08513684:: @ 8513684
-	.incbin "baserom.gba", 0x513684, 0x210
-
-gUnknown_08513894:: @ 8513894
-	.incbin "baserom.gba", 0x513894, 0xb50
-
-gUnknown_085143E4:: @ 85143E4
-	.incbin "baserom.gba", 0x5143e4, 0x210
-
-gUnknown_085145F4:: @ 85145F4
-	.incbin "baserom.gba", 0x5145f4, 0x810
-
-gUnknown_08514E04:: @ 8514E04
-	.incbin "baserom.gba", 0x514e04, 0x540
-
-gUnknown_08515344:: @ 8515344
-	.incbin "baserom.gba", 0x515344, 0x20
-
-gUnknown_08515364:: @ 8515364
-	.incbin "baserom.gba", 0x515364, 0x20
-
-gUnknown_08515384:: @ 8515384
-	.incbin "baserom.gba", 0x515384, 0x30
-
-gUnknown_085153B4:: @ 85153B4
-	.incbin "baserom.gba", 0x5153b4, 0x30
-
-gUnknown_085153E4:: @ 85153E4
-	.incbin "baserom.gba", 0x5153e4, 0x10
-
-gUnknown_085153F4:: @ 85153F4
-	.incbin "baserom.gba", 0x5153f4, 0x410
-
-gUnknown_08515804:: @ 8515804
-	.incbin "baserom.gba", 0x515804, 0x20
-
-gUnknown_08515824:: @ 8515824
-	.incbin "baserom.gba", 0x515824, 0x140
-
-gUnknown_08515964:: @ 8515964
-	.incbin "baserom.gba", 0x515964, 0x428
-
-gUnknown_08515D8C:: @ 8515D8C
-	.incbin "baserom.gba", 0x515d8c, 0x430
-
-gUnknown_085161BC:: @ 85161BC
-	.incbin "baserom.gba", 0x5161bc, 0x20
-
-gUnknown_085161DC:: @ 85161DC
-	.incbin "baserom.gba", 0x5161dc, 0x320
-
-gUnknown_085164FC:: @ 85164FC
-	.incbin "baserom.gba", 0x5164fc, 0x310
-
-gUnknown_0851680C:: @ 851680C
-	.incbin "baserom.gba", 0x51680c, 0x310
-
-gUnknown_08516B1C:: @ 8516B1C
-	.incbin "baserom.gba", 0x516b1c, 0x210
-
-gUnknown_08516D2C:: @ 8516D2C
-	.incbin "baserom.gba", 0x516d2c, 0x110
-
-gUnknown_08516E3C:: @ 8516E3C
-	.incbin "baserom.gba", 0x516e3c, 0xc08
-
-gUnknown_08517A44:: @ 8517A44
-	.incbin "baserom.gba", 0x517a44, 0xc
-
-gUnknown_08517A50:: @ 8517A50
-	.incbin "baserom.gba", 0x517a50, 0x1ac
-
-gUnknown_08517BFC:: @ 8517BFC
-	.incbin "baserom.gba", 0x517bfc, 0x10
-
-gUnknown_08517C0C:: @ 8517C0C
-	.incbin "baserom.gba", 0x517c0c, 0x428
-
-gUnknown_08518034:: @ 8518034
-	.incbin "baserom.gba", 0x518034, 0x268
-
-gUnknown_0851829C:: @ 851829C
-	.incbin "baserom.gba", 0x51829c, 0x8028
-
-gUnknown_085202C4:: @ 85202C4
-	.incbin "baserom.gba", 0x5202c4, 0x45a0
-
-gUnknown_08524864:: @ 8524864
-	.incbin "baserom.gba", 0x524864, 0xc
-
-gUnknown_08524870:: @ 8524870
-	.incbin "baserom.gba", 0x524870, 0xc
--- a/data/tilesets/primary/building/anim/0.png
+++ b/data/tilesets/primary/building/anim/0.png
--- a/data/tilesets/primary/building/anim/1.png
+++ b/data/tilesets/primary/building/anim/1.png
--- a/data/tilesets/primary/general/anim/0/0.png
+++ b/data/tilesets/primary/general/anim/0/0.png
--- a/data/tilesets/primary/general/anim/0/1.png
+++ b/data/tilesets/primary/general/anim/0/1.png
--- a/data/tilesets/primary/general/anim/0/2.png
+++ b/data/tilesets/primary/general/anim/0/2.png
--- a/data/tilesets/primary/general/anim/1/0.png
+++ b/data/tilesets/primary/general/anim/1/0.png
--- a/data/tilesets/primary/general/anim/1/1.png
+++ b/data/tilesets/primary/general/anim/1/1.png
--- a/data/tilesets/primary/general/anim/1/2.png
+++ b/data/tilesets/primary/general/anim/1/2.png
--- a/data/tilesets/primary/general/anim/1/3.png
+++ b/data/tilesets/primary/general/anim/1/3.png
--- a/data/tilesets/primary/general/anim/1/4.png
+++ b/data/tilesets/primary/general/anim/1/4.png
--- a/data/tilesets/primary/general/anim/1/5.png
+++ b/data/tilesets/primary/general/anim/1/5.png
--- a/data/tilesets/primary/general/anim/1/6.png
+++ b/data/tilesets/primary/general/anim/1/6.png
--- a/data/tilesets/primary/general/anim/1/7.png
+++ b/data/tilesets/primary/general/anim/1/7.png
--- a/data/tilesets/primary/general/anim/2/0.png
+++ b/data/tilesets/primary/general/anim/2/0.png
--- a/data/tilesets/primary/general/anim/2/1.png
+++ b/data/tilesets/primary/general/anim/2/1.png
--- a/data/tilesets/primary/general/anim/2/2.png
+++ b/data/tilesets/primary/general/anim/2/2.png
--- a/data/tilesets/primary/general/anim/2/3.png
+++ b/data/tilesets/primary/general/anim/2/3.png
--- a/data/tilesets/primary/general/anim/2/4.png
+++ b/data/tilesets/primary/general/anim/2/4.png
--- a/data/tilesets/primary/general/anim/2/5.png
+++ b/data/tilesets/primary/general/anim/2/5.png
--- a/data/tilesets/primary/general/anim/2/6.png
+++ b/data/tilesets/primary/general/anim/2/6.png
--- a/data/tilesets/primary/general/anim/3/0.png
+++ b/data/tilesets/primary/general/anim/3/0.png
--- a/data/tilesets/primary/general/anim/3/1.png
+++ b/data/tilesets/primary/general/anim/3/1.png
--- a/data/tilesets/primary/general/anim/3/2.png
+++ b/data/tilesets/primary/general/anim/3/2.png
--- a/data/tilesets/primary/general/anim/3/3.png
+++ b/data/tilesets/primary/general/anim/3/3.png
--- a/data/tilesets/primary/general/anim/4/0.png
+++ b/data/tilesets/primary/general/anim/4/0.png
--- a/data/tilesets/primary/general/anim/4/1.png
+++ b/data/tilesets/primary/general/anim/4/1.png
--- a/data/tilesets/primary/general/anim/4/2.png
+++ b/data/tilesets/primary/general/anim/4/2.png
--- a/data/tilesets/primary/general/anim/4/3.png
+++ b/data/tilesets/primary/general/anim/4/3.png
--- a/data/tilesets/primary/general/tiles.png
+++ b/data/tilesets/primary/general/tiles.png
--- a/data/tilesets/primary/inside_building/tiles.png
+++ b/data/tilesets/primary/inside_building/tiles.png
--- a/data/tilesets/primary/secret_base/tiles.png
+++ b/data/tilesets/primary/secret_base/tiles.png
--- a/data/tilesets/primary/secret_base/unknown_tiles.png
+++ b/data/tilesets/primary/secret_base/unknown_tiles.png
--- a/data/tilesets/secondary/battle_arena/tiles.png
+++ b/data/tilesets/secondary/battle_arena/tiles.png
--- a/data/tilesets/secondary/battle_dome/tiles.png
+++ b/data/tilesets/secondary/battle_dome/tiles.png
--- a/data/tilesets/secondary/battle_factory/tiles.png
+++ b/data/tilesets/secondary/battle_factory/tiles.png
--- a/data/tilesets/secondary/battle_frontier/tiles.png
+++ b/data/tilesets/secondary/battle_frontier/tiles.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/0.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/1.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/2.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/anim/3.png
--- a/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_outside_east/tiles.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/0.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/1.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/2.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/anim/3.png
--- a/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_outside_west/tiles.png
--- a/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
+++ b/data/tilesets/secondary/battle_frontier_ranking_hall/tiles.png
--- a/data/tilesets/secondary/battle_palace/tiles.png
+++ b/data/tilesets/secondary/battle_palace/tiles.png
--- a/data/tilesets/secondary/battle_pike/tiles.png
+++ b/data/tilesets/secondary/battle_pike/tiles.png
--- a/data/tilesets/secondary/battle_pyramid/anim/0/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/0.png
--- a/data/tilesets/secondary/battle_pyramid/anim/0/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/1.png
--- a/data/tilesets/secondary/battle_pyramid/anim/0/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/0/2.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/0.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/0.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/1.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/1.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/2.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/2.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/3.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/3.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/4.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/4.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/5.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/5.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/6.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/6.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/7.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/7.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/8.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/8.png
--- a/data/tilesets/secondary/battle_pyramid/anim/1/9.png
+++ b/data/tilesets/secondary/battle_pyramid/anim/1/9.png
--- a/data/tilesets/secondary/battle_pyramid/tiles.png
+++ b/data/tilesets/secondary/battle_pyramid/tiles.png
--- a/data/tilesets/secondary/battle_tent/tiles.png
+++ b/data/tilesets/secondary/battle_tent/tiles.png
--- a/data/tilesets/secondary/bike_shop/anim/0.png
+++ b/data/tilesets/secondary/bike_shop/anim/0.png
--- a/data/tilesets/secondary/bike_shop/anim/1.png
+++ b/data/tilesets/secondary/bike_shop/anim/1.png
--- a/data/tilesets/secondary/bike_shop/anim/2.png
+++ b/data/tilesets/secondary/bike_shop/anim/2.png
--- a/data/tilesets/secondary/bike_shop/tiles.png
+++ b/data/tilesets/secondary/bike_shop/tiles.png
--- a/data/tilesets/secondary/brendans_mays_house/tiles.png
+++ b/data/tilesets/secondary/brendans_mays_house/tiles.png
--- a/data/tilesets/secondary/cable_club/tiles.png
+++ b/data/tilesets/secondary/cable_club/tiles.png
--- a/data/tilesets/secondary/cable_club/unknown_tiles.png
+++ b/data/tilesets/secondary/cable_club/unknown_tiles.png
--- a/data/tilesets/secondary/cave/anim/0.png
+++ b/data/tilesets/secondary/cave/anim/0.png
--- a/data/tilesets/secondary/cave/anim/1.png
+++ b/data/tilesets/secondary/cave/anim/1.png
--- a/data/tilesets/secondary/cave/anim/2.png
+++ b/data/tilesets/secondary/cave/anim/2.png
--- a/data/tilesets/secondary/cave/anim/3.png
+++ b/data/tilesets/secondary/cave/anim/3.png
--- a/data/tilesets/secondary/cave/anim/unused/0.png
+++ b/data/tilesets/secondary/cave/anim/unused/0.png
--- a/data/tilesets/secondary/cave/anim/unused/1.png
+++ b/data/tilesets/secondary/cave/anim/unused/1.png
--- a/data/tilesets/secondary/cave/anim/unused/2.png
+++ b/data/tilesets/secondary/cave/anim/unused/2.png
--- a/data/tilesets/secondary/cave/anim/unused/3.png
+++ b/data/tilesets/secondary/cave/anim/unused/3.png
--- a/data/tilesets/secondary/cave/tiles.png
+++ b/data/tilesets/secondary/cave/tiles.png
--- a/data/tilesets/secondary/contest/tiles.png
+++ b/data/tilesets/secondary/contest/tiles.png
--- a/data/tilesets/secondary/dewford/anim/0.png
+++ b/data/tilesets/secondary/dewford/anim/0.png
--- a/data/tilesets/secondary/dewford/anim/1.png
+++ b/data/tilesets/secondary/dewford/anim/1.png
--- a/data/tilesets/secondary/dewford/anim/2.png
+++ b/data/tilesets/secondary/dewford/anim/2.png
--- a/data/tilesets/secondary/dewford/anim/3.png
+++ b/data/tilesets/secondary/dewford/anim/3.png
--- a/data/tilesets/secondary/dewford/tiles.png
+++ b/data/tilesets/secondary/dewford/tiles.png
--- a/data/tilesets/secondary/dewford_gym/tiles.png
+++ b/data/tilesets/secondary/dewford_gym/tiles.png
--- a/data/tilesets/secondary/elite_four/anim/0/0.png
+++ b/data/tilesets/secondary/elite_four/anim/0/0.png
--- a/data/tilesets/secondary/elite_four/anim/0/1.png
+++ b/data/tilesets/secondary/elite_four/anim/0/1.png
--- a/data/tilesets/secondary/elite_four/anim/0/2.png
+++ b/data/tilesets/secondary/elite_four/anim/0/2.png
--- a/data/tilesets/secondary/elite_four/anim/0/3.png
+++ b/data/tilesets/secondary/elite_four/anim/0/3.png
--- a/data/tilesets/secondary/elite_four/anim/1/0.png
+++ b/data/tilesets/secondary/elite_four/anim/1/0.png
--- a/data/tilesets/secondary/elite_four/anim/1/1.png
+++ b/data/tilesets/secondary/elite_four/anim/1/1.png
--- a/data/tilesets/secondary/elite_four/anim/1/2.png
+++ b/data/tilesets/secondary/elite_four/anim/1/2.png
--- a/data/tilesets/secondary/elite_four/anim/1/3.png
+++ b/data/tilesets/secondary/elite_four/anim/1/3.png
--- a/data/tilesets/secondary/elite_four/anim/1/4.png
+++ b/data/tilesets/secondary/elite_four/anim/1/4.png
--- a/Show More
+++ b/Show More