diff options
| -rw-r--r-- | data/battle_7.s | 32 | ||||
| -rw-r--r-- | data/field_region_map.s | 10 | ||||
| -rw-r--r-- | data/graphics.s | 30 |
3 files changed, 57 insertions, 15 deletions
diff --git a/data/battle_7.s b/data/battle_7.s index a64a39dc2..4b0eea65a 100644 --- a/data/battle_7.s +++ b/data/battle_7.s @@ -5,28 +5,42 @@ .align 2, 0 gUnknown_0832C0D0:: @ 832C0D0 - .incbin "baserom.gba", 0x32c0d0, 0x8 + obj_tiles gUnknown_08C1F1C8, 0x1000, 0xd6ff + .align 2 gUnknown_0832C0D8:: @ 832C0D8 - .incbin "baserom.gba", 0x32c0d8, 0x8 + obj_tiles gUnknown_08C1F46C, 0x1000, 0xd701 + .align 2 gUnknown_0832C0E0:: @ 832C0E0 - .incbin "baserom.gba", 0x32c0e0, 0x8 + obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd6ff + .align 2 gUnknown_0832C0E8:: @ 832C0E8 - .incbin "baserom.gba", 0x32c0e8, 0x8 + obj_tiles gUnknown_08C1F5E8, 0x0800, 0xd700 + .align 2 gUnknown_0832C0F0:: @ 832C0F0 - .incbin "baserom.gba", 0x32c0f0, 0x8 + obj_tiles gUnknown_08C1F76C, 0x0800, 0xd701 + .align 2 gUnknown_0832C0F8:: @ 832C0F8 - .incbin "baserom.gba", 0x32c0f8, 0x8 + obj_tiles gUnknown_08C1F76C, 0x0800, 0xd702 + .align 2 gUnknown_0832C100:: @ 832C100 - .incbin "baserom.gba", 0x32c100, 0x8 + obj_tiles gUnknown_08C1F8E8, 0x1000, 0xd70b + .align 2 gUnknown_0832C108:: @ 832C108 - .incbin "baserom.gba", 0x32c108, 0x20 + obj_tiles gUnknown_08C0237C, 0x0100, 0xd704 + obj_tiles gUnknown_08C0237C, 0x0120, 0xd705 + obj_tiles gUnknown_08C0237C, 0x0100, 0xd706 + obj_tiles gUnknown_08C0237C, 0x0120, 0xd707 + .align 2 gUnknown_0832C128:: @ 832C128 - .incbin "baserom.gba", 0x32c128, 0x18 + obj_pal gUnknown_08C11B9C, 0xd6ff + obj_pal gUnknown_08C11BBC, 0xd704 + + .byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x04, 0x00, 0x00 diff --git a/data/field_region_map.s b/data/field_region_map.s index 2ddc65739..f179ba8ce 100644 --- a/data/field_region_map.s +++ b/data/field_region_map.s @@ -3,8 +3,12 @@ .section .rodata -gUnknown_085E5068:: @ 85E5068 - .incbin "baserom.gba", 0x5e5068, 0x8 + .align 2 +gUnknown_085E5068:: @ 85E5068 struct BgTemplate + .4byte 0x000001f0, 0x00002dca + .align 2 gUnknown_085E5070:: @ 85E5070 - .incbin "baserom.gba", 0x5e5070, 0x18 + window_template 0x00, 0x11, 0x11, 0x0c, 0x02, 0x0f, 0x0001 + window_template 0x00, 0x16, 0x01, 0x07, 0x02, 0x0f, 0x0019 + window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000 diff --git a/data/graphics.s b/data/graphics.s index 79ef25aeb..a06c05217 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -22,10 +22,19 @@ gUnknown_08C01724:: @ 8C01724 .incbin "baserom.gba", 0xc01724, 0xBDC gUnknown_08C02300:: @ 8C02300 - .incbin "baserom.gba", 0xc02300, 0x70f0 + .incbin "baserom.gba", 0xc02300, 0x7c + +gUnknown_08C0237C:: @ 8C0237C + .incbin "baserom.gba", 0xc0237c, 0x7074 gUnknown_08C093F0:: @ 8C093F0 - .incbin "baserom.gba", 0xc093f0, 0x87ec + .incbin "baserom.gba", 0xc093f0, 0x87ac + +gUnknown_08C11B9C:: @ 8C11B9C + .incbin "baserom.gba", 0xc11b9c, 0x20 + +gUnknown_08C11BBC:: @ 8C11BBC + .incbin "baserom.gba", 0xc11bbc, 0x20 gUnknown_08C11BDC:: @ 8C11BDC .incbin "baserom.gba", 0xc11bdc, 0x52b4 @@ -79,7 +88,22 @@ gUnknown_08C1D1E8:: @ 8C1D1E8 .incbin "baserom.gba", 0xc1d1e8, 0x28 gUnknown_08C1D210:: @ 8C1D210 - .incbin "baserom.gba", 0xc1d210, 0x3458 + .incbin "baserom.gba", 0xc1d210, 0x1fb8 + +gUnknown_08C1F1C8:: @ 8C1F1C8 + .incbin "baserom.gba", 0xc1f1c8, 0x2a4 + +gUnknown_08C1F46C:: @ 8C1F46C + .incbin "baserom.gba", 0xc1f46c, 0x17c + +gUnknown_08C1F5E8:: @ 8C1F5E8 + .incbin "baserom.gba", 0xc1f5e8, 0x184 + +gUnknown_08C1F76C:: @ 8C1F76C + .incbin "baserom.gba", 0xc1f76c, 0x17c + +gUnknown_08C1F8E8:: @ 8C1F8E8 + .incbin "baserom.gba", 0xc1f8e8, 0xd80 gUnknown_08C20668:: @ 8C20668 .incbin "baserom.gba", 0xc20668, 0x1c |