diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-05-24 02:52:01 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 18:52:01 +0200 |
| commit | e68f321777be140726591b9a5dc4c45fe127d6d3 (patch) | |
| tree | 98317590b9cbdb73d2707d4bcf72b77aebbaf7e4 /src/code/z_construct.c | |
| parent | 2e6279bc8e528833704bc6b77635f0eeae6bbe44 (diff) | |
Document Magic (#1199)
* Magic docs WIP
* More docs, first round finished
* Better docs
* More renaming
* Simpler name
* Another small adjustment
* rm if(1)
* Better names again after in-game testing
* Change comments
* change comment
* Big rename based on all the suggestions
* Small touch-up
* More PR Suggestions
* RESTORE_IDLE -> RESET
* More docs
* Capitalization
* PR suggestions
* Make declaration consistent
* Health_ChangeBy (amount)
* PR Suggestions
* Missed one
* More PR Suggestions
* Change comment
* Add another clarity comment
* Discord discussions on `magicFillTarget`
* Comments
* grammar
* More comment clarity
* Another bad comment
* PR suggestions, improved comments
* One more comment
* one more thing
* bar -> meter
Diffstat (limited to 'src/code/z_construct.c')
| -rw-r--r-- | src/code/z_construct.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c index f4ce2ad7c..f1c93e63a 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -18,7 +18,7 @@ void func_801109B0(PlayState* play) { interfaceCtx->unk_1FA = interfaceCtx->unk_261 = interfaceCtx->unk_1FC = 0; interfaceCtx->unk_1EC = interfaceCtx->unk_1EE = interfaceCtx->unk_1F0 = 0; interfaceCtx->unk_22E = 0; - interfaceCtx->unk_230 = 16; + interfaceCtx->lensMagicConsumptionTimer = 16; interfaceCtx->unk_1F4 = 0.0f; interfaceCtx->unk_228 = XREG(95); interfaceCtx->minimapAlpha = 0; @@ -382,9 +382,9 @@ void func_80111070(void) { XREG(45) = 36; XREG(46) = 16; XREG(47) = 8; - R_MAGIC_BAR_SMALL_Y = 34; - R_MAGIC_BAR_X = 18; - R_MAGIC_BAR_LARGE_Y = 42; + R_MAGIC_METER_Y_HIGHER = 34; + R_MAGIC_METER_X = 18; + R_MAGIC_METER_Y_LOWER = 42; R_MAGIC_FILL_X = 26; XREG(52) = 0; XREG(53) = 1; |