summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_anim_80FE840.s16
-rw-r--r--asm/contest.s2
-rw-r--r--asm/intro.s58
3 files changed, 38 insertions, 38 deletions
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s
index cd365d7af..1055c8944 100644
--- a/asm/battle_anim_80FE840.s
+++ b/asm/battle_anim_80FE840.s
@@ -15557,7 +15557,7 @@ _0810653A:
lsls r0, 24
cmp r0, 0
beq _08106578
- ldr r1, =gUnknown_08D93960
+ ldr r1, =gBattleAnimBackgroundTilemap_ScaryFaceContest
b _0810658A
.pool
_08106578:
@@ -15568,7 +15568,7 @@ _08106578:
lsrs r0, 24
cmp r0, 0x1
bne _0810659C
- ldr r1, =gUnknown_08D93598
+ ldr r1, =gBattleAnimBackgroundTilemap_ScaryFacePlayer
_0810658A:
mov r0, sp
movs r2, 0
@@ -15576,7 +15576,7 @@ _0810658A:
b _081065A6
.pool
_0810659C:
- ldr r1, =gUnknown_08D9377C
+ ldr r1, =gBattleAnimBackgroundTilemap_ScaryFaceOpponent
mov r0, sp
movs r2, 0
bl sub_80A6D60
@@ -18097,7 +18097,7 @@ _081079E0:
_081079EA:
mov r0, sp
ldrb r0, [r0, 0x9]
- ldr r1, =gUnknown_08D94AB8
+ ldr r1, =gBattleAnimBackgroundImage_Surf
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80A6CC0
@@ -18106,7 +18106,7 @@ _081079EA:
ldrsh r0, [r0, r1]
cmp r0, 0
bne _08107A24
- ldr r0, =gUnknown_08D95DD8
+ ldr r0, =gBattleAnimBackgroundPalette_Surf
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -18115,7 +18115,7 @@ _081079EA:
b _08107A32
.pool
_08107A24:
- ldr r0, =gUnknown_08D8FB9C
+ ldr r0, =gBattleAnimBackgroundImageMuddyWater_Pal
mov r1, sp
ldrb r1, [r1, 0x8]
lsls r1, 4
@@ -26969,7 +26969,7 @@ _0810C0E2:
mov r3, sp
ldrh r3, [r3, 0xA]
bl LoadBgTiles
- ldr r1, =gUnknown_08D932E0
+ ldr r1, =gBattleAnimFogTilemap
mov r0, sp
movs r2, 0
bl sub_80A6D60
@@ -27251,7 +27251,7 @@ _0810C366:
mov r3, sp
ldrh r3, [r3, 0xA]
bl LoadBgTiles
- ldr r1, =gUnknown_08D932E0
+ ldr r1, =gBattleAnimFogTilemap
mov r0, sp
movs r2, 0
bl sub_80A6D60
diff --git a/asm/contest.s b/asm/contest.s
index 1eb0834df..a07e57b89 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -11731,7 +11731,7 @@ _080DD956:
ldr r1, [r0]
movs r0, 0x13
ldrsb r0, [r1, r0]
- ldr r4, =gUnknown_08D8EC24
+ ldr r4, =gContestApplauseMeterGfx
cmp r5, r0
bge _080DD966
adds r4, 0x40
diff --git a/asm/intro.s b/asm/intro.s
index 32b52ed06..d9f6e558f 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -1945,24 +1945,24 @@ task_intro_13: @ 816DD28
ldr r1, =gReservedSpritePaletteCount
movs r0, 0x8
strb r0, [r1]
- ldr r0, =gUnknown_08D88494
+ ldr r0, =gIntro3GroudonGfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
- ldr r0, =gUnknown_08D88D40
+ ldr r0, =gIntro3GroudonTilemap
ldr r1, =0x0600c000
bl LZDecompressVram
- ldr r0, =gUnknown_08D89F7C
+ ldr r0, =gIntro3LegendBgGfx
ldr r1, =0x06004000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8A818
+ ldr r0, =gIntro3GroudonBgTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gBattleAnimPicTable + 0x1D0
bl LoadCompressedObjectPicUsingHeap
ldr r0, =gBattleAnimPaletteTable + 0x1D0
bl LoadCompressedObjectPaletteUsingHeap
- ldr r0, =gUnknown_08D85CD0
+ ldr r0, =gIntro3BgPal
ldr r1, =gPlttBufferUnfaded
movs r2, 0x80
lsls r2, 1
@@ -2229,7 +2229,7 @@ _0816DFF4:
strh r0, [r4, 0xC]
movs r1, 0xE
ldrsh r0, [r4, r1]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x3E
movs r2, 0x1
@@ -2271,7 +2271,7 @@ _0816E046:
strh r0, [r4, 0xC]
movs r2, 0xE
ldrsh r0, [r4, r2]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x3E
movs r2, 0x1
@@ -2571,14 +2571,14 @@ task_intro_19: @ 816E2A0
lsls r4, 24
lsrs r4, 24
bl ResetSpriteData
- ldr r0, =gUnknown_08D89224
+ ldr r0, =gIntro3KyogreGfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
- ldr r0, =gUnknown_08D89ABC
+ ldr r0, =gIntro3KyogreTilemap
ldr r1, =0x0600c000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8A934
+ ldr r0, =gIntro3KyogreBgTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r0, =gUnknown_085E4C88
@@ -2888,7 +2888,7 @@ _0816E56E:
strh r0, [r5, 0xC]
movs r2, 0xE
ldrsh r0, [r5, r2]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x5E
movs r2, 0x1
@@ -2932,7 +2932,7 @@ _0816E5BC:
strh r0, [r5, 0xC]
movs r2, 0xE
ldrsh r0, [r5, r2]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0x5E
movs r2, 0x1
@@ -3319,7 +3319,7 @@ task_intro_21: @ 816E888
movs r0, 0x1A
movs r1, 0
bl SetGpuReg
- ldr r4, =gUnknown_08D8AA54
+ ldr r4, =gIntro3CloudsGfx
movs r1, 0xC0
lsls r1, 19
adds r0, r4, 0
@@ -3327,7 +3327,7 @@ task_intro_21: @ 816E888
ldr r1, =0x06004000
adds r0, r4, 0
bl LZDecompressVram
- ldr r0, =gUnknown_08D8B6E8
+ ldr r0, =gIntro3Clouds3Tilemap
ldr r1, =0x0600e000
bl LZDecompressVram
ldr r1, =gTasks
@@ -3349,10 +3349,10 @@ task_intro_22: @ 816E954
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, =gUnknown_08D8B180
+ ldr r0, =gIntro3Clouds1Tilemap
ldr r1, =0x0600c000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8B440
+ ldr r0, =gIntro3Clouds2Tilemap
ldr r1, =0x0600d000
bl LZDecompressVram
ldr r1, =gTasks
@@ -3509,16 +3509,16 @@ task_intro_25: @ 816EAB8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, =gUnknown_08D8C16C
+ ldr r0, =gIntro3RayquazaTilemap
ldr r1, =0x0600e000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8CCC8
+ ldr r0, =gIntro3Clouds4Tilemap
ldr r1, =0x0600c000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8BA74
+ ldr r0, =gIntro3RayquazaGfx
ldr r1, =0x06004000
bl LZDecompressVram
- ldr r0, =gUnknown_08D8C838
+ ldr r0, =gIntro3Clouds2Gfx
movs r1, 0xC0
lsls r1, 19
bl LZDecompressVram
@@ -3725,7 +3725,7 @@ _0816ECA0:
_0816ECAC:
movs r1, 0x30
ldrsh r0, [r4, r1]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBA
movs r2, 0x1
@@ -3757,7 +3757,7 @@ _0816ECDC:
strh r0, [r4, 0x32]
movs r1, 0x30
ldrsh r0, [r4, r1]
- ldr r1, =gUnknown_08D85CD0
+ ldr r1, =gIntro3BgPal
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBA
movs r2, 0x1
@@ -4007,7 +4007,7 @@ _0816EEF4:
movs r2, 0x2
ldrsh r0, [r5, r2]
lsls r0, 1
- ldr r1, =gUnknown_08D85E72
+ ldr r1, =gIntro3BgPal + 0x1A2
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xBC
movs r2, 0x1
@@ -4043,7 +4043,7 @@ _0816EF34:
movs r1, 0x2
ldrsh r0, [r5, r1]
lsls r0, 1
- ldr r1, =gUnknown_08D85E72
+ ldr r1, =gIntro3BgPal + 0x1A2
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xB0
movs r2, 0x1
@@ -4080,7 +4080,7 @@ _0816EF80:
movs r1, 0x2
ldrsh r0, [r5, r1]
lsls r0, 1
- ldr r1, =gUnknown_08D85E52
+ ldr r1, =gIntro3BgPal + 0x182
adds r0, r1
ldr r1, =gPlttBufferFaded + 0xB8
movs r2, 0x1
@@ -4148,7 +4148,7 @@ _0816F00A:
movs r0, 0x50
movs r1, 0x10
bl BlendPalette
- ldr r4, =gUnknown_08D85E7C
+ ldr r4, =gIntro3BgPal + 0x1AC
ldr r5, =gPlttBufferFaded + 0xBC
adds r0, r4, 0
adds r1, r5, 0
@@ -5617,7 +5617,7 @@ _0816FBB4:
cmp r0, 0
beq _0816FC14
lsls r0, 1
- ldr r4, =gUnknown_08D85C50
+ ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
@@ -5651,7 +5651,7 @@ _0816FC14:
movs r1, 0x30
ldrsh r0, [r6, r1]
lsls r0, 1
- ldr r4, =gUnknown_08D85C50
+ ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0
@@ -5696,7 +5696,7 @@ _0816FC6C:
cmp r0, 0x9
bgt _0816FCE6
lsls r0, 1
- ldr r4, =gUnknown_08D85C50
+ ldr r4, =gIntro1GameFreakTextFadePal
adds r0, r4
ldr r5, =gPlttBufferFaded + 0x23E
adds r1, r5, 0