remove hashtable.s

2 files changed, 8 insertions, 355 deletions

diff --git a/asm/hashtable.s b/asm/hashtable.s
deleted file mode 100644
index 31c524b..0000000
--- a/asm/hashtable.s
+++ /dev/null
@@ -1,347 +0,0 @@
-.include "macros.inc"

-

-.section .text, "ax"  # 0x80006980 - 0x803E1E60

-

-.global TableNew

-TableNew:

-/* 8033680C 0033246C  7C A9 2B 78 */	mr r9, r5

-/* 80336810 00332470  7C C0 33 78 */	mr r0, r6

-/* 80336814 00332474  7C E8 3B 78 */	mr r8, r7

-/* 80336818 00332478  38 A0 00 04 */	li r5, 4

-/* 8033681C 0033247C  7D 26 4B 78 */	mr r6, r9

-/* 80336820 00332480  7C 07 03 78 */	mr r7, r0

-/* 80336824 00332484  48 00 00 04 */	b TableNew2

-

-.global TableNew2

-TableNew2:

-/* 80336828 00332488  94 21 FF D0 */	stwu r1, -0x30(r1)

-/* 8033682C 0033248C  7C 08 02 A6 */	mflr r0

-/* 80336830 00332490  90 01 00 34 */	stw r0, 0x34(r1)

-/* 80336834 00332494  39 61 00 30 */	addi r11, r1, 0x30

-/* 80336838 00332498  4B E9 08 E1 */	bl _savegpr_23

-/* 8033683C 0033249C  7C 77 1B 78 */	mr r23, r3

-/* 80336840 003324A0  7C 98 23 78 */	mr r24, r4

-/* 80336844 003324A4  7C B9 2B 78 */	mr r25, r5

-/* 80336848 003324A8  7C DA 33 78 */	mr r26, r6

-/* 8033684C 003324AC  7C FB 3B 78 */	mr r27, r7

-/* 80336850 003324B0  7D 1C 43 78 */	mr r28, r8

-/* 80336854 003324B4  38 60 00 14 */	li r3, 0x14

-/* 80336858 003324B8  48 00 2A BD */	bl gsimalloc

-/* 8033685C 003324BC  7C 7E 1B 78 */	mr r30, r3

-/* 80336860 003324C0  57 03 10 3A */	slwi r3, r24, 2

-/* 80336864 003324C4  48 00 2A B1 */	bl gsimalloc

-/* 80336868 003324C8  90 7E 00 00 */	stw r3, 0(r30)

-/* 8033686C 003324CC  3B A0 00 00 */	li r29, 0

-/* 80336870 003324D0  3B E0 00 00 */	li r31, 0

-/* 80336874 003324D4  48 00 00 24 */	b lbl_80336898

-lbl_80336878:

-/* 80336878 003324D8  7E E3 BB 78 */	mr r3, r23

-/* 8033687C 003324DC  7F 24 CB 78 */	mr r4, r25

-/* 80336880 003324E0  7F 85 E3 78 */	mr r5, r28

-/* 80336884 003324E4  4B FF F5 35 */	bl ArrayNew

-/* 80336888 003324E8  80 9E 00 00 */	lwz r4, 0(r30)

-/* 8033688C 003324EC  3B BD 00 01 */	addi r29, r29, 1

-/* 80336890 003324F0  7C 64 F9 2E */	stwx r3, r4, r31

-/* 80336894 003324F4  3B FF 00 04 */	addi r31, r31, 4

-lbl_80336898:

-/* 80336898 003324F8  7C 1D C0 00 */	cmpw r29, r24

-/* 8033689C 003324FC  41 80 FF DC */	blt lbl_80336878

-/* 803368A0 00332500  93 1E 00 04 */	stw r24, 4(r30)

-/* 803368A4 00332504  39 61 00 30 */	addi r11, r1, 0x30

-/* 803368A8 00332508  7F C3 F3 78 */	mr r3, r30

-/* 803368AC 0033250C  93 9E 00 08 */	stw r28, 8(r30)

-/* 803368B0 00332510  93 7E 00 10 */	stw r27, 0x10(r30)

-/* 803368B4 00332514  93 5E 00 0C */	stw r26, 0xc(r30)

-/* 803368B8 00332518  4B E9 08 AD */	bl _restgpr_23

-/* 803368BC 0033251C  80 01 00 34 */	lwz r0, 0x34(r1)

