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/pokemon.c | |
| parent | 6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff) | |
| parent | 0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff) | |
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index faf00a7bf..690f83bb1 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -6814,7 +6814,9 @@ static void sub_806F160(struct Unknown_806F160_Struct* structPtr) structPtr->templates[i] = gUnknown_08329D98[i]; for (j = 0; j < structPtr->field_1; j++) { - asm(""); + #ifndef NONMATCHING + asm(""); + #endif structPtr->frameImages[i * structPtr->field_1 + j].data = &structPtr->byteArrays[i][j * 0x800]; } structPtr->templates[i].images = &structPtr->frameImages[i * structPtr->field_1]; |