mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

Fix/cleanup/rephrase miscellaneous stuff (#983)

Browse source 
* 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 c801337dde.

* 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 d80bdb32da.

* 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`
This commit is contained in:
Dragorn421 2021-10-03 05:17:09 +02:00 • committed by GitHub
parent 5c95f70d59
commit f1d27bf653
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 327 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h
View file

@ -9,45 +9,45 @@ struct BossMo;
typedef void (*BossMoActionFunc)(struct BossMo*, GlobalContext*);
typedef enum {
/* 0 */ MO_TENT_ACTION_STATE,
/* 1 */ MO_TENT_MOVE_TIMER,
/* 2 */ MO_TENT_VAR_TIMER,
/* 3 */ MO_TENT_UNK_TIMER,
/* 4 */ MO_TENT_INVINC_TIMER,
/* 5 */ MO_TENT_BASE_TEX1_X,
/* 6 */ MO_TENT_BASE_TEX1_Y,
/* 7 */ MO_TENT_BASE_TEX2_X,
/* 8 */ MO_TENT_BASE_TEX2_Y,
/* 0 */ MO_TENT_ACTION_STATE,
/* 1 */ MO_TENT_MOVE_TIMER,
/* 2 */ MO_TENT_VAR_TIMER,
/* 3 */ MO_TENT_UNK_TIMER,
/* 4 */ MO_TENT_INVINC_TIMER,
/* 5 */ MO_TENT_BASE_TEX1_X,
/* 6 */ MO_TENT_BASE_TEX1_Y,
/* 7 */ MO_TENT_BASE_TEX2_X,
/* 8 */ MO_TENT_BASE_TEX2_Y,
/* 9 */ MO_TENT_SHORT_MAX
} BossMoTentS16Var;
typedef enum {
/* 0 */ MO_CORE_ACTION_STATE,
/* 1 */ MO_CORE_MOVE_TIMER,
/* 2 */ MO_CORE_VAR_TIMER,
/* 3 */ MO_CORE_DMG_FLASH_TIMER,
/* 4 */ MO_CORE_INVINC_TIMER,
/* 5 */ MO_CORE_SHORT_5,
/* 6 */ MO_CORE_POS_IN_TENT,
/* 7 */ MO_CORE_DRAW_SHADOW,
/* 8 */ MO_CORE_WAIT_IN_WATER,
/* 9 */ MO_CORE_SHORT_MAX
/* 0 */ MO_CORE_ACTION_STATE,
/* 1 */ MO_CORE_MOVE_TIMER,
/* 2 */ MO_CORE_VAR_TIMER,
/* 3 */ MO_CORE_DMG_FLASH_TIMER,
/* 4 */ MO_CORE_INVINC_TIMER,
/* 5 */ MO_CORE_SHORT_5,
/* 6 */ MO_CORE_POS_IN_TENT,
/* 7 */ MO_CORE_DRAW_SHADOW,
/* 8 */ MO_CORE_WAIT_IN_WATER,
/* 9 */ MO_CORE_SHORT_MAX
} BossMoCoreS16Var;
typedef enum {
/* 0 */ MO_TENT_SWING_LAG_X,
/* 1 */ MO_TENT_SWING_SIZE_X,
/* 2 */ MO_TENT_SWING_RATE_X,
/* 3 */ MO_TENT_SWING_LAG_Z,
/* 4 */ MO_TENT_SWING_SIZE_Z,
/* 5 */ MO_TENT_SWING_RATE_Z,
/* 6 */ MO_TENT_MAX_STRETCH,
/* 7 */ MO_TENT_FLOAT_MAX
/* 0 */ MO_TENT_SWING_LAG_X,
/* 1 */ MO_TENT_SWING_SIZE_X,
/* 2 */ MO_TENT_SWING_RATE_X,
/* 3 */ MO_TENT_SWING_LAG_Z,
/* 4 */ MO_TENT_SWING_SIZE_Z,
/* 5 */ MO_TENT_SWING_RATE_Z,
/* 6 */ MO_TENT_MAX_STRETCH,
/* 7 */ MO_TENT_FLOAT_MAX
} BossMoTentF32Var;
typedef enum {
/* 0 */ MO_CORE_INTRO_WATER_ALPHA,
/* 7 */ MO_CORE_FLOAT_MAX
/* 0 */ MO_CORE_INTRO_WATER_ALPHA,
/* 1 */ MO_CORE_FLOAT_MAX
} BossMoCoreF32Var;
#define MO_SHORT_MAX MAX((s32)MO_TENT_SHORT_MAX, (s32)MO_CORE_SHORT_MAX)