diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/decoration.h | 9 | ||||
| -rw-r--r-- | include/palette.h | 32 |
2 files changed, 23 insertions, 18 deletions
diff --git a/include/decoration.h b/include/decoration.h index b0484c3be..afcfcae87 100644 --- a/include/decoration.h +++ b/include/decoration.h @@ -167,7 +167,7 @@ extern u8 ewram[]; extern struct Decoration gDecorations[0x77]; extern struct Decoration *gUnknown_02038900; -extern u8 *(gUnknown_020388D0[]); +extern u8 *gUnknown_020388D0; extern u8 gUnknown_020388D4; extern u8 gUnknown_020388D5; @@ -199,6 +199,7 @@ extern void sub_80B3068(u8); // src/shop extern u8 sub_8134194(u8); // src/decoration_inventory extern bool8 sub_81341D4(void); // src/decoration_inventory extern void sub_8134104(u8); // src/decoration_inventory +extern bool8 sub_807D770(void); extern void sub_80F944C(void); // src/menu_helpers extern void sub_80F9480(u8 *, u8); // src/menu_helpers extern void sub_80F94A4(u8, u8 *, u8, s16); // src/menu_helpers @@ -209,8 +210,8 @@ extern void CreateVerticalScrollIndicators(u8, u8, u8); // src/menu_helpers extern void LoadScrollIndicatorPalette(void); // src/menu_helpers extern void DisplayItemMessageOnField(u8, const u8 *, TaskFunc, u16); // src/menu_helpers extern void BuyMenuFreeMemory(void); // src/menu_helpers -extern void ReshowPlayerPC(u8); // src/player_pc +extern void ReshowPlayerPC(u8); // src/player_pc void sub_80FE2B4(void); void Task_DecorationPCProcessMenuInput(u8); void sub_80FE394(void); @@ -228,6 +229,10 @@ void sub_80FECE0(u8); void sub_80FEF50(u8); void sub_80FF394(u16, u16, u16); void sub_80FF6AC(u8); +void sub_80FF960(u8); +void sub_810065C(u8); void sub_8109DAC(u8); +void AddDecorationIconObjectFromFieldObject(struct Decoration **, u8); +void SetUpPlacingDecorationPlayerAvatar(u8, struct Decoration **); #endif // GUARD_DECORATION_H diff --git a/include/palette.h b/include/palette.h index 37fcb4d65..193773d24 100644 --- a/include/palette.h +++ b/include/palette.h @@ -16,22 +16,22 @@ enum struct PaletteFadeControl { - u32 multipurpose1; - u8 delayCounter:6; - u16 y:5; // blend coefficient - u16 targetY:5; // target blend coefficient - u16 blendColor:15; - u16 active:1; - u16 multipurpose2:6; - u16 yDec:1; // whether blend coefficient is decreasing - u16 bufferTransferDisabled:1; - u16 mode:2; - u16 shouldResetBlendRegisters:1; - u16 hardwareFadeFinishing:1; - u16 softwareFadeFinishingCounter:5; - u16 softwareFadeFinishing:1; - u16 objPaletteToggle:1; - u8 deltaY:4; // rate of change of blend coefficient + /*0x00*/ u32 multipurpose1; + /*0x04*/ u8 delayCounter:6; + /*0x05*/ u16 y:5; // blend coefficient + /*0x05-06*/ u16 targetY:5; // target blend coefficient + /*0x07*/ u16 blendColor:15; + /*0x07*/ u16 active:1; + /*0x08*/ u16 multipurpose2:6; + /*0x08*/ u16 yDec:1; // whether blend coefficient is decreasing + /*0x08*/ u16 bufferTransferDisabled:1; + /*0x09*/ u16 mode:2; + /*0x09*/ u16 shouldResetBlendRegisters:1; + /*0x09*/ u16 hardwareFadeFinishing:1; + /*0x09-0a*/ u16 softwareFadeFinishingCounter:5; + /*0x0a*/ u16 softwareFadeFinishing:1; + /*0x0a*/ u16 objPaletteToggle:1; + /*0x0a*/ u8 deltaY:4; // rate of change of blend coefficient }; extern struct PaletteFadeControl gPaletteFade; |