diff --git a/asm/bss.s b/asm/bss.s index 66bc9b7dc..31d42cf96 100644 --- a/asm/bss.s +++ b/asm/bss.s @@ -768,27 +768,3 @@ msVal__Q32kh6Screen19ObjDayEndResultBase: .global msVal__Q32kh6Screen14ObjFinalResult msVal__Q32kh6Screen14ObjFinalResult: .skip 0x24 -.global msVal__Q32kh6Screen10ObjWinLose -msVal__Q32kh6Screen10ObjWinLose: - .skip 0x1C -.global msVal__Q32kh6Screen16ObjWinLoseReason -msVal__Q32kh6Screen16ObjWinLoseReason: - .skip 0x1C -.global "zero__10Vector3" -"zero__10Vector3": - .skip 0xC -.global eof__4ID32 -eof__4ID32: - .skip 0xC -.global gGameConfig__4Game -gGameConfig__4Game: - .skip 0x27C -.global sPikminTex__13TinyPikminMgr -sPikminTex__13TinyPikminMgr: - .skip 0x18 -.global ActivePlayer -ActivePlayer: - .skip 0x1D0 -.global sInsReal__3PSM -sInsReal__3PSM: - .skip 0x20 diff --git a/asm/plugProjectKonoU/khWinLose.s b/asm/plugProjectKonoU/khWinLose.s index 80a178fd7..59e2780c3 100644 --- a/asm/plugProjectKonoU/khWinLose.s +++ b/asm/plugProjectKonoU/khWinLose.s @@ -1,4 +1,9 @@ .include "macros.inc" +.section .bss # 0x804EFC20 - 0x8051467C +.global msVal__Q32kh6Screen10ObjWinLose +msVal__Q32kh6Screen10ObjWinLose: + .skip 0x1C + .section .sbss2 # 0x80520e40 - 0x80520ED8 .global lbl_80520ED0 diff --git a/asm/plugProjectKonoU/khWinLoseReason.s b/asm/plugProjectKonoU/khWinLoseReason.s index d29219d8b..51a563c8e 100644 --- a/asm/plugProjectKonoU/khWinLoseReason.s +++ b/asm/plugProjectKonoU/khWinLoseReason.s @@ -1,4 +1,8 @@ .include "macros.inc" +.section .bss # 0x804EFC20 - 0x8051467C +.global msVal__Q32kh6Screen16ObjWinLoseReason +msVal__Q32kh6Screen16ObjWinLoseReason: + .skip 0x1C .section .text, "ax" # 0x800056C0 - 0x80472F00 .global doCreate__Q32kh6Screen16ObjWinLoseReasonFP10JKRArchive diff --git a/asm/sysCommonU/id32.s b/asm/sysCommonU/id32.s index ce98c5eff..4c956f90a 100644 --- a/asm/sysCommonU/id32.s +++ b/asm/sysCommonU/id32.s @@ -1,5 +1,10 @@ .include "macros.inc" +.section .bss # 0x804EFC20 - 0x8051467C +.global eof__4ID32 +eof__4ID32: + .skip 0xC + .section .text, "ax" # 0x800056C0 - 0x80472F00 .global __sinit_id32_cpp diff --git a/asm/sysCommonU/sysMath.s b/asm/sysCommonU/sysMath.s index f9718d05f..3514cdccf 100644 --- a/asm/sysCommonU/sysMath.s +++ b/asm/sysCommonU/sysMath.s @@ -9,6 +9,11 @@ lbl_80499654: .asciz "acosf %f\n" .skip 0x2 +.section .bss # 0x804EFC20 - 0x8051467C +.global "zero__10Vector3" +"zero__10Vector3": + .skip 0xC + .section .text, "ax" # 0x800056C0 - 0x80472F00 .global "CRSplineTangent__FfP10Vector3" diff --git a/asm/sysGCU/THPPlayer.s b/asm/sysGCU/THPPlayer.s index 41a342d89..40475c88d 100644 --- a/asm/sysGCU/THPPlayer.s +++ b/asm/sysGCU/THPPlayer.s @@ -115,6 +115,11 @@ VolumeTable: .4byte 0x7A067C00 .4byte 0x7DFE8000 +.section .bss # 0x804EFC20 - 0x8051467C +.global ActivePlayer +ActivePlayer: + .skip 0x1D0 + .section .sdata2, "a" # 0x80516360 - 0x80520E40 .balign 0x8 .global lbl_80520AF8 diff --git a/asm/sysGCU/bootSection.s b/asm/sysGCU/bootSection.s index fe3a1b00e..2f5db912d 100644 --- a/asm/sysGCU/bootSection.s +++ b/asm/sysGCU/bootSection.s @@ -261,6 +261,11 @@ __vt__11BootSection: .4byte 0 .4byte 0 +.section .bss # 0x804EFC20 - 0x8051467C +.global sPikminTex__13TinyPikminMgr +sPikminTex__13TinyPikminMgr: + .skip 0x18 + .section .sdata2, "a" # 0x80516360 - 0x80520E40 .balign 0x8 .global lbl_805209A0 diff --git a/asm/sysGCU/gameConfig.s b/asm/sysGCU/gameConfig.s index ad0accb36..2ddd30847 100644 --- a/asm/sysGCU/gameConfig.s +++ b/asm/sysGCU/gameConfig.s @@ -135,6 +135,11 @@ __vt__Q34Game10GameConfig5Parms: .4byte __dt__Q34Game10GameConfig5ParmsFv .4byte getChildCount__5CNodeFv +.section .bss # 0x804EFC20 - 0x8051467C +.global gGameConfig__4Game +gGameConfig__4Game: + .skip 0x27C + .section .sdata2, "a" # 0x80516360 - 0x80520E40 .balign 0x8 .global lbl_80520710 diff --git a/asm/utilityU/PSMainSide_CreaturePrm.s b/asm/utilityU/PSMainSide_CreaturePrm.s index 5c4679b45..53959e450 100644 --- a/asm/utilityU/PSMainSide_CreaturePrm.s +++ b/asm/utilityU/PSMainSide_CreaturePrm.s @@ -147,6 +147,11 @@ __vt__Q23PSM11CreaturePrm: .4byte 0 .4byte "__dt__Q28PSSystem34SingletonBaseFv" +.section .bss # 0x804EFC20 - 0x8051467C +.global sInsReal__3PSM +sInsReal__3PSM: + .skip 0x20 + .section .sdata2, "a" # 0x80516360 - 0x80520E40 .balign 0x8 .global lbl_80520DB8