diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2023-02-03 20:24:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-03 21:24:26 -0700 |
| commit | 0f1c72772500a2098c81ef34c0bee41d0df4063e (patch) | |
| tree | 8bfc0d572ef00099399dbabedb3337c842a15dfb /src/d/a/d_a_npc.cpp | |
| parent | f030d04b1442d09272af2cb1621c8c6e0cc99bb6 (diff) | |
d_a_obj_cboard / finish f_op_actor / rels cleanup (#268)
* d_a_obj_cboard / finish f_op_actor / clean up some rel files
* rename some actor vars / remove asm
* progress
Diffstat (limited to 'src/d/a/d_a_npc.cpp')
| -rw-r--r-- | src/d/a/d_a_npc.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp index 723d4d7c9e..efa9296dc3 100644 --- a/src/d/a/d_a_npc.cpp +++ b/src/d/a/d_a_npc.cpp @@ -2550,8 +2550,8 @@ int daNpcT_c::initTalk(int param_0, fopAc_ac_c** param_1) { } f32 tmp = FLOAT_LABEL(lit_4116); - mSpeedF = tmp; - mSpeed.set(tmp,tmp,tmp); + speedF = tmp; + speed.set(tmp,tmp,tmp); return 1; } @@ -3685,7 +3685,7 @@ void daBaseNpc_c::setEnvTevColor() { /* 8014F0FC-8014F140 149A3C 0044+00 1/1 0/0 2/2 .text setRoomNo__11daBaseNpc_cFv */ void daBaseNpc_c::setRoomNo() { s32 room_id = dComIfG_Bgsp().GetRoomId(mBgSPolyInfo); - current.mRoomNo = room_id; + current.roomNo = room_id; mRoomId = room_id; } @@ -5090,8 +5090,8 @@ asm void daNpcF_c::chkActorInAttnArea(fopAc_ac_c* param_0, fopAc_ac_c* param_1, int daNpcF_c::initTalk(int param_0, fopAc_ac_c** param_1) { mFlow.init(this,param_0,0,param_1); f32 tmp = FLOAT_LABEL(lit_4116); - mSpeedF = tmp; - mSpeed.set(tmp,tmp,tmp); + speedF = tmp; + speed.set(tmp,tmp,tmp); field_0x9e9 = 0; field_0x9ec = 0; return 1; |