dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

clean up aligns

Browse Source
This commit is contained in:
YamaArashi
2016-09-03 14:31:43 -07:00
parent 5af8ba570c
commit f5879e72d9
108 changed files with 7867 additions and 15733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/graphics/field_objects/berry_tree_graphics_tables.s
+63 -126
View File
@@ -1,5 +1,4 @@
.align 2, 0
.align 2
gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -11,13 +10,11 @@ gFieldObjectPicTable_PechaBerryTree:: @ 850BE48
obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pecha:: @ 850BE90
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -29,13 +26,11 @@ gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98
obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -47,13 +42,11 @@ gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8
obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Wepear:: @ 850BF30
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -65,13 +58,11 @@ gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38
obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -83,13 +74,11 @@ gFieldObjectPicTable_CheriBerryTree:: @ 850BF88
obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -101,13 +90,11 @@ gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8
obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100
obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Figy:: @ 850C020
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -119,13 +106,11 @@ gFieldObjectPicTable_MagoBerryTree:: @ 850C028
obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Mago:: @ 850C070
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -137,13 +122,11 @@ gFieldObjectPicTable_LumBerryTree:: @ 850C078
obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Lum:: @ 850C0C0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -155,13 +138,11 @@ gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8
obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Razz:: @ 850C110
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -173,13 +154,11 @@ gFieldObjectPicTable_GrepaBerryTree:: @ 850C118
obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Grepa:: @ 850C160
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -191,13 +170,11 @@ gFieldObjectPicTable_RabutaBerryTree:: @ 850C168
obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -209,13 +186,11 @@ gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8
obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100
obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Nomel:: @ 850C200
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -227,13 +202,11 @@ gFieldObjectPicTable_LeppaBerryTree:: @ 850C208
obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Leppa:: @ 850C250
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -245,13 +218,11 @@ gFieldObjectPicTable_LiechiBerryTree:: @ 850C258
obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -263,13 +234,11 @@ gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8
obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100
obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0
berry_tree_palette_slot_table 5
.align 2, 0
.align 2
gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -281,13 +250,11 @@ gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8
obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Aguav:: @ 850C340
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -299,13 +266,11 @@ gFieldObjectPicTable_WikiBerryTree:: @ 850C348
obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100
obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Wiki:: @ 850C390
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -317,13 +282,11 @@ gFieldObjectPicTable_PomegBerryTree:: @ 850C398
obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -335,13 +298,11 @@ gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8
obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100
obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Rawst:: @ 850C430
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -353,13 +314,11 @@ gFieldObjectPicTable_SpelonBerryTree:: @ 850C438
obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Spelon:: @ 850C480
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -371,13 +330,11 @@ gFieldObjectPicTable_ChestoBerryTree:: @ 850C488
obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -389,13 +346,11 @@ gFieldObjectPicTable_OranBerryTree:: @ 850C4D8
obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100
obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Oran:: @ 850C520
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -407,13 +362,11 @@ gFieldObjectPicTable_PersimBerryTree:: @ 850C528
obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Persim:: @ 850C570
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -425,13 +378,11 @@ gFieldObjectPicTable_SitrusBerryTree:: @ 850C578
obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100
obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -443,13 +394,11 @@ gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8
obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100
obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Aspear:: @ 850C610
berry_tree_palette_slot_table 3
.align 2, 0
.align 2
gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -461,13 +410,11 @@ gFieldObjectPicTable_PamtreBerryTree:: @ 850C618
obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100
obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Pamtre:: @ 850C660
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -479,13 +426,11 @@ gFieldObjectPicTable_CornnBerryTree:: @ 850C668
obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100
obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -497,13 +442,11 @@ gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8
obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100
obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Lansat:: @ 850C700
berry_tree_palette_slot_table 2
.align 2, 0
.align 2
gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -515,13 +458,11 @@ gFieldObjectPicTable_DurinBerryTree:: @ 850C708
obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100
obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Durin:: @ 850C750
berry_tree_palette_slot_table 4
.align 2, 0
.align 2
gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80
obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80
@@ -533,8 +474,7 @@ gFieldObjectPicTable_TamatoBerryTree:: @ 850C758
obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100
obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100
.align 2, 0
.align 2
gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0
berry_tree_palette_slot_table 2
@@ -551,8 +491,7 @@ gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.byte FIELD_OBJ_GFX_BERRY_TREE_LATE_STAGES
.align 2, 0
.align 2
gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CheriBerryTree @ Cheri
.4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto
@@ -598,8 +537,7 @@ gBerryTreePicTablePointers:: @ 850C7B0
.4byte gFieldObjectPicTable_CornnBerryTree @ Starf
.4byte gFieldObjectPicTable_DurinBerryTree @ Enigma
.align 2, 0
.align 2
gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cheri @ Cheri
.4byte gBerryTreePaletteSlotTable_Chesto @ Chesto
@@ -645,8 +583,7 @@ gBerryTreePaletteSlotTablePointers:: @ 850C85C
.4byte gBerryTreePaletteSlotTable_Cornn @ Starf
.4byte gBerryTreePaletteSlotTable_Durin @ Enigma
.align 2, 0
.align 2
gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri
.4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto