Merge pull request #160 from Felk/render_begin_end_labelsHEADmaster

name some rendering related labels

1 files changed, 13 insertions, 13 deletions

diff --git a/asm/code_80158E50.s b/asm/code_80158E50.s
index 6010920..cf4fd2b 100644
--- a/asm/code_80158E50.s
+++ b/asm/code_80158E50.s
@@ -3338,7 +3338,7 @@ lbl_8015B840:
 /* 8015B84C 001574AC  38 60 00 01 */	li r3, 1

 /* 8015B850 001574B0  4E 80 00 20 */	blr

 lbl_8015B854:

-/* 8015B854 001574B4  80 AD A3 D8 */	lwz r5, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015B854 001574B4  80 AD A3 D8 */	lwz r5, render_context_ptr-_SDA_BASE_(r13)

 /* 8015B858 001574B8  88 05 00 82 */	lbz r0, 0x82(r5)

 /* 8015B85C 001574BC  2C 00 00 00 */	cmpwi r0, 0

 /* 8015B860 001574C0  40 82 00 24 */	bne lbl_8015B884

@@ -4688,7 +4688,7 @@ lbl_8015C518:
 /* 8015C6EC 0015834C  C0 62 8F F4 */	lfs f3, lbl_806415F4-_SDA2_BASE_(r2)

 /* 8015C6F0 00158350  C0 82 8F CC */	lfs f4, lbl_806415CC-_SDA2_BASE_(r2)

 /* 8015C6F4 00158354  48 00 00 E1 */	bl func_8015C7D4

-/* 8015C6F8 00158358  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015C6F8 00158358  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

 /* 8015C6FC 0015835C  38 80 00 28 */	li r4, 0x28

 /* 8015C700 00158360  88 03 00 7A */	lbz r0, 0x7a(r3)

 /* 8015C704 00158364  2C 00 00 00 */	cmpwi r0, 0

@@ -5352,7 +5352,7 @@ lbl_8015D09C:
 /* 8015D0BC 00158D1C  4B EF D9 3D */	bl func_8005A9F8

 /* 8015D0C0 00158D20  88 1B 00 18 */	lbz r0, 0x18(r27)

 /* 8015D0C4 00158D24  3C C0 80 42 */	lis r6, lbl_8041E9B8@ha

-/* 8015D0C8 00158D28  81 0D A3 D8 */	lwz r8, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D0C8 00158D28  81 0D A3 D8 */	lwz r8, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D0CC 00158D2C  38 C6 E9 B8 */	addi r6, r6, lbl_8041E9B8@l

 /* 8015D0D0 00158D30  54 00 18 38 */	slwi r0, r0, 3

 /* 8015D0D4 00158D34  80 FB 00 2C */	lwz r7, 0x2c(r27)

@@ -5384,7 +5384,7 @@ lbl_8015D128:
 /* 8015D138 00158D98  60 00 00 01 */	ori r0, r0, 1

 /* 8015D13C 00158D9C  90 03 15 38 */	stw r0, 0x1538(r3)

 lbl_8015D140:

-/* 8015D140 00158DA0  80 CD A3 D8 */	lwz r6, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D140 00158DA0  80 CD A3 D8 */	lwz r6, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D144 00158DA4  38 A0 00 02 */	li r5, 2

 /* 8015D148 00158DA8  3B E0 00 01 */	li r31, 1

 /* 8015D14C 00158DAC  38 80 00 04 */	li r4, 4

@@ -5399,7 +5399,7 @@ lbl_8015D140:
 /* 8015D170 00158DD0  80 65 00 00 */	lwz r3, 0(r5)

 /* 8015D174 00158DD4  60 63 00 02 */	ori r3, r3, 2

 /* 8015D178 00158DD8  90 65 00 00 */	stw r3, 0(r5)

-/* 8015D17C 00158DDC  80 AD A3 D8 */	lwz r5, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D17C 00158DDC  80 AD A3 D8 */	lwz r5, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D180 00158DE0  80 65 16 38 */	lwz r3, 0x1638(r5)

 /* 8015D184 00158DE4  93 E3 0A 24 */	stw r31, 0xa24(r3)

 /* 8015D188 00158DE8  80 65 16 38 */	lwz r3, 0x1638(r5)

@@ -5416,10 +5416,10 @@ lbl_8015D140:
 /* 8015D1B4 00158E14  80 03 00 00 */	lwz r0, 0(r3)

 /* 8015D1B8 00158E18  60 00 00 40 */	ori r0, r0, 0x40

 /* 8015D1BC 00158E1C  90 03 00 00 */	stw r0, 0(r3)

