etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-26 14:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent King Bobomb from grabbing while thrown

Browse source
This commit is contained in:
MysterD 2020-10-08 21:13:56 -07:00
parent e4c1640c56
commit ff1b19e2ee
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/behaviors/king_bobomb.inc.c
View file

@ -362,7 +362,9 @@ void king_bobomb_move(void) {
#endif #endif
} }
u8 king_bobomb_ignore_if_true(void) { return o->oAction == 8; } u8 king_bobomb_ignore_if_true(void) {
return o->oAction == 8;
}
void bhv_king_bobomb_loop(void) { void bhv_king_bobomb_loop(void) {
if (!network_sync_object_initialized(o)) { if (!network_sync_object_initialized(o)) {
@ -377,7 +379,12 @@ void bhv_king_bobomb_loop(void) {
f32 sp34 = 20.0f; f32 sp34 = 20.0f;
f32 sp30 = 50.0f; f32 sp30 = 50.0f;
UNUSED u8 pad[8]; UNUSED u8 pad[8];
if (o->oAction == 4) {
o->oInteractionSubtype &= ~INT_SUBTYPE_GRABS_MARIO;
} else {
o->oInteractionSubtype |= INT_SUBTYPE_GRABS_MARIO; o->oInteractionSubtype |= INT_SUBTYPE_GRABS_MARIO;
}
switch (o->oHeldState) { switch (o->oHeldState) {
case HELD_FREE: case HELD_FREE:
king_bobomb_move(); king_bobomb_move();

2
src/pc/controller/controller_keyboard_debug.c
View file

@ -7,7 +7,7 @@
#ifdef DEBUG #ifdef DEBUG
static u8 warpToLevel = LEVEL_BITFS; static u8 warpToLevel = LEVEL_BOB;
#define SCANCODE_0 0x0B #define SCANCODE_0 0x0B
#define SCANCODE_1 0x02 #define SCANCODE_1 0x02