diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
| commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
| tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /include/rom_8077ABC.h | |
| parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
Diffstat (limited to 'include/rom_8077ABC.h')
| -rw-r--r-- | include/rom_8077ABC.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h index 21ec88a90..81a11ba04 100644 --- a/include/rom_8077ABC.h +++ b/include/rom_8077ABC.h @@ -103,5 +103,7 @@ bool8 sub_8078718(struct Sprite *sprite); bool8 sub_8078CE8(struct Sprite *sprite); void oamt_add_pos2_onto_pos1(struct Sprite *sprite); void sub_8078BD4(struct Sprite *sprite); +void sub_807941C(struct Sprite *sprite); +void sub_80789D4(bool8 a1); #endif // GUARD_ROM_8077ABC_H |