summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2022-02-19 15:27:15 -0800
committerGitHub <noreply@github.com>2022-02-19 23:27:15 +0000
commitf67ecbc3c222197cfdd9e63e8cc78506db06f0d4 (patch)
treed6dc13a42c672c12bee98a1ecc7b97e814c9becf /src/code
parentb9496691319640dfa8071a128263d26e9e8bce80 (diff)
EnBba01 Ok and Documented (#667)
* Decomp Bba_01 * Doc bba01 * Document object_bba * Remove new line * Cleanup/rename EnHy to help differentiate it from overlays * Adjust xml comment * PR suggestions * English is hard * English is hard 2 * Add note about invalid textIds * typo * Fix merge * Remove 0 defines
Diffstat (limited to 'src/code')
-rw-r--r--src/code/z_en_hy_code.c (renamed from src/code/z_en_hy.c)4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/code/z_en_hy.c b/src/code/z_en_hy_code.c
index b99b77dae..7b17f78f2 100644
--- a/src/code/z_en_hy.c
+++ b/src/code/z_en_hy_code.c
@@ -3,7 +3,7 @@
* Description: Unused System for NPCs (includes animation, door interaction, blinking, pathing, and collider helpers)
*/
-#include "z_en_hy.h"
+#include "z_en_hy_code.h"
#include "overlays/actors/ovl_En_Door/z_en_door.h"
#include "objects/object_aob/object_aob.h"
#include "objects/object_bba/object_bba.h"
@@ -18,7 +18,7 @@ static AnimationInfoS sAnimations[] = {
{ &object_boj_Anim_001908, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_boj_Anim_001908, 1.0f, 0, -1, ANIMMODE_LOOP, -8 },
{ &object_boj_Anim_0008C0, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
- { &object_bba_Anim_005DC4, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
+ { &gBbaIdleHoldingBagAnim, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_bji_Anim_000FDC, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },
{ &object_bji_Anim_000AB0, 1.0f, 0, -1, ANIMMODE_LOOP, -8 },
{ &object_bji_Anim_00066C, 1.0f, 0, -1, ANIMMODE_LOOP, 0 },