Fixup asm/parity with dtk branch

xbret · Aug 3, 2024 · 64e07b2 · 64e07b2
1 parent 3fd29bb
commit 64e07b2
Show file tree

Hide file tree

Showing 137 changed files with 268 additions and 351 deletions.
diff --git a/asm/kyoshin/appgame/cf/CBattleManager.s b/asm/kyoshin/appgame/cf/CBattleManager.s
@@ -32073,8 +32073,9 @@
 	.4byte 0x0000012A
 .endobj lbl_804F8310
 
-
+.obj lbl_804F8380, global
 	.asciz "cf::CfObjectEff"
+.endobj lbl_804F8380
 
 .obj cf_CBattleManager_typestr, global
 	.asciz "cf::CBattleManager"

diff --git a/asm/kyoshin/appgame/cf/CtrlMoveEne.s b/asm/kyoshin/appgame/cf/CtrlMoveEne.s
@@ -10451,12 +10451,12 @@
 	.4byte 0
 .endobj cf_CtrlMoveEne_hierarchy
 
-
+.obj lbl_8052B1E4, global
 	.asciz "FSqrt: Input is out of the domain."
 	.balign 4
 	.asciz "arithmetic.h"
 	.balign 4
-
+.endobj lbl_8052B1E4
 
 .section .sdata, "wa"  # 0x80664180 - 0x80666600
 

diff --git a/asm/kyoshin/appgame/cf/CtrlMovePC.s b/asm/kyoshin/appgame/cf/CtrlMovePC.s
@@ -6932,12 +6932,13 @@
 	.4byte 0
 .endobj cf_CtrlMovePC_hierarchy
 
-
+.obj lbl_80536528, global
 	.asciz "FSqrt: Input is out of the domain."
 	.balign 4
 	.asciz "arithmetic.h"
 	.balign 4
 	.4byte 0
+.endobj lbl_80536528
 
 .section .sdata, "wa"  # 0x80664180 - 0x80666600
 

diff --git a/asm/kyoshin/appgame/code_80135FDC.s b/asm/kyoshin/appgame/code_80135FDC.s
@@ -7310,9 +7310,10 @@
 
 .obj lbl_804FBC18, global
 	.asciz "minimaplist2401"
-	.4byte 0
 .endobj lbl_804FBC18
 
+.obj lbl_804FBC28, global
+	.4byte 0
 	.4byte lbl_804FBAA8
 	.4byte lbl_804FBAB8
 	.4byte lbl_804FBAC8
@@ -7348,7 +7349,7 @@
 	.4byte 0
 	.4byte 0
 	.4byte 0
-
+.endobj lbl_804FBC28
 
 .obj lbl_804FBCB0, global
 	.4byte 0
@@ -7363,6 +7364,7 @@
 	.4byte 0
 .endobj lbl_804FBCB0
 
+.obj lbl_804FBCD8, global
 	.4byte lbl_804FBB28
 	.4byte lbl_804FBB38
 	.4byte lbl_804FBB48
@@ -7386,16 +7388,18 @@
 	.4byte 0
 	.4byte 0
 	.4byte 0
+.endobj lbl_804FBCD8
 
 .obj lbl_804FBD30, global
 	.asciz "minimaplist0801"
 .endobj lbl_804FBD30
 
 .obj lbl_804FBD40, global
 	.asciz "minimaplist1801"
-	.4byte 0
 .endobj lbl_804FBD40
 
+.obj lbl_804FBD50, global
+	.4byte 0
 	.4byte lbl_804FBAA8
 	.4byte lbl_804FBAB8
 	.4byte lbl_804FBAC8
@@ -7429,7 +7433,7 @@
 	.4byte 0
 	.4byte 0
 	.4byte 0
-
+.endobj lbl_804FBD50
 
 .obj lbl_804FBDD8, global
 	.4byte 0
@@ -7444,6 +7448,7 @@
 	.4byte 0
 .endobj lbl_804FBDD8
 
+.obj lbl_804FBE00, global
 	.4byte lbl_804FBB28
 	.4byte lbl_804FBB38
 	.4byte lbl_804FBB48
@@ -7469,6 +7474,7 @@
 	.4byte 0
 	.4byte 0
 	.4byte 0
+.endobj lbl_804FBE00
 
 .obj lbl_804FBE60, global
 	.float 1.5

diff --git a/asm/kyoshin/appgame/plugin/ocUnit.s b/asm/kyoshin/appgame/plugin/ocUnit.s
@@ -5240,6 +5240,7 @@
 	.4byte 0
 .endobj lbl_805286A8
 
+.obj lbl_805286B8, global
 	.4byte lbl_806684E0
 	.4byte func_8003C0D0
 	.4byte func_8003C560
