summaryrefslogtreecommitdiff
path: root/src/code/sys_cfb.c
diff options
context:
space:
mode:
authorDragorn421 <Dragorn421@users.noreply.github.com>2021-10-03 05:17:09 +0200
committerGitHub <noreply@github.com>2021-10-02 23:17:09 -0400
commitf1d27bf6531fd6579d09dcf3078ee97c57b6fff1 (patch)
tree54d463be5b46f7fe77d1da1d8c34972db9092262 /src/code/sys_cfb.c
parent5c95f70d5913ade28916464812c89c4dfa209e9e (diff)
Fix/cleanup/rephrase miscellaneous stuff (#983)
* Add parens around params usage in VEC_SET macro * Remove unnecessary space character in a xml * Use defines instead of magic values in head/tail magic comments * Use `OS_USEC_TO_CYCLES` to make a time look better in `Graph_TaskSet00` * `0x25800` -> `sizeof(u16[SCREEN_HEIGHT][SCREEN_WIDTH])` * `0x803DA800` -> `0x80400000 - frame buffer size` * Use `OS_VI_` defines instead of hex * Add empty line after some variable declarations * Remove unused `extern CutsceneData` in `z_bg_dy_yoseizo.c` * `Matrix_MtxFToYXZRotS` does not use `MTXMODE_` * Use `MTXMODE_` more * Remove `ASCII_TO_U32`, use `'IS64'` * Add explicit `!= NULL` in some ternaries * Use `INV_CONTENT`, `AMMO` macros more * Use `PLAYER_AP_` enum more to compare to `Player#heldItemActionParam` * Get rid of lowercase hex (outside libultra) * `gWindMill*` -> `gWindmill*` * Format and small fix enums in `z_boss_mo.h` * Use `CHECK_BTN_ANY` more * Fix xz/xy mistake in comment in tektite * Rephrase comments mentioning "the devs" in a more neutral way * Clean-up some objectively useless parens * Fix some negative values written as u16 instead of s16 in ichains * `SKJ_ACTON_` -> `SKJ_ACTION_` * Run formatter * Fix unk_ offset of `TransformUpdateIndex#unk_10` -> `unk_0E` * Remove comments using in-game text * Remove `U` suffix from integer literals * Revert "Remove `ASCII_TO_U32`, use `'IS64'`" This reverts commit c801337dde9fe5e8b7a7ecf85ad3629bf5b87aaf. * Use `PLAYER_STR_*` to compare to `CUR_UPG_VALUE(UPG_STRENGTH)` * Add empty line after decl x2 * Revert "Use `PLAYER_STR_*` to compare to `CUR_UPG_VALUE(UPG_STRENGTH)`" This reverts commit d80bdb32da449edc74e02b8ab3f5a2c532e74bdb. * Make `CUR_UPG_VALUE(UPG_STRENGTH)` compare to integers (eventually needs its own enum) * Only use `PLAYER_SHIELD_` enum with `Player#currentShield` * Only use `PLAYER_TUNIC_` enum with `Player#currentTunic`
Diffstat (limited to 'src/code/sys_cfb.c')
-rw-r--r--src/code/sys_cfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c
index 4e81327ea..3c65b7aec 100644
--- a/src/code/sys_cfb.c
+++ b/src/code/sys_cfb.c
@@ -7,7 +7,7 @@ void SysCfb_Init(s32 n64dd) {
u32 screenSize;
u32 tmpFbEnd;
- if (osMemSize >= 0x800000U) {
+ if (osMemSize >= 0x800000) {
// "8MB or more memory is installed"
osSyncPrintf("8Mバイト以上のメモリが搭載されています\n");
tmpFbEnd = 0x8044BE80;
@@ -19,7 +19,7 @@ void SysCfb_Init(s32 n64dd) {
osSyncPrintf("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024));
sSysCfbEnd = tmpFbEnd;
}
- } else if (osMemSize >= 0x400000U) {
+ } else if (osMemSize >= 0x400000) {
osSyncPrintf("RAM4M mode\n");
sSysCfbEnd = 0x80400000;
} else {
@@ -27,7 +27,7 @@ void SysCfb_Init(s32 n64dd) {
}
screenSize = SCREEN_WIDTH * SCREEN_HEIGHT;
- sSysCfbEnd &= ~0x3f;
+ sSysCfbEnd &= ~0x3F;
// "The final address used by the system is %08x"
osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd);
sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4);