diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2022-02-05 12:49:21 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-05 01:49:21 +0000 |
| commit | 2104c163628b1e6fbea36cd5c648fca515960a39 (patch) | |
| tree | 101de7d2633ea069212ca8a02c1f3ec6b59f25cf /src/code/z_parameter.c | |
| parent | bcdd99df08f58fed2cb7f99331b21550fda1f1ca (diff) | |
code_8012EC80.c OK and Documented + parameter_static extraction (#534)
* Match remaining functions of code_8012EC80.c
* parameter_static extracted and OK
* Small Progress
* Documentation all over the place
* Finish Documenting
* Cleanup
* Name more textures
* Update knowledge on deku playground player name
* All textures from parameter_static known now
* Finish documenting and validating parameter_static
* More up-to-date SaveContext docs
* More docs
* More cleanup
* Sun -> Star
* Minor touchup
* More cleanup
* pictograph -> pictoBox
* Remove the "unused" part
* More accurate name: hour lines
* It's gsDPLoadTextureBlock, not gsDPSetTextureImage
* Fix parameter_static and merge issues
* More docs from new PRs and Parameter WIP
* Missed a name
* Move parameter_static to interface assets
* Clean up code_8012EC80.c data
* Fix comment
* Add comments to parameter_static
* Oops
* fix merge
* Missed a PR review suggestion
* Fix merge
Diffstat (limited to 'src/code/z_parameter.c')
| -rw-r--r-- | src/code/z_parameter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index ec227aaa9..44b1de152 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -72,9 +72,9 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114CA0.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114E90.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_HasEmptyBottle.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114F2C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_HasItemInBottle.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/func_80114FD0.s") |