pause data: avoid referencing stuff not in overlay

pmret · Apr 18, 2021 · 3d96621 · 3d96621
1 parent 29fc31a
commit 3d96621
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/ver/us/asm/data/16A3E0.data.s b/ver/us/asm/data/16A3E0.data.s
@@ -141,7 +141,7 @@ glabel D_80249DCC
 .word 0x8024BA60, 0x18000000, 0x00000120, 0x00C00000, func_802440BC, 0x00000000, 0x2C000000, 0x00000001, 0x00000000, 0x8024BA98, 0x17000000, 0x00000140, 0x00F00000, func_80244030, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, 0x8024BA98, 0x00000000, 0x00000000
 
 glabel D_80249E20
-.word 0x802423DC, func_80242434_9D9454, 0x8024248C, 0x802424E4, D_8024253C_AB46AC, 0x80242594, 0x802425EC, 0x80242408, 0x80242460, 0x802424B8, D_80242510_D95450, D_80242568_A4EF88, 0x802425C0, D_80242618_9800E8, 0x802422D4, 0x80242300, mac_02_SetCamVfov, func_80242358_DCF028, func_80242384_833B84, D_802423B0_9EDBA0, 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000
+.word 0x802423DC, 0x80242434, 0x8024248C, 0x802424E4, 0x8024253C, 0x80242594, 0x802425EC, 0x80242408, 0x80242460, 0x802424B8, 0x80242510, 0x80242568, 0x802425C0, 0x80242618, 0x802422D4, 0x80242300, 0x8024232C, 0x80242358, 0x80242384, 0x802423B0, 0x00000102, 0x02030405, 0x06000001, 0x02020306, 0x06060000, 0x01020203, 0x06060600, 0x00010202, 0x03060606, 0x00000102, 0x02030606, 0x06000000
 
 glabel D_80249EA0
 .word 0x2D000000, 0x00000000, 0x00000000, func_80244C30, 0x00000000, 0x2C000000, func_80243550, 0x00000000, 0x8024BB08, 0x3300FFFE, 0x00060044, 0x00140000, func_80244CEC, 0x00000000, 0x2C000000, func_802433F4, 0x00000000, 0x8024BAD0, 0x340000DD, 0x00060044, 0x00140000, func_80244D60, 0x00000000, 0x2C000000, func_80243468, 0x00000000, 0x8024BAD0, 0x35000005, 0x00AB0058, 0x00100000, func_80244DD0, 0x00000000, 0x2C000000, func_802434DC, 0x00000000, 0x8024BB40, 0x36000000, 0x00AB0058, 0x00100000, func_80244E54, 0x00000000, 0x2C000000, func_802434DC, 0x00000000, 0x8024BB78, 0x370000C3, 0x00AB0058, 0x00100000, func_80244F44, 0x00000000, 0x2C000000, func_802434DC, 0x00000000, 0x8024BBB0, 0x3A000009, 0x006E0082, 0x00360000, func_80245628, 0x00000000, 0x2C000000, func_802433F4, 0x00000000, 0x8024BC58, 0x3E000003, 0xFFF8007C, 0x000F0000, func_80245768, 0x00000000, 0x3A000000, 0x00000001, 0x00000000, 0x8024BD38, 0x3B000095, 0x006E0082, 0x00360000, func_80245678, 0x00000000, 0x2C000000, func_80243468, 0x00000000, 0x8024BC90, 0x3F000003, 0xFFF8007C, 0x000F0000, func_802457B8, 0x00000000, 0x3B000000, 0x00000001, 0x00000000, 0x8024BD70, 0x38000009, 0x00290082, 0x00360000, func_80245588, 0x00000000, 0x2C000000, func_802433F4, 0x00000000, 0x8024BBE8, 0x3C000003, 0xFFF8007C, 0x000F0000, func_802456C8, 0x00000000, 0x38000000, 0x00000001, 0x00000000, 0x8024BCC8, 0x39000095, 0x00290082, 0x00360000, func_802455D8, 0x00000000, 0x2C000000, func_80243468, 0x00000000, 0x8024BC20
@@ -159,7 +159,7 @@ glabel D_8024A134
 .word 0x2F000000, 0x00000000, 0x00004000, func_80247D30, 0x00000000, 0xFF000000, 0x00000002, 0x00000000, 0x8024BEC0, 0x00000000, 0x00010100, 0x8024A130, func_80247FD0, func_80248024, func_80248160, func_80248168, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_8024A180
-.word sam_06_Call800E98C4SyncStatusMenu, func_80241FBC_A1D0BC, kzn_09_UnkNpcAIFunc12
+.word 0x80241F70, 0x80241FBC, 0x80242B74
 
 glabel D_8024A18C
 .word 0xFFFFFFFC

diff --git a/ver/us/asm/data/pause/1422A0.data.s b/ver/us/asm/data/pause/1422A0.data.s
@@ -3,7 +3,7 @@
 .section .data
 
 glabel gPauseMenuIconScripts