@@ -5278,6 +5279,7 @@
 	.4byte 0
 	.4byte 0
 	.4byte 0
+.endobj lbl_805286B8
 
 .obj lbl_80528738, global
 	.4byte lbl_80668508

diff --git a/asm/kyoshin/appgame/realtimeevt/CREvtModelObj.s b/asm/kyoshin/appgame/realtimeevt/CREvtModelObj.s
@@ -2292,13 +2292,13 @@
 	.4byte 0
 .endobj cf_CREvtModelObj_hierarchy
 
-
+.obj lbl_80535910, global
 	.asciz "NW4R:Failed assertion !((u32)p & 0x1f)"
 	.balign 4
 	.asciz "g3d_resfile_ac.h"
 	.balign 4
 	.4byte 0
-
+.endobj lbl_80535910
 
 .section .sdata, "wa"  # 0x80664180 - 0x80666600
 

diff --git a/libs/CriWare/asm/adx/adxt/adx_bahx.s b/libs/CriWare/asm/adx/adxt/adx_bahx.s
@@ -66,7 +66,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
-
+.balign 8
 .obj ahxsetsjifunc, global
 	.skip 0x4
 .endobj ahxsetsjifunc

diff --git a/libs/CriWare/asm/adx/adxt/adx_bsc.s b/libs/CriWare/asm/adx/adxt/adx_bsc.s
@@ -2023,14 +2023,12 @@
 	.skip 0x2
 .endobj adxb_def_ka
 
-.skip 0x2
-
+.balign 4
 .obj adxb_dec_err_mode, global
 	.skip 0x4
 .endobj adxb_dec_err_mode
 
-.skip 0x4
-
+.balign 8
 .obj adxb_obj, local
 	.skip 0xFC0
 .endobj adxb_obj
diff --git a/libs/CriWare/asm/adx/adxt/adx_dcd3.s b/libs/CriWare/asm/adx/adxt/adx_dcd3.s
@@ -2,8 +2,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj adx_decode_output_mono_flag, global
 	.skip 0x4
 .endobj adx_decode_output_mono_flag
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/adxt/adx_inis.s b/libs/CriWare/asm/adx/adxt/adx_inis.s
@@ -248,8 +248,7 @@
 	.skip 0x4
 .endobj cri_verstr_ptr
 
-.skip 0x4
-
+.balign 8
 .obj adxt_obj, global
 	.skip 0xC40
 .endobj adxt_obj

diff --git a/libs/CriWare/asm/adx/adxt/adx_sfa.s b/libs/CriWare/asm/adx/adxt/adx_sfa.s
@@ -23,5 +23,3 @@
 .obj sfa_init_cnt, global
 	.skip 0x4
 .endobj sfa_init_cnt
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/adxt/adx_sjd.s b/libs/CriWare/asm/adx/adxt/adx_sjd.s
@@ -1563,6 +1563,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj adxsjd_init_cnt, global
 	.skip 0x4
 .endobj adxsjd_init_cnt

diff --git a/libs/CriWare/asm/adx/adxt/adx_stmc.s b/libs/CriWare/asm/adx/adxt/adx_stmc.s
@@ -1599,5 +1599,3 @@
 .obj adxstm_sj_internal_error_cnt, global
 	.skip 0x4
 .endobj adxstm_sj_internal_error_cnt
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/adxt/adx_tlk.s b/libs/CriWare/asm/adx/adxt/adx_tlk.s
@@ -2537,6 +2537,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj adxt_svr_start_cb, local
 	.skip 0x4
 .endobj adxt_svr_start_cb
@@ -2605,8 +2606,7 @@
 	.skip 0x4
 .endobj adxt_diff_av
 
-.skip 0x4
-
+.balign 8
 .obj adxt_fileid_buf, local
 	.skip 0x10
 .endobj adxt_fileid_buf
@@ -2646,5 +2646,3 @@
 .obj adxt_mviop_f, global
 	.skip 0x4
 .endobj adxt_mviop_f
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/adxt/adx_tsvr.s b/libs/CriWare/asm/adx/adxt/adx_tsvr.s
@@ -1131,6 +1131,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj adxt_enddecinfo_cbfn, local
 	.skip 0x4
 .endobj adxt_enddecinfo_cbfn

diff --git a/libs/CriWare/asm/adx/adxt/adx_xpnd.s b/libs/CriWare/asm/adx/adxt/adx_xpnd.s
@@ -323,5 +323,3 @@
 .obj adxpd_internal_error, global
 	.skip 0x4
 .endobj adxpd_internal_error
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/adxt/srcwii/adx_mwii.s b/libs/CriWare/asm/adx/adxt/srcwii/adx_mwii.s
@@ -670,8 +670,7 @@
 	.skip 0x4
 .endobj adxm_init_ex
 
