mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-28 08:48:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

add effects.h

Browse Source
This commit is contained in:
theo3
2021-10-26 20:33:33 -07:00
parent 3f5449c1a1
commit d29468c30b
67 changed files with 297 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/playerItem/playerItem14.c
+3 -2
View File
@@ -3,6 +3,7 @@
#include "functions.h"
#include "player.h"
#include "room.h"
#include "effects.h"
extern void (*const gUnk_08109AC8[])(Entity*);
extern Hitbox gUnk_08109AD0;
@@ -46,11 +47,11 @@ void sub_0805FC74(Entity* this) {
}
if (!sub_080002F0(COORD_TO_TILE(this), gPlayerEntity.collisionLayer, 0x80) &&
sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI)) {
CreateFx(this, 0x19, 0);
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
}
if (this->bitfield != 0) {
CreateFx(this, 0x19, 0);
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
}
} else {
src/playerItem/playerItemBow.c
+2 -1
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "entity.h"
#include "functions.h"
#include "effects.h"
extern void (*const gUnk_080B3E30[])(Entity*);
@@ -33,6 +34,6 @@ void sub_08019444(Entity* this) {
void sub_08019468(Entity* this) {
if (this->field_0x40 == 0x0e) {
CreateFx(this, 0x50, 0);
CreateFx(this, FX_REFLECT5, 0);
}
}
src/playerItem/playerItemSwordBeam.c
+3 -2
View File
@@ -3,6 +3,7 @@
#include "coord.h"
#include "functions.h"
#include "audio.h"
#include "effects.h"
extern void (*const gUnk_080B43F4[])(Entity*);
@@ -70,11 +71,11 @@ void sub_08019580(Entity* this) {
}
if ((sub_080002F0(TILE(this->x.HALF.HI, this->y.HALF.HI), gPlayerEntity.collisionLayer, 0x80) == 0) &&
(sub_080040D8(this, &gUnk_08003E44, this->x.HALF.HI, this->y.HALF.HI) != 0)) {
CreateFx(this, 0x19, 0);
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
}
if (this->bitfield != 0) {
CreateFx(this, 0x19, 0);
CreateFx(this, FX_SWORD_MAGIC, 0);
DeleteThisEntity();
}
if (sub_08008790(this, 0xc) != NULL) {