Decomp and integrate sub_8099360 - sub_809965C. #235
Conversation
src/code_8099360.c
Outdated
| script_disc = GetScriptVarValue(NULL, DUNGEON_ENTER); | ||
| if (script_disc == 0x50) { | ||
| script_disc = GetScriptVarValue(NULL, DUNGEON_ENTER_INDEX); | ||
| *(u8 *)param = script_disc; |
There was a problem hiding this comment.
What's going on here, why volatile and then another cast? Probably unneeded, but if it is needed, it deserves comments
There was a problem hiding this comment.
I guess my reasoning is because in src/post_office_guide2.c in DisplayMissionObjectives() a volatile gets passed in, sub_8099394 gets a volatile u8 local_94 passed in, but everywhere else it's called it uses just a regular u8*, so this way it preserves the properties of both. I'm not sure why DisplayMissionObjectives() uses a volatile there, but I didn't want to disrupt the functionality of the function there. Removing the volatile and cast gives the following warning/error:
src/post_office_guide2.c: In function `DisplayMissionObjectives': src/post_office_guide2.c:116: warning: passing arg 1 of `sub_8099394' discards qualifiers from pointer target type
There was a problem hiding this comment.
Function still matches without the volatile. Usually we use it for variables to force it on the stack. Might want to try removing volatile from the function declaration in post_office_guide2.c and see if it still matches.
https://decomp.me/scratch/6BPvc <- decomp.me link for sub_8099394
There was a problem hiding this comment.
Ah I actually got it! If in the code above we change line 116 to sub_8099394((u8 *)&local_94); it compiles and make compare is OK. This resolves the dependency of volatile in sub_8099394. I can push the patch to this in a moment
|
I can also rebase/squash if that's preferred |
|
No need, this project doesn't require that level of Git etiquette. |
|
Gotcha! Well let me know if there is anything else that seems wrong, otherwise the 2nd commit should have fixed the issue @Kermalis and @SethBarberee mentioned. |
Quite a few functions so please take the time to go over and feel free to nitpick! I'd be happy to amend any new changes, and It's possible I've overlooked something!