summaryrefslogtreecommitdiff
path: root/src/code/z_snap.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code/z_snap.c')
-rw-r--r--src/code/z_snap.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/code/z_snap.c b/src/code/z_snap.c
index bce1f67d7..f85f33f0a 100644
--- a/src/code/z_snap.c
+++ b/src/code/z_snap.c
@@ -12,8 +12,8 @@ s32 func_8013A240(GlobalContext* globalCtx) {
s32 seen;
s32 count = 0;
- gSaveContext.pictoFlags0 = 0;
- gSaveContext.pictoFlags1 = 0;
+ gSaveContext.save.pictoFlags0 = 0;
+ gSaveContext.save.pictoFlags1 = 0;
if (globalCtx->sceneNum == SCENE_20SICHITAI) {
func_8013A41C(1);
@@ -76,19 +76,19 @@ s32 func_8013A240(GlobalContext* globalCtx) {
void func_8013A41C(s32 flag) {
if (flag < 0x20) {
- gSaveContext.pictoFlags0 |= (1 << flag);
+ gSaveContext.save.pictoFlags0 |= (1 << flag);
} else {
flag &= 0x1F;
- gSaveContext.pictoFlags1 |= (1 << flag);
+ gSaveContext.save.pictoFlags1 |= (1 << flag);
}
}
void func_8013A46C(s32 flag) {
if (flag < 0x20) {
- gSaveContext.pictoFlags0 &= ~(1 << flag);
+ gSaveContext.save.pictoFlags0 &= ~(1 << flag);
} else {
flag &= 0x1F;
- gSaveContext.pictoFlags1 &= ~(1 << flag);
+ gSaveContext.save.pictoFlags1 &= ~(1 << flag);
}
}
@@ -96,10 +96,10 @@ u32 func_8013A4C4(s32 flag) {
SaveContext* saveCtx = &gSaveContext;
if (flag < 0x20) {
- return saveCtx->pictoFlags0 & (1 << flag);
+ return saveCtx->save.pictoFlags0 & (1 << flag);
} else {
flag &= 0x1F;
- return saveCtx->pictoFlags1 & (1 << flag);
+ return saveCtx->save.pictoFlags1 & (1 << flag);
}
}
@@ -135,7 +135,7 @@ s32 func_8013A530(GlobalContext* globalCtx, Actor* actor, s32 flag, Vec3f* pos,
Actor_GetProjectedPos(globalCtx, pos, &screenSpace, &distance);
x = (s16)(screenSpace.x * distance * 160.0f + 160.0f) - 85;
y = (s16)(screenSpace.y * distance * -120.0f + 120.0f) - 67;
- if ((x < 0) || (0x96 < x) || (y < 0) || (0x69 < y)) {
+ if ((x < 0) || (150 < x) || (y < 0) || (105 < y)) {
func_8013A41C(0x3D);
ret |= 0x3D;
}