Game-Decompilation/pikmin2
1
0
Fork 0
mirror of https://github.com/projectPiki/pikmin2.git synced 2025-02-21 14:21:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Major BSS refactor

Browse Source 
id32 sinit has been made assembly for the good of the many. OS.c finally links.
This commit is contained in:
EpochFlame 2022-06-24 21:08:27 -04:00
parent 18f3d776d0
commit 1dab817c47
131 changed files with 988 additions and 933 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -66,7 +66,7 @@ endif
O_FILES := $(GROUP_0_FILES) $(JSYSTEM) $(DOLPHIN)\
$(YAMASHITA) $(KANDO) $(NISHIMURA) $(OGAWA) $(HIKINO) $(MORIMURA) $(EBISAWA) $(KONO)\
$(BOOTUP) $(COMMON) $(GC) $(UTILITY)
$(BOOTUP) $(COMMON) $(GC) $(UTILITY) $(GLOBAL_BSS)
ifeq ($(EPILOGUE_PROCESS),1)
E_FILES := $(EPILOGUE_UNSCHEDULED)
endif

2
README.MD
View File

@ -64,7 +64,6 @@ pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/simpleMessage.cpp">sysGCU/simpleMessage.cpp</a>
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/THPDraw.c">sysGCU/THPDraw.c</a>
- sysCommonU
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/id32.cpp">sysCommonU/id32.cpp</a>
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/mapCollision.cpp">sysCommonU/mapCollision.cpp</a>
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/node.cpp">sysCommonU/node.cpp</a>
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/parameters.cpp">sysCommonU/parameters.cpp</a>
@ -212,6 +211,7 @@ pikmin2.usa.dol: `sha1: 90d328bf8f190c90472e8c19e7e53c6ad0fe0d1a`
- sysBootupU
- sysGCU
- sysCommonU
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/id32.cpp" >sysCommonU/id32.cpp</a>
- <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysCommonU/sysMath.cpp" >sysCommonU/sysMath.cpp</a>
- utilityU
- plugProjectKonoU

8
asm/Dolphin/CARDBios.s
View File

@ -16,6 +16,14 @@ ResetFunctionInfo:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global __CARDBlock
__CARDBlock:
.skip 0x220
.global __CARDDiskNone
__CARDDiskNone:
.skip 0x20
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __CARDVersion

5
asm/Dolphin/EXIBios.s
View File

@ -26,6 +26,11 @@ lbl_804A7ED0:
.asciz "IS-DOL-VIEWER"
.skip 2
.section .bss # 0x804EFC20 - 0x8051467C
.global Ecb
Ecb:
.skip 0xC0
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __EXIVersion

10
asm/Dolphin/GBA.s
View File

@ -10,6 +10,16 @@ ResetFunctionInfo:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.balign 32
.global SecParams
SecParams:
.skip 0x100
.balign 8
.global __GBA
__GBA:
.skip 0x400
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __GBAVersion

8
asm/Dolphin/GXInit.s
View File

@ -142,6 +142,14 @@ GXResetFuncInfo:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global FifoObj
FifoObj:
.skip 0x80
.global gxData
gxData:
.skip 0x5B0
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __GXVersion

5
asm/Dolphin/Gecko_ExceptionPPC.s
View File

@ -1,5 +1,10 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global fragmentinfo
fragmentinfo:
.skip 0x10
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __unregister_fragment
__unregister_fragment:

5
asm/Dolphin/OSError.s
View File

@ -51,6 +51,11 @@ lbl_804A926C:
.4byte lbl_800EDD64
.4byte lbl_800EDD18
.section .bss # 0x804EFC20 - 0x8051467C
.global __OSErrorTable
__OSErrorTable:
.skip 0x44
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __OSFpscrEnableBits

6
asm/Dolphin/OSReboot.s
View File

@ -1,4 +1,10 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 32
.global Header
Header:
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global SaveStart

5
asm/Dolphin/OSRtc.s
View File

@ -1,4 +1,9 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 32
.global Scb
Scb:
.skip 0x54
.section .text, "ax" # 0x800056C0 - 0x80472F00
WriteSramCallback:

18
asm/Dolphin/OSThread.s
View File

@ -1,4 +1,22 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 8
.global RunQueue
RunQueue:
.skip 0x100
.balign 8
.global IdleThread
IdleThread:
.skip 0x318
.balign 8
.global DefaultThread
DefaultThread:
.skip 0x318
.balign 8
.global IdleContext
IdleContext:
.skip 0x2C8
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
SwitchThreadCallback:

11
asm/Dolphin/Pad.s
View File

@ -10,6 +10,17 @@ ResetFunctionInfo:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global Type_1
Type_1:
.skip 0x10
.global Origin
Origin:
.skip 0x30
.global CmdProbeDevice
CmdProbeDevice:
.skip 0x10
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __PADVersion

36
asm/Dolphin/SIBios.s
View File

@ -50,6 +50,42 @@ lbl_804A9FB4:
lbl_804A9FC0:
.asciz "Steering"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 8
.global Packet
Packet:
.skip 0x80
.balign 8
.global Alarm
Alarm:
.skip 0xA0
.balign 8
.global TypeTime
TypeTime:
.skip 0x20
.balign 8
.global XferTime
XferTime:
.skip 0x20
.global TypeCallback
TypeCallback:
.skip 0x40
.global RDSTHandler
RDSTHandler:
.skip 0x10
.global InputBufferValid
InputBufferValid:
.skip 0x10
.global InputBuffer
InputBuffer:
.skip 0x20
.global InputBufferVcount
InputBufferVcount:
.skip 0x10
.global cmdFixDevice$327
cmdFixDevice$327:
.skip 0x10
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __SIVersion

15
asm/Dolphin/THPDec.s
View File

@ -37,6 +37,21 @@ __THPAANScaleFactor: # local object
THP_VERSION_STRING: # local string
.asciz "<< Dolphin SDK - THP\trelease build: Jan 9 2004 13:06:55 (0x2301) >>"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 32
.global __THPIDCTWorkspace
__THPIDCTWorkspace:
.skip 0x100
.global __THPLCWork512
__THPLCWork512:
.skip 0xC
.global __THPLCWork672
__THPLCWork672:
.skip 0xC
.global __THPMCUBuffer
__THPMCUBuffer:
.skip 0x28
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __THPVersion

5
asm/Dolphin/abort_exit.s
View File

@ -1,4 +1,9 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global __atexit_funcs
__atexit_funcs:
.skip 0x100
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global __aborting

5
asm/Dolphin/alloc.s
View File

@ -10,6 +10,11 @@ fix_pool_sizes:
.4byte 0x00000034
.4byte 0x00000044
.section .bss # 0x804EFC20 - 0x8051467C
.global protopool$192
protopool$192:
.skip 0x38
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global init$193

9
asm/Dolphin/ddh/main.s
View File

@ -22,6 +22,15 @@ lbl_80479E04:
lbl_80479E18:
.asciz "DONE CALLING EXI2_Init\n"
.section .bss # 0x804EFC20 - 0x8051467C
.balign 8
.global gRecvBuf
gRecvBuf:
.skip 0x800
.global gRecvCB
gRecvCB:
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
gIsInitialized:

5
asm/Dolphin/dolphin_trk.s
View File

@ -36,6 +36,11 @@ TRK_ISR_OFFSETS:
.4byte 0x00001700
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global lc_base
lc_base:
.skip 0x8
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global InitMetroTRK
InitMetroTRK:

9
asm/Dolphin/dolphin_trk_glue.s
View File

@ -87,6 +87,15 @@ gDBCommTable:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.balign 8
.global TRK_Use_BBA
TRK_Use_BBA:
.skip 0x4
.global _MetroTRK_Has_Framing
_MetroTRK_Has_Framing:
.skip 0x4
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global TRKLoadContext
TRKLoadContext:

14
asm/Dolphin/dvd.s
View File

@ -62,6 +62,20 @@ lbl_804A7DE4:
.4byte lbl_800DF2A0
.4byte lbl_800DF2A8
.section .bss # 0x804EFC20 - 0x8051467C
.global BB2
BB2:
.skip 0x20
.global CurrDiskID
CurrDiskID:
.skip 0x20
.global DummyCommandBlock
DummyCommandBlock:
.skip 0x30
.global ResetAlarm
ResetAlarm:
.skip 0x28
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __DVDVersion

20
asm/Dolphin/dvdlow.s
View File

@ -1,4 +1,24 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global CommandList
CommandList:
.skip 0x40
.global AlarmForWA
AlarmForWA:
.skip 0x28
.global AlarmForTimeout
AlarmForTimeout:
.skip 0x28
.global AlarmForBreak
AlarmForBreak:
.skip 0x28
.global Prev
Prev:
.skip 0xC
.global Curr
Curr:
.skip 0xC
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global FirstRead

4
asm/Dolphin/dvdqueue.s
View File

@ -1,4 +1,8 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global WaitingQueue
WaitingQueue:
.skip 0x20
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __DVDClearWaitingQueue

8
asm/Dolphin/main.s
View File

@ -22,6 +22,14 @@ lbl_80479EE4:
lbl_80479EF8:
.asciz "DONE CALLING EXI2_Init\n"
.section .bss # 0x804EFC20 - 0x8051467C
.global gRecvBuf_1
gRecvBuf_1:
.skip 0x500
.global gRecvCB_1
gRecvCB_1:
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
gIsInitialized:

5
asm/Dolphin/msgbuf.s
View File

