Migrated rodata (#199)

author: Lucas Shaw <49287729+shawlucas@users.noreply.github.com> 2020-06-09 09:06:23 -0700
committer: GitHub <noreply@github.com> 2020-06-09 12:06:23 -0400
commit: a0ef48e98751f102f7aa1f57bf3f5dbb336ca316 (patch)
tree: 59a8f70d296e4b27682bc193a822f7b4b73bb419
parent: 8afab54c234038838604750e12a9cca38178a618 (diff)
34 files changed, 995 insertions, 890 deletions
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s
index 0c94146e6..7ca269f0b 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/KaleidoScope_Update.s
@@ -1,3 +1,355 @@
+.rdata
+
+glabel D_8082FDFC
+    .asciz "プレイヤー size1＝%x\n"
+    .balign 4
+
+glabel D_8082FE14
+    .asciz "icon_item size0=%x\n"
+    .balign 4
+
+glabel D_8082FE28
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FE44
+    .asciz "icon_item24 size=%x\n"
+    .balign 4
+
+glabel D_8082FE5C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FE78
+    .asciz "icon_item_dungeon dungeon-size2=%x\n"
+    .balign 4
+
+glabel D_8082FE9C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FEB8
+    .asciz "icon_item_field field-size2=%x\n"
+    .balign 4
+
+glabel D_8082FED8
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FEF4
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_8082FF18
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FF34
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_8082FF58
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FF74
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_8082FF98
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FFB4
+    .asciz "サイズ＝%x\n"
+    .balign 4
+
+glabel D_8082FFC0
+    .asciz "item_name I_N_PT=%x\n"
+    .balign 4
+
+glabel D_8082FFD8
+    .asciz "サイズ＝%x\n"
+    .balign 4
+
+glabel D_8082FFE4
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_80830000
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8083001C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_80830038
+    .asciz "icon_item size0=%x\n"
+    .balign 4
+
+glabel D_8083004C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_80830068
+    .asciz "icon_item24 size=%x\n"
+    .balign 4
+
+glabel D_80830080
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8083009C
+    .asciz "icon_item_dungeon gameover-size2=%x\n"
+    .balign 4
+
+glabel D_808300C4
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_808300E0
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_80830104
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_80830120
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_80830144
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_80830160
+    .asciz "icon_item_dungeon dungeon-size=%x\n"
+    .balign 4
+
+glabel D_80830184
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_808301A0
+    .asciz "kscope->angle_s = %f\n"
+    .balign 4
+
+glabel D_808301B8
+    .asciz "[33m"
+    .balign 4
+
+glabel D_808301C0
+    .asciz "MAGIC_NOW=%d "
+    .balign 4
+
+glabel D_808301D0
+    .asciz "Z_MAGIC_NOW_NOW=%d   →  "
+    .balign 4
+
+glabel D_808301EC
+    .asciz "MAGIC_NOW=%d "
+    .balign 4
+
+glabel D_808301FC
+    .asciz "Z_MAGIC_NOW_NOW=%d\n"
+    .balign 4
+
+glabel D_80830210
+    .asciz "\x1b[m"
+    .balign 4
+
+glabel D_80830214
+    .asciz "[33m"
+    .balign 4
+
+glabel D_8083021C
+    .asciz "i=%d  LAST_TIME_TYPE=%d\n"
+    .balign 4
+
+glabel D_80830238
+    .asciz "\x1b[m"
+    .balign 4
+
+.late_rodata
+
+glabel jtbl_80830298
+.word L80826E00
+.word L808279D0
+.word L80827C1C
+.word L80827C90
+.word L80828098
+.word L80829940
+.word L80829940
+.word L808286FC
+.word L80828A38
+.word L80828E28
+.word L80828E54
+.word L808290DC
+.word L808291B8
+.word L80829264
+.word L80829484
+.word L808295F0
+.word L80829828
+
+glabel jtbl_808302DC
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827100
+.word L80827100
+.word L80827100
+.word L80827100
+.word L80827100
+.word L80827100
+.word L80827100
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+.word L80827078
+
+glabel jtbl_80830340
+.word L80827CB4
+.word L80827D78
+.word L80827D8C
+.word L80827DBC
+.word L80829940
+.word L80827DCC
+.word L80827F70
+.word L80829940
+.word L80827FB4
+.word L80829940
+
+glabel jtbl_80830368
+.word L808280BC
+.word L80828198
+.word L808284C0
+.word L808283CC
+.word L80828310
+.word L808284C0
+.word L808283CC
+
+glabel jtbl_80830384
+.word L808293F8
+.word L80829478
+.word L80829478
+.word L80829478
+.word L808293F0
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829434
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829420
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829440
+
+glabel jtbl_808303D8
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L8082940C
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+.word L80829478
+
+glabel jtbl_808304B8
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829894
+.word L80829894
+.word L80829894
+.word L80829894
+.word L80829894
+.word L80829894
+.word L80829894
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+.word L80829880
+
+.text
 glabel KaleidoScope_Update
 /* 13494 80826CB4 27BDFF78 */  addiu   $sp, $sp, 0xFF78           ## $sp = FFFFFF78
 /* 13498 80826CB8 AFBF0024 */  sw      $ra, 0x0024($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s
index d2453b544..070e409c1 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s
@@ -1,3 +1,34 @@
+.rdata
+
+glabel D_8082F420
+    .asciz "../z_kaleido_collect.c"
+    .balign 4
+
+glabel D_8082F438
+    .asciz "000 ccc=%d\n"
+    .balign 4
+
+glabel D_8082F444
+    .asciz "111 ccc=%d\n"
+    .balign 4
+
+glabel D_8082F450
+    .asciz "222 ccc=%d (%d, %d, %d)\n"
+    .balign 4
+
+glabel D_8082F46C
+    .asciz "999 ccc=%d (%d,  %d)\n"
+    .balign 4
+
+glabel D_8082F484
+    .asciz "888 ccc=%d (%d,  %d,  %x)\n"
+    .balign 4
+
+glabel D_8082F4A0
+    .asciz "../z_kaleido_collect.c"
+    .balign 4
+
+.text
 glabel func_80813820
 /* 00000 80813820 27BDFDD0 */  addiu   $sp, $sp, 0xFDD0           ## $sp = FFFFFDD0
 /* 00004 80813824 AFB50034 */  sw      $s5, 0x0034($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s
index 4ae10f5c2..c69fe8560 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815CE0.s
@@ -1,3 +1,133 @@
+.rdata
+glabel D_8082F4C0
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F4C4
+    .asciz "\x8Cﾙﾋﾟｰ" 
+    .balign 4
+
+glabel D_8082F4D0
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F4D4
+    .asciz "\x8Cﾊｰﾄ"
+    .balign 4
+
+glabel D_8082F4DC
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F4E0
+    .asciz "/4"
+    .balign 4
+
+glabel D_8082F4E4
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F4E8
+    .asciz "\x8Cｱｲﾃﾑ"
+    .balign 4
+
+glabel D_8082F4F4
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F4F8
+    .asciz "KEY"
+    .balign 4
+
+glabel D_8082F4FC
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F500
+    .asciz "\x8Dｿｳﾋﾞ"
+    .balign 4
+
+glabel D_8082F50C
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F510
+    .asciz "\x8Cｹﾝ"
+    .balign 4
+
+glabel D_8082F518
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F51C
+    .asciz "\x8Cﾀﾃ"
+    .balign 4
+
+glabel D_8082F524
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F528
+    .asciz "MAP"
+    .balign 4
+
+glabel D_8082F52C
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F530
+    .asciz "\x8Dﾌｳｲﾝ"
+    .balign 4
+
+glabel D_8082F53C
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F540
+    .asciz "\x8Dｾｲﾚｲｾｷ"
+    .balign 4
+
+glabel D_8082F550
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F554
+    .asciz "\x8Cｵｶﾘﾅ"
+    .balign 4
+
+glabel D_8082F560
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F564
+    .asciz "\x8Cｺﾚｸﾄ"
+    .balign 4
+
+glabel D_8082F570
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F574
+    .asciz "\x8Cｷﾝｽﾀ"
+    .balign 4
+
+glabel D_8082F580
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F584
+    .asciz "\x8Cｶｹﾗ"
+    .balign 4
+
+glabel D_8082F58C
+    .asciz "%s"
+    .balign 4
+
+glabel D_8082F590
+    .asciz "/4"
+    .balign 4
+
+.text   
 glabel func_80815CE0
 /* 024C0 80815CE0 27BDFFA0 */  addiu   $sp, $sp, 0xFFA0           ## $sp = FFFFFFA0
 /* 024C4 80815CE4 AFB00020 */  sw      $s0, 0x0020($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s
index bf2b6d770..eda847ae8 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082F594
+    .asciz "../z_kaleido_debug.c"
+    .balign 4
+
+glabel D_8082F5AC
+    .asciz "../z_kaleido_debug.c"
+    .balign 4
+
+.text
 glabel func_80815FD4
 /* 027B4 80815FD4 27BDFFA8 */  addiu   $sp, $sp, 0xFFA8           ## $sp = FFFFFFA8
 /* 027B8 80815FD8 AFBF0014 */  sw      $ra, 0x0014($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s
index c11e2643d..43bc7eba0 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s
@@ -1,3 +1,18 @@
+.rdata
+
+glabel D_8082F5C4
+    .asciz "../z_kaleido_debug.c"
+    .balign 4
+
+glabel D_8082F5DC
+    .asciz "i=%d  j=%d\n"
+    .balign 4
+
+glabel D_8082F5E8
+    .asciz "../z_kaleido_debug.c"
+    .balign 4
+
+.text
 glabel func_808161AC
 /* 0298C 808161AC 27BDFF10 */  addiu   $sp, $sp, 0xFF10           ## $sp = FFFFFF10
 /* 02990 808161B0 AFBF003C */  sw      $ra, 0x003C($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s
index 5d2bf632b..978019942 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082F600
+    .asciz "../z_kaleido_equipment.c"
+    .balign 4
+
+glabel D_8082F61C
+    .asciz "../z_kaleido_equipment.c"
+    .balign 4
+
+.text
 glabel func_80817D50
 /* 04530 80817D50 27BDFF28 */  addiu   $sp, $sp, 0xFF28           ## $sp = FFFFFF28
 /* 04534 80817D54 AFBF0014 */  sw      $ra, 0x0014($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s
index 2ad84bde4..bb9c57873 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081819C.s
@@ -1,3 +1,13 @@
+.late_rodata
+
+glabel D_8082F704
+    .float 0.046
+glabel D_8082F708
+    .float 0.056
+glabel D_8082F70C
+    .float 0.047
+
+.text
 glabel func_8081819C
 /* 0497C 8081819C 3C038016 */  lui     $v1, %hi(gSaveContext)
 /* 04980 808181A0 2463E660 */  addiu   $v1, %lo(gSaveContext)
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s
index 564f12495..a8d6cd664 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s
@@ -1,3 +1,30 @@
+.rdata
+
+glabel D_8082F638
+    .asciz "../z_kaleido_equipment.c"
+    .balign 4
+
+glabel D_8082F654
+    .asciz "H_arrowcase_1 + non_equip_item_table = %d\n"
+    .balign 4
+
+glabel D_8082F680
+    .asciz "大人 H_arrowcase_1 + non_equip_item_table = %d\n"
+    .balign 4
+
+glabel D_8082F6B0
+    .asciz "ccc=%d\n"
+    .balign 4
+
+glabel D_8082F6B8
+    .asciz "kscope->select_name[Display_Equipment] = %d\n"
+    .balign 4
+
+glabel D_8082F6E8
+    .asciz "../z_kaleido_equipment.c"
+    .balign 4
+
+.text
 glabel func_80818340
 /* 04B20 80818340 27BDFF28 */  addiu   $sp, $sp, 0xFF28           ## $sp = FFFFFF28
 /* 04B24 80818344 AFBF0044 */  sw      $ra, 0x0044($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s
index dfde39a60..eb78e0791 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082F710
+    .asciz "../z_kaleido_item.c"
+    .balign 4
+
+glabel D_8082F724
+    .asciz "../z_kaleido_item.c"
+    .balign 4
+
+.text
 glabel func_808198A0
 /* 06080 808198A0 27BDFF68 */  addiu   $sp, $sp, 0xFF68           ## $sp = FFFFFF68
 /* 06084 808198A4 AFA600A0 */  sw      $a2, 0x00A0($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s
index 5372af962..4455b94fd 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s
@@ -1,3 +1,26 @@
+.rdata
+
+glabel D_8082F738
+    .asciz "../z_kaleido_item.c"
+    .balign 4
+
+glabel D_8082F74C
+    .asciz "now=%d  ccc=%d\n"
+    .balign 4
+
+glabel D_8082F75C
+    .asciz "【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】  "
+    .balign 4
+
+glabel D_8082F7A0
+    .asciz "【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】  "
+    .balign 4
+
+glabel D_8082F7D8
+    .asciz "../z_kaleido_item.c"
+    .balign 4
+
+.text
 glabel func_80819E6C
 /* 0664C 80819E6C 27BDFF48 */  addiu   $sp, $sp, 0xFF48           ## $sp = FFFFFF48
 /* 06650 80819E70 AFBF0034 */  sw      $ra, 0x0034($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s
index d66fcb8ea..f86c0c387 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081AD44.s
@@ -1,3 +1,50 @@
+.rdata
+
+glabel D_8082F7EC
+    .asciz "\n＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝＝\n"
+    .balign 4
+
+glabel D_8082F830
+    .asciz "Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F858
+    .asciz "Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F880
+    .asciz "Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F8A8
+    .asciz "Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F8D0
+    .asciz "Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F8F8
+    .asciz "Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F920
+    .asciz "Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F948
+    .asciz "Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F970
+    .asciz "Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+glabel D_8082F998
+    .asciz "Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n"
+    .balign 4
+
+.text
 glabel func_8081AD44
 /* 07524 8081AD44 3C098083 */  lui     $t1, %hi(D_8082A430)       ## $t1 = 80830000
 /* 07528 8081AD48 2529A430 */  addiu   $t1, $t1, %lo(D_8082A430)  ## $t1 = 8082A430
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s
index 527e2e773..0de74b7b1 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s
@@ -1,3 +1,23 @@
+.rdata
+
+glabel D_8082F9C0
+    .asciz "../z_kaleido_map_PAL.c"
+    .balign 4
+
+glabel D_8082F9D8
+    .asciz "kscope->cursor_point=%d\n"
+    .balign 4  
+
+glabel D_8082F9F4
+    .asciz "kscope->cursor_point====%d\n"
+    .balign 4
+
+
+glabel D_8082FA10
+    .asciz "../z_kaleido_map_PAL.c"
+    .balign 4
+
+.text
 glabel func_8081BB10
 /* 082F0 8081BB10 27BDFE10 */  addiu   $sp, $sp, 0xFE10           ## $sp = FFFFFE10
 /* 082F4 8081BB14 AFBF002C */  sw      $ra, 0x002C($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s
index 3f6415d95..b174bc348 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FA28
+    .asciz "../z_kaleido_map_PAL.c"
+    .balign 4
+
+glabel D_8082FA40
+    .asciz "../z_kaleido_map_PAL.c"
+    .balign 4
+
+.text
 glabel func_8081D398
 /* 09B78 8081D398 27BDFD78 */  addiu   $sp, $sp, 0xFD78           ## $sp = FFFFFD78
 /* 09B7C 8081D39C 3C010001 */  lui     $at, 0x0001                ## $at = 00010000
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s
index c81eaca99..da699ce04 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FA60
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FA7C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_8081F1F0
 /* 0B9D0 8081F1F0 27BDFFA8 */  addiu   $sp, $sp, 0xFFA8           ## $sp = FFFFFFA8
 /* 0B9D4 8081F1F4 AFBF0024 */  sw      $ra, 0x0024($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s
index 4455c3bd0..7df8fb176 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FA98
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FAB4
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_8081F87C
 /* 0C05C 8081F87C 27BDFF90 */  addiu   $sp, $sp, 0xFF90           ## $sp = FFFFFF90
 /* 0C060 8081F880 AFB00018 */  sw      $s0, 0x0018($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s
index 1af57d504..e730df376 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FB7C.s
@@ -1,3 +1,10 @@
+.rdata
+
+glabel D_8082FAD0
+    .asciz "kscope->kscp_pos+pt = %d\n"
+    .balign 4
+
+.text
 glabel func_8081FB7C
 /* 0C35C 8081FB7C 27BDFFD8 */  addiu   $sp, $sp, 0xFFD8           ## $sp = FFFFFFD8
 /* 0C360 8081FB80 AFBF0024 */  sw      $ra, 0x0024($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s
index eff8485e5..570b6002a 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FAEC
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FB08
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_8081FE30
 /* 0C610 8081FE30 27BDFF80 */  addiu   $sp, $sp, 0xFF80           ## $sp = FFFFFF80
 /* 0C614 8081FE34 AFBF0014 */  sw      $ra, 0x0014($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s
index a60c661af..25065571f 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s
@@ -1,3 +1,121 @@
+.rdata
+
+glabel D_8082FB24
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FB40
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FB5C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FB78
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FB94
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FBB0
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FBCC
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FBE8
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FC04
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FC20
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FC3C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.late_rodata
+
+glabel D_8083023C
+    .float 0.78
+
+glabel D_80830240
+    .float 0.78
+
+glabel D_80830244
+    .float 1.57
+
+glabel D_80830248
+    .float 0.78
+
+glabel D_8083024C
+    .float 3.14
+
+glabel D_80830250
+    .float 0.78
+
+glabel D_80830254
+    .float -1.57
+
+glabel D_80830258
+    .float 0.78
+
+glabel D_8083025C
+    .float 0.78
+
+glabel D_80830260
+    .float 0.78
+
+glabel D_80830264
+    .float 0.78
+
+glabel D_80830268
+    .float -1.57
+
+glabel D_8083026C
+    .float 0.78
+
+glabel D_80830270
+    .float 3.14
+
+glabel D_80830274
+    .float 0.78
+
+glabel D_80830278
+    .float 1.57
+
+glabel D_8083027C
+    .float 0.78
+
+glabel D_80830280
+    .float 0.78
+
+glabel D_80830284
+    .float -1.57
+
+glabel D_80830288
+    .float 0.78
+
+glabel D_8083028C
+    .float 3.14
+
+glabel D_80830290
+    .float 0.78
+
+glabel D_80830294
+    .float 1.57
+
+.text
 glabel func_80820434
 /* 0CC14 80820434 27BDFEE8 */  addiu   $sp, $sp, 0xFEE8           ## $sp = FFFFFEE8
 /* 0CC18 80820438 AFBF0024 */  sw      $ra, 0x0024($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s
index 53e483ef3..8ff88655b 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s
@@ -1,3 +1,30 @@
+.rdata
+
+glabel D_8082FC58
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FC74
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FC90
+    .asciz "[33m"
+    .balign 4
+
+glabel D_8082FC98
+    .asciz "キンスタ数(%d) Get_KIN_STA=%x (%x)  (%x)\n"
+    .balign 4
+
+glabel D_8082FCC4
+    .asciz "\x1b[m"
+    .balign 4
+
+glabel D_8082FCC8
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_80821C10
 /* 0E3F0 80821C10 27BDFEF8 */  addiu   $sp, $sp, 0xFEF8           ## $sp = FFFFFEF8
 /* 0E3F4 80821C14 AFBF001C */  sw      $ra, 0x001C($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s
index 7cbc59f70..90d2bed8f 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80823548.s
@@ -1,3 +1,22 @@
+.rdata
+
+glabel D_8082FCE4
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FD00
+    .asciz "zoom_name=%d\n"
+    .balign 4
+
+glabel D_8082FD10
+    .asciz "J_N=%d  point=%d\n"
+    .balign 4
+
+glabel D_8082FD24
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_80823548
 /* 0FD28 80823548 27BDFFD0 */  addiu   $sp, $sp, 0xFFD0           ## $sp = FFFFFFD0
 /* 0FD2C 8082354C 3C030001 */  lui     $v1, 0x0001                ## $v1 = 00010000
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s
index 7d170efb1..2b91d9e2c 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FD40
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FD5C
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_80825C14
 /* 123F4 80825C14 27BDFF20 */  addiu   $sp, $sp, 0xFF20           ## $sp = FFFFFF20
 /* 123F8 80825C18 AFBF0014 */  sw      $ra, 0x0014($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s
index d8fe48afa..0c134adb2 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826AEC.s
@@ -1,3 +1,14 @@
+.rdata
+
+glabel D_8082FDB0
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+glabel D_8082FDCC
+    .asciz "../z_kaleido_scope_PAL.c"
+    .balign 4
+
+.text
 glabel func_80826AEC
 /* 132CC 80826AEC 3C0F8016 */  lui     $t7, %hi(gGameInfo)
 /* 132D0 80826AF0 8DEFFA90 */  lw      $t7, %lo(gGameInfo)($t7)
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s
index 83e64ed69..6a7707a66 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80826BA8.s
@@ -1,3 +1,10 @@
+.rdata
+
+glabel D_8082FDE8
+    .asciz "ＭＡＰ ＤＭＡ = %d\n"
+    .balign 4
+
+.text
 glabel func_80826BA8
 /* 13388 80826BA8 27BDFFD0 */  addiu   $sp, $sp, 0xFFD0           ## $sp = FFFFFFD0
 /* 1338C 80826BAC AFB00018 */  sw      $s0, 0x0018($sp)           
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s
index b24149085..c8f60ac25 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s
@@ -1,3 +1,48 @@
+.rdata
+
+glabel D_80830520
+ .word 0x00000000, 0x00000001, 0x00000002, 0x00000003
+
+glabel D_80830530
+ .word 0x00000002, 0x00000002, 0x00000002, 0x00000003
+
+glabel D_80830540
+ .word 0x00000003, 0x00000001, 0x00000000, 0x00000000
+
+glabel D_80830550
+ .word 0x00000002, 0x00000001, 0x00000000, 0x00000000
+
+glabel D_80830560
+ .word 0x00000000, 0x00000001, 0x00000002, 0x00000004
+
+glabel D_80830570
+ .word 0x00000000, 0x00000001, 0x00000002, 0x00000002
+
+glabel D_80830580
+    .asciz "../z_lmap_mark.c"
+    .balign 4
+
+glabel D_80830594
+    .asciz "../z_lmap_mark.c"
+    .balign 4
+
+glabel D_808305A8
+    .asciz "../z_lmap_mark.c"
+    .balign 4
+
+.late_rodata
+
+glabel jtbl_808305BC
+.word L80829C28
+.word L80829C28
+.word L80829C28
+.word L80829C28
+.word L80829C28
+.word L80829C28
+.word L80829C28
+.word L80829C28
+
+.text
 glabel func_808299A0
 /* 16180 808299A0 27BDFF28 */  addiu   $sp, $sp, 0xFF28           ## $sp = FFFFFF28
 /* 16184 808299A4 3C0F8016 */  lui     $t7, %hi(gGameInfo)
diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s
index 8d571ec07..a379b2fc5 100644
--- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s
+++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082A00C.s
@@ -1,3 +1,19 @@
+.late_rodata
+.late_rodata_alignment 4
+
+glabel jtbl_808305DC
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+.word L8082A044
+
+.text
 glabel func_8082A00C
 /* 167EC 8082A00C 27BDFFE8 */  addiu   $sp, $sp, 0xFFE8           ## $sp = FFFFFFE8
 /* 167F0 8082A010 AFBF0014 */  sw      $ra, 0x0014($sp)           
diff --git a/data/overlays/actors/z_kaleido_collect.rodata.s b/data/overlays/actors/z_kaleido_collect.rodata.s
deleted file mode 100644
index 3b825a393..000000000
--- a/data/overlays/actors/z_kaleido_collect.rodata.s
+++ /dev/null
@@ -1,38 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082F420
-    .asciz "../z_kaleido_collect.c"
-    .balign 4
-
-glabel D_8082F438
-    .asciz "000 ccc=%d\n"
-    .balign 4
-
-glabel D_8082F444
-    .asciz "111 ccc=%d\n"
-    .balign 4
-
-glabel D_8082F450
-    .asciz "222 ccc=%d (%d, %d, %d)\n"
-    .balign 4
-
-glabel D_8082F46C
-    .asciz "999 ccc=%d (%d,  %d)\n"
-    .balign 4
-
-glabel D_8082F484
-    .asciz "888 ccc=%d (%d,  %d,  %x)\n"
-    .balign 4
-
-glabel D_8082F4A0
-    .asciz "../z_kaleido_collect.c"
-    .balign 4
diff --git a/data/overlays/actors/z_kaleido_debug.rodata.s b/data/overlays/actors/z_kaleido_debug.rodata.s
deleted file mode 100644
index 754eded31..000000000
--- a/data/overlays/actors/z_kaleido_debug.rodata.s
+++ /dev/null
@@ -1,94 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082F4C0
- .word 0x25730000
-glabel D_8082F4C4
- .word 0x8C8ED98E, 0xCB8EDF8E, 0xB0000000
-glabel D_8082F4D0
- .word 0x25730000
-glabel D_8082F4D4
- .word 0x8C8ECA8E, 0xB08EC400
-glabel D_8082F4DC
- .word 0x25730000
-glabel D_8082F4E0
- .word 0x2F340000
-glabel D_8082F4E4
- .word 0x25730000
-glabel D_8082F4E8
- .word 0x8C8EB18E, 0xB28EC38E, 0xD1000000
-glabel D_8082F4F4
- .word 0x25730000
-glabel D_8082F4F8
- .word 0x4B455900
-glabel D_8082F4FC
- .word 0x25730000
-glabel D_8082F500
- .word 0x8D8EBF8E, 0xB38ECB8E, 0xDE000000
-glabel D_8082F50C
- .word 0x25730000
-glabel D_8082F510
- .word 0x8C8EB98E, 0xDD000000
-glabel D_8082F518
- .word 0x25730000
-glabel D_8082F51C
- .word 0x8C8EC08E, 0xC3000000
-glabel D_8082F524
- .word 0x25730000
-glabel D_8082F528
- .word 0x4D415000
-glabel D_8082F52C
- .word 0x25730000
-glabel D_8082F530
- .word 0x8D8ECC8E, 0xB38EB28E, 0xDD000000
-glabel D_8082F53C
- .word 0x25730000
-glabel D_8082F540
- .word 0x8D8EBE8E, 0xB28EDA8E, 0xB28EBE8E, 0xB7000000
-glabel D_8082F550
- .word 0x25730000
-glabel D_8082F554
- .word 0x8C8EB58E, 0xB68ED88E, 0xC5000000
-glabel D_8082F560
- .word 0x25730000
-glabel D_8082F564
- .word 0x8C8EBA8E, 0xDA8EB88E, 0xC4000000
-glabel D_8082F570
- .word 0x25730000
-glabel D_8082F574
- .word 0x8C8EB78E, 0xDD8EBD8E, 0xC0000000
-glabel D_8082F580
- .word 0x25730000
-glabel D_8082F584
- .word 0x8C8EB68E, 0xB98ED700
-glabel D_8082F58C
- .word 0x25730000
-glabel D_8082F590
- .word 0x2F340000
-glabel D_8082F594
-    .asciz "../z_kaleido_debug.c"
-    .balign 4
-
-glabel D_8082F5AC
-    .asciz "../z_kaleido_debug.c"
-    .balign 4
-
-glabel D_8082F5C4
-    .asciz "../z_kaleido_debug.c"
-    .balign 4
-
-glabel D_8082F5DC
-    .asciz "i=%d  j=%d\n"
-    .balign 4
-
-glabel D_8082F5E8
-    .asciz "../z_kaleido_debug.c"
-    .balign 4
diff --git a/data/overlays/actors/z_kaleido_equipment.rodata.s b/data/overlays/actors/z_kaleido_equipment.rodata.s
deleted file mode 100644
index 107ae899a..000000000
--- a/data/overlays/actors/z_kaleido_equipment.rodata.s
+++ /dev/null
@@ -1,49 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082F600
-    .asciz "../z_kaleido_equipment.c"
-    .balign 4
-
-glabel D_8082F61C
-    .asciz "../z_kaleido_equipment.c"
-    .balign 4
-
-glabel D_8082F638
-    .asciz "../z_kaleido_equipment.c"
-    .balign 4
-
-glabel D_8082F654
-    .asciz "H_arrowcase_1 + non_equip_item_table = %d\n"
-    .balign 4
-
-glabel D_8082F680
-    .asciz "大人 H_arrowcase_1 + non_equip_item_table = %d\n"
-    .balign 4
-
-glabel D_8082F6B0
-    .asciz "ccc=%d\n"
-    .balign 4
-
-glabel D_8082F6B8
-    .asciz "kscope->select_name[Display_Equipment] = %d\n"
-    .balign 4
-
-glabel D_8082F6E8
-    .asciz "../z_kaleido_equipment.c"
-    .balign 4
-
-glabel D_8082F704
- .word 0x3D3C6A7F
-glabel D_8082F708
- .word 0x3D656042
-glabel D_8082F70C
- .word 0x3D408312
diff --git a/data/overlays/actors/z_kaleido_item.rodata.s b/data/overlays/actors/z_kaleido_item.rodata.s
deleted file mode 100644
index 70020d96d..000000000
--- a/data/overlays/actors/z_kaleido_item.rodata.s
+++ /dev/null
@@ -1,80 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082F710
-    .asciz "../z_kaleido_item.c"
-    .balign 4
-
-glabel D_8082F724
-    .asciz "../z_kaleido_item.c"
-    .balign 4
-
-glabel D_8082F738
-    .asciz "../z_kaleido_item.c"
-    .balign 4
-
-glabel D_8082F74C
-    .asciz "now=%d  ccc=%d\n"
-    .balign 4
-
-glabel D_8082F75C
-    .asciz "【Ｘ cursor=%d(%) (cur_xpt=%d)(ok_fg=%d)(ccc=%d)(key_angle=%d)】  "
-    .balign 4
-
-glabel D_8082F7A0
-    .asciz "【Ｙ cursor=%d(%) (cur_ypt=%d)(ok_fg=%d)(ccc=%d)】  "
-    .balign 4
-
-glabel D_8082F7D8
-    .asciz "../z_kaleido_item.c"
-    .balign 4
-
-glabel D_8082F7EC
- .word 0x0AA1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE1A1E1A1, 0xE10A0000
-glabel D_8082F830
-    .asciz "Ｃ左sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F858
-    .asciz "Ｃ左sl_number=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F880
-    .asciz "Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F8A8
-    .asciz "Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F8D0
-    .asciz "Ｃ下sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F8F8
-    .asciz "Ｃ下sl_number=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F920
-    .asciz "Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F948
-    .asciz "Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F970
-    .asciz "Ｃ右sl_item_no=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
-
-glabel D_8082F998
-    .asciz "Ｃ右sl_number=%d (1)=%d (2)=%d (3)=%d\n"
-    .balign 4
diff --git a/data/overlays/actors/z_kaleido_map_PAL.rodata.s b/data/overlays/actors/z_kaleido_map_PAL.rodata.s
deleted file mode 100644
index 4fa56866d..000000000
--- a/data/overlays/actors/z_kaleido_map_PAL.rodata.s
+++ /dev/null
@@ -1,34 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082F9C0
-    .asciz "../z_kaleido_map_PAL.c"
-    .balign 4
-
-glabel D_8082F9D8
-    .asciz "kscope->cursor_point=%d\n"
-    .balign 4
-
-glabel D_8082F9F4
-    .asciz "kscope->cursor_point====%d\n"
-    .balign 4
-
-glabel D_8082FA10
-    .asciz "../z_kaleido_map_PAL.c"
-    .balign 4
-
-glabel D_8082FA28
-    .asciz "../z_kaleido_map_PAL.c"
-    .balign 4
-
-glabel D_8082FA40
-    .asciz "../z_kaleido_map_PAL.c"
-    .balign 4
diff --git a/data/overlays/actors/z_kaleido_scope_PAL.rodata.s b/data/overlays/actors/z_kaleido_scope_PAL.rodata.s
deleted file mode 100644
index d16b197a8..000000000
--- a/data/overlays/actors/z_kaleido_scope_PAL.rodata.s
+++ /dev/null
@@ -1,538 +0,0 @@
-.include "macro.inc"
-
- # assembler directives
- .set noat      # allow manual use of $at
- .set noreorder # don't insert nops after branches
- .set gp=64     # allow use of 64-bit general purpose registers
-
-.section .rodata
-
-.balign 16
-
-glabel D_8082FA60
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FA7C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FA98
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FAB4
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FAD0
-    .asciz "kscope->kscp_pos+pt = %d\n"
-    .balign 4
-
-glabel D_8082FAEC
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB08
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB24
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB40
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB5C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB78
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FB94
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FBB0
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FBCC
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FBE8
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC04
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC20
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC3C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC58
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC74
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FC90
-    .asciz "[33m"
-    .balign 4
-
-glabel D_8082FC98
-    .asciz "キンスタ数(%d) Get_KIN_STA=%x (%x)  (%x)\n"
-    .balign 4
-
-glabel D_8082FCC4
-    .asciz "\x1b[m"
-    .balign 4
-
-glabel D_8082FCC8
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FCE4
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FD00
-    .asciz "zoom_name=%d\n"
-    .balign 4
-
-glabel D_8082FD10
-    .asciz "J_N=%d  point=%d\n"
-    .balign 4
-
-glabel D_8082FD24
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FD40
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FD5C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FD78
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FD94
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FDB0
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FDCC
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FDE8
-    .asciz "ＭＡＰ ＤＭＡ = %d\n"
-    .balign 4
-
-glabel D_8082FDFC
-    .asciz "プレイヤー size1＝%x\n"
-    .balign 4
-
-glabel D_8082FE14
-    .asciz "icon_item size0=%x\n"
-    .balign 4
-
-glabel D_8082FE28
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FE44
-    .asciz "icon_item24 size=%x\n"
-    .balign 4
-
-glabel D_8082FE5C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FE78
-    .asciz "icon_item_dungeon dungeon-size2=%x\n"
-    .balign 4
-
-glabel D_8082FE9C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FEB8
-    .asciz "icon_item_field field-size2=%x\n"
-    .balign 4
-
-glabel D_8082FED8
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FEF4
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_8082FF18
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FF34
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_8082FF58
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FF74
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_8082FF98
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8082FFB4
-    .asciz "サイズ＝%x\n"
-    .balign 4
-
-glabel D_8082FFC0
-    .asciz "item_name I_N_PT=%x\n"
-    .balign 4
-
-glabel D_8082FFD8
-    .asciz "サイズ＝%x\n"
-    .balign 4
-
-glabel D_8082FFE4
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_80830000
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8083001C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_80830038
-    .asciz "icon_item size0=%x\n"
-    .balign 4
-
-glabel D_8083004C
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_80830068
-    .asciz "icon_item24 size=%x\n"
-    .balign 4
-
-glabel D_80830080
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_8083009C
-    .asciz "icon_item_dungeon gameover-size2=%x\n"
-    .balign 4
-
-glabel D_808300C4
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_808300E0
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_80830104
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_80830120
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_80830144
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_80830160
-    .asciz "icon_item_dungeon dungeon-size=%x\n"
-    .balign 4
-
-glabel D_80830184
-    .asciz "../z_kaleido_scope_PAL.c"
-    .balign 4
-
-glabel D_808301A0
-    .asciz "kscope->angle_s = %f\n"
-    .balign 4
-
-glabel D_808301B8
-    .asciz "[33m"
-    .balign 4
-
-glabel D_808301C0
-    .asciz "MAGIC_NOW=%d "
-    .balign 4
-
-glabel D_808301D0
-    .asciz "Z_MAGIC_NOW_NOW=%d   →  "
-    .balign 4
-
-glabel D_808301EC
-    .asciz "MAGIC_NOW=%d "
-    .balign 4
-
-glabel D_808301FC
-    .asciz "Z_MAGIC_NOW_NOW=%d\n"
-    .balign 4
-
-glabel D_80830210
-    .asciz "\x1b[m"
-    .balign 4
-
-glabel D_80830214
-    .asciz "[33m"
-    .balign 4
-
-glabel D_8083021C
-    .asciz "i=%d  LAST_TIME_TYPE=%d\n"
-    .balign 4
-
-glabel D_80830238
-    .asciz "\x1b[m"
-    .balign 4
-
-glabel D_8083023C
- .word 0x3F47AE14
-glabel D_80830240
- .word 0x3F47AE14
-glabel D_80830244
- .word 0x3FC8F5C3
-glabel D_80830248
- .word 0x3F47AE14
-glabel D_8083024C
- .word 0x4048F5C3
-glabel D_80830250
- .word 0x3F47AE14
-glabel D_80830254
- .word 0xBFC8F5C3
-glabel D_80830258
- .word 0x3F47AE14
-glabel D_8083025C
- .word 0x3F47AE14
-glabel D_80830260
- .word 0x3F47AE14
-glabel D_80830264
- .word 0x3F47AE14
-glabel D_80830268
- .word 0xBFC8F5C3
-glabel D_8083026C
- .word 0x3F47AE14
-glabel D_80830270
- .word 0x4048F5C3
-glabel D_80830274
- .word 0x3F47AE14
-glabel D_80830278
- .word 0x3FC8F5C3
-glabel D_8083027C
- .word 0x3F47AE14
-glabel D_80830280
- .word 0x3F47AE14
-glabel D_80830284
- .word 0xBFC8F5C3
-glabel D_80830288
- .word 0x3F47AE14
-glabel D_8083028C
- .word 0x4048F5C3
-glabel D_80830290
- .word 0x3F47AE14
-glabel D_80830294
- .word 0x3FC8F5C3
-glabel jtbl_80830298
-.word L80826E00
-.word L808279D0
-.word L80827C1C
-.word L80827C90
-.word L80828098
-.word L80829940
-.word L80829940
-.word L808286FC
-.word L80828A38
-.word L80828E28
-.word L80828E54
-.word L808290DC
-.word L808291B8
-.word L80829264
-.word L80829484
-.word L808295F0
-.word L80829828
-glabel jtbl_808302DC
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827100
-.word L80827100
-.word L80827100
-.word L80827100
-.word L80827100
-.word L80827100
-.word L80827100
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-.word L80827078
-glabel jtbl_80830340
-.word L80827CB4
-.word L80827D78
-.word L80827D8C
-.word L80827DBC
-.word L80829940
-.word L80827DCC
-.word L80827F70
-.word L80829940
-.word L80827FB4
-.word L80829940
-glabel jtbl_80830368
-.word L808280BC
-.word L80828198
-.word L808284C0
-.word L808283CC
-.word L80828310
-.word L808284C0
-.word L808283CC
-glabel jtbl_80830384
-.word L808293F8
-.word L80829478
-.word L80829478
-.word L80829478
-.word L808293F0
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829434
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829420
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829440
-glabel jtbl_808303D8
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L8082940C
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-.word L80829478
-glabel jtbl_808304B8
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829894
-.word L80829894
-.word L80829894
-.word L80829894
-.word L80829894
-.word L80829894
-.word L80829894
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word L80829880
-.word 0x00000000
diff --git a/data/overlays/actors/z_lmap_mark.rodata.s b/data/overlays/actors/z_lmap_mark.rodata.s
index f38da6858..3106829e2 100644
--- a/data/overlays/actors/z_lmap_mark.rodata.s
+++ b/data/overlays/actors/z_lmap_mark.rodata.s
@@ -7,53 +7,6 @@
 
 .section .rodata
 
-.balign 16
-
-glabel D_80830520
- .word 0x00000000, 0x00000001, 0x00000002, 0x00000003
-glabel D_80830530
- .word 0x00000002, 0x00000002, 0x00000002, 0x00000003
-glabel D_80830540
- .word 0x00000003, 0x00000001, 0x00000000, 0x00000000
-glabel D_80830550
- .word 0x00000002, 0x00000001, 0x00000000, 0x00000000
-glabel D_80830560
- .word 0x00000000, 0x00000001, 0x00000002, 0x00000004
-glabel D_80830570
- .word 0x00000000, 0x00000001, 0x00000002, 0x00000002
-glabel D_80830580
-    .asciz "../z_lmap_mark.c"
-    .balign 4
-
-glabel D_80830594
-    .asciz "../z_lmap_mark.c"
-    .balign 4
-
-glabel D_808305A8
-    .asciz "../z_lmap_mark.c"
-    .balign 4
-
-glabel jtbl_808305BC
-.word L80829C28
-.word L80829C28
-.word L80829C28
-.word L80829C28
-.word L80829C28
-.word L80829C28
-.word L80829C28
-.word L80829C28
-glabel jtbl_808305DC
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-.word L8082A044
-
 # This appears to be a file boundary
 .balign 16
 
diff --git a/spec b/spec
index 8373c2c62..06a7600ed 100644
--- a/spec
+++ b/spec
@@ -585,22 +585,16 @@ beginseg
     name "ovl_kaleido_scope"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_collect.o"
     include "build/data/overlays/actors/z_kaleido_collect.data.o"
-    include "build/data/overlays/actors/z_kaleido_collect.rodata.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_debug.o"
     include "build/data/overlays/actors/z_kaleido_debug.data.o"
-    include "build/data/overlays/actors/z_kaleido_debug.rodata.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_equipment.o"
     include "build/data/overlays/actors/z_kaleido_equipment.data.o"
-    include "build/data/overlays/actors/z_kaleido_equipment.rodata.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_item.o"
     include "build/data/overlays/actors/z_kaleido_item.data.o"
-    include "build/data/overlays/actors/z_kaleido_item.rodata.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_map_PAL.o"
     include "build/data/overlays/actors/z_kaleido_map_PAL.data.o"
-    include "build/data/overlays/actors/z_kaleido_map_PAL.rodata.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.o"
     include "build/data/overlays/actors/z_kaleido_scope_PAL.data.o"
-    include "build/data/overlays/actors/z_kaleido_scope_PAL.rodata.o"
     include "build/data/overlays/actors/z_kaleido_scope_PAL.bss.o"
     include "build/src/overlays/actors/ovl_kaleido_scope/z_lmap_mark.o"
     include "build/data/overlays/actors/z_lmap_mark.data.o"
diff --git a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index 6a24c74c9..93a47ee89 100644
--- a/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -40,8 +40,6 @@
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s")
 
-extern const char D_8082FD78[], D_8082FD94[];
-
 void KaleidoScope_Draw(GlobalContext* globalCtx) {
     Input* input = &globalCtx->state.input[0];
     PauseContext* pauseCtx = &globalCtx->pauseCtx;
@@ -49,7 +47,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     Gfx* dispRefs[4];
 
-    Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, D_8082FD78, 3188);
+    Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188);
 
     pauseCtx->inputX = input->rel.in.x;
     pauseCtx->inputY = input->rel.in.y;
@@ -84,7 +82,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
         func_808161AC(globalCtx);
     }
 
-    Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, D_8082FD94, 3254);
+    Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254);
 }
 
 #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s")
author	Lucas Shaw <49287729+shawlucas@users.noreply.github.com>	2020-06-09 09:06:23 -0700
committer	GitHub <noreply@github.com>	2020-06-09 12:06:23 -0400
commit	a0ef48e98751f102f7aa1f57bf3f5dbb336ca316 (patch)
tree	59a8f70d296e4b27682bc193a822f7b4b73bb419
parent	8afab54c234038838604750e12a9cca38178a618 (diff)