Skip to content

Rename floating point conversion routines #45

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
mattbruv merged 1 commit into from
Nov 30, 2020
Merged

Rename floating point conversion routines #45

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
2 changes: 1 addition & 1 deletion asm/CodeWarrior/MSL_C.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3510,7 +3510,7 @@ lbl_801DFCE8:
/* 801DFD08 001DCB08 38 61 00 30 */ addi r3, r1, 0x30
/* 801DFD0C 001DCB0C 48 00 CB 19 */ bl modf
/* 801DFD10 001DCB10 C8 21 00 30 */ lfd f1, 0x30(r1)
/* 801DFD14 001DCB14 48 00 DD 8D */ bl func_801EDAA0
/* 801DFD14 001DCB14 48 00 DD 8D */ bl __cvt_dbl_usll
/* 801DFD18 001DCB18 3B 80 00 00 */ li r28, 0
/* 801DFD1C 001DCB1C 7C 7B 1B 78 */ mr r27, r3
/* 801DFD20 001DCB20 7C 9A 23 78 */ mr r26, r4
Expand Down
12 changes: 6 additions & 6 deletions asm/CodeWarrior/Runtime.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ func_801ED36C:
/* 801ED3D4 001EA1D4 38 21 00 10 */ addi r1, r1, 0x10
/* 801ED3D8 001EA1D8 4E 80 00 20 */ blr

.global func_801ED3DC
func_801ED3DC:
.global __cvt_fp2unsigned
__cvt_fp2unsigned:
/* 801ED3DC 001EA1DC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801ED3E0 001EA1E0 3C 80 80 27 */ lis r4, lbl_8027A1B0@h
/* 801ED3E4 001EA1E4 60 84 A1 B0 */ ori r4, r4, lbl_8027A1B0@l
Expand Down Expand Up @@ -1045,8 +1045,8 @@ lbl_801ED9E4:
/* 801ED9E4 001EA7E4 7C 63 2E 30 */ sraw r3, r3, r5
/* 801ED9E8 001EA7E8 4E 80 00 20 */ blr

.global func_801ED9EC
func_801ED9EC:
.global __cvt_sll_flt
__cvt_sll_flt:
/* 801ED9EC 001EA7EC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801ED9F0 001EA7F0 54 65 00 01 */ rlwinm. r5, r3, 0, 0, 0
/* 801ED9F4 001EA7F4 41 82 00 0C */ beq lbl_801EDA00
Expand Down Expand Up @@ -1097,8 +1097,8 @@ lbl_801EDA88:
/* 801EDA98 001EA898 38 21 00 10 */ addi r1, r1, 0x10
/* 801EDA9C 001EA89C 4E 80 00 20 */ blr

