Merge pull request #160 from Felk/render_begin_end_labelsHEADmaster

name some rendering related labels

1 files changed, 14 insertions, 14 deletions

diff --git a/asm/code_8005A588.s b/asm/code_8005A588.s
index 9e69417..c14275d 100644
--- a/asm/code_8005A588.s
+++ b/asm/code_8005A588.s
@@ -228,7 +228,7 @@ lbl_8005A8B4:
 /* 8005A8BC 0005651C  4B FA 97 45 */	bl memcpy

 /* 8005A8C0 00056520  7C 77 E0 2E */	lwzx r3, r23, r28

 /* 8005A8C4 00056524  48 1E 2E 09 */	bl func_8023D6CC

-/* 8005A8C8 00056528  80 8D A3 D8 */	lwz r4, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005A8C8 00056528  80 8D A3 D8 */	lwz r4, render_context_ptr-_SDA_BASE_(r13)

 /* 8005A8CC 0005652C  7C 7C 1B 78 */	mr r28, r3

 /* 8005A8D0 00056530  88 04 00 7A */	lbz r0, 0x7a(r4)

 /* 8005A8D4 00056534  2C 00 00 00 */	cmpwi r0, 0

@@ -252,7 +252,7 @@ lbl_8005A910:
 /* 8005A910 00056570  7F 83 E3 78 */	mr r3, r28

 /* 8005A914 00056574  7F 04 C3 78 */	mr r4, r24

 /* 8005A918 00056578  48 20 FD 3D */	bl DCFlushRange

-/* 8005A91C 0005657C  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005A91C 0005657C  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

 /* 8005A920 00056580  28 19 00 0A */	cmplwi r25, 0xa

 /* 8005A924 00056584  A0 03 16 FE */	lhz r0, 0x16fe(r3)

 /* 8005A928 00056588  60 00 00 02 */	ori r0, r0, 2

@@ -764,7 +764,7 @@ lbl_8005AFCC:
 /* 8005B004 00056C64  D0 21 00 24 */	stfs f1, 0x24(r1)

 /* 8005B008 00056C68  D0 01 00 2C */	stfs f0, 0x2c(r1)

 lbl_8005B00C:

-/* 8005B00C 00056C6C  81 0D A3 D8 */	lwz r8, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B00C 00056C6C  81 0D A3 D8 */	lwz r8, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B010 00056C70  54 A0 46 3E */	srwi r0, r5, 0x18

 /* 8005B014 00056C74  54 A7 86 3E */	rlwinm r7, r5, 0x10, 0x18, 0x1f

 /* 8005B018 00056C78  54 A6 C6 3E */	rlwinm r6, r5, 0x18, 0x18, 0x1f

@@ -788,7 +788,7 @@ lbl_8005B04C:
 /* 8005B05C 00056CBC  60 00 00 01 */	ori r0, r0, 1

 /* 8005B060 00056CC0  90 03 15 38 */	stw r0, 0x1538(r3)

 lbl_8005B064:

-/* 8005B064 00056CC4  80 CD A3 D8 */	lwz r6, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B064 00056CC4  80 CD A3 D8 */	lwz r6, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B068 00056CC8  38 A0 00 02 */	li r5, 2

 /* 8005B06C 00056CCC  3B E0 00 01 */	li r31, 1

 /* 8005B070 00056CD0  38 80 00 04 */	li r4, 4

@@ -803,7 +803,7 @@ lbl_8005B064:
 /* 8005B094 00056CF4  80 65 00 00 */	lwz r3, 0(r5)

 /* 8005B098 00056CF8  60 63 00 02 */	ori r3, r3, 2

 /* 8005B09C 00056CFC  90 65 00 00 */	stw r3, 0(r5)

-/* 8005B0A0 00056D00  80 AD A3 D8 */	lwz r5, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B0A0 00056D00  80 AD A3 D8 */	lwz r5, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B0A4 00056D04  80 65 16 38 */	lwz r3, 0x1638(r5)

 /* 8005B0A8 00056D08  93 E3 0A 24 */	stw r31, 0xa24(r3)

 /* 8005B0AC 00056D0C  80 65 16 38 */	lwz r3, 0x1638(r5)

@@ -821,10 +821,10 @@ lbl_8005B064:
 /* 8005B0DC 00056D3C  60 00 00 40 */	ori r0, r0, 0x40

 /* 8005B0E0 00056D40  90 03 00 00 */	stw r0, 0(r3)

 /* 8005B0E4 00056D44  80 8D 81 F0 */	lwz r4, lbl_8063D4B0-_SDA_BASE_(r13)

