asm notes

This commit is contained in:
theo3
2021-10-31 22:59:41 -07:00
parent 57eec4def4
commit 46d14fdc0c
21 changed files with 161 additions and 110 deletions
+7 -7
View File
@@ -28,7 +28,7 @@ typedef struct {
extern s8 gUnk_08107C6C[];
extern u32 sub_08057810(void);
extern u32 sub_080002C0(u16, u16, u8);
extern void sub_080577AC(u32, u32, u32);
extern void CreateMagicSparkles(u32, u32, u32);
void Manager3_Main(Manager3* this) {
s8 tmp;
@@ -55,11 +55,11 @@ void Manager3_Main(Manager3* this) {
}
}
if (sub_080002C0(this->unk_38, this->unk_3a, this->manager.unk_0e) == 0x3d) {
sub_080577AC(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY,
this->manager.unk_0e);
CreateMagicSparkles(this->unk_38 + gRoomControls.roomOriginX, this->unk_3a + gRoomControls.roomOriginY,
this->manager.unk_0e);
if (!this->manager.unk_0f) {
this->manager.unk_0f = 1;
SoundReq(SFX_152);
SoundReq(SFX_NEAR_PORTAL);
}
}
}
@@ -69,15 +69,15 @@ void Manager3_Main(Manager3* this) {
}
}
void sub_080577AC(u32 baseX, u32 baseY, u32 layer) {
void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
u32 r;
int offsetX, offsetY;
Entity* spark;
r = Random();
if ((r & 0x7) != 0)
if (r & 0x7)
return;
spark = CreateObject(SPECIAL_FX, 0x26, 0);
if (!spark)
if (spark == NULL)
return;
offsetX = (r >> 0x8) & 0xF;
offsetY = ((r >> 0x10) & 0xF);