mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-09 02:45:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add original asset names to all object_p* and object_r* files (#1519)

Browse Source 
* Add original asset names to all `object_p*` and `object_r*` files

* Respond to review
This commit is contained in:
Tom Overton
2023-11-28 03:19:22 -08:00
committed by GitHub
parent 7649cd309a
commit 54f7aa23b5
31 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Rsn/z_en_rsn.c
+2 -2
View File
@@ -5,7 +5,7 @@
*/
#include "z_en_rsn.h"
#include "objects/object_rs/object_rs.h"
#include "objects/object_rsn/object_rsn.h"
#define FLAGS (ACTOR_FLAG_TARGETABLE | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_2000000)
@@ -22,7 +22,7 @@ ActorInit En_Rsn_InitVars = {
/**/ ACTOR_EN_RSN,
/**/ ACTORCAT_NPC,
/**/ FLAGS,
/**/ OBJECT_RS,
/**/ OBJECT_RSN,
/**/ sizeof(EnRsn),
/**/ EnRsn_Init,
/**/ EnRsn_Destroy,
src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
+1 -1
View File
@@ -79,7 +79,7 @@ ActorInit En_Sob1_InitVars = {
static s16 sObjectIds[][3] = {
{ OBJECT_ZO, OBJECT_ID_MAX, OBJECT_MASTERZOORA },
{ OBJECT_OF1D_MAP, OBJECT_ID_MAX, OBJECT_MASTERGOLON },
{ OBJECT_RS, OBJECT_ID_MAX, OBJECT_ID_MAX },
{ OBJECT_RSN, OBJECT_ID_MAX, OBJECT_ID_MAX },
{ OBJECT_OF1D_MAP, OBJECT_ID_MAX, OBJECT_MASTERGOLON },
};
src/overlays/actors/ovl_En_Sob1/z_en_sob1.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
#include "objects/object_rs/object_rs.h"
#include "objects/object_rsn/object_rsn.h"
#include "objects/object_zo/object_zo.h"
#include "objects/object_oF1d_map/object_oF1d_map.h"