diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_anim_80FE840.s | 18 | ||||
-rwxr-xr-x | asm/battle_frontier_2.s | 12 | ||||
-rw-r--r-- | asm/contest.s | 4 | ||||
-rw-r--r-- | asm/intro.s | 58 | ||||
-rwxr-xr-x | asm/item_menu.s | 6 | ||||
-rwxr-xr-x | asm/party_menu.s | 6 | ||||
-rw-r--r-- | asm/pokedex.s | 28 | ||||
-rwxr-xr-x | asm/pokemon_summary_screen.s | 2 | ||||
-rwxr-xr-x | asm/rayquaza_scene.s | 62 | ||||
-rw-r--r-- | asm/roulette.s | 2 |
10 files changed, 99 insertions, 99 deletions
diff --git a/asm/battle_anim_80FE840.s b/asm/battle_anim_80FE840.s index 75879519e..1055c8944 100644 --- a/asm/battle_anim_80FE840.s +++ b/asm/battle_anim_80FE840.s @@ -14567,7 +14567,7 @@ _08105CCC: lsls r2, 1 adds r0, r2 str r1, [r0] - ldr r0, =gUnknown_08C22610 + ldr r0, =gBattleAnimSpritePalette_206 bl LZDecompressWram movs r4, 0 _08105D00: @@ -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/battle_frontier_2.s b/asm/battle_frontier_2.s index fc5aaf958..1909a7a02 100755 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -189,7 +189,7 @@ _0819A69C: bl ResetSpriteData bl ResetTasks bl FreeAllSpritePalettes - ldr r0, =gUnknown_08DC0754 + ldr r0, =gFrontierFactorySelectMenu_Gfx ldr r5, =gUnknown_0203CE2C ldr r1, [r5] movs r2, 0x88 @@ -211,7 +211,7 @@ _0819A69C: movs r2, 0x60 movs r3, 0 bl LoadBgTiles - ldr r0, =gUnknown_08DC0B94 + ldr r0, =gFrontierFactorySelectMenu_Tilemap ldr r4, =gUnknown_0203CE34 ldr r1, [r4] movs r2, 0x80 @@ -223,7 +223,7 @@ _0819A69C: movs r0, 0x1 movs r3, 0 bl LoadBgTilemap - ldr r0, =gUnknown_08DC0714 + ldr r0, =gFrontierFactorySelectMenu_Pal movs r1, 0 movs r2, 0x40 bl LoadPalette @@ -6646,7 +6646,7 @@ _0819DDA8: bl ResetTasks bl FreeAllSpritePalettes bl dp13_810BB8C - ldr r0, =gUnknown_08DC0754 + ldr r0, =gFrontierFactorySelectMenu_Gfx ldr r5, =gUnknown_0203CE40 ldr r1, [r5] movs r2, 0x88 @@ -6668,7 +6668,7 @@ _0819DDA8: movs r2, 0x60 movs r3, 0 bl LoadBgTiles - ldr r0, =gUnknown_08DC0B94 + ldr r0, =gFrontierFactorySelectMenu_Tilemap ldr r4, =gUnknown_0203CE48 ldr r1, [r4] movs r2, 0x80 @@ -6680,7 +6680,7 @@ _0819DDA8: movs r0, 0x1 movs r3, 0 bl LoadBgTilemap - ldr r0, =gUnknown_08DC0714 + ldr r0, =gFrontierFactorySelectMenu_Pal movs r1, 0 movs r2, 0x40 bl LoadPalette diff --git a/asm/contest.s b/asm/contest.s index 5749350c7..7577826cf 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -6652,7 +6652,7 @@ sub_80DB0C4: @ 80DB0C4 push {r4,r5,lr} ldr r0, =gUnknown_08587C00 bl LoadCompressedObjectPic - ldr r0, =gUnknown_08C1C6B8 + ldr r0, =gContest2Pal movs r1, 0x88 lsls r1, 1 movs r2, 0x20 @@ -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 diff --git a/asm/item_menu.s b/asm/item_menu.s index 49f587939..9aedd3f5b 100755 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -637,7 +637,7 @@ _081AB0E8: .4byte _081AB1A8 _081AB0FC: bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D9A620 + ldr r1, =gBagScreen_Gfx movs r0, 0 str r0, [sp] movs r0, 0x2 @@ -670,14 +670,14 @@ _081AB13C: ldrb r0, [r0, 0x8] cmp r0, 0 beq _081AB164 - ldr r0, =gUnknown_08D9A5D4 + ldr r0, =gBagScreenFemale_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette b _081AB1AE .pool _081AB164: - ldr r0, =gUnknown_08D9A588 + ldr r0, =gBagScreenMale_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette diff --git a/asm/party_menu.s b/asm/party_menu.s index 4a70ab1da..a336b5d63 100755 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -487,7 +487,7 @@ _081B05F0: .4byte _081B0694 _081B0610: ldr r4, =gUnknown_0203CEE0 - ldr r0, =gUnknown_08D967EC + ldr r0, =gPartyMenuMisc_Gfx mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -505,14 +505,14 @@ _081B0638: lsls r0, 24 cmp r0, 0 bne _081B06B4 - ldr r0, =gUnknown_08D96BA0 + ldr r0, =gPartyMenuMisc_Tilemap ldr r1, =gUnknown_0203CEE4 ldr r1, [r1] bl LZDecompressWram b _081B069A .pool _081B0658: - ldr r0, =gUnknown_08D96AB4 + ldr r0, =gPartyMenuMisc_Pal movs r2, 0xB0 lsls r2, 1 movs r1, 0 diff --git a/asm/pokedex.s b/asm/pokedex.s index ac35c3f7b..147f8921b 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -2054,7 +2054,7 @@ _080BC56E: adds r1, r0, 0 movs r0, 0 bl SetBgTilemapBuffer - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 str r6, [sp] @@ -2291,14 +2291,14 @@ sub_80BC844: @ 80BC844 lsrs r0, 24 cmp r0, 0x1 bne _080BC858 - ldr r0, =gUnknown_08DC17B6 + ldr r0, =gPokedexHoennBg_Pal + 0x2 b _080BC862 .pool _080BC858: bl IsNationalPokedexEnabled cmp r0, 0 bne _080BC870 - ldr r0, =gUnknown_08DC16F4 + 2 + ldr r0, =gPokedexText_Pal + 2 _080BC862: movs r1, 0x1 movs r2, 0xBE @@ -2306,7 +2306,7 @@ _080BC862: b _080BC87A .pool _080BC870: - ldr r0, =gUnknown_08DC1876 + ldr r0, =gPokedexNationalBg_Pal + 0x2 movs r1, 0x1 movs r2, 0xBE bl LoadPalette @@ -6369,7 +6369,7 @@ _080BEACA: b _080BEDA0 .pool _080BEAF0: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -7257,7 +7257,7 @@ _080BF2B6: b _080BF5B2 .pool _080BF310: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -7856,7 +7856,7 @@ _080BF88E: b _080BFB94 .pool _080BF8D8: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -8543,7 +8543,7 @@ _080BFE92: b _080C0074 .pool _080BFF0C: - ldr r1, =gUnknown_08DC1934 + ldr r1, =gPokedexMenu_Gfx movs r2, 0x80 lsls r2, 6 movs r0, 0 @@ -8751,14 +8751,14 @@ _080C00E8: ands r1, r0 cmp r1, 0 beq _080C0114 - ldr r0, =gUnknown_08DC16F4 + 2 + ldr r0, =gPokedexText_Pal + 2 movs r1, 0x31 movs r2, 0xE bl LoadPalette b _080C011E .pool _080C0114: - ldr r0, =gUnknown_08DC1756 + ldr r0, =gPokedexCaughtScreenFade_Pal + 0x2 movs r1, 0x31 movs r2, 0xE bl LoadPalette @@ -11135,7 +11135,7 @@ _080C1332: bl DeactivateAllTextPrinters movs r0, 0 bl PutWindowTilemap - ldr r1, =gUnknown_08DC3304 + ldr r1, =gPokedexSearchMenu_Gfx movs r2, 0x80 lsls r2, 6 str r5, [sp] @@ -11145,7 +11145,7 @@ _080C1332: bl IsNationalPokedexEnabled cmp r0, 0 bne _080C13E4 - ldr r1, =gUnknown_08DC3A0C + ldr r1, =gPokedexSearch2_Tilemap movs r0, 0x3 movs r2, 0 movs r3, 0 @@ -11153,13 +11153,13 @@ _080C1332: b _080C13F0 .pool _080C13E4: - ldr r1, =gUnknown_08DC3870 + ldr r1, =gPokedexSearch1_Tilemap movs r0, 0x3 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer _080C13F0: - ldr r0, =gUnknown_08DC3286 + ldr r0, =gPokedexSearchMenu_Pal + 0x2 movs r1, 0x1 movs r2, 0x7E bl LoadPalette diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 5ae458d6d..51f322e1e 100755 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -2411,7 +2411,7 @@ _081C5264: .4byte _081C52D4 _081C5278: bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08D9A620 + ldr r1, =gBagScreen_Gfx movs r0, 0 str r0, [sp] movs r0, 0x2 diff --git a/asm/rayquaza_scene.s b/asm/rayquaza_scene.s index e6147333c..ab04d8660 100755 --- a/asm/rayquaza_scene.s +++ b/asm/rayquaza_scene.s @@ -1119,7 +1119,7 @@ sub_81D706C: @ 81D706C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA33C0 + ldr r1, =gRaySceneClouds_Gfx movs r0, 0 str r0, [sp] movs r2, 0 @@ -1130,22 +1130,22 @@ _081D7082: lsls r0, 24 cmp r0, 0 bne _081D7082 - ldr r0, =gUnknown_08DA3988 + ldr r0, =gRaySceneClouds2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA3824 + ldr r0, =gRaySceneClouds1_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA3A88 + ldr r0, =gRaySceneClouds3_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA37E8 + ldr r0, =gRaySceneClouds_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -2811,20 +2811,20 @@ sub_81D7E9C: @ 81D7E9C push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA33C0 + ldr r1, =gRaySceneClouds_Gfx movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA4F70 + ldr r1, =gRaySceneOvercast_Gfx str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA3C94 + ldr r1, =gRaySceneRayquaza_Gfx str r4, [sp] movs r0, 0x2 movs r2, 0 @@ -2835,22 +2835,22 @@ _081D7ED0: lsls r0, 24 cmp r0, 0 bne _081D7ED0 - ldr r0, =gUnknown_08DA3988 + ldr r0, =gRaySceneClouds2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA60B8 + ldr r0, =gRaySceneOvercast_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA4DEC + ldr r0, =gRaySceneRayquaza_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA4DA8 + ldr r0, =gRaySceneRayquaza_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -3354,14 +3354,14 @@ sub_81D8358: @ 81D8358 push {r4-r7,lr} sub sp, 0xC bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA7528 + ldr r1, =gRaySceneRayquazaLight_Gfx movs r4, 0 str r4, [sp] movs r0, 0 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA69BC + ldr r1, =gRaySceneOvercast2_Gfx str r4, [sp] movs r0, 0x1 movs r2, 0 @@ -3374,12 +3374,12 @@ _081D8380: lsrs r6, r0, 24 cmp r6, 0 bne _081D8380 - ldr r0, =gUnknown_08DA7AAC + ldr r0, =gRaySceneRayquazaLight_Tilemap ldr r5, =gUnknown_0203CF60 ldr r1, [r5] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA7784 + ldr r0, =gRaySceneOvercast2_Tilemap ldr r1, [r5] ldr r4, =0x00001804 adds r1, r4 @@ -3406,7 +3406,7 @@ _081D8380: ldr r2, =0x010000d0 adds r0, r7, 0 bl CpuFastSet - ldr r0, =gUnknown_08DA7744 + ldr r0, =gRaySceneOvercast2_Pal movs r1, 0 movs r2, 0x40 bl LoadCompressedPalette @@ -3961,20 +3961,20 @@ sub_81D88D0: @ 81D88D0 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DA80BC + ldr r1, =gRaySceneRayquazaChase_Gfx movs r4, 0 str r4, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA7EAC + ldr r1, =gRaySceneChaseStreaks_Gfx str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DA7C30 + ldr r1, =gRaySceneChaseBg_Gfx str r4, [sp] movs r0, 0x3 movs r2, 0 @@ -3985,27 +3985,27 @@ _081D8904: lsls r0, 24 cmp r0, 0 bne _081D8904 - ldr r0, =gUnknown_08DA8D6C + ldr r0, =gRayChaseRayquazaChase2_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DA8B40 + ldr r0, =gRayChaseRayquazaChase_Tilemap ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA7FB4 + ldr r0, =gRaySceneChaseStreaks_Tilemap ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA7D6C + ldr r0, =gRaySceneChaseBg_Tilemap ldr r1, [r4] ldr r2, =0x00001804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DA8E84 + ldr r0, =gRaySceneChase_Pal movs r1, 0 movs r2, 0x80 bl LoadCompressedPalette @@ -4407,14 +4407,14 @@ sub_81D8CC4: @ 81D8CC4 push {r4,lr} sub sp, 0x4 bl reset_temp_tile_data_buffers - ldr r1, =gUnknown_08DAAB24 + ldr r1, =gRaySceneHushRing_Gfx movs r4, 0 str r4, [sp] movs r0, 0x2 movs r2, 0 movs r3, 0 bl decompress_and_copy_tile_data_to_vram - ldr r1, =gUnknown_08DAA8B4 + ldr r1, =gRaySceneHushBg_Gfx str r4, [sp] movs r0, 0 movs r2, 0 @@ -4425,22 +4425,22 @@ _081D8CEA: lsls r0, 24 cmp r0, 0 bne _081D8CEA - ldr r0, =gUnknown_08DAAE54 + ldr r0, =gRaySceneHushRing_Tilemap ldr r4, =gUnknown_0203CF60 ldr r1, [r4] ldr r2, =0x00000804 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DAAC1C + ldr r0, =gRaySceneHushBg_Tilemap ldr r1, [r4] adds r1, 0x4 bl LZDecompressWram - ldr r0, =gUnknown_08DAAF98 + ldr r0, =gRaySceneHushRing_Map ldr r1, [r4] ldr r2, =0x00001004 adds r1, r2 bl LZDecompressWram - ldr r0, =gUnknown_08DAAFEC + ldr r0, =gRaySceneHushBg_Pal movs r1, 0 movs r2, 0x60 bl LoadCompressedPalette diff --git a/asm/roulette.s b/asm/roulette.s index 74a4d455b..bb1d5fed6 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -452,7 +452,7 @@ _08140662: lsls r2, 1 movs r1, 0 bl LoadPalette - ldr r1, =gUnknown_08DBC2E8 + ldr r1, =gRouletteMenuTiles movs r4, 0 str r4, [sp] movs r0, 0x1 |