-/* 803368C0 00332520  7C 08 03 A6 */	mtlr r0

-/* 803368C4 00332524  38 21 00 30 */	addi r1, r1, 0x30

-/* 803368C8 00332528  4E 80 00 20 */	blr

-

-.global TableFree

-TableFree:

-/* 803368CC 0033252C  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 803368D0 00332530  7C 08 02 A6 */	mflr r0

-/* 803368D4 00332534  2C 03 00 00 */	cmpwi r3, 0

-/* 803368D8 00332538  90 01 00 24 */	stw r0, 0x24(r1)

-/* 803368DC 0033253C  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 803368E0 00332540  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 803368E4 00332544  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 803368E8 00332548  7C 7D 1B 78 */	mr r29, r3

-/* 803368EC 0033254C  41 82 00 40 */	beq lbl_8033692C

-/* 803368F0 00332550  3B C0 00 00 */	li r30, 0

-/* 803368F4 00332554  3B E0 00 00 */	li r31, 0

-/* 803368F8 00332558  48 00 00 18 */	b lbl_80336910

-lbl_803368FC:

-/* 803368FC 0033255C  80 7D 00 00 */	lwz r3, 0(r29)

-/* 80336900 00332560  7C 63 F8 2E */	lwzx r3, r3, r31

-/* 80336904 00332564  4B FF F5 51 */	bl ArrayFree

-/* 80336908 00332568  3B FF 00 04 */	addi r31, r31, 4

-/* 8033690C 0033256C  3B DE 00 01 */	addi r30, r30, 1

-lbl_80336910:

-/* 80336910 00332570  80 1D 00 04 */	lwz r0, 4(r29)

-/* 80336914 00332574  7C 1E 00 00 */	cmpw r30, r0

-/* 80336918 00332578  41 80 FF E4 */	blt lbl_803368FC

-/* 8033691C 0033257C  80 7D 00 00 */	lwz r3, 0(r29)

-/* 80336920 00332580  48 00 2A 19 */	bl gsifree

-/* 80336924 00332584  7F A3 EB 78 */	mr r3, r29

-/* 80336928 00332588  48 00 2A 11 */	bl gsifree

-lbl_8033692C:

-/* 8033692C 0033258C  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336930 00332590  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 80336934 00332594  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 80336938 00332598  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 8033693C 0033259C  7C 08 03 A6 */	mtlr r0

-/* 80336940 003325A0  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336944 003325A4  4E 80 00 20 */	blr

-

-.global TableCount

-TableCount:

-/* 80336948 003325A8  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 8033694C 003325AC  7C 08 02 A6 */	mflr r0

-/* 80336950 003325B0  2C 03 00 00 */	cmpwi r3, 0

-/* 80336954 003325B4  90 01 00 24 */	stw r0, 0x24(r1)

-/* 80336958 003325B8  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 8033695C 003325BC  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 80336960 003325C0  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 80336964 003325C4  3B A0 00 00 */	li r29, 0

-/* 80336968 003325C8  93 81 00 10 */	stw r28, 0x10(r1)

-/* 8033696C 003325CC  7C 7C 1B 78 */	mr r28, r3

-/* 80336970 003325D0  40 82 00 0C */	bne lbl_8033697C

-/* 80336974 003325D4  38 60 00 00 */	li r3, 0

-/* 80336978 003325D8  48 00 00 38 */	b lbl_803369B0

-lbl_8033697C:

-/* 8033697C 003325DC  3B C0 00 00 */	li r30, 0

-/* 80336980 003325E0  3B E0 00 00 */	li r31, 0

-/* 80336984 003325E4  48 00 00 1C */	b lbl_803369A0

-lbl_80336988:

-/* 80336988 003325E8  80 7C 00 00 */	lwz r3, 0(r28)

-/* 8033698C 003325EC  7C 63 F8 2E */	lwzx r3, r3, r31

-/* 80336990 003325F0  4B FF F5 59 */	bl ArrayLength

-/* 80336994 003325F4  7F BD 1A 14 */	add r29, r29, r3

-/* 80336998 003325F8  3B FF 00 04 */	addi r31, r31, 4

-/* 8033699C 003325FC  3B DE 00 01 */	addi r30, r30, 1

-lbl_803369A0:

-/* 803369A0 00332600  80 1C 00 04 */	lwz r0, 4(r28)

