diff options
-rw-r--r-- | asm/contest.s | 52 | ||||
-rw-r--r-- | asm/contest_link_80C2020.s | 40 | ||||
-rw-r--r-- | asm/contest_link_80C857C.s | 4 | ||||
-rw-r--r-- | asm/matsuda_debug_menu.s | 4 | ||||
-rw-r--r-- | asm/script_pokemon_util_80C4BF0.s | 12 | ||||
-rw-r--r-- | src/matsuda_debug_menu.c | 8 | ||||
-rw-r--r-- | src/text.c | 4 | ||||
-rw-r--r-- | sym_ewram.txt | 2 |
8 files changed, 63 insertions, 63 deletions
diff --git a/asm/contest.s b/asm/contest.s index ba5bbfc1c..c98f5db0d 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -13,12 +13,12 @@ nullsub_89: @ 80AB1AC thumb_func_start sub_80AB1B0 sub_80AB1B0: @ 80AB1B0 - ldr r1, _080AB1B8 @ =gUnknown_0203869A + ldr r1, _080AB1B8 @ =gIsLinkContest movs r0, 0 strb r0, [r1] bx lr .align 2, 0 -_080AB1B8: .4byte gUnknown_0203869A +_080AB1B8: .4byte gIsLinkContest thumb_func_end sub_80AB1B0 thumb_func_start sub_80AB1BC @@ -302,7 +302,7 @@ _080AB3DE: movs r1, 0 movs r2, 0x10 bl memset - ldr r0, _080AB474 @ =gUnknown_0203869A + ldr r0, _080AB474 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -338,7 +338,7 @@ _080AB448: _080AB468: .4byte 0x02019204 _080AB46C: .4byte 0x02019260 _080AB470: .4byte 0x020192d0 -_080AB474: .4byte gUnknown_0203869A +_080AB474: .4byte gIsLinkContest _080AB478: .4byte gUnknown_02038696 thumb_func_end sub_80AB398 @@ -526,7 +526,7 @@ sub_80AB604: @ 80AB604 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080AB648 @ =gUnknown_0203869A + ldr r0, _080AB648 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -555,7 +555,7 @@ sub_80AB604: @ 80AB604 str r1, [r0] b _080AB66A .align 2, 0 -_080AB648: .4byte gUnknown_0203869A +_080AB648: .4byte gIsLinkContest _080AB64C: .4byte gPaletteFade _080AB650: .4byte sub_80AB678 _080AB654: .4byte gTasks @@ -1806,7 +1806,7 @@ sub_80AC0C8: @ 80AC0C8 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 - ldr r0, _080AC120 @ =gUnknown_0203869A + ldr r0, _080AC120 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -1843,7 +1843,7 @@ sub_80AC0C8: @ 80AC0C8 bl sub_80AFFE0 b _080AC14E .align 2, 0 -_080AC120: .4byte gUnknown_0203869A +_080AC120: .4byte gIsLinkContest _080AC124: .4byte gContestPlayerMonIndex _080AC128: .4byte 0x02019260 _080AC12C: .4byte sub_80C8A38 @@ -2173,7 +2173,7 @@ _080AC42C: ldr r4, _080AC484 @ =0x02019204 strb r6, [r4, 0x11] ldrb r7, [r4, 0x11] - ldr r0, _080AC488 @ =gUnknown_0203869A + ldr r0, _080AC488 @ =gIsLinkContest ldrb r1, [r0] movs r5, 0x1 adds r0, r5, 0 @@ -2210,7 +2210,7 @@ _080AC458: bl _080AD8CA .align 2, 0 _080AC484: .4byte 0x02019204 -_080AC488: .4byte gUnknown_0203869A +_080AC488: .4byte gIsLinkContest _080AC48C: .4byte sub_80C8C80 _080AC490: .4byte sub_80AD8DC _080AC494: .4byte gTasks @@ -4763,7 +4763,7 @@ _080AD988: beq _080ADA08 b _080ADA10 _080AD98E: - ldr r0, _080AD9D8 @ =gUnknown_0203869A + ldr r0, _080AD9D8 @ =gIsLinkContest ldrb r1, [r0] movs r6, 0x1 adds r0, r6, 0 @@ -4795,7 +4795,7 @@ _080AD9B8: strh r6, [r5, 0x8] b _080ADA10 .align 2, 0 -_080AD9D8: .4byte gUnknown_0203869A +_080AD9D8: .4byte gIsLinkContest _080AD9DC: .4byte 0x02019204 _080AD9E0: .4byte sub_80C8C80 _080AD9E4: .4byte sub_80AD8DC @@ -5473,7 +5473,7 @@ sub_80ADEEC: @ 80ADEEC ble _080ADF40 movs r0, 0 strh r0, [r4, 0x8] - ldr r0, _080ADF24 @ =gUnknown_0203869A + ldr r0, _080ADF24 @ =gIsLinkContest ldrb r0, [r0] movs r1, 0x1 ands r1, r0 @@ -5483,7 +5483,7 @@ sub_80ADEEC: @ 80ADEEC b _080ADF3E .align 2, 0 _080ADF20: .4byte gTasks -_080ADF24: .4byte gUnknown_0203869A +_080ADF24: .4byte gIsLinkContest _080ADF28: .4byte sub_80ADF4C _080ADF2C: movs r0, 0x1 @@ -5642,7 +5642,7 @@ _080AE04C: thumb_func_start sub_80AE054 sub_80AE054: @ 80AE054 push {lr} - ldr r0, _080AE06C @ =gUnknown_0203869A + ldr r0, _080AE06C @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -5655,7 +5655,7 @@ _080AE068: pop {r0} bx r0 .align 2, 0 -_080AE06C: .4byte gUnknown_0203869A +_080AE06C: .4byte gIsLinkContest _080AE070: .4byte gContestPlayerMonIndex thumb_func_end sub_80AE054 @@ -5694,7 +5694,7 @@ sub_80AE098: @ 80AE098 bl StringCopy mov r0, sp bl StripExtCtrlCodes - ldr r0, _080AE0F4 @ =gUnknown_0203869A + ldr r0, _080AE0F4 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -5726,7 +5726,7 @@ _080AE0CE: b _080AE108 .align 2, 0 _080AE0F0: .4byte gSaveBlock2 -_080AE0F4: .4byte gUnknown_0203869A +_080AE0F4: .4byte gIsLinkContest _080AE0F8: .4byte gContestPlayerMonIndex _080AE0FC: .4byte gUnknown_0203857D _080AE100: @@ -5768,7 +5768,7 @@ _080AE108: bl GetMonData mov r0, sp bl StringGetEnd10 - ldr r0, _080AE188 @ =gUnknown_0203869A + ldr r0, _080AE188 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -5791,7 +5791,7 @@ _080AE108: _080AE17C: .4byte gContestMons _080AE180: .4byte gContestPlayerMonIndex _080AE184: .4byte gPlayerParty -_080AE188: .4byte gUnknown_0203869A +_080AE188: .4byte gIsLinkContest _080AE18C: mov r0, sp ldrb r2, [r0, 0x5] @@ -6374,7 +6374,7 @@ sub_80AE5D4: @ 80AE5D4 movs r0, 0xBA strb r0, [r3] adds r3, 0x1 - ldr r0, _080AE668 @ =gUnknown_0203869A + ldr r0, _080AE668 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -6422,7 +6422,7 @@ sub_80AE5D4: @ 80AE5D4 .align 2, 0 _080AE660: .4byte gUnknown_020238CC _080AE664: .4byte gEmptyString_81E72B0 -_080AE668: .4byte gUnknown_0203869A +_080AE668: .4byte gIsLinkContest _080AE66C: .4byte gLinkPlayers _080AE670: .4byte gUnknown_03004210 _080AE674: .4byte gUnknown_02038696 @@ -14595,7 +14595,7 @@ _080B2470: .4byte 0x02019218 _080B2474: .4byte gUnknown_02038696 _080B2478: .4byte gTasks _080B247C: - ldr r0, _080B24C0 @ =gUnknown_0203869A + ldr r0, _080B24C0 @ =gIsLinkContest ldrb r0, [r0] ands r1, r0 cmp r1, 0 @@ -14625,7 +14625,7 @@ _080B249E: strh r0, [r5, 0x8] b _080B24FC .align 2, 0 -_080B24C0: .4byte gUnknown_0203869A +_080B24C0: .4byte gIsLinkContest _080B24C4: .4byte 0x02019204 _080B24C8: .4byte sub_80C8C80 _080B24CC: .4byte sub_80AD8DC @@ -15537,7 +15537,7 @@ _080B2BC4: adds r1, r4, r1 str r2, [sp] bl StringCopy - ldr r0, _080B2C1C @ =gUnknown_0203869A + ldr r0, _080B2C1C @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -15556,7 +15556,7 @@ _080B2BC4: .align 2, 0 _080B2C14: .4byte 0x02015de0 _080B2C18: .4byte gContestMons -_080B2C1C: .4byte gUnknown_0203869A +_080B2C1C: .4byte gIsLinkContest _080B2C20: .4byte gLinkPlayers + 0x8 _080B2C24: adds r0, r5, 0 diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 99e7511c9..672eb4c1a 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -316,7 +316,7 @@ _080C2296: adds r0, r2, 0 bl StringCopy adds r2, r0, 0 - ldr r0, _080C22F4 @ =gUnknown_0203869A + ldr r0, _080C22F4 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -334,7 +334,7 @@ _080C2296: _080C22E8: .4byte gUnknown_020238CC _080C22EC: .4byte gContestMons + 0x2 _080C22F0: .4byte gUnknown_083D17E0 -_080C22F4: .4byte gUnknown_0203869A +_080C22F4: .4byte gIsLinkContest _080C22F8: .4byte gLinkPlayers + 0x8 _080C22FC: adds r1, r7, 0 @@ -564,7 +564,7 @@ sub_80C24F4: @ 80C24F4 ands r0, r1 cmp r0, 0 bne _080C254E - ldr r0, _080C2530 @ =gUnknown_0203869A + ldr r0, _080C2530 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -582,7 +582,7 @@ sub_80C24F4: @ 80C24F4 b _080C254E .align 2, 0 _080C252C: .4byte gPaletteFade -_080C2530: .4byte gUnknown_0203869A +_080C2530: .4byte gIsLinkContest _080C2534: .4byte gOtherText_LinkStandby _080C2538: .4byte gTasks _080C253C: .4byte sub_80C255C @@ -1169,7 +1169,7 @@ _080C299C: movs r4, 0 ldr r2, _080C29F4 @ =gUnknown_02038690 ldrb r0, [r2] - ldr r1, _080C29F8 @ =gUnknown_0203869A + ldr r1, _080C29F8 @ =gIsLinkContest ldr r3, _080C29FC @ =gStringVar1 cmp r0, 0 beq _080C29D4 @@ -1198,7 +1198,7 @@ _080C29D4: b _080C2A10 .align 2, 0 _080C29F4: .4byte gUnknown_02038690 -_080C29F8: .4byte gUnknown_0203869A +_080C29F8: .4byte gIsLinkContest _080C29FC: .4byte gStringVar1 _080C2A00: .4byte gLinkPlayers + 0x8 _080C2A04: @@ -1586,7 +1586,7 @@ sub_80C2D1C: @ 80C2D1C ands r0, r1 cmp r0, 0 beq _080C2D66 - ldr r0, _080C2D70 @ =gUnknown_0203869A + ldr r0, _080C2D70 @ =gIsLinkContest ldrb r1, [r0] adds r0, r2, 0 ands r0, r1 @@ -1619,7 +1619,7 @@ _080C2D66: bx r0 .align 2, 0 _080C2D6C: .4byte gMain -_080C2D70: .4byte gUnknown_0203869A +_080C2D70: .4byte gIsLinkContest _080C2D74: .4byte gContestMons _080C2D78: .4byte gTasks _080C2D7C: .4byte sub_80C2D80 @@ -1630,7 +1630,7 @@ sub_80C2D80: @ 80C2D80 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - ldr r0, _080C2DAC @ =gUnknown_0203869A + ldr r0, _080C2DAC @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -1648,7 +1648,7 @@ sub_80C2D80: @ 80C2D80 str r1, [r0] b _080C2DCA .align 2, 0 -_080C2DAC: .4byte gUnknown_0203869A +_080C2DAC: .4byte gIsLinkContest _080C2DB0: .4byte gOtherText_LinkStandby _080C2DB4: .4byte gTasks _080C2DB8: .4byte sub_80C2DD8 @@ -1678,7 +1678,7 @@ sub_80C2DD8: @ 80C2DD8 ldrb r1, [r0] cmp r1, 0 bne _080C2DFC - ldr r0, _080C2E08 @ =gUnknown_0203869A + ldr r0, _080C2E08 @ =gIsLinkContest strb r1, [r0] bl sub_80C3764 ldr r1, _080C2E0C @ =gTasks @@ -1694,7 +1694,7 @@ _080C2DFC: bx r0 .align 2, 0 _080C2E04: .4byte gReceivedRemoteLinkPlayers -_080C2E08: .4byte gUnknown_0203869A +_080C2E08: .4byte gIsLinkContest _080C2E0C: .4byte gTasks _080C2E10: .4byte sub_80C2E14 thumb_func_end sub_80C2DD8 @@ -2954,7 +2954,7 @@ sub_80C37E4: @ 80C37E4 sub sp, 0x10 movs r5, 0x1 movs r4, 0 - ldr r0, _080C3808 @ =gUnknown_0203869A + ldr r0, _080C3808 @ =gIsLinkContest ldrb r0, [r0] adds r1, r5, 0 ands r1, r0 @@ -2968,7 +2968,7 @@ sub_80C37E4: @ 80C37E4 str r2, [sp, 0x4] b _080C386A .align 2, 0 -_080C3808: .4byte gUnknown_0203869A +_080C3808: .4byte gIsLinkContest _080C380C: .4byte 0x0600e000 _080C3810: .4byte gUnknown_08E964B8 _080C3814: @@ -4871,7 +4871,7 @@ sub_80C4698: @ 80C4698 adds r1, r0 adds r0, r5, 0 bl StringCopy - ldr r0, _080C46E4 @ =gUnknown_0203869A + ldr r0, _080C46E4 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -4898,14 +4898,14 @@ _080C46DA: bx r0 .align 2, 0 _080C46E0: .4byte gContestMons + 0x2 -_080C46E4: .4byte gUnknown_0203869A +_080C46E4: .4byte gIsLinkContest _080C46E8: .4byte gLinkPlayers thumb_func_end sub_80C4698 thumb_func_start sub_80C46EC sub_80C46EC: @ 80C46EC push {lr} - ldr r0, _080C4710 @ =gUnknown_0203869A + ldr r0, _080C4710 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -4922,7 +4922,7 @@ sub_80C46EC: @ 80C46EC bl sub_80C4674 b _080C4730 .align 2, 0 -_080C4710: .4byte gUnknown_0203869A +_080C4710: .4byte gIsLinkContest _080C4714: .4byte gStringVar1 _080C4718: .4byte gSpecialVar_0x8006 _080C471C: .4byte gLinkPlayers + 0x8 @@ -5047,7 +5047,7 @@ sub_80C47F0: @ 80C47F0 movs r2, 0 ldr r3, _080C4830 @ =gUnknown_02038690 ldrb r0, [r3] - ldr r1, _080C4834 @ =gUnknown_0203869A + ldr r1, _080C4834 @ =gIsLinkContest ldr r4, _080C4838 @ =gStringVar3 cmp r0, 0 beq _080C4812 @@ -5077,7 +5077,7 @@ _080C4812: b _080C484C .align 2, 0 _080C4830: .4byte gUnknown_02038690 -_080C4834: .4byte gUnknown_0203869A +_080C4834: .4byte gIsLinkContest _080C4838: .4byte gStringVar3 _080C483C: .4byte gLinkPlayers + 0x8 _080C4840: diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s index bef1d4402..12dc3bdb5 100644 --- a/asm/contest_link_80C857C.s +++ b/asm/contest_link_80C857C.s @@ -152,7 +152,7 @@ sub_80C8660: @ 80C8660 lsrs r0, 24 cmp r0, 0x4 bne _080C868E - ldr r1, _080C869C @ =gUnknown_0203869A + ldr r1, _080C869C @ =gIsLinkContest movs r0, 0x1 strb r0, [r1] adds r0, r4, 0 @@ -164,7 +164,7 @@ _080C868E: .align 2, 0 _080C8694: .4byte gReceivedRemoteLinkPlayers _080C8698: .4byte gContestPlayerMonIndex -_080C869C: .4byte gUnknown_0203869A +_080C869C: .4byte gIsLinkContest thumb_func_end sub_80C8660 thumb_func_start sub_80C86A0 diff --git a/asm/matsuda_debug_menu.s b/asm/matsuda_debug_menu.s index e9577b8b8..a7291e20a 100644 --- a/asm/matsuda_debug_menu.s +++ b/asm/matsuda_debug_menu.s @@ -70,7 +70,7 @@ sub_80AACC4: @ 80AACC4 cmp r0, 0 bne _080AACF4 bl SetDebugMonForContest - ldr r0, _080AACFC @ =gUnknown_0203869A + ldr r0, _080AACFC @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -87,7 +87,7 @@ _080AACF4: bx r0 .align 2, 0 _080AACF8: .4byte gPaletteFade -_080AACFC: .4byte gUnknown_0203869A +_080AACFC: .4byte gIsLinkContest _080AAD00: .4byte 0x02000000 _080AAD04: .4byte sub_80AB47C thumb_func_end sub_80AACC4 diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s index 6ce5f0dc7..6777ca135 100644 --- a/asm/script_pokemon_util_80C4BF0.s +++ b/asm/script_pokemon_util_80C4BF0.s @@ -370,7 +370,7 @@ _080C4E78: lsrs r1, 24 mov r0, r9 bl sub_80C4698 - ldr r0, _080C4EAC @ =gUnknown_0203869A + ldr r0, _080C4EAC @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -388,7 +388,7 @@ _080C4E78: _080C4EA0: .4byte gUnknown_02038670 _080C4EA4: .4byte gSpecialVar_0x8006 _080C4EA8: .4byte gStringVar1 -_080C4EAC: .4byte gUnknown_0203869A +_080C4EAC: .4byte gIsLinkContest _080C4EB0: .4byte gStringVar2 _080C4EB4: .4byte gLinkPlayers + 0x8 _080C4EB8: @@ -821,7 +821,7 @@ _080C5222: thumb_func_start ScriptGetMultiplayerId ScriptGetMultiplayerId: @ 80C5228 push {r4,lr} - ldr r0, _080C5244 @ =gUnknown_0203869A + ldr r0, _080C5244 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -834,7 +834,7 @@ ScriptGetMultiplayerId: @ 80C5228 strh r0, [r4] b _080C5252 .align 2, 0 -_080C5244: .4byte gUnknown_0203869A +_080C5244: .4byte gIsLinkContest _080C5248: .4byte gScriptResult _080C524C: ldr r1, _080C5258 @ =gScriptResult @@ -851,7 +851,7 @@ _080C5258: .4byte gScriptResult thumb_func_start ScriptRandom ScriptRandom: @ 80C525C push {r4,lr} - ldr r0, _080C5280 @ =gUnknown_0203869A + ldr r0, _080C5280 @ =gIsLinkContest ldrb r1, [r0] movs r0, 0x1 ands r0, r1 @@ -868,7 +868,7 @@ ScriptRandom: @ 80C525C ldr r4, _080C5290 @ =gScriptResult b _080C529E .align 2, 0 -_080C5280: .4byte gUnknown_0203869A +_080C5280: .4byte gIsLinkContest _080C5284: .4byte gUnknown_03005D28 _080C5288: .4byte 0x41c64e6d _080C528C: .4byte 0x00006073 diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c index df2ca3206..c74f4db0d 100644 --- a/src/matsuda_debug_menu.c +++ b/src/matsuda_debug_menu.c @@ -13,7 +13,7 @@ #define BIT(n) (1 << (n)) -extern u8 gUnknown_0203869A; +extern u8 gIsLinkContest; extern u8 gUnknown_0203869B; extern u8 gContestPlayerMonIndex; extern u16 gScriptContestCategory; @@ -135,7 +135,7 @@ static void sub_80A9BE4(u8 taskId) { DestroyTask(taskId); - if(!(gUnknown_0203869A & 1)) + if(!(gIsLinkContest & 1)) sub_80AF668(); sub_80C2358(); @@ -144,7 +144,7 @@ static void sub_80A9BE4(u8 taskId) s8 MatsudaDebugMenu_Contest(void) { - gUnknown_0203869A = 0; + gIsLinkContest = 0; sub_80AA10C(); return 0; } @@ -289,7 +289,7 @@ static void sub_80A9F10(u8 taskId) gContestPlayerMonIndex = GetMultiplayerId(); if(GetLinkPlayerCount() == 4) { - gUnknown_0203869A = 1; + gIsLinkContest = 1; SwitchTaskToFollowupFunc(taskId); } } diff --git a/src/text.c b/src/text.c index fb6118b65..a3e07594e 100644 --- a/src/text.c +++ b/src/text.c @@ -180,7 +180,7 @@ EWRAM_DATA u8 gStringVar3[0x100] = {0}; EWRAM_DATA u8 gStringVar4[0x100] = {0}; extern u16 gBattleTypeFlags; -extern u8 gUnknown_0203869A; +extern u8 gIsLinkContest; extern u8 gTileBuffer[]; vu16 *const gBGControlRegs[] = @@ -2908,7 +2908,7 @@ static bool8 PlayerCanInterruptWait(struct Window *win) break; case 3: retVal = FALSE; - if (!gUnknown_0203869A) + if (!gIsLinkContest) retVal = TRUE; break; case 1: diff --git a/sym_ewram.txt b/sym_ewram.txt index 919b00f72..638a61a7f 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -768,7 +768,7 @@ gContestPlayerMonIndex: @ 2038695 gUnknown_02038696: @ 2038696 .space 0x4 -gUnknown_0203869A: @ 203869A +gIsLinkContest: @ 203869A .space 0x1 gUnknown_0203869B: @ 203869B |