@ -6,6 +6,11 @@ lbl_80479720:
.ascii "ERROR : No buffer available\n"
.skip 4
.section .bss # 0x804EFC20 - 0x8051467C
.global gTRKMsgBufs
gTRKMsgBufs:
.skip 0x19B0
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global TRKReadBuffer_ui32
TRKReadBuffer_ui32:

5
asm/Dolphin/msghndlr.s
View File

@ -68,6 +68,11 @@ lbl_804A6894:
.4byte lbl_800BD2FC
.4byte lbl_800BD304
.section .bss # 0x804EFC20 - 0x8051467C
.global IsTRKConnected
IsTRKConnected:
.skip 0x8
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global TRKDoSetOption
TRKDoSetOption:

4
asm/Dolphin/nubevent.s
View File

@ -1,4 +1,8 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global gTRKEventQueue
gTRKEventQueue:
.skip 0x28
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global TRKDestructEvent

5
asm/Dolphin/nubinit.s
View File

@ -1,4 +1,9 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global gTRKBigEndian
gTRKBigEndian:
.skip 0x8
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global TRKInitializeNub
TRKInitializeNub:

5
asm/Dolphin/serpoll.s
View File

@ -104,6 +104,11 @@ lbl_80479740:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global gTRKFramingState
gTRKFramingState:
.skip 0x18
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global gTRKInputPendingPtr

17
asm/Dolphin/targimpl.s
View File

@ -71,6 +71,23 @@ gTRKStepStatus:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global TRK_saved_exceptionID
TRK_saved_exceptionID:
.skip 0x4
.global gTRKState
gTRKState:
.skip 0xA4
.global gTRKCPUState
gTRKCPUState:
.skip 0x430
.global gTRKSaveState
gTRKSaveState:
.skip 0x94
.global TRKvalue128_temp
TRKvalue128_temp:
.skip 0x14
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __TRK_get_MSR
__TRK_get_MSR:

11
asm/Dolphin/vi.s
View File

@ -240,6 +240,17 @@ lbl_804A7664:
.4byte lbl_800D236C
.4byte lbl_800D235C
.section .bss # 0x804EFC20 - 0x8051467C
.global regs
regs:
.skip 0x78
.global shdwRegs
shdwRegs:
.skip 0x78
.global HorVer
HorVer:
.skip 0x58
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global __VIVersion

5
asm/JSystem/J2D/J2DBloSaver.s
View File

@ -3,6 +3,11 @@
lbl_constructor:
.4byte __sinit_J2DBloSaver_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global lbl_804F0408
lbl_804F0408:
.skip 0x10
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global TextureNameConnect__11J2DBloSaver

5
asm/JSystem/J2D/J2DManage.s
View File

@ -1,5 +1,10 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global p_name$459
p_name$459:
.skip 0x108
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global get__13J2DDataManageFP14JSUInputStream

6
asm/JSystem/J2D/J2DPane.s
View File

@ -56,12 +56,6 @@ __vt__7J2DPane:
.4byte animationPane__7J2DPaneFPC15J2DAnmTransform
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
bss_entry:
.global static_mBounds__7J2DPane
static_mBounds__7J2DPane:
.skip 0x10
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_805167C0

8
asm/JSystem/J3D/J3DMtxBuffer.s
View File

@ -1,12 +1,4 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global sNoUseDrawMtx__12J3DMtxBuffer
sNoUseDrawMtx__12J3DMtxBuffer:
.skip 0x54
.global sNoUseNrmMtx__12J3DMtxBuffer
sNoUseNrmMtx__12J3DMtxBuffer:
.skip 0x24
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global sNoUseDrawMtxPtr__12J3DMtxBuffer

5
asm/JSystem/J3D/J3DShapeMtx.s
View File

@ -218,11 +218,6 @@ __vt__11J3DShapeMtx:
.4byte calcNBTScale__11J3DShapeMtxFRC3VecPA3_A3_fPA3_A3_f
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global sMtxLoadCache__11J3DShapeMtx
sMtxLoadCache__11J3DShapeMtx:
.skip 0x14
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global sCurrentPipeline__11J3DShapeMtx

20
asm/JSystem/J3D/J3DSys.s
View File

@ -87,26 +87,6 @@ IndMtx:
.float 0.5
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global j3dSys
j3dSys:
.skip 0x1A4
.global mCurrentMtx__6J3DSys
mCurrentMtx__6J3DSys:
.skip 0x30
.global mCurrentS__6J3DSys
mCurrentS__6J3DSys:
.skip 0xC
.global mParentS__6J3DSys
mParentS__6J3DSys:
.skip 0xC
.global sTexCoordScaleTable__6J3DSys
sTexCoordScaleTable__6J3DSys:
.skip 0x40
.global sGDLObj__17J3DDisplayListObj # technically goes with J3DPacket.cpp
sGDLObj__17J3DDisplayListObj:
.skip 0x10
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global ColorBlack

14
asm/JSystem/J3D/J3DTevs.s
View File

@ -171,20 +171,6 @@ lbl_804A1900:
.4byte lbl_80065150
.4byte lbl_80065048
.section .bss # 0x804EFC20 - 0x8051467C
.global j3dTexCoordTable
j3dTexCoordTable:
.skip 0x2528
.global j3dTevSwapTableTable
j3dTevSwapTableTable:
.skip 0x400
.global j3dAlphaCmpTable
j3dAlphaCmpTable:
.skip 0x300
.global j3dZModeTable
j3dZModeTable:
.skip 0x60
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_805169B0

17
asm/JSystem/JAI/JAIConst.s
View File

@ -3,23 +3,6 @@
lbl_constructor:
.4byte __sinit_JAIConst_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global nullCamera__Q27JAInter5Const
nullCamera__Q27JAInter5Const:
.skip 0x68
.global nullActor__Q27JAInter5Const
nullActor__Q27JAInter5Const:
.skip 0x14
.global camMtx__Q27JAInter5Const
camMtx__Q27JAInter5Const:
.skip 0x30
.global camTrans__Q27JAInter5Const
camTrans__Q27JAInter5Const:
.skip 0xC
.global camPreTrans__Q27JAInter5Const
camPreTrans__Q27JAInter5Const:
.skip 0xC
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global random__Q27JAInter5Const

6
asm/JSystem/JAI/JAISystemInterface.s
View File

@ -4,9 +4,9 @@ lbl_constructor:
.4byte __sinit_JAISystemInterface_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global systemPortCmd__Q27JAInter15SystemInterface
systemPortCmd__Q27JAInter15SystemInterface:
.skip 0x18
.global lbl_804F2870
lbl_804F2870:
.skip 0x10
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8

5
asm/JSystem/JAS/JASAiCtrl.s
View File

@ -49,6 +49,11 @@ history$449:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global sDmaDacBuffer__9JASDriver
sDmaDacBuffer__9JASDriver:
.skip 0x18
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global sDspDacBufferCount__9JASDriver

10
asm/JSystem/JAS/JASCmdStack.s
View File

@ -4,11 +4,11 @@ lbl_constructor:
.4byte __sinit_JASCmdStack_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global sCommandListOnce__10JASPortCmd
sCommandListOnce__10JASPortCmd:
.skip 0x18
.global sCommandListStay__10JASPortCmd
sCommandListStay__10JASPortCmd:
.global lbl_804F06E8
lbl_804F06E8:
.skip 0xC
.global lbl_804F06F4
lbl_804F06F4:
.skip 0xC
.section .text, "ax" # 0x800056C0 - 0x80472F00

11
asm/JSystem/JAS/JASDriverIF.s
View File

@ -140,6 +140,17 @@ C5BASE_PITCHTABLE__9JASDriver:
.4byte 0x00000000
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global sDspSyncCallback__9JASDriver
sDspSyncCallback__9JASDriver:
.skip 0x80
.global sSubFrameCallback__9JASDriver
sSubFrameCallback__9JASDriver:
.skip 0x80
.global sUpdateDacCallback__9JASDriver
sUpdateDacCallback__9JASDriver:
.skip 0x80
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global MAX_MIXERLEVEL__9JASDriver

5
asm/JSystem/JAS/JASDrumSet.s
View File

@ -10,6 +10,11 @@ __vt__10JASDrumSet:
.4byte getType__10JASDrumSetCFv
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global osc$639
osc$639:
.skip 0x18
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global oscp$640

8
asm/JSystem/JAS/JASHeapCtrl.s
View File

@ -3,6 +3,14 @@
lbl_constructor:
.4byte __sinit_JASHeapCtrl_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global lbl_804F0700
lbl_804F0700:
.skip 0xC
.global audioAramHeap__9JASKernel
audioAramHeap__9JASKernel:
.skip 0x44
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global JASDram

5
asm/JSystem/JAS/JASReport.s
View File

@ -1,4 +1,9 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global sMutex
sMutex:
.skip 0x18
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global sBuffer

7
asm/JSystem/JFW/JFWDisplay.s
View File

@ -70,9 +70,12 @@ __vt__10JFWDisplay:
.4byte __dt__10JFWDisplayFv
.section .bss # 0x804EFC20 - 0x8051467C
.global sList__8JFWAlarm
sList__8JFWAlarm:
.global lbl_804F0520
lbl_804F0520:
.skip 0xC
.global clear_z_tobj
clear_z_tobj:
.skip 0x24
.section .sbss # 0x80514D80 - 0x80516360
.balign 8

7
asm/JSystem/JKR/JKRAram.s
View File

