diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_anim_80FE840.s | 2 | ||||
| -rw-r--r-- | asm/intro.s | 18 | ||||
| -rw-r--r-- | asm/title_screen.s | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index f35b2f7da..441239162 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -21902,7 +21902,7 @@ _0810987E: muls r1, r3 lsls r1, 16 asrs r1, 16 - ldr r0, =gUnknown_085955CE + ldr r0, =gUnknown_085955CC+2 adds r2, r0 movs r3, 0 ldrsh r2, [r2, r3] diff --git a/asm/intro.s b/asm/intro.s index efd52e7fd..01ac2204b 100644 --- a/asm/intro.s +++ b/asm/intro.s @@ -376,11 +376,11 @@ task_intro_1: @ 816CF18 movs r0, 0x12 movs r1, 0x28 bl SetGpuReg - ldr r0, =gUnknown_085E13B4 + ldr r0, =gIntroLeavesBgGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, =gUnknown_085E07C4 + ldr r0, =gIntroLeavesForegroundTilemap ldr r1, =0x06008000 bl LZ77UnCompVram ldr r1, =0x06008800 @@ -393,7 +393,7 @@ task_intro_1: @ 816CF18 ldr r5, =0x81000400 str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E0B78 + ldr r0, =gIntroLeavesMidgroundTilemap ldr r1, =0x06009000 bl LZ77UnCompVram ldr r1, =0x06009800 @@ -403,7 +403,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E0EAC + ldr r0, =gIntroLeavesBgLeavesTilemap ldr r1, =0x0600a000 bl LZ77UnCompVram ldr r1, =0x0600a800 @@ -413,7 +413,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E119C + ldr r0, =gIntroLeavesBgMountainsTilemap ldr r1, =0x0600b000 bl LZ77UnCompVram ldr r1, =0x0600b800 @@ -423,7 +423,7 @@ task_intro_1: @ 816CF18 str r1, [r4, 0x4] str r5, [r4, 0x8] ldr r0, [r4, 0x8] - ldr r0, =gUnknown_085E05C4 + ldr r0, =gIntroLeavesPal movs r5, 0x80 lsls r5, 2 movs r1, 0 @@ -1779,14 +1779,14 @@ task_intro_10: @ 816DBAC lsls r5, 24 lsrs r5, 24 bl intro_reset_and_hide_bgs - ldr r0, =gUnknown_085E3854 + ldr r0, =gIntroBattlePokeBallGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram - ldr r0, =gUnknown_085E3724 + ldr r0, =gIntroBattlePokeBallTilemap ldr r1, =0x06004000 bl LZ77UnCompVram - ldr r0, =gUnknown_085E3524 + ldr r0, =gIntroBattlePokeBallPal movs r2, 0x80 lsls r2, 2 movs r1, 0 diff --git a/asm/title_screen.s b/asm/title_screen.s index 15037e80d..b2c0a4995 100644 --- a/asm/title_screen.s +++ b/asm/title_screen.s @@ -590,7 +590,7 @@ _080AA7E0: b _080AAB1E .pool _080AA8C4: - ldr r0, =gTitleScreenPokemonLogoTiles + ldr r0, =gTitleScreenPokemonLogoGfx movs r1, 0xC0 lsls r1, 19 bl LZ77UnCompVram @@ -602,13 +602,13 @@ _080AA8C4: lsls r2, 1 movs r1, 0 bl LoadPalette - ldr r0, =gTitleScreenRayquazaTiles + ldr r0, =gTitleScreenRayquazaGfx ldr r1, =0x06008000 bl LZ77UnCompVram - ldr r0, =gUnknown_0853F83C + ldr r0, =gTitleScreenRayquazaTilemap ldr r1, =0x0600d000 bl LZ77UnCompVram - ldr r0, =gTitleScreenCloudsTiles + ldr r0, =gTitleScreenCloudsGfx ldr r1, =0x0600c000 bl LZ77UnCompVram ldr r0, =gUnknown_08DDE458 @@ -627,7 +627,7 @@ _080AA8C4: bl LoadCompressedObjectPic ldr r0, =gUnknown_0854013C bl LoadCompressedObjectPic - ldr r0, =gUnknown_08DDE438 + ldr r0, =gTitleScreenEmeraldVersionPal movs r1, 0x80 lsls r1, 1 movs r2, 0x20 |