-.skip 0x4
-
+.balign 8
 .obj adxm_save_tprm, local
 	.skip 0x30
 .endobj adxm_save_tprm
@@ -712,8 +711,7 @@
 	.skip 0x4
 .endobj adxm_mwidle_exec_flag
 
-.skip 0x4
-
+.balign 8
 .obj adxm_mwidle_sleep_cb, global
 	.skip 0x8
 .endobj adxm_mwidle_sleep_cb
@@ -734,8 +732,7 @@
 	.skip 0x4
 .endobj adxm_mwidle_end
 
-.skip 0x4
-
+.balign 8
 .obj adxm_mwidle_thread, global
 	.skip 0x318
 .endobj adxm_mwidle_thread
@@ -744,8 +741,7 @@
 	.skip 0x4
 .endobj adxm_usridle_end
 
-.skip 0x4
-
+.balign 8
 .obj adxm_usridle_thread, global
 	.skip 0x318
 .endobj adxm_usridle_thread
@@ -786,8 +782,7 @@
 	.skip 0x4
 .endobj adxm_usridle_act
 
-.skip 0x4
-
+.balign 8
 .obj adxm_stack_safe, local
 	.skip 0x1000
 .endobj adxm_stack_safe

diff --git a/libs/CriWare/asm/adx/ahx/ahx_cmn.s b/libs/CriWare/asm/adx/ahx/ahx_cmn.s
@@ -18,9 +18,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
-
+.balign 8
 .obj lbl_805E9B08, global
 	.skip 0x4
 .endobj lbl_805E9B08
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/ahx/ahx_dcd.s b/libs/CriWare/asm/adx/ahx/ahx_dcd.s
@@ -1983,6 +1983,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj skg_init_count, local
 	.skip 0x4
 .endobj skg_init_count
@@ -1995,8 +1996,7 @@
 	.skip 0x4
 .endobj ahxdcd_init_cnt
 
-.skip 0x4
-
+.balign 8
 .obj "buf$338", local
 	.skip 0x200
 .endobj "buf$338"
diff --git a/libs/CriWare/asm/adx/ahx/ahx_sjd.s b/libs/CriWare/asm/adx/ahx/ahx_sjd.s
@@ -599,5 +599,3 @@
 .obj ahxsjd_init_cnt, global
 	.skip 0x4
 .endobj ahxsjd_init_cnt
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/cvfs/cri_cvfs.s b/libs/CriWare/asm/adx/cvfs/cri_cvfs.s
@@ -1572,8 +1572,7 @@
 .skip 0x4
 .endobj cvfs_init_cnt
 
-.skip 0x4
-
+.balign 8
 .obj cvfs_obj, local
 .skip 0x140
 .endobj cvfs_obj
@@ -1586,10 +1585,7 @@
 .skip 0x1
 .endobj cvfs_defdev
 
-.skip 0xB
-
+.balign 8
 .obj add_dev_tmp, local
 .skip 0x129
 .endobj add_dev_tmp
-
-.skip 0x3
diff --git a/libs/CriWare/asm/adx/gcci/gcci.s b/libs/CriWare/asm/adx/gcci/gcci.s
@@ -1109,6 +1109,7 @@
 
 .section .bss, "wa"  # 0x80573C80 - 0x8066417B
 
+.balign 8
 .obj gcg_ci_build_ptr, global
 	.skip 0x4
 .endobj gcg_ci_build_ptr

diff --git a/libs/CriWare/asm/adx/gcci/gcci_sub.s b/libs/CriWare/asm/adx/gcci/gcci_sub.s
@@ -14,8 +14,7 @@
 	.skip 0x4
 .endobj gcg_ci_rdmode
 
-.skip 0x4
-
+.balign 8
 .obj gcg_ci_root_dir, global
 	.skip 0x100
 .endobj gcg_ci_root_dir
diff --git a/libs/CriWare/asm/adx/lsc/lsc.s b/libs/CriWare/asm/adx/lsc/lsc.s
@@ -831,5 +831,3 @@
 .obj lsc_stat_obj2, global
 	.skip 0x4
 .endobj lsc_stat_obj2
-
-.skip 0x4
diff --git a/libs/CriWare/asm/adx/lsc/lsc_ini.s b/libs/CriWare/asm/adx/lsc/lsc_ini.s
@@ -103,8 +103,7 @@
 	.skip 0x4
 .endobj lsc_init_cnt
 
-.skip 0x4
-
+.balign 8
 .obj lsc_obj, global
 	.skip 0x4700
 .endobj lsc_obj