@ -72,9 +72,12 @@ __vt__7JKRAram:
.4byte run__7JKRAramFv
.section .bss # 0x804EFC20 - 0x8051467C
.global sAramCommandList__7JKRAram
sAramCommandList__7JKRAram:
.global lbl_804EFEF8
lbl_804EFEF8:
.skip 0xC
.global decompMutex
decompMutex:
.skip 0x1C
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8

6
asm/JSystem/JKR/JKRAramHeap.s
View File

@ -13,9 +13,9 @@ __vt__11JKRAramHeap:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global sAramList__11JKRAramHeap
sAramList__11JKRAramHeap:
.skip 0xC
.global lbl_804EFF20
lbl_804EFF20:
.skip 0x10
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __ct__11JKRAramHeapFUlUl

9
asm/JSystem/JKR/JKRAramPiece.s
View File

@ -21,12 +21,9 @@ lbl_80473584:
.asciz "JKRAramPiece.cpp"
.section .bss # 0x804EFC20 - 0x8051467C
.global sAramPieceCommandList__12JKRAramPiece
sAramPieceCommandList__12JKRAramPiece:
.skip 0x24
.global mMutex__12JKRAramPiece
mMutex__12JKRAramPiece:
.skip 0x18
.global lbl_804EFF30
lbl_804EFF30:
.skip 0x10
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8

17
asm/JSystem/JKR/JKRDvdAramRipper.s
View File

@ -4,9 +4,10 @@ lbl_constructor:
.4byte __sinit_JKRDvdAramRipper_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.global sDvdAramAsyncList__16JKRDvdAramRipper
sDvdAramAsyncList__16JKRDvdAramRipper:
lbl_804EFF50:
.skip 0xC
decompMutex:
.skip 0x1C
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
@ -672,16 +673,16 @@ JKRDecompressFromDVDToAram__FP10JKRDvdFileUlUlUlUlUlPUl:
/* 8001DF18 0001AE58 7C 78 1B 78 */ mr r24, r3
/* 8001DF1C 0001AE5C 28 00 00 00 */ cmplwi r0, 0
/* 8001DF20 0001AE60 40 82 00 18 */ bne lbl_8001DF38
/* 8001DF24 0001AE64 3C 60 80 4F */ lis r3, decompMutex_1@ha
/* 8001DF28 0001AE68 38 63 FF 5C */ addi r3, r3, decompMutex_1@l
/* 8001DF24 0001AE64 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001DF28 0001AE68 38 63 FF 5C */ addi r3, r3, decompMutex@l
/* 8001DF2C 0001AE6C 48 0D 1C 05 */ bl OSInitMutex
/* 8001DF30 0001AE70 38 00 00 01 */ li r0, 1
/* 8001DF34 0001AE74 98 0D 87 BC */ stb r0, isInitMutex_1@sda21(r13)
lbl_8001DF38:
/* 8001DF38 0001AE78 7F 03 C3 78 */ mr r3, r24
/* 8001DF3C 0001AE7C 48 0D 0D 25 */ bl OSRestoreInterrupts
/* 8001DF40 0001AE80 3C 60 80 4F */ lis r3, decompMutex_1@ha
/* 8001DF44 0001AE84 38 63 FF 5C */ addi r3, r3, decompMutex_1@l
/* 8001DF40 0001AE80 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001DF44 0001AE84 38 63 FF 5C */ addi r3, r3, decompMutex@l
/* 8001DF48 0001AE88 48 0D 1C 21 */ bl OSLockMutex
/* 8001DF4C 0001AE8C 83 0D 80 0C */ lwz r24, sSZSBufferSize__16JKRDvdAramRipper@sda21(r13)
/* 8001DF50 0001AE90 38 A0 00 20 */ li r5, 0x20
@ -746,8 +747,8 @@ lbl_8001E014:
/* 8001E02C 0001AF6C 80 6D 87 94 */ lwz r3, dmaBuf@sda21(r13)
/* 8001E030 0001AF70 38 80 00 00 */ li r4, 0
/* 8001E034 0001AF74 48 00 56 39 */ bl free__7JKRHeapFPvP7JKRHeap
/* 8001E038 0001AF78 3C 60 80 4F */ lis r3, decompMutex_1@ha
/* 8001E03C 0001AF7C 38 63 FF 5C */ addi r3, r3, decompMutex_1@l
/* 8001E038 0001AF78 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001E03C 0001AF7C 38 63 FF 5C */ addi r3, r3, decompMutex@l
/* 8001E040 0001AF80 48 0D 1C 05 */ bl OSUnlockMutex
/* 8001E044 0001AF84 7F 23 CB 78 */ mr r3, r25
/* 8001E048 0001AF88 BB 01 00 10 */ lmw r24, 0x10(r1)

6
asm/JSystem/JKR/JKRDvdFile.s
View File

@ -36,9 +36,9 @@ __vt__10JKRDvdFile:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global sDvdList__10JKRDvdFile
sDvdList__10JKRDvdFile:
.skip 0xC
.global lbl_804EFF40
lbl_804EFF40:
.skip 0x10
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __ct__10JKRDvdFileFv

17
asm/JSystem/JKR/JKRDvdRipper.s
View File

@ -33,9 +33,10 @@ lbl_80473688:
.4byte 0x65616400
.section .bss # 0x804EFC20 - 0x8051467C
.global sDvdAsyncList__12JKRDvdRipper
sDvdAsyncList__12JKRDvdRipper:
lbl_804EFF78:
.skip 0xC
decompMutex:
.skip 0x1C
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
@ -560,16 +561,16 @@ JKRDecompressFromDVD__FP10JKRDvdFilePvUlUlUlUlPUl:
/* 8001F7D0 0001C710 7C 78 1B 78 */ mr r24, r3
/* 8001F7D4 0001C714 28 00 00 00 */ cmplwi r0, 0
/* 8001F7D8 0001C718 40 82 00 18 */ bne lbl_8001F7F0
/* 8001F7DC 0001C71C 3C 60 80 4F */ lis r3, decompMutex_2@ha
/* 8001F7E0 0001C720 38 63 FF 84 */ addi r3, r3, decompMutex_2@l
/* 8001F7DC 0001C71C 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001F7E0 0001C720 38 63 FF 84 */ addi r3, r3, decompMutex@l
/* 8001F7E4 0001C724 48 0D 03 4D */ bl OSInitMutex
/* 8001F7E8 0001C728 38 00 00 01 */ li r0, 1
/* 8001F7EC 0001C72C 98 0D 87 F8 */ stb r0, isInitMutex_2@sda21(r13)
lbl_8001F7F0:
/* 8001F7F0 0001C730 7F 03 C3 78 */ mr r3, r24
/* 8001F7F4 0001C734 48 0C F4 6D */ bl OSRestoreInterrupts
/* 8001F7F8 0001C738 3C 60 80 4F */ lis r3, decompMutex_2@ha
/* 8001F7FC 0001C73C 38 63 FF 84 */ addi r3, r3, decompMutex_2@l
/* 8001F7F8 0001C738 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001F7FC 0001C73C 38 63 FF 84 */ addi r3, r3, decompMutex@l
/* 8001F800 0001C740 48 0D 03 69 */ bl OSLockMutex
/* 8001F804 0001C744 83 0D 80 14 */ lwz r24, sSZSBufferSize__12JKRDvdRipper@sda21(r13)
/* 8001F808 0001C748 38 A0 FF E0 */ li r5, -32
@ -636,8 +637,8 @@ lbl_8001F8DC:
/* 8001F8E0 0001C820 7F 43 D3 78 */ mr r3, r26
/* 8001F8E4 0001C824 80 84 00 00 */ lwz r4, 0(r4)
/* 8001F8E8 0001C828 48 0C CE BD */ bl DCStoreRangeNoSync
/* 8001F8EC 0001C82C 3C 60 80 4F */ lis r3, decompMutex_2@ha
/* 8001F8F0 0001C830 38 63 FF 84 */ addi r3, r3, decompMutex_2@l
/* 8001F8EC 0001C82C 3C 60 80 4F */ lis r3, decompMutex@ha
/* 8001F8F0 0001C830 38 63 FF 84 */ addi r3, r3, decompMutex@l
/* 8001F8F4 0001C834 48 0D 03 51 */ bl OSUnlockMutex
/* 8001F8F8 0001C838 7F 03 C3 78 */ mr r3, r24
/* 8001F8FC 0001C83C BB 01 00 10 */ lmw r24, 0x10(r1)

6
asm/JSystem/JKR/JKRFileLoader.s
View File

@ -25,9 +25,9 @@ __vt__13JKRFileLoader:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global sVolumeList__13JKRFileLoader
sVolumeList__13JKRFileLoader:
.skip 0xC
.global lbl_804EFFA0
lbl_804EFFA0:
.skip 0x10
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8

10
asm/JSystem/JKR/JKRThread.s
View File

@ -19,11 +19,11 @@ __vt__9JKRThread:
.4byte run__9JKRThreadFv
.section .bss # 0x804EFC20 - 0x8051467C
.global sThreadList__9JKRThread
sThreadList__9JKRThread:
.skip 0x38
.global sTaskList__7JKRTask
sTaskList__7JKRTask:
.global lbl_804EFFB0
lbl_804EFFB0:
.skip 0xC
.global lbl_804EFFBC
lbl_804EFFBC:
.skip 0xC
.section .sbss # 0x80514D80 - 0x80516360

14
asm/JSystem/JMath/JMATrigonometric.s
View File

