From e2f6ce3075d61db0ea93ccb977c3a74b7be3bcad Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Thu, 15 Aug 2024 05:20:30 -0300 Subject: [PATCH] actor docs --- assets/yaml/jp/rev0/ast_andross.yaml | 4 ++-- assets/yaml/jp/rev0/ast_macbeth.yaml | 8 ++++---- assets/yaml/us/rev1/ast_andross.yaml | 4 ++-- assets/yaml/us/rev1/ast_macbeth.yaml | 8 ++++---- include/mods.h | 2 +- include/sf64object.h | 2 +- src/engine/fox_edata_info.c | 6 +++--- src/engine/fox_play.c | 2 +- src/engine/fox_tank.c | 7 ++++--- 9 files changed, 22 insertions(+), 21 deletions(-) diff --git a/assets/yaml/jp/rev0/ast_andross.yaml b/assets/yaml/jp/rev0/ast_andross.yaml index c296a5a1..ea967a85 100644 --- a/assets/yaml/jp/rev0/ast_andross.yaml +++ b/assets/yaml/jp/rev0/ast_andross.yaml @@ -238,8 +238,8 @@ aAndDoorHitbox: D_ANDROSS_C038AC4: {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4} -D_ANDROSS_C038B40: - {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40} +aAndPathHitbox: + {type: SF64:HITBOX, offset: 0xC038B40, symbol: aAndPathHitbox} aAndPathIntersectionHitbox: {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox} diff --git a/assets/yaml/jp/rev0/ast_macbeth.yaml b/assets/yaml/jp/rev0/ast_macbeth.yaml index 04859b16..486da617 100644 --- a/assets/yaml/jp/rev0/ast_macbeth.yaml +++ b/assets/yaml/jp/rev0/ast_macbeth.yaml @@ -373,8 +373,8 @@ D_MA_6013060: D_MA_6013158: { type: TEXTURE, format: IA16, ctype: u16, width: 32, height: 32, offset: 0x6013158, symbol: D_MA_6013158} -D_MA_6013960: - {type: GFX, offset: 0x6013960, symbol: D_MA_6013960} +aMaGuillotineHousingDL: + {type: GFX, offset: 0x6013960, symbol: aMaGuillotineHousingDL} D_MA_6013F58: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6013F58, symbol: D_MA_6013F58, tlut: 0x6014058} @@ -916,8 +916,8 @@ aMaActor207Hitbox: D_MA_6036818: {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818} -D_MA_6036894: - {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894} +aMaGuillotineHousingHitbox: + {type: SF64:HITBOX, offset: 0x6036894, symbol: aMaGuillotineHousingHitbox} aMaGuillotineHitbox: {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} diff --git a/assets/yaml/us/rev1/ast_andross.yaml b/assets/yaml/us/rev1/ast_andross.yaml index a2954394..e6019ac5 100644 --- a/assets/yaml/us/rev1/ast_andross.yaml +++ b/assets/yaml/us/rev1/ast_andross.yaml @@ -238,8 +238,8 @@ aAndDoorHitbox: D_ANDROSS_C038AC4: {type: SF64:HITBOX, offset: 0xC038AC4, symbol: D_ANDROSS_C038AC4} -D_ANDROSS_C038B40: - {type: SF64:HITBOX, offset: 0xC038B40, symbol: D_ANDROSS_C038B40} +aAndPathHitbox: + {type: SF64:HITBOX, offset: 0xC038B40, symbol: aAndPathHitbox} aAndPathIntersectionHitbox: {type: SF64:HITBOX, offset: 0xC038BA4, symbol: aAndPathIntersectionHitbox} diff --git a/assets/yaml/us/rev1/ast_macbeth.yaml b/assets/yaml/us/rev1/ast_macbeth.yaml index fe1c9de1..b08087cc 100644 --- a/assets/yaml/us/rev1/ast_macbeth.yaml +++ b/assets/yaml/us/rev1/ast_macbeth.yaml @@ -373,8 +373,8 @@ D_MA_6013060: D_MA_6013158: { type: TEXTURE, format: IA16, ctype: u16, width: 32, height: 32, offset: 0x6013158, symbol: D_MA_6013158} -D_MA_6013960: - {type: GFX, offset: 0x6013960, symbol: D_MA_6013960} +aMaGuillotineHousingDL: + {type: GFX, offset: 0x6013960, symbol: aMaGuillotineHousingDL} D_MA_6013F58: { type: TEXTURE, format: CI8, ctype: u8, width: 16, height: 16, offset: 0x6013F58, symbol: D_MA_6013F58, tlut: 0x6014058} @@ -916,8 +916,8 @@ aMaActor207Hitbox: D_MA_6036818: {type: SF64:HITBOX, offset: 0x6036818, symbol: D_MA_6036818} -D_MA_6036894: - {type: SF64:HITBOX, offset: 0x6036894, symbol: D_MA_6036894} +aMaGuillotineHousingHitbox: + {type: SF64:HITBOX, offset: 0x6036894, symbol: aMaGuillotineHousingHitbox} aMaGuillotineHitbox: {type: SF64:HITBOX, offset: 0x60368E0, symbol: aMaGuillotineHitbox} diff --git a/include/mods.h b/include/mods.h index 3392f4ba..5e9118a0 100644 --- a/include/mods.h +++ b/include/mods.h @@ -58,7 +58,7 @@ /** * Spawner: - * Spawn Scenery, Actors, Bosses, Sprites, Items, Effects or even Event Actors. + * Spawn Scenery, Actors, Bosses, Sprites, Items, Effects and even Event Actors. * * Controls: * D-Pad left and right to set the object Id. diff --git a/include/sf64object.h b/include/sf64object.h index f5e4669d..8c596a5f 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -369,7 +369,7 @@ typedef enum ObjectId { /* 60 */ OBJ_SCENERY_MA_BUILDING_2, /* 61 */ OBJ_SCENERY_MA_TOWER, /* 62 */ OBJ_SCENERY_MA_WALL_1, - /* 63 */ OBJ_SCENERY_63, + /* 63 */ OBJ_SCENERY_GUILLOTINE_HOUSING, /* 64 */ OBJ_SCENERY_MA_GUILLOTINE, /* 65 */ OBJ_SCENERY_MA_PROXIMITY_LIGHT, /* 66 */ OBJ_SCENERY_MA_WALL_2, diff --git a/src/engine/fox_edata_info.c b/src/engine/fox_edata_info.c index f1fdf4a2..81cc18af 100644 --- a/src/engine/fox_edata_info.c +++ b/src/engine/fox_edata_info.c @@ -156,7 +156,7 @@ ObjectInfo gObjectInfo[] = { /* OBJ_SCENERY_MA_BUILDING_2, */ {(void*) aMaBuilding2DL, 0, (ObjectFunc) NULL, aMaBuilding2Hitbox, 400.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_TOWER, */ {(void*) Macbeth_MaTower_Draw, 1, (ObjectFunc) NULL, aMaTowerHitbox, 200.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_WALL_1, */ {(void*) aMaWall1DL, 0, (ObjectFunc) NULL, gNoHitbox, 1500.0f, 0, 0, 0, 0, 0.0f, 0 }, - /* OBJ_SCENERY_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, + /* OBJ_SCENERY_GUILLOTINE_HOUSING, */ {(void*) aMaGuillotineHousingDL, 0, (ObjectFunc) NULL, aMaGuillotineHousingHitbox, 500.0f, 0, 0, 5, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_GUILLOTINE, */ {(void*) aMaGuillotineDL, 0, (ObjectFunc) NULL, aMaGuillotineHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_PROXIMITY_LIGHT, */ {(void*) Macbeth_MaProximityLight_Draw, 1, (ObjectFunc) NULL, aMaProximityLightHitbox, 400.0f, 0, 0, 0, 0, 0.0f, 0 }, /* OBJ_SCENERY_MA_WALL_2, */ {(void*) aMaWall2DL, 0, (ObjectFunc) NULL, aMaWall2Hitbox, 2500.0f, 0, 0, 5, 0, 0.0f, 0 }, @@ -228,8 +228,8 @@ ObjectInfo gObjectInfo[] = { /* OBJ_SCENERY_AND_DOOR */ {(void*) Andross_AndDoor_Draw, 1, (ObjectFunc) Andross_AndDoor_Update, aAndDoorHitbox, 500.0f, 0, 0, 41, 0, 0.0f, 0 }, /* OBJ_SCENERY_TR_BUILDING */ {(void*) aTrBuildingDL, 0, (ObjectFunc) NULL, aTrBuildingHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 0 }, /* OBJ_SCENERY_AND_PATH_INTERSECTION */ {(void*) aAndPathIntersectionDL, 0, (ObjectFunc) NULL, aAndPathIntersectionHitbox, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - /* OBJ_SCENERY_AND_PATH_WALLS */ {(void*) aAndPathWallsDL, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, - /* OBJ_SCENERY_AND_PATH_EXIT */ {(void*) aAndPathExitDL, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJ_SCENERY_AND_PATH_WALLS */ {(void*) aAndPathWallsDL, 0, (ObjectFunc) NULL, aAndPathHitbox, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, + /* OBJ_SCENERY_AND_PATH_EXIT */ {(void*) aAndPathExitDL, 0, (ObjectFunc) NULL, aAndPathHitbox, 0.0f, 0, 0, 41, 1, 0.0f, 0 }, /* OBJ_SCENERY_AND_PATH_ENTRANCE */ {(void*) aAndPathEntranceDL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 1, 0.0f, 0 }, /* OBJ_SCENERY_VS_BUILDING_1 */ {(void*) aVsBuildingDL, 0, (ObjectFunc) NULL, aVsBuilding1Hibox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, /* OBJ_SCENERY_VS_BUILDING_2 */ {(void*) aVsBuildingDL, 0, (ObjectFunc) NULL, aVsBuilding2Hibox, 0.0f, 0, 0, 40, 0, 0.0f, 0 }, diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index c20df7e1..93c4a5e9 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -1425,7 +1425,7 @@ bool Play_CheckPolyCollision(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 a case OBJ_SCENERY_MA_BUILDING_2: case OBJ_SCENERY_MA_TOWER: case OBJ_SCENERY_MA_WALL_1: - case OBJ_SCENERY_63: + case OBJ_SCENERY_GUILLOTINE_HOUSING: case OBJ_SCENERY_MA_GUILLOTINE: case OBJ_SCENERY_MA_PROXIMITY_LIGHT: case OBJ_SCENERY_MA_WALL_2: diff --git a/src/engine/fox_tank.c b/src/engine/fox_tank.c index 0dc3b8cd..3ef5166f 100644 --- a/src/engine/fox_tank.c +++ b/src/engine/fox_tank.c @@ -910,7 +910,7 @@ void func_tank_80046704(Player* player) { } } if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) || (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) || - (scenery->obj.id == OBJ_SCENERY_MA_TOWER) || (scenery->obj.id == OBJ_SCENERY_63) || + (scenery->obj.id == OBJ_SCENERY_MA_TOWER) || (scenery->obj.id == OBJ_SCENERY_GUILLOTINE_HOUSING) || (scenery->obj.id == OBJ_SCENERY_MA_TRAIN_TRACK_13) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_2) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_3) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) { s32 temp_v0; @@ -937,7 +937,8 @@ void func_tank_80046704(Player* player) { break; case 3: if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) || - (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) || (scenery->obj.id == OBJ_SCENERY_63) || + (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) || + (scenery->obj.id == OBJ_SCENERY_GUILLOTINE_HOUSING) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_2) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) { Player_ApplyDamage(player, temp_v0, 5); } @@ -1346,7 +1347,7 @@ void func_tank_800481F4(Player* player) { for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) { if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id != OBJ_SCENERY_TI_BRIDGE) && (scenery->obj.id != OBJ_SCENERY_MA_TRAIN_TRACK_13) && (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_1) && - (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_2) && (scenery->obj.id != OBJ_SCENERY_63) && + (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_2) && (scenery->obj.id != OBJ_SCENERY_GUILLOTINE_HOUSING) && (scenery->obj.id != OBJ_SCENERY_MA_WALL_2) && (scenery->obj.id != OBJ_SCENERY_MA_WALL_3) && (scenery->obj.id != OBJ_SCENERY_MA_WALL_4) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_1) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_3) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_2) &&