diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-05-10 02:59:23 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-09 18:59:23 +0200 |
| commit | 95b431793182bd021cb4234255f90b996edd8d4d (patch) | |
| tree | 13b56539e1ecab971892ebe3d333b13113262245 /src/code/z_construct.c | |
| parent | 6cd8029cd5e039a1094260da49d50b35a36f4f2a (diff) | |
Audio Ocarina Documentation (#1026)
* Begin ocarina documentation
* Many ocarina-related docs
* More ocarina docs
* Introduce Ocarina Fonts Enum
* Fix ocarina font enum
* Fix incorrect documentation, more documentation
* Ocarina recording documentation
* cleanup
* Small touch-ups
* Fix font -> instrument
* format
* Better docs on playback, memory game
* more cleanup
* Add z64ocarina.h
* Clean up names
* final cleanup
* typo
* Fix description
* better docs
* Fix channel -> channelIdx
* Fix old "font" name to correct "instrument" name, add io port docs
* Add comments to clarify certain lines/functions
* format
* Rename noteIdx to pitch
* Missed a name
* Add comment on pitch
* `reset` -> `SetInstrument` and `displayed` -> `playback`
* Clarify audio_update and windmill comment
* Minor PR fixes
* Revert Audio_Update because there are 2 different Audio_Update functions
* PR Feedback
* Ocarina Idx -> Index
* Introduce OCARINA_BTN_C_RIGHT_OR_C_LEFT
* PR Suggestions
* Next PR Suggestions
* Next PR Feedback
* consistency
* Better docs (PR)
* Better comment
Diffstat (limited to 'src/code/z_construct.c')
| -rw-r--r-- | src/code/z_construct.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/code/z_construct.c b/src/code/z_construct.c index fbfc9dcb0..cbf9983ad 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -533,8 +533,8 @@ void func_80111070(void) { VREG(25) = 0; VREG(26) = 0; VREG(27) = 0; - R_OCARINA_NOTES_XPOS = 98; - R_OCARINA_NOTES_XPOS_OFFSET = 18; + R_OCARINA_BUTTONS_XPOS = 98; + R_OCARINA_BUTTONS_XPOS_OFFSET = 18; VREG(30) = 0; VREG(31) = 0; VREG(32) = 0; @@ -551,13 +551,13 @@ void func_80111070(void) { VREG(42) = 250; VREG(43) = 440; VREG(44) = 10; - R_OCARINA_NOTES_YPOS(0) = 190; - R_OCARINA_NOTES_YPOS(1) = 184; - R_OCARINA_NOTES_YPOS(2) = 176; - R_OCARINA_NOTES_YPOS(3) = 172; - R_OCARINA_NOTES_YPOS(4) = 170; + R_OCARINA_BUTTONS_YPOS(0) = 190; + R_OCARINA_BUTTONS_YPOS(1) = 184; + R_OCARINA_BUTTONS_YPOS(2) = 176; + R_OCARINA_BUTTONS_YPOS(3) = 172; + R_OCARINA_BUTTONS_YPOS(4) = 170; VREG(50) = 30; - R_OCARINA_NOTES_YPOS_OFFSET = 0; + R_OCARINA_BUTTONS_YPOS_OFFSET = 0; VREG(52) = -16; VREG(53) = 230; VREG(54) = 230; |