diff --git a/src/game/game_0b28d0.c b/src/game/game_0b28d0.c index cb420de03..ffb286f12 100644 --- a/src/game/game_0b28d0.c +++ b/src/game/game_0b28d0.c @@ -8341,26 +8341,14 @@ void func0f0b9afc(void) } } -GLOBAL_ASM( -glabel warpBondToPad -/* f0b9b68: 27bdffe8 */ addiu $sp,$sp,-24 -/* f0b9b6c: afbf0014 */ sw $ra,0x14($sp) -/* f0b9b70: afa40018 */ sw $a0,0x18($sp) -/* f0b9b74: 0fc2e58f */ jal setTickMode -/* f0b9b78: 24040003 */ addiu $a0,$zero,0x3 -/* f0b9b7c: 3c018007 */ lui $at,0x8007 -/* f0b9b80: ac200744 */ sw $zero,0x744($at) -/* f0b9b84: 0fc31f7b */ jal releaseObj -/* f0b9b88: 24040005 */ addiu $a0,$zero,0x5 -/* f0b9b8c: 0fc30748 */ jal func0f0c1d20 -/* f0b9b90: 00000000 */ sll $zero,$zero,0x0 -/* f0b9b94: 8fbf0014 */ lw $ra,0x14($sp) -/* f0b9b98: 87ae001a */ lh $t6,0x1a($sp) -/* f0b9b9c: 3c01800a */ lui $at,0x800a -/* f0b9ba0: 27bd0018 */ addiu $sp,$sp,0x18 -/* f0b9ba4: 03e00008 */ jr $ra -/* f0b9ba8: a42edde8 */ sh $t6,-0x2218($at) -); +void warpBondToPad(s16 pad) +{ + setTickMode(TICKMODE_3); + var80070744 = 0; + releaseObj(5); + func0f0c1d20(); + g_WarpPadId = pad; +} GLOBAL_ASM( glabel func0f0b9bac diff --git a/src/gvars/gvars.c b/src/gvars/gvars.c index ddef0812e..d9844e340 100644 --- a/src/gvars/gvars.c +++ b/src/gvars/gvars.c @@ -16934,7 +16934,7 @@ f32 var8009ddd8 = 0; f32 var8009dddc = 0; f32 var8009dde0 = 0; f32 var8009dde4 = 0; -u32 var8009dde8 = 0; +s16 g_WarpPadId = 0; u32 var8009ddec = 0; u32 var8009ddf0 = 0; u32 var8009ddf4 = 0; diff --git a/src/include/constants.h b/src/include/constants.h index 2a6220ce6..d23009b42 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1747,6 +1747,7 @@ #define TICKMODE_0 0 #define TICKMODE_1 1 +#define TICKMODE_3 3 #define TICKMODE_4 4 #define TELEPORTSTATE_STARTING 1 diff --git a/src/include/game/game_0b28d0.h b/src/include/game/game_0b28d0.h index 19dd08b69..ed72f8310 100644 --- a/src/include/game/game_0b28d0.h +++ b/src/include/game/game_0b28d0.h @@ -154,7 +154,7 @@ void currentPlayerSetCamPropertiesWithRoom(struct coord *pos, struct coord *up, void currentPlayerSetCamPropertiesWithoutRoom(struct coord *pos, struct coord *up, struct coord *look, s32 room); void currentPlayerSetCamProperties(struct coord *pos, struct coord *up, struct coord *look, s32 room); void currentPlayerClearMemCamRoom(void); -u32 func0f0c1d20(void); +void func0f0c1d20(void); u32 func0f0c1e54(void); u32 func0f0c1f08(void); u32 func0f0c1ff4(void); diff --git a/src/include/gvars/gvars.h b/src/include/gvars/gvars.h index b12fc2ed2..d8de9c517 100644 --- a/src/include/gvars/gvars.h +++ b/src/include/gvars/gvars.h @@ -619,6 +619,7 @@ extern f32 var8009ddd8; extern f32 var8009dddc; extern f32 var8009dde0; extern f32 var8009dde4; +extern s16 g_WarpPadId; extern u32 var8009ddec; extern u32 var8009ddf0; extern u32 var8009de10;