diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm.inc.h | 20 | ||||
| -rw-r--r-- | include/sprite.h | 6 |
2 files changed, 4 insertions, 22 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index 18127f136..3e7c5fa99 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -465,26 +465,8 @@ void sub_8134AC0(void *); // src/player_pc.o void NewGameInitPCItems(void); -// asm/intro.o -void sub_813CAF4(u8); -void intro_reset_and_hide_bgs(void); -void sub_813CCE8(u8); +// src/intro.o void sub_813CE30(u16, u16, u16, u16); -u8 sub_813CE88(u16, s16, u16, u16, u8); -u8 sub_813CFA8(u16, u16, u16, u16); -void sub_813D084(u8); -u8 sub_813D584(u16, s16, u16, u16, u16, u8); -void sub_813D788(struct Sprite *); -void sub_813D880(struct Sprite *); -void sub_813D954(/*TODO: arg types*/); -void sub_813DB9C(struct Sprite *); -void sub_813DE70(struct Sprite *); -void sub_813E10C(struct Sprite *); -void sub_813E210(struct Sprite *); -void sub_813E7C0(u8); -void sub_813E930(/*TODO: arg types*/); -void InitIntroTorchicAttackAnim(u8); -void InitIntroMudkipAttackAnim(/*TODO: arg types*/); // asm/braille_puzzles.o bool8 ShouldDoBrailleStrengthEffect(void); diff --git a/include/sprite.h b/include/sprite.h index 3c8da394f..13d94e9f3 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -179,10 +179,10 @@ struct Sprite /*0x40*/ u16 sheetTileStart; - u8 subspriteTableNum:6; - u8 subspriteMode:2; + /*0x42*/ u8 subspriteTableNum:6; + u8 subspriteMode:2; - u8 subpriority; + /*0x43*/ u8 subpriority; }; extern s16 gSpriteCoordOffsetX; |