-/* 803369A4 00332604  7C 1E 00 00 */	cmpw r30, r0

-/* 803369A8 00332608  41 80 FF E0 */	blt lbl_80336988

-/* 803369AC 0033260C  7F A3 EB 78 */	mr r3, r29

-lbl_803369B0:

-/* 803369B0 00332610  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 803369B4 00332614  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 803369B8 00332618  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 803369BC 0033261C  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 803369C0 00332620  83 81 00 10 */	lwz r28, 0x10(r1)

-/* 803369C4 00332624  7C 08 03 A6 */	mtlr r0

-/* 803369C8 00332628  38 21 00 20 */	addi r1, r1, 0x20

-/* 803369CC 0033262C  4E 80 00 20 */	blr

-

-.global TableEnter

-TableEnter:

-/* 803369D0 00332630  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 803369D4 00332634  7C 08 02 A6 */	mflr r0

-/* 803369D8 00332638  2C 03 00 00 */	cmpwi r3, 0

-/* 803369DC 0033263C  90 01 00 24 */	stw r0, 0x24(r1)

-/* 803369E0 00332640  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 803369E4 00332644  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 803369E8 00332648  7C 9E 23 78 */	mr r30, r4

-/* 803369EC 0033264C  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 803369F0 00332650  7C 7D 1B 78 */	mr r29, r3

-/* 803369F4 00332654  41 82 00 68 */	beq lbl_80336A5C

-/* 803369F8 00332658  81 9D 00 0C */	lwz r12, 0xc(r29)

-/* 803369FC 0033265C  7F C3 F3 78 */	mr r3, r30

-/* 80336A00 00332660  80 9D 00 04 */	lwz r4, 4(r29)

-/* 80336A04 00332664  7D 89 03 A6 */	mtctr r12

-/* 80336A08 00332668  4E 80 04 21 */	bctrl

-/* 80336A0C 0033266C  80 DD 00 00 */	lwz r6, 0(r29)

-/* 80336A10 00332670  54 7F 10 3A */	slwi r31, r3, 2

-/* 80336A14 00332674  80 BD 00 10 */	lwz r5, 0x10(r29)

-/* 80336A18 00332678  7F C4 F3 78 */	mr r4, r30

-/* 80336A1C 0033267C  7C 66 F8 2E */	lwzx r3, r6, r31

-/* 80336A20 00332680  38 C0 00 00 */	li r6, 0

-/* 80336A24 00332684  38 E0 00 00 */	li r7, 0

-/* 80336A28 00332688  4B FF FA 09 */	bl ArraySearch

-/* 80336A2C 0033268C  2C 03 FF FF */	cmpwi r3, -1

-/* 80336A30 00332690  40 82 00 18 */	bne lbl_80336A48

-/* 80336A34 00332694  80 7D 00 00 */	lwz r3, 0(r29)

-/* 80336A38 00332698  7F C4 F3 78 */	mr r4, r30

-/* 80336A3C 0033269C  7C 63 F8 2E */	lwzx r3, r3, r31

-/* 80336A40 003326A0  4B FF F4 E1 */	bl ArrayAppend

-/* 80336A44 003326A4  48 00 00 18 */	b lbl_80336A5C

-lbl_80336A48:

-/* 80336A48 003326A8  80 DD 00 00 */	lwz r6, 0(r29)

-/* 80336A4C 003326AC  7C 65 1B 78 */	mr r5, r3

-/* 80336A50 003326B0  7F C4 F3 78 */	mr r4, r30

-/* 80336A54 003326B4  7C 66 F8 2E */	lwzx r3, r6, r31

-/* 80336A58 003326B8  4B FF F9 09 */	bl ArrayReplaceAt

-lbl_80336A5C:

-/* 80336A5C 003326BC  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336A60 003326C0  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 80336A64 003326C4  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 80336A68 003326C8  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 80336A6C 003326CC  7C 08 03 A6 */	mtlr r0

-/* 80336A70 003326D0  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336A74 003326D4  4E 80 00 20 */	blr

-

-.global TableRemove

-TableRemove:

-/* 80336A78 003326D8  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 80336A7C 003326DC  7C 08 02 A6 */	mflr r0

-/* 80336A80 003326E0  2C 03 00 00 */	cmpwi r3, 0

