diff options
author | Cameron Hall <cameronghall@cox.net> | 2018-01-27 16:51:06 -0600 |
---|---|---|
committer | Cameron Hall <cameronghall@cox.net> | 2018-01-27 16:51:06 -0600 |
commit | 0597628ae78755f4e30ae6bc79b3075e5b9c8ab8 (patch) | |
tree | 0b2964103554e55ba4e03d4dbe8103bc8f06fc41 /src/contest.c | |
parent | 8aae2583eb851d1442b85e28d7bcb13a15c1818d (diff) | |
parent | e92ead0e159ccaa8301b189b9ef2bb1a33b2ea62 (diff) |
Merge branch 'master' into german_debug
Diffstat (limited to 'src/contest.c')
-rw-r--r-- | src/contest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/contest.c b/src/contest.c index 2f988b9e4..e2695627e 100644 --- a/src/contest.c +++ b/src/contest.c @@ -61,7 +61,7 @@ extern u16 gBattle_BG0_Y; extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u16 gBattle_WIN0H; -extern u32 gUnknown_03005D28; // saved RNG value +extern u32 gContestRngValue; // saved RNG value extern struct SpriteTemplate gUnknown_02024E8C; @@ -498,7 +498,7 @@ void sub_80AB6B4(u8 taskId) GetMultiplayerId(); // unused return value DestroyTask(taskId); gTasks[sContest.mainTaskId].func = sub_80AB960; - gRngValue = gUnknown_03005D28; + gRngValue = gContestRngValue; } } @@ -2004,7 +2004,7 @@ void sub_80ADDA4(u8 taskId) sub_80AF668(); sub_80AF138(); sub_80BE23C(sContestantStatus[gContestPlayerMonIndex].prevMove); - gUnknown_03005D28 = gRngValue; + gContestRngValue = gRngValue; StringExpandPlaceholders(gStringVar4, gUnknown_083CB02C); Text_InitWindow8002EB0(&gMenuWindow, gStringVar4, 776, 1, 15); gTasks[taskId].data[2] = 0; |