diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-03-18 04:00:15 +0100 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-03-18 04:00:15 +0100 |
commit | 6035511c139549a0291b6b3d43b9b080f792b2b6 (patch) | |
tree | 128cb1580f3c1ac1a6f897ea2e8e703265e88914 /asm | |
parent | d4703599837531d1118b64822c85755f28747ee1 (diff) |
reorganize and add new headers for many files
Diffstat (limited to 'asm')
-rw-r--r-- | asm/battle_message.s | 26 | ||||
-rw-r--r-- | asm/choose_party.s | 38 | ||||
-rw-r--r-- | asm/hall_of_fame.s | 6 | ||||
-rw-r--r-- | asm/reset_rtc_screen.s | 2 | ||||
-rw-r--r-- | asm/rom_81258BC.s | 10 |
5 files changed, 41 insertions, 41 deletions
diff --git a/asm/battle_message.s b/asm/battle_message.s index 17841a4e9..0e3588d14 100644 --- a/asm/battle_message.s +++ b/asm/battle_message.s @@ -16,7 +16,7 @@ sub_8120AA8: @ 8120AA8 lsls r0, 16 lsrs r7, r0, 16 movs r6, 0 - ldr r5, _08120B70 @ =gUnknown_02039270 + ldr r5, _08120B70 @ =gSelectedOrderFromParty ldr r4, _08120B74 @ =gUnknown_02024A60 ldrb r1, [r4] lsls r1, 9 @@ -73,7 +73,7 @@ _08120B10: movs r2, 0 ldr r0, _08120B9C @ =gUnknown_030041C0 mov r8, r0 - ldr r3, _08120B70 @ =gUnknown_02039270 + ldr r3, _08120B70 @ =gSelectedOrderFromParty ldr r1, _08120BA4 @ =gUnknown_03004290 mov r12, r1 ldr r5, _08120BA8 @ =gUnknown_030042B0 @@ -111,7 +111,7 @@ _08120B64: ldr r0, [r0] mov pc, r0 .align 2, 0 -_08120B70: .4byte gUnknown_02039270 +_08120B70: .4byte gSelectedOrderFromParty _08120B74: .4byte gUnknown_02024A60 _08120B78: .4byte gUnknown_02023A64 _08120B7C: .4byte gUnknown_02024C04 @@ -414,7 +414,7 @@ _08120DE4: .4byte gUnknown_08400622 _08120DE8: mov r0, r10 bl sub_8121D1C - ldr r0, _08120E14 @ =gUnknown_02039270 + ldr r0, _08120E14 @ =gSelectedOrderFromParty ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -433,7 +433,7 @@ _08120DE8: bl StringCopy b _08120E38 .align 2, 0 -_08120E14: .4byte gUnknown_02039270 +_08120E14: .4byte gSelectedOrderFromParty _08120E18: .4byte gUnknown_03004290 _08120E1C: .4byte gUnknown_08401674 _08120E20: .4byte 0x02000000 @@ -1368,7 +1368,7 @@ _081215E8: .align 2, 0 _081215F4: .4byte gUnknown_02024A6A _081215F8: - ldr r0, _08121610 @ =gUnknown_02039270 + ldr r0, _08121610 @ =gSelectedOrderFromParty ldr r2, [r0] ldrh r1, [r2] movs r0, 0xB1 @@ -1380,14 +1380,14 @@ _081215F8: adds r0, r2 b _08121634 .align 2, 0 -_08121610: .4byte gUnknown_02039270 +_08121610: .4byte gSelectedOrderFromParty _08121614: .4byte 0x02000000 _08121618: .4byte 0x000160a0 _0812161C: ldrh r1, [r2] b _08121652 _08121620: - ldr r0, _08121640 @ =gUnknown_02039270 + ldr r0, _08121640 @ =gSelectedOrderFromParty ldr r2, [r0] ldrh r1, [r2, 0x2] movs r0, 0xB1 @@ -1404,7 +1404,7 @@ _08121634: adds r4, r0, r1 b _081219E6 .align 2, 0 -_08121640: .4byte gUnknown_02039270 +_08121640: .4byte gSelectedOrderFromParty _08121644: .4byte 0x02000000 _08121648: .4byte 0x000160a0 _0812164C: .4byte gUnknown_08401674 @@ -2274,7 +2274,7 @@ sub_8121D1C: @ 8121D1C push {r4,r5,lr} adds r4, r0, 0 movs r2, 0 - ldr r5, _08121D50 @ =gUnknown_02039270 + ldr r5, _08121D50 @ =gSelectedOrderFromParty ldr r3, _08121D54 @ =gUnknown_084016BC _08121D26: cmp r2, 0x4 @@ -2299,7 +2299,7 @@ _08121D3C: bl StringCopy b _08121D68 .align 2, 0 -_08121D50: .4byte gUnknown_02039270 +_08121D50: .4byte gSelectedOrderFromParty _08121D54: .4byte gUnknown_084016BC _08121D58: .4byte gUnknown_08400E5E _08121D5C: @@ -2329,7 +2329,7 @@ _08121D7E: cmp r0, 0xFF bne _08121D7C ldr r1, _08121DB4 @ =gUnknown_084016BC - ldr r5, _08121DB8 @ =gUnknown_02039270 + ldr r5, _08121DB8 @ =gSelectedOrderFromParty movs r0, 0 lsls r0, 1 adds r2, r0, r1 @@ -2356,7 +2356,7 @@ _08121DA8: mov pc, r0 .align 2, 0 _08121DB4: .4byte gUnknown_084016BC -_08121DB8: .4byte gUnknown_02039270 +_08121DB8: .4byte gSelectedOrderFromParty _08121DBC: .4byte _08121DC0 .align 2, 0 _08121DC0: diff --git a/asm/choose_party.s b/asm/choose_party.s index 673933814..9995ceb30 100644 --- a/asm/choose_party.s +++ b/asm/choose_party.s @@ -47,7 +47,7 @@ _08121E54: .4byte 0x00000263 sub_8121E58: @ 8121E58 push {lr} movs r1, 0 - ldr r3, _08121E74 @ =gUnknown_02039270 + ldr r3, _08121E74 @ =gSelectedOrderFromParty movs r2, 0 _08121E60: adds r0, r1, r3 @@ -60,7 +60,7 @@ _08121E60: pop {r0} bx r0 .align 2, 0 -_08121E74: .4byte gUnknown_02039270 +_08121E74: .4byte gSelectedOrderFromParty thumb_func_end sub_8121E58 thumb_func_start sub_8121E78 @@ -192,7 +192,7 @@ _08121F78: _08121F7E: cmp r4, 0x2 bhi _08121FA0 - ldr r0, _08121FC4 @ =gUnknown_02039270 + ldr r0, _08121FC4 @ =gSelectedOrderFromParty adds r0, r4, r0 ldrb r0, [r0] cmp r0, r6 @@ -223,7 +223,7 @@ _08121FA0: bl sub_806BC3C b _08121FD4 .align 2, 0 -_08121FC4: .4byte gUnknown_02039270 +_08121FC4: .4byte gSelectedOrderFromParty _08121FC8: .4byte gPlayerParty _08121FCC: adds r0, r5, 0 @@ -372,7 +372,7 @@ sub_81220C8: @ 81220C8 ldrb r0, [r0] cmp r0, 0 beq _081221A2 - ldr r0, _081220F4 @ =gUnknown_02039270 + ldr r0, _081220F4 @ =gSelectedOrderFromParty ldrb r0, [r0, 0x2] cmp r0, 0 bne _08122100 @@ -381,7 +381,7 @@ sub_81220C8: @ 81220C8 .align 2, 0 _081220EC: .4byte 0x0201b000 _081220F0: .4byte 0x00000263 -_081220F4: .4byte gUnknown_02039270 +_081220F4: .4byte gSelectedOrderFromParty _081220F8: movs r0, 0x12 b _081221A4 @@ -391,7 +391,7 @@ _081220FC: _08122100: movs r5, 0 _08122102: - ldr r4, _081221B4 @ =gUnknown_02039270 + ldr r4, _081221B4 @ =gSelectedOrderFromParty adds r4, r5, r4 ldrb r0, [r4] movs r1, 0x64 @@ -430,7 +430,7 @@ _0812214A: add r0, r9 movs r1, 0 ldrsh r4, [r0, r1] - ldr r0, _081221B4 @ =gUnknown_02039270 + ldr r0, _081221B4 @ =gSelectedOrderFromParty adds r6, r5, r0 ldrb r0, [r6] mov r2, r8 @@ -481,7 +481,7 @@ _081221A4: pop {r1} bx r1 .align 2, 0 -_081221B4: .4byte gUnknown_02039270 +_081221B4: .4byte gSelectedOrderFromParty _081221B8: .4byte gUnknown_030042FC _081221BC: .4byte 0x0201b000 _081221C0: .4byte 0x00000282 @@ -495,7 +495,7 @@ sub_81221CC: @ 81221CC lsls r0, 24 lsrs r2, r0, 24 movs r1, 0 - ldr r3, _081221E4 @ =gUnknown_02039270 + ldr r3, _081221E4 @ =gSelectedOrderFromParty _081221D6: adds r0, r1, r3 ldrb r0, [r0] @@ -504,7 +504,7 @@ _081221D6: movs r0, 0x1 b _081221F4 .align 2, 0 -_081221E4: .4byte gUnknown_02039270 +_081221E4: .4byte gSelectedOrderFromParty _081221E8: adds r0, r1, 0x1 lsls r0, 24 @@ -868,7 +868,7 @@ sub_81224A8: @ 81224A8 .align 2, 0 _081224CC: .4byte gTasks _081224D0: - ldr r0, _081224F8 @ =gUnknown_02039270 + ldr r0, _081224F8 @ =gSelectedOrderFromParty ldrb r0, [r0] cmp r0, 0 beq _08122504 @@ -888,7 +888,7 @@ _081224D0: str r1, [r0] b _08122520 .align 2, 0 -_081224F8: .4byte gUnknown_02039270 +_081224F8: .4byte gSelectedOrderFromParty _081224FC: .4byte gTasks _08122500: .4byte sub_8122450 _08122504: @@ -1088,7 +1088,7 @@ sub_8122694: @ 8122694 lsls r0, 24 lsrs r5, r0, 24 movs r4, 0 - ldr r3, _081226D4 @ =gUnknown_02039270 + ldr r3, _081226D4 @ =gSelectedOrderFromParty ldr r2, _081226D8 @ =gUnknown_03005CE0 _081226A0: adds r1, r4, r3 @@ -1116,7 +1116,7 @@ _081226CC: bl sub_8122838 b _08122716 .align 2, 0 -_081226D4: .4byte gUnknown_02039270 +_081226D4: .4byte gSelectedOrderFromParty _081226D8: .4byte gUnknown_03005CE0 _081226DC: adds r0, r4, 0x1 @@ -1197,7 +1197,7 @@ sub_8122770: @ 8122770 lsrs r6, r0, 24 movs r4, 0 ldr r5, _08122798 @ =gUnknown_03005CE0 - ldr r3, _0812279C @ =gUnknown_02039270 + ldr r3, _0812279C @ =gSelectedOrderFromParty _0812277C: adds r2, r4, r3 ldrb r1, [r2] @@ -1214,7 +1214,7 @@ _0812277C: b _081227BE .align 2, 0 _08122798: .4byte gUnknown_03005CE0 -_0812279C: .4byte gUnknown_02039270 +_0812279C: .4byte gSelectedOrderFromParty _081227A0: ldrb r0, [r3, 0x1] strb r0, [r3] @@ -1237,7 +1237,7 @@ _081227BE: ldrb r0, [r5] movs r1, 0x70 bl sub_806BC3C - ldr r4, _081227F8 @ =gUnknown_02039270 + ldr r4, _081227F8 @ =gSelectedOrderFromParty ldrb r0, [r4] cmp r0, 0 beq _081227DA @@ -1262,7 +1262,7 @@ _081227EC: pop {r0} bx r0 .align 2, 0 -_081227F8: .4byte gUnknown_02039270 +_081227F8: .4byte gSelectedOrderFromParty thumb_func_end sub_8122770 thumb_func_start sub_81227FC diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index f0295656c..3ad85d7cf 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -539,11 +539,11 @@ sub_8142274: @ 8142274 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _081422A8 @ =gUnknown_03005EBC + ldr r1, _081422A8 @ =gGameContinueCallback ldr r0, _081422AC @ =sub_8141FC4 str r0, [r1] movs r0, 0x3 - bl sub_8125D44 + bl TrySavingData movs r0, 0x37 bl PlaySE ldr r1, _081422B0 @ =gTasks @@ -559,7 +559,7 @@ sub_8142274: @ 8142274 pop {r0} bx r0 .align 2, 0 -_081422A8: .4byte gUnknown_03005EBC +_081422A8: .4byte gGameContinueCallback _081422AC: .4byte sub_8141FC4 _081422B0: .4byte gTasks _081422B4: .4byte sub_81422B8 diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 1b58b417b..2fbc559c8 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -1238,7 +1238,7 @@ _0806AE54: .4byte 0x00004040 _0806AE58: .4byte gSystemText_ClockResetDataSave _0806AE5C: movs r0, 0 - bl sub_8125D44 + bl TrySavingData lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s index a169258ae..483209fd5 100644 --- a/asm/rom_81258BC.s +++ b/asm/rom_81258BC.s @@ -21701,7 +21701,7 @@ _08135750: .4byte 0x00000564 _08135754: movs r2, 0 ldr r4, _0813576C @ =gSaveBlock2 + 0x565 - ldr r3, _08135770 @ =gUnknown_02039270 + ldr r3, _08135770 @ =gSelectedOrderFromParty _0813575A: adds r0, r2, r4 adds r1, r2, r3 @@ -21713,7 +21713,7 @@ _0813575A: b _0813589A .align 2, 0 _0813576C: .4byte gSaveBlock2 + 0x565 -_08135770: .4byte gUnknown_02039270 +_08135770: .4byte gSelectedOrderFromParty _08135774: ldr r3, _081357C0 @ =0x00000564 adds r0, r5, r3 @@ -22042,7 +22042,7 @@ _08135A10: .4byte 0x00000554 sub_8135A14: @ 8135A14 push {r4,lr} movs r2, 0 - ldr r4, _08135A34 @ =gUnknown_02039270 + ldr r4, _08135A34 @ =gSelectedOrderFromParty ldr r3, _08135A38 @ =gSaveBlock2 + 0x565 _08135A1C: adds r0, r2, r4 @@ -22057,7 +22057,7 @@ _08135A1C: pop {r0} bx r0 .align 2, 0 -_08135A34: .4byte gUnknown_02039270 +_08135A34: .4byte gSelectedOrderFromParty _08135A38: .4byte gSaveBlock2 + 0x565 thumb_func_end sub_8135A14 @@ -22293,7 +22293,7 @@ _08135BF8: orrs r0, r1 strb r0, [r2] movs r0, 0x2 - bl sub_8125D44 + bl TrySavingData pop {r4,r5} pop {r0} bx r0 |