-/* 80336A84 003326E4  90 01 00 24 */	stw r0, 0x24(r1)

-/* 80336A88 003326E8  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 80336A8C 003326EC  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 80336A90 003326F0  7C 9E 23 78 */	mr r30, r4

-/* 80336A94 003326F4  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 80336A98 003326F8  7C 7D 1B 78 */	mr r29, r3

-/* 80336A9C 003326FC  40 82 00 0C */	bne lbl_80336AA8

-/* 80336AA0 00332700  38 60 00 00 */	li r3, 0

-/* 80336AA4 00332704  48 00 00 5C */	b lbl_80336B00

-lbl_80336AA8:

-/* 80336AA8 00332708  81 9D 00 0C */	lwz r12, 0xc(r29)

-/* 80336AAC 0033270C  7F C3 F3 78 */	mr r3, r30

-/* 80336AB0 00332710  80 9D 00 04 */	lwz r4, 4(r29)

-/* 80336AB4 00332714  7D 89 03 A6 */	mtctr r12

-/* 80336AB8 00332718  4E 80 04 21 */	bctrl

-/* 80336ABC 0033271C  80 DD 00 00 */	lwz r6, 0(r29)

-/* 80336AC0 00332720  54 7F 10 3A */	slwi r31, r3, 2

-/* 80336AC4 00332724  80 BD 00 10 */	lwz r5, 0x10(r29)

-/* 80336AC8 00332728  7F C4 F3 78 */	mr r4, r30

-/* 80336ACC 0033272C  7C 66 F8 2E */	lwzx r3, r6, r31

-/* 80336AD0 00332730  38 C0 00 00 */	li r6, 0

-/* 80336AD4 00332734  38 E0 00 00 */	li r7, 0

-/* 80336AD8 00332738  4B FF F9 59 */	bl ArraySearch

-/* 80336ADC 0033273C  2C 03 FF FF */	cmpwi r3, -1

-/* 80336AE0 00332740  40 82 00 0C */	bne lbl_80336AEC

-/* 80336AE4 00332744  38 60 00 00 */	li r3, 0

-/* 80336AE8 00332748  48 00 00 18 */	b lbl_80336B00

-lbl_80336AEC:

-/* 80336AEC 0033274C  80 BD 00 00 */	lwz r5, 0(r29)

-/* 80336AF0 00332750  7C 64 1B 78 */	mr r4, r3

-/* 80336AF4 00332754  7C 65 F8 2E */	lwzx r3, r5, r31

-/* 80336AF8 00332758  4B FF F7 79 */	bl ArrayDeleteAt

-/* 80336AFC 0033275C  38 60 00 01 */	li r3, 1

-lbl_80336B00:

-/* 80336B00 00332760  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336B04 00332764  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 80336B08 00332768  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 80336B0C 0033276C  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 80336B10 00332770  7C 08 03 A6 */	mtlr r0

-/* 80336B14 00332774  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336B18 00332778  4E 80 00 20 */	blr

-

-.global TableLookup

-TableLookup:

-/* 80336B1C 0033277C  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 80336B20 00332780  7C 08 02 A6 */	mflr r0

-/* 80336B24 00332784  2C 03 00 00 */	cmpwi r3, 0

-/* 80336B28 00332788  90 01 00 24 */	stw r0, 0x24(r1)

-/* 80336B2C 0033278C  93 E1 00 1C */	stw r31, 0x1c(r1)

-/* 80336B30 00332790  93 C1 00 18 */	stw r30, 0x18(r1)

-/* 80336B34 00332794  7C 9E 23 78 */	mr r30, r4

-/* 80336B38 00332798  93 A1 00 14 */	stw r29, 0x14(r1)

-/* 80336B3C 0033279C  7C 7D 1B 78 */	mr r29, r3

-/* 80336B40 003327A0  40 82 00 0C */	bne lbl_80336B4C

-/* 80336B44 003327A4  38 60 00 00 */	li r3, 0

-/* 80336B48 003327A8  48 00 00 58 */	b lbl_80336BA0

-lbl_80336B4C:

-/* 80336B4C 003327AC  81 9D 00 0C */	lwz r12, 0xc(r29)

-/* 80336B50 003327B0  7F C3 F3 78 */	mr r3, r30

-/* 80336B54 003327B4  80 9D 00 04 */	lwz r4, 4(r29)

