Add hack to load bss texture in ovl_En_Jsjutan (fixes #69) #1482
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rozelette
commented
Sep 15, 2022
| @@ -402,7 +402,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { | |||
| this->unk_164 = false; | |||
| u8* carpTex = ResourceMgr_LoadTexByName(sCarpetTex); | |||
| u8* shadTex = sShadowTex; | |||
| for (i = 0; i < ARRAY_COUNT(shadTex); i++) { | |||
There was a problem hiding this comment.
I have no idea why this worked before (IDO being bad?). But for the array size to be calculated correctly, it needed to be changed to something that was, well, an array
dcvz
approved these changes
Sep 15, 2022
dcvz
reviewed
Sep 15, 2022
| @@ -2110,11 +2110,6 @@ unsigned int dListBP; | |||
| int matrixBP; | |||
| uintptr_t clearMtx; | |||
|
|
|||
| extern "C" | |||
| { | |||
| uintptr_t jsjutanShadowTex = 0; | |||
Kenix3
approved these changes
Sep 20, 2022
Kenix3
pushed a commit
to Kenix3/Shipwright
that referenced
this pull request
Oct 19, 2022
…) (HarbourMasters#1482) * Add hack to load bss texture in ovl_En_Jsjutan * Remove (debug?) reference to jsjutanShadowTex in LUS
dcvz
pushed a commit
to briaguya-ai/Shipwright
that referenced
this pull request
Nov 12, 2022
…sters#1482) * Add hack to load bss texture in ovl_En_Jsjutan * Remove (debug?) reference to jsjutanShadowTex in LUS
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#69
The carpet shadow texture is (I think) the only texture that sources from an overlay's bss. This means it does does occupy any space in the ROM and therefore does not have a name in the OTR. This causes an issue when extracting it, since a proper reference can not be placed in the DL.
This PR adds a hack that replaces the reference in the DL to a texture in segment
0C, and modifies the actor to load the texture into segment0C. This is a scratch segment that actors can use (indeed, see that later on this actor uses it to load vertices into), so this is safe.There is a potential issue further down the road. Because this is a dynamically generated texture based on the carpet texture, if the carpet texture were to change (say, from a texture mod), the shadow would not be calculated correctly. Therefore, I think the long term solution would be to render the shadow with a shader based on the carpet texture. This is out-of-scope of this PR, however.
This will require a regen of the OTR. Do we have a process for this yet? Is there anything this PR should do accordingly?