naming work

This commit is contained in:
theo3
2022-01-03 23:58:02 -08:00
parent f26b2e286a
commit 52db70bb9d
212 changed files with 1762 additions and 1736 deletions
+4 -4
View File
@@ -6,9 +6,9 @@
void Manager33_Main(Manager* this) {
RoomControls* roomControls = &gRoomControls;
u32 a = roomControls->roomOriginX + 0x1f8;
u32 a = roomControls->origin_x + 0x1f8;
u32 x = (a - gPlayerEntity.x.HALF.HI) + 0x10;
u32 b = roomControls->roomOriginY + 0x140;
u32 b = roomControls->origin_y + 0x140;
u32 y = (b - gPlayerEntity.y.HALF.HI) + 0x10;
if (this->action == 0) {
if (x < 0x20 && y < 0x20 && gPlayerEntity.z.HALF.HI < -0x18 && gPlayerState.framestate == PL_STATE_CAPE) {
@@ -20,8 +20,8 @@ void Manager33_Main(Manager* this) {
if (--this->unk_0e == 0) {
Entity* object = CreateObject(OBJECT_96, 1, 0);
if (object != NULL) {
object->x.HALF.HI = roomControls->roomOriginX + 0x1f8;
object->y.HALF.HI = roomControls->roomOriginY + 0x140;
object->x.HALF.HI = roomControls->origin_x + 0x1f8;
object->y.HALF.HI = roomControls->origin_y + 0x140;
object->z.HALF.HI = 0xffe8;
}
DeleteThisEntity();