diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-29 13:06:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-29 13:06:11 -0400 |
| commit | 35e7dffe66de92dccda079b62a6ce268906e1440 (patch) | |
| tree | 6d6ab19a542d35dae9d071e1da7a599d7484e64d /data | |
| parent | 24d36fd91fb7b13efed60c94ab3882ce3b2d55ab (diff) | |
trainer_pokemon_sprites
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 10 | ||||
| -rw-r--r-- | data/trainer_pokemon_sprites.s | 25 |
2 files changed, 5 insertions, 30 deletions
diff --git a/data/data.s b/data/data.s index 2d3806e4a..eb704206c 100644 --- a/data/data.s +++ b/data/data.s @@ -76,7 +76,7 @@ gUnknown_82349BC:: @ 82349BC gUnknown_82349CC:: @ 82349CC .incbin "baserom.gba", 0x2349CC, 0x6E0 -gUnknown_82350AC:: @ 82350AC +gMonFrontPicTable:: @ 82350AC .incbin "baserom.gba", 0x2350AC, 0xE8 gUnknown_8235194:: @ 8235194 @@ -85,7 +85,7 @@ gUnknown_8235194:: @ 8235194 gUnknown_8235E6C:: @ 8235E6C .incbin "baserom.gba", 0x235E6C, 0x6E0 -gUnknown_823654C:: @ 823654C +gMonBackPicTable:: @ 823654C .incbin "baserom.gba", 0x23654C, 0xDC0 gMonPaletteTable:: @ 823730C @@ -103,10 +103,10 @@ gTrainerFrontAnimsPtrTable:: @ 82390DC gUnknown_823932C:: @ 823932C .incbin "baserom.gba", 0x23932C, 0x250 -gUnknown_823957C:: @ 823957C +gTrainerFrontPicTable:: @ 823957C .incbin "baserom.gba", 0x23957C, 0x4A0 -gUnknown_8239A1C:: @ 8239A1C +gTrainerFrontPicPaletteTable:: @ 8239A1C .incbin "baserom.gba", 0x239A1C, 0x558 gTrainerBackAnimsPtrTable:: @ 8239F74 @@ -115,7 +115,7 @@ gTrainerBackAnimsPtrTable:: @ 8239F74 gUnknown_8239F8C:: @ 8239F8C .incbin "baserom.gba", 0x239F8C, 0x18 -gUnknown_8239FA4:: @ 8239FA4 +gTrainerBackPicTable:: @ 8239FA4 .incbin "baserom.gba", 0x239FA4, 0x30 gUnknown_8239FD4:: @ 8239FD4 diff --git a/data/trainer_pokemon_sprites.s b/data/trainer_pokemon_sprites.s deleted file mode 100644 index 6d5477040..000000000 --- a/data/trainer_pokemon_sprites.s +++ /dev/null @@ -1,25 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - - .align 2 -gUnknown_845312C:: @ 845312C - window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x0f, 0x02a2 - window_template 0x00, 0x06, 0x0f, 0x0e, 0x04, 0x0c, 0x02a2 - window_template 0x00, 0x06, 0x0f, 0x0f, 0x04, 0x0c, 0x02da - window_template 0x00, 0x06, 0x0f, 0x10, 0x04, 0x0c, 0x0316 - window_template 0x00, 0x06, 0x0f, 0x17, 0x04, 0x0c, 0x0356 - window_template 0x00, 0x16, 0x11, 0x07, 0x02, 0x0f, 0x020a - window_template 0x00, 0x16, 0x0f, 0x07, 0x04, 0x0f, 0x020a - window_template 0x00, 0x16, 0x0d, 0x07, 0x06, 0x0f, 0x020a - window_template 0x00, 0x16, 0x0b, 0x07, 0x08, 0x0f, 0x020a - -gUnknown_8453174:: - .byte 16, 8, 4, 0 - - .align 2 -gUnknown_8453178:: @ 8453178 - .space 12 - -gUnknown_8453184:: @ 8453184 - .byte 0, 0, 0, 0xc0, 0, 0, 0, 0 |