Merge pull request #1141 from GriffinRichards/add-nonmatch

Wrap asm statements in NONMATCHING
This commit is contained in:
PikalaxALT
2020-08-21 12:44:07 -04:00
committed by GitHub
13 changed files with 59 additions and 30 deletions

View File

@@ -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");