summaryrefslogtreecommitdiff
path: root/src/party_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/party_menu.c')
-rw-r--r--src/party_menu.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/party_menu.c b/src/party_menu.c
index 8a3ce81d1..110453361 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -480,7 +480,7 @@ extern u16 gMoveToLearn;
extern u16 gUnknown_08E9A300[];
extern struct Coords8 const gUnknown_08376738[12][6];
extern u8 gUnknown_02039460[];
-extern struct Window gUnknown_03004210;
+extern struct Window gWindowTemplate_Contest_MoveDescription;
extern const u8 gPartyMenuMisc_Gfx[];
extern const u8 gPartyMenuMisc_Tilemap[];
@@ -678,8 +678,8 @@ bool8 InitPartyMenu(void)
gMain.state++;
break;
case 8:
- Text_InitWindowWithTemplate(&gUnknown_03004210, &gWindowTemplate_81E6C90);
- MultistepInitWindowTileData(&gUnknown_03004210, 1);
+ Text_InitWindowWithTemplate(&gWindowTemplate_Contest_MoveDescription, &gWindowTemplate_81E6C90);
+ MultistepInitWindowTileData(&gWindowTemplate_Contest_MoveDescription, 1);
gMain.state++;
break;
case 9:
@@ -2406,13 +2406,13 @@ void SwapValues_s16(s16 *a, s16 *b)
#ifdef NONMATCHING
void sub_806CF04(void)
{
- SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.unk4].pos1.x);
- SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.unk4].pos1.y);
- SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.unk4].pos2.x);
- SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.unk4].data[0]);
+ SwapValues_s16(&gSprites[ewram01000.unk3].pos1.x, &gSprites[ewram01000.round1Points].pos1.x);
+ SwapValues_s16(&gSprites[ewram01000.unk3].pos1.y, &gSprites[ewram01000.round1Points].pos1.y);
+ SwapValues_s16(&gSprites[ewram01000.unk3].pos2.x, &gSprites[ewram01000.round1Points].pos2.x);
+ SwapValues_s16(&gSprites[ewram01000.unk3].data[0], &gSprites[ewram01000.round1Points].data[0]);
gSprites[ewram01000.unk3].callback = SpriteCB_sub_806D37C;
- gSprites[ewram01000.unk4].callback = SpriteCB_sub_806D37C;
+ gSprites[ewram01000.round1Points].callback = SpriteCB_sub_806D37C;
}
#else
NAKED
@@ -2710,7 +2710,7 @@ void sub_806D5B8(u8 monIndex)
u8 right = gUnknown_08376948[IsDoubleBattle()][monIndex].right;
u8 bottom = gUnknown_08376948[IsDoubleBattle()][monIndex].bottom;
- Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom);
+ Text_EraseWindowRect(&gWindowTemplate_Contest_MoveDescription, left, top, right, bottom);
var1 = 0;
CpuFastSet(&var1, OBJ_VRAM1 + monIndex * 0x400, 0x1000100);
@@ -2724,7 +2724,7 @@ void sub_806D668(u8 monIndex)
u8 right = gUnknown_08376978[IsDoubleBattle()][monIndex].right;
u8 bottom = gUnknown_08376978[IsDoubleBattle()][monIndex].bottom;
- Text_EraseWindowRect(&gUnknown_03004210, left, top, right, bottom);
+ Text_EraseWindowRect(&gWindowTemplate_Contest_MoveDescription, left, top, right, bottom);
var1 = 0;
CpuFastSet(&var1, OBJ_VRAM1 + 0x300 + monIndex * 0x400, 0x1000040);