.global func_801EDAA0
func_801EDAA0:
.global __cvt_dbl_usll
__cvt_dbl_usll:
/* 801EDAA0 001EA8A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 801EDAA4 001EA8A4 D8 21 00 08 */ stfd f1, 8(r1)
/* 801EDAA8 001EA8A8 80 61 00 08 */ lwz r3, 8(r1)
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/p2/iTime.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ iTimeDiffSec__Fx:
/* 800D4980 000D1780 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800D4984 000D1784 7C 08 02 A6 */ mflr r0
/* 800D4988 000D1788 90 01 00 14 */ stw r0, 0x14(r1)
/* 800D498C 000D178C 48 11 90 61 */ bl func_801ED9EC
/* 800D498C 000D178C 48 11 90 61 */ bl __cvt_sll_flt
/* 800D4990 000D1790 3C 60 80 00 */ lis r3, 0x800000F8@ha
/* 800D4994 000D1794 3C 00 43 30 */ lis r0, 0x4330
/* 800D4998 000D1798 80 63 00 F8 */ lwz r3, 0x800000F8@l(r3)
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/iCamera.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ lbl_800C07A0:
/* 800C07E8 000BD5E8 C8 01 00 08 */ lfd f0, 8(r1)
/* 800C07EC 000BD5EC EC 00 08 28 */ fsubs f0, f0, f1
/* 800C07F0 000BD5F0 EC 3F 00 32 */ fmuls f1, f31, f0
/* 800C07F4 000BD5F4 48 12 D2 AD */ bl func_801EDAA0
/* 800C07F4 000BD5F4 48 12 D2 AD */ bl __cvt_dbl_usll
/* 800C07F8 000BD5F8 80 1F 06 B4 */ lwz r0, 0x6b4(r31)
/* 800C07FC 000BD5FC 80 BF 06 B0 */ lwz r5, 0x6b0(r31)
/* 800C0800 000BD600 7C 00 20 14 */ addc r0, r0, r4
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xAnim.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ lbl_800067CC:
/* 800067D0 000035D0 48 00 03 A9 */ bl floorf__3stdFf
/* 800067D4 000035D4 EC 1E 08 28 */ fsubs f0, f30, f1
/* 800067D8 000035D8 D0 1E 00 00 */ stfs f0, 0(r30)
/* 800067DC 000035DC 48 1E 6C 01 */ bl func_801ED3DC
/* 800067DC 000035DC 48 1E 6C 01 */ bl __cvt_fp2unsigned
/* 800067E0 000035E0 90 7D 00 00 */ stw r3, 0(r29)
/* 800067E4 000035E4 7C 15 D8 AE */ lbzx r0, r21, r27
/* 800067E8 000035E8 80 9D 00 00 */ lwz r4, 0(r29)
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xCurveAsset.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ lbl_8017C364:
lbl_8017C3AC:
/* 8017C3AC 001791AC C3 DF 00 08 */ lfs f30, 8(r31)
/* 8017C3B0 001791B0 EC 3F F0 24 */ fdivs f1, f31, f30
/* 8017C3B4 001791B4 48 07 10 29 */ bl func_801ED3DC
/* 8017C3B4 001791B4 48 07 10 29 */ bl __cvt_fp2unsigned
/* 8017C3B8 001791B8 3C 00 43 30 */ lis r0, 0x4330
/* 8017C3BC 001791BC 90 61 00 0C */ stw r3, 0xc(r1)
/* 8017C3C0 001791C0 C8 22 AD F0 */ lfd f1, lbl_803CF770-_SDA2_BASE_(r2)
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xCutscene.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1570,7 +1570,7 @@ lbl_8001749C:
/* 800174C0 000142C0 7C 10 03 78 */ mr r16, r0
/* 800174C4 000142C4 82 2F 00 0C */ lwz r17, 0xc(r15)
/* 800174C8 000142C8 EC 20 07 B2 */ fmuls f1, f0, f30
/* 800174CC 000142CC 48 1D 5F 11 */ bl func_801ED3DC
/* 800174CC 000142CC 48 1D 5F 11 */ bl __cvt_fp2unsigned
/* 800174D0 000142D0 7E 09 03 A6 */ mtctr r16
/* 800174D4 000142D4 28 10 00 00 */ cmplwi r16, 0
/* 800174D8 000142D8 41 82 00 88 */ beq lbl_80017560
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xEntBoulder.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ lbl_8011F7F4:
/* 8011F824 0011C624 4C 41 13 82 */ cror 2, 1, 2
/* 8011F828 0011C628 40 82 00 10 */ bne lbl_8011F838
/* 8011F82C 0011C62C FC 20 E8 90 */ fmr f1, f29
/* 8011F830 0011C630 48 0C DB AD */ bl func_801ED3DC
/* 8011F830 0011C630 48 0C DB AD */ bl __cvt_fp2unsigned
/* 8011F834 0011C634 48 00 00 14 */ b lbl_8011F848
lbl_8011F838:
/* 8011F838 0011C638 4B F1 14 51 */ bl xurand__Fv
Expand Down
4 changes: 2 additions & 2 deletions asm/Core/x/xFX.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4397,7 +4397,7 @@ refresh_config__9xFXRibbonFv:
/* 8002A468 00027268 C0 22 83 B8 */ lfs f1, lbl_803CCD38-_SDA2_BASE_(r2)
/* 8002A46C 0002726C C0 03 00 00 */ lfs f0, 0(r3)
/* 8002A470 00027270 EC 21 00 32 */ fmuls f1, f1, f0
/* 8002A474 00027274 48 1C 2F 69 */ bl func_801ED3DC
/* 8002A474 00027274 48 1C 2F 69 */ bl __cvt_fp2unsigned
/* 8002A478 00027278 90 7F 01 3C */ stw r3, 0x13c(r31)
/* 8002A47C 0002727C 88 1F 00 10 */ lbz r0, 0x10(r31)
/* 8002A480 00027280 28 00 00 00 */ cmplwi r0, 0
Expand Down Expand Up @@ -4607,7 +4607,7 @@ update__9xFXRibbonFf:
/* 8002A73C 0002753C 48 00 18 6D */ bl debug_update__9xFXRibbonFf
/* 8002A740 00027540 C0 02 83 B8 */ lfs f0, lbl_803CCD38-_SDA2_BASE_(r2)
/* 8002A744 00027544 EC 20 07 F2 */ fmuls f1, f0, f31
/* 8002A748 00027548 48 1C 2C 95 */ bl func_801ED3DC
/* 8002A748 00027548 48 1C 2C 95 */ bl __cvt_fp2unsigned
/* 8002A74C 0002754C 80 1F 01 38 */ lwz r0, 0x138(r31)
/* 8002A750 00027550 7C 00 1A 14 */ add r0, r0, r3
/* 8002A754 00027554 90 1F 01 38 */ stw r0, 0x138(r31)
Expand Down
4 changes: 2 additions & 2 deletions asm/Core/x/xFont.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2861,7 +2861,7 @@ temp_layout__8xtextboxCFb:
/* 80022660 0001F460 90 01 00 0C */ stw r0, 0xc(r1)
/* 80022664 0001F464 C8 01 00 08 */ lfd f0, 8(r1)
/* 80022668 0001F468 EC 20 08 28 */ fsubs f1, f0, f1
/* 8002266C 0001F46C 48 1C B4 35 */ bl func_801EDAA0
/* 8002266C 0001F46C 48 1C B4 35 */ bl __cvt_dbl_usll
/* 80022670 0001F470 7C 9C 23 78 */ mr r28, r4
/* 80022674 0001F474 7C 7D 1B 78 */ mr r29, r3
/* 80022678 0001F478 48 0B 22 D9 */ bl iTimeGet__Fv
Expand Down Expand Up @@ -6719,7 +6719,7 @@ lbl_80025AB8:
/* 80025AEC 000228EC 50 80 3E 30 */ rlwimi r0, r4, 7, 0x18, 0x18
/* 80025AF0 000228F0 98 1F 00 09 */ stb r0, 9(r31)
/* 80025AF4 000228F4 C0 23 00 18 */ lfs f1, 0x18(r3)
/* 80025AF8 000228F8 48 1C 78 E5 */ bl func_801ED3DC
/* 80025AF8 000228F8 48 1C 78 E5 */ bl __cvt_fp2unsigned
/* 80025AFC 000228FC 3C 80 88 89 */ lis r4, 0x88888889@ha
/* 80025B00 00022900 38 C3 00 01 */ addi r6, r3, 1
/* 80025B04 00022904 38 04 88 89 */ addi r0, r4, 0x88888889@l
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xPtankPool.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ lbl_8017FA4C:
/* 8017FA64 0017C864 C0 02 AE 70 */ lfs f0, lbl_803CF7F0-_SDA2_BASE_(r2)
/* 8017FA68 0017C868 EC 21 10 28 */ fsubs f1, f1, f2
/* 8017FA6C 0017C86C EC 23 00 7A */ fmadds f1, f3, f1, f0
/* 8017FA70 0017C870 48 06 D9 6D */ bl func_801ED3DC
/* 8017FA70 0017C870 48 06 D9 6D */ bl __cvt_fp2unsigned
/* 8017FA74 0017C874 7C 64 1B 78 */ mr r4, r3
/* 8017FA78 0017C878 7F C3 F3 78 */ mr r3, r30
/* 8017FA7C 0017C87C 48 00 00 2D */ bl create_ptanks__24_esc__2_unnamed_esc__2_xPtankPool_cpp_esc__2_FRQ224_esc__2_unnamed_esc__2_xPtankPool_cpp_esc__2_10group_dataUl
Expand Down
4 changes: 2 additions & 2 deletions asm/Core/x/xScrFx.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ xScrFxDrawSafeArea__Fv:
/* 80042038 0003EE38 83 C1 00 0C */ lwz r30, 0xc(r1)
/* 8004203C 0003EE3C EC 00 08 28 */ fsubs f0, f0, f1
/* 80042040 0003EE40 EC 22 00 32 */ fmuls f1, f2, f0
/* 80042044 0003EE44 48 1A B3 99 */ bl func_801ED3DC
/* 80042044 0003EE44 48 1A B3 99 */ bl __cvt_fp2unsigned
/* 80042048 0003EE48 3C 00 43 30 */ lis r0, 0x4330
/* 8004204C 0003EE4C 7C 63 F8 50 */ subf r3, r3, r31
/* 80042050 0003EE50 93 C1 00 2C */ stw r30, 0x2c(r1)
Expand All @@ -551,7 +551,7 @@ xScrFxDrawSafeArea__Fv:
/* 80042064 0003EE64 C8 01 00 28 */ lfd f0, 0x28(r1)
/* 80042068 0003EE68 EC 00 08 28 */ fsubs f0, f0, f1
/* 8004206C 0003EE6C EC 22 00 32 */ fmuls f1, f2, f0
/* 80042070 0003EE70 48 1A B3 6D */ bl func_801ED3DC
/* 80042070 0003EE70 48 1A B3 6D */ bl __cvt_fp2unsigned
/* 80042074 0003EE74 7F 9D F8 50 */ subf r28, r29, r31
/* 80042078 0003EE78 3D 00 43 30 */ lis r8, 0x4330
/* 8004207C 0003EE7C 6F A4 80 00 */ xoris r4, r29, 0x8000
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xSpline.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ lbl_8004A8D0:
/* 8004A8D0 000476D0 FC 20 F0 90 */ fmr f1, f30
/* 8004A8D4 000476D4 4B FB C2 A5 */ bl floorf__3stdFf
/* 8004A8D8 000476D8 FF E0 08 90 */ fmr f31, f1
/* 8004A8DC 000476DC 48 1A 2B 01 */ bl func_801ED3DC
/* 8004A8DC 000476DC 48 1A 2B 01 */ bl __cvt_fp2unsigned
/* 8004A8E0 000476E0 80 9D 00 04 */ lwz r4, 4(r29)
/* 8004A8E4 000476E4 7C 67 1B 78 */ mr r7, r3
/* 8004A8E8 000476E8 7C 07 20 40 */ cmplw r7, r4
Expand Down
2 changes: 1 addition & 1 deletion asm/Core/x/xTimer.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ GetRandomizedTime__FP11xTimerAsset:
/* 8004D208 0004A008 C0 22 87 98 */ lfs f1, lbl_803CD118-_SDA2_BASE_(r2)
/* 8004D20C 0004A00C C0 03 00 0C */ lfs f0, 0xc(r3)
/* 8004D210 0004A010 EC 21 00 32 */ fmuls f1, f1, f0
/* 8004D214 0004A014 48 1A 01 C9 */ bl func_801ED3DC
/* 8004D214 0004A014 48 1A 01 C9 */ bl __cvt_fp2unsigned
/* 8004D218 0004A018 7C 7F 1B 79 */ or. r31, r3, r3
/* 8004D21C 0004A01C 40 82 00 0C */ bne lbl_8004D228
/* 8004D220 0004A020 C0 3E 00 08 */ lfs f1, 8(r30)
Expand Down
2 changes: 1 addition & 1 deletion asm/Game/zDiscoFloor.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2349,7 +2349,7 @@ lbl_8013CF88:
/* 8013CF90 00139D90 48 00 00 6C */ b lbl_8013CFFC
lbl_8013CF94:
/* 8013CF94 00139D94 C0 26 00 00 */ lfs f1, 0(r6)
/* 8013CF98 00139D98 48 0B 04 45 */ bl func_801ED3DC
/* 8013CF98 00139D98 48 0B 04 45 */ bl __cvt_fp2unsigned
/* 8013CF9C 00139D9C 7C 64 1B 78 */ mr r4, r3
/* 8013CFA0 00139DA0 7F E3 FB 78 */ mr r3, r31
/* 8013CFA4 00139DA4 38 A0 00 00 */ li r5, 0
Expand Down
2 changes: 1 addition & 1 deletion asm/Game/zDispatcher.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ lbl_80053F34:
/* 80053F34 00050D34 38 00 00 01 */ li r0, 1
/* 80053F38 00050D38 C0 3E 00 00 */ lfs f1, 0(r30)
/* 80053F3C 00050D3C 98 0D 90 30 */ stb r0, menu_fmv_played-_SDA_BASE_(r13)
/* 80053F40 00050D40 48 19 94 9D */ bl func_801ED3DC
/* 80053F40 00050D40 48 19 94 9D */ bl __cvt_fp2unsigned
/* 80053F44 00050D44 48 03 ED 8D */ bl zFMVFileGetName__F8eFMVFile
/* 80053F48 00050D48 3C 80 00 01 */ lis r4, 0x00010001@ha
/* 80053F4C 00050D4C C0 22 88 FC */ lfs f1, lbl_803CD27C-_SDA2_BASE_(r2)
Expand Down
4 changes: 2 additions & 2 deletions asm/Game/zEntCruiseBubble.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2099,7 +2099,7 @@ add_trail_sample__Q213cruise_bubble30_esc__2_unnamed_esc__2_zEntCruiseBubble_cpp
/* 80058E4C 00055C4C C0 48 00 FC */ lfs f2, 0xfc(r8)
/* 80058E50 00055C50 EC 21 00 BA */ fmadds f1, f1, f2, f0
/* 80058E54 00055C54 D0 3A 01 10 */ stfs f1, 0x110(r26)
/* 80058E58 00055C58 48 19 45 85 */ bl func_801ED3DC
/* 80058E58 00055C58 48 19 45 85 */ bl __cvt_fp2unsigned
/* 80058E5C 00055C5C 7C 7E 1B 79 */ or. r30, r3, r3
/* 80058E60 00055C60 41 82 01 E0 */ beq lbl_80059040
/* 80058E64 00055C64 3C 00 43 30 */ lis r0, 0x4330
Expand Down Expand Up @@ -7998,7 +7998,7 @@ reset_quadrants__Q313cruise_bubble30_esc__2_unnamed_esc__2_zEntCruiseBubble_cpp_
/* 8005E290 0005B090 C8 01 00 08 */ lfd f0, 8(r1)
/* 8005E294 0005B094 EC 20 08 28 */ fsubs f1, f0, f1
/* 8005E298 0005B098 4B FA C5 65 */ bl xsqrt__Ff
/* 8005E29C 0005B09C 48 18 F1 41 */ bl func_801ED3DC
/* 8005E29C 0005B09C 48 18 F1 41 */ bl __cvt_fp2unsigned
/* 8005E2A0 0005B0A0 38 03 FF FF */ addi r0, r3, -1
/* 8005E2A4 0005B0A4 3C 80 80 2E */ lis r4, lbl_802DC920@ha
/* 8005E2A8 0005B0A8 7C 1E 02 14 */ add r0, r30, r0
Expand Down
8 changes: 4 additions & 4 deletions asm/Game/zEntPlayer.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24904,23 +24904,23 @@ lbl_8007CDA4:
/* 8007CDB4 00079BB4 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8007CDB8 00079BB8 3B A3 1B 08 */ addi r29, r3, 0x1b08
/* 8007CDBC 00079BBC 7F 9D 00 2E */ lwzx r28, r29, r0
/* 8007CDC0 00079BC0 48 17 06 1D */ bl func_801ED3DC
/* 8007CDC0 00079BC0 48 17 06 1D */ bl __cvt_fp2unsigned
/* 8007CDC4 00079BC4 3C 80 80 3C */ lis r4, globals@ha
/* 8007CDC8 00079BC8 7C BC 18 50 */ subf r5, r28, r3
/* 8007CDCC 00079BCC 38 64 05 58 */ addi r3, r4, globals@l
/* 8007CDD0 00079BD0 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8007CDD4 00079BD4 80 03 1B C4 */ lwz r0, 0x1bc4(r3)
/* 8007CDD8 00079BD8 7C 00 2A 14 */ add r0, r0, r5
/* 8007CDDC 00079BDC 90 03 1B C4 */ stw r0, 0x1bc4(r3)
/* 8007CDE0 00079BE0 48 17 05 FD */ bl func_801ED3DC
/* 8007CDE0 00079BE0 48 17 05 FD */ bl __cvt_fp2unsigned
/* 8007CDE4 00079BE4 7C 7C 1B 78 */ mr r28, r3
/* 8007CDE8 00079BE8 48 03 7F D9 */ bl zSceneGetLevelIndex__Fv
/* 8007CDEC 00079BEC 54 60 10 3A */ slwi r0, r3, 2
/* 8007CDF0 00079BF0 7F 9D 01 2E */ stwx r28, r29, r0
/* 8007CDF4 00079BF4 48 00 05 EC */ b lbl_8007D3E0
lbl_8007CDF8:
/* 8007CDF8 00079BF8 C0 3E 00 00 */ lfs f1, 0(r30)
/* 8007CDFC 00079BFC 48 17 05 E1 */ bl func_801ED3DC
/* 8007CDFC 00079BFC 48 17 05 E1 */ bl __cvt_fp2unsigned
/* 8007CE00 00079C00 7C 7C 1B 78 */ mr r28, r3
/* 8007CE04 00079C04 48 03 7F BD */ bl zSceneGetLevelIndex__Fv
/* 8007CE08 00079C08 3C 80 80 3C */ lis r4, globals@ha
Expand Down Expand Up @@ -25084,7 +25084,7 @@ lbl_8007D034:
/* 8007D050 00079E50 C0 1E 00 00 */ lfs f0, 0(r30)
/* 8007D054 00079E54 C0 3E 00 04 */ lfs f1, 4(r30)
/* 8007D058 00079E58 D0 03 17 94 */ stfs f0, 0x1794(r3)
/* 8007D05C 00079E5C 48 17 03 81 */ bl func_801ED3DC
/* 8007D05C 00079E5C 48 17 03 81 */ bl __cvt_fp2unsigned
/* 8007D060 00079E60 3C 80 80 3C */ lis r4, globals@ha
/* 8007D064 00079E64 38 03 00 01 */ addi r0, r3, 1
/* 8007D068 00079E68 3B 84 05 58 */ addi r28, r4, globals@l
Expand Down
4 changes: 2 additions & 2 deletions asm/Game/zGame.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ zGameLoop__Fv:
/* 80097A64 00094864 C8 21 00 48 */ lfd f1, 0x48(r1)
/* 80097A68 00094868 EC 21 10 28 */ fsubs f1, f1, f2
/* 80097A6C 0009486C EC 21 00 24 */ fdivs f1, f1, f0
/* 80097A70 00094870 48 15 60 31 */ bl func_801EDAA0
/* 80097A70 00094870 48 15 60 31 */ bl __cvt_dbl_usll
/* 80097A74 00094874 7C 94 23 78 */ mr r20, r4
/* 80097A78 00094878 7C 73 1B 78 */ mr r19, r3
/* 80097A7C 0009487C 48 03 CE D5 */ bl iTimeGet__Fv
Expand Down Expand Up @@ -1658,7 +1658,7 @@ lbl_80098C4C:
/* 80098C6C 00095A6C C8 21 00 10 */ lfd f1, 0x10(r1)
/* 80098C70 00095A70 EC 21 10 28 */ fsubs f1, f1, f2
/* 80098C74 00095A74 EC 21 00 24 */ fdivs f1, f1, f0
/* 80098C78 00095A78 48 15 4E 29 */ bl func_801EDAA0
/* 80098C78 00095A78 48 15 4E 29 */ bl __cvt_dbl_usll
/* 80098C7C 00095A7C 7C 9E 23 78 */ mr r30, r4
/* 80098C80 00095A80 7C 7F 1B 78 */ mr r31, r3
/* 80098C84 00095A84 48 03 BC CD */ bl iTimeGet__Fv
Expand Down
14 changes: 7 additions & 7 deletions asm/Game/zMenu.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ lbl_800A61C0:
/* 800A61D4 000A2FD4 48 00 14 6D */ bl zMusicNotify__Fi
lbl_800A61D8:
/* 800A61D8 000A2FD8 48 02 E7 79 */ bl iTimeGet__Fv
/* 800A61DC 000A2FDC 48 14 78 11 */ bl func_801ED9EC
/* 800A61DC 000A2FDC 48 14 78 11 */ bl __cvt_sll_flt
/* 800A61E0 000A2FE0 3C 60 80 00 */ lis r3, 0x800000F8@ha
/* 800A61E4 000A2FE4 3C 00 43 30 */ lis r0, 0x4330
/* 800A61E8 000A2FE8 80 63 00 F8 */ lwz r3, 0x800000F8@l(r3)
Expand Down Expand Up @@ -168,7 +168,7 @@ lbl_800A61D8:
/* 800A6240 000A3040 4B F9 B8 D9 */ bl xScrFxFade__FP10iColor_tagP10iColor_tagfPFv_vi
/* 800A6244 000A3044 3A E0 00 0A */ li r23, 0xa
/* 800A6248 000A3048 48 02 E7 09 */ bl iTimeGet__Fv
/* 800A624C 000A304C 48 14 77 A1 */ bl func_801ED9EC
/* 800A624C 000A304C 48 14 77 A1 */ bl __cvt_sll_flt
/* 800A6250 000A3050 3F 20 80 00 */ lis r25, 0x800000F8@ha
/* 800A6254 000A3054 3F 40 43 30 */ lis r26, 0x4330
/* 800A6258 000A3058 80 19 00 F8 */ lwz r0, 0x800000F8@l(r25)
Expand Down Expand Up @@ -250,7 +250,7 @@ lbl_800A62FC:
/* 800A637C 000A317C 38 C0 00 01 */ li r6, 1
/* 800A6380 000A3180 4B F9 B7 99 */ bl xScrFxFade__FP10iColor_tagP10iColor_tagfPFv_vi
/* 800A6384 000A3184 48 02 E5 CD */ bl iTimeGet__Fv
/* 800A6388 000A3188 48 14 76 65 */ bl func_801ED9EC
/* 800A6388 000A3188 48 14 76 65 */ bl __cvt_sll_flt
/* 800A638C 000A318C 3C 60 80 00 */ lis r3, 0x800000F8@ha
/* 800A6390 000A3190 3C 00 43 30 */ lis r0, 0x4330
/* 800A6394 000A3194 80 63 00 F8 */ lwz r3, 0x800000F8@l(r3)
Expand All @@ -267,7 +267,7 @@ lbl_800A62FC:
/* 800A63C0 000A31C0 D0 0D 90 34 */ stfs f0, lbl_803CB934-_SDA_BASE_(r13)
lbl_800A63C4:
/* 800A63C4 000A31C4 48 02 E5 8D */ bl iTimeGet__Fv
/* 800A63C8 000A31C8 48 14 76 25 */ bl func_801ED9EC
/* 800A63C8 000A31C8 48 14 76 25 */ bl __cvt_sll_flt
/* 800A63CC 000A31CC 80 19 00 F8 */ lwz r0, 0xf8(r25)
/* 800A63D0 000A31D0 93 41 00 20 */ stw r26, 0x20(r1)
/* 800A63D4 000A31D4 54 00 F0 BE */ srwi r0, r0, 2
Expand Down Expand Up @@ -535,7 +535,7 @@ zMenuUpdateMode__Fv:
/* 800A6788 000A3588 2C 00 00 04 */ cmpwi r0, 4
/* 800A678C 000A358C 40 82 00 58 */ bne lbl_800A67E4
/* 800A6790 000A3590 48 02 E1 C1 */ bl iTimeGet__Fv
/* 800A6794 000A3594 48 14 72 59 */ bl func_801ED9EC
/* 800A6794 000A3594 48 14 72 59 */ bl __cvt_sll_flt
/* 800A6798 000A3598 C0 0D 90 34 */ lfs f0, lbl_803CB934-_SDA_BASE_(r13)
/* 800A679C 000A359C EF E1 00 28 */ fsubs f31, f1, f0
/* 800A67A0 000A35A0 48 00 98 C5 */ bl zSaveLoad_LoadLoop__Fv
Expand All @@ -553,7 +553,7 @@ lbl_800A67BC:
/* 800A67CC 000A35CC 3B E3 30 30 */ addi r31, r3, 0x48423030@l
lbl_800A67D0:
/* 800A67D0 000A35D0 48 02 E1 81 */ bl iTimeGet__Fv
/* 800A67D4 000A35D4 48 14 72 19 */ bl func_801ED9EC
/* 800A67D4 000A35D4 48 14 72 19 */ bl __cvt_sll_flt
/* 800A67D8 000A35D8 EC 1F 08 2A */ fadds f0, f31, f1
/* 800A67DC 000A35DC D0 0D 90 34 */ stfs f0, lbl_803CB934-_SDA_BASE_(r13)
/* 800A67E0 000A35E0 48 00 00 28 */ b lbl_800A6808
Expand Down Expand Up @@ -832,7 +832,7 @@ zMenuFMVPlay__FPcUifbb:
/* 800A6BB4 000A39B4 41 82 00 24 */ beq lbl_800A6BD8
/* 800A6BB8 000A39B8 4B FE C0 35 */ bl zFMVPlay__FPcUifbb
/* 800A6BBC 000A39BC 48 02 DD 95 */ bl iTimeGet__Fv
/* 800A6BC0 000A39C0 48 14 6E 2D */ bl func_801ED9EC
/* 800A6BC0 000A39C0 48 14 6E 2D */ bl __cvt_sll_flt
/* 800A6BC4 000A39C4 D0 2D 90 34 */ stfs f1, lbl_803CB934-_SDA_BASE_(r13)
/* 800A6BC8 000A39C8 C0 0D 90 34 */ lfs f0, lbl_803CB934-_SDA_BASE_(r13)
/* 800A6BCC 000A39CC D0 0D 90 38 */ stfs f0, lbl_803CB938-_SDA_BASE_(r13)
Expand Down
6 changes: 3 additions & 3 deletions asm/Game/zNPCFXCinematic.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,7 +1960,7 @@ NCIN_HazTTSteam_AR__FPC12zCutsceneMgrP9NCINEntryP8RpAtomicP11RwMatrixTagUiUi:
/* 80192A88 0018F888 93 A1 00 74 */ stw r29, 0x74(r1)
/* 80192A8C 0018F88C 7C 9D 23 78 */ mr r29, r4
/* 80192A90 0018F890 C0 24 00 24 */ lfs f1, 0x24(r4)
/* 80192A94 0018F894 48 05 A9 49 */ bl func_801ED3DC
/* 80192A94 0018F894 48 05 A9 49 */ bl __cvt_fp2unsigned
/* 80192A98 0018F898 7C 1F 18 40 */ cmplw r31, r3
/* 80192A9C 0018F89C 40 82 01 1C */ bne lbl_80192BB8
/* 80192AA0 0018F8A0 C0 1D 00 28 */ lfs f0, 0x28(r29)
Expand Down Expand Up @@ -2059,7 +2059,7 @@ NCIN_TTGunSmoke_AR__FPC12zCutsceneMgrP9NCINEntryP8RpAtomicP11RwMatrixTagUiUi:
/* 80192C00 0018FA00 C0 24 00 24 */ lfs f1, 0x24(r4)
/* 80192C04 0018FA04 7C DE 33 78 */ mr r30, r6
/* 80192C08 0018FA08 7C FF 3B 78 */ mr r31, r7
/* 80192C0C 0018FA0C 48 05 A7 D1 */ bl func_801ED3DC
/* 80192C0C 0018FA0C 48 05 A7 D1 */ bl __cvt_fp2unsigned
/* 80192C10 0018FA10 7C 1F 18 40 */ cmplw r31, r3
/* 80192C14 0018FA14 40 82 01 E4 */ bne lbl_80192DF8
/* 80192C18 0018FA18 C0 1D 00 28 */ lfs f0, 0x28(r29)
Expand Down Expand Up @@ -3167,7 +3167,7 @@ NCIN_FodProdBone_AR__FPC12zCutsceneMgrP9NCINEntryP8RpAtomicP11RwMatrixTagUiUi:
/* 80193BCC 001909CC 93 81 00 40 */ stw r28, 0x40(r1)
/* 80193BD0 001909D0 7C 9C 23 78 */ mr r28, r4
/* 80193BD4 001909D4 C0 24 00 24 */ lfs f1, 0x24(r4)
/* 80193BD8 001909D8 48 05 98 05 */ bl func_801ED3DC
/* 80193BD8 001909D8 48 05 98 05 */ bl __cvt_fp2unsigned
/* 80193BDC 001909DC 7C 1E 18 40 */ cmplw r30, r3
/* 80193BE0 001909E0 40 82 01 10 */ bne lbl_80193CF0
/* 80193BE4 001909E4 88 0D 98 C4 */ lbz r0, lbl_803CC1C4-_SDA_BASE_(r13)
Expand Down
2 changes: 1 addition & 1 deletion asm/Game/zParPTank.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ lbl_80170D48:
/* 80170DD0 0016DBD0 C0 02 AC 28 */ lfs f0, lbl_803CF5A8-_SDA2_BASE_(r2)
/* 80170DD4 0016DBD4 EC 21 00 B2 */ fmuls f1, f1, f2
/* 80170DD8 0016DBD8 EC 21 00 24 */ fdivs f1, f1, f0
/* 80170DDC 0016DBDC 48 07 C6 01 */ bl func_801ED3DC
/* 80170DDC 0016DBDC 48 07 C6 01 */ bl __cvt_fp2unsigned
/* 80170DE0 0016DBE0 3C 00 43 30 */ lis r0, 0x4330
/* 80170DE4 0016DBE4 90 61 00 2C */ stw r3, 0x2c(r1)
/* 80170DE8 0016DBE8 C8 62 AC 48 */ lfd f3, lbl_803CF5C8-_SDA2_BASE_(r2)
Expand Down
2 changes: 1 addition & 1 deletion asm/Game/zSaveLoad.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ zSaveLoad_Tick__Fv:
/* 800AD32C 000AA12C 7C 08 02 A6 */ mflr r0
/* 800AD330 000AA130 90 01 00 54 */ stw r0, 0x54(r1)
/* 800AD334 000AA134 48 02 76 1D */ bl iTimeGet__Fv
/* 800AD338 000AA138 48 14 06 B5 */ bl func_801ED9EC
/* 800AD338 000AA138 48 14 06 B5 */ bl __cvt_sll_flt
/* 800AD33C 000AA13C 3C 60 80 00 */ lis r3, 0x800000F8@ha
/* 800AD340 000AA140 3C 00 43 30 */ lis r0, 0x4330
/* 800AD344 000AA144 80 63 00 F8 */ lwz r3, 0x800000F8@l(r3)
Expand Down
2 changes: 1 addition & 1 deletion asm/Game/zShrapnel.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,7 +1965,7 @@ lbl_80128E00:
/* 80128E24 00125C24 4B FF 8F 39 */ bl xVec3LengthFast__FPC5xVec3
/* 80128E28 00125C28 C0 02 A1 A4 */ lfs f0, lbl_803CEB24-_SDA2_BASE_(r2)
/* 80128E2C 00125C2C EC 20 00 72 */ fmuls f1, f0, f1
/* 80128E30 00125C30 48 0C 45 AD */ bl func_801ED3DC
/* 80128E30 00125C30 48 0C 45 AD */ bl __cvt_fp2unsigned
/* 80128E34 00125C34 28 03 00 01 */ cmplwi r3, 1
/* 80128E38 00125C38 40 80 00 08 */ bge lbl_80128E40
/* 80128E3C 00125C3C 38 60 00 01 */ li r3, 1
Expand Down
Loading