@ -3,20 +3,6 @@
lbl_constructor:
.4byte __sinit_JMATrigonometric_cpp
.section .bss # 0x804EFC20 - 0x8051467C
.balign 32
.global sincosTable___5JMath
sincosTable___5JMath:
.skip 0x6040
.balign 32
.global atanTable___5JMath
atanTable___5JMath:
.skip 0x1020
.balign 32
.global asinAcosTable___5JMath
asinAcosTable___5JMath:
.skip 0x1020
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_80516738:

20
asm/JSystem/JStudio/jstudio-object.s
View File

@ -1133,6 +1133,26 @@ lbl_8049F4E8:
.4byte "__cl__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_<Q27JStudio14TAdaptor_actor>CFfPQ27JStudio8TAdaptor"
.4byte "__dt__Q37JStudio28@unnamed@jstudio_object_cpp@54TOutputVariableValue_BOOL_<Q27JStudio14TAdaptor_actor>Fv"
.section .bss # 0x804EFC20 - 0x8051467C
lbl_804EFCB0:
.skip 0xC
"soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
"soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global soOutput_none___Q27JStudio14TVariableValue

8
asm/JSystem/JUT/JUTAssert.s
View File

@ -1,4 +1,12 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global "sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@"
"sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@":
.skip 0x40
.global "sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@"
"sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@":
.skip 0x100
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
"sVisible__Q212JUTAssertion23@unnamed@JUTAssert_cpp@": # local object

10
asm/JSystem/JUT/JUTException.s
View File

@ -215,9 +215,15 @@ __vt__12JUTException:
.4byte run__12JUTExceptionFv
.section .bss # 0x804EFC20 - 0x8051467C
.global sMapFileList__12JUTException
sMapFileList__12JUTException:
.global exCallbackObject
exCallbackObject:
.skip 0x14
.global lbl_804F011C
lbl_804F011C:
.skip 0xC
.global context$2483
context$2483:
.skip 0x2C8
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8

22
asm/JSystem/JUT/JUTGamePad.s
View File

@ -24,23 +24,11 @@ __vt__10JUTGamePad:
.4byte __dt__10JUTGamePadFv
.section .bss # 0x804EFC20 - 0x8051467C
.global mPadList__10JUTGamePad
mPadList__10JUTGamePad:
.skip 0x188
.global mPadStatus__10JUTGamePad
mPadStatus__10JUTGamePad:
.skip 0x30
.global mPadButton__10JUTGamePad
mPadButton__10JUTGamePad:
.skip 0xC0
.global mPadMStick__10JUTGamePad
mPadMStick__10JUTGamePad:
.skip 0x40
.global mPadSStick__10JUTGamePad
mPadSStick__10JUTGamePad:
.skip 0x40
.global sPatternList__19JUTGamePadLongPress
sPatternList__19JUTGamePadLongPress:
.global lbl_804F03F0
lbl_804F03F0:
.skip 0xC
.global lbl_804F03FC
lbl_804F03FC:
.skip 0xC
.section .sdata, "wa" # 0x80514680 - 0x80514D80

11
asm/JSystem/dsp/dsptask.s
View File

@ -1868,6 +1868,17 @@ jdsp:
.4byte 0x02BF00EB
.4byte 0x02DF0000
.section .bss # 0x804EFC20 - 0x8051467C
.global audio_task
audio_task:
.skip 0x60
.global AUDIO_YIELD_BUFFER
AUDIO_YIELD_BUFFER:
.skip 0x2000
.global taskwork
taskwork:
.skip 0x80
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
taskreadp: # local data

5
asm/JSystem/dsp/osdsp_task.s
View File

@ -1,4 +1,9 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global sync_stack
sync_stack:
.skip 0x10
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global DSP_prior_yield

9
asm/JSystem/object/object-actor.s
View File

@ -105,12 +105,9 @@ __vt__Q214JStudio_JStage14TAdaptor_actor:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global saoVVOutput___Q214JStudio_JStage14TAdaptor_actor
saoVVOutput___Q214JStudio_JStage14TAdaptor_actor:
.skip 0xD0
.global saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor
saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor:
.skip 0x90
.global lbl_804EFDE8
lbl_804EFDE8:
.skip 0x40
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8

6
asm/JSystem/object/object-camera.s
View File

@ -75,9 +75,9 @@ __vt__Q214JStudio_JStage15TAdaptor_camera:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global saoVVOutput___Q214JStudio_JStage15TAdaptor_camera
saoVVOutput___Q214JStudio_JStage15TAdaptor_camera:
.skip 0xA0
.global lbl_804EFE28
lbl_804EFE28:
.skip 0x40
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __ct__Q214JStudio_JStage15TAdaptor_cameraFPCQ26JStage7TSystemPQ26JStage7TCamera

6
asm/JSystem/object/object-fog.s
View File

@ -49,9 +49,9 @@ __vt__Q214JStudio_JStage12TAdaptor_fog:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global saoVVOutput___Q214JStudio_JStage12TAdaptor_fog
saoVVOutput___Q214JStudio_JStage12TAdaptor_fog:
.skip 0x60
.global lbl_804EFE68
lbl_804EFE68:
.skip 0x28
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global __ct__Q214JStudio_JStage12TAdaptor_fogFPCQ26JStage7TSystemPQ26JStage4TFog

4
asm/JSystem/object/object-light.s
View File

@ -25,8 +25,8 @@ __vt__Q214JStudio_JStage14TAdaptor_light:
.4byte adaptor_do_FACULTY__Q214JStudio_JStage14TAdaptor_lightFQ37JStudio4data15TEOperationDataPCvUl
.section .bss # 0x804EFC20 - 0x8051467C
.global saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light
saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light:
.global lbl_804EFDA0
lbl_804EFDA0:
.skip 0x48
.section .sdata2, "a" # 0x80516360 - 0x80520E40

6
asm/JSystem/object/object-particle.s
View File

@ -65,11 +65,15 @@ __vt__Q27JStudio17TAdaptor_particle:
.4byte 0
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
aoData$1232: # should be local to object-particle.cpp
.skip 0x90
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global init$1233
init$1233:
.skip 0x8
.skip 0x1
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8

6
asm/JSystem/object/object-sound.s
View File

@ -71,9 +71,9 @@ __vt__Q214JStudio_JAudio14TAdaptor_sound:
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global saoVVOSetValue___Q214JStudio_JAudio14TAdaptor_sound
saoVVOSetValue___Q214JStudio_JAudio14TAdaptor_sound:
.skip 0x78
.global aoData$1256
aoData$1256:
.skip 0x68
.section .sbss # 0x80514D80 - 0x80516360
.balign 8

830
asm/bss.s
View File

