Mostly decompile text.s

This commit is contained in:
Diegoisawesome
2017-03-27 19:30:49 -05:00
parent 1d95689766
commit 5a8eeb353d
27 changed files with 2795 additions and 3869 deletions

View File

@@ -2883,7 +2883,7 @@ _0814FA36:
_0814FAC6:
cmp r7, 0x16
bne _0814FAE0
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r2, [r0]
movs r1, 0x3
negs r1, r1
@@ -2891,7 +2891,7 @@ _0814FAC6:
b _0814FAE8
.pool
_0814FAE0:
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r2, 0x2
orrs r1, r2
@@ -2949,7 +2949,7 @@ _0814FB54:
lsls r0, 24
lsrs r6, r0, 24
_0814FB5C:
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r2, 0x1
orrs r1, r2

View File

@@ -166,7 +166,7 @@ sub_80D77E4: @ 80D77E4
ands r0, r1
cmp r0, 0
beq _080D7818
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@@ -175,7 +175,7 @@ sub_80D77E4: @ 80D77E4
b _080D7822
.pool
_080D7818:
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r2, 0x1
orrs r1, r2

View File

@@ -2893,7 +2893,7 @@ sub_807109C: @ 807109C
adds r0, r2, 0
ands r0, r1
strb r0, [r3, 0xC]
ldr r3, =gUnknown_03003014
ldr r3, =gTextFlags
ldrb r1, [r3]
movs r0, 0x3
negs r0, r0

View File

@@ -960,7 +960,7 @@ sub_813E1D4: @ 813E1D4
strh r0, [r1]
ldr r0, =gUnknown_02022E22
strh r4, [r0]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x2
orrs r0, r1
@@ -2939,7 +2939,7 @@ _0813F634:
ldr r0, [r4]
bl Free
str r5, [r4]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0

View File

@@ -10,7 +10,7 @@ sub_8098128: @ 8098128
ldr r1, =gUnknown_020375BC
movs r0, 0
strb r0, [r1]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0

View File

@@ -26532,7 +26532,7 @@ sub_80173E0: @ 80173E0
negs r0, r0
ands r0, r1
strb r0, [r2, 0xC]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
@@ -45458,7 +45458,7 @@ _08020C26:
ldr r0, =c2_exit_to_overworld_2_switch
cmp r4, r0
bne _08020C5A
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1
@@ -45585,7 +45585,7 @@ _08020D10:
bl CreateTask
ldr r1, [r6]
strb r0, [r1, 0xA]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0

View File

@@ -139,7 +139,7 @@ DisplayMessageAndContinueTask: @ 8121E7C
ldr r1, [sp, 0x30]
bl StringExpandPlaceholders
_08121EC0:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1

View File

@@ -899,7 +899,7 @@ _080E3586:
movs r0, 0
movs r1, 0
bl sub_81973C4
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1

View File

@@ -735,7 +735,7 @@ _0817A260:
ldr r1, =gUnknown_085E93A9
bl StringExpandPlaceholders
_0817A268:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1

View File

@@ -32554,7 +32554,7 @@ sub_81965D8: @ 81965D8
movs r0, 0xE0
orrs r1, r0
strb r1, [r2, 0xD]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
@@ -32583,7 +32583,7 @@ sub_8196648: @ 8196648
ands r0, r1
cmp r0, 0
beq _0819666C
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r2, 0x1
orrs r1, r2
@@ -32591,7 +32591,7 @@ sub_8196648: @ 8196648
b _08196678
.pool
_0819666C:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@@ -34182,7 +34182,7 @@ AddTextPrinterParametrized: @ 8197238
ands r1, r4
orrs r1, r6
strb r1, [r0, 0xD]
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x3
negs r0, r0
@@ -34211,7 +34211,7 @@ AddTextPrinterForMessage: @ 81972C4
lsls r0, 24
lsrs r0, 24
movs r5, 0
ldr r3, =gUnknown_03003014
ldr r3, =gTextFlags
movs r4, 0x1
ands r0, r4
ldrb r2, [r3]
@@ -34248,7 +34248,7 @@ AddTextPrinterForMessage_2: @ 8197310
sub sp, 0x10
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_03003014
ldr r3, =gTextFlags
movs r4, 0x1
ands r0, r4
ldrb r2, [r3]
@@ -34289,7 +34289,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C
lsrs r0, 24
lsls r3, 24
lsrs r3, 24
ldr r4, =gUnknown_03003014
ldr r4, =gTextFlags
movs r5, 0x1
ands r0, r5
ldrb r2, [r4]
@@ -35036,7 +35036,7 @@ sub_8197948: @ 8197948
thumb_func_start sub_8197964
sub_8197964: @ 8197964
push {lr}
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r0, 0x8
ands r0, r1
@@ -35218,7 +35218,7 @@ AddTextPrinterWithCallbackForMessage: @ 8197A9C
adds r5, r1, 0
lsls r0, 24
lsrs r0, 24
ldr r3, =gUnknown_03003014
ldr r3, =gTextFlags
movs r4, 0x1
ands r0, r4
ldrb r2, [r3]
@@ -82275,7 +82275,7 @@ _081B017A:
movs r0, 0
strb r0, [r6, 0x9]
_081B017E:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x5
negs r0, r0
@@ -88278,7 +88278,7 @@ sub_81B3300: @ 81B3300
movs r2, 0x4F
movs r3, 0xD
bl SetWindowBorderStyle
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@@ -101186,7 +101186,7 @@ _081BA2A6:
beq _081BA2E8
subs r0, r1, 0x1
strb r0, [r6, 0x1E]
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r0, 0x1
ands r0, r1
@@ -101210,7 +101210,7 @@ _081BA2D0:
b _081BA50E
.pool
_081BA2E8:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x4
ands r0, r1

