mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-11 05:08:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

define collisions

Browse Source
This commit is contained in:
theo3
2023-12-31 21:24:07 -08:00
parent 48fdf9d827
commit dcc596ed87
125 changed files with 388 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/cat.c
+1 -1
View File
@@ -140,7 +140,7 @@ void sub_080677EC(CatEntity* this) {
super->collisionFlags = 7;
super->hurtType = 0x48;
super->hitType = -0x58;
super->flags2 = 1;
super->collisionMask = 1;
this->unk_69 = 0xff;
if (super->x.HALF.HI < gPlayerEntity.base.x.HALF.HI) {
super->spriteSettings.flipX = 1;
src/npc/npc5.c
+3 -3
View File
@@ -2,7 +2,7 @@
* @file npc5.c
* @ingroup NPCs
*
* @brief NPC 5
* @brief Unused Zelda follower NPC.
*/
#include "collision.h"
#include "functions.h"
@@ -166,7 +166,7 @@ void sub_08060AE0(NPC5Entity* this) {
super->collisionFlags = 7;
super->hurtType = 0x48;
super->hitType = 0x49;
super->flags2 = 3;
super->collisionMask = 3;
super->hitbox = (Hitbox*)&gHitbox_0;
super->followerFlag &= 0xfe;
this->unk_6c = 0xff;
@@ -525,7 +525,7 @@ u32 sub_080611D4(Entity* this) {
u32 sub_08061230(NPC5Entity* this) {
if ((((UnkHeap*)super->myHeap)->unk_0 & 1) == 0) {
if ((super->contactFlags & CONTACT_TAKE_DAMAGE) != 0) {
if ((super->contactFlags & CONTACT_NOW) != 0) {
switch (super->contactFlags & 0x7f) {
case 0:
case 1: