Skip to content

Replaced 2030 references of 766 unique global labels #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seilc merged 1 commit into from
Sep 25, 2020
Merged

Replaced 2030 references of 766 unique global labels #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions asm/Core/p2/iAnim.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ zVolumeInit__Fv:
/* 800BE4D0 000BB2D0 28 00 00 00 */ cmplwi r0, 0
/* 800BE4D4 000BB2D4 41 82 00 64 */ beq lbl_800BE538
/* 800BE4D8 000BB2D8 1C 80 00 14 */ mulli r4, r0, 0x14
/* 800BE4DC 000BB2DC 80 6D 89 E0 */ lwz r3, lbl_803CB2E0-_SDA_BASE_(r13)
/* 800BE4DC 000BB2DC 80 6D 89 E0 */ lwz r3, gActiveHeap-_SDA_BASE_(r13)
/* 800BE4E0 000BB2E0 38 A0 00 00 */ li r5, 0
/* 800BE4E4 000BB2E4 4B F7 54 5D */ bl xMemAlloc__FUiUii
/* 800BE4E8 000BB2E8 90 6D 91 70 */ stw r3, lbl_803CBA70-_SDA_BASE_(r13)
Expand Down Expand Up @@ -118,15 +118,15 @@ zVolume_OccludePrecalc__FP5xVec3:
/* 800BE5E4 000BB3E4 F3 C1 00 E8 */ psq_st f30, 232(r1), 0, qr0
/* 800BE5E8 000BB3E8 BE 61 00 AC */ stmw r19, 0xac(r1)
/* 800BE5EC 000BB3EC 38 00 00 00 */ li r0, 0
/* 800BE5F0 000BB3F0 3C 80 80 3C */ lis r4, lbl_803C32A8@ha
/* 800BE5F4 000BB3F4 3B E4 32 A8 */ addi r31, r4, lbl_803C32A8@l
/* 800BE5F8 000BB3F8 90 0D 91 7C */ stw r0, lbl_803CBA7C-_SDA_BASE_(r13)
/* 800BE5FC 000BB3FC 3C 80 80 3C */ lis r4, lbl_803C32D0@ha
/* 800BE5F0 000BB3F0 3C 80 80 3C */ lis r4, gOccludeList@ha
/* 800BE5F4 000BB3F4 3B E4 32 A8 */ addi r31, r4, gOccludeList@l
/* 800BE5F8 000BB3F8 90 0D 91 7C */ stw r0, gOccludeCalcCount-_SDA_BASE_(r13)
/* 800BE5FC 000BB3FC 3C 80 80 3C */ lis r4, gOccludeCalc@ha
/* 800BE600 000BB400 7C 79 1B 78 */ mr r25, r3
/* 800BE604 000BB404 3B C1 00 6C */ addi r30, r1, 0x6c
/* 800BE608 000BB408 3B A1 00 78 */ addi r29, r1, 0x78
/* 800BE60C 000BB40C 3B 81 00 90 */ addi r28, r1, 0x90
/* 800BE610 000BB410 3B 04 32 D0 */ addi r24, r4, lbl_803C32D0@l
/* 800BE610 000BB410 3B 04 32 D0 */ addi r24, r4, gOccludeCalc@l
/* 800BE614 000BB414 3B 60 00 00 */ li r27, 0
/* 800BE618 000BB418 48 00 02 A0 */ b lbl_800BE8B8
lbl_800BE61C:
Expand All @@ -141,7 +141,7 @@ lbl_800BE61C:
/* 800BE63C 000BB43C 7F 83 E3 78 */ mr r3, r28
/* 800BE640 000BB440 C0 13 00 48 */ lfs f0, 0x48(r19)
/* 800BE644 000BB444 38 81 00 60 */ addi r4, r1, 0x60
/* 800BE648 000BB448 80 0D 91 7C */ lwz r0, lbl_803CBA7C-_SDA_BASE_(r13)
/* 800BE648 000BB448 80 0D 91 7C */ lwz r0, gOccludeCalcCount-_SDA_BASE_(r13)
/* 800BE64C 000BB44C EC 00 38 28 */ fsubs f0, f0, f7
/* 800BE650 000BB450 1C 00 00 50 */ mulli r0, r0, 0x50
/* 800BE654 000BB454 EC DF 38 3A */ fmadds f6, f31, f0, f7
Expand Down Expand Up @@ -297,14 +297,14 @@ lbl_800BE800:
/* 800BE898 000BB698 C0 01 00 58 */ lfs f0, 0x58(r1)
/* 800BE89C 000BB69C D0 3A 00 48 */ stfs f1, 0x48(r26)
/* 800BE8A0 000BB6A0 D0 1A 00 4C */ stfs f0, 0x4c(r26)
/* 800BE8A4 000BB6A4 80 6D 91 7C */ lwz r3, lbl_803CBA7C-_SDA_BASE_(r13)
/* 800BE8A4 000BB6A4 80 6D 91 7C */ lwz r3, gOccludeCalcCount-_SDA_BASE_(r13)
/* 800BE8A8 000BB6A8 38 03 00 01 */ addi r0, r3, 1
/* 800BE8AC 000BB6AC 90 0D 91 7C */ stw r0, lbl_803CBA7C-_SDA_BASE_(r13)
/* 800BE8AC 000BB6AC 90 0D 91 7C */ stw r0, gOccludeCalcCount-_SDA_BASE_(r13)
lbl_800BE8B0:
/* 800BE8B0 000BB6B0 3B FF 00 04 */ addi r31, r31, 4
/* 800BE8B4 000BB6B4 3B 7B 00 01 */ addi r27, r27, 1
lbl_800BE8B8:
/* 800BE8B8 000BB6B8 80 0D 91 78 */ lwz r0, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE8B8 000BB6B8 80 0D 91 78 */ lwz r0, gOccludeCount-_SDA_BASE_(r13)
/* 800BE8BC 000BB6BC 7C 1B 00 00 */ cmpw r27, r0
/* 800BE8C0 000BB6C0 41 80 FD 5C */ blt lbl_800BE61C
/* 800BE8C4 000BB6C4 E3 E1 00 F8 */ psq_l f31, 248(r1), 0, qr0
Expand Down Expand Up @@ -335,14 +335,14 @@ lbl_800BE918:
/* 800BE91C 000BB71C 48 05 A0 79 */ bl Reset__7xVolumeFv
/* 800BE920 000BB720 48 00 00 C0 */ b lbl_800BE9E0
lbl_800BE924:
/* 800BE924 000BB724 80 AD 91 78 */ lwz r5, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE924 000BB724 80 AD 91 78 */ lwz r5, gOccludeCount-_SDA_BASE_(r13)
/* 800BE928 000BB728 2C 05 00 0A */ cmpwi r5, 0xa
/* 800BE92C 000BB72C 40 82 00 0C */ bne lbl_800BE938
/* 800BE930 000BB730 38 60 00 01 */ li r3, 1
/* 800BE934 000BB734 48 00 00 B0 */ b lbl_800BE9E4
lbl_800BE938:
/* 800BE938 000BB738 3C 60 80 3C */ lis r3, lbl_803C32A8@ha
/* 800BE93C 000BB73C 38 63 32 A8 */ addi r3, r3, lbl_803C32A8@l
/* 800BE938 000BB738 3C 60 80 3C */ lis r3, gOccludeList@ha
/* 800BE93C 000BB73C 38 63 32 A8 */ addi r3, r3, gOccludeList@l
/* 800BE940 000BB740 7C A9 03 A6 */ mtctr r5
/* 800BE944 000BB744 2C 05 00 00 */ cmpwi r5, 0
/* 800BE948 000BB748 40 81 00 20 */ ble lbl_800BE968
Expand All @@ -356,35 +356,35 @@ lbl_800BE960:
/* 800BE960 000BB760 38 63 00 04 */ addi r3, r3, 4
/* 800BE964 000BB764 42 00 FF E8 */ bdnz lbl_800BE94C
lbl_800BE968:
/* 800BE968 000BB768 3C 60 80 3C */ lis r3, lbl_803C32A8@ha
/* 800BE968 000BB768 3C 60 80 3C */ lis r3, gOccludeList@ha
/* 800BE96C 000BB76C 54 A0 10 3A */ slwi r0, r5, 2
/* 800BE970 000BB770 38 63 32 A8 */ addi r3, r3, lbl_803C32A8@l
/* 800BE970 000BB770 38 63 32 A8 */ addi r3, r3, gOccludeList@l
/* 800BE974 000BB774 7C 83 01 2E */ stwx r4, r3, r0
/* 800BE978 000BB778 80 6D 91 78 */ lwz r3, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE978 000BB778 80 6D 91 78 */ lwz r3, gOccludeCount-_SDA_BASE_(r13)
/* 800BE97C 000BB77C 38 03 00 01 */ addi r0, r3, 1
/* 800BE980 000BB780 90 0D 91 78 */ stw r0, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE980 000BB780 90 0D 91 78 */ stw r0, gOccludeCount-_SDA_BASE_(r13)
/* 800BE984 000BB784 48 00 00 5C */ b lbl_800BE9E0
lbl_800BE988:
/* 800BE988 000BB788 80 AD 91 78 */ lwz r5, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE98C 000BB78C 3C 60 80 3C */ lis r3, lbl_803C32A8@ha
/* 800BE990 000BB790 38 63 32 A8 */ addi r3, r3, lbl_803C32A8@l
/* 800BE988 000BB788 80 AD 91 78 */ lwz r5, gOccludeCount-_SDA_BASE_(r13)
/* 800BE98C 000BB78C 3C 60 80 3C */ lis r3, gOccludeList@ha
/* 800BE990 000BB790 38 63 32 A8 */ addi r3, r3, gOccludeList@l
/* 800BE994 000BB794 7C A9 03 A6 */ mtctr r5
/* 800BE998 000BB798 2C 05 00 00 */ cmpwi r5, 0
/* 800BE99C 000BB79C 40 81 00 44 */ ble lbl_800BE9E0
lbl_800BE9A0:
/* 800BE9A0 000BB7A0 80 03 00 00 */ lwz r0, 0(r3)
/* 800BE9A4 000BB7A4 7C 00 20 40 */ cmplw r0, r4
/* 800BE9A8 000BB7A8 40 82 00 30 */ bne lbl_800BE9D8
/* 800BE9AC 000BB7AC 3C 60 80 3C */ lis r3, lbl_803C32A8@ha
/* 800BE9AC 000BB7AC 3C 60 80 3C */ lis r3, gOccludeList@ha
/* 800BE9B0 000BB7B0 54 A6 10 3A */ slwi r6, r5, 2
/* 800BE9B4 000BB7B4 38 A3 32 A8 */ addi r5, r3, lbl_803C32A8@l
/* 800BE9B4 000BB7B4 38 A3 32 A8 */ addi r5, r3, gOccludeList@l
/* 800BE9B8 000BB7B8 38 60 00 01 */ li r3, 1
/* 800BE9BC 000BB7BC 7C 85 32 14 */ add r4, r5, r6
/* 800BE9C0 000BB7C0 80 04 FF FC */ lwz r0, -4(r4)
/* 800BE9C4 000BB7C4 7C 05 31 2E */ stwx r0, r5, r6
/* 800BE9C8 000BB7C8 80 8D 91 78 */ lwz r4, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE9C8 000BB7C8 80 8D 91 78 */ lwz r4, gOccludeCount-_SDA_BASE_(r13)
/* 800BE9CC 000BB7CC 38 04 FF FF */ addi r0, r4, -1
/* 800BE9D0 000BB7D0 90 0D 91 78 */ stw r0, lbl_803CBA78-_SDA_BASE_(r13)
/* 800BE9D0 000BB7D0 90 0D 91 78 */ stw r0, gOccludeCount-_SDA_BASE_(r13)
/* 800BE9D4 000BB7D4 48 00 00 10 */ b lbl_800BE9E4
lbl_800BE9D8:
/* 800BE9D8 000BB7D8 38 63 00 04 */ addi r3, r3, 4
Expand Down
14 changes: 7 additions & 7 deletions asm/Core/p2/iCollide.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,18 +1639,18 @@ lbl_800C23D4:
/* 800C241C 000BF21C 7C 1F 20 10 */ subfc r0, r31, r4
/* 800C2420 000BF220 80 AD 91 A4 */ lwz r5, lbl_803CBAA4-_SDA_BASE_(r13)
/* 800C2424 000BF224 7C 7B 19 10 */ subfe r3, r27, r3
/* 800C2428 000BF228 80 8D 91 A0 */ lwz r4, lbl_803CBAA0-_SDA_BASE_(r13)
/* 800C2428 000BF228 80 8D 91 A0 */ lwz r4, collide_rwtime-_SDA_BASE_(r13)
/* 800C242C 000BF22C 7C 05 00 14 */ addc r0, r5, r0
/* 800C2430 000BF230 90 0D 91 A4 */ stw r0, lbl_803CBAA4-_SDA_BASE_(r13)
/* 800C2434 000BF234 7C 04 19 14 */ adde r0, r4, r3
/* 800C2438 000BF238 90 0D 91 A0 */ stw r0, lbl_803CBAA0-_SDA_BASE_(r13)
/* 800C243C 000BF23C 80 6D 91 A8 */ lwz r3, lbl_803CBAA8-_SDA_BASE_(r13)
/* 800C2438 000BF238 90 0D 91 A0 */ stw r0, collide_rwtime-_SDA_BASE_(r13)
/* 800C243C 000BF23C 80 6D 91 A8 */ lwz r3, collide_rwct-_SDA_BASE_(r13)
/* 800C2440 000BF240 38 03 00 01 */ addi r0, r3, 1
/* 800C2444 000BF244 90 0D 91 A8 */ stw r0, lbl_803CBAA8-_SDA_BASE_(r13)
/* 800C2448 000BF248 80 6D 91 A0 */ lwz r3, lbl_803CBAA0-_SDA_BASE_(r13)
/* 800C2444 000BF244 90 0D 91 A8 */ stw r0, collide_rwct-_SDA_BASE_(r13)
/* 800C2448 000BF248 80 6D 91 A0 */ lwz r3, collide_rwtime-_SDA_BASE_(r13)
/* 800C244C 000BF24C 80 8D 91 A4 */ lwz r4, lbl_803CBAA4-_SDA_BASE_(r13)
/* 800C2450 000BF250 48 01 25 31 */ bl iTimeDiffSec__Fx
/* 800C2454 000BF254 80 6D 91 A8 */ lwz r3, lbl_803CBAA8-_SDA_BASE_(r13)
/* 800C2454 000BF254 80 6D 91 A8 */ lwz r3, collide_rwct-_SDA_BASE_(r13)
/* 800C2458 000BF258 3C 00 43 30 */ lis r0, 0x4330
/* 800C245C 000BF25C 90 01 00 58 */ stw r0, 0x58(r1)
/* 800C2460 000BF260 6C 60 80 00 */ xoris r0, r3, 0x8000
Expand All @@ -1659,7 +1659,7 @@ lbl_800C23D4:
/* 800C246C 000BF26C C8 01 00 58 */ lfd f0, 0x58(r1)
/* 800C2470 000BF270 EC 00 10 28 */ fsubs f0, f0, f2
/* 800C2474 000BF274 EC 01 00 24 */ fdivs f0, f1, f0
/* 800C2478 000BF278 D0 0D 91 AC */ stfs f0, lbl_803CBAAC-_SDA_BASE_(r13)
/* 800C2478 000BF278 D0 0D 91 AC */ stfs f0, collide_rwtime_secs-_SDA_BASE_(r13)
/* 800C247C 000BF27C 80 1D 00 00 */ lwz r0, 0(r29)
/* 800C2480 000BF280 54 00 04 EF */ rlwinm. r0, r0, 0, 0x13, 0x17
/* 800C2484 000BF284 41 82 00 A4 */ beq lbl_800C2528
Expand Down
4 changes: 2 additions & 2 deletions asm/Core/p2/iCutscene.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ iCSFileAsyncRead__FP9xCutscenePvUi:
/* 801355BC 001323BC 90 01 00 14 */ stw r0, 0x14(r1)
/* 801355C0 001323C0 38 00 00 01 */ li r0, 1
/* 801355C4 001323C4 28 09 00 00 */ cmplwi r9, 0
/* 801355C8 001323C8 90 AD 96 30 */ stw r5, lbl_803CBF30-_SDA_BASE_(r13)
/* 801355C8 001323C8 90 AD 96 30 */ stw r5, read_sizzze-_SDA_BASE_(r13)
/* 801355CC 001323CC 90 03 00 1C */ stw r0, 0x1c(r3)
/* 801355D0 001323D0 40 81 00 88 */ ble lbl_80135658
/* 801355D4 001323D4 28 09 00 08 */ cmplwi r9, 8
Expand Down Expand Up @@ -403,7 +403,7 @@ lbl_801357E4:
/* 80135800 00132600 80 05 00 00 */ lwz r0, 0(r5)
/* 80135804 00132604 28 00 00 06 */ cmplwi r0, 6
/* 80135808 00132608 40 82 00 50 */ bne lbl_80135858
/* 8013580C 0013260C 80 8D 9F 7C */ lwz r4, lbl_803CC87C-_SDA_BASE_(r13)
/* 8013580C 0013260C 80 8D 9F 7C */ lwz r4, RwEngineInstance-_SDA_BASE_(r13)
/* 80135810 00132610 80 65 00 08 */ lwz r3, 8(r5)
/* 80135814 00132614 81 84 01 34 */ lwz r12, 0x134(r4)
/* 80135818 00132618 7D 89 03 A6 */ mtctr r12
Expand Down
4 changes: 2 additions & 2 deletions asm/Core/p2/iEnv.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,15 @@ iEnvEndRenderFX__FP4iEnv:
/* 800C32B0 000C00B0 80 7F 00 08 */ lwz r3, 8(r31)
/* 800C32B4 000C00B4 28 03 00 00 */ cmplwi r3, 0
/* 800C32B8 000C00B8 41 82 00 34 */ beq lbl_800C32EC
/* 800C32BC 000C00BC 80 8D 91 80 */ lwz r4, lbl_803CBA80-_SDA_BASE_(r13)
/* 800C32BC 000C00BC 80 8D 91 80 */ lwz r4, globalCamera-_SDA_BASE_(r13)
/* 800C32C0 000C00C0 28 04 00 00 */ cmplwi r4, 0
/* 800C32C4 000C00C4 41 82 00 28 */ beq lbl_800C32EC
/* 800C32C8 000C00C8 80 0D 91 B0 */ lwz r0, lbl_803CBAB0-_SDA_BASE_(r13)
/* 800C32CC 000C00CC 2C 00 00 00 */ cmpwi r0, 0
/* 800C32D0 000C00D0 41 82 00 1C */ beq lbl_800C32EC
/* 800C32D4 000C00D4 48 15 BC 75 */ bl RpWorldRemoveCamera
/* 800C32D8 000C00D8 80 7F 00 00 */ lwz r3, 0(r31)
/* 800C32DC 000C00DC 80 8D 91 80 */ lwz r4, lbl_803CBA80-_SDA_BASE_(r13)
/* 800C32DC 000C00DC 80 8D 91 80 */ lwz r4, globalCamera-_SDA_BASE_(r13)
/* 800C32E0 000C00E0 48 15 BC 15 */ bl RpWorldAddCamera
/* 800C32E4 000C00E4 38 00 00 00 */ li r0, 0
/* 800C32E8 000C00E8 90 0D 91 B0 */ stw r0, lbl_803CBAB0-_SDA_BASE_(r13)
Expand Down
Loading