Put const data in swordsmanNewsletter

This commit is contained in:
Tal Hayon
2022-04-18 00:26:18 +03:00
parent ac8b0220b5
commit 90eac705f2
4 changed files with 14 additions and 33 deletions
+13 -7
View File
@@ -3,27 +3,33 @@
#include "message.h"
extern void sub_080787B4(Entity*);
void sub_080933D8(Entity*);
void sub_080933FC(Entity*);
extern void (*const gUnk_081228B0[])(Entity*);
extern Hitbox gUnk_081228A8;
extern u16 gUnk_081228B8[];
static const Hitbox gUnk_081228A8 = { 0, 0, {}, 6, 8 };
void SwordsmanNewsletter(Entity* this) {
gUnk_081228B0[this->action](this);
static void (*const actionFuncs[])(Entity*) = {
sub_080933D8,
sub_080933FC,
};
actionFuncs[this->action](this);
}
void sub_080933D8(Entity* this) {
this->action = 1;
this->frameIndex = this->type;
UpdateSpriteForCollisionLayer(this);
this->hitbox = &gUnk_081228A8;
this->hitbox = (Hitbox*)&gUnk_081228A8;
sub_080787B4(this);
}
void sub_080933FC(Entity* this) {
static const u16 messageIndices[] = {
0x301, 0x302, 0x303, 0x304, 0x305, 0x306, 0x307, 0x308,
};
if (this->interactType != 0) {
this->interactType = 0;
MessageNoOverlap(gUnk_081228B8[this->type], this);
MessageNoOverlap(messageIndices[this->type], this);
}
}