summaryrefslogtreecommitdiff
path: root/src/overlays/gamestates
diff options
context:
space:
mode:
authorDerek Hensley <hensley.derek58@gmail.com>2024-12-26 07:14:55 -0800
committerGitHub <noreply@github.com>2024-12-26 08:14:55 -0700
commitbececbff99bd2bb208a811c100c8f79ebbecc77d (patch)
treee2e3e00ac3d9aa866c727197e20c6f6b0201f24b /src/overlays/gamestates
parent60579a4260965c1de2e8a8f320fe9f8c3f5d2dde (diff)
main OK (#234)
* main OK * gSegments -> SegmentBaseAddress * newline * format
Diffstat (limited to 'src/overlays/gamestates')
-rw-r--r--src/overlays/gamestates/ovl_cpedit/m_cpedit.c2
-rw-r--r--src/overlays/gamestates/ovl_play/m_play.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/overlays/gamestates/ovl_cpedit/m_cpedit.c b/src/overlays/gamestates/ovl_cpedit/m_cpedit.c
index 7b8fa00..55dc518 100644
--- a/src/overlays/gamestates/ovl_cpedit/m_cpedit.c
+++ b/src/overlays/gamestates/ovl_cpedit/m_cpedit.c
@@ -34,7 +34,7 @@ void func_80804930_jp(Game_CPEdit* edit) {
SET_NEXT_GAMESTATE((Game*)edit, trademark_init, sizeof(Game_Trademark));
}
- gSegments[4] = OS_K0_TO_PHYSICAL(segment);
+ SegmentBaseAddress[4] = OS_K0_TO_PHYSICAL(segment);
OPEN_DISPS(graph);
diff --git a/src/overlays/gamestates/ovl_play/m_play.c b/src/overlays/gamestates/ovl_play/m_play.c
index 1cbd4a2..44dea63 100644
--- a/src/overlays/gamestates/ovl_play/m_play.c
+++ b/src/overlays/gamestates/ovl_play/m_play.c
@@ -482,8 +482,8 @@ void Game_play_move(Game_Play* game_play) {
game_play->state.unk_9D = 0x8D;
game_play->state.unk_9C = 1;
Game_play_Reset_destiny();
- gSegments[4] = (uintptr_t)OS_K0_TO_PHYSICAL(p->status[0].segment);
- gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
+ SegmentBaseAddress[4] = (uintptr_t)OS_K0_TO_PHYSICAL(p->status[0].segment);
+ SegmentBaseAddress[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
game_play->state.unk_9C = 2;
if (zurumode_flag >= 2) {
@@ -536,8 +536,8 @@ void Game_play_move(Game_Play* game_play) {
void func_80803810_jp(Game_Play* game_play, GraphicsContext* gfxCtx) {
void* temp_v0 = game_play->objectExchangeBank.status[0].segment;
- gSegments[4] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_v0);
- gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
+ SegmentBaseAddress[4] = (uintptr_t)OS_K0_TO_PHYSICAL(temp_v0);
+ SegmentBaseAddress[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
OPEN_DISPS(gfxCtx);
@@ -861,7 +861,7 @@ void Gameplay_Scene_Read(Game_Play* game_play, s16 arg1) {
game_play->unk_00E0 = arg1;
game_play->unk_010C = func_80804138_jp(game_play, sp1C);
sp1C->unk_13 = 0;
- gSegments[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
+ SegmentBaseAddress[2] = (uintptr_t)OS_K0_TO_PHYSICAL(game_play->unk_010C);
Gameplay_Scene_Init(game_play);
sAdo_RoomType(mPl_SceneNo2SoundRoomType(common_data.save.sceneNo));
}