View File

@@ -32680,7 +32680,7 @@ sub_81CC194: @ 81CC194
ands r0, r1
cmp r0, 0
beq _081CC1B8
ldr r0, =gUnknown_03003014
ldr r0, =gTextFlags
ldrb r1, [r0]
movs r2, 0x1
orrs r1, r2
@@ -32688,7 +32688,7 @@ sub_81CC194: @ 81CC194
b _081CC1C4
.pool
_081CC1B8:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r1, [r2]
movs r0, 0x2
negs r0, r0
@@ -46190,7 +46190,7 @@ sub_81D2BF4: @ 81D2BF4
movs r0, 0x3
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
@@ -63097,7 +63097,7 @@ sub_81DB620: @ 81DB620
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
adds r4, r0
lsls r7, r3, 5
ldrb r0, [r4, 0x3]

View File

@@ -3300,7 +3300,7 @@ s9B_unknown: @ 809AC0C
bne _0809AC1C
ldr r3, [r4, 0x64]
_0809AC1C:
ldr r2, =gUnknown_03003014
ldr r2, =gTextFlags
ldrb r0, [r2]
movs r1, 0x4
orrs r0, r1

3592
asm/text.s

File diff suppressed because it is too large Load Diff

View File

@@ -42,7 +42,7 @@ _080031E4:
ldr r0, =gDummyWindowTemplate
ldr r2, [r0]
ldr r3, [r0, 0x4]
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
movs r0, 0
movs r4, 0x1F
mov r8, r4
@@ -165,7 +165,7 @@ _080032CA:
b _08003250
.pool
_0800330C:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
adds r0, r1, 0
adds r0, 0x8
ldr r2, [sp, 0x4]
@@ -233,7 +233,7 @@ AddWindow: @ 8003380
sub sp, 0x4
mov r8, r0
movs r6, 0
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
ldrb r0, [r1]
cmp r0, 0xFF
beq _080033B0
@@ -346,7 +346,7 @@ _0800346A:
b _080034C0
.pool
_08003484:
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r6, 1
adds r1, r6
lsls r1, 2
@@ -394,7 +394,7 @@ AddWindowWithoutTileMap: @ 80034D8
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
ldrb r0, [r1]
cmp r0, 0xFF
beq _080034FE
@@ -437,7 +437,7 @@ _08003528:
b _08003564
.pool
_08003534:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
@@ -474,7 +474,7 @@ RemoveWindow: @ 8003574
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r6, 1
adds r0, r6
lsls r0, 2
@@ -515,7 +515,7 @@ _080035A0:
bl Free
str r5, [r4]
_080035CE:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r6, 1
adds r0, r6
lsls r0, 2
@@ -556,7 +556,7 @@ _08003620:
subs r5, 0x1
cmp r5, 0
bge _0800360A
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
adds r4, r0, 0
adds r4, 0x8
movs r6, 0
@@ -588,7 +588,7 @@ CopyWindowToVram: @ 8003658
lsls r1, 24
lsrs r3, r1, 24
adds r5, r3, 0
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -661,7 +661,7 @@ CopyWindowRectToVram: @ 80036D8
beq _08003782
cmp r3, 0
beq _08003782
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r0, r6, 1
adds r0, r6
lsls r0, 2
@@ -747,7 +747,7 @@ PutWindowTilemap: @ 800378C
sub sp, 0x1C
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -818,7 +818,7 @@ PutWindowRectTilemapOverridePalette: @ 80037EC
lsls r5, 24
lsrs r5, 24
str r5, [sp, 0x20]
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -892,7 +892,7 @@ ClearWindowTilemap: @ 80038A4
sub sp, 0x18
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -949,7 +949,7 @@ PutWindowRectTilemap: @ 80038F4
lsls r4, 24
lsrs r4, 24
mov r8, r4
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -1097,7 +1097,7 @@ BlitBitmapRectToWindow: @ 80039DC
lsrs r4, 16
orrs r4, r5
str r4, [sp, 0x18]
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r5, r0, 1
adds r5, r0
lsls r5, 2
@@ -1194,7 +1194,7 @@ BlitBitmapRectToWindowWithColorKey: @ 8003A9C
lsrs r4, 16
orrs r4, r5
str r4, [sp, 0x18]
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r5, r0, 1
adds r5, r0
lsls r5, 2
@@ -1268,7 +1268,7 @@ FillWindowPixelRect: @ 8003B64
lsls r4, 16
lsrs r4, 16
mov r8, r4
ldr r5, =gUnknown_02020004
ldr r5, =gWindows
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
@@ -1320,7 +1320,7 @@ CopyToWindowPixelBuffer: @ 8003BF0
lsrs r2, r3, 16
cmp r5, 0
beq _08003C24
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
@@ -1335,7 +1335,7 @@ CopyToWindowPixelBuffer: @ 8003BF0
b _08003C3C
.pool
_08003C24:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r4, 1
adds r0, r4
lsls r0, 2
@@ -1362,7 +1362,7 @@ FillWindowPixelBuffer: @ 8003C48
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
ldr r5, =gUnknown_02020004
ldr r5, =gWindows
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
@@ -1412,7 +1412,7 @@ ScrollWindow: @ 8003C94
str r2, [sp]
lsls r3, 24
lsrs r3, 24
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -1929,7 +1929,7 @@ CallWindowFunction: @ 8004058
mov r8, r1
lsls r0, 24
lsrs r0, 24
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
@@ -1988,7 +1988,7 @@ _080040C4:
.4byte _08004120
.4byte _08004134
_080040E4:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
@@ -1998,7 +1998,7 @@ _080040E4:
b _08004144
.pool
_080040F8:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
@@ -2008,7 +2008,7 @@ _080040F8:
b _08004144
.pool
_0800410C:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
@@ -2018,7 +2018,7 @@ _0800410C:
b _08004144
.pool
_08004120:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
@@ -2028,7 +2028,7 @@ _08004120:
b _08004144
.pool
_08004134:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r0, r3, 1
adds r0, r3
lsls r0, 2
@@ -2070,7 +2070,7 @@ _08004168:
.4byte _08004200
.4byte _08004214
_08004188:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2079,7 +2079,7 @@ _08004188:
b _0800422A
.pool
_0800419C:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2088,7 +2088,7 @@ _0800419C:
b _0800422A
.pool
_080041B0:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2097,7 +2097,7 @@ _080041B0:
b _0800422A
.pool
_080041C4:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2106,7 +2106,7 @@ _080041C4:
b _0800422A
.pool
_080041D8:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2115,7 +2115,7 @@ _080041D8:
b _0800422A
.pool
_080041EC:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2124,7 +2124,7 @@ _080041EC:
b _0800422A
.pool
_08004200:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2133,7 +2133,7 @@ _08004200:
b _0800422A
.pool
_08004214:
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
lsls r1, r2, 1
adds r1, r2
lsls r1, 2
@@ -2156,7 +2156,7 @@ GetNumActiveWindowsOnBg: @ 8004230
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
movs r1, 0x1F
_0800423C:
ldrb r0, [r2]
@@ -2192,7 +2192,7 @@ AddWindow8Bit: @ 8004260
push {r5-r7}
mov r9, r0
movs r6, 0
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
ldrb r0, [r1]
cmp r0, 0xFF
beq _0800428E
@@ -2286,7 +2286,7 @@ _08004322:
b _08004356
.pool
_08004338:
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r2, r6, 1
adds r2, r6
lsls r2, 2
@@ -2320,7 +2320,7 @@ FillWindowPixelBuffer8Bit: @ 8004368
lsrs r0, 24
lsls r1, 24
lsrs r5, r1, 24
ldr r6, =gUnknown_02020004
ldr r6, =gWindows
lsls r1, r0, 1
adds r1, r0
lsls r4, r1, 2
@@ -2378,7 +2378,7 @@ FillWindowPixelRect8Bit: @ 80043A8
lsls r4, 16
lsrs r4, 16
mov r8, r4
ldr r5, =gUnknown_02020004
ldr r5, =gWindows
lsls r4, r0, 1
adds r4, r0
lsls r4, 2
@@ -2470,7 +2470,7 @@ BlitBitmapRectToWindow4BitTo8Bit: @ 8004434
lsrs r4, 16
orrs r4, r5
str r4, [sp, 0x1C]
ldr r1, =gUnknown_02020004
ldr r1, =gWindows
lsls r5, r0, 1
adds r5, r0
lsls r5, 2
@@ -2531,7 +2531,7 @@ CopyWindowToVram8Bit: @ 8004500
lsls r1, r0, 1
adds r1, r0
lsls r1, 2
ldr r0, =gUnknown_02020004
ldr r0, =gWindows
adds r3, r1, r0
str r3, [r6]
ldr r4, =gUnknown_02020188
@@ -2585,7 +2585,7 @@ GetNumActiveWindowsOnBg8Bit: @ 8004578
lsls r0, 24
lsrs r4, r0, 24
movs r3, 0
ldr r2, =gUnknown_02020004
ldr r2, =gWindows
movs r1, 0x1F
_08004584:
ldrb r0, [r2]