summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2017-01-04 17:31:44 -0500
committerYamaArashi <YamaArashi@users.noreply.github.com>2017-01-04 14:31:44 -0800
commit370c7f78539698902907f262721fe60e606c774d (patch)
treeca842638903ee4d3badfabd73d1d761e87281d77 /include
parent3c1109d03f5e4581336ee870ed710567498e256f (diff)
more labels (#159)
* labels for tv.c and tv.s * match function prologue a little bit better * whoops * label and document lottery_corner.c * gSoftResetDisabled * add labels for main_menu.c * labels for metatile_behavior.c
Diffstat (limited to 'include')
-rw-r--r--include/load_save.h4
-rw-r--r--include/lottery_corner.h12
-rw-r--r--include/main.h2
-rw-r--r--include/metatile_behavior.h60
4 files changed, 39 insertions, 39 deletions
diff --git a/include/load_save.h b/include/load_save.h
index 5ca52a2fc..a3c2c609c 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -11,7 +11,7 @@ void SavePlayerParty(void);
void LoadPlayerParty(void);
void SaveSerializedGame(void);
void LoadSerializedGame(void);
-void LoadPlayerData(void);
-void SavePlayerData(void);
+void LoadPlayerBag(void);
+void SavePlayerBag(void);
#endif // GUARD_LOAD_SAVE_H
diff --git a/include/lottery_corner.h b/include/lottery_corner.h
index 06f38a5c9..5e2346d37 100644
--- a/include/lottery_corner.h
+++ b/include/lottery_corner.h
@@ -1,12 +1,12 @@
#ifndef GUARD_LOTTERY_CORNER_H
#define GUARD_LOTTERY_CORNER_H
-void sub_8145A78(void);
-void sub_8145AA4(u16 a);
-void sub_8145AEC(void);
+void ResetLotteryCorner(void);
+void SetRandomLotteryNumber(u16 i);
+void RetrieveLotteryNumber(void);
void PickLotteryCornerTicket(void);
-void sub_8145D14(u32 a);
-u32 sub_8145D3C(void);
-void unref_sub_8145D64(u16 a);
+void SetLotteryNumber(u32 lotteryNum);
+u32 GetLotteryNumber(void);
+void SetLotteryNumber16_Unused(u16 lotteryNum);
#endif // GUARD_LOTTERY_CORNER_H
diff --git a/include/main.h b/include/main.h
index 5d8f8b68a..bed3a5749 100644
--- a/include/main.h
+++ b/include/main.h
@@ -45,7 +45,7 @@ struct Main
extern u8 gUnknown_3001764;
extern struct Main gMain;
-extern u8 gUnknown_3001BB4;
+extern bool8 gSoftResetDisabled;
extern bool8 gLinkVSyncDisabled;
extern const u8 gGameVersion;
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 34b660054..e7b4adfbd 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -1,31 +1,31 @@
#ifndef GUARD_METATILE_BEHAVIOR
#define GUARD_METATILE_BEHAVIOR
-bool8 sub_8056D9C(u8);
-bool8 sub_8056DA0(u8);
+bool8 MetatileBehavior_IsATile(u8);
+bool8 MetatileBehavior_IsEncounterTile(u8);
bool8 MetatileBehavior_IsJumpEast(u8);
bool8 MetatileBehavior_IsJumpWest(u8);
bool8 MetatileBehavior_IsJumpNorth(u8);
bool8 MetatileBehavior_IsJumpSouth(u8);
-bool8 sub_8056E14(u8);
+bool8 MetatileBehavior_IsPokeGrass(u8);
bool8 MetatileBehavior_IsSandOrDeepSand(u8);
bool8 MetatileBehavior_IsDeepSand(u8);
bool8 MetatileBehavior_IsReflective(u8);
bool8 MetatileBehavior_IsIce(u8);
-bool8 is_tile_x69_2_warp_door(u8);
+bool8 MetatileBehavior_IsWarpDoor(u8);
bool8 MetatileBehavior_IsDoor(u8);
bool8 MetatileBehavior_IsEscalator(u8);
bool8 unref_sub_8056EE0(u8);
bool8 MetatileBehavior_IsLadder(u8);
-bool8 sub_8056F08(u8);
-bool8 sub_8056F24(u8);
+bool8 MetatileBehavior_IsNonAnimDoor(u8);
+bool8 MetatileBehavior_IsDeepSouthWarp(u8);
bool8 MetatileBehavior_IsSurfableWaterOrUnderwater(u8);
bool8 MetatileBehavior_IsEastArrowWarp(u8);
bool8 MetatileBehavior_IsWestArrowWarp(u8);
bool8 MetatileBehavior_IsNorthArrowWarp(u8);
bool8 MetatileBehavior_IsSouthArrowWarp(u8);
bool8 MetatileBehavior_IsArrowWarp(u8);
-bool8 sub_8056FFC(u8);
+bool8 MetatileBehavior_IsMoveTile(u8);
bool8 MetatileBehavior_IsIce_2(u8);
bool8 MetatileBehavior_IsTrickHouseSlipperyFloor(u8);
bool8 MetatileBehavior_0x05(u8);
@@ -46,10 +46,10 @@ bool8 MetatileBehavior_IsPlayerFacingTVScreen(u8, u8);
bool8 MetatileBehavior_IsPC(u8);
bool8 is_tile_x84(u8);
bool8 sub_80571C0(u8);
-bool8 sub_80571EC(u8);
-bool8 sub_805720C(u8);
-bool8 is_tile_x98(u8);
-bool8 sub_8057238(u8);
+bool8 MetatileBehavior_IsSecretBaseCave(u8);
+bool8 MetatileBehavior_IsSecretBaseTree(u8);
+bool8 MetatileBehavior_IsSecretBaseShrub(u8);
+bool8 MetatileBehavior_IsSecretBasePC(u8);
bool8 sub_805724C(u8);
bool8 unref_sub_8057260(u8);
bool8 sub_8057274(u8);
@@ -83,8 +83,8 @@ bool8 sub_80574D8(u8);
bool8 sub_80574EC(u8);
bool8 sub_805750C(u8);
bool8 MetatileBehavior_IsShallowFlowingWater(u8);
-bool8 sub_8057540(u8);
-bool8 sub_8057554(u8);
+bool8 MetatileBehavior_IsThinIce(u8);
+bool8 MetatileBehavior_IsCrackedIce(u8);
bool8 sub_8057568(u8);
bool8 unref_sub_8057584(u8);
bool8 sub_805759C(u8);
@@ -101,20 +101,20 @@ bool8 sub_80576B4(u8);
bool8 sub_80576C8(u8);
bool8 sub_80576DC(u8);
bool8 MetatileBehavior_IsPacifidlogLog(u8);
-bool8 is_tile_x8C(u8);
-bool8 is_tile_x85(u8);
-bool8 is_tile_x8B(u8);
-bool8 is_tile_x8A(u8);
-bool8 is_tile_x87(u8);
+bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
+bool8 MetatileBehavior_IsRegionMap(u8);
+bool8 MetatileBehavior_IsClosedSootpolisGymDoor(u8);
+bool8 MetatileBehavior_IsRoulette(u8);
+bool8 MetatileBehavior_IsPokeblockFeeder(u8);
bool8 MetatileBehavior_0xBB(u8);
bool8 MetatileBehavior_0xBC(u8);
-bool8 sub_8057798(u8);
-bool8 is_role_x68(u8);
+bool8 MetatileBehavior_IsLavaridgeB1FWarp(u8);
+bool8 MetatileBehavior_IsLavaridge1FWarp(u8);
bool8 MetatileBehavior_IsAquaHideoutWarp(u8);
bool8 MetatileBehavior_IsSurfableFishableWater(u8);
-bool8 sub_8057804(u8);
-bool8 sub_8057818(u8);
-bool8 sub_805782C(u8);
+bool8 MetatileBehavior_IsMtPyreHole(u8);
+bool8 MetatileBehavior_IsCrackedFloorHole(u8);
+bool8 MetatileBehavior_IsCrackedFloor(u8);
bool8 MetatileBehavior_IsMuddySlope(u8);
bool8 MetatileBehavior_IsBumpySlope(u8);
bool8 MetatileBehavior_IsIsolatedVerticalRail(u8);
@@ -125,12 +125,12 @@ bool8 MetatileBehavior_IsSeaweed(u8);
bool8 MetatileBehavior_IsRunningDisallowed(u8);
bool8 sub_80578F8(u8);
bool8 sub_805791C(u8);
-bool8 sub_8057930(u8);
-bool8 sub_8057944(u8);
-bool8 sub_8057958(u8);
-bool8 sub_805796C(u8);
-bool8 sub_8057980(u8);
-bool8 sub_8057994(u8);
-bool8 sub_80579A8(u8);
+bool8 MetatileBehavior_IsPictureBookShelf(u8);
+bool8 MetatileBehavior_IsBookShelf(u8);
+bool8 MetatileBehavior_IsPokeCenterBookShelf(u8);
+bool8 MetatileBehavior_IsVase(u8);
+bool8 MetatileBehavior_IsTrashCan(u8);
+bool8 MetatileBehavior_IsShopShelf(u8);
+bool8 MetatileBehavior_IsBlueprint(u8);
#endif // GUARD_METATILE_BEHAVIOR