-/* 8005B0E8 00056D48  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B0E8 00056D48  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B0EC 00056D4C  80 84 00 00 */	lwz r4, 0(r4)

 /* 8005B0F0 00056D50  48 1D CF CD */	bl func_802380BC

-/* 8005B0F4 00056D54  81 2D A3 D8 */	lwz r9, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B0F4 00056D54  81 2D A3 D8 */	lwz r9, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B0F8 00056D58  39 00 00 00 */	li r8, 0

 /* 8005B0FC 00056D5C  38 C0 00 07 */	li r6, 7

 /* 8005B100 00056D60  38 A0 00 03 */	li r5, 3

@@ -844,7 +844,7 @@ lbl_8005B064:
 /* 8005B138 00056D98  80 67 00 00 */	lwz r3, 0(r7)

 /* 8005B13C 00056D9C  60 63 00 40 */	ori r3, r3, 0x40

 /* 8005B140 00056DA0  90 67 00 00 */	stw r3, 0(r7)

-/* 8005B144 00056DA4  80 ED A3 D8 */	lwz r7, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B144 00056DA4  80 ED A3 D8 */	lwz r7, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B148 00056DA8  80 67 16 38 */	lwz r3, 0x1638(r7)

 /* 8005B14C 00056DAC  90 C3 0A 44 */	stw r6, 0xa44(r3)

 /* 8005B150 00056DB0  80 67 16 38 */	lwz r3, 0x1638(r7)

@@ -865,7 +865,7 @@ lbl_8005B064:
 /* 8005B18C 00056DEC  80 66 00 00 */	lwz r3, 0(r6)

 /* 8005B190 00056DF0  60 63 00 40 */	ori r3, r3, 0x40

 /* 8005B194 00056DF4  90 66 00 00 */	stw r3, 0(r6)

-/* 8005B198 00056DF8  80 CD A3 D8 */	lwz r6, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B198 00056DF8  80 CD A3 D8 */	lwz r6, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B19C 00056DFC  80 66 16 38 */	lwz r3, 0x1638(r6)

 /* 8005B1A0 00056E00  99 03 0A 3C */	stb r8, 0xa3c(r3)

 /* 8005B1A4 00056E04  80 66 16 38 */	lwz r3, 0x1638(r6)

@@ -878,10 +878,10 @@ lbl_8005B064:
 /* 8005B1C0 00056E20  80 65 00 00 */	lwz r3, 0(r5)

 /* 8005B1C4 00056E24  60 63 00 40 */	ori r3, r3, 0x40

 /* 8005B1C8 00056E28  90 65 00 00 */	stw r3, 0(r5)

-/* 8005B1CC 00056E2C  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

+/* 8005B1CC 00056E2C  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

 /* 8005B1D0 00056E30  90 03 17 38 */	stw r0, 0x1738(r3)

-/* 8005B1D4 00056E34  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

-/* 8005B1D8 00056E38  48 1D 83 55 */	bl func_8023352C

+/* 8005B1D4 00056E34  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

+/* 8005B1D8 00056E38  48 1D 83 55 */	bl begin_drawing

 /* 8005B1DC 00056E3C  C0 3E 00 10 */	lfs f1, 0x10(r30)

 /* 8005B1E0 00056E40  3C 60 CC 01 */	lis r3, 0xCC008000@ha

 /* 8005B1E4 00056E44  C0 1E 00 00 */	lfs f0, 0(r30)

@@ -920,8 +920,8 @@ lbl_8005B064:
 /* 8005B268 00056EC8  90 03 80 00 */	stw r0, -0x8000(r3)

 /* 8005B26C 00056ECC  D0 C3 80 00 */	stfs f6, -0x8000(r3)

 /* 8005B270 00056ED0  D0 E3 80 00 */	stfs f7, -0x8000(r3)

-/* 8005B274 00056ED4  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

-/* 8005B278 00056ED8  48 1D 83 09 */	bl func_80233580

+/* 8005B274 00056ED4  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

+/* 8005B278 00056ED8  48 1D 83 09 */	bl end_drawing

 lbl_8005B27C:

 /* 8005B27C 00056EDC  80 01 00 44 */	lwz r0, 0x44(r1)

 /* 8005B280 00056EE0  83 E1 00 3C */	lwz r31, 0x3c(r1)