From 8efd6b0d114301c0abf62be0cf29c10c28e6f851 Mon Sep 17 00:00:00 2001 From: Made Date: Mon, 18 May 2020 03:09:51 +0200 Subject: fix merge --- arm9/data/rom2_2.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arm9/data/rom2_2.s b/arm9/data/rom2_2.s index 4bdd4119..013410bd 100644 --- a/arm9/data/rom2_2.s +++ b/arm9/data/rom2_2.s @@ -10232,12 +10232,12 @@ FX_AtanTable_: ; 0x02103A38 .byte 0xB0, 0x1E, 0xDB, 0x1E, 0x06, 0x1F, 0x30, 0x1F, 0x5A, 0x1F, 0x84, 0x1F, 0xAE, 0x1F, 0xD7, 0x1F .byte 0x00, 0x20, 0x00, 0x00 - .global UNK_02103B3C -UNK_02103B3C: ; 0x02103B3C + .global sTexPlttStartAddrTable +sTexPlttStartAddrTable: ; 0x02103B3C .byte 0x00, 0x00, 0x80, 0x68, 0x90, 0x68, 0x80, 0x68, 0x94, 0x68, 0x00, 0x00, 0x90, 0x68, 0x80, 0x68 - .global UNK_02103B4C -UNK_02103B4C: ; 0x02103B4C + .global sTexStartAddrTable +sTexStartAddrTable: ; 0x02103B4C .byte 0x00, 0x00 .byte 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x00, 0x20, 0x68, 0x00, 0x00, 0x00, 0x00, 0x00, 0x68 -- cgit v1.2.3