Doc code 80005fd0

Makefile

@@ -244,7 +244,7 @@ include $(MAKEFILE_SPLIT)
 # These are files that need to be encoded into EUC-JP in order for the ROM to match
 # We filter them out from the regular C_FILES since we don't need nor want the
 # UTF-8 versions getting compiled
-EUC_JP_FILES := src/ending/credits.c src/code_80005FD0.c src/menu_items.c
+EUC_JP_FILES := src/ending/credits.c src/cpu_logic.c src/menu_items.c
 C_FILES := $(filter-out %.inc.c,$(filter-out $(EUC_JP_FILES),$(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c))))
 S_FILES := $(foreach dir,$(ASM_DIRS),$(wildcard $(dir)/*.s))
 # Include source files in courses/course_name/files.c but exclude .inc.c files.

asm/non_matchings/code_80005FD0/func_800088D8.s → asm/non_matchings/cpu_logic/func_800088D8.s

@@ -69,14 +69,14 @@ glabel func_800088D8
 /* 0095D0 800089D0 03193821 */   addu  $a3, $t8, $t9
 /* 0095D4 800089D4 3C0E800E */  lui   $t6, %hi(gDemoMode)
 /* 0095D8 800089D8 95CEC51C */  lhu   $t6, %lo(gDemoMode)($t6)
-/* 0095DC 800089DC 3C048016 */  lui   $a0, %hi(gLapProgressScore) # $a0, 0x8016
-/* 0095E0 800089E0 24844450 */  addiu $a0, %lo(gLapProgressScore) # addiu $a0, $a0, 0x4450
+/* 0095DC 800089DC 3C048016 */  lui   $a0, %hi(gNumPathPointsTraversed) # $a0, 0x8016
+/* 0095E0 800089E0 24844450 */  addiu $a0, %lo(gNumPathPointsTraversed) # addiu $a0, $a0, 0x4450
 /* 0095E4 800089E4 146E003A */  bne   $v1, $t6, .L80008AD0
 /* 0095E8 800089E8 0088C021 */   addu  $t8, $a0, $t0
 /* 0095EC 800089EC 3C188016 */  lui   $t8, %hi(D_80164378 + 0xE) # $t8, 0x8016
 /* 0095F0 800089F0 87184386 */  lh    $t8, %lo(D_80164378 + 0xE)($t8)
-/* 0095F4 800089F4 3C048016 */  lui   $a0, %hi(gLapProgressScore) # $a0, 0x8016
-/* 0095F8 800089F8 24844450 */  addiu $a0, %lo(gLapProgressScore) # addiu $a0, $a0, 0x4450
+/* 0095F4 800089F4 3C048016 */  lui   $a0, %hi(gNumPathPointsTraversed) # $a0, 0x8016
+/* 0095F8 800089F8 24844450 */  addiu $a0, %lo(gNumPathPointsTraversed) # addiu $a0, $a0, 0x4450
 /* 0095FC 800089FC 0018C880 */  sll   $t9, $t8, 2
 /* 009600 80008A00 00887821 */  addu  $t7, $a0, $t0
 /* 009604 80008A04 00997021 */  addu  $t6, $a0, $t9
@@ -140,8 +140,8 @@ glabel func_800088D8
 /* 0096DC 80008ADC 24010003 */  li    $at, 3
 /* 0096E0 80008AE0 000FC040 */  sll   $t8, $t7, 1
 /* 0096E4 80008AE4 0301001A */  div   $zero, $t8, $at
-/* 0096E8 80008AE8 3C0B8016 */  lui   $t3, %hi(gPlayerInFront) # $t3, 0x8016
-/* 0096EC 80008AEC 856B3478 */  lh    $t3, %lo(gPlayerInFront)($t3)
+/* 0096E8 80008AE8 3C0B8016 */  lui   $t3, %hi(gBestRankedHumanPlayer) # $t3, 0x8016
+/* 0096EC 80008AEC 856B3478 */  lh    $t3, %lo(gBestRankedHumanPlayer)($t3)
 /* 0096F0 80008AF0 3C0D8016 */  lui   $t5, %hi(gGPCurrentRaceRankByPlayerId + 0x2) # 0x8016
 /* 0096F4 80008AF4 000BC880 */  sll   $t9, $t3, 2
 /* 0096F8 80008AF8 00997021 */  addu  $t6, $a0, $t9
@@ -220,8 +220,8 @@ glabel func_800088D8
 .L80008C08:
 /* 009808 80008C08 3C098016 */  lui   $t1, %hi(D_80163344) # $t1, 0x8016
 /* 00980C 80008C0C 85293344 */  lh    $t1, %lo(D_80163344)($t1)
-/* 009810 80008C10 3C048016 */  lui   $a0, %hi(gLapProgressScore) # $a0, 0x8016
-/* 009814 80008C14 24844450 */  addiu $a0, %lo(gLapProgressScore) # addiu $a0, $a0, 0x4450
+/* 009810 80008C10 3C048016 */  lui   $a0, %hi(gNumPathPointsTraversed) # $a0, 0x8016
+/* 009814 80008C14 24844450 */  addiu $a0, %lo(gNumPathPointsTraversed) # addiu $a0, $a0, 0x4450
 /* 009818 80008C18 00097080 */  sll   $t6, $t1, 2
 /* 00981C 80008C1C 0088C821 */  addu  $t9, $a0, $t0
 /* 009820 80008C20 008E7821 */  addu  $t7, $a0, $t6

asm/non_matchings/code_80005FD0/func_8000B140.s → asm/non_matchings/cpu_logic/func_8000B140.s

@@ -76,9 +76,9 @@ glabel func_8000B140
 /* 00BE34 8000B234 3C014358 */  li    $at, 0x43580000 # 216.000000
 /* 00BE38 8000B238 44815000 */  mtc1  $at, $f10
 /* 00BE3C 8000B23C 46062203 */  div.s $f8, $f4, $f6
-/* 00BE40 8000B240 3C098016 */  lui   $t1, %hi(gNearestWaypointByPlayerId) # 0x8016
+/* 00BE40 8000B240 3C098016 */  lui   $t1, %hi(gNearestPathPointByPlayerId) # 0x8016
 /* 00BE44 8000B244 012D4821 */  addu  $t1, $t1, $t5
-/* 00BE48 8000B248 85294438 */  lh    $t1, %lo(gNearestWaypointByPlayerId)($t1) # 0x4438($t1)
+/* 00BE48 8000B248 85294438 */  lh    $t1, %lo(gNearestPathPointByPlayerId)($t1) # 0x4438($t1)
 /* 00BE4C 8000B24C 240303E8 */  li    $v1, 1000
 /* 00BE50 8000B250 27A5009C */  addiu $a1, $sp, 0x9c
 /* 00BE54 8000B254 27A200B0 */  addiu $v0, $sp, 0xb0
@@ -134,28 +134,28 @@ glabel func_8000B140
 /* 00BF10 8000B310 44815000 */  mtc1  $at, $f10
 /* 00BF14 8000B314 46062203 */  div.s $f8, $f4, $f6
 /* 00BF18 8000B318 00087040 */  sll   $t6, $t0, 1
-/* 00BF1C 8000B31C 3C038016 */  lui   $v1, %hi(gNearestWaypointByPlayerId) # 0x8016
+/* 00BF1C 8000B31C 3C038016 */  lui   $v1, %hi(gNearestPathPointByPlayerId) # 0x8016
 /* 00BF20 8000B320 006E1821 */  addu  $v1, $v1, $t6
 /* 00BF24 8000B324 4614B081 */  sub.s $f2, $f22, $f20
-/* 00BF28 8000B328 84634438 */  lh    $v1, %lo(gNearestWaypointByPlayerId)($v1) # 0x4438($v1)
+/* 00BF28 8000B328 84634438 */  lh    $v1, %lo(gNearestPathPointByPlayerId)($v1) # 0x4438($v1)
 /* 00BF2C 8000B32C 3125FFFF */  andi  $a1, $t1, 0xffff
 /* 00BF30 8000B330 00003025 */  move  $a2, $zero
 /* 00BF34 8000B334 24070014 */  li    $a3, 20
-/* 00BF38 8000B338 3C0C8016 */  lui   $t4, %hi(gCurrentWaypointCountByPathIndex) # $t4, 0x8016
+/* 00BF38 8000B338 3C0C8016 */  lui   $t4, %hi(gSelectedPathCount) # $t4, 0x8016
 /* 00BF3C 8000B33C 3064FFFF */  andi  $a0, $v1, 0xffff
 /* 00BF40 8000B340 460A4002 */  mul.s $f0, $f8, $f10
 /* 00BF44 8000B344 4602003C */  c.lt.s $f0, $f2
 /* 00BF48 8000B348 00000000 */  nop   
 /* 00BF4C 8000B34C 45020028 */  bc1fl .L8000B3F0
 /* 00BF50 8000B350 29410002 */   slti  $at, $t2, 2
-/* 00BF54 8000B354 958C4430 */  lhu   $t4, %lo(gCurrentWaypointCountByPathIndex)($t4)
+/* 00BF54 8000B354 958C4430 */  lhu   $t4, %lo(gSelectedPathCount)($t4)
 /* 00BF58 8000B358 A7A300E4 */  sh    $v1, 0xe4($sp)
 /* 00BF5C 8000B35C AFA800FC */  sw    $t0, 0xfc($sp)
 /* 00BF60 8000B360 A7A900E6 */  sh    $t1, 0xe6($sp)
 /* 00BF64 8000B364 AFAA00F0 */  sw    $t2, 0xf0($sp)
 /* 00BF68 8000B368 E7A000DC */  swc1  $f0, 0xdc($sp)
 /* 00BF6C 8000B36C E7A20060 */  swc1  $f2, 0x60($sp)
-/* 00BF70 8000B370 0C001EFE */  jal   is_waypoint_in_range
+/* 00BF70 8000B370 0C001EFE */  jal   is_path_point_in_range
 /* 00BF74 8000B374 AFAC0010 */   sw    $t4, 0x10($sp)
 /* 00BF78 8000B378 3C0B8016 */  lui   $t3, %hi(gTrackPositionFactor) # $t3, 0x8016
 /* 00BF7C 8000B37C 256B3068 */  addiu $t3, %lo(gTrackPositionFactor) # addiu $t3, $t3, 0x3068
@@ -179,8 +179,8 @@ glabel func_8000B140
 /* 00BFC4 8000B3C4 10000006 */  b     .L8000B3E0
 /* 00BFC8 8000B3C8 A4C50000 */   sh    $a1, ($a2)
 .L8000B3CC:
-/* 00BFCC 8000B3CC 3C0E8016 */  lui   $t6, %hi(gCurrentWaypointCountByPathIndex) # $t6, 0x8016
-/* 00BFD0 8000B3D0 95CE4430 */  lhu   $t6, %lo(gCurrentWaypointCountByPathIndex)($t6)
+/* 00BFCC 8000B3CC 3C0E8016 */  lui   $t6, %hi(gSelectedPathCount) # $t6, 0x8016
+/* 00BFD0 8000B3D0 95CE4430 */  lhu   $t6, %lo(gSelectedPathCount)($t6)
 /* 00BFD4 8000B3D4 006E6021 */  addu  $t4, $v1, $t6
 /* 00BFD8 8000B3D8 01896823 */  subu  $t5, $t4, $t1
 /* 00BFDC 8000B3DC A4CD0000 */  sh    $t5, ($a2)

asm/non_matchings/code_80005FD0/func_80017054.s → asm/non_matchings/cpu_logic/func_80017054.s

@@ -37,11 +37,11 @@ glabel func_80017054
 /* 017CAC 800170AC AFA700C4 */  sw    $a3, 0xc4($sp)
 /* 017CB0 800170B0 848200AE */  lh    $v0, 0xae($a0)
 /* 017CB4 800170B4 01C01825 */  move  $v1, $t6
-/* 017CB8 800170B8 3C0F8016 */  lui   $t7, %hi(gNearestWaypointByCameraId) # $t7, 0x8016
+/* 017CB8 800170B8 3C0F8016 */  lui   $t7, %hi(gNearestPathPointByCameraId) # $t7, 0x8016
 /* 017CBC 800170BC E5240000 */  swc1  $f4, ($t1)
 /* 017CC0 800170C0 3C0C8016 */  lui   $t4, %hi(gPathCountByPathIndex) # 0x8016
 /* 017CC4 800170C4 3C018016 */  lui   $at, %hi(D_80163238) # $at, 0x8016
-/* 017CC8 800170C8 25EF4668 */  addiu $t7, %lo(gNearestWaypointByCameraId) # addiu $t7, $t7, 0x4668
+/* 017CC8 800170C8 25EF4668 */  addiu $t7, %lo(gNearestPathPointByCameraId) # addiu $t7, $t7, 0x4668
 /* 017CCC 800170CC 00077040 */  sll   $t6, $a3, 1
 /* 017CD0 800170D0 000AC840 */  sll   $t9, $t2, 1
 /* 017CD4 800170D4 01996021 */  addu  $t4, $t4, $t9

asm/non_matchings/code_80005FD0/kart_ai_use_item_strategy.s → asm/non_matchings/cpu_logic/kart_ai_use_item_strategy.s

@@ -46,8 +46,8 @@ glabel kart_ai_use_item_strategy
 /* 01B864 8001AC64 510C0480 */  beql  $t0, $t4, .L8001BE68
 /* 01B868 8001AC68 8FBF0024 */   lw    $ra, 0x24($sp)
 /* 01B86C 8001AC6C 972E0000 */  lhu   $t6, ($t9)
-/* 01B870 8001AC70 3C0B8016 */  lui   $t3, %hi(gCpuItemStrategy) # $t3, 0x8016
-/* 01B874 8001AC74 256B42D8 */  addiu $t3, %lo(gCpuItemStrategy) # addiu $t3, $t3, 0x42d8
+/* 01B870 8001AC70 3C0B8016 */  lui   $t3, %hi(cpu_ItemStrategy) # $t3, 0x8016
+/* 01B874 8001AC74 256B42D8 */  addiu $t3, %lo(cpu_ItemStrategy) # addiu $t3, $t3, 0x42d8
 /* 01B878 8001AC78 31CF0800 */  andi  $t7, $t6, 0x800
 /* 01B87C 8001AC7C 15E00479 */  bnez  $t7, .L8001BE64
 /* 01B880 8001AC80 0004C900 */   sll   $t9, $a0, 4
@@ -65,12 +65,12 @@ glabel L8001ACAC
 /* 01B8AC 8001ACAC 2405FFFF */  li    $a1, -1
 /* 01B8B0 8001ACB0 A6050002 */  sh    $a1, 2($s0)
 /* 01B8B4 8001ACB4 8FAD0030 */  lw    $t5, 0x30($sp)
-/* 01B8B8 8001ACB8 3C0E8016 */  lui   $t6, %hi(gLapProgressScore) # 0x8016
+/* 01B8B8 8001ACB8 3C0E8016 */  lui   $t6, %hi(gNumPathPointsTraversed) # 0x8016
 /* 01B8BC 8001ACBC 8FA40030 */  lw    $a0, 0x30($sp)
 /* 01B8C0 8001ACC0 000D1080 */  sll   $v0, $t5, 2
 /* 01B8C4 8001ACC4 01C27021 */  addu  $t6, $t6, $v0
 /* 01B8C8 8001ACC8 000D7880 */  sll   $t7, $t5, 2
-/* 01B8CC 8001ACCC 8DCE4450 */  lw    $t6, %lo(gLapProgressScore)($t6) # 0x4450($t6)
+/* 01B8CC 8001ACCC 8DCE4450 */  lw    $t6, %lo(gNumPathPointsTraversed)($t6) # 0x4450($t6)
 /* 01B8D0 8001ACD0 01ED7821 */  addu  $t7, $t7, $t5
 /* 01B8D4 8001ACD4 000F7880 */  sll   $t7, $t7, 2
 /* 01B8D8 8001ACD8 25F80064 */  addiu $t8, $t7, 0x64
@@ -118,10 +118,10 @@ glabel L8001AD64
 /* 01B974 8001AD74 01CF7021 */  addu  $t6, $t6, $t7
 /* 01B978 8001AD78 8DCE4390 */  lw    $t6, %lo(gLapCountByPlayerId)($t6) # 0x4390($t6)
 /* 01B97C 8001AD7C 24C643B8 */  addiu $a2, %lo(gGPCurrentRaceRankByPlayerId) # addiu $a2, $a2, 0x43b8
-/* 01B980 8001AD80 3C038016 */  lui   $v1, %hi(gPlayerInFront) # $v1, 0x8016
+/* 01B980 8001AD80 3C038016 */  lui   $v1, %hi(gBestRankedHumanPlayer) # $v1, 0x8016
 /* 01B984 8001AD84 19C0004B */  blez  $t6, .L8001AEB4
 /* 01B988 8001AD88 00000000 */   nop
-/* 01B98C 8001AD8C 84633478 */  lh    $v1, %lo(gPlayerInFront)($v1)
+/* 01B98C 8001AD8C 84633478 */  lh    $v1, %lo(gBestRankedHumanPlayer)($v1)
 /* 01B990 8001AD90 00CF5821 */  addu  $t3, $a2, $t7
 /* 01B994 8001AD94 8D6C0000 */  lw    $t4, ($t3)
 /* 01B998 8001AD98 0003C080 */  sll   $t8, $v1, 2
@@ -134,65 +134,65 @@ glabel L8001AD64
 /* 01B9B4 8001ADB4 8FAD002C */   lw    $t5, 0x2c($sp)
 /* 01B9B8 8001ADB8 95A20254 */  lhu   $v0, 0x254($t5)
 /* 01B9BC 8001ADBC 24010004 */  li    $at, 4
-/* 01B9C0 8001ADC0 3C088016 */  lui   $t0, %hi(gNearestWaypointByPlayerId) # $t0, 0x8016
+/* 01B9C0 8001ADC0 3C088016 */  lui   $t0, %hi(gNearestPathPointByPlayerId) # $t0, 0x8016
 /* 01B9C4 8001ADC4 10410006 */  beq   $v0, $at, .L8001ADE0
-/* 01B9C8 8001ADC8 25084438 */   addiu $t0, %lo(gNearestWaypointByPlayerId) # addiu $t0, $t0, 0x4438
+/* 01B9C8 8001ADC8 25084438 */   addiu $t0, %lo(gNearestPathPointByPlayerId) # addiu $t0, $t0, 0x4438
 /* 01B9CC 8001ADCC 24060006 */  li    $a2, 6
 /* 01B9D0 8001ADD0 10460014 */  beq   $v0, $a2, .L8001AE24
-/* 01B9D4 8001ADD4 3C088016 */   lui   $t0, %hi(gNearestWaypointByPlayerId) # 0x8016
+/* 01B9D4 8001ADD4 3C088016 */   lui   $t0, %hi(gNearestPathPointByPlayerId) # 0x8016
 /* 01B9D8 8001ADD8 10000024 */  b     .L8001AE6C
-/* 01B9DC 8001ADDC 3C088016 */   lui   $t0, %hi(gNearestWaypointByPlayerId) # $t0, 0x8016
+/* 01B9DC 8001ADDC 3C088016 */   lui   $t0, %hi(gNearestPathPointByPlayerId) # $t0, 0x8016
 .L8001ADE0:
 /* 01B9E0 8001ADE0 8FAF0030 */  lw    $t7, 0x30($sp)
 /* 01B9E4 8001ADE4 0003C840 */  sll   $t9, $v1, 1
-/* 01B9E8 8001ADE8 3C0C8016 */  lui   $t4, %hi(gCurrentWaypointCountByPathIndex) # $t4, 0x8016
+/* 01B9E8 8001ADE8 3C0C8016 */  lui   $t4, %hi(gSelectedPathCount) # $t4, 0x8016
 /* 01B9EC 8001ADEC 000F7040 */  sll   $t6, $t7, 1
-/* 01B9F0 8001ADF0 958C4430 */  lhu   $t4, %lo(gCurrentWaypointCountByPathIndex)($t4)
+/* 01B9F0 8001ADF0 958C4430 */  lhu   $t4, %lo(gSelectedPathCount)($t4)
 /* 01B9F4 8001ADF4 010EC021 */  addu  $t8, $t0, $t6
 /* 01B9F8 8001ADF8 01195821 */  addu  $t3, $t0, $t9
 /* 01B9FC 8001ADFC 95650000 */  lhu   $a1, ($t3)
 /* 01BA00 8001AE00 97040000 */  lhu   $a0, ($t8)
 /* 01BA04 8001AE04 24060028 */  li    $a2, 40
 /* 01BA08 8001AE08 24070002 */  li    $a3, 2
-/* 01BA0C 8001AE0C 0C001EFE */  jal   is_waypoint_in_range
+/* 01BA0C 8001AE0C 0C001EFE */  jal   is_path_point_in_range
 /* 01BA10 8001AE10 AFAC0010 */   sw    $t4, 0x10($sp)
 /* 01BA14 8001AE14 18400045 */  blez  $v0, .L8001AF2C
 /* 01BA18 8001AE18 240D0022 */   li    $t5, 34
 /* 01BA1C 8001AE1C 10000043 */  b     .L8001AF2C
 /* 01BA20 8001AE20 A60D0000 */   sh    $t5, ($s0)
 .L8001AE24:
 /* 01BA24 8001AE24 8FAF0030 */  lw    $t7, 0x30($sp)
-/* 01BA28 8001AE28 25084438 */  addiu $t0, %lo(gNearestWaypointByPlayerId) # addiu $t0, $t0, 0x4438
+/* 01BA28 8001AE28 25084438 */  addiu $t0, %lo(gNearestPathPointByPlayerId) # addiu $t0, $t0, 0x4438
 /* 01BA2C 8001AE2C 0003C840 */  sll   $t9, $v1, 1
-/* 01BA30 8001AE30 3C0C8016 */  lui   $t4, %hi(gCurrentWaypointCountByPathIndex) # $t4, 0x8016
+/* 01BA30 8001AE30 3C0C8016 */  lui   $t4, %hi(gSelectedPathCount) # $t4, 0x8016
 /* 01BA34 8001AE34 000F7040 */  sll   $t6, $t7, 1
-/* 01BA38 8001AE38 958C4430 */  lhu   $t4, %lo(gCurrentWaypointCountByPathIndex)($t4)
+/* 01BA38 8001AE38 958C4430 */  lhu   $t4, %lo(gSelectedPathCount)($t4)
 /* 01BA3C 8001AE3C 010EC021 */  addu  $t8, $t0, $t6
 /* 01BA40 8001AE40 01195821 */  addu  $t3, $t0, $t9
 /* 01BA44 8001AE44 95650000 */  lhu   $a1, ($t3)
 /* 01BA48 8001AE48 97040000 */  lhu   $a0, ($t8)
 /* 01BA4C 8001AE4C 24060004 */  li    $a2, 4
 /* 01BA50 8001AE50 24070002 */  li    $a3, 2
-/* 01BA54 8001AE54 0C001EFE */  jal   is_waypoint_in_range
+/* 01BA54 8001AE54 0C001EFE */  jal   is_path_point_in_range
 /* 01BA58 8001AE58 AFAC0010 */   sw    $t4, 0x10($sp)
 /* 01BA5C 8001AE5C 18400033 */  blez  $v0, .L8001AF2C
 /* 01BA60 8001AE60 240D0022 */   li    $t5, 34
 /* 01BA64 8001AE64 10000031 */  b     .L8001AF2C
 /* 01BA68 8001AE68 A60D0000 */   sh    $t5, ($s0)
 .L8001AE6C:
 /* 01BA6C 8001AE6C 8FAF0030 */  lw    $t7, 0x30($sp)
-/* 01BA70 8001AE70 25084438 */  addiu $t0, $t0, %lo(gNearestWaypointByPlayerId) # 0x4438
+/* 01BA70 8001AE70 25084438 */  addiu $t0, $t0, %lo(gNearestPathPointByPlayerId) # 0x4438
 /* 01BA74 8001AE74 0003C840 */  sll   $t9, $v1, 1
-/* 01BA78 8001AE78 3C0C8016 */  lui   $t4, %hi(gCurrentWaypointCountByPathIndex) # $t4, 0x8016
+/* 01BA78 8001AE78 3C0C8016 */  lui   $t4, %hi(gSelectedPathCount) # $t4, 0x8016
 /* 01BA7C 8001AE7C 000F7040 */  sll   $t6, $t7, 1
-/* 01BA80 8001AE80 958C4430 */  lhu   $t4, %lo(gCurrentWaypointCountByPathIndex)($t4)
+/* 01BA80 8001AE80 958C4430 */  lhu   $t4, %lo(gSelectedPathCount)($t4)
 /* 01BA84 8001AE84 010EC021 */  addu  $t8, $t0, $t6
 /* 01BA88 8001AE88 01195821 */  addu  $t3, $t0, $t9
 /* 01BA8C 8001AE8C 95650000 */  lhu   $a1, ($t3)
 /* 01BA90 8001AE90 97040000 */  lhu   $a0, ($t8)
 /* 01BA94 8001AE94 2406000A */  li    $a2, 10
 /* 01BA98 8001AE98 24070002 */  li    $a3, 2
-/* 01BA9C 8001AE9C 0C001EFE */  jal   is_waypoint_in_range
+/* 01BA9C 8001AE9C 0C001EFE */  jal   is_path_point_in_range
 /* 01BAA0 8001AEA0 AFAC0010 */   sw    $t4, 0x10($sp)
 /* 01BAA4 8001AEA4 18400021 */  blez  $v0, .L8001AF2C
 /* 01BAA8 8001AEA8 240D0022 */   li    $t5, 34
@@ -359,7 +359,7 @@ glabel L8001B0EC
 /* 01BD00 8001B100 0460006C */  bltz  $v1, .L8001B2B4
 /* 01BD04 8001B104 28610064 */   slti  $at, $v1, 0x64
 /* 01BD08 8001B108 1020006A */  beqz  $at, .L8001B2B4
-/* 01BD0C 8001B10C 3C088016 */   lui   $t0, %hi(gNearestWaypointByPlayerId) # $t0, 0x8016
+/* 01BD0C 8001B10C 3C088016 */   lui   $t0, %hi(gNearestPathPointByPlayerId) # $t0, 0x8016
 /* 01BD10 8001B110 0003C8C0 */  sll   $t9, $v1, 3
 /* 01BD14 8001B114 0323C823 */  subu  $t9, $t9, $v1
 /* 01BD18 8001B118 3C0B8016 */  lui   $t3, %hi(gActorList) # $t3, 0x8016
@@ -381,9 +381,9 @@ glabel L8001B0EC
 /* 01BD58 8001B158 A6000004 */  sh    $zero, 4($s0)
 /* 01BD5C 8001B15C 272B0001 */  addiu $t3, $t9, 1
 /* 01BD60 8001B160 A60B0006 */  sh    $t3, 6($s0)
-/* 01BD64 8001B164 3C068016 */  lui   $a2, %hi(gPlayerInFront) # $a2, 0x8016
-/* 01BD68 8001B168 84C63478 */  lh    $a2, %lo(gPlayerInFront)($a2)
-/* 01BD6C 8001B16C 25084438 */  addiu $t0, %lo(gNearestWaypointByPlayerId) # addiu $t0, $t0, 0x4438
+/* 01BD64 8001B164 3C068016 */  lui   $a2, %hi(gBestRankedHumanPlayer) # $a2, 0x8016
+/* 01BD68 8001B168 84C63478 */  lh    $a2, %lo(gBestRankedHumanPlayer)($a2)
+/* 01BD6C 8001B16C 25084438 */  addiu $t0, %lo(gNearestPathPointByPlayerId) # addiu $t0, $t0, 0x4438
 /* 01BD70 8001B170 3C098016 */  lui   $t1, %hi(gPathIndexByPlayerId) # $t1, 0x8016
 /* 01BD74 8001B174 00067840 */  sll   $t7, $a2, 1
 /* 01BD78 8001B178 010F7021 */  addu  $t6, $t0, $t7