Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make a XML for ganon_mant #961

Merged
merged 5 commits into from
Sep 18, 2021
Merged

Make a XML for ganon_mant #961

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e913ba3
Make a XML for ganon_mant
AngheloAlf Sep 12, 2021
0bff3ae
cleanup
AngheloAlf Sep 12, 2021
79da364
Apply suggestions from code review
AngheloAlf Sep 12, 2021
6cd1125
sForceAlignment
AngheloAlf Sep 12, 2021
33ee2a6
Merge branch 'ganon_mant_xml' of github.com:AngheloAlf/oot into ganon…
AngheloAlf Sep 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
  • Loading branch information
@AngheloAlf @Thar0
AngheloAlf and Thar0 committed Sep 12, 2021
commit 79da364665fd1562650d3ee9609142b4dfa86ddb
2 changes: 1 addition & 1 deletion assets/xml/overlays/ovl_En_Ganon_Mant.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<DList Name="gMantTexDL" Offset="0x3318"/>

<!-- ! @bug sMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
<!-- ! @bug gMantUnusedTex is 32x32 not 32x64, however this dlist is unused -->
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this the right way to document a bug in assets? Or just lack of a better option

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when we move toward committing the c files it will be easier to just put it right in the file. but for now this is all we got i guess

<DList Name="gMantUnusedTexDL" Offset="0x3370"/>

<DList Name="gMantDL" Offset="0x33C8"/>
Expand Down
2 changes: 1 addition & 1 deletion src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void EnGanonMant_Tear(EnGanonMant* this) {
if (1) {}
for (areaY = 0; areaY <= tearAreaSizes[i]; areaY++) {
texIdx = (s16)((s16)tx + ((s16)ty * MANT_TEX_WIDTH)) + ((s16)areaX + ((s16)areaY * MANT_TEX_WIDTH));
if (texIdx < (s32)(MANT_TEX_WIDTH * MANT_TEX_WIDTH * sizeof(u16))) {
if (texIdx < MANT_TEX_WIDTH * MANT_TEX_HEIGHT) {
((u16*)gMantTex)[texIdx] = 0;
}
}
Expand Down