@ -1,489 +1,381 @@
.include "macros.inc"
.section .bss # 0x804EFC20 - 0x8051467C
.global aoData$1232
aoData$1232: # should be local to object-particle.cpp
.skip 0x90
.global lbl_804EFCB0
lbl_804EFCB0:
.skip 0xC
.global "soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_actor_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_actor_RELATION_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_camera_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_camera_TARGET_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_light_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_particle_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_sound_PARENT_ENABLE___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x1C
.global "soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@"
"soovv_sound_LOCATED___Q27JStudio28@unnamed@jstudio_object_cpp@":
.skip 0x20
.global lbl_804EFDA0
lbl_804EFDA0:
# global BSS
# object-light.cpp
.global saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light
saoVVOutput_direction___Q214JStudio_JStage14TAdaptor_light:
.skip 0x48
.global lbl_804EFDE8
lbl_804EFDE8:
.skip 0x40
.global lbl_804EFE28
lbl_804EFE28:
.skip 0x40
.global lbl_804EFE68
lbl_804EFE68:
.skip 0x28
.global aoData$1256
aoData$1256:
.skip 0x68
.global lbl_804EFEF8
lbl_804EFEF8:
.skip 0xC
.global decompMutex
decompMutex:
.skip 0x1C
.global lbl_804EFF20
lbl_804EFF20:
.skip 0x10
.global lbl_804EFF30
lbl_804EFF30:
.skip 0x10
.global lbl_804EFF40
lbl_804EFF40:
.skip 0x10
.global lbl_804EFF50
lbl_804EFF50:
.skip 0xC
.global decompMutex_1
decompMutex_1:
.skip 0x1C
.global lbl_804EFF78
lbl_804EFF78:
.skip 0xC
.global decompMutex_2
decompMutex_2:
.skip 0x1C
.global lbl_804EFFA0
lbl_804EFFA0:
.skip 0x10
.global lbl_804EFFB0
lbl_804EFFB0:
.skip 0xC
.global lbl_804EFFBC
lbl_804EFFBC:
.skip 0xC
.global "sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@"
"sMessageFileLine__Q212JUTAssertion23@unnamed@JUTAssert_cpp@":
.skip 0x40
.global "sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@"
"sMessageString__Q212JUTAssertion23@unnamed@JUTAssert_cpp@":
.skip 0x100
.global exCallbackObject
exCallbackObject:
.skip 0x14
.global lbl_804F011C
lbl_804F011C:
.skip 0xC
.global context$2483
context$2483:
.skip 0x2C8
.global lbl_804F03F0
lbl_804F03F0:
.skip 0xC
.global lbl_804F03FC
lbl_804F03FC:
.skip 0xC
.global lbl_804F0408
lbl_804F0408:
.skip 0x10
.global p_name$459
p_name$459:
.skip 0x108
.global lbl_804F0520
lbl_804F0520:
.skip 0xC
.global clear_z_tobj
clear_z_tobj:
.skip 0x24
.global osc$639
osc$639:
.skip 0x18
.global sDspSyncCallback__9JASDriver
sDspSyncCallback__9JASDriver:
.skip 0x80
.global sSubFrameCallback__9JASDriver
sSubFrameCallback__9JASDriver:
.skip 0x80
.global sUpdateDacCallback__9JASDriver
sUpdateDacCallback__9JASDriver:
.skip 0x80
.global lbl_804F06E8
lbl_804F06E8:
.skip 0xC
.global lbl_804F06F4
lbl_804F06F4:
.skip 0xC
.global lbl_804F0700
lbl_804F0700:
.skip 0xC
.global audioAramHeap__9JASKernel
audioAramHeap__9JASKernel:
.skip 0x44
.global sMutex
sMutex:
.skip 0x18
.global sDmaDacBuffer__9JASDriver
sDmaDacBuffer__9JASDriver:
.skip 0x18
.global audio_task
audio_task:
.skip 0x60
.global AUDIO_YIELD_BUFFER
AUDIO_YIELD_BUFFER:
.skip 0x2000
.global taskwork
taskwork:
.skip 0x80
.global sync_stack
sync_stack:
.skip 0x10
.global lbl_804F2870
lbl_804F2870:
.skip 0x10
.global gTRKEventQueue
gTRKEventQueue:
.skip 0x28
.global gTRKBigEndian
gTRKBigEndian:
.skip 0x8
.global gTRKMsgBufs
gTRKMsgBufs:
.skip 0x19B0
.global gTRKFramingState
gTRKFramingState:
.skip 0x18
.global IsTRKConnected
IsTRKConnected:
.skip 0x8
.global TRK_saved_exceptionID
TRK_saved_exceptionID:
.skip 0x4
.global gTRKState
gTRKState:
.skip 0xA4
.global gTRKCPUState
gTRKCPUState:
.skip 0x430
.global gTRKSaveState
gTRKSaveState:
.skip 0x94
.global TRKvalue128_temp
TRKvalue128_temp:
.skip 0x14
.global lc_base
lc_base:
.skip 0x8
.global TRK_mainError
TRK_mainError:
.skip 0x8
.global TRK_Use_BBA
TRK_Use_BBA:
.skip 0x4
.global _MetroTRK_Has_Framing
_MetroTRK_Has_Framing:
.skip 0x4
.global bUseSerialIO
bUseSerialIO: # should be local to target_options.c
.skip 1
.balign 8
.global gRecvBuf
gRecvBuf:
.skip 0x800
.global gRecvCB
gRecvCB:
.skip 0x20
.global gRecvBuf_1
gRecvBuf_1:
.skip 0x500
.global gRecvCB_1
gRecvCB_1:
.skip 0x20
.global fragmentinfo
fragmentinfo:
.skip 0x10
.global __atexit_funcs
__atexit_funcs:
.skip 0x100
.global protopool$192
protopool$192:
.skip 0x38
.global stderr_buff
stderr_buff: # should be local to ansi_files.c
.skip 0x100
.global stdout_buff
stdout_buff: # should be local to ansi_files.c
.skip 0x100
.global stdin_buff
stdin_buff: # should be local to ansi_files.c
.skip 0x100
.global regs
regs:
.skip 0x78
.global shdwRegs
shdwRegs:
.skip 0x78
.global HorVer
HorVer:
.skip 0x58
.global __CARDBlock
__CARDBlock:
.skip 0x220
.global __CARDDiskNone
__CARDDiskNone:
.skip 0x20
.global CommandList
CommandList:
.skip 0x40
.global AlarmForWA
AlarmForWA:
.skip 0x28
.global AlarmForTimeout
AlarmForTimeout:
.skip 0x28
.global AlarmForBreak
AlarmForBreak:
.skip 0x28
.global Prev
Prev:
.skip 0xC
.global Curr
Curr:
.skip 0xC
.global BB2
BB2:
.skip 0x20
.global CurrDiskID
CurrDiskID:
.skip 0x20
.global DummyCommandBlock
DummyCommandBlock:
.skip 0x30
.global ResetAlarm
ResetAlarm:
.skip 0x28
.global WaitingQueue
WaitingQueue:
.skip 0x20
.global bb2Buf
bb2Buf:
.skip 0x40
.global block_18
block_18:
.skip 0x30
.global Ecb
Ecb:
.skip 0xC0
.global FifoObj
FifoObj:
.skip 0x80
.global gxData
gxData:
.skip 0x5B8
.global DriveInfo
DriveInfo:
.skip 0x20
.global DriveBlock
DriveBlock:
.skip 0x30
.global __OSErrorTable
__OSErrorTable:
.skip 0x50
.global Header
Header:
.skip 0x20
.global Scb
Scb:
.skip 0x58
.global RunQueue
RunQueue:
.skip 0x100
.global IdleThread
IdleThread:
.skip 0x318
.global DefaultThread
DefaultThread:
.skip 0x318
.global IdleContext
IdleContext:
.skip 0x2C8
.global Type_1
Type_1:
.skip 0x10
.global Origin
Origin:
.skip 0x30
.global CmdProbeDevice
CmdProbeDevice:
.skip 0x10
.global Packet
Packet:
.skip 0x80
.global Alarm
Alarm:
# object-actor.cpp
.global saoVVOutput___Q214JStudio_JStage14TAdaptor_actor
saoVVOutput___Q214JStudio_JStage14TAdaptor_actor:
.skip 0xD0
.global saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor
saoVVOutput_ANIMATION_FRAME___Q214JStudio_JStage14TAdaptor_actor:
.skip 0x90
# object-camera.cpp
.global saoVVOutput___Q214JStudio_JStage15TAdaptor_camera
saoVVOutput___Q214JStudio_JStage15TAdaptor_camera:
.skip 0xA0
.global TypeTime
TypeTime:
.skip 0x20
.global XferTime
XferTime:
.skip 0x20
.global TypeCallback
TypeCallback:
.skip 0x40
.global RDSTHandler
RDSTHandler:
.skip 0x10
.global InputBufferValid
InputBufferValid:
.skip 0x10
.global InputBuffer
InputBuffer:
.skip 0x20
.global InputBufferVcount
InputBufferVcount:
.skip 0x10
.global cmdFixDevice$327
cmdFixDevice$327:
.skip 0x10
.global __THPIDCTWorkspace
__THPIDCTWorkspace:
.skip 0x100
.global __THPLCWork512
__THPLCWork512:
# object-fog.cpp
.global saoVVOutput___Q214JStudio_JStage12TAdaptor_fog
saoVVOutput___Q214JStudio_JStage12TAdaptor_fog:
.skip 0x60
# object-sound.cpp
.global saoVVOSetValue___Q214JStudio_JAudio14TAdaptor_sound
saoVVOSetValue___Q214JStudio_JAudio14TAdaptor_sound:
.skip 0x78
# JKRAram.cpp
.global sAramCommandList__7JKRAram
sAramCommandList__7JKRAram:
.skip 0xC
.global __THPLCWork672
__THPLCWork672:
# JKRAramHeap.cpp
.global sAramList__11JKRAramHeap
sAramList__11JKRAramHeap:
.skip 0xC
.global __THPMCUBuffer
__THPMCUBuffer:
.skip 0x28
.global SecParams
SecParams:
.skip 0x100
.global __GBA
__GBA:
.skip 0x400
.global dummyPlayer
dummyPlayer:
.skip 0x10
.global sCylinderVertPos__4Game
sCylinderVertPos__4Game:
.skip 0x240
.global lbl_804F7C10
lbl_804F7C10:
.skip 0x10
.global exCallbackObject_1
exCallbackObject_1:
# JKRAramPiece.cpp
.global sAramPieceCommandList__12JKRAramPiece
sAramPieceCommandList__12JKRAramPiece:
.skip 0x24
.global mMutex__12JKRAramPiece
mMutex__12JKRAramPiece:
.skip 0x18
.global lbl_804F7C38
lbl_804F7C38:
.skip 0x10
.global sRubyDataBuffer__5P2JME
sRubyDataBuffer__5P2JME:
.skip 0x28
.global str_673
str_673:
.skip 0x100
.balign 32
.global sCardWorkArea
sCardWorkArea:
.skip 0xA000
.global AudioDecodeThread
AudioDecodeThread:
.skip 0x318
.global AudioDecodeThreadStack
AudioDecodeThreadStack:
.skip 0x1000
.global FreeAudioBufferQueue
FreeAudioBufferQueue:
.skip 0x20
.global DecodedAudioBufferQueue
DecodedAudioBufferQueue:
.skip 0x20
.global FreeAudioBufferMessage
FreeAudioBufferMessage:
# JKRDvdFile.cpp
.global sDvdList__10JKRDvdFile
sDvdList__10JKRDvdFile:
.skip 0xC
.global DecodedAudioBufferMessage
DecodedAudioBufferMessage:
# JKRDvdAramRipper.cpp
.global sDvdAramAsyncList__16JKRDvdAramRipper
sDvdAramAsyncList__16JKRDvdAramRipper:
.skip 0xC
.balign 32
.global WorkBuffer
WorkBuffer:
# JKRDvdRipper.cpp
.global sDvdAsyncList__12JKRDvdRipper
sDvdAsyncList__12JKRDvdRipper:
.skip 0xC
# JKRFileLoader.cpp
.global sVolumeList__13JKRFileLoader
sVolumeList__13JKRFileLoader:
.skip 0xC
# JKRThread.cpp
.global sThreadList__9JKRThread
sThreadList__9JKRThread:
.skip 0x38
.global sTaskList__7JKRTask
sTaskList__7JKRTask:
.skip 0xC
# JUTException.cpp
.global sMapFileList__12JUTException
sMapFileList__12JUTException:
.skip 0xC
# JUTGamePad.cpp
.global mPadList__10JUTGamePad
mPadList__10JUTGamePad:
.skip 0x188
.global mPadStatus__10JUTGamePad
mPadStatus__10JUTGamePad:
.skip 0x30
.global mPadButton__10JUTGamePad
mPadButton__10JUTGamePad:
.skip 0xC0
.global mPadMStick__10JUTGamePad
mPadMStick__10JUTGamePad:
.skip 0x40
.global PrepareReadyQueue
PrepareReadyQueue:
.skip 0x20
.global UsedTextureSetQueue
UsedTextureSetQueue:
.skip 0x20
.global UsedTextureSetMessage
UsedTextureSetMessage:
.global mPadSStick__10JUTGamePad
mPadSStick__10JUTGamePad:
.skip 0x40
.global sPatternList__19JUTGamePadLongPress
sPatternList__19JUTGamePadLongPress:
.skip 0xC
.balign 32
.global SoundBuffer
SoundBuffer:
.skip 0x1180
.global FreeReadBufferQueue
FreeReadBufferQueue:
.skip 0x1C
# JMATrigonometric.cpp
#.balign 32
.global sincosTable___5JMath
sincosTable___5JMath:
.skip 0x6040
#.balign 32
.global atanTable___5JMath
atanTable___5JMath:
.skip 0x1020
#.balign 32
.global asinAcosTable___5JMath
asinAcosTable___5JMath:
.skip 0x1020
# J2DPane.cpp
.global static_mBounds__7J2DPane
static_mBounds__7J2DPane:
.skip 0x10
# J3DSys.cpp
.global j3dSys
j3dSys:
.skip 0x1A4
.global mCurrentMtx__6J3DSys
mCurrentMtx__6J3DSys:
.skip 0x30
.global mCurrentS__6J3DSys
mCurrentS__6J3DSys:
.skip 0xC
.global mParentS__6J3DSys
mParentS__6J3DSys:
.skip 0xC
.global sTexCoordScaleTable__6J3DSys
sTexCoordScaleTable__6J3DSys:
.skip 0x40
# J3DPacket.cpp
.global sGDLObj__17J3DDisplayListObj # technically goes with J3DPacket.cpp
sGDLObj__17J3DDisplayListObj:
.skip 0x10
# J3DTevs.cpp
.global j3dTexCoordTable
j3dTexCoordTable:
.skip 0x2528
.global j3dTevSwapTableTable
j3dTevSwapTableTable:
.skip 0x400
.global j3dAlphaCmpTable
j3dAlphaCmpTable:
.skip 0x300
.global j3dZModeTable
j3dZModeTable:
.skip 0x60
# J3DShapeMtx.cpp
.global sMtxLoadCache__11J3DShapeMtx
sMtxLoadCache__11J3DShapeMtx:
.skip 0x14
# J3DMtxBuffer.cpp
.global sNoUseDrawMtx__12J3DMtxBuffer
sNoUseDrawMtx__12J3DMtxBuffer:
.skip 0x54
.global sNoUseNrmMtx__12J3DMtxBuffer
sNoUseNrmMtx__12J3DMtxBuffer:
.skip 0x24
# JFWDisplay.cpp
.global sList__8JFWAlarm
sList__8JFWAlarm:
.skip 0xC
# JASCmdStack.cpp
.global sCommandListOnce__10JASPortCmd
sCommandListOnce__10JASPortCmd:
.skip 0x18
.global sCommandListStay__10JASPortCmd
sCommandListStay__10JASPortCmd:
.skip 0xC
# JAIConst.cpp
.global nullCamera__Q27JAInter5Const
nullCamera__Q27JAInter5Const:
.skip 0x68
.global nullActor__Q27JAInter5Const
nullActor__Q27JAInter5Const:
.skip 0x14
.global camMtx__Q27JAInter5Const
camMtx__Q27JAInter5Const:
.skip 0x30
.global camTrans__Q27JAInter5Const
camTrans__Q27JAInter5Const:
.skip 0xC
.global camPreTrans__Q27JAInter5Const
camPreTrans__Q27JAInter5Const:
.skip 0xC
# JAISystemInterface.cpp
.global systemPortCmd__Q27JAInter15SystemInterface
systemPortCmd__Q27JAInter15SystemInterface:
.skip 0x18
# piki.cpp
.global pikiColors__Q24Game4Piki
pikiColors__Q24Game4Piki:
.skip 0x40
.global pikiColorsCursor__Q24Game4Piki
pikiColorsCursor__Q24Game4Piki:
.skip 0x20
.global ReadedBufferQueue
ReadedBufferQueue:
# gameStat.cpp
.global formationPikis__Q24Game8GameStat
formationPikis__Q24Game8GameStat:
.skip 0x220
.global workPikis__Q24Game8GameStat
workPikis__Q24Game8GameStat:
.skip 0xE0
.global alivePikis__Q24Game8GameStat
alivePikis__Q24Game8GameStat:
.skip 0x20
.global ReadedBufferQueue2
ReadedBufferQueue2:
.global mePikis__Q24Game8GameStat
mePikis__Q24Game8GameStat:
.skip 0x20
.global FreeReadBufferMessage
FreeReadBufferMessage:
.global zikatuPikis__Q24Game8GameStat
zikatuPikis__Q24Game8GameStat:
.skip 0x20
# gameDeathCount.cpp
.global mToday__Q24Game8BirthMgr
mToday__Q24Game8BirthMgr:
.skip 0xC0
.global mCave__Q24Game8BirthMgr
mCave__Q24Game8BirthMgr:
.skip 0x1C
.global mTotal__Q24Game8BirthMgr
mTotal__Q24Game8BirthMgr:
.skip 0x1C
.global mToday__Q24Game8DeathMgr
mToday__Q24Game8DeathMgr:
.skip 0x24
.global mCave__Q24Game8DeathMgr
mCave__Q24Game8DeathMgr:
.skip 0x24
.global mTotal__Q24Game8DeathMgr
mTotal__Q24Game8DeathMgr:
.skip 0x24
# pelletBirthBuffer.cpp
.global sArgs__Q24Game17PelletBirthBuffer
sArgs__Q24Game17PelletBirthBuffer:
.skip 0x1400
# ogScreen.cpp
.global PikiIconTextureResTIMG__Q22og6Screen
PikiIconTextureResTIMG__Q22og6Screen:
.skip 0x4C
# ogLifeGauge.cpp
.global msVal__Q32og6Screen18CallBack_LifeGauge # belongs in ogLifeGauge
msVal__Q32og6Screen18CallBack_LifeGauge:
.skip 0x10
# ogCounterRV.cpp
.global msVal__Q32og6Screen18CallBack_CounterRV
msVal__Q32og6Screen18CallBack_CounterRV:
.skip 0xC
# ogObjGround.cpp
.global msVal__Q32og9newScreen9ObjGround
msVal__Q32og9newScreen9ObjGround:
.skip 0x28
.global ReadedBufferMessage
ReadedBufferMessage:
.skip 0x28
.global ReadedBufferMessage2
ReadedBufferMessage2:
.skip 0x28
.global ReadThread
ReadThread:
.skip 0x318
.global ReadThreadStack
ReadThreadStack:
.skip 0x1000
.global VideoDecodeThread
VideoDecodeThread:
.skip 0x318
.global VideoDecodeThreadStack
VideoDecodeThreadStack:
.skip 0x1000
.global FreeTextureSetQueue
FreeTextureSetQueue:
# ogObjSMenuMap.cpp
.global msVal__Q32og9newScreen11ObjSMenuMap
msVal__Q32og9newScreen11ObjSMenuMap:
.skip 0x50
# ogObjSMenuItem.cpp
.global msVal__Q32og9newScreen12ObjSMenuItem
msVal__Q32og9newScreen12ObjSMenuItem:
.skip 0x20
.global DecodedTextureSetQueue
DecodedTextureSetQueue:
# ogObjSMenuPause.cpp
.global msVal__Q32og9newScreen13ObjSMenuPause
msVal__Q32og9newScreen13ObjSMenuPause:
.skip 0x44
# ogObjSMenuBase.cpp
.global msBaseVal__Q32og9newScreen12ObjSMenuBase
msBaseVal__Q32og9newScreen12ObjSMenuBase:
.skip 0x1C
# ogObjCourseName.cpp
.global msVal__Q32og9newScreen13ObjCourseName
msVal__Q32og9newScreen13ObjCourseName:
.skip 0x10
# ogObjKantei.cpp
.global msVal__Q32og9newScreen9ObjKantei
msVal__Q32og9newScreen9ObjKantei:
.skip 0x40
# ogObjFloor.cpp
.global msVal__Q32og9newScreen8ObjFloor
msVal__Q32og9newScreen8ObjFloor:
.skip 0x7C
# ogObjCave.cpp
.global msVal__Q32og9newScreen7ObjCave
msVal__Q32og9newScreen7ObjCave:
.skip 0x4C
# ogObjAnaDemo.cpp
.global msVal__Q32og9newScreen10ObjAnaDemo
msVal__Q32og9newScreen10ObjAnaDemo:
.skip 0x10
# ogObjChallenge2P.cpp
.global msVal__Q32og9newScreen14ObjChallenge2P
msVal__Q32og9newScreen14ObjChallenge2P:
.skip 0x90
# ogObjContena.cpp
.global msVal__Q32og9newScreen10ObjContena
msVal__Q32og9newScreen10ObjContena:
.skip 0x44
# ogObjSMenuPauseDoukutu.cpp
.global msVal__Q32og9newScreen20ObjSMenuPauseDoukutu
msVal__Q32og9newScreen20ObjSMenuPauseDoukutu:
.skip 0xC
# ogObjUfo.cpp
.global msVal__Q32og9newScreen10ObjUfoMenu
msVal__Q32og9newScreen10ObjUfoMenu:
.skip 0x28
# ogObjVs.cpp
.global msVal__Q32og9newScreen5ObjVs
msVal__Q32og9newScreen5ObjVs:
.skip 0x34
# ogObjChallenge1P.cpp
.global msVal__Q32og9newScreen14ObjChallenge1P
msVal__Q32og9newScreen14ObjChallenge1P:
.skip 0x6C
# ogObjChallengeBase.cpp
.global msBaseVal__Q32og9newScreen16ObjChallengeBase
msBaseVal__Q32og9newScreen16ObjChallengeBase:
.skip 0x1C
# PSGame.cpp
.global newSeqName__6PSGame
newSeqName__6PSGame:
.skip 0x20
.global FreeTextureSetMessage
FreeTextureSetMessage:
# zukan2D.cpp
.global mScrollParm__Q28Morimura10TZukanBase
mScrollParm__Q28Morimura10TZukanBase:
.skip 0x14
# hiScore2D.cpp
.global mScrollParm__Q28Morimura8THiScore
mScrollParm__Q28Morimura8THiScore:
.skip 0x14
# vsSelect2D.cpp
.global mScrollParm__Q28Morimura9TVsSelect
mScrollParm__Q28Morimura9TVsSelect:
.skip 0x14
# khWorldMap.cpp
.global msVal__Q32kh6Screen8WorldMap
msVal__Q32kh6Screen8WorldMap:
.skip 0x7C
# khCaveResult.cpp
.global msVal__Q32kh6Screen13ObjCaveResult
msVal__Q32kh6Screen13ObjCaveResult:
.skip 0x3C
# khReadyGo.cpp
.global msVal__Q32kh6Screen10ObjReadyGo
msVal__Q32kh6Screen10ObjReadyGo:
.skip 0x18
# khFinalFloor.cpp
.global msVal__Q32kh6Screen13ObjFinalFloor
msVal__Q32kh6Screen13ObjFinalFloor:
.skip 0xC
.global DecodedTextureSetMessage
DecodedTextureSetMessage:
# khDayEndResult.cpp
.global msVal__Q32kh6Screen19ObjDayEndResultBase
msVal__Q32kh6Screen19ObjDayEndResultBase:
.skip 0x54
# khFinalResult.cpp
.global msVal__Q32kh6Screen14ObjFinalResult
msVal__Q32kh6Screen14ObjFinalResult:
.skip 0x24
# khWinLose.cpp
.global msVal__Q32kh6Screen10ObjWinLose
msVal__Q32kh6Screen10ObjWinLose:
.skip 0x1C
# khWinLoseReason.cpp
.global msVal__Q32kh6Screen16ObjWinLoseReason
msVal__Q32kh6Screen16ObjWinLoseReason:
.skip 0x1C
# sysMath.cpp
.global "zero__10Vector3<f>"
"zero__10Vector3<f>":
.skip 0xC
.global lbl_80506A80
lbl_80506A80:
# id32.cpp
.global eof__4ID32 # god damn it, this is static in the class definition but global linkage
eof__4ID32:
.skip 0xC
# gameConfig.cpp
.global gGameConfig__4Game
gGameConfig__4Game:
.skip 0x27C
# bootSection.cpp
.global sPikminTex__13TinyPikminMgr
sPikminTex__13TinyPikminMgr:
.skip 0x14
.skip 0x4
# THPPlayer.c
#.balign 8
.global ActivePlayer
ActivePlayer:
.skip 0x1D0
# PSMainSide_CreaturePrm.cpp
.global sInsReal__3PSM
sInsReal__3PSM:
.skip 0x1C

