From ab3eb6065b5d9942520bbd844bd51991ae225f7f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 1 Jun 2020 16:17:25 +0200 Subject: More transitions documentation --- include/battle_transition.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index db06a5638..0f583b101 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); bool8 FldEff_Pokeball(void); void TransitionPhase1_Task_RunFuncs(u8 taskId); -void sub_8149F58(u16 **a0, u16 **a1); +void GetBg0TilesDst(u16 **tilemap, u16 **tileset); extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; -- cgit v1.2.3 From 72b332d5516d3d45e448819a5bc2355d0f813388 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 1 Jun 2020 18:05:31 -0400 Subject: Revert "More transitions documentation" --- include/battle_transition.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index 0f583b101..db06a5638 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); bool8 FldEff_Pokeball(void); void TransitionPhase1_Task_RunFuncs(u8 taskId); -void GetBg0TilesDst(u16 **tilemap, u16 **tileset); +void sub_8149F58(u16 **a0, u16 **a1); extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; -- cgit v1.2.3 From 0690abd5a4325811937d88019d728a4fcbe71b50 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 2 Jun 2020 17:28:47 +0200 Subject: its time to ddddddduel --- include/battle_transition.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/battle_transition.h b/include/battle_transition.h index db06a5638..0f583b101 100644 --- a/include/battle_transition.h +++ b/include/battle_transition.h @@ -7,7 +7,7 @@ void BattleTransition_Start(u8 transitionId); bool8 IsBattleTransitionDone(void); bool8 FldEff_Pokeball(void); void TransitionPhase1_Task_RunFuncs(u8 taskId); -void sub_8149F58(u16 **a0, u16 **a1); +void GetBg0TilesDst(u16 **tilemap, u16 **tileset); extern const struct SpritePalette gFieldEffectObjectPaletteInfo10; -- cgit v1.2.3 From aaf5d91c18727f9a542f90ec0e7ca5a5f6247815 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 3 Jun 2020 18:25:16 -0400 Subject: Document field_message_box.c --- include/field_message_box.h | 6 +++--- include/match_call.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/field_message_box.h b/include/field_message_box.h index 58f782d9c..34b3324e7 100644 --- a/include/field_message_box.h +++ b/include/field_message_box.h @@ -10,13 +10,13 @@ enum }; bool8 ShowFieldMessage(const u8 *message); -bool8 sub_8098238(const u8 *message); -bool8 sub_80982B8(void); +bool8 ShowPokenavFieldMessage(const u8 *message); +bool8 ShowFieldMessageFromBuffer(void); bool8 ShowFieldAutoScrollMessage(const u8 *message); void HideFieldMessageBox(void); bool8 IsFieldMessageBoxHidden(void); u8 GetFieldMessageBoxMode(void); -void sub_8098374(void); +void StopFieldMessage(void); void InitFieldMessageBox(void); #endif // GUARD_FIELD_MESSAGE_BOX_H diff --git a/include/match_call.h b/include/match_call.h index 8214e03b7..bc5f374bd 100644 --- a/include/match_call.h +++ b/include/match_call.h @@ -14,7 +14,7 @@ s32 GetRematchIdxByTrainerIdx(s32 trainerIdx); void InitMatchCallCounters(void); bool32 TryStartMatchCall(void); bool32 IsMatchCallTaskActive(void); -void StartMatchCallFromScript(u8 *message); +void StartMatchCallFromScript(const u8 *message); void BufferPokedexRatingForMatchCall(u8 *destStr); bool32 SelectMatchCallMessage(int, u8 *); void sub_8197184(u32 windowId, u32 destOffset, u32 paletteId); -- cgit v1.2.3 From 5d752bbe49f5d559932fdfbb2247fb72199e0c2a Mon Sep 17 00:00:00 2001 From: SBird Date: Wed, 3 Jun 2020 14:26:22 +0200 Subject: shop: document some constants s.t. object events don't break --- include/shop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/shop.h b/include/shop.h index 164d6f3c2..c338103b4 100644 --- a/include/shop.h +++ b/include/shop.h @@ -41,7 +41,7 @@ struct ShopData /*0x200B*/ u8 scrollIndicatorsTaskId; /*0x200C*/ u8 iconSlot; /*0x200D*/ u8 itemSpriteIds[2]; - /*0x2010*/ s16 viewportObjects[16][5]; + /*0x2010*/ s16 viewportObjects[OBJECT_EVENTS_COUNT][5]; }; void CreatePokemartMenu(const u16 *); -- cgit v1.2.3