summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/asm.inc.h4
-rw-r--r--include/battle_setup.h2
-rw-r--r--include/field_player_avatar.h4
-rw-r--r--include/global.fieldmap.h9
-rw-r--r--include/global.h6
-rw-r--r--include/metatile_behavior.h2
-rw-r--r--include/rom4.h13
-rw-r--r--include/vars.h28
8 files changed, 36 insertions, 32 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h
index 44a28b2b5..6f78b2a08 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -148,10 +148,10 @@ void sub_8064990(u8, u8);
void sub_8067EEC(struct UnkInputStruct *pStruct);
void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys);
int sub_8068024(struct UnkInputStruct *pStruct);
-u8 *sub_80682A8(void *, u8, u8);
+u8 *sub_80682A8(struct MapPosition *, u8, u8);
void overworld_poison_timer_set(void);
void prev_quest_postbuffer_cursor_backup_reset(void);
-u8 *sub_8068E24(struct UnkStruct_8054FF8_Substruct *);
+u8 *sub_8068E24(struct MapPosition *);
u8 *GetFieldObjectScriptPointerForComparison();
// asm/field_tasks.o
diff --git a/include/battle_setup.h b/include/battle_setup.h
index 6271a3cc5..2a1a2e717 100644
--- a/include/battle_setup.h
+++ b/include/battle_setup.h
@@ -71,7 +71,7 @@ u8 *sub_8082880(void);
// sub_8082AE4
// sub_8082B10
// sub_8082B44
-// sub_8082B78
+void sub_8082B78(void);
// sub_8082BA4
void sub_8082BD0(u16, u16);
// sub_8082C0C
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index 9f6f634f7..630d7b19d 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -69,8 +69,8 @@ void sub_80597F4(void);
u8 sub_805983C(u8 a, u8 b);
u8 GetPlayerAvatarGraphicsIdByStateId(u8 a);
// GetPlayerAvatarGenderByGraphicsId
-// PartyHasMonWithSurf
-// IsPlayerSurfingNorth
+bool8 PartyHasMonWithSurf(void);
+bool8 IsPlayerSurfingNorth(void);
bool8 IsPlayerFacingSurfableFishableWater(void);
// ClearPlayerAvatarInfo
void SetPlayerAvatarStateMask(u8 a);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 95ccf2614..de465ac95 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -80,14 +80,15 @@ struct WarpEvent
{
s16 x, y;
s8 warpId;
- s8 mapGroup;
- s8 mapNum;
+ u8 mapGroup;
+ u8 mapNum;
+ u8 unk7;
};
struct CoordEvent
{
s16 x, y;
- u8 filler_4;
+ u8 unk4;
u8 filler_5;
u16 trigger;
u16 index;
@@ -98,7 +99,7 @@ struct CoordEvent
struct BgEvent
{
s16 x, y;
- u8 filler_4;
+ u8 unk4;
u8 kind;
s16 filler_6;
u8 *script;
diff --git a/include/global.h b/include/global.h
index a5932d175..a9056ed55 100644
--- a/include/global.h
+++ b/include/global.h
@@ -410,11 +410,11 @@ struct SaveBlock2 /* 0x02024EA4 */
/*0xA8*/ struct SaveBlock2_Sub filler_A8;
};
-struct UnkStruct_8054FF8_Substruct
+struct MapPosition
{
s16 x;
s16 y;
- u8 field_8;
+ u8 height;
};
struct UnkStruct_8054FF8
@@ -423,7 +423,7 @@ struct UnkStruct_8054FF8
u8 b;
u8 c;
u8 d;
- struct UnkStruct_8054FF8_Substruct sub;
+ struct MapPosition sub;
u16 field_C;
};
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index e7b4adfbd..2960a1b6f 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -103,7 +103,7 @@ bool8 sub_80576DC(u8);
bool8 MetatileBehavior_IsPacifidlogLog(u8);
bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
bool8 MetatileBehavior_IsRegionMap(u8);
-bool8 MetatileBehavior_IsClosedSootpolisGymDoor(u8);
+bool8 MetatileBehavior_IsClosedSootopolisGymDoor(u8);
bool8 MetatileBehavior_IsRoulette(u8);
bool8 MetatileBehavior_IsPokeblockFeeder(u8);
bool8 MetatileBehavior_0xBB(u8);
diff --git a/include/rom4.h b/include/rom4.h
index 44819cbee..215c7ff17 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -9,7 +9,8 @@ struct UnkPlayerStruct
u8 player_field_1;
};
-struct LinkPlayerMapObject {
+struct LinkPlayerMapObject
+{
u8 active;
u8 linkPlayerId;
u8 mapObjId;
@@ -35,21 +36,21 @@ void update_saveblock1_field_object_movement_behavior(u8, u8);
// warp_shift
// warp_set
// warp_data_is_not_neg_1
-// get_mapheader_by_bank_and_number
+struct MapHeader * const get_mapheader_by_bank_and_number(u16 mapGroup, u16 mapNum);
// warp1_get_mapheader
// set_current_map_header_from_sav1_save_old_name
// sub_805338C
// sub_80533CC
void warp_in(void);
void warp1_set(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-// warp1_set_2
+void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId);
void saved_warp2_set(int unused, s8 mapGroup, s8 mapNum, s8 warpId);
void saved_warp2_set_2(int unused, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
// sub_8053538
void sub_8053570(void);
void sub_8053588(u8);
-// sub_80535C4
+void sub_80535C4(s16 a1, s16 a2);
void sub_805363C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
// sub_8053678
void sub_8053690(s8, s8, s8, s8, s8);
@@ -62,8 +63,8 @@ void sub_8053720(s16, s16);
void gpu_sync_bg_hide();
// sub_8053818
// sub_8053850
-// sub_80538B0
-// sub_80538D0
+bool8 sub_80538B0(u16 x, u16 y);
+bool8 sub_80538D0(u16 x, u16 y);
// sub_80538F0
// sub_8053994
void player_avatar_init_params_reset(void);
diff --git a/include/vars.h b/include/vars.h
index 4661bbd52..e041e33bb 100644
--- a/include/vars.h
+++ b/include/vars.h
@@ -1,24 +1,26 @@
#ifndef GUARD_VARS_H
#define GUARD_VARS_H
-#define VAR_RECYCLE_GOODS 0x4020
-#define VAR_REPEL_STEP_COUNT 0x4021
+#define VAR_RECYCLE_GOODS 0x4020
+#define VAR_REPEL_STEP_COUNT 0x4021
-#define VAR_FIRST_POKE 0x4023
-#define VAR_MIRAGE_RND_H 0x4024
-#define VAR_MIRAGE_RND_L 0x4025
+#define VAR_FIRST_POKE 0x4023
+#define VAR_MIRAGE_RND_H 0x4024
+#define VAR_MIRAGE_RND_L 0x4025
-#define VAR_RESET_RTC_ENABLE 0x402C
+#define VAR_HAPPINESS_STEP_COUNTER 0x402A
+#define VAR_POISON_STEP_COUNTER 0x402B
+#define VAR_RESET_RTC_ENABLE 0x402C
-#define VAR_DAYS 0x4040
+#define VAR_DAYS 0x4040
-#define VAR_POKELOT_PRIZE 0x4045
-#define VAR_NATIONAL_DEX 0x4046
-#define VAR_SHROOMISH_SIZE_RECORD 0x4047
+#define VAR_POKELOT_PRIZE 0x4045
+#define VAR_NATIONAL_DEX 0x4046
+#define VAR_SHROOMISH_SIZE_RECORD 0x4047
-#define VAR_POKELOT_RND1 0x404B
-#define VAR_POKELOT_RND2 0x404C
+#define VAR_POKELOT_RND1 0x404B
+#define VAR_POKELOT_RND2 0x404C
-#define VAR_BARBOACH_SIZE_RECORD 0x404F
+#define VAR_BARBOACH_SIZE_RECORD 0x404F
#endif // GUARD_VARS_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 11:28:02 +0000