5
asm/plugProjectEbisawaU/efxBase.s
View File

@ -312,6 +312,11 @@ __vt__Q23efx24TCallBack_StaticClipping:
.4byte draw__18JPAEmitterCallBackFP14JPABaseEmitter
.4byte drawAfter__18JPAEmitterCallBackFP14JPABaseEmitter
.section .bss # 0x804EFC20 - 0x8051467C
.global lbl_804F7C10
lbl_804F7C10:
.skip 0xC
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global mCallBack_StaticClipping__Q23efx5TBase

5
asm/plugProjectHikinoU/PSGame.s
View File

@ -380,11 +380,6 @@ __vt__Q26PSGame13ConductorList:
.4byte 0
.4byte "__dt__Q28PSSystem39SingletonBase<Q26PSGame13ConductorList>Fv"
.section .bss # 0x804EFC20 - 0x8051467C
.global newSeqName__6PSGame
newSeqName__6PSGame:
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global sToolMode__Q26PSGame13ConductorList

20
asm/plugProjectKandoU/gameDeathCount.s
View File

@ -29,26 +29,6 @@ lbl_80483920:
.4byte 0x746E6572
.4byte 0x00000000
.section .bss # 0x804EFC20 - 0x8051467C
.global mToday__Q24Game8BirthMgr
mToday__Q24Game8BirthMgr:
.skip 0xC0
.global mCave__Q24Game8BirthMgr
mCave__Q24Game8BirthMgr:
.skip 0x1C
.global mTotal__Q24Game8BirthMgr
mTotal__Q24Game8BirthMgr:
.skip 0x1C
.global mToday__Q24Game8DeathMgr
mToday__Q24Game8DeathMgr:
.skip 0x24
.global mCave__Q24Game8DeathMgr
mCave__Q24Game8DeathMgr:
.skip 0x24
.global mTotal__Q24Game8DeathMgr
mTotal__Q24Game8DeathMgr:
.skip 0x24
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global mSoundDeathCount__Q24Game8DeathMgr

