diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-10-23 02:03:16 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 16:03:16 +1100 |
| commit | 1e19cfe8697afc2d3a2cce0489da0980aaf6efd7 (patch) | |
| tree | 2973ccb22fb17d09a654b51e2140efb5893f54cc /src/code | |
| parent | a468be77d5e87498b343664c78b6f8488d404f19 (diff) | |
Anju objects (#1444)
* bring over the objects from the other branch
* kafeis mask
* use symbols
* dman naming after assets
* stateFlags
* remaining stuff
* anim array bug
* Name everything in DmGm after DmAn
* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED
* undef
* format
* idk
* ing
* format
* name animations from an4, thanks emil!
* emptydl
* disbelief
* review
* format
* Update assets/xml/objects/object_mask_kerfay.xml
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_player_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 3a5d69a34..6c33a5565 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -2515,7 +2515,7 @@ u8 D_801C0B1C[] = { Gfx* D_801C0B20[] = { object_mask_truth_DL_0001A0, // PLAYER_MASK_TRUTH - object_mask_kerfay_DL_000D40, // PLAYER_MASK_KAFEIS_MASK + gKafeisMaskDL, // PLAYER_MASK_KAFEIS_MASK object_mask_yofukasi_DL_000490, // PLAYER_MASK_ALL_NIGHT object_mask_rabit_DL_000610, // PLAYER_MASK_BUNNY object_mask_ki_tan_DL_0004A0, // PLAYER_MASK_KEATON |