summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorProjectRevoTPP <projectrevotpp@hotmail.com>2016-12-11 15:21:48 -0500
committerYamaArashi <YamaArashi@users.noreply.github.com>2016-12-11 12:21:48 -0800
commitc7b4ec3cdf5fce8d48f73166d08c37aaaaac98ab (patch)
tree6f0ea9639daf2f41a817f4d93be9a01d24862f65
parentd145c73c8e68bd210474f9682a3134014ed78d9d (diff)
decompile more of matsuda_debug_menu.c (#122)
* begin decompiling matsuda_debug_menu.c * i'm sorry for misspelling your name * decompile more masuda_debug_menu.c * mergable state * whatever yama * more decompilation of matsuda_debug_menu.c * matsuda debug text label consistency * add current work
Diffstat
-rw-r--r--asm/contest.s220
-rw-r--r--asm/contest_ai.s52
-rw-r--r--asm/contest_link_80C2020.s56
-rw-r--r--asm/contest_link_80C857C.s36
-rw-r--r--asm/matsuda_debug_menu.s910
-rw-r--r--asm/script_pokemon_util_80C4BF0.s20
-rw-r--r--data/data2.s66
-rw-r--r--include/pokemon.h64
-rw-r--r--src/matsuda_debug_menu.c724
-rw-r--r--sym_ewram.txt5
10 files changed, 962 insertions, 1191 deletions
diff --git a/asm/contest.s b/asm/contest.s
index 4b99acefc..78354b363 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -811,7 +811,7 @@ _080AB844:
mov r1, sp
adds r2, r6, 0
bl CpuSet
- ldr r0, _080AB8B8 @ =gUnknown_02038695
+ ldr r0, _080AB8B8 @ =gContestPlayerMonIndex
mov r9, r0
ldrb r0, [r0]
adds r0, 0x5
@@ -850,7 +850,7 @@ _080AB844:
_080AB8AC: .4byte gUnknown_08D17144
_080AB8B0: .4byte gPlttBufferUnfaded + 0x100
_080AB8B4: .4byte REG_BG0CNT
-_080AB8B8: .4byte gUnknown_02038695
+_080AB8B8: .4byte gContestPlayerMonIndex
_080AB8BC: .4byte 0xffffff00
_080AB8C0: .4byte 0x02018004
_080AB8C4: .4byte 0x040000d4
@@ -1191,7 +1191,7 @@ sub_80ABB70: @ 80ABB70
ldr r1, _080ABBC4 @ =0x84000100
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- ldr r0, _080ABBC8 @ =gUnknown_02038695
+ ldr r0, _080ABBC8 @ =gContestPlayerMonIndex
ldrb r0, [r0]
bl sub_80AF59C
lsls r0, 24
@@ -1208,7 +1208,7 @@ _080ABBB8: .4byte gPlttBufferUnfaded
_080ABBBC: .4byte 0x02018204
_080ABBC0: .4byte 0x040000d4
_080ABBC4: .4byte 0x84000100
-_080ABBC8: .4byte gUnknown_02038695
+_080ABBC8: .4byte gContestPlayerMonIndex
_080ABBCC: .4byte gUnknown_020238CC
_080ABBD0: .4byte gUnknown_083CAF84
_080ABBD4:
@@ -1301,7 +1301,7 @@ sub_80ABC70: @ 80ABC70
_080ABC88:
movs r0, 0x5
bl PlaySE
- ldr r0, _080ABCB4 @ =gUnknown_02038695
+ ldr r0, _080ABCB4 @ =gContestPlayerMonIndex
ldrb r0, [r0]
bl sub_80AF59C
lsls r0, 24
@@ -1318,7 +1318,7 @@ _080ABC88:
b _080ABCCC
.align 2, 0
_080ABCB0: .4byte gMain
-_080ABCB4: .4byte gUnknown_02038695
+_080ABCB4: .4byte gContestPlayerMonIndex
_080ABCB8: .4byte gTasks
_080ABCBC: .4byte sub_80ABCDC
_080ABCC0:
@@ -1367,7 +1367,7 @@ sub_80ABCDC: @ 80ABCDC
movs r1, 0
bl FillWindowRect_DefaultPalette
movs r6, 0
- ldr r0, _080ABD90 @ =gUnknown_02038695
+ ldr r0, _080ABD90 @ =gContestPlayerMonIndex
mov r8, r0
ldr r7, _080ABD94 @ =0x02019260
mov r9, r5
@@ -1425,7 +1425,7 @@ _080ABD80: .4byte gUnknown_030042A0
_080ABD84: .4byte gUnknown_03004280
_080ABD88: .4byte gUnknown_03004210
_080ABD8C: .4byte gUnknown_083CA340
-_080ABD90: .4byte gUnknown_02038695
+_080ABD90: .4byte gContestPlayerMonIndex
_080ABD94: .4byte 0x02019260
_080ABD98: .4byte gUnknown_0203858E
_080ABD9C: .4byte gUnknownText_UnknownFormatting2
@@ -1504,10 +1504,10 @@ _080ABE20:
movs r0, 0
ldrsb r0, [r4, r0]
bl sub_80AC0AC
- ldr r2, _080ABE90 @ =gUnknown_02038570
+ ldr r2, _080ABE90 @ =gContestMons
ldrb r1, [r4]
lsls r1, 1
- ldr r0, _080ABE94 @ =gUnknown_02038695
+ ldr r0, _080ABE94 @ =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
adds r1, r0
@@ -1539,8 +1539,8 @@ _080ABE80: .4byte gUnknown_083CA340 + 0x1
_080ABE84: .4byte 0x0000ffff
_080ABE88: .4byte 0x00002d9f
_080ABE8C: .4byte 0x02019204
-_080ABE90: .4byte gUnknown_02038570
-_080ABE94: .4byte gUnknown_02038695
+_080ABE90: .4byte gContestMons
+_080ABE94: .4byte gContestPlayerMonIndex
_080ABE98: .4byte gTasks
_080ABE9C: .4byte sub_80ABEA0
thumb_func_end sub_80ABCDC
@@ -1553,8 +1553,8 @@ sub_80ABEA0: @ 80ABEA0
lsrs r7, r0, 24
movs r6, 0
ldr r3, _080ABEF4 @ =gMain
- ldr r1, _080ABEF8 @ =gUnknown_02038570
- ldr r0, _080ABEFC @ =gUnknown_02038695
+ ldr r1, _080ABEF8 @ =gContestMons
+ ldr r0, _080ABEFC @ =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
adds r1, 0x1E
@@ -1590,8 +1590,8 @@ _080ABEC6:
b _080AC098
.align 2, 0
_080ABEF4: .4byte gMain
-_080ABEF8: .4byte gUnknown_02038570
-_080ABEFC: .4byte gUnknown_02038695
+_080ABEF8: .4byte gContestMons
+_080ABEFC: .4byte gContestPlayerMonIndex
_080ABF00: .4byte gTasks
_080ABF04: .4byte sub_80AC0C8
_080ABF08:
@@ -1629,7 +1629,7 @@ _080ABF26:
str r1, [sp, 0x4]
movs r1, 0
bl FillWindowRect_DefaultPalette
- ldr r0, _080ABF6C @ =gUnknown_02038695
+ ldr r0, _080ABF6C @ =gContestPlayerMonIndex
ldrb r0, [r0]
bl sub_80AF59C
lsls r0, 24
@@ -1642,7 +1642,7 @@ _080ABF26:
.align 2, 0
_080ABF64: .4byte gUnknown_03004210
_080ABF68: .4byte gUnknown_083CA340
-_080ABF6C: .4byte gUnknown_02038695
+_080ABF6C: .4byte gContestPlayerMonIndex
_080ABF70: .4byte gUnknown_020238CC
_080ABF74: .4byte gUnknown_083CAF84
_080ABF78:
@@ -1713,10 +1713,10 @@ _080AC006:
ldrsb r0, [r4, r0]
bl sub_80AC0AC
bl sub_80AED58
- ldr r2, _080AC040 @ =gUnknown_02038570
+ ldr r2, _080AC040 @ =gContestMons
ldrb r1, [r4]
lsls r1, 1
- ldr r0, _080AC044 @ =gUnknown_02038695
+ ldr r0, _080AC044 @ =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
adds r1, r0
@@ -1731,8 +1731,8 @@ _080AC006:
b _080AC098
.align 2, 0
_080AC03C: .4byte 0x02019204
-_080AC040: .4byte gUnknown_02038570
-_080AC044: .4byte gUnknown_02038695
+_080AC040: .4byte gContestMons
+_080AC044: .4byte gContestPlayerMonIndex
_080AC048:
ldr r4, _080AC060 @ =0x02019204
movs r0, 0
@@ -1755,10 +1755,10 @@ _080AC068:
ldrsb r0, [r4, r0]
bl sub_80AC0AC
bl sub_80AED58
- ldr r2, _080AC0A4 @ =gUnknown_02038570
+ ldr r2, _080AC0A4 @ =gContestMons
ldrb r1, [r4]
lsls r1, 1
- ldr r0, _080AC0A8 @ =gUnknown_02038695
+ ldr r0, _080AC0A8 @ =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
adds r1, r0
@@ -1777,8 +1777,8 @@ _080AC098:
bx r0
.align 2, 0
_080AC0A0: .4byte 0x02019204
-_080AC0A4: .4byte gUnknown_02038570
-_080AC0A8: .4byte gUnknown_02038695
+_080AC0A4: .4byte gContestMons
+_080AC0A8: .4byte gContestPlayerMonIndex
thumb_func_end sub_80ABEA0
thumb_func_start sub_80AC0AC
@@ -1812,7 +1812,7 @@ sub_80AC0C8: @ 80AC0C8
ands r0, r1
cmp r0, 0
beq _080AC13C
- ldr r4, _080AC124 @ =gUnknown_02038695
+ ldr r4, _080AC124 @ =gContestPlayerMonIndex
ldrb r0, [r4]
bl sub_80AF15C
ldrb r2, [r4]
@@ -1844,7 +1844,7 @@ sub_80AC0C8: @ 80AC0C8
b _080AC14E
.align 2, 0
_080AC120: .4byte gUnknown_0203869A
-_080AC124: .4byte gUnknown_02038695
+_080AC124: .4byte gContestPlayerMonIndex
_080AC128: .4byte 0x02019260
_080AC12C: .4byte sub_80C8A38
_080AC130: .4byte sub_80AC15C
@@ -2311,7 +2311,7 @@ _080AC542:
adds r7, r4, r5
ldrb r0, [r7, 0x11]
bl sub_80B28F0
- ldr r3, _080AC5D0 @ =gUnknown_02038570
+ ldr r3, _080AC5D0 @ =gContestMons
ldrb r2, [r7, 0x11]
lsls r2, 6
adds r0, r2, r3
@@ -2360,7 +2360,7 @@ _080AC542:
_080AC5C4: .4byte 0x02019348
_080AC5C8: .4byte gUnknown_02024E84
_080AC5CC: .4byte 0xfffffebc
-_080AC5D0: .4byte gUnknown_02038570
+_080AC5D0: .4byte gContestMons
_080AC5D4: .4byte gSprites
_080AC5D8: .4byte sub_80AD8FC
_080AC5DC: .4byte gTasks
@@ -2428,7 +2428,7 @@ _080AC664:
bl sub_80AF138
ldr r0, _080AC690 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080AC694 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080AC694 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldrh r1, [r5, 0x6]
@@ -2446,7 +2446,7 @@ _080AC664:
b _080AC6B0
.align 2, 0
_080AC690: .4byte gStringVar1
-_080AC694: .4byte gUnknown_02038570 + 0x2
+_080AC694: .4byte gContestMons + 0x2
_080AC698: .4byte gStringVar2
_080AC69C: .4byte gMoveNames
_080AC6A0:
@@ -3369,7 +3369,7 @@ _080ACE0A:
bl sub_80AF138
ldr r0, _080ACE4C @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080ACE50 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080ACE50 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r4, _080ACE54 @ =gStringVar4
@@ -3396,7 +3396,7 @@ _080ACE36:
.align 2, 0
_080ACE48: .4byte 0x02019260
_080ACE4C: .4byte gStringVar1
-_080ACE50: .4byte gUnknown_02038570 + 0x2
+_080ACE50: .4byte gContestMons + 0x2
_080ACE54: .4byte gStringVar4
_080ACE58: .4byte gUnknown_083CC103
_080ACE5C: .4byte gMenuWindow
@@ -3511,7 +3511,7 @@ _080ACF48:
bl sub_80AF138
ldr r0, _080ACF90 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080ACF94 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080ACF94 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r4, _080ACF98 @ =gStringVar4
@@ -3541,7 +3541,7 @@ _080ACF88:
bl _080AD8CA
.align 2, 0
_080ACF90: .4byte gStringVar1
-_080ACF94: .4byte gUnknown_02038570 + 0x2
+_080ACF94: .4byte gContestMons + 0x2
_080ACF98: .4byte gStringVar4
_080ACF9C: .4byte gUnknown_083CBD52
_080ACFA0: .4byte gMenuWindow
@@ -3655,7 +3655,7 @@ _080AD070:
bl sub_80AF138
ldr r0, _080AD0D0 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080AD0D4 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080AD0D4 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r4, _080AD0D8 @ =gStringVar4
@@ -3685,7 +3685,7 @@ _080AD070:
.align 2, 0
_080AD0CC: .4byte 0x02019260
_080AD0D0: .4byte gStringVar1
-_080AD0D4: .4byte gUnknown_02038570 + 0x2
+_080AD0D4: .4byte gContestMons + 0x2
_080AD0D8: .4byte gStringVar4
_080AD0DC: .4byte gUnknown_083CC075
_080AD0E0: .4byte gMenuWindow
@@ -3859,7 +3859,7 @@ _080AD23A:
bl sub_80AF138
ldr r0, _080AD280 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080AD284 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080AD284 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r3, _080AD288 @ =0x02019204
@@ -3887,7 +3887,7 @@ _080AD274: .4byte gUnknown_083CC2D8
_080AD278: .4byte gContestMoves
_080AD27C: .4byte 0x02019260
_080AD280: .4byte gStringVar1
-_080AD284: .4byte gUnknown_02038570 + 0x2
+_080AD284: .4byte gContestMons + 0x2
_080AD288: .4byte 0x02019204
_080AD28C: .4byte gTasks
_080AD290:
@@ -4242,7 +4242,7 @@ _080AD53C:
lsls r1, 20
lsrs r1, 29
lsls r1, 6
- ldr r5, _080AD5B0 @ =gUnknown_02038570 + 0x2
+ ldr r5, _080AD5B0 @ =gContestMons + 0x2
adds r1, r5
bl StringCopy
ldr r0, _080AD5B4 @ =gStringVar1
@@ -4285,7 +4285,7 @@ _080AD53C:
.align 2, 0
_080AD5A8: .4byte gStringVar3
_080AD5AC: .4byte 0x02019328
-_080AD5B0: .4byte gUnknown_02038570 + 0x2
+_080AD5B0: .4byte gContestMons + 0x2
_080AD5B4: .4byte gStringVar1
_080AD5B8: .4byte gStringVar2
_080AD5BC: .4byte gMoveNames
@@ -4365,7 +4365,7 @@ _080AD664:
bl sub_80B09B0
ldr r0, _080AD6B8 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080AD6BC @ =gUnknown_02038570 + 0x2
+ ldr r2, _080AD6BC @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r0, _080AD6C0 @ =gStringVar2
@@ -4399,7 +4399,7 @@ _080AD664:
.align 2, 0
_080AD6B4: .4byte 0x02019260
_080AD6B8: .4byte gStringVar1
-_080AD6BC: .4byte gUnknown_02038570 + 0x2
+_080AD6BC: .4byte gContestMons + 0x2
_080AD6C0: .4byte gStringVar2
_080AD6C4: .4byte gMoveNames
_080AD6C8: .4byte gStringVar4
@@ -4548,7 +4548,7 @@ _080AD7E8:
bl sub_80AF138
ldr r0, _080AD828 @ =gStringVar1
lsls r1, r7, 6
- ldr r2, _080AD82C @ =gUnknown_02038570 + 0x2
+ ldr r2, _080AD82C @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r4, _080AD830 @ =gStringVar4
@@ -4574,7 +4574,7 @@ _080AD7E8:
b _080AD8CA
.align 2, 0
_080AD828: .4byte gStringVar1
-_080AD82C: .4byte gUnknown_02038570 + 0x2
+_080AD82C: .4byte gContestMons + 0x2
_080AD830: .4byte gStringVar4
_080AD834: .4byte gUnknown_083CB00D
_080AD838: .4byte gMenuWindow
@@ -5031,7 +5031,7 @@ sub_80ADB88: @ 80ADB88
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
- ldr r6, _080ADBEC @ =gUnknown_02038695
+ ldr r6, _080ADBEC @ =gContestPlayerMonIndex
ldrb r1, [r6]
lsls r0, r1, 3
subs r0, r1
@@ -5043,7 +5043,7 @@ sub_80ADB88: @ 80ADB88
ldr r0, _080ADBF4 @ =gStringVar1
ldrb r1, [r6]
lsls r1, 6
- ldr r2, _080ADBF8 @ =gUnknown_02038570 + 0x2
+ ldr r2, _080ADBF8 @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r6, _080ADBFC @ =gStringVar4
@@ -5073,10 +5073,10 @@ sub_80ADB88: @ 80ADB88
pop {r0}
bx r0
.align 2, 0
-_080ADBEC: .4byte gUnknown_02038695
+_080ADBEC: .4byte gContestPlayerMonIndex
_080ADBF0: .4byte 0x02019260
_080ADBF4: .4byte gStringVar1
-_080ADBF8: .4byte gUnknown_02038570 + 0x2
+_080ADBF8: .4byte gContestMons + 0x2
_080ADBFC: .4byte gStringVar4
_080ADC00: .4byte gUnknown_083CB2F0
_080ADC04: .4byte gMenuWindow
@@ -5324,7 +5324,7 @@ _080ADDBC:
movs r5, 0
bl sub_80AF668
bl sub_80AF138
- ldr r0, _080ADE34 @ =gUnknown_02038695
+ ldr r0, _080ADE34 @ =gContestPlayerMonIndex
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -5366,7 +5366,7 @@ _080ADE24: .4byte gUnknown_030042A0
_080ADE28: .4byte gUnknown_03004280
_080ADE2C: .4byte 0x02019260
_080ADE30: .4byte gUnknown_02038680
-_080ADE34: .4byte gUnknown_02038695
+_080ADE34: .4byte gContestPlayerMonIndex
_080ADE38: .4byte gUnknown_03005D28
_080ADE3C: .4byte gRngValue
_080ADE40: .4byte gStringVar4
@@ -5648,7 +5648,7 @@ sub_80AE054: @ 80AE054
ands r0, r1
cmp r0, 0
bne _080AE068
- ldr r1, _080AE070 @ =gUnknown_02038695
+ ldr r1, _080AE070 @ =gContestPlayerMonIndex
movs r0, 0x3
strb r0, [r1]
_080AE068:
@@ -5656,13 +5656,13 @@ _080AE068:
bx r0
.align 2, 0
_080AE06C: .4byte gUnknown_0203869A
-_080AE070: .4byte gUnknown_02038695
+_080AE070: .4byte gContestPlayerMonIndex
thumb_func_end sub_80AE054
thumb_func_start sub_80AE074
sub_80AE074: @ 80AE074
push {lr}
- ldr r0, _080AE088 @ =gUnknown_02038695
+ ldr r0, _080AE088 @ =gContestPlayerMonIndex
ldr r1, _080AE08C @ =gUnknown_0203869B
ldrb r0, [r0]
ldrb r1, [r1]
@@ -5671,7 +5671,7 @@ sub_80AE074: @ 80AE074
movs r0, 0
b _080AE092
.align 2, 0
-_080AE088: .4byte gUnknown_02038695
+_080AE088: .4byte gContestPlayerMonIndex
_080AE08C: .4byte gUnknown_0203869B
_080AE090:
movs r0, 0x1
@@ -5708,7 +5708,7 @@ sub_80AE098: @ 80AE098
mov r0, sp
strb r2, [r0, 0x7]
_080AE0CE:
- ldr r5, _080AE0F8 @ =gUnknown_02038695
+ ldr r5, _080AE0F8 @ =gContestPlayerMonIndex
ldrb r0, [r5]
lsls r0, 6
ldr r4, _080AE0FC @ =gUnknown_0203857D
@@ -5727,7 +5727,7 @@ _080AE0CE:
.align 2, 0
_080AE0F0: .4byte gSaveBlock2
_080AE0F4: .4byte gUnknown_0203869A
-_080AE0F8: .4byte gUnknown_02038695
+_080AE0F8: .4byte gContestPlayerMonIndex
_080AE0FC: .4byte gUnknown_0203857D
_080AE100:
ldrb r0, [r5]
@@ -5736,8 +5736,8 @@ _080AE100:
movs r1, 0xD9
_080AE108:
strb r1, [r0, 0x8]
- ldr r5, _080AE17C @ =gUnknown_02038570
- ldr r4, _080AE180 @ =gUnknown_02038695
+ ldr r5, _080AE17C @ =gContestMons
+ ldr r4, _080AE180 @ =gContestPlayerMonIndex
ldrb r0, [r4]
lsls r0, 6
adds r1, r5, 0
@@ -5788,8 +5788,8 @@ _080AE108:
strb r0, [r1, 0xA]
b _080AE19A
.align 2, 0
-_080AE17C: .4byte gUnknown_02038570
-_080AE180: .4byte gUnknown_02038695
+_080AE17C: .4byte gContestMons
+_080AE180: .4byte gContestPlayerMonIndex
_080AE184: .4byte gPlayerParty
_080AE188: .4byte gUnknown_0203869A
_080AE18C:
@@ -5801,10 +5801,10 @@ _080AE18C:
mov r0, sp
strb r2, [r0, 0xA]
_080AE19A:
- ldr r5, _080AE2C4 @ =gUnknown_02038695
+ ldr r5, _080AE2C4 @ =gContestPlayerMonIndex
ldrb r0, [r5]
lsls r0, 6
- ldr r1, _080AE2C8 @ =gUnknown_02038570 + 0x2
+ ldr r1, _080AE2C8 @ =gContestMons + 0x2
mov r8, r1
add r0, r8
mov r1, sp
@@ -5936,8 +5936,8 @@ _080AE19A:
adds r3, 0x14
b _080AE31E
.align 2, 0
-_080AE2C4: .4byte gUnknown_02038695
-_080AE2C8: .4byte gUnknown_02038570 + 0x2
+_080AE2C4: .4byte gContestPlayerMonIndex
+_080AE2C8: .4byte gContestMons + 0x2
_080AE2CC: .4byte gPlayerParty
_080AE2D0:
cmp r2, 0xFF
@@ -6010,8 +6010,8 @@ _080AE342:
ble _080AE34C
movs r7, 0xFF
_080AE34C:
- ldr r2, _080AE390 @ =gUnknown_02038570
- ldr r1, _080AE394 @ =gUnknown_02038695
+ ldr r2, _080AE390 @ =gContestMons
+ ldr r1, _080AE394 @ =gContestPlayerMonIndex
ldrb r0, [r1]
lsls r0, 6
adds r0, r2
@@ -6044,8 +6044,8 @@ _080AE34C:
pop {r0}
bx r0
.align 2, 0
-_080AE390: .4byte gUnknown_02038570
-_080AE394: .4byte gUnknown_02038695
+_080AE390: .4byte gContestMons
+_080AE394: .4byte gContestPlayerMonIndex
thumb_func_end sub_80AE098
thumb_func_start sub_80AE398
@@ -6125,7 +6125,7 @@ _080AE412:
bl __modsi3
lsls r0, 16
lsrs r0, 16
- ldr r1, _080AE474 @ =gUnknown_02038570
+ ldr r1, _080AE474 @ =gContestMons
lsls r2, r5, 6
adds r2, r1
mov r1, sp
@@ -6164,7 +6164,7 @@ _080AE454:
bx r0
.align 2, 0
_080AE470: .4byte gUnknown_083C9408
-_080AE474: .4byte gUnknown_02038570
+_080AE474: .4byte gContestMons
_080AE478: .4byte gUnknown_02038694
thumb_func_end sub_80AE398
@@ -6499,7 +6499,7 @@ sub_80AE6E4: @ 80AE6E4
strb r0, [r3, 0x2]
adds r3, 0x3
lsls r1, r4, 6
- ldr r0, _080AE760 @ =gUnknown_02038570 + 0x2
+ ldr r0, _080AE760 @ =gContestMons + 0x2
adds r1, r0
adds r0, r3, 0
bl sub_80AE598
@@ -6541,7 +6541,7 @@ sub_80AE6E4: @ 80AE6E4
bx r0
.align 2, 0
_080AE75C: .4byte gUnknown_020238CC
-_080AE760: .4byte gUnknown_02038570 + 0x2
+_080AE760: .4byte gContestMons + 0x2
_080AE764: .4byte gUnknown_03004210
_080AE768: .4byte gUnknown_02038696
_080AE76C: .4byte gUnknown_083CA308
@@ -6571,7 +6571,7 @@ _080AE78C:
.4byte _080AE7E0
.4byte _080AE7FC
_080AE7A0:
- ldr r0, _080AE7B4 @ =gUnknown_02038570
+ ldr r0, _080AE7B4 @ =gContestMons
lsls r2, 6
adds r1, r2, r0
adds r3, r1, 0
@@ -6582,9 +6582,9 @@ _080AE7A0:
adds r1, 0x27
b _080AE80E
.align 2, 0
-_080AE7B4: .4byte gUnknown_02038570
+_080AE7B4: .4byte gContestMons
_080AE7B8:
- ldr r0, _080AE7CC @ =gUnknown_02038570
+ ldr r0, _080AE7CC @ =gContestMons
lsls r2, 6
adds r1, r2, r0
adds r3, r1, 0
@@ -6595,18 +6595,18 @@ _080AE7B8:
adds r1, 0x28
b _080AE80E
.align 2, 0
-_080AE7CC: .4byte gUnknown_02038570
+_080AE7CC: .4byte gContestMons
_080AE7D0:
- ldr r1, _080AE7DC @ =gUnknown_02038570
+ ldr r1, _080AE7DC @ =gContestMons
lsls r2, 6
adds r3, r2, r1
adds r0, r3, 0
adds r0, 0x28
b _080AE7EA
.align 2, 0
-_080AE7DC: .4byte gUnknown_02038570
+_080AE7DC: .4byte gContestMons
_080AE7E0:
- ldr r1, _080AE7F8 @ =gUnknown_02038570
+ ldr r1, _080AE7F8 @ =gContestMons
lsls r2, 6
adds r3, r2, r1
adds r0, r3, 0
@@ -6620,9 +6620,9 @@ _080AE7EA:
adds r0, r1, 0
b _080AE810
.align 2, 0
-_080AE7F8: .4byte gUnknown_02038570
+_080AE7F8: .4byte gContestMons
_080AE7FC:
- ldr r0, _080AE828 @ =gUnknown_02038570
+ ldr r0, _080AE828 @ =gContestMons
lsls r2, 6
adds r1, r2, r0
adds r3, r1, 0
@@ -6647,7 +6647,7 @@ _080AE810:
pop {r1}
bx r1
.align 2, 0
-_080AE828: .4byte gUnknown_02038570
+_080AE828: .4byte gContestMons
thumb_func_end sub_80AE770
thumb_func_start sub_80AE82C
@@ -6767,9 +6767,9 @@ unref_sub_80AE908: @ 80AE908
mov r4, r8
push {r4-r6}
sub sp, 0x8
- ldr r0, _080AE9D4 @ =gUnknown_02038570
+ ldr r0, _080AE9D4 @ =gContestMons
mov r9, r0
- ldr r1, _080AE9D8 @ =gUnknown_02038695
+ ldr r1, _080AE9D8 @ =gContestPlayerMonIndex
mov r8, r1
ldrb r0, [r1]
lsls r0, 6
@@ -6859,8 +6859,8 @@ unref_sub_80AE908: @ 80AE908
pop {r1}
bx r1
.align 2, 0
-_080AE9D4: .4byte gUnknown_02038570
-_080AE9D8: .4byte gUnknown_02038695
+_080AE9D4: .4byte gContestMons
+_080AE9D8: .4byte gContestPlayerMonIndex
_080AE9DC: .4byte gMonFrontPicTable
_080AE9E0: .4byte gMonFrontPicCoords
_080AE9E4: .4byte gUnknown_081FAF4C
@@ -7856,7 +7856,7 @@ sub_80AF15C: @ 80AF15C
movs r0, 0
b _080AF1AA
_080AF174:
- ldr r0, _080AF190 @ =gUnknown_02038695
+ ldr r0, _080AF190 @ =gContestPlayerMonIndex
ldrb r0, [r0]
cmp r4, r0
beq _080AF198
@@ -7864,15 +7864,15 @@ _080AF174:
bl sub_81288F4
bl sub_8128944
lsls r0, 24
- ldr r2, _080AF194 @ =gUnknown_02038570
+ ldr r2, _080AF194 @ =gContestMons
lsrs r0, 23
lsls r1, r4, 6
b _080AF1A2
.align 2, 0
-_080AF190: .4byte gUnknown_02038695
-_080AF194: .4byte gUnknown_02038570
+_080AF190: .4byte gContestPlayerMonIndex
+_080AF194: .4byte gContestMons
_080AF198:
- ldr r2, _080AF1B0 @ =gUnknown_02038570
+ ldr r2, _080AF1B0 @ =gContestMons
ldr r0, _080AF1B4 @ =0x02019204
ldrb r0, [r0]
lsls r0, 1
@@ -7887,7 +7887,7 @@ _080AF1AA:
pop {r1}
bx r1
.align 2, 0
-_080AF1B0: .4byte gUnknown_02038570
+_080AF1B0: .4byte gContestMons
_080AF1B4: .4byte 0x02019204
thumb_func_end sub_80AF15C
@@ -8464,7 +8464,7 @@ unref_sub_80AF5D0: @ 80AF5D0
lsrs r0, 24
lsls r1, 24
lsrs r3, r1, 24
- ldr r1, _080AF5E8 @ =gUnknown_02038695
+ ldr r1, _080AF5E8 @ =gContestPlayerMonIndex
ldrb r1, [r1]
cmp r0, r1
beq _080AF600
@@ -8472,7 +8472,7 @@ _080AF5E2:
movs r0, 0x1
b _080AF626
.align 2, 0
-_080AF5E8: .4byte gUnknown_02038695
+_080AF5E8: .4byte gContestPlayerMonIndex
_080AF5EC:
ldrb r0, [r4, 0x6]
movs r1, 0x1
@@ -12550,7 +12550,7 @@ sub_80B146C: @ 80B146C
lsrs r5, r1, 24
ldr r0, _080B14C8 @ =gStringVar1
lsls r1, r4, 6
- ldr r2, _080B14CC @ =gUnknown_02038570 + 0x2
+ ldr r2, _080B14CC @ =gContestMons + 0x2
adds r1, r2
bl StringCopy
ldr r0, _080B14D0 @ =gStringVar2
@@ -12586,7 +12586,7 @@ sub_80B146C: @ 80B146C
b _080B1538
.align 2, 0
_080B14C8: .4byte gStringVar1
-_080B14CC: .4byte gUnknown_02038570 + 0x2
+_080B14CC: .4byte gContestMons + 0x2
_080B14D0: .4byte gStringVar2
_080B14D4: .4byte 0x02019260
_080B14D8: .4byte gMoveNames
@@ -15022,7 +15022,7 @@ sub_80B2790: @ 80B2790
bl sub_80B2760
lsls r0, 16
lsrs r5, r0, 16
- ldr r1, _080B27F4 @ =gUnknown_02038570
+ ldr r1, _080B27F4 @ =gContestMons
lsls r0, r6, 6
adds r0, r1
ldrh r0, [r0]
@@ -15056,7 +15056,7 @@ _080B27D0:
b _080B28BE
.align 2, 0
_080B27F0: .4byte 0x02019260
-_080B27F4: .4byte gUnknown_02038570
+_080B27F4: .4byte gContestMons
_080B27F8: .4byte gUnknown_02024E84
_080B27FC:
cmp r5, 0x82
@@ -15106,7 +15106,7 @@ _080B2848:
ldr r4, _080B2878 @ =0x02019260
adds r0, r4
ldrb r5, [r0, 0x1B]
- ldr r6, _080B287C @ =gUnknown_02038570
+ ldr r6, _080B287C @ =gContestMons
lsls r5, 6
adds r0, r5, r6
ldrh r0, [r0]
@@ -15124,7 +15124,7 @@ _080B2848:
b _080B28BE
.align 2, 0
_080B2878: .4byte 0x02019260
-_080B287C: .4byte gUnknown_02038570
+_080B287C: .4byte gContestMons
_080B2880:
ldr r1, _080B2888 @ =gUnknown_0202F7BE
movs r0, 0xFF
@@ -15196,7 +15196,7 @@ sub_80B28F0: @ 80B28F0
lsrs r4, 24
ldr r6, _080B2924 @ =0x02019348
strb r4, [r6, 0x5]
- ldr r5, _080B2928 @ =gUnknown_02038570
+ ldr r5, _080B2928 @ =gContestMons
lsls r4, 6
adds r0, r4, r5
ldrh r0, [r0]
@@ -15216,7 +15216,7 @@ sub_80B28F0: @ 80B28F0
bx r0
.align 2, 0
_080B2924: .4byte 0x02019348
-_080B2928: .4byte gUnknown_02038570
+_080B2928: .4byte gContestMons
thumb_func_end sub_80B28F0
thumb_func_start sub_80B292C
@@ -15391,7 +15391,7 @@ _080B2AB6:
mov r0, r9
cmp r0, 0xFF
bne _080B2AD0
- ldr r0, _080B2ACC @ =gUnknown_02038695
+ ldr r0, _080B2ACC @ =gContestPlayerMonIndex
ldrb r0, [r0]
cmp r6, r0
beq _080B2AD0
@@ -15399,7 +15399,7 @@ _080B2AB6:
b _080B2C38
.align 2, 0
_080B2AC8: .4byte gUnknown_02038690
-_080B2ACC: .4byte gUnknown_02038695
+_080B2ACC: .4byte gContestPlayerMonIndex
_080B2AD0:
ldr r0, _080B2AE4 @ =gScriptContestCategory
ldrh r0, [r0]
@@ -15450,7 +15450,7 @@ _080B2B16:
ldr r0, _080B2B9C @ =0x00002dfc
adds r1, r2, r0
adds r1, r4, r1
- ldr r5, _080B2BA0 @ =gUnknown_02038570
+ ldr r5, _080B2BA0 @ =gContestMons
lsls r6, 6
adds r0, r5, 0
adds r0, 0x38
@@ -15501,7 +15501,7 @@ _080B2B16:
.align 2, 0
_080B2B98: .4byte gSaveBlock1
_080B2B9C: .4byte 0x00002dfc
-_080B2BA0: .4byte gUnknown_02038570
+_080B2BA0: .4byte gContestMons
_080B2BA4: .4byte 0x00002e04
_080B2BA8: .4byte 0x00002e07
_080B2BAC: .4byte 0x00002e12
@@ -15516,7 +15516,7 @@ _080B2BB8:
_080B2BC0: .4byte 0x00002e06
_080B2BC4:
ldr r5, _080B2C14 @ =0x02015de0
- ldr r2, _080B2C18 @ =gUnknown_02038570
+ ldr r2, _080B2C18 @ =gContestMons
lsls r4, r6, 6
adds r0, r2, 0
adds r0, 0x38
@@ -15555,7 +15555,7 @@ _080B2BC4:
b _080B2C32
.align 2, 0
_080B2C14: .4byte 0x02015de0
-_080B2C18: .4byte gUnknown_02038570
+_080B2C18: .4byte gContestMons
_080B2C1C: .4byte gUnknown_0203869A
_080B2C20: .4byte gLinkPlayers + 0x8
_080B2C24:
diff --git a/asm/contest_ai.s b/asm/contest_ai.s
index 1e5497570..a947110ec 100644
--- a/asm/contest_ai.s
+++ b/asm/contest_ai.s
@@ -34,7 +34,7 @@ _08128910:
adds r0, r2, 0
adds r0, 0x40
strb r1, [r0]
- ldr r1, _08128940 @ =gUnknown_02038570
+ ldr r1, _08128940 @ =gContestMons
ldrb r0, [r3]
lsls r0, 6
adds r1, 0x18
@@ -46,7 +46,7 @@ _08128910:
bx r0
.align 2, 0
_0812893C: .4byte 0x020192e4
-_08128940: .4byte gUnknown_02038570
+_08128940: .4byte gContestMons
thumb_func_end sub_81288F4
thumb_func_start sub_8128944
@@ -1403,7 +1403,7 @@ _081292E0:
thumb_func_start contest_ai_get_move_excitement
contest_ai_get_move_excitement: @ 81292E4
push {r4,lr}
- ldr r2, _08129318 @ =gUnknown_02038570
+ ldr r2, _08129318 @ =gContestMons
ldr r4, _0812931C @ =0x020192e4
ldrb r1, [r4, 0x4]
lsls r1, 1
@@ -1427,7 +1427,7 @@ contest_ai_get_move_excitement: @ 81292E4
pop {r0}
bx r0
.align 2, 0
-_08129318: .4byte gUnknown_02038570
+_08129318: .4byte gContestMons
_0812931C: .4byte 0x020192e4
_08129320: .4byte gAIScriptPtr
thumb_func_end contest_ai_get_move_excitement
@@ -1582,7 +1582,7 @@ _0812942C:
thumb_func_start contest_ai_get_move_effect
contest_ai_get_move_effect: @ 8129434
- ldr r2, _08129460 @ =gUnknown_02038570
+ ldr r2, _08129460 @ =gContestMons
ldr r3, _08129464 @ =0x020192e4
ldrb r1, [r3, 0x4]
lsls r1, 1
@@ -1605,7 +1605,7 @@ contest_ai_get_move_effect: @ 8129434
str r0, [r1]
bx lr
.align 2, 0
-_08129460: .4byte gUnknown_02038570
+_08129460: .4byte gContestMons
_08129464: .4byte 0x020192e4
_08129468: .4byte gContestMoves
_0812946C: .4byte gAIScriptPtr
@@ -1683,7 +1683,7 @@ _081294EC:
thumb_func_start contest_ai_get_move_effect_type
contest_ai_get_move_effect_type: @ 81294F0
- ldr r2, _08129524 @ =gUnknown_02038570
+ ldr r2, _08129524 @ =gContestMons
ldr r3, _08129528 @ =0x020192e4
ldrb r1, [r3, 0x4]
lsls r1, 1
@@ -1710,7 +1710,7 @@ contest_ai_get_move_effect_type: @ 81294F0
str r0, [r1]
bx lr
.align 2, 0
-_08129524: .4byte gUnknown_02038570
+_08129524: .4byte gContestMons
_08129528: .4byte 0x020192e4
_0812952C: .4byte gContestEffects
_08129530: .4byte gContestMoves
@@ -1790,7 +1790,7 @@ _081295B4:
thumb_func_start contest_ai_check_move_has_highest_appeal
contest_ai_check_move_has_highest_appeal: @ 81295B8
push {r4-r7,lr}
- ldr r2, _08129610 @ =gUnknown_02038570
+ ldr r2, _08129610 @ =gContestMons
ldr r3, _08129614 @ =0x020192e4
ldrb r0, [r3, 0x4]
lsls r0, 1
@@ -1837,7 +1837,7 @@ _08129608:
movs r0, 0x1
b _08129626
.align 2, 0
-_08129610: .4byte gUnknown_02038570
+_08129610: .4byte gContestMons
_08129614: .4byte 0x020192e4
_08129618: .4byte gContestEffects
_0812961C: .4byte gContestMoves
@@ -1896,7 +1896,7 @@ _08129678: .4byte gAIScriptPtr
thumb_func_start sub_812967C
sub_812967C: @ 812967C
push {r4-r7,lr}
- ldr r2, _081296D4 @ =gUnknown_02038570
+ ldr r2, _081296D4 @ =gContestMons
ldr r3, _081296D8 @ =0x020192e4
ldrb r0, [r3, 0x4]
lsls r0, 1
@@ -1943,7 +1943,7 @@ _081296CC:
movs r0, 0x1
b _081296EA
.align 2, 0
-_081296D4: .4byte gUnknown_02038570
+_081296D4: .4byte gContestMons
_081296D8: .4byte 0x020192e4
_081296DC: .4byte gContestEffects
_081296E0: .4byte gContestMoves
@@ -2002,7 +2002,7 @@ _0812973C: .4byte gAIScriptPtr
thumb_func_start sub_8129740
sub_8129740: @ 8129740
push {r4,lr}
- ldr r2, _08129784 @ =gUnknown_02038570
+ ldr r2, _08129784 @ =gContestMons
ldr r4, _08129788 @ =0x020192e4
ldrb r1, [r4, 0x4]
lsls r1, 1
@@ -2035,7 +2035,7 @@ sub_8129740: @ 8129740
pop {r0}
bx r0
.align 2, 0
-_08129784: .4byte gUnknown_02038570
+_08129784: .4byte gContestMons
_08129788: .4byte 0x020192e4
_0812978C: .4byte gContestEffects
_08129790: .4byte gContestMoves
@@ -2185,7 +2185,7 @@ _08129894:
thumb_func_start sub_8129898
sub_8129898: @ 8129898
push {r4,lr}
- ldr r2, _081298DC @ =gUnknown_02038570
+ ldr r2, _081298DC @ =gContestMons
ldr r4, _081298E0 @ =0x020192e4
ldrb r1, [r4, 0x4]
lsls r1, 1
@@ -2218,7 +2218,7 @@ sub_8129898: @ 8129898
pop {r0}
bx r0
.align 2, 0
-_081298DC: .4byte gUnknown_02038570
+_081298DC: .4byte gContestMons
_081298E0: .4byte 0x020192e4
_081298E4: .4byte gContestEffects
_081298E8: .4byte gContestMoves
@@ -2368,7 +2368,7 @@ _081299EC:
thumb_func_start contest_ai_get_move_used_count
contest_ai_get_move_used_count: @ 81299F0
push {r4,lr}
- ldr r3, _08129A20 @ =gUnknown_02038570
+ ldr r3, _08129A20 @ =gContestMons
ldr r4, _08129A24 @ =0x020192e4
ldrb r0, [r4, 0x4]
lsls r0, 1
@@ -2392,7 +2392,7 @@ contest_ai_get_move_used_count: @ 81299F0
movs r0, 0
b _08129A30
.align 2, 0
-_08129A20: .4byte gUnknown_02038570
+_08129A20: .4byte gContestMons
_08129A24: .4byte 0x020192e4
_08129A28:
ldrb r0, [r0, 0xB]
@@ -2558,7 +2558,7 @@ contest_ai_check_combo_starter: @ 8129B44
mov r7, r8
push {r7}
movs r5, 0
- ldr r3, _08129BAC @ =gUnknown_02038570
+ ldr r3, _08129BAC @ =gContestMons
ldr r2, _08129BB0 @ =0x020192e4
ldrb r1, [r2, 0x4]
lsls r1, 1
@@ -2610,7 +2610,7 @@ _08129B96:
pop {r0}
bx r0
.align 2, 0
-_08129BAC: .4byte gUnknown_02038570
+_08129BAC: .4byte gContestMons
_08129BB0: .4byte 0x020192e4
_08129BB4: .4byte gAIScriptPtr
thumb_func_end contest_ai_check_combo_starter
@@ -2697,7 +2697,7 @@ contest_ai_check_combo_finisher: @ 8129C40
mov r7, r8
push {r7}
movs r5, 0
- ldr r3, _08129CA8 @ =gUnknown_02038570
+ ldr r3, _08129CA8 @ =gContestMons
ldr r2, _08129CAC @ =0x020192e4
ldrb r1, [r2, 0x4]
lsls r1, 1
@@ -2748,7 +2748,7 @@ _08129C90:
pop {r0}
bx r0
.align 2, 0
-_08129CA8: .4byte gUnknown_02038570
+_08129CA8: .4byte gContestMons
_08129CAC: .4byte 0x020192e4
_08129CB0: .4byte gAIScriptPtr
thumb_func_end contest_ai_check_combo_finisher
@@ -2833,7 +2833,7 @@ _08129D38: .4byte gAIScriptPtr
contest_ai_check_would_finish_combo: @ 8129D3C
push {r4,r5,lr}
movs r5, 0
- ldr r3, _08129D8C @ =gUnknown_02038570
+ ldr r3, _08129D8C @ =gContestMons
ldr r4, _08129D90 @ =0x020192e4
ldrb r0, [r4, 0x4]
lsls r0, 1
@@ -2872,7 +2872,7 @@ _08129D7A:
pop {r0}
bx r0
.align 2, 0
-_08129D8C: .4byte gUnknown_02038570
+_08129D8C: .4byte gContestMons
_08129D90: .4byte 0x020192e4
_08129D94: .4byte gAIScriptPtr
thumb_func_end contest_ai_check_would_finish_combo
@@ -5166,7 +5166,7 @@ sub_812ADD8: @ 812ADD8
lsls r0, 8
orrs r4, r0
movs r3, 0
- ldr r0, _0812AE0C @ =gUnknown_02038570
+ ldr r0, _0812AE0C @ =gContestMons
mov r12, r0
ldr r5, _0812AE10 @ =0x020192e4
adds r0, r5, 0
@@ -5183,7 +5183,7 @@ sub_812ADD8: @ 812ADD8
b _0812AE2E
.align 2, 0
_0812AE08: .4byte gAIScriptPtr
-_0812AE0C: .4byte gUnknown_02038570
+_0812AE0C: .4byte gContestMons
_0812AE10: .4byte 0x020192e4
_0812AE14:
adds r3, 0x1
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 4149db9dc..af8d1742e 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -277,7 +277,7 @@ sub_80C226C: @ 80C226C
sub sp, 0x4
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080C2288 @ =gUnknown_02038695
+ ldr r0, _080C2288 @ =gContestPlayerMonIndex
ldrb r0, [r0]
cmp r5, r0
bne _080C2294
@@ -287,7 +287,7 @@ sub_80C226C: @ 80C226C
adds r2, r0, 0
b _080C2296
.align 2, 0
-_080C2288: .4byte gUnknown_02038695
+_080C2288: .4byte gContestPlayerMonIndex
_080C228C: .4byte gUnknown_020238CC
_080C2290: .4byte gUnknown_083D17DC
_080C2294:
@@ -301,7 +301,7 @@ _080C2296:
strb r0, [r2, 0x2]
adds r2, 0x3
lsls r6, r5, 6
- ldr r7, _080C22EC @ =gUnknown_02038570 + 0x2
+ ldr r7, _080C22EC @ =gContestMons + 0x2
adds r1, r6, r7
adds r0, r2, 0
bl StringCopy
@@ -332,7 +332,7 @@ _080C2296:
b _080C230A
.align 2, 0
_080C22E8: .4byte gUnknown_020238CC
-_080C22EC: .4byte gUnknown_02038570 + 0x2
+_080C22EC: .4byte gContestMons + 0x2
_080C22F0: .4byte gUnknown_083D17E0
_080C22F4: .4byte gUnknown_0203869A
_080C22F8: .4byte gLinkPlayers + 0x8
@@ -1209,7 +1209,7 @@ _080C2A04:
bl StringCopy
_080C2A10:
ldr r0, _080C2A58 @ =gStringVar2
- ldr r1, _080C2A5C @ =gUnknown_02038570 + 0x2
+ ldr r1, _080C2A5C @ =gContestMons + 0x2
adds r1, r4, r1
bl StringCopy
ldr r1, _080C2A60 @ =gContestText_PokeWon
@@ -1241,7 +1241,7 @@ _080C2A4A:
.align 2, 0
_080C2A54: .4byte gUnknown_0203857D
_080C2A58: .4byte gStringVar2
-_080C2A5C: .4byte gUnknown_02038570 + 0x2
+_080C2A5C: .4byte gContestMons + 0x2
_080C2A60: .4byte gContestText_PokeWon
_080C2A64: .4byte 0x02018000
_080C2A68: .4byte 0x0000ffff
@@ -1315,7 +1315,7 @@ _080C2ADC:
ldrb r0, [r3]
lsls r4, r7, 2
mov r10, r4
- ldr r2, _080C2BD4 @ =gUnknown_02038570
+ ldr r2, _080C2BD4 @ =gContestMons
ldr r5, _080C2BD8 @ =gMonFrontPicTable
mov r12, r5
ldr r4, _080C2BDC @ =gMonFrontPicCoords
@@ -1418,7 +1418,7 @@ _080C2BC4: .4byte gUnknown_030042C4
_080C2BC8: .4byte gUnknown_03004240
_080C2BCC: .4byte 0x00005050
_080C2BD0: .4byte gUnknown_02038690
-_080C2BD4: .4byte gUnknown_02038570
+_080C2BD4: .4byte gContestMons
_080C2BD8: .4byte gMonFrontPicTable
_080C2BDC: .4byte gMonFrontPicCoords
_080C2BE0: .4byte gUnknown_081FAF4C
@@ -1593,7 +1593,7 @@ sub_80C2D1C: @ 80C2D1C
lsls r6, r7, 2
cmp r0, 0
bne _080C2D5A
- ldr r5, _080C2D74 @ =gUnknown_02038570
+ ldr r5, _080C2D74 @ =gContestMons
movs r4, 0x3
_080C2D42:
ldrh r0, [r5]
@@ -1620,7 +1620,7 @@ _080C2D66:
.align 2, 0
_080C2D6C: .4byte gMain
_080C2D70: .4byte gUnknown_0203869A
-_080C2D74: .4byte gUnknown_02038570
+_080C2D74: .4byte gContestMons
_080C2D78: .4byte gTasks
_080C2D7C: .4byte sub_80C2D80
thumb_func_end sub_80C2D1C
@@ -1707,7 +1707,7 @@ sub_80C2E14: @ 80C2E14
lsls r5, 24
lsrs r5, 24
ldr r1, _080C2E80 @ =gUnknown_02038690
- ldr r0, _080C2E84 @ =gUnknown_02038695
+ ldr r0, _080C2E84 @ =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -1750,7 +1750,7 @@ sub_80C2E14: @ 80C2E14
bx r0
.align 2, 0
_080C2E80: .4byte gUnknown_02038690
-_080C2E84: .4byte gUnknown_02038695
+_080C2E84: .4byte gContestPlayerMonIndex
_080C2E88: .4byte gScriptContestRank
_080C2E8C: .4byte 0x02000000
_080C2E90: .4byte 0x00015ddf
@@ -2058,7 +2058,7 @@ sub_80C30D4: @ 80C30D4
lsls r1, 24
lsrs r6, r1, 24
movs r5, 0
- ldr r4, _080C3108 @ =gUnknown_02038570
+ ldr r4, _080C3108 @ =gContestMons
_080C30E4:
ldrh r0, [r4]
lsls r1, r5, 24
@@ -2077,7 +2077,7 @@ _080C30E4:
pop {r0}
bx r0
.align 2, 0
-_080C3108: .4byte gUnknown_02038570
+_080C3108: .4byte gContestMons
thumb_func_end sub_80C30D4
thumb_func_start sub_80C310C
@@ -2088,7 +2088,7 @@ sub_80C310C: @ 80C310C
movs r5, 0xA0
lsls r5, 16
_080C3116:
- ldr r1, _080C3150 @ =gUnknown_02038570
+ ldr r1, _080C3150 @ =gContestMons
lsls r0, r4, 6
adds r0, r1
ldrh r0, [r0]
@@ -2115,7 +2115,7 @@ _080C3116:
bx r0
.align 2, 0
_080C314C: .4byte gMonIconPaletteIndices
-_080C3150: .4byte gUnknown_02038570
+_080C3150: .4byte gContestMons
_080C3154: .4byte gMonIconPalettes
thumb_func_end sub_80C310C
@@ -3813,7 +3813,7 @@ sub_80C3E60: @ 80C3E60
adds r1, r2
strh r4, [r1, 0x8]
strh r5, [r1, 0xA]
- ldr r0, _080C3EA0 @ =gUnknown_02038570
+ ldr r0, _080C3EA0 @ =gContestMons
lsls r4, 6
adds r4, r0
ldrh r0, [r4]
@@ -3824,7 +3824,7 @@ sub_80C3E60: @ 80C3E60
.align 2, 0
_080C3E98: .4byte sub_80C3EA4
_080C3E9C: .4byte gTasks
-_080C3EA0: .4byte gUnknown_02038570
+_080C3EA0: .4byte gContestMons
thumb_func_end sub_80C3E60
thumb_func_start sub_80C3EA4
@@ -3852,7 +3852,7 @@ sub_80C3EA4: @ 80C3EA4
strh r0, [r4, 0x1C]
ldrh r0, [r4, 0xC]
ldrb r2, [r4, 0x1E]
- ldr r1, _080C3EFC @ =gUnknown_02038570
+ ldr r1, _080C3EFC @ =gContestMons
lsls r3, r5, 6
adds r1, 0x38
adds r3, r1
@@ -3872,7 +3872,7 @@ _080C3EEE:
bx r0
.align 2, 0
_080C3EF8: .4byte gTasks
-_080C3EFC: .4byte gUnknown_02038570
+_080C3EFC: .4byte gContestMons
thumb_func_end sub_80C3EA4
thumb_func_start sub_80C3F00
@@ -4638,7 +4638,7 @@ sub_80C44C0: @ 80C44C0
push {r4-r7,lr}
sub sp, 0x4
ldr r1, _080C44E8 @ =gUnknown_02038690
- ldr r0, _080C44EC @ =gUnknown_02038695
+ ldr r0, _080C44EC @ =gContestPlayerMonIndex
ldrb r0, [r0]
adds r0, r1
ldrb r0, [r0]
@@ -4659,7 +4659,7 @@ _080C44DE:
mov pc, r0
.align 2, 0
_080C44E8: .4byte gUnknown_02038690
-_080C44EC: .4byte gUnknown_02038695
+_080C44EC: .4byte gContestPlayerMonIndex
_080C44F0: .4byte gScriptContestCategory
_080C44F4: .4byte _080C44F8
.align 2, 0
@@ -4867,7 +4867,7 @@ sub_80C4698: @ 80C4698
lsls r1, 24
lsrs r4, r1, 24
lsls r1, r4, 6
- ldr r0, _080C46E0 @ =gUnknown_02038570 + 0x2
+ ldr r0, _080C46E0 @ =gContestMons + 0x2
adds r1, r0
adds r0, r5, 0
bl StringCopy
@@ -4897,7 +4897,7 @@ _080C46DA:
pop {r0}
bx r0
.align 2, 0
-_080C46E0: .4byte gUnknown_02038570 + 0x2
+_080C46E0: .4byte gContestMons + 0x2
_080C46E4: .4byte gUnknown_0203869A
_080C46E8: .4byte gLinkPlayers
thumb_func_end sub_80C4698
@@ -5182,7 +5182,7 @@ _080C48F0: .4byte sub_80C489C
thumb_func_start sub_80C48F4
sub_80C48F4: @ 80C48F4
ldr r2, _080C4908 @ =gSpecialVar_0x8004
- ldr r1, _080C490C @ =gUnknown_02038570
+ ldr r1, _080C490C @ =gContestMons
ldr r0, _080C4910 @ =gSpecialVar_0x8006
ldrh r0, [r0]
lsls r0, 6
@@ -5192,7 +5192,7 @@ sub_80C48F4: @ 80C48F4
bx lr
.align 2, 0
_080C4908: .4byte gSpecialVar_0x8004
-_080C490C: .4byte gUnknown_02038570
+_080C490C: .4byte gContestMons
_080C4910: .4byte gSpecialVar_0x8006
thumb_func_end sub_80C48F4
@@ -5244,13 +5244,13 @@ _080C4968: .4byte sub_80C4914
thumb_func_start sub_80C496C
sub_80C496C: @ 80C496C
ldr r0, _080C4978 @ =gSpecialVar_0x8004
- ldr r1, _080C497C @ =gUnknown_02038695
+ ldr r1, _080C497C @ =gContestPlayerMonIndex
ldrb r1, [r1]
strh r1, [r0]
bx lr
.align 2, 0
_080C4978: .4byte gSpecialVar_0x8004
-_080C497C: .4byte gUnknown_02038695
+_080C497C: .4byte gContestPlayerMonIndex
thumb_func_end sub_80C496C
thumb_func_start sub_80C4980
diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s
index b06a88faf..bef1d4402 100644
--- a/asm/contest_link_80C857C.s
+++ b/asm/contest_link_80C857C.s
@@ -145,7 +145,7 @@ sub_80C8660: @ 80C8660
cmp r0, 0
beq _080C868E
bl GetMultiplayerId
- ldr r1, _080C8698 @ =gUnknown_02038695
+ ldr r1, _080C8698 @ =gContestPlayerMonIndex
strb r0, [r1]
bl GetLinkPlayerCount
lsls r0, 24
@@ -163,7 +163,7 @@ _080C868E:
bx r0
.align 2, 0
_080C8694: .4byte gReceivedRemoteLinkPlayers
-_080C8698: .4byte gUnknown_02038695
+_080C8698: .4byte gContestPlayerMonIndex
_080C869C: .4byte gUnknown_0203869A
thumb_func_end sub_80C8660
@@ -290,10 +290,10 @@ _080C876C:
b _080C8896
_080C8782:
ldr r0, _080C879C @ =gBlockSendBuffer
- ldr r1, _080C87A0 @ =gUnknown_02038695
+ ldr r1, _080C87A0 @ =gContestPlayerMonIndex
ldrb r1, [r1]
lsls r1, 6
- ldr r2, _080C87A4 @ =gUnknown_02038570
+ ldr r2, _080C87A4 @ =gContestMons
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -302,14 +302,14 @@ _080C8782:
b _080C87BA
.align 2, 0
_080C879C: .4byte gBlockSendBuffer
-_080C87A0: .4byte gUnknown_02038695
-_080C87A4: .4byte gUnknown_02038570
+_080C87A0: .4byte gContestPlayerMonIndex
+_080C87A4: .4byte gContestMons
_080C87A8:
ldr r0, _080C87C4 @ =gBlockSendBuffer
- ldr r1, _080C87C8 @ =gUnknown_02038695
+ ldr r1, _080C87C8 @ =gContestPlayerMonIndex
ldrb r1, [r1]
lsls r1, 6
- ldr r2, _080C87CC @ =gUnknown_02038570
+ ldr r2, _080C87CC @ =gContestMons
adds r1, r2
movs r2, 0x40
bl memcpy
@@ -320,8 +320,8 @@ _080C87BA:
b _080C8896
.align 2, 0
_080C87C4: .4byte gBlockSendBuffer
-_080C87C8: .4byte gUnknown_02038695
-_080C87CC: .4byte gUnknown_02038570
+_080C87C8: .4byte gContestPlayerMonIndex
+_080C87CC: .4byte gContestMons
_080C87D0:
bl sub_80C85D8
lsls r0, 24
@@ -329,7 +329,7 @@ _080C87D0:
beq _080C8896
movs r7, 0
str r5, [sp]
- ldr r0, _080C8818 @ =gUnknown_02038570
+ ldr r0, _080C8818 @ =gContestMons
ldr r6, _080C881C @ =gLinkPlayers
movs r5, 0
mov r10, r0
@@ -342,7 +342,7 @@ _080C87EA:
mov r0, r10
movs r2, 0x40
bl memcpy
- ldr r0, _080C8824 @ =gUnknown_02038570 + 0x2
+ ldr r0, _080C8824 @ =gContestMons + 0x2
adds r4, r5, r0
ldrh r0, [r6, 0x1A]
cmp r0, 0x1
@@ -356,10 +356,10 @@ _080C87EA:
bl ConvertInternationalString
b _080C883E
.align 2, 0
-_080C8818: .4byte gUnknown_02038570
+_080C8818: .4byte gContestMons
_080C881C: .4byte gLinkPlayers
_080C8820: .4byte gBlockRecvBuffer
-_080C8824: .4byte gUnknown_02038570 + 0x2
+_080C8824: .4byte gContestMons + 0x2
_080C8828:
ldrb r0, [r4, 0xA]
cmp r0, 0xFC
@@ -612,12 +612,12 @@ _080C8A08:
lsls r0, 24
cmp r0, 0
beq _080C8A30
- ldr r0, _080C8A1C @ =gUnknown_02038695
+ ldr r0, _080C8A1C @ =gContestPlayerMonIndex
movs r1, 0x1
bl sub_80C857C
b _080C8A2A
.align 2, 0
-_080C8A1C: .4byte gUnknown_02038695
+_080C8A1C: .4byte gContestPlayerMonIndex
_080C8A20:
bl sub_80C85D8
lsls r0, 24
@@ -661,7 +661,7 @@ _080C8A64:
lsls r0, 24
cmp r0, 0
beq _080C8AC2
- ldr r0, _080C8A8C @ =gUnknown_02038695
+ ldr r0, _080C8A8C @ =gContestPlayerMonIndex
ldrb r1, [r0]
lsls r0, r1, 3
subs r0, r1
@@ -675,7 +675,7 @@ _080C8A64:
strh r0, [r4, 0x8]
b _080C8AC2
.align 2, 0
-_080C8A8C: .4byte gUnknown_02038695
+_080C8A8C: .4byte gContestPlayerMonIndex
_080C8A90: .4byte 0x02019266
_080C8A94:
bl sub_80C85D8
diff --git a/asm/matsuda_debug_menu.s b/asm/matsuda_debug_menu.s
index b05d530be..e9577b8b8 100644
--- a/asm/matsuda_debug_menu.s
+++ b/asm/matsuda_debug_menu.s
@@ -6,900 +6,6 @@
.text
- thumb_func_start sub_80AA5BC
-sub_80AA5BC: @ 80AA5BC
- push {lr}
- sub sp, 0x4
- lsls r0, 24
- ldr r2, _080AA5E0 @ =gMenuWindow
- ldr r1, _080AA5E4 @ =gUnknown_083C93B4
- lsrs r0, 22
- adds r0, r1
- ldr r1, [r0]
- movs r0, 0x12
- str r0, [sp]
- adds r0, r2, 0
- movs r2, 0xC2
- movs r3, 0x3
- bl sub_8003460
- add sp, 0x4
- pop {r0}
- bx r0
- .align 2, 0
-_080AA5E0: .4byte gMenuWindow
-_080AA5E4: .4byte gUnknown_083C93B4
- thumb_func_end sub_80AA5BC
-
- thumb_func_start sub_80AA5E8
-sub_80AA5E8: @ 80AA5E8
- push {lr}
- sub sp, 0x4
- lsls r0, 24
- ldr r2, _080AA60C @ =gMenuWindow
- ldr r1, _080AA610 @ =gUnknown_083C93F0
- lsrs r0, 22
- adds r0, r1
- ldr r1, [r0]
- movs r0, 0x4
- str r0, [sp]
- adds r0, r2, 0
- movs r2, 0xE8
- movs r3, 0x3
- bl sub_8003460
- add sp, 0x4
- pop {r0}
- bx r0
- .align 2, 0
-_080AA60C: .4byte gMenuWindow
-_080AA610: .4byte gUnknown_083C93F0
- thumb_func_end sub_80AA5E8
-
- thumb_func_start sub_80AA614
-sub_80AA614: @ 80AA614
- push {r4,lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- lsls r1, 24
- lsrs r1, 24
- bl sub_80AE770
- adds r1, r0, 0
- lsls r1, 16
- lsrs r1, 16
- ldr r4, _080AA650 @ =0x02000000
- adds r0, r4, 0
- movs r2, 0x1
- movs r3, 0x3
- bl ConvertIntToDecimalStringN
- ldr r0, _080AA654 @ =gMenuWindow
- movs r1, 0xC
- str r1, [sp]
- adds r1, r4, 0
- movs r2, 0xE2
- movs r3, 0x3
- bl sub_8003460
- add sp, 0x4
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA650: .4byte 0x02000000
-_080AA654: .4byte gMenuWindow
- thumb_func_end sub_80AA614
-
- thumb_func_start sub_80AA658
-sub_80AA658: @ 80AA658
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r5, r0, 24
- adds r0, r5, 0
- bl sub_80AA340
- adds r0, r5, 0
- bl sub_80AA388
- adds r0, r5, 0
- bl sub_80AA3D0
- adds r0, r5, 0
- bl sub_80AA418
- adds r0, r5, 0
- bl sub_80AA460
- adds r0, r5, 0
- bl sub_80AA4A8
- movs r4, 0
-_080AA684:
- adds r0, r5, 0
- adds r1, r4, 0
- bl sub_80AA4F0
- adds r0, r4, 0x1
- lsls r0, 24
- lsrs r4, r0, 24
- cmp r4, 0x3
- bls _080AA684
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_80AA658
-
- thumb_func_start sub_80AA69C
-sub_80AA69C: @ 80AA69C
- push {r4-r6,lr}
- ldr r6, _080AA748 @ =gPlayerParty
- ldr r5, _080AA74C @ =gUnknown_02038695
- ldrb r2, [r5]
- lsls r2, 6
- ldr r4, _080AA750 @ =gUnknown_02038596
- adds r2, r4
- adds r0, r6, 0
- movs r1, 0x16
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r0, r4, 0x2
- adds r2, r0
- adds r0, r6, 0
- movs r1, 0x18
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r0, r4, 0x1
- adds r2, r0
- adds r0, r6, 0
- movs r1, 0x17
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r0, r4, 0x3
- adds r2, r0
- adds r0, r6, 0
- movs r1, 0x21
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r0, r4, 0x4
- adds r2, r0
- adds r0, r6, 0
- movs r1, 0x2F
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r0, r4, 0x5
- adds r2, r0
- adds r0, r6, 0
- movs r1, 0x30
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- subs r4, 0x8
- adds r2, r4
- adds r0, r6, 0
- movs r1, 0xD
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r2, r4
- adds r2, 0x2
- adds r0, r6, 0
- movs r1, 0xE
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r2, r4
- adds r2, 0x4
- adds r0, r6, 0
- movs r1, 0xF
- bl SetMonData
- ldrb r2, [r5]
- lsls r2, 6
- adds r2, r4
- adds r2, 0x6
- adds r0, r6, 0
- movs r1, 0x10
- bl SetMonData
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA748: .4byte gPlayerParty
-_080AA74C: .4byte gUnknown_02038695
-_080AA750: .4byte gUnknown_02038596
- thumb_func_end sub_80AA69C
-
- thumb_func_start sub_80AA754
-sub_80AA754: @ 80AA754
- push {r4,lr}
- adds r4, r0, 0
- ldr r0, _080AA774 @ =gMain
- ldrh r1, [r0, 0x30]
- cmp r1, 0x20
- beq _080AA7A2
- cmp r1, 0x20
- bgt _080AA782
- cmp r1, 0x2
- beq _080AA7F8
- cmp r1, 0x2
- bgt _080AA778
- cmp r1, 0x1
- beq _080AA7D8
- b _080AA870
- .align 2, 0
-_080AA774: .4byte gMain
-_080AA778:
- cmp r1, 0x8
- beq _080AA868
- cmp r1, 0x10
- beq _080AA7A2
- b _080AA870
-_080AA782:
- cmp r1, 0x80
- beq _080AA7C2
- cmp r1, 0x80
- bgt _080AA790
- cmp r1, 0x40
- beq _080AA7AC
- b _080AA870
-_080AA790:
- movs r0, 0x80
- lsls r0, 1
- cmp r1, r0
- beq _080AA814
- movs r0, 0x80
- lsls r0, 2
- cmp r1, r0
- beq _080AA834
- b _080AA870
-_080AA7A2:
- ldrh r0, [r4, 0x2E]
- movs r1, 0x1
- eors r0, r1
- strh r0, [r4, 0x2E]
- b _080AA870
-_080AA7AC:
- ldrh r1, [r4, 0x30]
- movs r2, 0x30
- ldrsh r0, [r4, r2]
- cmp r0, 0
- bne _080AA7BC
- movs r0, 0x8
- strh r0, [r4, 0x30]
- b _080AA870
-_080AA7BC:
- subs r0, r1, 0x1
- strh r0, [r4, 0x30]
- b _080AA870
-_080AA7C2:
- ldrh r1, [r4, 0x30]
- movs r3, 0x30
- ldrsh r0, [r4, r3]
- cmp r0, 0x8
- bne _080AA7D2
- movs r0, 0
- strh r0, [r4, 0x30]
- b _080AA870
-_080AA7D2:
- adds r0, r1, 0x1
- strh r0, [r4, 0x30]
- b _080AA870
-_080AA7D8:
- ldr r2, _080AA7F4 @ =gUnknown_083C92E4
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- lsls r0, 2
- movs r3, 0x30
- ldrsh r1, [r4, r3]
- lsls r1, 3
- adds r0, r1
- adds r0, r2
- ldr r2, [r0]
- adds r0, r4, 0
- movs r1, 0x1
- b _080AA84E
- .align 2, 0
-_080AA7F4: .4byte gUnknown_083C92E4
-_080AA7F8:
- ldr r1, _080AA810 @ =gUnknown_083C92E4
- movs r0, 0x2E
- ldrsh r2, [r4, r0]
- lsls r2, 2
- movs r3, 0x30
- ldrsh r0, [r4, r3]
- lsls r0, 3
- adds r2, r0
- adds r2, r1
- movs r1, 0x1
- negs r1, r1
- b _080AA84A
- .align 2, 0
-_080AA810: .4byte gUnknown_083C92E4
-_080AA814:
- ldr r2, _080AA830 @ =gUnknown_083C92E4
- movs r1, 0x2E
- ldrsh r0, [r4, r1]
- lsls r0, 2
- movs r3, 0x30
- ldrsh r1, [r4, r3]
- lsls r1, 3
- adds r0, r1
- adds r0, r2
- ldr r2, [r0]
- adds r0, r4, 0
- movs r1, 0xA
- b _080AA84E
- .align 2, 0
-_080AA830: .4byte gUnknown_083C92E4
-_080AA834:
- ldr r1, _080AA864 @ =gUnknown_083C92E4
- movs r0, 0x2E
- ldrsh r2, [r4, r0]
- lsls r2, 2
- movs r3, 0x30
- ldrsh r0, [r4, r3]
- lsls r0, 3
- adds r2, r0
- adds r2, r1
- movs r1, 0xA
- negs r1, r1
-_080AA84A:
- ldr r2, [r2]
- adds r0, r4, 0
-_080AA84E:
- bl _call_via_r2
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldrh r1, [r4, 0x34]
- lsls r1, 24
- lsrs r1, 24
- bl sub_80AA614
- b _080AA870
- .align 2, 0
-_080AA864: .4byte gUnknown_083C92E4
-_080AA868:
- adds r0, r4, 0
- movs r1, 0x1
- bl sub_80AAD08
-_080AA870:
- ldr r2, _080AA898 @ =gUnknown_083C9296
- movs r0, 0x2E
- ldrsh r1, [r4, r0]
- movs r3, 0x30
- ldrsh r0, [r4, r3]
- lsls r0, 1
- adds r1, r0
- adds r1, r2
- ldrb r0, [r1]
- strh r0, [r4, 0x20]
- ldr r1, _080AA89C @ =gUnknown_083C92A8
- movs r2, 0x30
- ldrsh r0, [r4, r2]
- adds r0, r1
- ldrb r0, [r0]
- strh r0, [r4, 0x22]
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA898: .4byte gUnknown_083C9296
-_080AA89C: .4byte gUnknown_083C92A8
- thumb_func_end sub_80AA754
-
- thumb_func_start sub_80AA8A0
-sub_80AA8A0: @ 80AA8A0
- push {r4,lr}
- adds r4, r0, 0
- lsls r2, 24
- lsrs r0, r2, 24
- lsls r1, 24
- asrs r1, 24
- cmp r1, 0x1
- bne _080AA8C0
- strh r0, [r4, 0x32]
- bl sub_80AA280
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA658
-_080AA8C0:
- pop {r4}
- pop {r0}
- bx r0
- thumb_func_end sub_80AA8A0
-
- thumb_func_start sub_80AA8C8
-sub_80AA8C8: @ 80AA8C8
- push {lr}
- lsls r1, 24
- asrs r1, 24
- movs r2, 0
- bl sub_80AA8A0
- pop {r0}
- bx r0
- thumb_func_end sub_80AA8C8
-
- thumb_func_start sub_80AA8D8
-sub_80AA8D8: @ 80AA8D8
- push {lr}
- lsls r1, 24
- asrs r1, 24
- movs r2, 0x1
- bl sub_80AA8A0
- pop {r0}
- bx r0
- thumb_func_end sub_80AA8D8
-
- thumb_func_start sub_80AA8E8
-sub_80AA8E8: @ 80AA8E8
- push {lr}
- lsls r1, 24
- asrs r1, 24
- movs r2, 0x2
- bl sub_80AA8A0
- pop {r0}
- bx r0
- thumb_func_end sub_80AA8E8
-
- thumb_func_start sub_80AA8F8
-sub_80AA8F8: @ 80AA8F8
- push {lr}
- lsls r1, 24
- asrs r1, 24
- movs r2, 0x3
- bl sub_80AA8A0
- pop {r0}
- bx r0
- thumb_func_end sub_80AA8F8
-
- thumb_func_start sub_80AA908
-sub_80AA908: @ 80AA908
- push {lr}
- lsls r1, 24
- lsrs r1, 24
- lsls r2, 24
- asrs r2, 24
- adds r2, r1
- lsls r2, 16
- lsrs r0, r2, 16
- asrs r2, 16
- cmp r2, 0xFF
- ble _080AA922
- movs r0, 0xFF
- b _080AA928
-_080AA922:
- cmp r2, 0
- bge _080AA928
- movs r0, 0
-_080AA928:
- lsls r0, 24
- lsrs r0, 24
- pop {r1}
- bx r1
- thumb_func_end sub_80AA908
-
- thumb_func_start sub_80AA930
-sub_80AA930: @ 80AA930
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AA970 @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x26
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x26
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA340
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA970: .4byte gUnknown_02038570
- thumb_func_end sub_80AA930
-
- thumb_func_start sub_80AA974
-sub_80AA974: @ 80AA974
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AA9B4 @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x28
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x28
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA388
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA9B4: .4byte gUnknown_02038570
- thumb_func_end sub_80AA974
-
- thumb_func_start sub_80AA9B8
-sub_80AA9B8: @ 80AA9B8
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AA9F8 @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x27
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x27
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA3D0
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AA9F8: .4byte gUnknown_02038570
- thumb_func_end sub_80AA9B8
-
- thumb_func_start sub_80AA9FC
-sub_80AA9FC: @ 80AA9FC
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AAA3C @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x29
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x29
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA418
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAA3C: .4byte gUnknown_02038570
- thumb_func_end sub_80AA9FC
-
- thumb_func_start sub_80AAA40
-sub_80AAA40: @ 80AAA40
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AAA80 @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x2A
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x2A
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA460
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAA80: .4byte gUnknown_02038570
- thumb_func_end sub_80AAA40
-
- thumb_func_start sub_80AAA84
-sub_80AAA84: @ 80AAA84
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AAAC4 @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- adds r2, 0x2B
- ldrb r3, [r2]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AA908
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- adds r1, 0x2B
- strb r0, [r1]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA4A8
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAAC4: .4byte gUnknown_02038570
- thumb_func_end sub_80AAA84
-
- thumb_func_start sub_80AAAC8
-sub_80AAAC8: @ 80AAAC8
- push {lr}
- lsls r1, 16
- lsrs r1, 16
- lsls r2, 24
- asrs r2, 24
- adds r1, r2
- lsls r1, 16
- lsrs r0, r1, 16
- asrs r1, 16
- movs r2, 0xB1
- lsls r2, 1
- cmp r1, r2
- ble _080AAAE6
- movs r0, 0x1
- b _080AAAEC
-_080AAAE6:
- cmp r1, 0
- bge _080AAAEC
- adds r0, r2, 0
-_080AAAEC:
- pop {r1}
- bx r1
- thumb_func_end sub_80AAAC8
-
- thumb_func_start sub_80AAAF0
-sub_80AAAF0: @ 80AAAF0
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AAB2C @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- ldrh r3, [r2, 0x1E]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AAAC8
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- strh r0, [r1, 0x1E]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0
- bl sub_80AA4F0
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAB2C: .4byte gUnknown_02038570
- thumb_func_end sub_80AAAF0
-
- thumb_func_start sub_80AAB30
-sub_80AAB30: @ 80AAB30
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AAB6C @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- ldrh r3, [r2, 0x20]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AAAC8
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- strh r0, [r1, 0x20]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0x1
- bl sub_80AA4F0
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAB6C: .4byte gUnknown_02038570
- thumb_func_end sub_80AAB30
-
- thumb_func_start sub_80AAB70
-sub_80AAB70: @ 80AAB70
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AABAC @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- ldrh r3, [r2, 0x22]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AAAC8
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- strh r0, [r1, 0x22]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0x2
- bl sub_80AA4F0
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AABAC: .4byte gUnknown_02038570
- thumb_func_end sub_80AAB70
-
- thumb_func_start sub_80AABB0
-sub_80AABB0: @ 80AABB0
- push {r4,r5,lr}
- adds r4, r0, 0
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- ldr r5, _080AABEC @ =gUnknown_02038570
- movs r3, 0x32
- ldrsh r2, [r4, r3]
- lsls r2, 6
- adds r2, r5
- ldrh r3, [r2, 0x24]
- lsls r2, r1, 24
- asrs r2, 24
- adds r1, r3, 0
- bl sub_80AAAC8
- movs r2, 0x32
- ldrsh r1, [r4, r2]
- lsls r1, 6
- adds r1, r5
- strh r0, [r1, 0x24]
- ldrh r0, [r4, 0x32]
- lsls r0, 24
- lsrs r0, 24
- movs r1, 0x3
- bl sub_80AA4F0
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AABEC: .4byte gUnknown_02038570
- thumb_func_end sub_80AABB0
-
- thumb_func_start sub_80AABF0
-sub_80AABF0: @ 80AABF0
- push {r4,r5,lr}
- adds r5, r0, 0
- lsls r1, 24
- movs r0, 0xFF
- cmp r1, 0
- ble _080AABFE
- movs r0, 0x1
-_080AABFE:
- lsls r0, 24
- asrs r0, 24
- ldrh r1, [r5, 0x34]
- adds r0, r1
- lsls r0, 24
- lsrs r4, r0, 24
- asrs r0, 24
- cmp r0, 0
- bge _080AAC14
- movs r4, 0
- b _080AAC1A
-_080AAC14:
- cmp r0, 0x4
- ble _080AAC1A
- movs r4, 0x4
-_080AAC1A:
- lsls r4, 24
- lsrs r0, r4, 24
- bl sub_80AA5BC
- asrs r4, 24
- strh r4, [r5, 0x34]
- ldr r0, _080AAC54 @ =gScriptContestCategory
- strh r4, [r0]
- lsls r4, 24
- lsrs r4, 24
- ldr r0, _080AAC58 @ =gScriptContestRank
- ldrb r1, [r0]
- adds r0, r4, 0
- bl sub_80AE398
- ldrh r0, [r5, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA280
- ldrh r0, [r5, 0x32]
- lsls r0, 24
- lsrs r0, 24
- bl sub_80AA658
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080AAC54: .4byte gScriptContestCategory
-_080AAC58: .4byte gScriptContestRank
- thumb_func_end sub_80AABF0
-
thumb_func_start sub_80AAC5C
sub_80AAC5C: @ 80AAC5C
push {r4,r5,lr}
@@ -963,7 +69,7 @@ sub_80AACC4: @ 80AACC4
ands r0, r1
cmp r0, 0
bne _080AACF4
- bl sub_80AA69C
+ bl SetDebugMonForContest
ldr r0, _080AACFC @ =gUnknown_0203869A
ldrb r1, [r0]
movs r0, 0x1
@@ -1024,7 +130,7 @@ sub_80AAD44: @ 80AAD44
asrs r1, 24
cmp r1, 0x1
bne _080AAD72
- bl sub_80AA69C
+ bl SetDebugMonForContest
movs r4, 0
ldr r5, _080AAD78 @ =gUnknown_02038670
_080AAD56:
@@ -1274,7 +380,7 @@ sub_80AAF30: @ 80AAF30
ldr r1, _080AAFC0 @ =gUnknown_0203856C
movs r0, 0x1
strb r0, [r1]
- ldr r1, _080AAFC4 @ =gUnknown_02038695
+ ldr r1, _080AAFC4 @ =gContestPlayerMonIndex
movs r0, 0x3
strb r0, [r1]
movs r0, 0
@@ -1294,7 +400,7 @@ _080AAF56:
movs r4, 0
movs r6, 0
ldr r7, _080AAFCC @ =gUnknown_02038670
- ldr r5, _080AAFD0 @ =gUnknown_02038570
+ ldr r5, _080AAFD0 @ =gContestMons
mov r9, r5
_080AAF6C:
lsls r1, r4, 1
@@ -1338,10 +444,10 @@ _080AAF6C:
bx r0
.align 2, 0
_080AAFC0: .4byte gUnknown_0203856C
-_080AAFC4: .4byte gUnknown_02038695
+_080AAFC4: .4byte gContestPlayerMonIndex
_080AAFC8: .4byte gUnknown_02038690
_080AAFCC: .4byte gUnknown_02038670
-_080AAFD0: .4byte gUnknown_02038570
+_080AAFD0: .4byte gContestMons
_080AAFD4: .4byte gUnknown_02038680
_080AAFD8: .4byte gUnknown_02038678
thumb_func_end sub_80AAF30
@@ -1392,7 +498,7 @@ _080AB028: .4byte gUnknown_02038670
thumb_func_start MatsudaDebugMenu_SetArtMuseumItems
MatsudaDebugMenu_SetArtMuseumItems: @ 80AB02C
push {r4,r5,lr}
- ldr r1, _080AB078 @ =gUnknown_02038695
+ ldr r1, _080AB078 @ =gContestPlayerMonIndex
movs r0, 0x3
strb r0, [r1]
movs r0, 0
@@ -1429,7 +535,7 @@ _080AB058:
pop {r1}
bx r1
.align 2, 0
-_080AB078: .4byte gUnknown_02038695
+_080AB078: .4byte gContestPlayerMonIndex
_080AB07C: .4byte gUnknown_02038690
_080AB080: .4byte gScriptContestCategory
thumb_func_end MatsudaDebugMenu_SetArtMuseumItems
diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s
index dd4c18d96..5d99fa2b2 100644
--- a/asm/script_pokemon_util_80C4BF0.s
+++ b/asm/script_pokemon_util_80C4BF0.s
@@ -10,7 +10,7 @@
sub_80C4BF0: @ 80C4BF0
push {r4,lr}
ldr r2, _080C4C1C @ =gSaveBlock1
- ldr r1, _080C4C20 @ =gUnknown_02038570
+ ldr r1, _080C4C20 @ =gContestMons
ldrb r3, [r1, 0x15]
movs r4, 0x9B
lsls r4, 5
@@ -32,7 +32,7 @@ sub_80C4BF0: @ 80C4BF0
bx r0
.align 2, 0
_080C4C1C: .4byte gSaveBlock1
-_080C4C20: .4byte gUnknown_02038570
+_080C4C20: .4byte gContestMons
_080C4C24: .4byte 0x00001364
thumb_func_end sub_80C4BF0
@@ -161,7 +161,7 @@ sub_80C4CEC: @ 80C4CEC
sub_80C4CF8: @ 80C4CF8
push {lr}
ldr r0, _080C4D28 @ =gUnknown_02038690
- ldr r1, _080C4D2C @ =gUnknown_02038695
+ ldr r1, _080C4D2C @ =gContestPlayerMonIndex
ldrb r2, [r1]
adds r0, r2, r0
ldrb r0, [r0]
@@ -184,7 +184,7 @@ sub_80C4CF8: @ 80C4CF8
b _080C4D44
.align 2, 0
_080C4D28: .4byte gUnknown_02038690
-_080C4D2C: .4byte gUnknown_02038695
+_080C4D2C: .4byte gContestPlayerMonIndex
_080C4D30: .4byte gScriptContestRank
_080C4D34: .4byte gUnknown_02038678
_080C4D38: .4byte 0x0000031f
@@ -486,7 +486,7 @@ _080C4F6C: .4byte ShowContestWinnerCleanup
sub_80C4F70: @ 80C4F70
push {r4,lr}
ldr r0, _080C4FA8 @ =0x00004010
- ldr r4, _080C4FAC @ =gUnknown_02038570
+ ldr r4, _080C4FAC @ =gContestMons
ldrb r1, [r4, 0x15]
bl VarSet
ldr r0, _080C4FB0 @ =0x00004011
@@ -509,7 +509,7 @@ sub_80C4F70: @ 80C4F70
bx r0
.align 2, 0
_080C4FA8: .4byte 0x00004010
-_080C4FAC: .4byte gUnknown_02038570
+_080C4FAC: .4byte gContestMons
_080C4FB0: .4byte 0x00004011
_080C4FB4: .4byte 0x00004012
_080C4FB8: .4byte 0x00004013
@@ -534,7 +534,7 @@ GiveMonArtistRibbon: @ 80C4FBC
cmp r0, 0
bne _080C5038
ldr r0, _080C5024 @ =gUnknown_02038690
- ldr r1, _080C5028 @ =gUnknown_02038695
+ ldr r1, _080C5028 @ =gContestPlayerMonIndex
ldrb r2, [r1]
adds r0, r2, r0
ldrb r0, [r0]
@@ -567,7 +567,7 @@ GiveMonArtistRibbon: @ 80C4FBC
_080C501C: .4byte gUnknown_02038694
_080C5020: .4byte gPlayerParty
_080C5024: .4byte gUnknown_02038690
-_080C5028: .4byte gUnknown_02038695
+_080C5028: .4byte gContestPlayerMonIndex
_080C502C: .4byte gScriptContestRank
_080C5030: .4byte gUnknown_02038678
_080C5034: .4byte 0x0000031f
@@ -611,7 +611,7 @@ ShowContestEntryMonPic: @ 80C5050
movs r2, 0x13
movs r3, 0xD
bl MenuDrawTextWindow
- ldr r2, _080C5140 @ =gUnknown_02038570
+ ldr r2, _080C5140 @ =gContestMons
ldr r0, _080C5144 @ =gSpecialVar_0x8006
ldrh r1, [r0]
lsls r1, 6
@@ -703,7 +703,7 @@ _080C512A:
bx r0
.align 2, 0
_080C513C: .4byte sub_80C5190
-_080C5140: .4byte gUnknown_02038570
+_080C5140: .4byte gContestMons
_080C5144: .4byte gSpecialVar_0x8006
_080C5148: .4byte gTasks
_080C514C: .4byte gMonFrontPicTable
diff --git a/data/data2.s b/data/data2.s
index 525068cbe..060d359de 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -13870,62 +13870,62 @@ gMatsudaDebugMenu_GoBackText:: @ 83C9337
gMatsudaDebugMenu_BattlePointsText:: @ 83C933B
.string "{COLOR MAGENTA}BP.$"
-gMatsudaDebugMenuText_Cool:
+MatsudaDebugMenuText_Cool:
.string "かっこよさ$" @ coolness
-gMatsudaDebugMenuText_Cute:
+MatsudaDebugMenuText_Cute:
.string "かわいさ$" @ cuteness
-gMatsudaDebugMenuText_Beauty:
+MatsudaDebugMenuText_Beauty:
.string "うつくしさ$" @ beauty
-gMatsudaDebugMenuText_Smart:
+MatsudaDebugMenuText_Smart:
.string "かしこさ$" @ smartness
-gMatsudaDebugMenuText_Tough:
+MatsudaDebugMenuText_Tough:
.string "たくましさ$" @ toughness
-gMatsudaDebugMenuText_Sheen:
+MatsudaDebugMenuText_Sheen:
.string "けづや$" @ sheen
.align 2
gMatsudaDebugMenuTextList1:: @ 83C9364
- .4byte gMatsudaDebugMenuText_Cool
- .4byte gMatsudaDebugMenuText_Cute
- .4byte gMatsudaDebugMenuText_Beauty
- .4byte gMatsudaDebugMenuText_Smart
- .4byte gMatsudaDebugMenuText_Tough
- .4byte gMatsudaDebugMenuText_Sheen
-
-Unknown_83C937C:
+ .4byte MatsudaDebugMenuText_Cool
+ .4byte MatsudaDebugMenuText_Cute
+ .4byte MatsudaDebugMenuText_Beauty
+ .4byte MatsudaDebugMenuText_Smart
+ .4byte MatsudaDebugMenuText_Tough
+ .4byte MatsudaDebugMenuText_Sheen
+
+MatsudaDebugMenuText_CoolContest:
.string "かっこよさコンテスト$" @ Cool Contest
-Unknown_83C9387:
+MatsudaDebugMenuText_BeautyContest:
.string "うつくしさコンテスト$" @ Beauty Contest
-Unknown_83C9392:
+MatsudaDebugMenuText_CuteContest:
.string "かわいさコンテスト　$" @ Cute Contest
-Unknown_83C939D:
+MatsudaDebugMenuText_SmartContest:
.string "かしこさコンテスト　$" @ Smart Contest
-Unknown_83C93A8:
+MatsudaDebugMenuText_ToughContest:
.string "たくましさコンテスト$" @ Tough Contest
.align 2
-gUnknown_083C93B4:: @ 83C93B4
- .4byte Unknown_83C937C
- .4byte Unknown_83C9387
- .4byte Unknown_83C9392
- .4byte Unknown_83C939D
- .4byte Unknown_83C93A8
+gMatsudaDebugMenuTextList2:: @ 83C93B4
+ .4byte MatsudaDebugMenuText_CoolContest
+ .4byte MatsudaDebugMenuText_BeautyContest
+ .4byte MatsudaDebugMenuText_CuteContest
+ .4byte MatsudaDebugMenuText_SmartContest
+ .4byte MatsudaDebugMenuText_ToughContest
-Unknown_83C93C8:
+MatsudaDebugMenuText_Fallarbor:
.string "ハジツゲ/ノーマル$" @ Fallarbor / Normal
-Unknown_83C93D2:
+MatsudaDebugMenuText_Verdanturf:
.string "シダケ/スーパー　$" @ Verdanturf / Super
-Unknown_83C93DC:
+MatsudaDebugMenuText_Slateport:
.string "カイナ/ハイパー　$" @ Slateport / Hyper
-Unknown_83C93E6:
+MatsudaDebugMenuText_Lilycove:
.string "ミナモ/マスター　$" @ Lilycove / Master
.align 2
-gUnknown_083C93F0:: @ 83C93F0
- .4byte Unknown_83C93C8
- .4byte Unknown_83C93D2
- .4byte Unknown_83C93DC
- .4byte Unknown_83C93E6
+gMatsudaDebugMenuTextList3:: @ 83C93F0
+ .4byte MatsudaDebugMenuText_Fallarbor @ Normal
+ .4byte MatsudaDebugMenuText_Verdanturf @ Super
+ .4byte MatsudaDebugMenuText_Slateport @ Hyper
+ .4byte MatsudaDebugMenuText_Lilycove @ Master
gUnknown_083C9400:: @ 83C9400
.incbin "baserom.gba", 0x003c9400, 0x8
diff --git a/include/pokemon.h b/include/pokemon.h
index 956a3984f..dd80e1ea1 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -128,41 +128,41 @@ struct PokemonSubstruct2
struct PokemonSubstruct3
{
- u8 pokerus;
- u8 metLocation;
+ /* 0x00 */ u8 pokerus;
+ /* 0x01 */ u8 metLocation;
- u16 metLevel:7;
- u16 metGame:4;
- u16 pokeball:4;
- u16 otGender:1;
+ /* 0x02 */ u16 metLevel:7;
+ /* 0x02 */ u16 metGame:4;
+ /* 0x03 */ u16 pokeball:4;
+ /* 0x03 */ u16 otGender:1;
- u32 hpIV:5;
- u32 attackIV:5;
- u32 defenseIV:5;
- u32 speedIV:5;
- u32 spAttackIV:5;
- u32 spDefenseIV:5;
- u32 isEgg:1;
- u32 altAbility:1;
+ /* 0x04 */ u32 hpIV:5;
+ /* 0x04 */ u32 attackIV:5;
+ /* 0x05 */ u32 defenseIV:5;
+ /* 0x05 */ u32 speedIV:5;
+ /* 0x05 */ u32 spAttackIV:5;
+ /* 0x06 */ u32 spDefenseIV:5;
+ /* 0x07 */ u32 isEgg:1;
+ /* 0x07 */ u32 altAbility:1;
- u32 coolRibbon:3;
- u32 beautyRibbon:3;
- u32 cuteRibbon:3;
- u32 smartRibbon:3;
- u32 toughRibbon:3;
- u32 championRibbon:1;
- u32 winningRibbon:1;
- u32 victoryRibbon:1;
- u32 artistRibbon:1;
- u32 effortRibbon:1;
- u32 giftRibbon1:1;
- u32 giftRibbon2:1;
- u32 giftRibbon3:1;
- u32 giftRibbon4:1;
- u32 giftRibbon5:1;
- u32 giftRibbon6:1;
- u32 giftRibbon7:1;
- u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald
+ /* 0x08 */ u32 coolRibbon:3;
+ /* 0x08 */ u32 beautyRibbon:3;
+ /* 0x08 */ u32 cuteRibbon:3;
+ /* 0x09 */ u32 smartRibbon:3;
+ /* 0x09 */ u32 toughRibbon:3;
+ /* 0x09 */ u32 championRibbon:1;
+ /* 0x0A */ u32 winningRibbon:1;
+ /* 0x0A */ u32 victoryRibbon:1;
+ /* 0x0A */ u32 artistRibbon:1;
+ /* 0x0A */ u32 effortRibbon:1;
+ /* 0x0A */ u32 giftRibbon1:1;
+ /* 0x0A */ u32 giftRibbon2:1;
+ /* 0x0A */ u32 giftRibbon3:1;
+ /* 0x0A */ u32 giftRibbon4:1;
+ /* 0x0B */ u32 giftRibbon5:1;
+ /* 0x0B */ u32 giftRibbon6:1;
+ /* 0x0B */ u32 giftRibbon7:1;
+ /* 0x0B */ u32 fatefulEncounter:5; // unused in Ruby/Sapphire, but the high bit must be set for Mew/Deoxys to obey in FR/LG/Emerald
};
union PokemonSubstruct
diff --git a/src/matsuda_debug_menu.c b/src/matsuda_debug_menu.c
index 9c20b4078..18f644cbb 100644
--- a/src/matsuda_debug_menu.c
+++ b/src/matsuda_debug_menu.c
@@ -12,7 +12,7 @@
extern u8 gUnknown_0203869A;
extern u8 gUnknown_0203869B;
-extern u8 gUnknown_02038695;
+extern u8 gContestPlayerMonIndex;
extern u16 gScriptContestCategory;
extern u16 gScriptContestRank;
extern u8 (*gCallback_03004AE8)(void);
@@ -39,9 +39,7 @@ extern void sub_805469C(void);
extern void sub_80AE398(u8, u8);
extern void sub_80AE098(u8);
extern void sub_80AA5BC(u8);
-extern void sub_80AA5E8(u16);
-extern void sub_80AA658(u8);
-extern void sub_80AA614(u8, u8);
+extern u32 sub_80AE770(u8, u8);
extern struct Window gMenuWindow;
@@ -74,24 +72,27 @@ extern u8 gMoveNames[][13];
extern u8 gMatsudaDebugMenu_UnknownByteArray[];
extern u32 gMatsudaDebugMenuTextList1[];
+extern u32 gMatsudaDebugMenuTextList2[];
+extern u32 gMatsudaDebugMenuTextList3[];
extern u8 gMatsudaDebugMenuContestTopLeft[][2];
-struct UnknownStruct
-{
- u8 text[2];
- u8 unk2;
- u8 filler3[27];
- u16 unk1E[4];
- u8 unk26;
- u8 unk27;
- u8 unk28;
- u8 unk29;
- u8 unk2A;
- u8 unk2B;
- u8 filler2C[20];
+struct ContestPokemon
+{
+ /* 0x00 */ u16 species;
+ /* 0x02 */ u8 nickname[POKEMON_NAME_LENGTH];
+ /* 0x0D */ u8 trainerName[8];
+ /* 0x15 */ u8 filler15[9];
+ /* 0x1E */ u16 moves[4]; // moves
+ /* 0x26 */ u8 cool; // cool
+ /* 0x27 */ u8 beauty; // beauty
+ /* 0x28 */ u8 cute; // cute
+ /* 0x29 */ u8 smart; // smart
+ /* 0x2A */ u8 tough; // tough
+ /* 0x2B */ u8 sheen; // sheen
+ /* 0x2C */ u8 filler2C[20];
};
-extern struct UnknownStruct gUnknown_02038570[];
+extern struct ContestPokemon gContestMons[];
extern bool8 gReceivedRemoteLinkPlayers;
extern u16 gBlockRecvBuffer[MAX_LINK_PLAYERS][BLOCK_BUFFER_SIZE / 2];
@@ -111,6 +112,9 @@ void sub_80A9E3C(u8 taskId);
void sub_80A9ED8(u8);
void sub_80A9E80(u8);
void sub_80AA280(u8);
+void sub_80AA5E8(u8);
+void sub_80AA614(u8, u8);
+void sub_80AA658(u8);
u8 unref_sub_80A9B28(void)
{
@@ -303,7 +307,7 @@ void sub_80A9F10(u8 taskId)
{
if(gReceivedRemoteLinkPlayers)
{
- gUnknown_02038695 = GetMultiplayerId();
+ gContestPlayerMonIndex = GetMultiplayerId();
if(GetLinkPlayerCount() == 4)
{
gUnknown_0203869A = 1;
@@ -406,7 +410,7 @@ void sub_80AA10C(void)
gPaletteFade.bufferTransferDisabled = 0;
gUnknown_02038694 = 0;
- if(!(gUnknown_02038570[0].unk2))
+ if(!(gContestMons[0].nickname[0]))
sub_80AE398(0, 0);
sub_80AE098(gUnknown_02038694);
@@ -419,9 +423,9 @@ void sub_80AA10C(void)
}
gScriptContestCategory = gScriptContestRank = 0;
- zero = 0;
+ zero = 0; // it's possible this was some assignment that matsuda used to quickly edit and test things without changing whats passed to the later functions.
sub_80AA5BC(zero);
- sub_80AA5E8((u8)gScriptContestRank);
+ sub_80AA5E8(gScriptContestRank);
sub_8003460(&gMenuWindow, gMatsudaDebugMenu_GoBackText, 0xD6, 0x12, 0x12);
sub_8003460(&gMenuWindow, gMatsudaDebugMenu_BattlePointsText, 0xDC, zero, 0xC);
LoadSpriteSheet(gUnknown_083C92B4);
@@ -460,44 +464,704 @@ void sub_80AA280(u8 var)
void sub_80AA340(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk26, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cool, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x66, gUnknown_083C9282[0], gUnknown_083C9282[1]);
}
void sub_80AA388(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk28, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].cute, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x6C, gUnknown_083C9282[2], gUnknown_083C9282[3]);
}
void sub_80AA3D0(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk27, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].beauty, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x72, gUnknown_083C9282[4], gUnknown_083C9282[5]);
}
void sub_80AA418(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk29, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].smart, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x78, gUnknown_083C9282[6], gUnknown_083C9282[7]);
}
void sub_80AA460(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk2A, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].tough, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x7E, gUnknown_083C9282[8], gUnknown_083C9282[9]);
}
void sub_80AA4A8(u8 var)
{
- ConvertIntToDecimalStringN(unk_2000000, gUnknown_02038570[var].unk2B, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ ConvertIntToDecimalStringN(unk_2000000, gContestMons[var].sheen, STR_CONV_MODE_RIGHT_ALIGN, 3);
sub_8003460(&gMenuWindow, unk_2000000, 0x84, gUnknown_083C9282[10], gUnknown_083C9282[11]);
}
void sub_80AA4F0(u8 var1, u8 var2)
{
FillWindowRect_DefaultPalette(&gMenuWindow, 0, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1], gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1] + 1);
- sub_8003460(&gMenuWindow, gMoveNames[gUnknown_02038570[var1].unk1E[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]);
- ConvertIntToDecimalStringN(gStringVar1, gUnknown_02038570[var1].unk1E[var2], STR_CONV_MODE_LEADING_ZEROS, 3);
+ sub_8003460(&gMenuWindow, gMoveNames[gContestMons[var1].moves[var2]], 0x8A + var2 * 14, gUnknown_083C928E[var2][0], gUnknown_083C928E[var2][1]);
+ ConvertIntToDecimalStringN(gStringVar1, gContestMons[var1].moves[var2], STR_CONV_MODE_LEADING_ZEROS, 3);
sub_8003460(&gMenuWindow, gStringVar1, 0xFA + var2 * 6, gUnknown_083C928E[var2][0] + 7, gUnknown_083C928E[var2][1]);
}
+
+void sub_80AA5BC(u8 var)
+{
+ sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList2[var], 0xC2, 3, 0x12);
+}
+
+void sub_80AA5E8(u8 var)
+{
+ sub_8003460(&gMenuWindow, gMatsudaDebugMenuTextList3[var], 0xE8, 3, 4);
+}
+
+void sub_80AA614(u8 var1, u8 var2)
+{
+ u16 var = sub_80AE770(var1, var2);
+
+ ConvertIntToDecimalStringN(unk_2000000, var, STR_CONV_MODE_RIGHT_ALIGN, 3);
+ sub_8003460(&gMenuWindow, unk_2000000, 0xE2, 3, 0xC);
+}
+
+void sub_80AA658(u8 var)
+{
+ u8 i;
+
+ sub_80AA340(var);
+ sub_80AA388(var);
+ sub_80AA3D0(var);
+ sub_80AA418(var);
+ sub_80AA460(var);
+ sub_80AA4A8(var);
+
+ for(i = 0; i < 4; i++)
+ sub_80AA4F0(var, i);
+}
+
+void SetDebugMonForContest(void)
+{
+ SetMonData(&gPlayerParty, MON_DATA_COOL, &gContestMons[gContestPlayerMonIndex].cool);
+ SetMonData(&gPlayerParty, MON_DATA_CUTE, &gContestMons[gContestPlayerMonIndex].cute);
+ SetMonData(&gPlayerParty, MON_DATA_BEAUTY, &gContestMons[gContestPlayerMonIndex].beauty);
+ SetMonData(&gPlayerParty, MON_DATA_SMART, &gContestMons[gContestPlayerMonIndex].smart);
+ SetMonData(&gPlayerParty, MON_DATA_TOUGH, &gContestMons[gContestPlayerMonIndex].tough);
+ SetMonData(&gPlayerParty, MON_DATA_SHEEN, &gContestMons[gContestPlayerMonIndex].sheen);
+ SetMonData(&gPlayerParty, MON_DATA_MOVE1, &gContestMons[gContestPlayerMonIndex].moves[0]);
+ SetMonData(&gPlayerParty, MON_DATA_MOVE2, &gContestMons[gContestPlayerMonIndex].moves[1]);
+ SetMonData(&gPlayerParty, MON_DATA_MOVE3, &gContestMons[gContestPlayerMonIndex].moves[2]);
+ SetMonData(&gPlayerParty, MON_DATA_MOVE4, &gContestMons[gContestPlayerMonIndex].moves[3]);
+}
+
+// too complicated
+__attribute__((naked))
+void sub_80AA754(struct Sprite *sprite)
+{
+ asm(".syntax unified\n\
+ push {r4,lr}\n\
+ adds r4, r0, 0\n\
+ ldr r0, _080AA774 @ =gMain\n\
+ ldrh r1, [r0, 0x30]\n\
+ cmp r1, 0x20\n\
+ beq _080AA7A2\n\
+ cmp r1, 0x20\n\
+ bgt _080AA782\n\
+ cmp r1, 0x2\n\
+ beq _080AA7F8\n\
+ cmp r1, 0x2\n\
+ bgt _080AA778\n\
+ cmp r1, 0x1\n\
+ beq _080AA7D8\n\
+ b _080AA870\n\
+ .align 2, 0\n\
+_080AA774: .4byte gMain\n\
+_080AA778:\n\
+ cmp r1, 0x8\n\
+ beq _080AA868\n\
+ cmp r1, 0x10\n\
+ beq _080AA7A2\n\
+ b _080AA870\n\
+_080AA782:\n\
+ cmp r1, 0x80\n\
+ beq _080AA7C2\n\
+ cmp r1, 0x80\n\
+ bgt _080AA790\n\
+ cmp r1, 0x40\n\
+ beq _080AA7AC\n\
+ b _080AA870\n\
+_080AA790:\n\
+ movs r0, 0x80\n\
+ lsls r0, 1\n\
+ cmp r1, r0\n\
+ beq _080AA814\n\
+ movs r0, 0x80\n\
+ lsls r0, 2\n\
+ cmp r1, r0\n\
+ beq _080AA834\n\
+ b _080AA870\n\
+_080AA7A2:\n\
+ ldrh r0, [r4, 0x2E]\n\
+ movs r1, 0x1\n\
+ eors r0, r1\n\
+ strh r0, [r4, 0x2E]\n\
+ b _080AA870\n\
+_080AA7AC:\n\
+ ldrh r1, [r4, 0x30]\n\
+ movs r2, 0x30\n\
+ ldrsh r0, [r4, r2]\n\
+ cmp r0, 0\n\
+ bne _080AA7BC\n\
+ movs r0, 0x8\n\
+ strh r0, [r4, 0x30]\n\
+ b _080AA870\n\
+_080AA7BC:\n\
+ subs r0, r1, 0x1\n\
+ strh r0, [r4, 0x30]\n\
+ b _080AA870\n\
+_080AA7C2:\n\
+ ldrh r1, [r4, 0x30]\n\
+ movs r3, 0x30\n\
+ ldrsh r0, [r4, r3]\n\
+ cmp r0, 0x8\n\
+ bne _080AA7D2\n\
+ movs r0, 0\n\
+ strh r0, [r4, 0x30]\n\
+ b _080AA870\n\
+_080AA7D2:\n\
+ adds r0, r1, 0x1\n\
+ strh r0, [r4, 0x30]\n\
+ b _080AA870\n\
+_080AA7D8:\n\
+ ldr r2, _080AA7F4 @ =gUnknown_083C92E4\n\
+ movs r1, 0x2E\n\
+ ldrsh r0, [r4, r1]\n\
+ lsls r0, 2\n\
+ movs r3, 0x30\n\
+ ldrsh r1, [r4, r3]\n\
+ lsls r1, 3\n\
+ adds r0, r1\n\
+ adds r0, r2\n\
+ ldr r2, [r0]\n\
+ adds r0, r4, 0\n\
+ movs r1, 0x1\n\
+ b _080AA84E\n\
+ .align 2, 0\n\
+_080AA7F4: .4byte gUnknown_083C92E4\n\
+_080AA7F8:\n\
+ ldr r1, _080AA810 @ =gUnknown_083C92E4\n\
+ movs r0, 0x2E\n\
+ ldrsh r2, [r4, r0]\n\
+ lsls r2, 2\n\
+ movs r3, 0x30\n\
+ ldrsh r0, [r4, r3]\n\
+ lsls r0, 3\n\
+ adds r2, r0\n\
+ adds r2, r1\n\
+ movs r1, 0x1\n\
+ negs r1, r1\n\
+ b _080AA84A\n\
+ .align 2, 0\n\
+_080AA810: .4byte gUnknown_083C92E4\n\
+_080AA814:\n\
+ ldr r2, _080AA830 @ =gUnknown_083C92E4\n\
+ movs r1, 0x2E\n\
+ ldrsh r0, [r4, r1]\n\
+ lsls r0, 2\n\
+ movs r3, 0x30\n\
+ ldrsh r1, [r4, r3]\n\
+ lsls r1, 3\n\
+ adds r0, r1\n\
+ adds r0, r2\n\
+ ldr r2, [r0]\n\
+ adds r0, r4, 0\n\
+ movs r1, 0xA\n\
+ b _080AA84E\n\
+ .align 2, 0\n\
+_080AA830: .4byte gUnknown_083C92E4\n\
+_080AA834:\n\
+ ldr r1, _080AA864 @ =gUnknown_083C92E4\n\
+ movs r0, 0x2E\n\
+ ldrsh r2, [r4, r0]\n\
+ lsls r2, 2\n\
+ movs r3, 0x30\n\
+ ldrsh r0, [r4, r3]\n\
+ lsls r0, 3\n\
+ adds r2, r0\n\
+ adds r2, r1\n\
+ movs r1, 0xA\n\
+ negs r1, r1\n\
+_080AA84A:\n\
+ ldr r2, [r2]\n\
+ adds r0, r4, 0\n\
+_080AA84E:\n\
+ bl _call_via_r2\n\
+ ldrh r0, [r4, 0x32]\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ ldrh r1, [r4, 0x34]\n\
+ lsls r1, 24\n\
+ lsrs r1, 24\n\
+ bl sub_80AA614\n\
+ b _080AA870\n\
+ .align 2, 0\n\
+_080AA864: .4byte gUnknown_083C92E4\n\
+_080AA868:\n\
+ adds r0, r4, 0\n\
+ movs r1, 0x1\n\
+ bl sub_80AAD08\n\
+_080AA870:\n\
+ ldr r2, _080AA898 @ =gUnknown_083C9296\n\
+ movs r0, 0x2E\n\
+ ldrsh r1, [r4, r0]\n\
+ movs r3, 0x30\n\
+ ldrsh r0, [r4, r3]\n\
+ lsls r0, 1\n\
+ adds r1, r0\n\
+ adds r1, r2\n\
+ ldrb r0, [r1]\n\
+ strh r0, [r4, 0x20]\n\
+ ldr r1, _080AA89C @ =gUnknown_083C92A8\n\
+ movs r2, 0x30\n\
+ ldrsh r0, [r4, r2]\n\
+ adds r0, r1\n\
+ ldrb r0, [r0]\n\
+ strh r0, [r4, 0x22]\n\
+ pop {r4}\n\
+ pop {r0}\n\
+ bx r0\n\
+ .align 2, 0\n\
+_080AA898: .4byte gUnknown_083C9296\n\
+_080AA89C: .4byte gUnknown_083C92A8\n\
+ .syntax divided");
+}
+
+void sub_80AA8A0(struct Sprite *sprite, s8 var1, u8 var2)
+{
+ if(var1 == 1)
+ {
+ sprite->data2 = var2;
+ sub_80AA280(var2);
+ sub_80AA658(sprite->data2);
+ }
+}
+
+void sub_80AA8C8(struct Sprite *sprite, s8 var1)
+{
+ sub_80AA8A0(sprite, var1, 0);
+}
+
+void sub_80AA8D8(struct Sprite *sprite, s8 var1)
+{
+ sub_80AA8A0(sprite, var1, 1);
+}
+
+void sub_80AA8E8(struct Sprite *sprite, s8 var1)
+{
+ sub_80AA8A0(sprite, var1, 2);
+}
+
+void sub_80AA8F8(struct Sprite *sprite, s8 var1)
+{
+ sub_80AA8A0(sprite, var1, 3);
+}
+
+u8 sub_80AA908(u32 a1, u8 a2, s8 a3) // first param is unused.
+{
+ s16 val = a2 + a3;
+
+ if (val > 255)
+ val = 255;
+ else if (val < 0)
+ val = 0;
+
+ return val;
+}
+
+void sub_80AA930(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].cool = sub_80AA908(val, gContestMons[sprite->data2].cool, var2);
+ sub_80AA340(sprite->data2);
+}
+
+void sub_80AA974(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].cute = sub_80AA908(val, gContestMons[sprite->data2].cute, var2);
+ sub_80AA388(sprite->data2);
+}
+
+void sub_80AA9B8(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].beauty = sub_80AA908(val, gContestMons[sprite->data2].beauty, var2);
+ sub_80AA3D0(sprite->data2);
+}
+
+void sub_80AA9FC(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].smart = sub_80AA908(val, gContestMons[sprite->data2].smart, var2);
+ sub_80AA418(sprite->data2);
+}
+
+void sub_80AAA40(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].tough = sub_80AA908(val, gContestMons[sprite->data2].tough, var2);
+ sub_80AA460(sprite->data2);
+}
+
+void sub_80AAA84(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].sheen = sub_80AA908(val, gContestMons[sprite->data2].sheen, var2);
+ sub_80AA4A8(sprite->data2);
+}
+
+// a similar function is at 0x80AA908, however, it apparently returns the wrong type (u8 vs u16).
+u16 sub_80AAAC8(u32 a1, u16 a2, s8 a3) // first param is unused.
+{
+ s16 val = a2 + a3;
+
+ if (val > 354)
+ val = 1;
+ else if (val < 0)
+ val = 354;
+
+ return val;
+}
+
+void sub_80AAAF0(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].moves[0] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[0], var2);
+ sub_80AA4F0(sprite->data2, 0);
+}
+
+void sub_80AAB30(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].moves[1] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[1], var2);
+ sub_80AA4F0(sprite->data2, 1);
+}
+
+void sub_80AAB70(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].moves[2] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[2], var2);
+ sub_80AA4F0(sprite->data2, 2);
+}
+
+void sub_80AABB0(struct Sprite *sprite, u8 var2)
+{
+ u8 val = sprite->data2;
+
+ gContestMons[sprite->data2].moves[3] = sub_80AAAC8(val, gContestMons[sprite->data2].moves[3], var2);
+ sub_80AA4F0(sprite->data2, 3);
+}
+
+// hard/weird function #2
+__attribute__((naked))
+void sub_80AABF0(struct Sprite *sprite, u8 var2)
+{
+ asm(".syntax unified\n\
+ push {r4,r5,lr}\n\
+ adds r5, r0, 0\n\
+ lsls r1, 24\n\
+ movs r0, 0xFF\n\
+ cmp r1, 0\n\
+ ble _080AABFE\n\
+ movs r0, 0x1\n\
+_080AABFE:\n\
+ lsls r0, 24\n\
+ asrs r0, 24\n\
+ ldrh r1, [r5, 0x34]\n\
+ adds r0, r1\n\
+ lsls r0, 24\n\
+ lsrs r4, r0, 24\n\
+ asrs r0, 24\n\
+ cmp r0, 0\n\
+ bge _080AAC14\n\
+ movs r4, 0\n\
+ b _080AAC1A\n\
+_080AAC14:\n\
+ cmp r0, 0x4\n\
+ ble _080AAC1A\n\
+ movs r4, 0x4\n\
+_080AAC1A:\n\
+ lsls r4, 24\n\
+ lsrs r0, r4, 24\n\
+ bl sub_80AA5BC\n\
+ asrs r4, 24\n\
+ strh r4, [r5, 0x34]\n\
+ ldr r0, _080AAC54 @ =gScriptContestCategory\n\
+ strh r4, [r0]\n\
+ lsls r4, 24\n\
+ lsrs r4, 24\n\
+ ldr r0, _080AAC58 @ =gScriptContestRank\n\
+ ldrb r1, [r0]\n\
+ adds r0, r4, 0\n\
+ bl sub_80AE398\n\
+ ldrh r0, [r5, 0x32]\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ bl sub_80AA280\n\
+ ldrh r0, [r5, 0x32]\n\
+ lsls r0, 24\n\
+ lsrs r0, 24\n\
+ bl sub_80AA658\n\
+ pop {r4,r5}\n\
+ pop {r0}\n\
+ bx r0\n\
+ .align 2, 0\n\
+_080AAC54: .4byte gScriptContestCategory\n\
+_080AAC58: .4byte gScriptContestRank\n\
+ .syntax divided");
+}
+
+/*
+ thumb_func_start sub_80AABF0
+sub_80AABF0: @ 80AABF0
+ push {r4,r5,lr}
+ adds r5, r0, 0
+ lsls r1, 24
+ movs r0, 0xFF
+ cmp r1, 0
+ ble _080AABFE
+ movs r0, 0x1
+_080AABFE:
+ lsls r0, 24
+ asrs r0, 24
+ ldrh r1, [r5, 0x34]
+ adds r0, r1
+ lsls r0, 24
+ lsrs r4, r0, 24
+ asrs r0, 24
+ cmp r0, 0
+ bge _080AAC14
+ movs r4, 0
+ b _080AAC1A
+_080AAC14:
+ cmp r0, 0x4
+ ble _080AAC1A
+ movs r4, 0x4
+_080AAC1A:
+ lsls r4, 24
+ lsrs r0, r4, 24
+ bl sub_80AA5BC
+ asrs r4, 24
+ strh r4, [r5, 0x34]
+ ldr r0, _080AAC54 @ =gScriptContestCategory
+ strh r4, [r0]
+ lsls r4, 24
+ lsrs r4, 24
+ ldr r0, _080AAC58 @ =gScriptContestRank
+ ldrb r1, [r0]
+ adds r0, r4, 0
+ bl sub_80AE398
+ ldrh r0, [r5, 0x32]
+ lsls r0, 24
+ lsrs r0, 24
+ bl sub_80AA280
+ ldrh r0, [r5, 0x32]
+ lsls r0, 24
+ lsrs r0, 24
+ bl sub_80AA658
+ pop {r4,r5}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_080AAC54: .4byte gScriptContestCategory
+_080AAC58: .4byte gScriptContestRank
+ thumb_func_end sub_80AABF0
+*/
+
+/*
+ thumb_func_start sub_80AA754
+sub_80AA754: @ 80AA754
+ push {r4,lr}
+ adds r4, r0, 0
+ ldr r0, _080AA774 @ =gMain
+ ldrh r1, [r0, 0x30]
+ cmp r1, 0x20
+ beq _080AA7A2
+ cmp r1, 0x20
+ bgt _080AA782
+ cmp r1, 0x2
+ beq _080AA7F8
+ cmp r1, 0x2
+ bgt _080AA778
+ cmp r1, 0x1
+ beq _080AA7D8
+ b _080AA870
+ .align 2, 0
+_080AA774: .4byte gMain
+_080AA778:
+ cmp r1, 0x8
+ beq _080AA868
+ cmp r1, 0x10
+ beq _080AA7A2
+ b _080AA870
+_080AA782:
+ cmp r1, 0x80
+ beq _080AA7C2
+ cmp r1, 0x80
+ bgt _080AA790
+ cmp r1, 0x40
+ beq _080AA7AC
+ b _080AA870
+_080AA790:
+ movs r0, 0x80
+ lsls r0, 1
+ cmp r1, r0
+ beq _080AA814
+ movs r0, 0x80
+ lsls r0, 2
+ cmp r1, r0
+ beq _080AA834
+ b _080AA870
+_080AA7A2:
+ ldrh r0, [r4, 0x2E]
+ movs r1, 0x1
+ eors r0, r1
+ strh r0, [r4, 0x2E]
+ b _080AA870
+_080AA7AC:
+ ldrh r1, [r4, 0x30]
+ movs r2, 0x30
+ ldrsh r0, [r4, r2]
+ cmp r0, 0
+ bne _080AA7BC
+ movs r0, 0x8
+ strh r0, [r4, 0x30]
+ b _080AA870
+_080AA7BC:
+ subs r0, r1, 0x1
+ strh r0, [r4, 0x30]
+ b _080AA870
+_080AA7C2:
+ ldrh r1, [r4, 0x30]
+ movs r3, 0x30
+ ldrsh r0, [r4, r3]
+ cmp r0, 0x8
+ bne _080AA7D2
+ movs r0, 0
+ strh r0, [r4, 0x30]
+ b _080AA870
+_080AA7D2:
+ adds r0, r1, 0x1
+ strh r0, [r4, 0x30]
+ b _080AA870
+_080AA7D8:
+ ldr r2, _080AA7F4 @ =gUnknown_083C92E4
+ movs r1, 0x2E
+ ldrsh r0, [r4, r1]
+ lsls r0, 2
+ movs r3, 0x30
+ ldrsh r1, [r4, r3]
+ lsls r1, 3
+ adds r0, r1
+ adds r0, r2
+ ldr r2, [r0]
+ adds r0, r4, 0
+ movs r1, 0x1
+ b _080AA84E
+ .align 2, 0
+_080AA7F4: .4byte gUnknown_083C92E4
+_080AA7F8:
+ ldr r1, _080AA810 @ =gUnknown_083C92E4
+ movs r0, 0x2E
+ ldrsh r2, [r4, r0]
+ lsls r2, 2
+ movs r3, 0x30
+ ldrsh r0, [r4, r3]
+ lsls r0, 3
+ adds r2, r0
+ adds r2, r1
+ movs r1, 0x1
+ negs r1, r1
+ b _080AA84A
+ .align 2, 0
+_080AA810: .4byte gUnknown_083C92E4
+_080AA814:
+ ldr r2, _080AA830 @ =gUnknown_083C92E4
+ movs r1, 0x2E
+ ldrsh r0, [r4, r1]
+ lsls r0, 2
+ movs r3, 0x30
+ ldrsh r1, [r4, r3]
+ lsls r1, 3
+ adds r0, r1
+ adds r0, r2
+ ldr r2, [r0]
+ adds r0, r4, 0
+ movs r1, 0xA
+ b _080AA84E
+ .align 2, 0
+_080AA830: .4byte gUnknown_083C92E4
+_080AA834:
+ ldr r1, _080AA864 @ =gUnknown_083C92E4
+ movs r0, 0x2E
+ ldrsh r2, [r4, r0]
+ lsls r2, 2
+ movs r3, 0x30
+ ldrsh r0, [r4, r3]
+ lsls r0, 3
+ adds r2, r0
+ adds r2, r1
+ movs r1, 0xA
+ negs r1, r1
+_080AA84A:
+ ldr r2, [r2]
+ adds r0, r4, 0
+_080AA84E:
+ bl _call_via_r2
+ ldrh r0, [r4, 0x32]
+ lsls r0, 24
+ lsrs r0, 24
+ ldrh r1, [r4, 0x34]
+ lsls r1, 24
+ lsrs r1, 24
+ bl sub_80AA614
+ b _080AA870
+ .align 2, 0
+_080AA864: .4byte gUnknown_083C92E4
+_080AA868:
+ adds r0, r4, 0
+ movs r1, 0x1
+ bl sub_80AAD08
+_080AA870:
+ ldr r2, _080AA898 @ =gUnknown_083C9296
+ movs r0, 0x2E
+ ldrsh r1, [r4, r0]
+ movs r3, 0x30
+ ldrsh r0, [r4, r3]
+ lsls r0, 1
+ adds r1, r0
+ adds r1, r2
+ ldrb r0, [r1]
+ strh r0, [r4, 0x20]
+ ldr r1, _080AA89C @ =gUnknown_083C92A8
+ movs r2, 0x30
+ ldrsh r0, [r4, r2]
+ adds r0, r1
+ ldrb r0, [r0]
+ strh r0, [r4, 0x22]
+ pop {r4}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_080AA898: .4byte gUnknown_083C9296
+_080AA89C: .4byte gUnknown_083C92A8
+ thumb_func_end sub_80AA754
+*/
diff --git a/sym_ewram.txt b/sym_ewram.txt
index ae42fe7ad..eb71c9938 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -739,12 +739,13 @@ gUnknown_02038568: @ 2038568
gUnknown_0203856C: @ 203856C
.space 0x4
-gUnknown_02038570: @ 2038570
+gContestMons: @ 2038570
.space 0xD
gUnknown_0203857D: @ 203857D
.space 0x11
+ @ contest move space
gUnknown_0203858E: @ 203858E
.space 0x8
@@ -769,7 +770,7 @@ gUnknown_02038690: @ 2038690
gUnknown_02038694: @ 2038694
.space 0x1
-gUnknown_02038695: @ 2038695
+gContestPlayerMonIndex: @ 2038695
.space 0x1
gUnknown_02038696: @ 2038696
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 01:38:41 +0000