17
asm/plugProjectKandoU/gameStat.s
View File

@ -25,23 +25,6 @@ __vt__Q34Game8GameStat11PikiCounter:
.4byte __opi__Q34Game8GameStat11PikiCounterFv
.4byte __cl__Q34Game8GameStat11PikiCounterFi
.section .bss # 0x804EFC20 - 0x8051467C
.global formationPikis__Q24Game8GameStat
formationPikis__Q24Game8GameStat:
.skip 0x220
.global workPikis__Q24Game8GameStat
workPikis__Q24Game8GameStat:
.skip 0xE0
.global alivePikis__Q24Game8GameStat
alivePikis__Q24Game8GameStat:
.skip 0x20
.global mePikis__Q24Game8GameStat
mePikis__Q24Game8GameStat:
.skip 0x20
.global zikatuPikis__Q24Game8GameStat
zikatuPikis__Q24Game8GameStat:
.skip 0x20
.section .text, "ax" # 0x800056C0 - 0x80472F00
.global clear__Q24Game8GameStatFv
clear__Q24Game8GameStatFv:

5
asm/plugProjectKandoU/pelletBirthBuffer.s
View File

@ -11,11 +11,6 @@ lbl_80483F28:
lbl_80483F40:
.asciz "too many birthbuffer\n"
.section .bss # 0x804EFC20 - 0x8051467C
.global sArgs__Q24Game17PelletBirthBuffer
sArgs__Q24Game17PelletBirthBuffer:
.skip 0x1400
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global sNum__Q24Game17PelletBirthBuffer

8
asm/plugProjectKandoU/piki.s
View File

@ -266,14 +266,6 @@ __vt__Q23efx7TPkMoeA:
.4byte "transit__Q24Game26StateMachine<Q24Game4Piki>FPQ24Game4PikiiPQ24Game8StateArg"
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global pikiColors__Q24Game4Piki
pikiColors__Q24Game4Piki:
.skip 0x40
.global pikiColorsCursor__Q24Game4Piki
pikiColorsCursor__Q24Game4Piki:
.skip 0x20
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515920

5
asm/plugProjectKandoU/singleGS_Movie.s
View File

@ -188,6 +188,11 @@ __vt__Q34Game10SingleGame10MovieState:
.4byte 0
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global dummyPlayer
dummyPlayer:
.skip 0x10
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515C38

5
asm/plugProjectKonoU/khCaveResult.s
View File

@ -143,11 +143,6 @@ __vt__Q32kh6Screen14DispCaveResult:
.4byte getMemberID__Q32kh6Screen14DispCaveResultFv
.4byte doSetSubMemberAll__Q32og6Screen14DispMemberBaseFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen13ObjCaveResult
msVal__Q32kh6Screen13ObjCaveResult:
.skip 0x3C
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_8051FFA8:

5
asm/plugProjectKonoU/khDayEndResult.s
View File

@ -602,11 +602,6 @@ __vt__Q32kh6Screen20DispDayEndResultItem:
.4byte getMemberID__Q32kh6Screen20DispDayEndResultItemFv
.4byte doSetSubMemberAll__Q32og6Screen14DispMemberBaseFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen19ObjDayEndResultBase
msVal__Q32kh6Screen19ObjDayEndResultBase:
.skip 0x54
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global msVal__Q32kh6Screen19ObjDayEndResultTitl