-/* 80336B58 003327B8  7D 89 03 A6 */	mtctr r12

-/* 80336B5C 003327BC  4E 80 04 21 */	bctrl

-/* 80336B60 003327C0  80 DD 00 00 */	lwz r6, 0(r29)

-/* 80336B64 003327C4  54 7F 10 3A */	slwi r31, r3, 2

-/* 80336B68 003327C8  80 BD 00 10 */	lwz r5, 0x10(r29)

-/* 80336B6C 003327CC  7F C4 F3 78 */	mr r4, r30

-/* 80336B70 003327D0  7C 66 F8 2E */	lwzx r3, r6, r31

-/* 80336B74 003327D4  38 C0 00 00 */	li r6, 0

-/* 80336B78 003327D8  38 E0 00 00 */	li r7, 0

-/* 80336B7C 003327DC  4B FF F8 B5 */	bl ArraySearch

-/* 80336B80 003327E0  2C 03 FF FF */	cmpwi r3, -1

-/* 80336B84 003327E4  40 82 00 0C */	bne lbl_80336B90

-/* 80336B88 003327E8  38 60 00 00 */	li r3, 0

-/* 80336B8C 003327EC  48 00 00 14 */	b lbl_80336BA0

-lbl_80336B90:

-/* 80336B90 003327F0  80 BD 00 00 */	lwz r5, 0(r29)

-/* 80336B94 003327F4  7C 64 1B 78 */	mr r4, r3

-/* 80336B98 003327F8  7C 65 F8 2E */	lwzx r3, r5, r31

-/* 80336B9C 003327FC  4B FF F3 55 */	bl ArrayNth

-lbl_80336BA0:

-/* 80336BA0 00332800  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336BA4 00332804  83 E1 00 1C */	lwz r31, 0x1c(r1)

-/* 80336BA8 00332808  83 C1 00 18 */	lwz r30, 0x18(r1)

-/* 80336BAC 0033280C  83 A1 00 14 */	lwz r29, 0x14(r1)

-/* 80336BB0 00332810  7C 08 03 A6 */	mtlr r0

-/* 80336BB4 00332814  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336BB8 00332818  4E 80 00 20 */	blr

-

-.global TableMapSafe

-TableMapSafe:

-/* 80336BBC 0033281C  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 80336BC0 00332820  7C 08 02 A6 */	mflr r0

-/* 80336BC4 00332824  90 01 00 24 */	stw r0, 0x24(r1)

-/* 80336BC8 00332828  39 61 00 20 */	addi r11, r1, 0x20

-/* 80336BCC 0033282C  4B E9 05 5D */	bl _savegpr_27

-/* 80336BD0 00332830  7C 7B 1B 78 */	mr r27, r3

-/* 80336BD4 00332834  7C 9C 23 78 */	mr r28, r4

-/* 80336BD8 00332838  7C BD 2B 78 */	mr r29, r5

-/* 80336BDC 0033283C  3B C0 00 00 */	li r30, 0

-/* 80336BE0 00332840  3B E0 00 00 */	li r31, 0

-/* 80336BE4 00332844  48 00 00 20 */	b lbl_80336C04

-lbl_80336BE8:

-/* 80336BE8 00332848  80 7B 00 00 */	lwz r3, 0(r27)

-/* 80336BEC 0033284C  7F 84 E3 78 */	mr r4, r28

-/* 80336BF0 00332850  7F A5 EB 78 */	mr r5, r29

-/* 80336BF4 00332854  7C 63 F8 2E */	lwzx r3, r3, r31

-/* 80336BF8 00332858  4B FF F9 D1 */	bl ArrayMapBackwards

-/* 80336BFC 0033285C  3B FF 00 04 */	addi r31, r31, 4

-/* 80336C00 00332860  3B DE 00 01 */	addi r30, r30, 1

-lbl_80336C04:

-/* 80336C04 00332864  80 1B 00 04 */	lwz r0, 4(r27)

-/* 80336C08 00332868  7C 1E 00 00 */	cmpw r30, r0

-/* 80336C0C 0033286C  41 80 FF DC */	blt lbl_80336BE8

-/* 80336C10 00332870  39 61 00 20 */	addi r11, r1, 0x20

-/* 80336C14 00332874  4B E9 05 61 */	bl _restgpr_27

-/* 80336C18 00332878  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336C1C 0033287C  7C 08 03 A6 */	mtlr r0

