From 3cb2dc53ab9679fd298ee0b52e80f0620d4fe175 Mon Sep 17 00:00:00 2001 From: Lucas Azevedo Date: Sat, 13 Apr 2024 05:20:07 -0300 Subject: [PATCH] Integrate some variables --- src/asm/012324.src | 13 ++++++++++--- src/asm/012504.src | 8 +++++++- src/asm/0fcd20_sectionB.src | 12 ------------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/asm/012324.src b/src/asm/012324.src index 2c90aa9..f81cc18 100644 --- a/src/asm/012324.src +++ b/src/asm/012324.src @@ -5,14 +5,14 @@ .IMPORT _pdGetPeripheral .IMPORT _var_8c157a70 .IMPORT __quick_odd_mvn - .IMPORT _var_8c157ae4 - .IMPORT _var_8c157ae8 .IMPORT __8c033318 .IMPORT _var_vibport_8c1ba354 - .IMPORT _var_8c157ad4 .IMPORT _vmsLcd_8c01c910 .IMPORT _FUN_adxVol_8c010a40 .EXPORT _task_8c012324 + .EXPORT _var_8c157ad4 + .EXPORT _var_8c157ae4 + .EXPORT _var_8c157ae8 .SECTION P, CODE, ALIGN=4 _task_8c012324: MOV.L R14,@-R15 @@ -262,4 +262,11 @@ LP_GEN_88452: .DATA.L _var_8c157ad4 .DATA.L _vmsLcd_8c01c910 .DATA.L _FUN_adxVol_8c010a40 + .SECTION B,DATA,ALIGN=4 +_var_8c157ad4: + .RES.B 16 +_var_8c157ae4: + .RES.B 4 +_var_8c157ae8: + .RES.B 4 .END diff --git a/src/asm/012504.src b/src/asm/012504.src index 69b5747..8dde923 100644 --- a/src/asm/012504.src +++ b/src/asm/012504.src @@ -23,7 +23,6 @@ .IMPORT _var_8c157ad4 .IMPORT _var_8c1bb8c8 .IMPORT _init_8c03bf40 - .IMPORT _var_8c157aec .IMPORT _strcmp .IMPORT _strcpy .EXPORT _FUN_8c012718 @@ -31,6 +30,10 @@ .EXPORT _FUN_8c012984 .EXPORT _FUN_8c012970 .EXPORT _const_8c033358 + + .AIFDEF UNIT_TESTING + .EXPORT _var_8c157aec + .AENDI .SECTION P, CODE, ALIGN=4 task_8c012504: MOV.L R14,@-R15 @@ -676,4 +679,7 @@ _const_8c033358: .SDATA "FortyFive" .DATA.B H'00 .RES.W 1 + .SECTION B,DATA,ALIGN=4 +_var_8c157aec: + .RES.B 12 .END diff --git a/src/asm/0fcd20_sectionB.src b/src/asm/0fcd20_sectionB.src index 20d5bb5..1587e14 100644 --- a/src/asm/0fcd20_sectionB.src +++ b/src/asm/0fcd20_sectionB.src @@ -1,8 +1,4 @@ ; 8c0fcd20 - .EXPORT _var_8c157ad4 - .EXPORT _var_8c157ae4 - .EXPORT _var_8c157ae8 - .EXPORT _var_8c157aec .EXPORT _var_tex_8c157af8 .EXPORT _var_fogTable_8c18aaf8 .EXPORT _var_texname_8c18acf8 @@ -419,14 +415,6 @@ .EXPORT _var_shapebuf_8c2f84a0 .EXPORT _var_matrix_8c2f8ca0 .SECTION B,DATA,ALIGN=4 -_var_8c157ad4: - .RES.B 16 -_var_8c157ae4: - .RES.B 4 -_var_8c157ae8: - .RES.B 4 -_var_8c157aec: - .RES.B 12 _var_tex_8c157af8: .RES.B 208896 _var_fogTable_8c18aaf8: