diff options
author | YamaArashi <shadow962@live.com> | 2016-12-04 03:35:28 -0800 |
---|---|---|
committer | YamaArashi <shadow962@live.com> | 2016-12-04 03:35:28 -0800 |
commit | 087d746c8bf066013a42f450d77abb39f81b9abb (patch) | |
tree | 152aa79f924fa71355f30a712753aebba5e56653 /include/asm.inc.h | |
parent | 4ceea5913e430464ccde4ac17b050a8faff5f97c (diff) | |
parent | 97f58f823c6cfc031e48fd30d84bcbfeb667c881 (diff) |
Merge branch 'clean/warnings-1' of https://github.com/marijnvdwerf/pokeruby into marijnvdwerf-clean/warnings-1
Diffstat (limited to 'include/asm.inc.h')
-rw-r--r-- | include/asm.inc.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index d15a8bc9b..795e68f34 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -262,6 +262,11 @@ void sub_80A68CC(); // asm/contest.o void sub_80AB1B0(void); +void sub_80AE098(u8); +void sub_80AE398(u8, u8); +void sub_80AE82C(u8); +void sub_80AF668(void); +void sub_80B0F28(u8); void sub_80B2D1C(void); // asm/shop.o @@ -308,9 +313,11 @@ void sub_80BFD44(void *, u32, u8); void sub_80C0514(void *, u32, u8); // asm/contest_link_80C2020.o +void sub_80C2358(void); void sub_80C48C8(void); void sub_80C4940(void); void sub_80C4980(u8); +u8 sub_80C4B34(u8 *); // asm/script_pokemon_util_80C4BF0.o u8 sub_80C4D50(void); @@ -332,6 +339,13 @@ void RotatingGatePuzzleCameraUpdate(s16, s16); void sub_80C8080(); u32 CheckForRotatingGatePuzzleCollision(u8, s16, s16); +// asm/contest_link_80C857C.o +void sub_80C8734(u8); +void sub_80C88AC(u8); +void sub_80C8E1C(u8); +void sub_80C8EBC(u8); +void sub_80C8F34(u8); + // asm/bike.o void MovePlayerOnBike(u8, u16, u16); void sub_80E5B38(u16 i, u16 c); |