Skip to content

Commit

Permalink
fixed teleportation
Browse files Browse the repository at this point in the history
  • Loading branch information
glankk committed Jul 30, 2016
1 parent 35dbc8b commit 97d81e5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion gz.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,10 @@ ENTRY void _start(void *text_ptr)
stored_rot[tp_slot] = z64_link_rot;
}
if (input_ptr->pad & BUTTON_D_RIGHT) {
(*(z64_xyz_t*)0x801DAA38) = stored_pos[tp_slot]; /* secondary position */
z64_link_pos = stored_pos[tp_slot];
(*(z64_xyz_t*)0x801DAA38) = stored_pos[tp_slot]; /* actor position */
z64_link_rot = stored_rot[tp_slot];
(*(uint16_t*)0x801DB25E) = stored_rot[tp_slot].y; /* locked rotation */
/* (*(uint8_t*)0x801DAADE) = 0xFF; prevents collision with actors */
}
}
Expand Down
2 changes: 1 addition & 1 deletion gz.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
</Unit>
<Unit filename="console.h" />
<Unit filename="gz.c">
<Option compilerVar="CPP" />
<Option compilerVar="CC" />
</Unit>
<Unit filename="gz.h" />
<Unit filename="menu.c">
Expand Down

0 comments on commit 97d81e5

Please sign in to comment.