-/* 80336C20 00332880  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336C24 00332884  4E 80 00 20 */	blr

-

-.global TableMapSafe2

-TableMapSafe2:

-/* 80336C28 00332888  94 21 FF E0 */	stwu r1, -0x20(r1)

-/* 80336C2C 0033288C  7C 08 02 A6 */	mflr r0

-/* 80336C30 00332890  90 01 00 24 */	stw r0, 0x24(r1)

-/* 80336C34 00332894  39 61 00 20 */	addi r11, r1, 0x20

-/* 80336C38 00332898  4B E9 04 F1 */	bl _savegpr_27

-/* 80336C3C 0033289C  7C 7B 1B 78 */	mr r27, r3

-/* 80336C40 003328A0  7C 9C 23 78 */	mr r28, r4

-/* 80336C44 003328A4  7C BD 2B 78 */	mr r29, r5

-/* 80336C48 003328A8  3B C0 00 00 */	li r30, 0

-/* 80336C4C 003328AC  3B E0 00 00 */	li r31, 0

-/* 80336C50 003328B0  48 00 00 2C */	b lbl_80336C7C

-lbl_80336C54:

-/* 80336C54 003328B4  80 7B 00 00 */	lwz r3, 0(r27)

-/* 80336C58 003328B8  7F 84 E3 78 */	mr r4, r28

-/* 80336C5C 003328BC  7F A5 EB 78 */	mr r5, r29

-/* 80336C60 003328C0  7C 63 F8 2E */	lwzx r3, r3, r31

-/* 80336C64 003328C4  4B FF FA 01 */	bl ArrayMapBackwards2

-/* 80336C68 003328C8  2C 03 00 00 */	cmpwi r3, 0

-/* 80336C6C 003328CC  41 82 00 08 */	beq lbl_80336C74

-/* 80336C70 003328D0  48 00 00 1C */	b lbl_80336C8C

-lbl_80336C74:

-/* 80336C74 003328D4  3B FF 00 04 */	addi r31, r31, 4

-/* 80336C78 003328D8  3B DE 00 01 */	addi r30, r30, 1

-lbl_80336C7C:

-/* 80336C7C 003328DC  80 1B 00 04 */	lwz r0, 4(r27)

-/* 80336C80 003328E0  7C 1E 00 00 */	cmpw r30, r0

-/* 80336C84 003328E4  41 80 FF D0 */	blt lbl_80336C54

-/* 80336C88 003328E8  38 60 00 00 */	li r3, 0

-lbl_80336C8C:

-/* 80336C8C 003328EC  39 61 00 20 */	addi r11, r1, 0x20

-/* 80336C90 003328F0  4B E9 04 E5 */	bl _restgpr_27

-/* 80336C94 003328F4  80 01 00 24 */	lwz r0, 0x24(r1)

-/* 80336C98 003328F8  7C 08 03 A6 */	mtlr r0

-/* 80336C9C 003328FC  38 21 00 20 */	addi r1, r1, 0x20

-/* 80336CA0 00332900  4E 80 00 20 */	blr

diff --git a/src/hashtable.c b/src/hashtable.c
index 8612f47..b816691 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -8,16 +8,16 @@ HashTable *TableNew(s32 p1, s32 p2, HashFunction hf, s32 p4, s32 p5)
 

 HashTable *TableNew2(s32 p1, s32 size, s32 p3, HashFunction hf, s32 p5, s32 p6)

 {

-    HashTable *r30 = (HashTable *)gsimalloc(sizeof(HashTable));

-    r30->chains = (DArray **)gsimalloc(size * sizeof(DArray *));

+    HashTable *table = (HashTable *)gsimalloc(sizeof(HashTable));

+    table->chains = (DArray **)gsimalloc(size * sizeof(DArray *));

     for (s32 i = 0; i < size; i++) {

-        r30->chains[i] = (DArray *)ArrayNew(p1, p3, p6);

+        table->chains[i] = (DArray *)ArrayNew(p1, p3, p6);

     }

-    r30->size = size;

-    r30->unk8 = p6;

-    r30->unk10 = p5;

-    r30->hashFunc = hf;

-    return r30;

+    table->size = size;

+    table->unk8 = p6;

+    table->unk10 = p5;

+    table->hashFunc = hf;

+    return table;

 }

 

 void TableFree(HashTable *table)