diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2024-12-26 07:14:55 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-26 08:14:55 -0700 |
| commit | bececbff99bd2bb208a811c100c8f79ebbecc77d (patch) | |
| tree | e2e3e00ac3d9aa866c727197e20c6f6b0201f24b /src/code/m_actor.c | |
| parent | 60579a4260965c1de2e8a8f320fe9f8c3f5d2dde (diff) | |
main OK (#234)
* main OK
* gSegments -> SegmentBaseAddress
* newline
* format
Diffstat (limited to 'src/code/m_actor.c')
| -rw-r--r-- | src/code/m_actor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/code/m_actor.c b/src/code/m_actor.c index 8995617..e59d78f 100644 --- a/src/code/m_actor.c +++ b/src/code/m_actor.c @@ -192,7 +192,7 @@ void Actor_ct(Actor* actor, Game_Play* game_play) { Shape_Info_init(actor, 0.0f, NULL, 0.0f, 0.0f); if (Actor_data_bank_dma_end_check(actor, game_play) == 1) { - gSegments[6] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_a0->status[actor->unk_026].segment); + SegmentBaseAddress[6] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_a0->status[actor->unk_026].segment); actor->ct(actor, game_play); actor->ct = NULL; } @@ -263,7 +263,7 @@ void Actor_draw(Game_Play* game_play, Actor* actor) { { void* segment = game_play->objectExchangeBank.status[(void)0, actor->unk_026].segment; - gSegments[6] = (uintptr_t)OS_PHYSICAL_TO_K0(segment); + SegmentBaseAddress[6] = (uintptr_t)OS_PHYSICAL_TO_K0(segment); gSPSegment(POLY_OPA_DISP++, 0x06, segment); gSPSegment(POLY_XLU_DISP++, 0x06, segment); @@ -441,7 +441,7 @@ void Actor_info_call_actor(Game_Play* game_play, ActorInfo* actorInfo) { if (actor->ct != NULL) { if (Actor_data_bank_dma_end_check(actor, game_play) == 1) { - gSegments[6] = + SegmentBaseAddress[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->objectExchangeBank.status[actor->unk_026].segment); game_play->state.unk_9D = 0x98; @@ -478,7 +478,7 @@ void Actor_info_call_actor(Game_Play* game_play, ActorInfo* actorInfo) { actor->flags &= ~ACTOR_FLAG_1000000; if ((actor->flags & (ACTOR_FLAG_40 | ACTOR_FLAG_10)) || (actor->part == ACTOR_PART_NPC)) { - gSegments[6] = + SegmentBaseAddress[6] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->objectExchangeBank.status[actor->unk_026].segment); game_play->state.unk_9D = 0xA1; actor->update(actor, game_play); @@ -833,9 +833,9 @@ Actor* Actor_info_make_actor(ActorInfo* actorInfo, Game_Play* game_play, s16 act { uintptr_t segmentTemp; - segmentTemp = gSegments[6]; + segmentTemp = SegmentBaseAddress[6]; Actor_ct(sp68, game_play); - gSegments[6] = segmentTemp; + SegmentBaseAddress[6] = segmentTemp; } return sp68; |