mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-10 01:44:36 +00:00
Code Issues Projects Releases Wiki Activity

Document Magic (#1199)

Browse source 
* 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
This commit is contained in:
engineer124 2022-05-24 02:52:01 +10:00 • committed by GitHub
parent 2e6279bc8e
commit e68f321777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 327 additions and 249 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/code/z_sram.c
View file

@ -17,9 +17,9 @@ typedef struct {
/* 0x18 */ s16 rupees;
/* 0x1A */ u16 swordHealth;
/* 0x1C */ u16 naviTimer;
/* 0x1E */ u8 magicAcquired;
/* 0x1E */ u8 isMagicAcquired;
/* 0x1F */ u8 unk_1F;
/* 0x20 */ u8 doubleMagic;
/* 0x20 */ u8 isDoubleMagicAcquired;
/* 0x21 */ u8 doubleDefense;
/* 0x22 */ u8 bgsFlag;
/* 0x23 */ u8 ocarinaGameRoundNum;
@ -104,13 +104,13 @@ static SavePlayerData sNewSavePlayerData = {
0x30, // healthCapacity
0x30, // defense
0, // magicLevel
0x30, // magic
MAGIC_NORMAL_METER, // magic
0, // rupees
0, // swordHealth
0, // naviTimer
0, // magicAcquired
false, // isMagicAcquired
0, // unk_1F
0, // doubleMagic
false, // isDoubleMagicAcquired
0, // doubleDefense
0, // bgsFlag
0, // ocarinaGameRoundNum
@ -189,13 +189,13 @@ static SavePlayerData sDebugSavePlayerData = {
0xE0, // healthCapacity
0xE0, // health
0, // magicLevel
0x30, // magic
MAGIC_NORMAL_METER, // magic
150, // rupees
8, // swordHealth
0, // naviTimer
1, // magicAcquired
true, // isMagicAcquired
0, // unk_1F
0, // doubleMagic
false, // isDoubleMagicAcquired
0, // doubleDefense
0, // bgsFlag
0, // ocarinaGameRoundNum