summaryrefslogtreecommitdiff
path: root/src/enemy/businessScrub.c
diff options
context:
space:
mode:
authorHenny022p <73211432+Henny022p@users.noreply.github.com>2026-02-08 18:32:38 +0100
committerGitHub <noreply@github.com>2026-02-08 18:32:38 +0100
commit5ab63f00e522ff69c5bc987e379f0163943f2833 (patch)
tree53622222ac729c6ab6dc75ef7f9bafa8031daf18 /src/enemy/businessScrub.c
parent73901a0a012d55ebb66a4627dcb246d19737fcb5 (diff)
parent5b2cafdc894823d57beee8f3947a391d881d91de (diff)
Merge pull request #701 from Henny022p/cleanup/250302HEADmaster
Various code cleanup changes
Diffstat (limited to 'src/enemy/businessScrub.c')
-rw-r--r--src/enemy/businessScrub.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 3f2c5c74..c00fdd50 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -6,14 +6,18 @@
*/
#include "asm.h"
#include "enemy.h"
-#include "functions.h"
-#include "game.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
#include "item.h"
#include "kinstone.h"
#include "message.h"
#include "npc.h"
#include "save.h"
#include "tiles.h"
+#include "vram.h"
+#include "color.h"
struct SalesOffering {
u8 field_0x0;
@@ -37,7 +41,7 @@ typedef struct {
/*0x80*/ u8 unk_80;
/*0x81*/ u8 unk_81;
/*0x82*/ u8 unused2[4];
- /*0x86*/ u16 unk_86;
+ /*0x86*/ u16 flag;
} BusinessScrubEntity;
void sub_08028E9C(BusinessScrubEntity*);
@@ -95,7 +99,7 @@ void BusinessScrub_Action0(BusinessScrubEntity* this) {
super->animationState = 0;
super->direction = DirectionSouth;
sub_08028E9C(this);
- if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->unk_86)) {
+ if ((*(u8*)this->unk_7c & 1) || CheckFlags(this->flag)) {
super->action = 4;
super->timer = 120;
super->spritePriority.b1 = 1;
@@ -227,7 +231,7 @@ void BusinessScrub_Action3(BusinessScrubEntity* this) {
iVar1->z.HALF.HI -= 12;
SetEntityPriority(iVar1, PRIO_MESSAGE);
}
- SetFlag(this->unk_86);
+ SetFlag(this->flag);
sub_0802925C(this);
}
break;