From 04598f07497734e76d0ebddb592d81d224a5ae6a Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 12 Sep 2017 00:00:05 -0500 Subject: [PATCH] Rename data2 external file symbols --- asm/link.s | 40 +++--- data/data2.s | 124 +++++++++--------- data/strings.s | 7 +- ...est_textbox.pal => unk_textbox_border.pal} | 0 ...est_textbox.png => unk_textbox_border.png} | Bin ...ess_link.bin => wireless_link_display.bin} | Bin ...ess_link.pal => wireless_link_display.pal} | 0 ...ess_link.png => wireless_link_display.png} | Bin 8 files changed, 88 insertions(+), 83 deletions(-) rename graphics/interface/{test_textbox.pal => unk_textbox_border.pal} (100%) rename graphics/interface/{test_textbox.png => unk_textbox_border.png} (100%) rename graphics/interface/{wireless_link.bin => wireless_link_display.bin} (100%) rename graphics/interface/{wireless_link.pal => wireless_link_display.pal} (100%) rename graphics/interface/{wireless_link.png => wireless_link_display.png} (100%) diff --git a/asm/link.s b/asm/link.s index 1fd881b99..9e197b8d2 100644 --- a/asm/link.s +++ b/asm/link.s @@ -57,12 +57,12 @@ sub_8009414: @ 8009414 lsrs r7, r3, 24 lsls r4, 16 lsrs r4, 16 - ldr r0, =gUnknown_082ECF20 + ldr r0, =gLinkTestDigitsPal lsls r1, r5, 4 movs r2, 0x20 bl LoadPalette ldr r3, =0x040000d4 - ldr r0, =gUnknown_082ECF40 + ldr r0, =gLinkTestDigitsGfx str r0, [r3] lsls r2, r7, 14 lsls r0, r4, 5 @@ -158,13 +158,13 @@ sub_80094EC: @ 80094EC lsrs r4, 24 lsls r5, 24 lsrs r5, 24 - ldr r0, =gUnknown_082ECF20 + ldr r0, =gLinkTestDigitsPal mov r2, r8 lsls r1, r2, 4 movs r2, 0x20 bl LoadPalette ldr r2, =0x040000d4 - ldr r0, =gUnknown_082ECF40 + ldr r0, =gLinkTestDigitsGfx str r0, [r2] lsls r0, r5, 14 movs r1, 0xC0 @@ -866,7 +866,7 @@ _08009B68: stm r2!, {r3,r6,r7} ldr r1, [r1] str r1, [r2] - ldr r4, =gUnknown_082ED1D4 + ldr r4, =gASCIIGameFreakInc adds r2, r0, 0 adds r1, r4, 0 ldm r1!, {r5-r7} @@ -1025,7 +1025,7 @@ _08009C70: _08009CCA: adds r0, r2, 0 bl sub_800B524 - ldr r5, =gUnknown_082ED1D4 + ldr r5, =gASCIIGameFreakInc mov r0, r8 adds r1, r5, 0 bl strcmp @@ -2521,7 +2521,7 @@ _0800A838: task00_link_test: @ 800A850 push {r4-r6,lr} sub sp, 0x20 - ldr r1, =gUnknown_082ED1E4 + ldr r1, =gASCIITestPrint mov r0, sp bl strcpy mov r0, sp @@ -3450,26 +3450,26 @@ _0800B03C: sub_800B080: @ 800B080 push {r4,r5,lr} sub sp, 0xC - ldr r1, =gUnknown_082ED168 + ldr r1, =g2BlankTilesGfx movs r0, 0 movs r2, 0x20 movs r3, 0 bl LoadBgTiles - ldr r1, =gUnknown_082EC88C + ldr r1, =gWirelessLinkDisplayGfx movs r5, 0 str r5, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, =gUnknown_082ECD34 + ldr r1, =gWirelessLinkDisplayTilemap movs r0, 0x1 movs r2, 0 movs r3, 0 bl CopyToBgTilemapBuffer movs r0, 0x1 bl CopyBgTilemapBufferToVram - ldr r0, =gUnknown_082EC86C + ldr r0, =gWirelessLinkDisplayPal movs r1, 0 movs r2, 0x20 bl LoadPalette @@ -3519,7 +3519,7 @@ sub_800B080: @ 800B080 sub_800B138: @ 800B138 push {lr} sub sp, 0xC - ldr r1, =gUnknown_082ED168 + ldr r1, =g2BlankTilesGfx movs r0, 0 movs r2, 0x20 movs r3, 0 @@ -3781,7 +3781,7 @@ sub_800B348: @ 800B348 stm r2!, {r3,r4,r6} ldr r0, [r0] str r0, [r2] - ldr r3, =gUnknown_082ED1D4 + ldr r3, =gASCIIGameFreakInc adds r2, r1, 0 adds r0, r3, 0 ldm r0!, {r4-r6} @@ -3831,7 +3831,7 @@ sub_800B3A4: @ 800B3A4 str r0, [r1] adds r0, r2, 0 bl sub_800B524 - ldr r5, =gUnknown_082ED1D4 + ldr r5, =gASCIIGameFreakInc adds r0, r4, 0 adds r1, r5, 0 bl strcmp @@ -28719,7 +28719,7 @@ _08018482: b _08018610 .pool _08018574: - ldr r0, =gUnknown_082F0548 + ldr r0, =gUnkTextboxBorderPal movs r1, 0 movs r2, 0x20 bl LoadPalette @@ -31126,7 +31126,7 @@ bgid_upload_textbox_1: @ 8019938 sub sp, 0x4 lsls r0, 24 lsrs r0, 24 - ldr r1, =gUnknown_082F0568 + ldr r1, =gUnkTextboxBorderGfx movs r2, 0x80 lsls r2, 1 movs r3, 0 @@ -32602,14 +32602,14 @@ sub_801A43C: @ 801A43C adds r1, r0, 0 movs r0, 0 bl SetBgTilemapBuffer - ldr r1, =gUnknown_082F0990 + ldr r1, =gWirelessInfoScreenGfx movs r0, 0 str r0, [sp] movs r0, 0x1 movs r2, 0 movs r3, 0 bl copy_decompressed_tile_data_to_vram_autofree - ldr r1, =gUnknown_082F0BA0 + ldr r1, =gWirelessInfoScreenTilemap movs r0, 0x1 movs r2, 0 movs r3, 0 @@ -32653,7 +32653,7 @@ sub_801A43C: @ 801A43C movs r1, 0 movs r2, 0 bl ChangeBgY - ldr r0, =gUnknown_082F0790 + ldr r0, =gWirelessInfoScreenPal movs r1, 0 movs r2, 0x20 bl LoadPalette @@ -32738,7 +32738,7 @@ _0801A5E4: ldrsh r0, [r1, r2] adds r0, 0x2 lsls r0, 5 - ldr r1, =gUnknown_082F0790 + ldr r1, =gWirelessInfoScreenPal adds r0, r1 movs r1, 0 movs r2, 0x10 diff --git a/data/data2.s b/data/data2.s index 45adfc678..96d8c826d 100644 --- a/data/data2.s +++ b/data/data2.s @@ -6,25 +6,25 @@ .section .rodata .align 2 -gUnknown_082EC86C:: @ 82EC86C - .incbin "graphics/interface/wireless_link.gbapal" +gWirelessLinkDisplayPal:: @ 82EC86C + .incbin "graphics/interface/wireless_link_display.gbapal" -gUnknown_082EC88C:: @ 82EC88C - .incbin "graphics/interface/wireless_link.4bpp.lz" +gWirelessLinkDisplayGfx:: @ 82EC88C + .incbin "graphics/interface/wireless_link_display.4bpp.lz" -gUnknown_082ECD34:: @ 82ECD34 - .incbin "graphics/interface/wireless_link.bin.lz" +gWirelessLinkDisplayTilemap:: @ 82ECD34 + .incbin "graphics/interface/wireless_link_display.bin.lz" -gUnknown_082ECF20:: @ 82ECF20 +gLinkTestDigitsPal:: @ 82ECF20 .incbin "graphics/interface/link_test_digits.gbapal" -gUnknown_082ECF40:: @ 82ECF40 +gLinkTestDigitsGfx:: @ 82ECF40 .incbin "graphics/interface/link_test_digits.4bpp" .string "{HIGHLIGHT TRANSPARENT}{COLOR WHITE}$" .align 2 -gUnknown_082ED168:: @ 82ED168 +g2BlankTilesGfx:: @ 82ED168 .incbin "graphics/interface/blank_1x2.4bpp" gUnknown_082ED1A8:: @ 82ED1A8 @@ -42,11 +42,11 @@ gUnknown_082ED1A8:: @ 82ED1A8 gUnknown_082ED1D0:: @ 82ED1D0 .byte 0x8, 0xA, 0xC, 0xE -gUnknown_082ED1D4:: @ 82ED1D4 +gASCIIGameFreakInc:: @ 82ED1D4 .ascii "GameFreak inc." .align 2 -gUnknown_082ED1E4:: @ 82ED1E4 +gASCIITestPrint:: @ 82ED1E4 .ascii "TEST PRINT\nP0\nP1\nP2\nP3" .align 2 @@ -1882,12 +1882,12 @@ gUnknown_082F0530:: @ 82F0530 .byte 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x0e, 0x00, 0x00 .align 2 -gUnknown_082F0548:: @ 82F0548 - .incbin "graphics/interface/test_textbox.gbapal" +gUnkTextboxBorderPal:: @ 82F0548 + .incbin "graphics/interface/unk_textbox_border.gbapal" .align 2 -gUnknown_082F0568:: @ 82F0568 - .incbin "graphics/interface/test_textbox.4bpp.lz" +gUnkTextboxBorderGfx:: @ 82F0568 + .incbin "graphics/interface/unk_textbox_border.4bpp.lz" .align 2 gUnknown_082F0598:: @ 82F0598 struct BgTemplate @@ -2064,15 +2064,15 @@ gUnknown_082F078E:: @ 82F078E .byte 0x9d, 0xfe .align 2 -gUnknown_082F0790:: @ 82F0790 +gWirelessInfoScreenPal:: @ 82F0790 .incbin "graphics/interface/wireless_info_screen.gbapal" .align 2 -gUnknown_082F0990:: @ 82F0990 +gWirelessInfoScreenGfx:: @ 82F0990 .incbin "graphics/interface/wireless_info_screen.4bpp.lz" .align 2 -gUnknown_082F0BA0:: @ 82F0BA0 +gWirelessInfoScreenTilemap:: @ 82F0BA0 .incbin "graphics/interface/wireless_info_screen.bin.lz" .align 2 @@ -2145,150 +2145,150 @@ gUnknown_082F0E1C:: @ 82F0E1C window_template 0x01, 0x01, 0x0E, 0x1C, 0x05, 0x02, 0x0130 .align 2 -gUnknown_082F0E34:: @ 82F0E34 +gWonderCardBgPal1:: @ 82F0E34 .incbin "graphics/interface/wonder_card_1.gbapal" .align 2 -gUnknown_082F0E54:: @ 82F0E54 +gWonderCardBgPal2:: @ 82F0E54 .incbin "graphics/interface/wonder_card_2.gbapal" .align 2 -gUnknown_082F0E74:: @ 82F0E74 +gWonderCardBgPal3:: @ 82F0E74 .incbin "graphics/interface/wonder_card_3.gbapal" .align 2 -gUnknown_082F0E94:: @ 82F0E94 +gWonderCardBgPal4:: @ 82F0E94 .incbin "graphics/interface/wonder_card_4.gbapal" .align 2 -gUnknown_082F0EB4:: @ 82F0EB4 +gWonderCardBgPal5:: @ 82F0EB4 .incbin "graphics/interface/wonder_card_5.gbapal" .align 2 -gUnknown_082F0ED4:: @ 82F0ED4 +gWonderCardBgPal6:: @ 82F0ED4 .incbin "graphics/interface/wonder_card_6.gbapal" .align 2 -gUnknown_082F0EF4:: @ 82F0EF4 +gWonderCardBgPal7:: @ 82F0EF4 .incbin "graphics/interface/wonder_card_7.gbapal" .align 2 -gUnknown_082F0F14:: @ 82F0F14 +gWonderCardBgPal8:: @ 82F0F14 .incbin "graphics/interface/wonder_card_8.gbapal" .align 2 -gUnknown_082F0F34:: @ 82F0F34 +gWonderCardBgGfx1:: @ 82F0F34 .incbin "graphics/interface/wonder_card_1.4bpp.lz" .align 2 -gUnknown_082F1030:: @ 82F1030 +gWonderCardBgTilemap1:: @ 82F1030 .incbin "graphics/interface/wonder_card_1.bin.lz" .align 2 -gUnknown_082F1124:: @ 82F1124 +gWonderCardBgGfx2:: @ 82F1124 .incbin "graphics/interface/wonder_card_2.4bpp.lz" .align 2 -gUnknown_082F1218:: @ 82F1218 +gWonderCardBgTilemap2:: @ 82F1218 .incbin "graphics/interface/wonder_card_2.bin.lz" .align 2 -gUnknown_082F1300:: @ 82F1300 +gWonderCardBgGfx3:: @ 82F1300 .incbin "graphics/interface/wonder_card_3.4bpp.lz" .align 2 -gUnknown_082F13D4:: @ 82F13D4 +gWonderCardBgTilemap3:: @ 82F13D4 .incbin "graphics/interface/wonder_card_3.bin.lz" .align 2 -gUnknown_082F14A8:: @ 82F14A8 +gWonderCardBgGfx7:: @ 82F14A8 .incbin "graphics/interface/wonder_card_7.4bpp.lz" .align 2 -gUnknown_082F16DC:: @ 82F16DC +gWonderCardBgTilemap7:: @ 82F16DC .incbin "graphics/interface/wonder_card_7.bin.lz" .align 2 -gUnknown_082F1824:: @ 82F1824 +gWonderCardBgGfx8:: @ 82F1824 .incbin "graphics/interface/wonder_card_8.4bpp.lz" .align 2 -gUnknown_082F1A54:: @ 82F1A54 +gWonderCardBgTilemap8:: @ 82F1A54 .incbin "graphics/interface/wonder_card_8.bin.lz" .align 2 -gUnknown_082F1B9C:: @ 82F1B9C +gWonderCardShadowPal1:: @ 82F1B9C .incbin "graphics/interface/wonder_card_shadow_1.gbapal" .align 2 -gUnknown_082F1BBC:: @ 82F1BBC +gWonderCardShadowPal2:: @ 82F1BBC .incbin "graphics/interface/wonder_card_shadow_2.gbapal" .align 2 -gUnknown_082F1BDC:: @ 82F1BDC +gWonderCardShadowPal3:: @ 82F1BDC .incbin "graphics/interface/wonder_card_shadow_3.gbapal" .align 2 -gUnknown_082F1BFC:: @ 82F1BFC +gWonderCardShadowPal4:: @ 82F1BFC .incbin "graphics/interface/wonder_card_shadow_4.gbapal" .align 2 -gUnknown_082F1C1C:: @ 82F1C1C +gWonderCardShadowPal5:: @ 82F1C1C .incbin "graphics/interface/wonder_card_shadow_5.gbapal" .align 2 -gUnknown_082F1C3C:: @ 82F1C3C +gWonderCardShadowPal6:: @ 82F1C3C .incbin "graphics/interface/wonder_card_shadow_6.gbapal" .align 2 -gUnknown_082F1C5C:: @ 82F1C5C +gWonderCardShadowPal7:: @ 82F1C5C .incbin "graphics/interface/wonder_card_shadow_7.gbapal" .align 2 -gUnknown_082F1C7C:: @ 82F1C7C +gWonderCardShadowPal8:: @ 82F1C7C .incbin "graphics/interface/wonder_card_shadow_8.gbapal" .align 2 -gUnknown_082F1C9C:: @ 82F1C9C +gWonderCardShadowGfx:: @ 82F1C9C .incbin "graphics/interface/wonder_card_shadow.4bpp.lz" .align 2 gUnknown_082F1D00:: @ 82F1D00 struct CompressedSpriteSheet - .4byte gUnknown_082F1C9C + .4byte gWonderCardShadowGfx .2byte 0x0100 .2byte 0x8000 .align 2 gUnknown_082F1D08:: @ 82F1D08 struct SpritePalette - .4byte gUnknown_082F1B9C + .4byte gWonderCardShadowPal1 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1BBC + .4byte gWonderCardShadowPal2 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1BDC + .4byte gWonderCardShadowPal3 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1BFC + .4byte gWonderCardShadowPal4 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1C1C + .4byte gWonderCardShadowPal5 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1C3C + .4byte gWonderCardShadowPal6 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1C5C + .4byte gWonderCardShadowPal7 .2byte 0x8000 .align 2 - .4byte gUnknown_082F1C7C + .4byte gWonderCardShadowPal8 .2byte 0x8000 .align 2 @@ -2303,14 +2303,14 @@ gUnknown_082F1D48:: @ 82F1D48 struct SpriteTemplate .align 2 gUnknown_082F1D60:: @ 82F1D60 - .4byte 0x00000001, gUnknown_082F0F34, gUnknown_082F1030, gUnknown_082F0E34 - .4byte 0x00001001, gUnknown_082F1124, gUnknown_082F1218, gUnknown_082F0E54 - .4byte 0x00002001, gUnknown_082F1300, gUnknown_082F13D4, gUnknown_082F0E74 - .4byte 0x00003001, gUnknown_082F1300, gUnknown_082F13D4, gUnknown_082F0E94 - .4byte 0x00004001, gUnknown_082F1300, gUnknown_082F13D4, gUnknown_082F0EB4 - .4byte 0x00005001, gUnknown_082F1300, gUnknown_082F13D4, gUnknown_082F0ED4 - .4byte 0x00006001, gUnknown_082F14A8, gUnknown_082F16DC, gUnknown_082F0EF4 - .4byte 0x00007001, gUnknown_082F1824, gUnknown_082F1A54, gUnknown_082F0F14 + .4byte 0x00000001, gWonderCardBgGfx1, gWonderCardBgTilemap1, gWonderCardBgPal1 + .4byte 0x00001001, gWonderCardBgGfx2, gWonderCardBgTilemap2, gWonderCardBgPal2 + .4byte 0x00002001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal3 + .4byte 0x00003001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal4 + .4byte 0x00004001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal5 + .4byte 0x00005001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal6 + .4byte 0x00006001, gWonderCardBgGfx7, gWonderCardBgTilemap7, gWonderCardBgPal7 + .4byte 0x00007001, gWonderCardBgGfx8, gWonderCardBgTilemap8, gWonderCardBgPal8 gUnknown_082F1DE0:: @ 82F1DE0 .incbin "baserom.gba", 0x2f1de0, 0x8 diff --git a/data/strings.s b/data/strings.s index 2abac1437..755cc45bc 100644 --- a/data/strings.s +++ b/data/strings.s @@ -2053,7 +2053,7 @@ gUnknown_085ECF8F:: @ 85ECF8F gUnknown_085ECF99:: @ 85ECF99 .string "TIME$" - .string "ゲ-ムポイント$" + .string "ゲ-ムポイント$" @ "geemupointo" ("game point" in Japanese) gUnknown_085ECFA6:: @ 85ECFA6 .string "{STR_VAR_1}’s TRAINER CARD$" @@ -2108,12 +2108,17 @@ gUnknown_085ED0E0:: @ 85ED0E0 .align 2 .string "{STR_VAR_1} SINGLE$" + .align 2 .string "{STR_VAR_1} DOUBLE$" + .align 2 .string "{STR_VAR_1} MULTI$" + .align 2 .string "{STR_VAR_1} LINK$" + + .align 2 .string "{STR_VAR_1}$" gUnknown_085ED193:: @ 85ED193 diff --git a/graphics/interface/test_textbox.pal b/graphics/interface/unk_textbox_border.pal similarity index 100% rename from graphics/interface/test_textbox.pal rename to graphics/interface/unk_textbox_border.pal diff --git a/graphics/interface/test_textbox.png b/graphics/interface/unk_textbox_border.png similarity index 100% rename from graphics/interface/test_textbox.png rename to graphics/interface/unk_textbox_border.png diff --git a/graphics/interface/wireless_link.bin b/graphics/interface/wireless_link_display.bin similarity index 100% rename from graphics/interface/wireless_link.bin rename to graphics/interface/wireless_link_display.bin diff --git a/graphics/interface/wireless_link.pal b/graphics/interface/wireless_link_display.pal similarity index 100% rename from graphics/interface/wireless_link.pal rename to graphics/interface/wireless_link_display.pal diff --git a/graphics/interface/wireless_link.png b/graphics/interface/wireless_link_display.png similarity index 100% rename from graphics/interface/wireless_link.png rename to graphics/interface/wireless_link_display.png