diff options
| -rw-r--r-- | data/battle_7.s | 64 | ||||
| -rw-r--r-- | data/battle_controller_player.s | 4 | ||||
| -rw-r--r-- | data/data2b_2.s | 30 | ||||
| -rw-r--r-- | data/graphics.s | 13 | ||||
| -rw-r--r-- | ld_script.txt | 2 |
5 files changed, 80 insertions, 33 deletions
diff --git a/data/battle_7.s b/data/battle_7.s new file mode 100644 index 000000000..6f2478842 --- /dev/null +++ b/data/battle_7.s @@ -0,0 +1,64 @@ +@ data used in battle_7.s and smokescreen.s, can't split because they're interleaved + + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + + .align 2 +gUnknown_0831C604:: @ 831C604 + .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x02, 0x00 + .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x02, 0x01 + .byte 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01 + .byte 0x00, 0x00, 0x00, 0x00 + + .align 2 +gUnknown_0831C620:: @ 831C620 + obj_tiles gUnknown_08C01644, 0x0180, 0xd6eb + + .align 2 +gUnknown_0831C628:: @ 831C628 + obj_pal gUnknown_08C01724, 0xd6eb + + .align 2 +gUnknown_0831C630:: @ 831C630 + .byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x04, 0x00, 0x00 + + .align 2 +gUnknown_0831C638:: @ 831C638 + .2byte 0x0000, 0x0004, 0x0004, 0x0004, 0x0008, 0x0004, 0xffff, 0x0000 + + .align 2 +gUnknown_0831C648:: @ 831C648 + .2byte 0x0000, 0x0044, 0x0004, 0x0044, 0x0008, 0x0044, 0xffff, 0x0000 + + .align 2 +gUnknown_0831C658:: @ 831C658 + .2byte 0x0000, 0x0084, 0x0004, 0x0084, 0x0008, 0x0084, 0xffff, 0x0000 + + .align 2 +gUnknown_0831C668:: @ 831C668 + .2byte 0x0000, 0x00c4, 0x0004, 0x00c4, 0x0008, 0x00c4, 0xffff, 0x0000 + + .align 2 +gUnknown_0831C678:: @ 831C678 + .4byte gUnknown_0831C638 + .4byte gUnknown_0831C648 + .4byte gUnknown_0831C658 + .4byte gUnknown_0831C668 + + .align 2 +gUnknown_0831C688:: @ 831C688 + spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4 + + .align 2 +gUnknown_0831C6A0:: @ 831C6A0 + obj_tiles gUnknown_08D8FBC0, 0x0080, 0xd759 + + .align 2 +gUnknown_0831C6A8:: @ 831C6A8 + .byte 0x00, 0x40, 0x00, 0x40, 0x00, 0x0c, 0x00, 0x00 + + .align 2 +gUnknown_0831C6B0:: @ 831C6B0 + spr_template 0xd759, 0xd6ff, gUnknown_0831C6A8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_805EE48 diff --git a/data/battle_controller_player.s b/data/battle_controller_player.s index 37c877dfd..bc2a18edb 100644 --- a/data/battle_controller_player.s +++ b/data/battle_controller_player.s @@ -63,3 +63,7 @@ gPlayerBufferCommands:: @ 831C514 .4byte sub_805D094 .4byte nullsub_22 + .align 2 +gUnknown_0831C5F8:: @ 831C5F8 + .byte 0x00, 0x02, 0x03, 0x01, 0x48, 0x48, 0x20, 0x5a + .byte 0x50, 0x50, 0x50, 0x58 diff --git a/data/data2b_2.s b/data/data2b_2.s deleted file mode 100644 index a1088768e..000000000 --- a/data/data2b_2.s +++ /dev/null @@ -1,30 +0,0 @@ -@ the second big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - - -gUnknown_0831C5F8:: @ 831C5F8 - .incbin "baserom.gba", 0x31c5f8, 0xc - -gUnknown_0831C604:: @ 831C604 - .incbin "baserom.gba", 0x31c604, 0x1c - -gUnknown_0831C620:: @ 831C620 - .incbin "baserom.gba", 0x31c620, 0x8 - -gUnknown_0831C628:: @ 831C628 - .incbin "baserom.gba", 0x31c628, 0x60 - -gUnknown_0831C688:: @ 831C688 - .incbin "baserom.gba", 0x31c688, 0x18 - -gUnknown_0831C6A0:: @ 831C6A0 - .incbin "baserom.gba", 0x31c6a0, 0x10 - -gUnknown_0831C6B0:: @ 831C6B0 - .incbin "baserom.gba", 0x31c6b0, 0x18 diff --git a/data/graphics.s b/data/graphics.s index dc29f6bcb..4bff14d97 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -13,7 +13,13 @@ gUnknown_08C00524:: @ 8C00524 .include "data/graphics/pokemon/circled_question_mark_graphics.inc" @ 8C00C10 - .incbin "baserom.gba", 0xc00c10, 0x16f0 + .incbin "baserom.gba", 0xc00c10, 0xa34 + +gUnknown_08C01644:: @ 8C01644 + .incbin "baserom.gba", 0xc01644, 0xE0 + +gUnknown_08C01724:: @ 8C01724 + .incbin "baserom.gba", 0xc01724, 0xBDC gUnknown_08C02300:: @ 8C02300 .incbin "baserom.gba", 0xc02300, 0x70f0 @@ -453,7 +459,10 @@ gUnknown_08D8EC24:: @ 8D8EC24 .incbin "baserom.gba", 0xd8ec24, 0xf78 gUnknown_08D8FB9C:: @ 8D8FB9C - .incbin "baserom.gba", 0xd8fb9c, 0xd8 + .incbin "baserom.gba", 0xd8fb9c, 0x24 + +gUnknown_08D8FBC0:: @ 8D8FBC0 + .incbin "baserom.gba", 0xd8fbc0, 0xb4 .align 2 gMonIcon_Egg:: @ 8D8FC74 diff --git a/ld_script.txt b/ld_script.txt index b2e996ff5..b2470ebc5 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -333,7 +333,7 @@ SECTIONS { src/battle_4.o(.rodata); data/battle_4.o(.rodata); data/battle_controller_player.o(.rodata); - data/data2b_2.o(.rodata); + data/battle_7.o(.rodata); data/battle_controller_opponent.o(.rodata); data/battle_controller_link_opponent.o(.rodata); data/data2c.o(.rodata); |