mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-07 13:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Picto defines

Browse Source
This commit is contained in:
Derek Hensley
2022-10-06 20:49:46 -07:00
parent 7ff9f511ad
commit ef4db3887f
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_play.c
+3 -1
View File
@@ -211,7 +211,9 @@ void Play_TriggerPictographPhoto(void) {
void Play_TakePictographPhoto(PreRender* prerender) {
PreRender_ApplyFilters(prerender);
Play_ConvertRgba16ToIntensityImage(gPictoPhotoI8, prerender->fbufSave, 320, 80, 64, 240 - 1, 176 - 1, 8);
Play_ConvertRgba16ToIntensityImage(gPictoPhotoI8, prerender->fbufSave, SCREEN_WIDTH, PICTO_TOPLEFT_X,
PICTO_TOPLEFT_Y, (PICTO_TOPLEFT_X + PICTO_RESOLUTION_WIDTH) - 1,
(PICTO_TOPLEFT_Y + PICTO_RESOLUTION_HEIGHT) - 1, 8);
}
s32 Play_ChooseDynamicTransition(PlayState* this, s32 transitionType) {
src/code/z_snap.c
+1 -1
View File
@@ -174,7 +174,7 @@ s32 Snap_ValidatePictograph(PlayState* play, Actor* actor, s32 flag, Vec3f* pos,
y = (s16)PROJECTED_TO_SCREEN_Y(projectedPos, distance) - PICTO_CAPTURE_REGION_TOPLEFT_Y;
// checks if the coordinates are within the capture region
if ((x < 0) || (x > PICTO_RESOLUTION_HORIZONTAL) || (y < 0) || (y > PICTO_RESOLUTION_VERTICAL)) {
if ((x < 0) || (x > PICTO_CAPTURE_REGION_WIDTH) || (y < 0) || (y > PICTO_CAPTURE_REGION_HEIGHT)) {
Snap_SetFlag(PICTOGRAPH_NOT_IN_VIEW);
ret |= PICTOGRAPH_NOT_IN_VIEW;
}