diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-21 12:44:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:44:07 -0400 |
| commit | cd895e497d68bf9adbaa067dc411cc99a3bd1a4b (patch) | |
| tree | ad8bed728bb939cf08fbb8b9fd7d4c009a06459e /src/data | |
| parent | 6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff) | |
| parent | 0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff) | |
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/graphics/pokemon.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/data/graphics/pokemon.h b/src/data/graphics/pokemon.h index fd4d8b95d..bce0b7a21 100644 --- a/src/data/graphics/pokemon.h +++ b/src/data/graphics/pokemon.h @@ -2698,7 +2698,8 @@ const u8 gMonIcon_Deoxys[] = INCBIN_U8("graphics/pokemon/deoxys/icon.4bpp"); const u8 gMonIcon_DeoxysSpeed[] = INCBIN_U8("graphics/pokemon/deoxys/icon_speed.4bpp"); const u8 gMonIcon_DeoxysSpeedWide[] = INCBIN_U8("graphics/unused/deoxys_speed_icon_wide.4bpp"); -asm(".space 0x6800"); +// Probably the leftover space from the other Deoxys forms +static const u8 sEmpty[0x6800] = {0}; const u16 gUnknown_D437F8[] = INCBIN_U16("graphics/unknown/unknown_D437F8.bin"); |