-/* 8015D1C0 00158E20  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D1C0 00158E20  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D1C4 00158E24  80 9A 01 A8 */	lwz r4, 0x1a8(r26)

 /* 8015D1C8 00158E28  48 0D AE F5 */	bl func_802380BC

-/* 8015D1CC 00158E2C  81 0D A3 D8 */	lwz r8, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D1CC 00158E2C  81 0D A3 D8 */	lwz r8, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D1D0 00158E30  38 00 00 00 */	li r0, 0

 /* 8015D1D4 00158E34  38 C0 00 07 */	li r6, 7

 /* 8015D1D8 00158E38  38 A0 00 03 */	li r5, 3

@@ -5438,7 +5438,7 @@ lbl_8015D140:
 /* 8015D20C 00158E6C  80 67 00 00 */	lwz r3, 0(r7)

 /* 8015D210 00158E70  60 63 00 40 */	ori r3, r3, 0x40

 /* 8015D214 00158E74  90 67 00 00 */	stw r3, 0(r7)

-/* 8015D218 00158E78  80 ED A3 D8 */	lwz r7, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D218 00158E78  80 ED A3 D8 */	lwz r7, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D21C 00158E7C  80 67 16 38 */	lwz r3, 0x1638(r7)

 /* 8015D220 00158E80  90 C3 0A 44 */	stw r6, 0xa44(r3)

 /* 8015D224 00158E84  80 67 16 38 */	lwz r3, 0x1638(r7)

@@ -5459,7 +5459,7 @@ lbl_8015D140:
 /* 8015D260 00158EC0  80 66 00 00 */	lwz r3, 0(r6)

 /* 8015D264 00158EC4  60 63 00 40 */	ori r3, r3, 0x40

 /* 8015D268 00158EC8  90 66 00 00 */	stw r3, 0(r6)

-/* 8015D26C 00158ECC  80 CD A3 D8 */	lwz r6, lbl_8063F698-_SDA_BASE_(r13)

+/* 8015D26C 00158ECC  80 CD A3 D8 */	lwz r6, render_context_ptr-_SDA_BASE_(r13)

 /* 8015D270 00158ED0  80 66 16 38 */	lwz r3, 0x1638(r6)

 /* 8015D274 00158ED4  98 03 0A 3C */	stb r0, 0xa3c(r3)

 /* 8015D278 00158ED8  80 66 16 38 */	lwz r3, 0x1638(r6)

@@ -5472,8 +5472,8 @@ lbl_8015D140:
 /* 8015D294 00158EF4  80 03 00 00 */	lwz r0, 0(r3)

 /* 8015D298 00158EF8  60 00 00 40 */	ori r0, r0, 0x40

 /* 8015D29C 00158EFC  90 03 00 00 */	stw r0, 0(r3)

-/* 8015D2A0 00158F00  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

-/* 8015D2A4 00158F04  48 0D 62 89 */	bl func_8023352C

+/* 8015D2A0 00158F00  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

+/* 8015D2A4 00158F04  48 0D 62 89 */	bl begin_drawing

 /* 8015D2A8 00158F08  3C 60 CC 01 */	lis r3, 0xCC008000@ha

 /* 8015D2AC 00158F0C  80 01 00 08 */	lwz r0, 8(r1)

 /* 8015D2B0 00158F10  B3 C3 80 00 */	sth r30, 0xCC008000@l(r3)

@@ -5504,8 +5504,8 @@ lbl_8015D140:
 /* 8015D314 00158F74  D0 03 80 00 */	stfs f0, -0x8000(r3)

 /* 8015D318 00158F78  C0 02 8F A0 */	lfs f0, lbl_806415A0-_SDA2_BASE_(r2)

 /* 8015D31C 00158F7C  D0 03 80 00 */	stfs f0, -0x8000(r3)

-/* 8015D320 00158F80  80 6D A3 D8 */	lwz r3, lbl_8063F698-_SDA_BASE_(r13)

-/* 8015D324 00158F84  48 0D 62 5D */	bl func_80233580

+/* 8015D320 00158F80  80 6D A3 D8 */	lwz r3, render_context_ptr-_SDA_BASE_(r13)

+/* 8015D324 00158F84  48 0D 62 5D */	bl end_drawing

 /* 8015D328 00158F88  39 61 00 30 */	addi r11, r1, 0x30

 /* 8015D32C 00158F8C  48 06 9E 45 */	bl _restgpr_26

 /* 8015D330 00158F90  80 01 00 34 */	lwz r0, 0x34(r1)