-.word D_80241ECC, 0x802427D4, nok_02_UnkMovePartner, 0x80241E00, D_801091E4, D_80108BBC, 0x80108D04, 0x80108D40
+.word D_80241ECC, 0x802427D4, 0x80242820, 0x80241E00, D_801091E4, D_80108BBC, 0x80108D04, 0x80108D40
 
 glabel D_8024EF80
 .word 0x8024F314, 0x8024F4AC, 0x8024F54C, 0x8024F5E4, 0x8024F88C, 0x8024FA10
@@ -99,7 +99,7 @@ glabel D_8024F114
 .word 0x1600000C, 0x00140128, 0x00C80000, func_80243568, 0x00000000, 0xFF000000, 0x00000001, 0x40000000, 0x8026F900, 0x18000000, 0x008A0128, 0x003F0000, pause_tutorial_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026F970, 0x17000014, 0x00A40100, 0x00200000, pause_textbox_draw_contents, 0x00000000, 0x16000000, basic_window_update, 0x00000000, 0x8026F938, 0x2C000000, 0x00000140, 0x00F00000, pause_update_cursor, 0x00000000, 0xFF000000, 0x00000001, 0x00000000, 0x8026F900, 0x00000000, 0x00000000, 0x00000000
 
 glabel D_8024F1B0
-.word func_80241FE8_D3C5B8, func_80242014_8B2084, func_80242040_8B20B0, func_8024206C_83386C, 0x80242098, sam_06_PartnerSuspendAbilityScript, 0x00010203, 0x04050000
+.word 0x80241FE8, 0x80242014, 0x80242040, 0x8024206C, 0x80242098, 0x802420C4, 0x00010203, 0x04050000
 
 glabel D_8024F1D0
 .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x00
@@ -129,13 +129,13 @@ glabel D_8024F310
 .word 0x00000001, 0x00000000, 0x00060100, 0x8024F1C8, pause_tabs_init, pause_tabs_handle_input, pause_tabs_update, pause_tabs_cleanup
 
 glabel D_8024F330
-.word 0x802429D4, 0x8024286C, 0x8024290C, D_80108558, D_801086AC, 0x80242A24, 0x802429FC, D_80108518, func_80242AD4_825D94, 0x802429AC, D_801083D8, 0x80242B24
+.word 0x802429D4, 0x8024286C, 0x8024290C, D_80108558, D_801086AC, 0x80242A24, 0x802429FC, D_80108518, 0x80242AD4, 0x802429AC, D_801083D8, 0x80242B24
 
 glabel D_8024F360
-.word 0x8024286C, mac_05_UnkYawFunc, 0x802428BC, 0x802428E4
+.word 0x8024286C, 0x80242894, 0x802428BC, 0x802428E4
 
 glabel D_8024F370
-.word 0x8024290C, func_80242934_C63644, func_8024295C_8B29CC, 0x80242984
+.word 0x8024290C, 0x80242934, 0x8024295C, 0x80242984
 
 glabel D_8024F380
 .word 0x0000003B, 0x0000003C, 0x0000003D, 0x0000003E
@@ -180,19 +180,19 @@ glabel D_8024F488
 .word 0x1F000003, 0x00100121, 0x009A0000, pause_stats_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FBA0, 0x00000000, 0x00020700, 0x8024F3A0, pause_stats_init, pause_stats_handle_input, 0x00000000, pause_stats_cleanup, 0x00000000, 0x00000000
 
 glabel D_8024F4D0
-.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, jan_02_SomeMatrixOperation2, D_801083D8
+.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802426A0, 0x802426CC, 0x802427A8, 0x80242750, D_801083D8
 
 glabel D_8024F528
 .word 0x20000003, 0x00100121, 0x009A0100, pause_badges_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FC80, 0x00000000, 0x00000000, 0x00000000, pause_badges_init, pause_badges_handle_input, pause_badges_update, pause_badges_cleanup, 0x00000000, 0x00000000
 
 glabel D_8024F570
-.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, func_802426A0_8B2710, 0x802426CC, 0x802427A8, D_801083D8
+.word 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802429AC, 0x802426A0, 0x802426CC, 0x802427A8, D_801083D8
 
 glabel D_8024F5C0
 .word 0x21000003, 0x00100121, 0x009A0100, pause_items_draw_contents, 0x00000000, 0x16000000, 0x00000002, 0x00000000, 0x8026FD28, 0x00000000, 0x00000000, 0x00000000, pause_items_init, pause_items_handle_input, pause_items_update, pause_items_cleanup
 
 glabel D_8024F600
-.word D_80107638, func_80242AD4_825D94, 0x80242B4C, 0x80242B4C, 0x80109338, 0x80109360, 0x80109388, 0x801093B0
+.word D_80107638, 0x80242AD4, 0x80242B4C, 0x80242B4C, 0x80109338, 0x80109360, 0x80109388, 0x801093B0
 
 glabel D_8024F620
 .word 0x028001E0, 0x01FF0000, 0x028001E0, 0x01FF0000