diff --git a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s index 7f370c5b9..a7ee16d55 100644 --- a/asm/non_matchings/code_80091750/add_8018D9E0_entry.s +++ b/asm/non_matchings/code_80091750/add_8018D9E0_entry.s @@ -864,10 +864,10 @@ glabel L8009F264 /* 09FEF4 8009F2F4 10600006 */ beqz $v1, .L8009F310 /* 09FEF8 8009F2F8 3C04800F */ lui $a0, %hi(D_800E8320) # 0x800f /* 09FEFC 8009F2FC 00051880 */ sll $v1, $a1, 2 -/* 09FF00 8009F300 3C04800F */ lui $a0, %hi(D_800E8420) # 0x800f +/* 09FF00 8009F300 3C04800F */ lui $a0, %hi(gCharacterDefeatAnimation) # 0x800f /* 09FF04 8009F304 00832021 */ addu $a0, $a0, $v1 /* 09FF08 8009F308 10000004 */ b .L8009F31C -/* 09FF0C 8009F30C 8C848420 */ lw $a0, %lo(D_800E8420)($a0) # -0x7be0($a0) +/* 09FF0C 8009F30C 8C848420 */ lw $a0, %lo(gCharacterDefeatAnimation)($a0) # -0x7be0($a0) .L8009F310: /* 09FF10 8009F310 00051880 */ sll $v1, $a1, 2 /* 09FF14 8009F314 00832021 */ addu $a0, $a0, $v1 @@ -1037,10 +1037,10 @@ glabel L8009F530 /* 0A0168 8009F568 10400006 */ beqz $v0, .L8009F584 /* 0A016C 8009F56C 00051880 */ sll $v1, $a1, 2 /* 0A0170 8009F570 00051880 */ sll $v1, $a1, 2 -/* 0A0174 8009F574 3C04800F */ lui $a0, %hi(D_800E8420) # 0x800f +/* 0A0174 8009F574 3C04800F */ lui $a0, %hi(gCharacterDefeatAnimation) # 0x800f /* 0A0178 8009F578 00832021 */ addu $a0, $a0, $v1 /* 0A017C 8009F57C 10000004 */ b .L8009F590 -/* 0A0180 8009F580 8C848420 */ lw $a0, %lo(D_800E8420)($a0) # -0x7be0($a0) +/* 0A0180 8009F580 8C848420 */ lw $a0, %lo(gCharacterDefeatAnimation)($a0) # -0x7be0($a0) .L8009F584: /* 0A0184 8009F584 3C04800F */ lui $a0, %hi(D_800E8320) # 0x800f /* 0A0188 8009F588 00832021 */ addu $a0, $a0, $v1 diff --git a/asm/non_matchings/code_80091750/func_800AA69C.s b/asm/non_matchings/code_80091750/func_800AA69C.s index 24401cac5..1cef28e68 100644 --- a/asm/non_matchings/code_80091750/func_800AA69C.s +++ b/asm/non_matchings/code_80091750/func_800AA69C.s @@ -32,11 +32,11 @@ glabel L800AA6F4 /* 0AB308 800AA708 1080000D */ beqz $a0, .L800AA740 /* 0AB30C 800AA70C 24180001 */ li $t8, 1 /* 0AB310 800AA710 0005C880 */ sll $t9, $a1, 2 -/* 0AB314 800AA714 3C04800F */ lui $a0, %hi(D_800E8380) # 0x800f +/* 0AB314 800AA714 3C04800F */ lui $a0, %hi(gCharacterCelebrateAnimation) # 0x800f /* 0AB318 800AA718 AE180008 */ sw $t8, 8($s0) /* 0AB31C 800AA71C 00992021 */ addu $a0, $a0, $t9 /* 0AB320 800AA720 0C026455 */ jal segmented_to_virtual_dupe -/* 0AB324 800AA724 8C848380 */ lw $a0, %lo(D_800E8380)($a0) # -0x7c80($a0) +/* 0AB324 800AA724 8C848380 */ lw $a0, %lo(gCharacterCelebrateAnimation)($a0) # -0x7c80($a0) /* 0AB328 800AA728 8E040018 */ lw $a0, 0x18($s0) /* 0AB32C 800AA72C 00002825 */ move $a1, $zero /* 0AB330 800AA730 0C026965 */ jal func_8009A594 @@ -54,11 +54,11 @@ glabel L800AA6F4 /* 0AB358 800AA758 00401825 */ move $v1, $v0 /* 0AB35C 800AA75C 24080004 */ li $t0, 4 /* 0AB360 800AA760 00054880 */ sll $t1, $a1, 2 -/* 0AB364 800AA764 3C04800F */ lui $a0, %hi(D_800E83E0) # 0x800f +/* 0AB364 800AA764 3C04800F */ lui $a0, %hi(gCharacterSingleBlinkAnimation) # 0x800f /* 0AB368 800AA768 AE080008 */ sw $t0, 8($s0) /* 0AB36C 800AA76C 00892021 */ addu $a0, $a0, $t1 /* 0AB370 800AA770 0C026455 */ jal segmented_to_virtual_dupe -/* 0AB374 800AA774 8C8483E0 */ lw $a0, %lo(D_800E83E0)($a0) # -0x7c20($a0) +/* 0AB374 800AA774 8C8483E0 */ lw $a0, %lo(gCharacterSingleBlinkAnimation)($a0) # -0x7c20($a0) /* 0AB378 800AA778 8E040018 */ lw $a0, 0x18($s0) /* 0AB37C 800AA77C 00002825 */ move $a1, $zero /* 0AB380 800AA780 0C026965 */ jal func_8009A594 @@ -70,11 +70,11 @@ glabel L800AA6F4 /* 0AB394 800AA794 142000BC */ bnez $at, .L800AAA88 /* 0AB398 800AA798 240A0005 */ li $t2, 5 /* 0AB39C 800AA79C 00055880 */ sll $t3, $a1, 2 -/* 0AB3A0 800AA7A0 3C04800F */ lui $a0, %hi(D_800E8400) # 0x800f +/* 0AB3A0 800AA7A0 3C04800F */ lui $a0, %hi(gCharacterDoubleBlinkAnimation) # 0x800f /* 0AB3A4 800AA7A4 AE0A0008 */ sw $t2, 8($s0) /* 0AB3A8 800AA7A8 008B2021 */ addu $a0, $a0, $t3 /* 0AB3AC 800AA7AC 0C026455 */ jal segmented_to_virtual_dupe -/* 0AB3B0 800AA7B0 8C848400 */ lw $a0, %lo(D_800E8400)($a0) # -0x7c00($a0) +/* 0AB3B0 800AA7B0 8C848400 */ lw $a0, %lo(gCharacterDoubleBlinkAnimation)($a0) # -0x7c00($a0) /* 0AB3B4 800AA7B4 8E040018 */ lw $a0, 0x18($s0) /* 0AB3B8 800AA7B8 00002825 */ move $a1, $zero /* 0AB3BC 800AA7BC 0C026965 */ jal func_8009A594 @@ -115,10 +115,10 @@ glabel L800AA7CC /* 0AB440 800AA840 8FBF001C */ lw $ra, 0x1c($sp) /* 0AB444 800AA844 10800090 */ beqz $a0, .L800AAA88 /* 0AB448 800AA848 24080003 */ li $t0, 3 -/* 0AB44C 800AA84C 3C04800F */ lui $a0, %hi(D_800E83C0) # 0x800f +/* 0AB44C 800AA84C 3C04800F */ lui $a0, %hi(gCharacterDeselectAnimation) # 0x800f /* 0AB450 800AA850 AE080008 */ sw $t0, 8($s0) /* 0AB454 800AA854 00832021 */ addu $a0, $a0, $v1 -/* 0AB458 800AA858 8C8483C0 */ lw $a0, %lo(D_800E83C0)($a0) # -0x7c40($a0) +/* 0AB458 800AA858 8C8483C0 */ lw $a0, %lo(gCharacterDeselectAnimation)($a0) # -0x7c40($a0) /* 0AB45C 800AA85C 0C026455 */ jal segmented_to_virtual_dupe /* 0AB460 800AA860 AFA30024 */ sw $v1, 0x24($sp) /* 0AB464 800AA864 8E040018 */ lw $a0, 0x18($s0) @@ -146,11 +146,11 @@ glabel L800AA8A4 /* 0AB4B8 800AA8B8 10800073 */ beqz $a0, .L800AAA88 /* 0AB4BC 800AA8BC 240D0003 */ li $t5, 3 /* 0AB4C0 800AA8C0 00057080 */ sll $t6, $a1, 2 -/* 0AB4C4 800AA8C4 3C04800F */ lui $a0, %hi(D_800E83C0) # 0x800f +/* 0AB4C4 800AA8C4 3C04800F */ lui $a0, %hi(gCharacterDeselectAnimation) # 0x800f /* 0AB4C8 800AA8C8 AE0D0008 */ sw $t5, 8($s0) /* 0AB4CC 800AA8CC 008E2021 */ addu $a0, $a0, $t6 /* 0AB4D0 800AA8D0 0C026455 */ jal segmented_to_virtual_dupe -/* 0AB4D4 800AA8D4 8C8483C0 */ lw $a0, %lo(D_800E83C0)($a0) # -0x7c40($a0) +/* 0AB4D4 800AA8D4 8C8483C0 */ lw $a0, %lo(gCharacterDeselectAnimation)($a0) # -0x7c40($a0) /* 0AB4D8 800AA8D8 8E040018 */ lw $a0, 0x18($s0) /* 0AB4DC 800AA8DC 00002825 */ move $a1, $zero /* 0AB4E0 800AA8E0 0C026965 */ jal func_8009A594 @@ -192,10 +192,10 @@ glabel L800AA8F0 /* 0AB568 800AA968 8FBF001C */ lw $ra, 0x1c($sp) /* 0AB56C 800AA96C 10800046 */ beqz $a0, .L800AAA88 /* 0AB570 800AA970 240B0001 */ li $t3, 1 -/* 0AB574 800AA974 3C04800F */ lui $a0, %hi(D_800E8380) # 0x800f +/* 0AB574 800AA974 3C04800F */ lui $a0, %hi(gCharacterCelebrateAnimation) # 0x800f /* 0AB578 800AA978 AE0B0008 */ sw $t3, 8($s0) /* 0AB57C 800AA97C 00832021 */ addu $a0, $a0, $v1 -/* 0AB580 800AA980 8C848380 */ lw $a0, %lo(D_800E8380)($a0) # -0x7c80($a0) +/* 0AB580 800AA980 8C848380 */ lw $a0, %lo(gCharacterCelebrateAnimation)($a0) # -0x7c80($a0) /* 0AB584 800AA984 0C026455 */ jal segmented_to_virtual_dupe /* 0AB588 800AA988 AFA70020 */ sw $a3, 0x20($sp) /* 0AB58C 800AA98C 8E040018 */ lw $a0, 0x18($s0) @@ -222,11 +222,11 @@ glabel L800AA9C4 /* 0AB5DC 800AA9DC 1080000D */ beqz $a0, .L800AAA14 /* 0AB5E0 800AA9E0 24180001 */ li $t8, 1 /* 0AB5E4 800AA9E4 0005C880 */ sll $t9, $a1, 2 -/* 0AB5E8 800AA9E8 3C04800F */ lui $a0, %hi(D_800E8380) # 0x800f +/* 0AB5E8 800AA9E8 3C04800F */ lui $a0, %hi(gCharacterCelebrateAnimation) # 0x800f /* 0AB5EC 800AA9EC AE180008 */ sw $t8, 8($s0) /* 0AB5F0 800AA9F0 00992021 */ addu $a0, $a0, $t9 /* 0AB5F4 800AA9F4 0C026455 */ jal segmented_to_virtual_dupe -/* 0AB5F8 800AA9F8 8C848380 */ lw $a0, %lo(D_800E8380)($a0) # -0x7c80($a0) +/* 0AB5F8 800AA9F8 8C848380 */ lw $a0, %lo(gCharacterCelebrateAnimation)($a0) # -0x7c80($a0) /* 0AB5FC 800AA9FC 8E040018 */ lw $a0, 0x18($s0) /* 0AB600 800AAA00 00002825 */ move $a1, $zero /* 0AB604 800AAA04 0C026965 */ jal func_8009A594 diff --git a/asm/non_matchings/code_80091750/func_800ACF40.s b/asm/non_matchings/code_80091750/func_800ACF40.s index d7a67a02b..9f702199e 100644 --- a/asm/non_matchings/code_80091750/func_800ACF40.s +++ b/asm/non_matchings/code_80091750/func_800ACF40.s @@ -99,9 +99,9 @@ glabel L800AD01C /* 0ADCAC 800AD0AC 2B210002 */ slti $at, $t9, 2 /* 0ADCB0 800AD0B0 14200037 */ bnez $at, .L800AD190 /* 0ADCB4 800AD0B4 00054080 */ sll $t0, $a1, 2 -/* 0ADCB8 800AD0B8 3C04800F */ lui $a0, %hi(D_800E8380) # 0x800f +/* 0ADCB8 800AD0B8 3C04800F */ lui $a0, %hi(gCharacterCelebrateAnimation) # 0x800f /* 0ADCBC 800AD0BC 00882021 */ addu $a0, $a0, $t0 -/* 0ADCC0 800AD0C0 8C848380 */ lw $a0, %lo(D_800E8380)($a0) # -0x7c80($a0) +/* 0ADCC0 800AD0C0 8C848380 */ lw $a0, %lo(gCharacterCelebrateAnimation)($a0) # -0x7c80($a0) /* 0ADCC4 800AD0C4 0C026455 */ jal segmented_to_virtual_dupe /* 0ADCC8 800AD0C8 AFA60038 */ sw $a2, 0x38($sp) /* 0ADCCC 800AD0CC 8FA60038 */ lw $a2, 0x38($sp) diff --git a/asm/non_matchings/code_80091750/func_800AF270.s b/asm/non_matchings/code_80091750/func_800AF270.s index 9f4684c82..657fa0ced 100644 --- a/asm/non_matchings/code_80091750/func_800AF270.s +++ b/asm/non_matchings/code_80091750/func_800AF270.s @@ -67,7 +67,7 @@ glabel L800AF34C /* 0AFF68 800AF368 0002C080 */ sll $t8, $v0, 2 /* 0AFF6C 800AF36C 29810003 */ slti $at, $t4, 3 /* 0AFF70 800AF370 1420000F */ bnez $at, .L800AF3B0 -/* 0AFF74 800AF374 3C04800F */ lui $a0, %hi(D_800E8380) # 0x800f +/* 0AFF74 800AF374 3C04800F */ lui $a0, %hi(gCharacterCelebrateAnimation) # 0x800f /* 0AFF78 800AF378 240D0004 */ li $t5, 4 /* 0AFF7C 800AF37C 0C03282E */ jal func_800CA0B8 /* 0AFF80 800AF380 AE0D0004 */ sw $t5, 4($s0) @@ -86,7 +86,7 @@ glabel L800AF34C /* 0AFFB0 800AF3B0 AE0F0004 */ sw $t7, 4($s0) /* 0AFFB4 800AF3B4 00982021 */ addu $a0, $a0, $t8 /* 0AFFB8 800AF3B8 0C026455 */ jal segmented_to_virtual_dupe -/* 0AFFBC 800AF3BC 8C848380 */ lw $a0, %lo(D_800E8380)($a0) # -0x7c80($a0) +/* 0AFFBC 800AF3BC 8C848380 */ lw $a0, %lo(gCharacterCelebrateAnimation)($a0) # -0x7c80($a0) /* 0AFFC0 800AF3C0 8E040018 */ lw $a0, 0x18($s0) /* 0AFFC4 800AF3C4 00002825 */ move $a1, $zero /* 0AFFC8 800AF3C8 8FA60030 */ lw $a2, 0x30($sp) diff --git a/data/data_0DD0A0_2.s b/data/data_0DD0A0_2.s index 6c70f0ede..db2bcbe99 100644 --- a/data/data_0DD0A0_2.s +++ b/data/data_0DD0A0_2.s @@ -2164,35 +2164,30 @@ glabel D_800E8360 .word D_020068F0, D_02006CC0, D_02006EA8, D_02007090 .word D_02007280, D_02007468, D_02006AD8 -glabel D_800E8380 -.word D_02006718 -.word D_02006900, D_02006CD0, D_02006EB8, D_020070A0 -.word D_02007290, D_02007478, D_02006AE8 +glabel gCharacterCelebrateAnimation +.word D_02006718, D_02006900, D_02006CD0, D_02006EB8 +.word D_020070A0, D_02007290, D_02007478, D_02006AE8 glabel D_800E83A0 .word D_02006778 .word D_02006960, D_02006D30, D_02006F18, D_02007100 .word D_020072F0, D_020074D8, D_02006B48 -glabel D_800E83C0 -.word D_02006788 -.word D_02006970, D_02006D40, D_02006F28, D_02007110 -.word D_02007300, D_020074E8, D_02006B58 +glabel gCharacterDeselectAnimation +.word D_02006788, D_02006970, D_02006D40, D_02006F28 +.word D_02007110, D_02007300, D_020074E8, D_02006B58 -glabel D_800E83E0 -.word D_020067E0 -.word D_020069C8, D_02006D98, D_02006F80, D_02007170 -.word D_02007358, D_02007540, D_02006BB0 +glabel gCharacterSingleBlinkAnimation +.word D_020067E0, D_020069C8, D_02006D98, D_02006F80 +.word D_02007170, D_02007358, D_02007540, D_02006BB0 -glabel D_800E8400 -.word D_02006838 -.word D_02006A20, D_02006DF0, D_02006FD8, D_020071C8 -.word D_020073B0, D_02007598, D_02006C08 +glabel gCharacterDoubleBlinkAnimation +.word D_02006838, D_02006A20, D_02006DF0, D_02006FD8 +.word D_020071C8, D_020073B0, D_02007598, D_02006C08 -glabel D_800E8420 -.word D_020068E0 -.word D_02006AC8, D_02006E98, D_02007080, D_02007270 -.word D_02007458, D_02007640, D_02006CB0 +glabel gCharacterDefeatAnimation +.word D_020068E0, D_02006AC8, D_02006E98, D_02007080 +.word D_02007270, D_02007458, D_02007640, D_02006CB0 glabel D_800E8440 .word 0x0000000a, 0x0000000a, 0x0000000a, 0x0000000a diff --git a/src/code_80091750.c b/src/code_80091750.c index a9440eda4..c81ddf76c 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -7301,7 +7301,7 @@ static MkAnimation *D_800E8320[8] = { D_02007468, D_02006AD8, }; /* const */ -static MkAnimation *D_800E8420[8] = { +static MkAnimation *gCharacterDefeatAnimation[8] = { D_020068E0, D_02006AC8, D_02006E98, @@ -7789,7 +7789,7 @@ loop_3: } if (phi_v1_4 != 0) { phi_v1_5 = temp_a1 * 4; - phi_a0_2 = D_800E8420[temp_a1]; + phi_a0_2 = gCharacterDefeatAnimation[temp_a1]; } else { phi_v1_5 = temp_a1 * 4; phi_a0_2 = D_800E8320[temp_a1]; @@ -7848,7 +7848,7 @@ loop_3: phi_v1 = temp_a1_2 * 4; if (phi_v0_2 != 0) { phi_v1 = temp_a1_2 * 4; - phi_a0 = D_800E8420[temp_a1_2]; + phi_a0 = gCharacterDefeatAnimation[temp_a1_2]; } else { phi_a0 = D_800E8320[temp_a1_2]; } @@ -14102,7 +14102,7 @@ static MkAnimation *D_800E8360[8] = { D_02007468, D_02006AD8, }; /* const */ -static MkAnimation *D_800E8380[8] = { +static MkAnimation *gCharacterCelebrateAnimation[8] = { D_02006718, D_02006900, D_02006CD0, @@ -14122,7 +14122,7 @@ static MkAnimation *D_800E83A0[8] = { D_020074D8, D_02006B48, }; /* const */ -static MkAnimation *D_800E83C0[8] = { +static MkAnimation *gCharacterDeselectAnimation[8] = { D_02006788, D_02006970, D_02006D40, @@ -14132,7 +14132,7 @@ static MkAnimation *D_800E83C0[8] = { D_020074E8, D_02006B58, }; /* const */ -static MkAnimation *D_800E83E0[8] = { +static MkAnimation *gCharacterSingleBlinkAnimation[8] = { D_020067E0, D_020069C8, D_02006D98, @@ -14142,7 +14142,7 @@ static MkAnimation *D_800E83E0[8] = { D_02007540, D_02006BB0, }; /* const */ -static MkAnimation *D_800E8400[8] = { +static MkAnimation *gCharacterDoubleBlinkAnimation[8] = { D_02006838, D_02006A20, D_02006DF0, @@ -14187,19 +14187,19 @@ void func_800AA69C(struct_8018D9E0_entry *arg0) { case 0: if ((*(&D_8018EDE8 + temp_v0) != 0) && (phi_a0 != 0)) { arg0->unk8 = 1; - func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E8380[temp_a1])); + func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(gCharacterCelebrateAnimation[temp_a1])); return; } sp30 = temp_a1; temp_v0_2 = random_int(0xC8, temp_a1); if (temp_v0_2 >= 0xC6) { arg0->unk8 = 4; - func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E83E0[temp_a1])); + func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(gCharacterSingleBlinkAnimation[temp_a1])); return; } if (temp_v0_2 >= 0xC5) { arg0->unk8 = 5; - func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E8400[temp_a1])); + func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(gCharacterDoubleBlinkAnimation[temp_a1])); return; } default: @@ -14214,14 +14214,14 @@ void func_800AA69C(struct_8018D9E0_entry *arg0) { arg0->unk8 = 3; sp24 = temp_a1 * 4; temp_a0_2 = arg0->D_8018DEE0_index; - func_8009A594(temp_a0_2, D_800E8460[temp_a1] - *(&D_8018DEE4 + (temp_a0_2 * 0x18)), segmented_to_virtual_dupe(D_800E83C0[temp_a1])); + func_8009A594(temp_a0_2, D_800E8460[temp_a1] - *(&D_8018DEE4 + (temp_a0_2 * 0x18)), segmented_to_virtual_dupe(gCharacterDeselectAnimation[temp_a1])); return; } break; case 2: if ((*(&D_8018EDE8 + temp_v0) == 0) && (phi_a0 != 0)) { arg0->unk8 = 3; - func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E83C0[temp_a1])); + func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(gCharacterDeselectAnimation[temp_a1])); return; } break; @@ -14236,7 +14236,7 @@ void func_800AA69C(struct_8018D9E0_entry *arg0) { arg0->unk8 = 1; sp20 = temp_a3; temp_a0_3 = arg0->D_8018DEE0_index; - func_8009A594(temp_a0_3, *temp_a3 - *(&D_8018DEE4 + (temp_a0_3 * 0x18)), segmented_to_virtual_dupe(D_800E8380[temp_a1])); + func_8009A594(temp_a0_3, *temp_a3 - *(&D_8018DEE4 + (temp_a0_3 * 0x18)), segmented_to_virtual_dupe(gCharacterCelebrateAnimation[temp_a1])); return; } break; @@ -14244,7 +14244,7 @@ void func_800AA69C(struct_8018D9E0_entry *arg0) { case 5: if ((*(&D_8018EDE8 + temp_v0) != 0) && (phi_a0 != 0)) { arg0->unk8 = 1; - func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(D_800E8380[temp_a1])); + func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe(gCharacterCelebrateAnimation[temp_a1])); return; } if (temp_v1 == 4) { @@ -15940,7 +15940,7 @@ extern s8 D_8018EDF3; extern s32 gPlayerWinningIndex; static ? D_800E72F8; /* unable to generate initializer; const */ static ? D_800E7300; /* unable to generate initializer; const */ -static MkAnimation *D_800E8380[8] = { +static MkAnimation *gCharacterCelebrateAnimation[8] = { D_02006718, D_02006900, D_02006CD0, @@ -16026,7 +16026,7 @@ block_11: sp38 = temp_a2; if (find_8018D9E0_entry_dupe(0xB0)->unk4 >= 2) { sp38 = temp_a2; - func_8009A640(arg0->D_8018DEE0_index, 0, temp_a2, segmented_to_virtual_dupe(D_800E8380[temp_a1])); + func_8009A640(arg0->D_8018DEE0_index, 0, temp_a2, segmented_to_virtual_dupe(gCharacterCelebrateAnimation[temp_a1])); arg0->unk4 = 3; temp_a0 = temp_a2 & 0xFF; sp24 = temp_a0; @@ -17237,7 +17237,7 @@ struct _struct_D_800E7480_0x8 { extern ? D_8018DEE4; static struct _struct_D_800E7458_0x8 D_800E7458[0]; /* unable to generate initializer; const */ static struct _struct_D_800E7480_0x8 D_800E7480[0]; /* unable to generate initializer; const */ -static MkAnimation *D_800E8380[8] = { +static MkAnimation *gCharacterCelebrateAnimation[8] = { D_02006718, D_02006900, D_02006CD0, @@ -17306,7 +17306,7 @@ void func_800AF270(struct_8018D9E0_entry *arg0) { return; } arg0->unk4 = 3; - func_8009A640(arg0->D_8018DEE0_index, 0, sp30, segmented_to_virtual_dupe(D_800E8380[temp_v0])); + func_8009A640(arg0->D_8018DEE0_index, 0, sp30, segmented_to_virtual_dupe(gCharacterCelebrateAnimation[temp_v0])); func_800CA0B8(); func_800C90F4(0, (sp30 * 0x10) + 0x29008007); func_800CA0A0();