diff options
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_1.s | 24 | ||||
-rw-r--r-- | asm/battle_anim_80A22E8.s | 156 | ||||
-rw-r--r-- | asm/battle_anim_80DE2C0.s | 36 | ||||
-rw-r--r-- | asm/battle_anim_80EEC0C.s | 12 | ||||
-rw-r--r-- | asm/battle_gfx_sfx_util.s | 16 | ||||
-rw-r--r-- | asm/egg_hatch.s | 4 | ||||
-rw-r--r-- | asm/link.s | 8 | ||||
-rw-r--r-- | asm/party_menu.s | 8 | ||||
-rw-r--r-- | asm/pokeball.s | 4 | ||||
-rw-r--r-- | asm/trade.s | 12 |
10 files changed, 140 insertions, 140 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index e93a714eb..6215fc86e 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -298,7 +298,7 @@ LoadBattleTextboxAndBackground: @ 800F420 movs r1, 0xC0 lsls r1, 19 bl LZDecompressVram - ldr r1, _0800F458 @ =gUnknown_8D0051C + ldr r1, _0800F458 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -315,7 +315,7 @@ LoadBattleTextboxAndBackground: @ 800F420 bx r0 .align 2, 0 _0800F454: .4byte gUnknown_8D00000 -_0800F458: .4byte gUnknown_8D0051C +_0800F458: .4byte gFile_graphics_interface_menu_map_tilemap _0800F45C: .4byte gUnknown_8D004D8 thumb_func_end LoadBattleTextboxAndBackground @@ -1152,13 +1152,13 @@ sub_800FAE0: @ 800FAE0 ands r0, r1 cmp r0, 0 beq _0800FB94 - ldr r0, _0800FB68 @ =gUnknown_8E7737C + ldr r0, _0800FB68 @ =gFile_graphics_battle_transitions_vs_frame_sheet ldr r1, _0800FB6C @ =0x06004000 bl LZDecompressVram - ldr r0, _0800FB70 @ =gUnknown_8E77598 + ldr r0, _0800FB70 @ =gFile_graphics_battle_transitions_vs_sheet ldr r1, _0800FB74 @ =0x06010000 bl LZDecompressVram - ldr r0, _0800FB78 @ =gUnknown_8E77570 + ldr r0, _0800FB78 @ =gFile_graphics_battle_transitions_vs_frame_palette movs r1, 0x60 movs r2, 0x20 bl LoadCompressedPalette @@ -1169,7 +1169,7 @@ sub_800FAE0: @ 800FAE0 ldr r1, _0800FB7C @ =0x00005c04 movs r0, 0xA bl SetGpuReg - ldr r4, _0800FB80 @ =gUnknown_8E77464 + ldr r4, _0800FB80 @ =gFile_graphics_battle_transitions_vs_frame_tilemap movs r0, 0x1 adds r1, r4, 0 movs r2, 0 @@ -1201,13 +1201,13 @@ sub_800FAE0: @ 800FAE0 b _0800FC26 .align 2, 0 _0800FB64: .4byte gBattleTypeFlags -_0800FB68: .4byte gUnknown_8E7737C +_0800FB68: .4byte gFile_graphics_battle_transitions_vs_frame_sheet _0800FB6C: .4byte 0x06004000 -_0800FB70: .4byte gUnknown_8E77598 +_0800FB70: .4byte gFile_graphics_battle_transitions_vs_sheet _0800FB74: .4byte 0x06010000 -_0800FB78: .4byte gUnknown_8E77570 +_0800FB78: .4byte gFile_graphics_battle_transitions_vs_frame_palette _0800FB7C: .4byte 0x00005c04 -_0800FB80: .4byte gUnknown_8E77464 +_0800FB80: .4byte gFile_graphics_battle_transitions_vs_frame_tilemap _0800FB84: .4byte gUnknown_202297A _0800FB88: .4byte 0x0000ff5c _0800FB8C: .4byte gUnknown_202297E @@ -1393,7 +1393,7 @@ _0800FCEC: .align 2, 0 _0800FCF8: .4byte gUnknown_8D00000 _0800FCFC: - ldr r1, _0800FD10 @ =gUnknown_8D0051C + ldr r1, _0800FD10 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -1402,7 +1402,7 @@ _0800FCFC: bl CopyBgTilemapBufferToVram b _0800FD94 .align 2, 0 -_0800FD10: .4byte gUnknown_8D0051C +_0800FD10: .4byte gFile_graphics_interface_menu_map_tilemap _0800FD14: ldr r0, _0800FD20 @ =gUnknown_8D004D8 movs r1, 0 diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s index 2c5feb2f1..31cf3ba30 100644 --- a/asm/battle_anim_80A22E8.s +++ b/asm/battle_anim_80A22E8.s @@ -15161,7 +15161,7 @@ _080A96CC: lsls r2, 1 adds r0, r2 str r1, [r0] - ldr r0, _080A975C @ =gUnknown_8D227E4 + ldr r0, _080A975C @ =gFile_graphics_battle_anims_sprites_206_palette bl LZDecompressWram movs r4, 0 _080A9700: @@ -15206,7 +15206,7 @@ _080A9700: _080A9750: .4byte 0x000027de _080A9754: .4byte 0x00002710 _080A9758: .4byte gMonSpritesGfxPtr -_080A975C: .4byte gUnknown_8D227E4 +_080A975C: .4byte gFile_graphics_battle_anims_sprites_206_palette thumb_func_end sub_80A96B4 thumb_func_start sub_80A9760 @@ -15955,15 +15955,15 @@ _080A9D2A: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DAC @ =gUnknown_8D23F4C + ldr r1, _080A9DAC @ =gFile_graphics_battle_anims_backgrounds_attract_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9DB0 @ =gUnknown_8D234B4 + ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080A9DB4 @ =gUnknown_8D23F24 + ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -15995,9 +15995,9 @@ _080A9D88: _080A9DA0: .4byte 0x00003f42 _080A9DA4: .4byte gUnknown_2022978 _080A9DA8: .4byte gUnknown_202297A -_080A9DAC: .4byte gUnknown_8D23F4C -_080A9DB0: .4byte gUnknown_8D234B4 -_080A9DB4: .4byte gUnknown_8D23F24 +_080A9DAC: .4byte gFile_graphics_battle_anims_backgrounds_attract_tilemap +_080A9DB0: .4byte gFile_graphics_battle_anims_backgrounds_attract_sheet +_080A9DB4: .4byte gFile_graphics_battle_anims_backgrounds_attract_palette _080A9DB8: .4byte gTasks _080A9DBC: .4byte sub_80A9DC0 thumb_func_end sub_80A9CE8 @@ -16214,7 +16214,7 @@ _080A9F52: lsls r0, 24 cmp r0, 0 beq _080A9F98 - ldr r0, _080A9F94 @ =gUnknown_8E7F874 + ldr r0, _080A9F94 @ =gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram b _080A9FC6 @@ -16222,7 +16222,7 @@ _080A9F52: _080A9F88: .4byte 0x00003f42 _080A9F8C: .4byte gUnknown_2022978 _080A9F90: .4byte gUnknown_202297A -_080A9F94: .4byte gUnknown_8E7F874 +_080A9F94: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_contest_tilemap _080A9F98: ldr r0, _080A9FB4 @ =gUnknown_2037F1B ldrb r0, [r0] @@ -16233,25 +16233,25 @@ _080A9F98: bne _080A9FBC mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080A9FB8 @ =gUnknown_8E7F4AC + ldr r1, _080A9FB8 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl sub_807543C b _080A9FC6 .align 2, 0 _080A9FB4: .4byte gUnknown_2037F1B -_080A9FB8: .4byte gUnknown_8E7F4AC +_080A9FB8: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080A9FBC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA010 @ =gUnknown_8E7F690 + ldr r1, _080AA010 @ =gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap bl sub_807543C _080A9FC6: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AA014 @ =gUnknown_8D24BCC + ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080AA018 @ =gUnknown_8D24BA4 + ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -16280,9 +16280,9 @@ _080A9FFA: pop {r0} bx r0 .align 2, 0 -_080AA010: .4byte gUnknown_8E7F690 -_080AA014: .4byte gUnknown_8D24BCC -_080AA018: .4byte gUnknown_8D24BA4 +_080AA010: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_opponent_tilemap +_080AA014: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080AA018: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080AA01C: .4byte gTasks _080AA020: .4byte sub_80AA024 thumb_func_end sub_80A9F10 @@ -18865,23 +18865,23 @@ sub_80AB38C: @ 80AB38C bne _080AB408 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB404 @ =gUnknown_8E81D14 + ldr r1, _080AB404 @ =gFile_graphics_unknown_unknown_E81D14_tilemap bl sub_807543C b _080AB42E .align 2, 0 _080AB3FC: .4byte 0x00003f42 _080AB400: .4byte gUnknown_2037F1A -_080AB404: .4byte gUnknown_8E81D14 +_080AB404: .4byte gFile_graphics_unknown_unknown_E81D14_tilemap _080AB408: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB414 @ =gUnknown_8E81FE4 + ldr r1, _080AB414 @ =gFile_graphics_unknown_unknown_E81FE4_tilemap bl sub_807543C b _080AB42E .align 2, 0 -_080AB414: .4byte gUnknown_8E81FE4 +_080AB414: .4byte gFile_graphics_unknown_unknown_E81FE4_tilemap _080AB418: - ldr r0, _080AB458 @ =gUnknown_8E822B8 + ldr r0, _080AB458 @ =gFile_graphics_unknown_unknown_E822B8_tilemap ldr r1, [sp, 0x4] bl LZDecompressVram mov r0, sp @@ -18893,7 +18893,7 @@ _080AB418: _080AB42E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AB45C @ =gUnknown_8E809CC + ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -18902,7 +18902,7 @@ _080AB42E: ldrsh r0, [r0, r1] cmp r0, 0 bne _080AB468 - ldr r0, _080AB464 @ =gUnknown_8E81CEC + ldr r0, _080AB464 @ =gFile_graphics_battle_anims_backgrounds_water_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18910,12 +18910,12 @@ _080AB42E: bl LoadCompressedPalette b _080AB476 .align 2, 0 -_080AB458: .4byte gUnknown_8E822B8 -_080AB45C: .4byte gUnknown_8E809CC +_080AB458: .4byte gFile_graphics_unknown_unknown_E822B8_tilemap +_080AB45C: .4byte gFile_graphics_battle_anims_backgrounds_water_sheet _080AB460: .4byte gUnknown_2037F02 -_080AB464: .4byte gUnknown_8E81CEC +_080AB464: .4byte gFile_graphics_battle_anims_backgrounds_water_palette _080AB468: - ldr r0, _080AB4E0 @ =gUnknown_8E7BAB0 + ldr r0, _080AB4E0 @ =gFile_graphics_battle_anims_backgrounds_water_muddy_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -18973,7 +18973,7 @@ _080AB476: strh r0, [r7, 0xE] b _080AB552 .align 2, 0 -_080AB4E0: .4byte gUnknown_8E7BAB0 +_080AB4E0: .4byte gFile_graphics_battle_anims_backgrounds_water_muddy_palette _080AB4E4: .4byte sub_80AB79C _080AB4E8: .4byte gTasks _080AB4EC: .4byte 0x0000ffb0 @@ -28163,7 +28163,7 @@ _080AFB26: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4 + ldr r1, _080AFBB0 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFBB4 @ =gUnknown_83C2CE0 mov r1, sp @@ -28198,7 +28198,7 @@ _080AFBA0: .4byte 0x00003f42 _080AFBA4: .4byte gUnknown_2022978 _080AFBA8: .4byte gUnknown_202297A _080AFBAC: .4byte gUnknown_83C3540 -_080AFBB0: .4byte gUnknown_8E7F1F4 +_080AFBB0: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFBB4: .4byte gUnknown_83C2CE0 _080AFBB8: .4byte gTasks _080AFBBC: .4byte sub_80AFBC0 @@ -28474,7 +28474,7 @@ _080AFDC2: bl LoadBgTiles mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080AFE50 @ =gUnknown_8E7F1F4 + ldr r1, _080AFE50 @ =gFile_graphics_battle_anims_backgrounds_fog_tilemap bl sub_807543C ldr r0, _080AFE54 @ =gUnknown_83C2CE0 mov r1, sp @@ -28511,7 +28511,7 @@ _080AFE40: .4byte 0x00003f42 _080AFE44: .4byte gUnknown_2022978 _080AFE48: .4byte gUnknown_202297A _080AFE4C: .4byte gUnknown_83C3540 -_080AFE50: .4byte gUnknown_8E7F1F4 +_080AFE50: .4byte gFile_graphics_battle_anims_backgrounds_fog_tilemap _080AFE54: .4byte gUnknown_83C2CE0 _080AFE58: .4byte gTasks _080AFE5C: .4byte 0x0000ffff @@ -38100,15 +38100,15 @@ _080B4854: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F0 @ =gUnknown_8E79354 + ldr r1, _080B48F0 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B48F4 @ =gUnknown_8E794D0 + ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B48F8 @ =gUnknown_8E799FC + ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -38154,9 +38154,9 @@ _080B48CA: _080B48E4: .4byte 0x00003f42 _080B48E8: .4byte gUnknown_2022978 _080B48EC: .4byte gUnknown_202297A -_080B48F0: .4byte gUnknown_8E79354 -_080B48F4: .4byte gUnknown_8E794D0 -_080B48F8: .4byte gUnknown_8E799FC +_080B48F0: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_tilemap +_080B48F4: .4byte gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet +_080B48F8: .4byte gFile_graphics_battle_anims_sprites_261_palette _080B48FC: .4byte gUnknown_2037F02 _080B4900: .4byte gUnknown_2037F1A _080B4904: .4byte gTasks @@ -42800,11 +42800,11 @@ _080B6D28: bl sub_80752C8 add r0, sp, 0xC ldrb r0, [r0, 0x9] - ldr r1, _080B6D84 @ =gUnknown_8D24BCC + ldr r1, _080B6D84 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet add r2, sp, 0xC ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B6D88 @ =gUnknown_8D24BA4 + ldr r0, _080B6D88 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette add r1, sp, 0xC ldrb r1, [r1, 0x8] lsls r1, 4 @@ -42814,8 +42814,8 @@ _080B6D28: .align 2, 0 _080B6D7C: .4byte gUnknown_202297C _080B6D80: .4byte gUnknown_202297E -_080B6D84: .4byte gUnknown_8D24BCC -_080B6D88: .4byte gUnknown_8D24BA4 +_080B6D84: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_sheet +_080B6D88: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_palette _080B6D8C: add r0, sp, 0xC movs r1, 0x2 @@ -42830,7 +42830,7 @@ _080B6D8C: lsls r4, 1 adds r0, r4 str r1, [r0] - ldr r0, _080B6E00 @ =gUnknown_8E7F4AC + ldr r0, _080B6E00 @ =gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap bl LZDecompressWram add r0, sp, 0xC ldrb r0, [r0, 0x8] @@ -42867,7 +42867,7 @@ _080B6D8C: b _080B6F1E .align 2, 0 _080B6DFC: .4byte gMonSpritesGfxPtr -_080B6E00: .4byte gUnknown_8E7F4AC +_080B6E00: .4byte gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap _080B6E04: ldrh r0, [r6, 0xA] adds r0, 0x1 @@ -46190,15 +46190,15 @@ _080B8828: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C4 @ =gUnknown_8D1D388 + ldr r1, _080B88C4 @ =gFile_graphics_battle_anims_masks_metal_shine_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080B88C8 @ =gUnknown_8D1D224 + ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080B88CC @ =gUnknown_8D1D360 + ldr r0, _080B88CC @ =gFile_graphics_battle_anims_masks_metal_shine_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -46236,9 +46236,9 @@ _080B8828: _080B88B8: .4byte gBattlerPartyIndexes _080B88BC: .4byte gPlayerParty _080B88C0: .4byte gUnknown_2037F1A -_080B88C4: .4byte gUnknown_8D1D388 -_080B88C8: .4byte gUnknown_8D1D224 -_080B88CC: .4byte gUnknown_8D1D360 +_080B88C4: .4byte gFile_graphics_battle_anims_masks_metal_shine_tilemap +_080B88C8: .4byte gFile_graphics_battle_anims_masks_metal_shine_sheet +_080B88CC: .4byte gFile_graphics_battle_anims_masks_metal_shine_palette _080B88D0: .4byte gUnknown_2022978 _080B88D4: .4byte gSprites _080B88D8: .4byte gUnknown_202297A @@ -51145,7 +51145,7 @@ _080BAE5C: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF18 @ =gUnknown_8D20858 + ldr r1, _080BAF18 @ =gFile_graphics_battle_anims_masks_curse_tilemap bl sub_807543C bl sub_8073788 lsls r0, 24 @@ -51160,7 +51160,7 @@ _080BAE5C: _080BAEAC: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BAF1C @ =gUnknown_8D2083C + ldr r1, _080BAF1C @ =gFile_graphics_battle_anims_masks_curse_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51207,8 +51207,8 @@ _080BAEAC: _080BAF0C: .4byte gBattlerPartyIndexes _080BAF10: .4byte gPlayerParty _080BAF14: .4byte gUnknown_2037F1A -_080BAF18: .4byte gUnknown_8D20858 -_080BAF1C: .4byte gUnknown_8D2083C +_080BAF18: .4byte gFile_graphics_battle_anims_masks_curse_tilemap +_080BAF1C: .4byte gFile_graphics_battle_anims_masks_curse_sheet _080BAF20: .4byte gUnknown_83E7CC8 _080BAF24: .4byte gUnknown_2022978 _080BAF28: .4byte gSprites @@ -51659,17 +51659,17 @@ _080BB2E2: bne _080BB30C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB308 @ =gUnknown_8D2DB04 + ldr r1, _080BB308 @ =gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap bl sub_807543C b _080BB316 .align 2, 0 _080BB300: .4byte gUnknown_2023D44 _080BB304: .4byte gUnknown_20399B4 -_080BB308: .4byte gUnknown_8D2DB04 +_080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap _080BB30C: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB354 @ =gUnknown_8D2DC20 + ldr r1, _080BB354 @ =gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap bl sub_807543C _080BB316: bl sub_8073788 @@ -51685,7 +51685,7 @@ _080BB316: _080BB32E: mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080BB358 @ =gUnknown_8D2D8F4 + ldr r1, _080BB358 @ =gFile_graphics_battle_anims_masks_stat_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 @@ -51701,8 +51701,8 @@ _080BB32E: ldr r0, [r0] mov pc, r0 .align 2, 0 -_080BB354: .4byte gUnknown_8D2DC20 -_080BB358: .4byte gUnknown_8D2D8F4 +_080BB354: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_2_tilemap +_080BB358: .4byte gFile_graphics_battle_anims_masks_stat_sheet _080BB35C: .4byte gUnknown_20399B4 _080BB360: .4byte _080BB364 .align 2, 0 @@ -51715,37 +51715,37 @@ _080BB364: .4byte _080BB3A8 .4byte _080BB3B0 _080BB380: - ldr r0, _080BB384 @ =gUnknown_8D2DD5C + ldr r0, _080BB384 @ =gFile_graphics_battle_anims_masks_stat2_palette b _080BB3B2 .align 2, 0 -_080BB384: .4byte gUnknown_8D2DD5C +_080BB384: .4byte gFile_graphics_battle_anims_masks_stat2_palette _080BB388: - ldr r0, _080BB38C @ =gUnknown_8D2DD3C + ldr r0, _080BB38C @ =gFile_graphics_battle_anims_masks_stat1_palette b _080BB3B2 .align 2, 0 -_080BB38C: .4byte gUnknown_8D2DD3C +_080BB38C: .4byte gFile_graphics_battle_anims_masks_stat1_palette _080BB390: - ldr r0, _080BB394 @ =gUnknown_8D2DD7C + ldr r0, _080BB394 @ =gFile_graphics_battle_anims_masks_stat3_palette b _080BB3B2 .align 2, 0 -_080BB394: .4byte gUnknown_8D2DD7C +_080BB394: .4byte gFile_graphics_battle_anims_masks_stat3_palette _080BB398: - ldr r0, _080BB39C @ =gUnknown_8D2DD9C + ldr r0, _080BB39C @ =gFile_graphics_battle_anims_masks_stat4_palette b _080BB3B2 .align 2, 0 -_080BB39C: .4byte gUnknown_8D2DD9C +_080BB39C: .4byte gFile_graphics_battle_anims_masks_stat4_palette _080BB3A0: - ldr r0, _080BB3A4 @ =gUnknown_8D2DDDC + ldr r0, _080BB3A4 @ =gFile_graphics_battle_anims_masks_stat6_palette b _080BB3B2 .align 2, 0 -_080BB3A4: .4byte gUnknown_8D2DDDC +_080BB3A4: .4byte gFile_graphics_battle_anims_masks_stat6_palette _080BB3A8: - ldr r0, _080BB3AC @ =gUnknown_8D2DDFC + ldr r0, _080BB3AC @ =gFile_graphics_battle_anims_masks_stat7_palette b _080BB3B2 .align 2, 0 -_080BB3AC: .4byte gUnknown_8D2DDFC +_080BB3AC: .4byte gFile_graphics_battle_anims_masks_stat7_palette _080BB3B0: - ldr r0, _080BB3C0 @ =gUnknown_8D2DE1C + ldr r0, _080BB3C0 @ =gFile_graphics_battle_anims_masks_stat8_palette _080BB3B2: mov r1, sp ldrb r1, [r1, 0x8] @@ -51754,9 +51754,9 @@ _080BB3B2: bl LoadCompressedPalette b _080BB3D2 .align 2, 0 -_080BB3C0: .4byte gUnknown_8D2DE1C +_080BB3C0: .4byte gFile_graphics_battle_anims_masks_stat8_palette _080BB3C4: - ldr r0, _080BB3FC @ =gUnknown_8D2DDBC + ldr r0, _080BB3FC @ =gFile_graphics_battle_anims_masks_stat5_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -51785,7 +51785,7 @@ _080BB3D2: ldr r1, _080BB410 @ =0x0000fffd b _080BB420 .align 2, 0 -_080BB3FC: .4byte gUnknown_8D2DDBC +_080BB3FC: .4byte gFile_graphics_battle_anims_masks_stat5_palette _080BB400: .4byte gUnknown_2022978 _080BB404: .4byte gUnknown_202297A _080BB408: .4byte gUnknown_20399B4 diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s index 9b56509a2..4304c8c1a 100644 --- a/asm/battle_anim_80DE2C0.s +++ b/asm/battle_anim_80DE2C0.s @@ -3410,15 +3410,15 @@ _080DFCCE: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD1C @ =gUnknown_8D2A8C0 + ldr r1, _080DFD1C @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080DFD20 @ =gUnknown_8D2A808 + ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080DFD24 @ =gUnknown_8D2A8A8 + ldr r0, _080DFD24 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -3439,9 +3439,9 @@ _080DFCCE: b _080DFD58 .align 2, 0 _080DFD18: .4byte 0x00003f42 -_080DFD1C: .4byte gUnknown_8D2A8C0 -_080DFD20: .4byte gUnknown_8D2A808 -_080DFD24: .4byte gUnknown_8D2A8A8 +_080DFD1C: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080DFD20: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080DFD24: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080DFD28: .4byte gUnknown_2022978 _080DFD2C: .4byte 0x0000ffc8 _080DFD30: @@ -4052,15 +4052,15 @@ _080E01FC: bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0250 @ =gUnknown_8D2A8C0 + ldr r1, _080E0250 @ =gFile_graphics_battle_anims_masks_morning_sun_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080E0254 @ =gUnknown_8D2A808 + ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080E0258 @ =gUnknown_8D2A8A8 + ldr r0, _080E0258 @ =gFile_graphics_battle_anims_masks_morning_sun_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -4083,9 +4083,9 @@ _080E01FC: .align 2, 0 _080E0248: .4byte 0x00003f42 _080E024C: .4byte 0x00000d03 -_080E0250: .4byte gUnknown_8D2A8C0 -_080E0254: .4byte gUnknown_8D2A808 -_080E0258: .4byte gUnknown_8D2A8A8 +_080E0250: .4byte gFile_graphics_battle_anims_masks_morning_sun_tilemap +_080E0254: .4byte gFile_graphics_battle_anims_masks_morning_sun_sheet +_080E0258: .4byte gFile_graphics_battle_anims_masks_morning_sun_palette _080E025C: .4byte gUnknown_2022978 _080E0260: .4byte 0x0000ffc8 _080E0264: @@ -7994,11 +7994,11 @@ sub_80E2084: @ 80E2084 str r1, [sp, 0x8] movs r1, 0x1E str r1, [sp, 0xC] - ldr r1, _080E20C8 @ =gUnknown_8D2DE3C + ldr r1, _080E20C8 @ =gFile_graphics_battle_anims_masks_cure_bubbles_sheet str r1, [sp, 0x10] - ldr r1, _080E20CC @ =gUnknown_8D2DF98 + ldr r1, _080E20CC @ =gFile_graphics_battle_anims_masks_cure_bubbles_tilemap str r1, [sp, 0x14] - ldr r1, _080E20D0 @ =gUnknown_8D2DF78 + ldr r1, _080E20D0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette str r1, [sp, 0x18] movs r1, 0 bl sub_80BBA20 @@ -8008,9 +8008,9 @@ sub_80E2084: @ 80E2084 .align 2, 0 _080E20C0: .4byte gUnknown_2037F1A _080E20C4: .4byte gUnknown_2037F02 -_080E20C8: .4byte gUnknown_8D2DE3C -_080E20CC: .4byte gUnknown_8D2DF98 -_080E20D0: .4byte gUnknown_8D2DF78 +_080E20C8: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_sheet +_080E20CC: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_tilemap +_080E20D0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette thumb_func_end sub_80E2084 thumb_func_start sub_80E20D4 diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s index bb6d8d8d8..d09e8ef93 100644 --- a/asm/battle_anim_80EEC0C.s +++ b/asm/battle_anim_80EEC0C.s @@ -154,15 +154,15 @@ sub_80EEC0C: @ 80EEC0C bl sub_80752A0 mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDD8 @ =gUnknown_8D2EC70 + ldr r1, _080EEDD8 @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap bl sub_807543C mov r0, sp ldrb r0, [r0, 0x9] - ldr r1, _080EEDDC @ =gUnknown_8D2EC24 + ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet mov r2, sp ldrh r2, [r2, 0xA] bl sub_80753B4 - ldr r0, _080EEDE0 @ =gUnknown_8D2DF78 + ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette mov r1, sp ldrb r1, [r1, 0x8] lsls r1, 4 @@ -212,9 +212,9 @@ _080EEDC8: .4byte 0x00003f42 _080EEDCC: .4byte gUnknown_3004FF0 _080EEDD0: .4byte gSprites _080EEDD4: .4byte SpriteCallbackDummy -_080EEDD8: .4byte gUnknown_8D2EC70 -_080EEDDC: .4byte gUnknown_8D2EC24 -_080EEDE0: .4byte gUnknown_8D2DF78 +_080EEDD8: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_tilemap +_080EEDDC: .4byte gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet +_080EEDE0: .4byte gFile_graphics_battle_anims_masks_cure_bubbles_palette _080EEDE4: .4byte gUnknown_2022978 _080EEDE8: .4byte gUnknown_202297A _080EEDEC: .4byte gTasks diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s index dd319645e..ac088b355 100644 --- a/asm/battle_gfx_sfx_util.s +++ b/asm/battle_gfx_sfx_util.s @@ -1466,7 +1466,7 @@ _0803495A: thumb_func_start LoadBattleBarGfx LoadBattleBarGfx: @ 8034964 push {lr} - ldr r0, _0803497C @ =gUnknown_8D093D8 + ldr r0, _0803497C @ =gFile_graphics_interface_hp_numbers ldr r1, _08034980 @ =gMonSpritesGfxPtr ldr r1, [r1] movs r2, 0xBA @@ -1477,7 +1477,7 @@ LoadBattleBarGfx: @ 8034964 pop {r0} bx r0 .align 2, 0 -_0803497C: .4byte gUnknown_8D093D8 +_0803497C: .4byte gFile_graphics_interface_hp_numbers _08034980: .4byte gMonSpritesGfxPtr thumb_func_end LoadBattleBarGfx @@ -2351,7 +2351,7 @@ sub_80350BC: @ 80350BC lsls r0, 24 cmp r0, 0 beq _080350FC - ldr r0, _080350F4 @ =gUnknown_8D2D0B4 + ldr r0, _080350F4 @ =gFile_graphics_battle_anims_sprites_substitute_sheet ldr r1, _080350F8 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2361,10 +2361,10 @@ sub_80350BC: @ 80350BC bl LZDecompressVram b _0803510E .align 2, 0 -_080350F4: .4byte gUnknown_8D2D0B4 +_080350F4: .4byte gFile_graphics_battle_anims_sprites_substitute_sheet _080350F8: .4byte gMonSpritesGfxPtr _080350FC: - ldr r0, _08035144 @ =gUnknown_8D2D2F4 + ldr r0, _08035144 @ =gFile_graphics_battle_anims_sprites_substitute_tilemap ldr r1, _08035148 @ =gMonSpritesGfxPtr ldr r1, [r1] lsls r4, r5, 2 @@ -2375,7 +2375,7 @@ _080350FC: _0803510E: movs r3, 0x1 lsls r6, 4 - ldr r7, _0803514C @ =gUnknown_8D2D090 + ldr r7, _0803514C @ =gFile_graphics_battle_anims_sprites_substitute_palette ldr r0, _08035148 @ =gMonSpritesGfxPtr ldr r0, [r0] adds r0, 0x4 @@ -2401,9 +2401,9 @@ _08035120: bl LoadCompressedPalette b _0803519A .align 2, 0 -_08035144: .4byte gUnknown_8D2D2F4 +_08035144: .4byte gFile_graphics_battle_anims_sprites_substitute_tilemap _08035148: .4byte gMonSpritesGfxPtr -_0803514C: .4byte gUnknown_8D2D090 +_0803514C: .4byte gFile_graphics_battle_anims_sprites_substitute_palette _08035150: .4byte 0x040000d4 _08035154: .4byte 0x84000200 _08035158: diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index e8f282578..7fe86b9cf 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -648,7 +648,7 @@ _08047174: movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _080471A0 @ =gUnknown_8D0051C + ldr r1, _080471A0 @ =gFile_graphics_interface_menu_map_tilemap movs r0, 0 movs r2, 0 movs r3, 0 @@ -660,7 +660,7 @@ _08047174: b _0804724A .align 2, 0 _0804719C: .4byte gUnknown_8D00000 -_080471A0: .4byte gUnknown_8D0051C +_080471A0: .4byte gFile_graphics_interface_menu_map_tilemap _080471A4: .4byte gUnknown_8D004D8 _080471A8: ldr r0, _080471BC @ =gUnknown_826011C diff --git a/asm/link.s b/asm/link.s index 586ee46a8..71f4c718b 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3354,14 +3354,14 @@ _0800AE18: .4byte sub_800AF2C sub_800AE1C: @ 800AE1C push {r4,r5,lr} sub sp, 0xC - ldr r1, _0800AEB8 @ =gUnknown_8231EE4 + ldr r1, _0800AEB8 @ =gWirelessLinkDisplay4bpp movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r1, _0800AEBC @ =gUnknown_823238C + ldr r1, _0800AEBC @ =gWirelessLinkDisplayBin movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -3416,8 +3416,8 @@ sub_800AE1C: @ 800AE1C pop {r0} bx r0 .align 2, 0 -_0800AEB8: .4byte gUnknown_8231EE4 -_0800AEBC: .4byte gUnknown_823238C +_0800AEB8: .4byte gWirelessLinkDisplay4bpp +_0800AEBC: .4byte gWirelessLinkDisplayBin _0800AEC0: .4byte gUnknown_8231EC4 _0800AEC4: .4byte gUnknown_8234610 _0800AEC8: .4byte gUnknown_841DEF0 diff --git a/asm/party_menu.s b/asm/party_menu.s index 992cc627f..23a1eb60a 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -647,7 +647,7 @@ _0811EF6C: .4byte _0811F010 _0811EF8C: ldr r4, _0811EFAC @ =gUnknown_203B0B8 - ldr r0, _0811EFB0 @ =gUnknown_8E82700 + ldr r0, _0811EFB0 @ =gFile_graphics_interface_party_menu_misc_sheet mov r1, sp bl malloc_and_decompress adds r1, r0, 0 @@ -661,19 +661,19 @@ _0811EF8C: b _0811F016 .align 2, 0 _0811EFAC: .4byte gUnknown_203B0B8 -_0811EFB0: .4byte gUnknown_8E82700 +_0811EFB0: .4byte gFile_graphics_interface_party_menu_misc_sheet _0811EFB4: bl IsDma3ManagerBusyWithBgCopy lsls r0, 24 cmp r0, 0 bne _0811F030 - ldr r0, _0811EFCC @ =gUnknown_8E82AB0 + ldr r0, _0811EFCC @ =gFile_graphics_interface_party_menu_misc_tilemap ldr r1, _0811EFD0 @ =gUnknown_203B0BC ldr r1, [r1] bl LZDecompressWram b _0811F016 .align 2, 0 -_0811EFCC: .4byte gUnknown_8E82AB0 +_0811EFCC: .4byte gFile_graphics_interface_party_menu_misc_tilemap _0811EFD0: .4byte gUnknown_203B0BC _0811EFD4: ldr r0, _0811EFF4 @ =gUnknown_8E829C8 diff --git a/asm/pokeball.s b/asm/pokeball.s index b5d718a13..11572c80f 100644 --- a/asm/pokeball.s +++ b/asm/pokeball.s @@ -2811,7 +2811,7 @@ _0804BF2C: bl GetSpriteTileStartByTag adds r1, r0, 0 lsls r1, 16 - ldr r0, _0804BF5C @ =gUnknown_8D022E8 + ldr r0, _0804BF5C @ =gFile_graphics_interface_ball_Open_sheet lsrs r1, 11 ldr r2, _0804BF60 @ =0x06010100 adds r1, r2 @@ -2824,7 +2824,7 @@ _0804BF48: _0804BF50: .4byte gUnknown_826056C _0804BF54: .4byte 0xffff0000 _0804BF58: .4byte gUnknown_82605CC -_0804BF5C: .4byte gUnknown_8D022E8 +_0804BF5C: .4byte gFile_graphics_interface_ball_Open_sheet _0804BF60: .4byte 0x06010100 thumb_func_end LoadBallGfx diff --git a/asm/trade.s b/asm/trade.s index a12a9fcd0..9f35fe6a8 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7850,7 +7850,7 @@ sub_80504CC: @ 80504CC movs r2, 0 movs r3, 0 bl sub_80F696C - ldr r0, _080505BC @ =gUnknown_8D0051C + ldr r0, _080505BC @ =gFile_graphics_interface_menu_map_tilemap mov r8, r0 ldr r4, _080505C0 @ =gDecompressionBuffer adds r1, r4, 0 @@ -7897,7 +7897,7 @@ sub_80504CC: @ 80504CC .align 2, 0 _080505B4: .4byte gUnknown_826D1D4 _080505B8: .4byte gUnknown_8D00000 -_080505BC: .4byte gUnknown_8D0051C +_080505BC: .4byte gFile_graphics_interface_menu_map_tilemap _080505C0: .4byte gDecompressionBuffer _080505C4: .4byte gUnknown_8D004D8 _080505C8: .4byte gUnknown_826D1BC @@ -8490,7 +8490,7 @@ _08050AC4: ldr r1, _08050AF8 @ =0x00001241 movs r0, 0 bl SetGpuReg - ldr r0, _08050AFC @ =gUnknown_826BA5C + ldr r0, _08050AFC @ =gUnknown_3379A0Bin ldr r1, _08050B00 @ =0x06002800 bl LZ77UnCompVram movs r0, 0x8 @@ -8498,7 +8498,7 @@ _08050AC4: .align 2, 0 _08050AF4: .4byte gUnknown_2031DAC _08050AF8: .4byte 0x00001241 -_08050AFC: .4byte gUnknown_826BA5C +_08050AFC: .4byte gUnknown_3379A0Bin _08050B00: .4byte 0x06002800 _08050B04: ldr r1, _08050B28 @ =0x00001241 @@ -8529,7 +8529,7 @@ _08050B3C: movs r1, 0x30 movs r2, 0x20 bl LoadPalette - ldr r0, _08050B70 @ =gUnknown_826BF7C + ldr r0, _08050B70 @ =gWirelessSignal4bpp ldr r1, _08050B74 @ =0x06004000 bl LZ77UnCompVram ldr r0, _08050B78 @ =gUnknown_826C60C @@ -8548,7 +8548,7 @@ _08050B64: b _08050DB4 .align 2, 0 _08050B6C: .4byte gUnknown_826BF5C -_08050B70: .4byte gUnknown_826BF7C +_08050B70: .4byte gWirelessSignal4bpp _08050B74: .4byte 0x06004000 _08050B78: .4byte gUnknown_826C60C _08050B7C: .4byte 0x06009000 |