diff options
author | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
---|---|---|
committer | camthesaxman <cameronghall@cox.net> | 2018-01-04 23:42:42 -0600 |
commit | 3d49abfecb20b9b86311cbd83ff92a20761ea256 (patch) | |
tree | 9e65e0cf9a6ce4ba318f0e144553248e6709eb61 /include/heated_rock.h | |
parent | 501482beadd05c5ade13f6919c3c2cd42c86952d (diff) | |
parent | f5fbe5b66226f4e7e38fe5d4638831d1ce19b36b (diff) |
fix merge conflicts
Diffstat (limited to 'include/heated_rock.h')
-rw-r--r-- | include/heated_rock.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/heated_rock.h b/include/heated_rock.h new file mode 100644 index 000000000..26856fe7f --- /dev/null +++ b/include/heated_rock.h @@ -0,0 +1,10 @@ +#ifndef GUARD_HEATED_ROCK_H +#define GUARD_HEATED_ROCK_H + +// heated_rock (moves heated rock sprites) +// Used in Eruption. + +u16 sub_80D5940(u8 spriteId); +void sub_80D5994(struct Sprite *sprite, s16 x, s16 y); + +#endif // GUARD_HEATED_ROCK_H
\ No newline at end of file |