EntityStrongWargDeathBeams #1585
Conversation
|
Congrats on the match! 🎊 |
src/st/no3/48A84.c
Outdated
| prim->clut = palette; | ||
| prim->u0 = prim->u1 = (temp_s1 & 1) << 7 | 0x21; | ||
| prim->v1 = prim->v3 = (temp_s1 & 2) << 6 | 0x59; | ||
| prim->v0 = prim->v2 = (temp_s1 & 2) << 6 | 0x7F; |
There was a problem hiding this comment.
Do these still match if you use + instead of | at the end? Since UV coordinates are numerical values, it probably makes more sense to add a physical offset than to bitwise OR it.
src/st/no3/48A84.c
Outdated
| while (prim != NULL) { | ||
| if (prim->drawMode == DRAW_HIDE) { | ||
| if (self->ext.factory.unk7E & 1) { | ||
| PlaySfxPositional(0x655); |
There was a problem hiding this comment.
For SFX calls, we usually use the enums in include/sfx.h. In this case, this should be SFX_EXPLODE_B.
src/st/no3/48A84.c
Outdated
| prim->priority = self->zPriority + priorityOffset; | ||
| prim->drawMode = DRAW_TPAGE2 | DRAW_TPAGE | DRAW_COLORS | | ||
| DRAW_UNK02 | DRAW_TRANSP; | ||
| prim->p1 = (Random(priorityOffset) & 3) + 0x10; |
There was a problem hiding this comment.
I think this Random call shouldn't have an argument. The compiler is just reusing the a0 register, I expect. Try removing priorityOffset from this line and see if it still matches.
src/st/no3/48A84.c
Outdated
| } | ||
|
|
||
| self->ext.timer.t = 4; | ||
| self->ext.factory.unk7E++; |
There was a problem hiding this comment.
You'll probably want to make a new entry in the Ext union in include/entity.h for this entity. Feel free to ask in discord if you don't know how to do this.
There was a problem hiding this comment.
I took a shot at it in a33aa1c, LMK if it needs changed and I'm happy to do so
There was a problem hiding this comment.
Looks good, but I'm not sure why you named the variable zPriority. It looks like it's controlling multiple things, including the zPriority. I would recommend keeping it as unk7E unless we know what it is.
Also, I would recommend adding an unk7C, and using that instead of ext.timer.t. When possible, we want an entity to exclusively use its own Ext member, instead of mixing around self->ext.this and self->ext.that.
src/st/no3/48A84.c
Outdated
| prim->y0 = prim->y1 = prim->y1 - prim->p1; | ||
|
|
||
| if (prim->p2 > 0x10) { | ||
| prim->drawMode = 8; |
There was a problem hiding this comment.
drawMode uses enums, in this case 8 should be DRAW_HIDE.
|
Looking like a fantastic first PR, well done! Some cleanup comments, but nothing huge. Looking forward to merging this one! |
|
Congrats @Max-Clark for your first pull request to the project 👏 . We are currently transitioning to apply a license to the project. Before merging this pull request we will need you to accept the license here: #1565 |
Thanks again @joshlory @bismurphy for the help!