diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-11 23:46:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-11 23:46:50 +0100 |
| commit | 2736c0fd4a52785aac63b259a71e8c64d92bef93 (patch) | |
| tree | 2afed0b7fa35ac5aa673a2cca91a926e410a3e07 /data/data2b.s | |
| parent | fd17ca59b0f5eaa3231628f7b9da66e77dfb8bd9 (diff) | |
| parent | 14a76793e596d612efd273169c4172922c270f13 (diff) | |
add more const pokemon data, clear include
Diffstat (limited to 'data/data2b.s')
| -rw-r--r-- | data/data2b.s | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/data/data2b.s b/data/data2b.s index 4d3126215..b65087d7a 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -2,6 +2,7 @@ #include "constants/moves.h" #include "constants/species.h" #include "constants/trainers.h" +#include "constants/pokemon.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -21,31 +22,31 @@ gUnknown_082FF2B8:: @ 82FF2B8 .align 2 gUnknown_082FF3A8:: @ 82FF3A8 - .byte 0x00, 0x80, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x88, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x90, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0x98, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0x8000, 0x800 + obj_frame_tiles gHeap + 0x8800, 0x800 + obj_frame_tiles gHeap + 0x9000, 0x800 + obj_frame_tiles gHeap + 0x9800, 0x800 .align 2 gUnknown_082FF3C8:: @ 82FF3C8 - .byte 0x00, 0xa0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xa8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xb0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xb8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xA000, 0x800 + obj_frame_tiles gHeap + 0xA800, 0x800 + obj_frame_tiles gHeap + 0xB000, 0x800 + obj_frame_tiles gHeap + 0xB800, 0x800 .align 2 gUnknown_082FF3E8:: @ 82FF3E8 - .byte 0x00, 0xc0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xc8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xd0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xd8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xC000, 0x800 + obj_frame_tiles gHeap + 0xC800, 0x800 + obj_frame_tiles gHeap + 0xD000, 0x800 + obj_frame_tiles gHeap + 0xD800, 0x800 .align 2 gUnknown_082FF408:: @ 82FF408 - .byte 0x00, 0xe0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xe8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xf0, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 - .byte 0x00, 0xf8, 0x00, 0x02, 0x00, 0x08, 0x00, 0x00 + obj_frame_tiles gHeap + 0xE000, 0x800 + obj_frame_tiles gHeap + 0xE800, 0x800 + obj_frame_tiles gHeap + 0xF000, 0x800 + obj_frame_tiles gHeap + 0xF800, 0x800 .align 2 gUnknown_082FF428:: @ 82FF428 |