dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Data alignment and organization

Browse Source
This commit is contained in:
PikalaxALT
2019-11-26 10:45:17 -05:00
parent b66e46513d
commit 13bcbd338c
1 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/berry_crush.s
+43 -10
View File
@@ -10,11 +10,22 @@ gUnknown_846E2E8:: @ 846E2E8
.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
gUnknown_846E2F0:: @ 846E2F0 gUnknown_846E2F0:: @ 846E2F0
.byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01, 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe .byte 0x04, 0x01, 0x00, 0xff
.byte 0x00, 0x00, 0x00, 0x04
.byte 0x02, 0x00, 0xff, 0x00
.byte 0x00, 0x00, 0x04, 0x02
.byte 0x00, 0xfe, 0x00, 0x00
.byte 0x00, 0x06, 0x03, 0x01
.byte 0xff, 0xfd, 0xff, 0x00
.byte 0x06, 0x04, 0x01, 0xfe
.byte 0xfc, 0xfe, 0x00, 0x00 .byte 0xfc, 0xfe, 0x00, 0x00
gUnknown_846E314:: @ 846E314 gUnknown_846E314:: @ 846E314
.byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00, 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00, 0x03, 0x05, 0x03, 0x00 .byte 0x03, 0x02, 0x01, 0x00
.byte 0x03, 0x03, 0x01, 0x00
.byte 0x03, 0x03, 0x02, 0x00
.byte 0x03, 0x04, 0x02, 0x00
.byte 0x03, 0x05, 0x03, 0x00
gUnknown_846E328:: @ 846E328 gUnknown_846E328:: @ 846E328
.4byte gUnknown_841CE3C .4byte gUnknown_841CE3C
@@ -56,7 +67,10 @@ gUnknown_846E34C:: @ 846E34C
.4byte sub_814D4C8 .4byte sub_814D4C8
gUnknown_846E3B4:: @ 846E3B4 gUnknown_846E3B4:: @ 846E3B4
.byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b, 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11 .byte 0x02, 0x04, 0x06, 0x07
.byte 0x03, 0x05, 0x08, 0x0b
.byte 0x03, 0x07, 0x0b, 0x0f
.byte 0x04, 0x08, 0x0c, 0x11
gUnknown_846E3C4:: @ 846E3C4 gUnknown_846E3C4:: @ 846E3C4
.byte 0x05, 0x07, 0x09, 0x0c .byte 0x05, 0x07, 0x09, 0x0c
@@ -116,11 +130,13 @@ gUnknown_846E3E2:: @ 846E3E2
.byte 0x00, 0x03, 0x04 .byte 0x00, 0x03, 0x04
gUnknown_846E3E5:: @ 846E3E5 gUnknown_846E3E5:: @ 846E3E5
.byte 0x01, 0x08, 0x09, 0x01, 0x06, 0x07 .byte 0x01, 0x08, 0x09
.byte 0x01, 0x06, 0x07
gUnknown_846E3EB:: @ 846E3EB gUnknown_846E3EB:: @ 846E3EB
.byte 0x01, 0x04, 0x05, 0x00, 0x00 .byte 0x01, 0x04, 0x05
.align 2
gUnknown_846E3F0:: @ 846E3F0 gUnknown_846E3F0:: @ 846E3F0
.byte 0, 3, 4, 24, 13, 15 .byte 0, 3, 4, 24, 13, 15
.2byte 0x0001 .2byte 0x0001
@@ -148,7 +164,8 @@ gUnknown_846E3F8:: @ 846E3F8
.2byte 0x0000 .2byte 0x0000
gUnknown_846E448:: @ 846E448 gUnknown_846E448:: @ 846E448
.byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10 .byte 0x06, 0x08, 0x09, 0x0b
.byte 0x0c, 0x0e, 0x0f, 0x10
gUnknown_846E450:: @ 846E450 gUnknown_846E450:: @ 846E450
.4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625 .4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625
@@ -184,7 +201,10 @@ gUnknown_846F058:: @ 846F058 bin.lz
.incbin "graphics/link_games/unk_846F058.bin.lz" .incbin "graphics/link_games/unk_846F058.bin.lz"
gUnknown_846F280:: @ 846F280 gUnknown_846F280:: @ 846F280
.byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00, 0x01, 0x03, 0x02, 0x04 .byte 0x01, 0x03, 0x00, 0x00, 0x00
.byte 0x00, 0x01, 0x03, 0x00, 0x00
.byte 0x01, 0x03, 0x02, 0x04, 0x00
.byte 0x00, 0x01, 0x03, 0x02, 0x04
gUnknown_846F294:: @ 846F294 gUnknown_846F294:: @ 846F294
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00
@@ -194,14 +214,27 @@ gUnknown_846F294:: @ 846F294
.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff
gUnknown_846F2D0:: @ 846F2D0 gUnknown_846F2D0:: @ 846F2D0
.byte 0x00, 0x00, 0xff, 0x00, 0x01, 0x01 .byte 0x00, 0x00
.byte 0xff, 0x00
.byte 0x01, 0x01
gUnknown_846F2D6:: @ 846F2D6 gUnknown_846F2D6:: @ 846F2D6
.byte 0x00, 0x00, 0xf0, 0xfc, 0x10, 0xfc, 0xf8, 0xfe, 0x08, 0xfe, 0xe8, 0xf8, 0x18, 0xf8, 0xe0, 0xf4, 0x20, 0xf4, 0xd8, 0xf0, 0x28, 0xf0 .byte 0x00, 0x00
.byte 0xf0, 0xfc
.byte 0x10, 0xfc
.byte 0xf8, 0xfe
.byte 0x08, 0xfe
.byte 0xe8, 0xf8
.byte 0x18, 0xf8
.byte 0xe0, 0xf4
.byte 0x20, 0xf4
.byte 0xd8, 0xf0
.byte 0x28, 0xf0
gUnknown_846F2EC:: @ 846F2EC gUnknown_846F2EC:: @ 846F2EC
.2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000 .2byte 5, 6, 7, 8, 9
.align 2
gUnknown_846F2F8:: @ 846F2F8 gUnknown_846F2F8:: @ 846F2F8
obj_tiles gUnknown_846E4D0, 0x0800, 1 obj_tiles gUnknown_846E4D0, 0x0800, 1
obj_tiles gUnknown_846E7FC, 0x0e00, 2 obj_tiles gUnknown_846E7FC, 0x0e00, 2