summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/blit.h7
-rw-r--r--include/event_object_movement.h19
-rw-r--r--include/field_effect_helpers.h6
-rw-r--r--include/field_player_avatar.h31
-rw-r--r--include/global.fieldmap.h2
-rw-r--r--include/global.h9
-rw-r--r--include/graphics.h4
-rw-r--r--include/item_menu.h1
-rw-r--r--include/party_menu.h1
-rw-r--r--include/shop.h37
-rw-r--r--include/sprite.h8
-rw-r--r--include/strings.h21
12 files changed, 97 insertions, 49 deletions
diff --git a/include/blit.h b/include/blit.h
index e7f384cc8..2fe99d7bd 100644
--- a/include/blit.h
+++ b/include/blit.h
@@ -1,6 +1,13 @@
#ifndef GUARD_BLIT_H
#define GUARD_BLIT_H
+struct Bitmap
+{
+ u8* pixels;
+ u32 width:16;
+ u32 height:16;
+};
+
void BlitBitmapRect4BitWithoutColorKey(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height);
void BlitBitmapRect4Bit(struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height, u8 colorKey);
void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index ddccfe39b..6d38d072d 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -143,9 +143,27 @@ u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 d
u8 GetFaceDirectionMovementAction(u32);
u8 GetWalkNormalMovementAction(u32);
u8 GetWalkFastMovementAction(u32);
+u8 GetRideWaterCurrentMovementAction(u32);
u8 GetWalkFastestMovementAction(u32);
+u8 GetPlayerRunMovementAction(u32);
u8 GetJumpInPlaceMovementAction(u32);
+u8 GetAcroWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroPopWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroEndWheelieFaceDirectionMovementAction(u32);
+u8 GetAcroWheelieHopFaceDirectionMovementAction(u32);
+u8 GetAcroWheelieHopDirectionMovementAction(u32);
+u8 GetAcroWheelieJumpDirectionMovementAction(u32);
+u8 GetJumpInPlaceTurnAroundMovementAction(u32);
+u8 GetAcroWheelieInPlaceDirectionMovementAction(u32);
+u8 GetAcroPopWheelieMoveDirectionMovementAction(u32);
+u8 GetAcroWheelieMoveDirectionMovementAction(u32);
+u8 GetAcroEndWheelieMoveDirectionMovementAction(u32);
+u8 GetFishingDirectionAnimNum(u8 direction);
+u8 GetAcroWheelieDirectionAnimNum(u8 direction);
+u8 GetFishingBiteDirectionAnimNum(u8 direction);
+u8 GetFishingNoCatchDirectionAnimNum(u8 direction);
bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 specialAnimId);
+void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId);
bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject);
u8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject);
u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject);
@@ -194,6 +212,7 @@ u16 GetObjectPaletteTag(u8 palSlot);
void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
s16 sub_809773C(s16 a1);
s16 sub_8097728(s16 a1);
+void CameraObjectReset2(void);
void MovementType_None(struct Sprite *);
void MovementType_LookAround(struct Sprite *);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 9c354159b..223350042 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -7,9 +7,10 @@
// Exported ROM declarations
u8 CreateWarpArrowSprite(void);
+u8 sub_8155800(u8 oldSpriteId);
+void sub_81555AC(u8, u8);
bool8 sub_8155DA0(struct EventObject *);
void sub_8155D78(struct EventObject *);
-void sub_81555AC(u8, u8);
void StartAshFieldEffect(s16, s16, u16, s16);
void SetUpReflection(struct EventObject*, struct Sprite*, u8);
u32 StartFieldEffectForEventObject(u8, struct EventObject*);
@@ -30,5 +31,8 @@ void UpdateShortGrassFieldEffect(struct Sprite*);
void UpdateHotSpringsWaterFieldEffect(struct Sprite*);
void UpdateBubblesFieldEffect(struct Sprite*);
void UpdateSparkleFieldEffect(struct Sprite*);
+void SetSpriteInvisible(u8 spriteId);
+void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y);
+void sub_8155604(u8 spriteId, u8 value, s16 data1);
#endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index ee2cbb3c8..adb51f889 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -1,6 +1,17 @@
#ifndef GUARD_FIELD_PLAYER_AVATAR_H
#define GUARD_FIELD_PLAYER_AVATAR_H
+enum {
+ PLAYER_AVATAR_STATE_NORMAL,
+ PLAYER_AVATAR_STATE_MACH_BIKE,
+ PLAYER_AVATAR_STATE_ACRO_BIKE,
+ PLAYER_AVATAR_STATE_SURFING,
+ PLAYER_AVATAR_STATE_UNDERWATER,
+ PLAYER_AVATAR_STATE_FIELD_MOVE,
+ PLAYER_AVATAR_STATE_FISHING,
+ PLAYER_AVATAR_STATE_WATERING,
+};
+
void player_step(u8 a, u16 b, u16 c);
void ClearPlayerAvatarInfo(void);
void SetPlayerAvatarExtraStateTransition(u8, u8);
@@ -13,7 +24,7 @@ u8 GetPlayerMovementDirection(void);
u8 PlayerGetCopyableMovement(void);
void PlayerGoSpeed1(u8);
void PlayerGoSpeed2(u8);
-void PlayerGoSpeed3(u8);
+void PlayerRideWaterCurrent(u8);
void PlayerGoSpeed4(u8);
void PlayerOnBikeCollide(u8);
void PlayerFaceDirection(u8 a);
@@ -48,22 +59,4 @@ bool8 PartyHasMonWithSurf(void);
bool8 IsPlayerFacingSurfableFishableWater(void);
bool8 IsPlayerSurfingNorth(void);
-bool8 ForcedMovement_None(void);
-bool8 ForcedMovement_Slip(void);
-bool8 ForcedMovement_WalkSouth(void);
-bool8 ForcedMovement_WalkNorth(void);
-bool8 ForcedMovement_WalkWest(void);
-bool8 ForcedMovement_WalkEast(void);
-bool8 ForcedMovement_PushedSouthByCurrent(void);
-bool8 ForcedMovement_PushedNorthByCurrent(void);
-bool8 ForcedMovement_PushedWestByCurrent(void);
-bool8 ForcedMovement_PushedEastByCurrent(void);
-bool8 ForcedMovement_SlideSouth(void);
-bool8 ForcedMovement_SlideNorth(void);
-bool8 ForcedMovement_SlideWest(void);
-bool8 ForcedMovement_SlideEast(void);
-bool8 ForcedMovement_0xBB(void);
-bool8 ForcedMovement_0xBC(void);
-bool8 ForcedMovement_MuddySlope(void);
-
#endif // GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 66d5b5e4c..bb120c62c 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -232,7 +232,7 @@ struct EventObjectGraphicsInfo
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
#define PLAYER_AVATAR_FLAG_SURFING (1 << 3)
-#define PLAYER_AVATAR_FLAG_4 (1 << 4)
+#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
#define PLAYER_AVATAR_FLAG_5 (1 << 5)
#define PLAYER_AVATAR_FLAG_6 (1 << 6)
#define PLAYER_AVATAR_FLAG_DASH (1 << 7)
diff --git a/include/global.h b/include/global.h
index 027065481..b92f1097f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -976,13 +976,4 @@ struct UnkStruct_8054FF8
u16 field_C;
};
-struct Bitmap // TODO: Find a better spot for this
-{
- u8* pixels;
- u32 width:16;
- u32 height:16;
-};
-
-extern u8 gReservedSpritePaletteCount;
-
#endif // GUARD_GLOBAL_H
diff --git a/include/graphics.h b/include/graphics.h
index 4cbee1c34..07900977d 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4029,4 +4029,8 @@ extern const u8 gUnknown_08D97CF4[];
extern const u8 gStatusGfx_Icons[];
extern const u8 gStatusPal_Icons[];
+extern const u8 gBuyMenuFrame_Gfx[];
+extern const u16 gBuyMenuFrame_Tilemap[];
+extern const u16 gMenuMoneyPal[];
+
#endif //GUARD_GRAPHICS_H
diff --git a/include/item_menu.h b/include/item_menu.h
index b80d0628e..649eb934c 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -59,5 +59,6 @@ void bag_menu_mail_related(void);
void CB2_BagMenuFromStartMenu(void);
u8 sub_81ABB2C(u8 pocketId);
bool8 UseRegisteredKeyItemOnField(void);
+void CB2_GoToSellMenu(void);
#endif //GUARD_item_menu_H
diff --git a/include/party_menu.h b/include/party_menu.h
index 170fcafc1..cb82eb82c 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -70,6 +70,5 @@ extern void sub_81B67C8(u8, u16, TaskFunc);
extern void sub_81B79E8(u8, u16, TaskFunc);
extern void sub_81B6DC4(u8, u16, TaskFunc);
extern void sub_81B7C74(u8, u16, TaskFunc);
-extern u16 ItemIdToBattleMoveId(u16);
#endif // GUARD_PARTY_MENU_H
diff --git a/include/shop.h b/include/shop.h
index 067b8fee4..7f2d877dc 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -1,7 +1,7 @@
#ifndef GUARD_SHOP_H
#define GUARD_SHOP_H
-extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
+extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3];
enum
{
@@ -10,9 +10,19 @@ enum
MART_TYPE_2,
};
+// shop view window NPC info enum
+enum
+{
+ EVENT_OBJ_ID,
+ X_COORD,
+ Y_COORD,
+ ANIM_NUM,
+ LAYER_TYPE
+};
+
struct MartInfo
{
- /*0x0*/ void (* callback) (void);
+ /*0x0*/ void (*callback)(void);
/*0x4*/ const struct MenuAction *menuActions;
/*0x8*/ const u16 *itemList;
/*0xC*/ u16 itemCount;
@@ -20,23 +30,18 @@ struct MartInfo
/*0xF*/ u8 martType;
};
-struct BuyMenuLabel
-{
- u8 label[16];
-};
-
struct ShopData
{
- /*0x0000*/ u8 tilemapBuffers[4][0x800];
- /*0x2000*/ u8 filler2000[0x4];
- /*0x2004*/ u16 unk2004;
- /*0x2006*/ u8 filler2006[0x2];
- /*0x2008*/ u16 unk2008;
- /*0x200A*/ u8 filler200A;
+ /*0x0000*/ u16 tilemapBuffers[4][0x400];
+ /*0x2000*/ u32 totalCost;
+ /*0x2004*/ u16 itemsShowed;
+ /*0x2006*/ u16 selectedRow;
+ /*0x2008*/ u16 scrollOffset;
+ /*0x200A*/ u8 maxQuantity;
/*0x200B*/ u8 scrollIndicatorsTaskId;
- /*0x200C*/ u8 unk200C;
- /*0x200D*/ u8 unk200D[2];
- /*0x200F*/ u8 filler200F[0xA1];
+ /*0x200C*/ u8 iconSlot;
+ /*0x200D*/ u8 itemSpriteIds[2];
+ /*0x2010*/ s16 viewportObjects[16][5];
};
void CreatePokemartMenu(const u16 *);
diff --git a/include/sprite.h b/include/sprite.h
index 8fc45d501..4ffcd2884 100644
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -235,11 +235,15 @@ extern const struct OamData gDummyOamData;
extern const union AnimCmd *const gDummySpriteAnimTable[];
extern const union AffineAnimCmd *const gDummySpriteAffineAnimTable[];
extern const struct SpriteTemplate gDummySpriteTemplate;
-extern s16 gSpriteCoordOffsetX;
-extern s16 gSpriteCoordOffsetY;
+extern u8 gReservedSpritePaletteCount;
extern struct Sprite gSprites[];
+extern u8 gOamLimit;
+extern u16 gReservedSpriteTileCount;
+extern s16 gSpriteCoordOffsetX;
+extern s16 gSpriteCoordOffsetY;
extern struct OamMatrix gOamMatrices[];
+extern bool8 gAffineAnimsDisabled;
void ResetSpriteData(void);
void AnimateSprites(void);
diff --git a/include/strings.h b/include/strings.h
index 4ea33635b..c563353ec 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -855,5 +855,26 @@ extern const u8 gText_CanIHelpWithAnythingElse[];
extern const u8 gText_AnythingElseICanHelp[];
extern const u8 gText_QuitShopping[];
extern const u8 gText_PokedollarVar1[];
+extern const u8 gText_YouDontHaveMoney[];
+extern const u8 gText_Var1CertainlyHowMany2[];
+extern const u8 gText_Var1CertainlyHowMany[];
+extern const u8 gText_Var1IsItThatllBeVar2[];
+extern const u8 gText_YouWantedVar1ThatllBeVar2[];
+extern const u8 gText_InBagVar1[];
+extern const u8 gText_Var1AndYouWantedVar2[];
+extern const u8 gText_HereYouGoThankYou[];
+extern const u8 gText_NoMoreRoomForThis[];
+extern const u8 gText_ThankYouIllSendItHome[];
+extern const u8 gText_ThanksIllSendItHome[];
+extern const u8 gText_SpaceForVar1Full[];
+extern const u8 gText_ThrowInPremierBall[];
+extern const u8 gText_ShopBuy[];
+extern const u8 gText_ShopSell[];
+extern const u8 gText_ShopQuit[];
+
+extern const u8 gText_OhABite[];
+extern const u8 gText_PokemonOnHook[];
+extern const u8 gText_NotEvenANibble[];
+extern const u8 gText_ItGotAway[];
#endif //GUARD_STRINGS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 18:56:23 +0000