summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_interface.s180
-rw-r--r--data/graphics.s114
-rw-r--r--data/mail.s26
3 files changed, 111 insertions, 209 deletions
diff --git a/data/battle_interface.s b/data/battle_interface.s
deleted file mode 100644
index 766f34752..000000000
--- a/data/battle_interface.s
+++ /dev/null
@@ -1,180 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_0832C138:: @ 832C138
- .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
-
- .align 2
-gUnknown_0832C140:: @ 832C140
- spr_template 0xd6ff, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0832C158:: @ 832C158
- spr_template 0xd700, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0832C170:: @ 832C170
- spr_template 0xd701, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0832C188:: @ 832C188
- spr_template 0xd702, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0832C1A0:: @ 832C1A0
- spr_template 0xd70b, 0xd6ff, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
- .align 2
-gUnknown_0832C1B8:: @ 832C1B8
- .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00
-
- .align 2
-gUnknown_0832C1C0:: @ 832C1C0
- spr_template 0xd704, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
- .align 2
-gUnknown_0832C1D8:: @ 832C1D8
- spr_template 0xd705, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
- .align 2
-gUnknown_0832C1F0:: @ 832C1F0
- spr_template 0xd706, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
- .align 2
-gUnknown_0832C208:: @ 832C208
- spr_template 0xd707, 0xd704, gUnknown_0832C1B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80728B4
-
- .align 2
-gUnknown_0832C220:: @ 832C220
- .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
- .byte 0xf0, 0x20, 0x05, 0x43, 0x10, 0x20, 0x45, 0x43
- .byte 0x30, 0x20, 0x85, 0x43
-
- .align 2
-gUnknown_0832C234:: @ 832C234
- .byte 0xf0, 0x00, 0x0d, 0x44, 0x30, 0x00, 0x08, 0x46
- .byte 0xf0, 0x20, 0x05, 0x47, 0x10, 0x20, 0x45, 0x47
- .byte 0x30, 0x20, 0x85, 0x47
-
- .align 2
-gUnknown_0832C248:: @ 832C248
- .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
-
- .align 2
-gUnknown_0832C250:: @ 832C250
- .byte 0xf0, 0x00, 0x0d, 0x40, 0x30, 0x00, 0x08, 0x42
-
- .align 2
-gUnknown_0832C258:: @ 832C258
- .byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
-
- .align 2
-gUnknown_0832C260:: @ 832C260
- .byte 0xf0, 0x00, 0x05, 0x40, 0x10, 0x00, 0x45, 0x40
- .byte 0xe0, 0x00, 0x80, 0x40
-
- .align 2
-gUnknown_0832C26C:: @ 832C26C
- .4byte 0x00000005, gUnknown_0832C220
- .4byte 0x00000002, gUnknown_0832C248
- .4byte 0x00000005, gUnknown_0832C234
- .4byte 0x00000002, gUnknown_0832C250
-
- .align 2
-gUnknown_0832C28C:: @ 832C28C
- .4byte 0x00000002, gUnknown_0832C258
- .4byte 0x00000003, gUnknown_0832C260
-
- .align 2
-gUnknown_0832C29C:: @ 832C29C
- .byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
- .byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0xc5, 0x40
-
- .align 2
-gUnknown_0832C2AC:: @ 832C2AC
- .byte 0xa0, 0x00, 0x05, 0x40, 0xc0, 0x00, 0x45, 0x40
- .byte 0xe0, 0x00, 0x85, 0x40, 0x00, 0x00, 0x85, 0x40
- .byte 0x20, 0x00, 0x85, 0x40, 0x40, 0x00, 0xc5, 0x40
-
- .align 2
-gUnknown_0832C2C4:: @ 832C2C4
- .4byte 0x00000004, gUnknown_0832C29C
-
- .align 2
-gUnknown_0832C2CC:: @ 832C2CC
- .4byte 0x00000006, gUnknown_0832C2AC
-
- .align 2
-gUnknown_0832C2D4:: @ 832C2D4
- .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
- .2byte 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777, 0x7777
-
- .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
- .2byte 0x7777, 0x7777, 0x7777, 0x7717, 0x1777, 0x7177, 0x7777, 0x7771
-
- .2byte 0x0000, 0x0000, 0x3333, 0x3333, 0x4444, 0x4444, 0x2222, 0x2222
- .2byte 0x7777, 0x7777, 0x7777, 0x7111, 0x7777, 0x7171, 0x7777, 0x7111
-
- .align 2
-gUnknown_0832C334:: @ 832C334
- obj_tiles gBattleInterface_BallStatusBarGfx, 0x0200, 0xd70c
-
- .align 2
-gUnknown_0832C33C:: @ 832C33C
- obj_pal gBattleInterface_BallStatusBarPal, 0xd710
-
- .align 2
-gUnknown_0832C344:: @ 832C344
- obj_pal gBattleInterface_BallDisplayPal, 0xd712
-
- .align 2
-gUnknown_0832C34C:: @ 832C34C
- obj_tiles gBattleInterface_BallDisplayGfx, 0x0080, 0xd714
-
- .align 2
-gUnknown_0832C354:: @ 832C354
- .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00
-
- .align 2
-gUnknown_0832C35C:: @ 832C35C
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00
-
- .align 2
-gUnknown_0832C364:: @ 832C364
- spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
-
- .align 2
-gUnknown_0832C37C:: @ 832C37C
- spr_template 0xd70c, 0xd710, gUnknown_0832C138, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8074078
-
- .align 2
-gUnknown_0832C394:: @ 832C394
- spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
-
- .align 2
-gUnknown_0832C3AC:: @ 832C3AC
- spr_template 0xd714, 0xd712, gUnknown_0832C35C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80740C4
-
- .align 2
-gUnknown_0832C3C4:: @ 832C3C4
- .byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x02, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0832C3D8:: @ 832C3D8
- .byte 0xfc, 0x01, 0x01, 0xfc, 0x02, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0x00, 0x00, 0x00, 0x00
-
- .align 2
-gUnknown_0832C3EC:: @ 832C3EC
- .byte 0x98, 0x61, 0xf7, 0x0e, 0x94, 0x46, 0xd1, 0x72
- .byte 0xdc, 0x29, 0x00, 0x00
-
- .align 2
-gUnknown_0832C3F8:: @ 832C3F8
- .byte 0x00, 0x00, 0x00, 0x08, 0x02, 0x00, 0x00, 0x00
diff --git a/data/graphics.s b/data/graphics.s
index e1b76565a..bf0e3173b 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -39,7 +39,7 @@ gBattleInterface_BallDisplayPal:: @ 8C11BBC
.incbin "graphics/battle_interface/ball_display.gbapal"
.align 2
-gUnknown_08C11BDC:: @ 8C11BDC
+gHealthboxElementsGfxTable:: @ 8C11BDC
.incbin "baserom.gba", 0xc11bdc, 0x840
.align 2
@@ -910,8 +910,116 @@ gCableCarCord_Gfx:: @ 8DBC2C0
gUnknown_08DBC2E8:: @ 8DBC2E8
.incbin "baserom.gba", 0xdbc2e8, 0x72c
-gUnknown_08DBCA14:: @ 8DBCA14
- .incbin "baserom.gba", 0xdbca14, 0x3d00
+gUnknown_08DBCA14:: @ 0x08DBCA14
+ .incbin "baserom.gba", 0xdbca14, 0x1e04
+
+gUnknown_08DBE818:: @ 0x08DBE818
+ .incbin "baserom.gba", 0xdbe818, 0x20
+
+gUnknown_08DBE838:: @ 0x08DBE838
+ .incbin "baserom.gba", 0xdbe838, 0x20
+
+gUnknown_08DBE858:: @ 0x08DBE858
+ .incbin "baserom.gba", 0xdbe858, 0x20
+
+gUnknown_08DBE878:: @ 0x08DBE878
+ .incbin "baserom.gba", 0xdbe878, 0x20
+
+gUnknown_08DBE898:: @ 0x08DBE898
+ .incbin "baserom.gba", 0xdbe898, 0x20
+
+gUnknown_08DBE8B8:: @ 0x08DBE8B8
+ .incbin "baserom.gba", 0xdbe8b8, 0x20
+
+gUnknown_08DBE8D8:: @ 0x08DBE8D8
+ .incbin "baserom.gba", 0xdbe8d8, 0x20
+
+gUnknown_08DBE8F8:: @ 0x08DBE8F8
+ .incbin "baserom.gba", 0xdbe8f8, 0x20
+
+gUnknown_08DBE918:: @ 0x08DBE918
+ .incbin "baserom.gba", 0xdbe918, 0x20
+
+gUnknown_08DBE938:: @ 0x08DBE938
+ .incbin "baserom.gba", 0xdbe938, 0x20
+
+gUnknown_08DBE958:: @ 0x08DBE958
+ .incbin "baserom.gba", 0xdbe958, 0x20
+
+gUnknown_08DBE978:: @ 0x08DBE978
+ .incbin "baserom.gba", 0xdbe978, 0x20
+
+gUnknown_08DBE998:: @ 0x08DBE998
+ .incbin "baserom.gba", 0xdbe998, 0x1a0
+
+gUnknown_08DBEB38:: @ 0x08DBEB38
+ .incbin "baserom.gba", 0xdbeb38, 0x13c
+
+gUnknown_08DBEC74:: @ 0x08DBEC74
+ .incbin "baserom.gba", 0xdbec74, 0x210
+
+gUnknown_08DBEE84:: @ 0x08DBEE84
+ .incbin "baserom.gba", 0xdbee84, 0xd8
+
+gUnknown_08DBEF5C:: @ 0x08DBEF5C
+ .incbin "baserom.gba", 0xdbef5c, 0x1f8
+
+gUnknown_08DBF154:: @ 0x08DBF154
+ .incbin "baserom.gba", 0xdbf154, 0x180
+
+gUnknown_08DBF2D4:: @ 0x08DBF2D4
+ .incbin "baserom.gba", 0xdbf2d4, 0xa8
+
+gUnknown_08DBF37C:: @ 0x08DBF37C
+ .incbin "baserom.gba", 0xdbf37c, 0x190
+
+gUnknown_08DBF50C:: @ 0x08DBF50C
+ .incbin "baserom.gba", 0xdbf50c, 0x140
+
+gUnknown_08DBF64C:: @ 0x08DBF64C
+ .incbin "baserom.gba", 0xdbf64c, 0x168
+
+gUnknown_08DBF7B4:: @ 0x08DBF7B4
+ .incbin "baserom.gba", 0xdbf7b4, 0x150
+
+gUnknown_08DBF904:: @ 0x08DBF904
+ .incbin "baserom.gba", 0xdbf904, 0x2a0
+
+gUnknown_08DBFBA4:: @ 0x08DBFBA4
+ .incbin "baserom.gba", 0xdbfba4, 0xd8
+
+gUnknown_08DBFC7C:: @ 0x08DBFC7C
+ .incbin "baserom.gba", 0xdbfc7c, 0xe0
+
+gUnknown_08DBFD5C:: @ 0x08DBFD5C
+ .incbin "baserom.gba", 0xdbfd5c, 0x10c
+
+gUnknown_08DBFE68:: @ 0x08DBFE68
+ .incbin "baserom.gba", 0xdbfe68, 0xdc
+
+gUnknown_08DBFF44:: @ 0x08DBFF44
+ .incbin "baserom.gba", 0xdbff44, 0xf0
+
+gUnknown_08DC0034:: @ 0x08DC0034
+ .incbin "baserom.gba", 0xdc0034, 0xe0
+
+gUnknown_08DC0114:: @ 0x08DC0114
+ .incbin "baserom.gba", 0xdc0114, 0xe0
+
+gUnknown_08DC01F4:: @ 0x08DC01F4
+ .incbin "baserom.gba", 0xdc01f4, 0x10c
+
+gUnknown_08DC0300:: @ 0x08DC0300
+ .incbin "baserom.gba", 0xdc0300, 0xf0
+
+gUnknown_08DC03F0:: @ 0x08DC03F0
+ .incbin "baserom.gba", 0xdc03f0, 0xf8
+
+gUnknown_08DC04E8:: @ 0x08DC04E8
+ .incbin "baserom.gba", 0xdc04e8, 0x118
+
+gUnknown_08DC0600:: @ 0x08DC0600
+ .incbin "baserom.gba", 0xdc0600, 0x114
gUnknown_08DC0714:: @ 8DC0714
.incbin "baserom.gba", 0xdc0714, 0x40
diff --git a/data/mail.s b/data/mail.s
deleted file mode 100644
index 5dc8270bc..000000000
--- a/data/mail.s
+++ /dev/null
@@ -1,26 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_0859F290:: @ 859F290
- .incbin "baserom.gba", 0x59f290, 0xc
-
-gUnknown_0859F29C:: @ 859F29C
- .incbin "baserom.gba", 0x59f29c, 0x10
-
-gUnknown_0859F2AC:: @ 859F2AC
- .incbin "baserom.gba", 0x59f2ac, 0x4
-
-gUnknown_0859F2B0:: @ 859F2B0
- .incbin "baserom.gba", 0x59f2b0, 0x8
-
-gUnknown_0859F2B8:: @ 859F2B8
- .incbin "baserom.gba", 0x59f2b8, 0xfc
-
-gUnknown_0859F3B4:: @ 859F3B4
- .incbin "baserom.gba", 0x59f3b4, 0xa4
-
-gUnknown_0859F458:: @ 859F458
- .incbin "baserom.gba", 0x59f458, 0xbc