5
asm/plugProjectKonoU/khFinalFloor.s
View File

@ -911,11 +911,6 @@ __vt__Q32kh6Screen13ObjFinalFloor:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen13ObjFinalFloor
msVal__Q32kh6Screen13ObjFinalFloor:
.skip 0xC
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
gu32NAN___Q24Game5P2JST:

5
asm/plugProjectKonoU/khFinalResult.s
View File

@ -303,11 +303,6 @@ __vt__Q32kh6Screen15DispFinalResult:
.4byte getMemberID__Q32kh6Screen15DispFinalResultFv
.4byte doSetSubMemberAll__Q32og6Screen14DispMemberBaseFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen14ObjFinalResult
msVal__Q32kh6Screen14ObjFinalResult:
.skip 0x24
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_80520198

5
asm/plugProjectKonoU/khReadyGo.s
View File

@ -136,11 +136,6 @@ __vt__Q32kh6Screen10ObjReadyGo:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen10ObjReadyGo
msVal__Q32kh6Screen10ObjReadyGo:
.skip 0x18
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80516128

5
asm/plugProjectKonoU/khWinLose.s
View File

@ -131,11 +131,6 @@ __vt__Q32kh6Screen10ObjWinLose:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen10ObjWinLose
msVal__Q32kh6Screen10ObjWinLose:
.skip 0x1C
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_80520208:

5
asm/plugProjectKonoU/khWinLoseReason.s
View File

@ -104,11 +104,6 @@ __vt__Q32kh6Screen16ObjWinLoseReason:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen16ObjWinLoseReason
msVal__Q32kh6Screen16ObjWinLoseReason:
.skip 0x1C
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_80520240:

5
asm/plugProjectKonoU/khWorldMap.s
View File

@ -572,11 +572,6 @@ __vt__Q42kh6Screen14khUtilFadePane10khPaneNode:
.4byte 0
.4byte __dt__Q42kh6Screen14khUtilFadePane10khPaneNodeFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32kh6Screen8WorldMap
msVal__Q32kh6Screen8WorldMap:
.skip 0x7C
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_8051FEF0:

5
asm/plugProjectMorimuraU/hiScore2D.s
View File

@ -382,11 +382,6 @@ __vt__Q28Morimura15THiScoreIndPane:
.4byte draw__Q28Morimura15THiScoreIndPaneFv
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global mScrollParm__Q28Morimura8THiScore
mScrollParm__Q28Morimura8THiScore:
.skip 0x14
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global mPictureOffsetY__Q28Morimura8THiScore

5
asm/plugProjectMorimuraU/vsSelect2D.s
View File

@ -706,11 +706,6 @@ __vt__Q28Morimura16TVsSelectIndPane:
.4byte draw__Q28Morimura16TVsSelectIndPaneFv
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global mScrollParm__Q28Morimura9TVsSelect
mScrollParm__Q28Morimura9TVsSelect:
.skip 0x14
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global mAngRate__Q28Morimura9TVsSelect

5
asm/plugProjectMorimuraU/zukan2D.s
View File

@ -1429,11 +1429,6 @@ __vt__Q28Morimura10TZukanBase:
.4byte 0
.4byte isPanelExist__Q28Morimura10TZukanBaseFv
.section .bss # 0x804EFC20 - 0x8051467C
.global mScrollParm__Q28Morimura10TZukanBase
mScrollParm__Q28Morimura10TZukanBase:
.skip 0x14
.section .sdata, "wa" # 0x80514680 - 0x80514D80
.balign 8
.global mRequestTimerMax__Q28Morimura10TZukanBase

5
asm/plugProjectNishimuraU/ShadowCylinder.s
View File

@ -178,6 +178,11 @@ __vt__Q24Game12CylinderBase:
.4byte drawCylinder__Q24Game12CylinderBaseFR7Matrixfi
.4byte drawFinish__Q24Game12CylinderBaseFv
.section .bss # 0x804EFC20 - 0x8051467C
.global sCylinderVertPos__4Game
sCylinderVertPos__4Game:
.skip 0x240
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515CE8

5
asm/plugProjectOgawaU/ogCounterRV.s
View File

@ -20,11 +20,6 @@ __vt__Q32og6Screen18CallBack_CounterRV:
.4byte setValue__Q32og6Screen18CallBack_CounterRVFbb
.4byte setValue__Q32og6Screen18CallBack_CounterRVFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og6Screen18CallBack_CounterRV
msVal__Q32og6Screen18CallBack_CounterRV:
.skip 0xC
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_8051D6A0

5
asm/plugProjectOgawaU/ogObjAnaDemo.s
View File

@ -91,11 +91,6 @@ __vt__Q32og9newScreen10ObjAnaDemo:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen10ObjAnaDemo
msVal__Q32og9newScreen10ObjAnaDemo:
.skip 0x10
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_8051DC10:

5
asm/plugProjectOgawaU/ogObjCave.s
View File

@ -87,11 +87,6 @@ __vt__Q32og9newScreen7ObjCave:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen7ObjCave
msVal__Q32og9newScreen7ObjCave:
.skip 0x4C
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515E78

5
asm/plugProjectOgawaU/ogObjChallenge1P.s
View File

@ -89,11 +89,6 @@ __vt__Q32og9newScreen14ObjChallenge1P:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte doCreateAfter__Q32og9newScreen16ObjChallengeBaseFP10JKRArchivePQ32og6Screen18CallBack_CounterRV
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen14ObjChallenge1P
msVal__Q32og9newScreen14ObjChallenge1P:
.skip 0x6C
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515E90

5
asm/plugProjectOgawaU/ogObjChallenge2P.s
View File

@ -82,11 +82,6 @@ __vt__Q32og9newScreen14ObjChallenge2P:
.4byte doCreateAfter__Q32og9newScreen16ObjChallengeBaseFP10JKRArchivePQ32og6Screen18CallBack_CounterRV
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen14ObjChallenge2P
msVal__Q32og9newScreen14ObjChallenge2P:
.skip 0x90
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_8051DC48

5
asm/plugProjectOgawaU/ogObjChallengeBase.s
View File

@ -44,11 +44,6 @@ __vt__Q32og9newScreen16ObjChallengeBase:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte doCreateAfter__Q32og9newScreen16ObjChallengeBaseFP10JKRArchivePQ32og6Screen18CallBack_CounterRV
.section .bss # 0x804EFC20 - 0x8051467C
.global msBaseVal__Q32og9newScreen16ObjChallengeBase
msBaseVal__Q32og9newScreen16ObjChallengeBase:
.skip 0x1C
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global lbl_80515EB0

5
asm/plugProjectOgawaU/ogObjContena.s
View File

@ -130,11 +130,6 @@ __vt__Q32og9newScreen10ObjContena:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen10ObjContena
msVal__Q32og9newScreen10ObjContena:
.skip 0x44
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
.global angle$4147

5
asm/plugProjectOgawaU/ogObjCourseName.s
View File

@ -71,11 +71,6 @@ __vt__Q32og9newScreen13ObjCourseName:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen13ObjCourseName
msVal__Q32og9newScreen13ObjCourseName:
.skip 0x10
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_8051D8D0

5
asm/plugProjectOgawaU/ogObjFloor.s
View File

@ -91,11 +91,6 @@ __vt__Q32og9newScreen8ObjFloor:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen8ObjFloor
msVal__Q32og9newScreen8ObjFloor:
.skip 0x7C
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
lbl_8051D998:

5
asm/plugProjectOgawaU/ogObjGround.s
View File

@ -83,11 +83,6 @@ __vt__Q32og9newScreen9ObjGround:
.4byte doConfirmStartScene__Q26Screen7ObjBaseFPQ26Screen13StartSceneArg
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen9ObjGround
msVal__Q32og9newScreen9ObjGround:
.skip 0x28
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
gu32NAN___Q24Game5P2JST:

5
asm/plugProjectOgawaU/ogObjKantei.s
View File

@ -145,11 +145,6 @@ __vt__Q32og9newScreen9ObjKantei:
.4byte doConfirmEndScene__Q26Screen7ObjBaseFRPQ26Screen11EndSceneArg
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen9ObjKantei
msVal__Q32og9newScreen9ObjKantei:
.skip 0x40
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_8051D938

5
asm/plugProjectOgawaU/ogObjSMenuBase.s
View File

@ -102,11 +102,6 @@ __vt__Q26Screen13StartSceneArg:
.4byte getSceneType__Q26Screen12SceneArgBaseCFv
.4byte 0
.section .bss # 0x804EFC20 - 0x8051467C
.global msBaseVal__Q32og9newScreen12ObjSMenuBase
msBaseVal__Q32og9newScreen12ObjSMenuBase:
.skip 0x1C
.section .sbss # 0x80514D80 - 0x80516360
.balign 8
angle$3853:

5
asm/plugProjectOgawaU/ogObjSMenuItem.s
View File

@ -163,11 +163,6 @@ __vt__Q32og9newScreen12ObjSMenuItem:
.4byte updateFadeOut__Q32og9newScreen12ObjSMenuBaseFv
.4byte commonUpdate__Q32og9newScreen12ObjSMenuItemFv
.section .bss # 0x804EFC20 - 0x8051467C
.global msVal__Q32og9newScreen12ObjSMenuItem
msVal__Q32og9newScreen12ObjSMenuItem:
.skip 0x20
.section .sdata2, "a" # 0x80516360 - 0x80520E40
.balign 8
.global lbl_8051D830

Some files were not shown because too many files have changed in this diff Show More