Split main.s

Former-commit-id: 7626e83e7d
This commit is contained in:
Luke Street 2022-03-29 18:47:30 -04:00
parent 7385c3182a
commit 38a0a07e05
9 changed files with 6932 additions and 156 deletions

6906
asm/Kyoto_CWD/main.s Normal file

File diff suppressed because it is too large Load Diff

View File

@ -1,18 +1,7 @@
.include "macros.inc"
.section .data, "wa" # 0x803D8D60 - 0x803F7560
.global lbl_803D8D60
lbl_803D8D60:
.incbin "baserom.dol", 0x3D5D60, 0xC
.global lbl_803D8D6C
lbl_803D8D6C:
.incbin "baserom.dol", 0x3D5D6C, 0xC
.global lbl_803D8D78
lbl_803D8D78:
.incbin "baserom.dol", 0x3D5D78, 0xC
.global lbl_803D8D84
lbl_803D8D84:
.incbin "baserom.dol", 0x3D5D84, 0xC
.global lbl_803D8D90
lbl_803D8D90:
.incbin "baserom.dol", 0x3D5D90, 0x10C

View File

@ -1,18 +1,7 @@
.include "macros.inc"
.section .rodata, "a" # 0x803CB3A0 - 0x803D8D60
.global lbl_803CB3A0
lbl_803CB3A0:
.incbin "baserom.dol", 0x3C83A0, 0x650
.global lbl_803CB9F0
lbl_803CB9F0:
.incbin "baserom.dol", 0x3C89F0, 0x45C
.global lbl_803CBE4C
lbl_803CBE4C:
.incbin "baserom.dol", 0x3C8E4C, 0x28
.global lbl_803CBE74
lbl_803CBE74:
.incbin "baserom.dol", 0x3C8E74, 0x1B4
.global lbl_803CC028
lbl_803CC028:
.incbin "baserom.dol", 0x3C9028, 0x8

View File

@ -2,77 +2,6 @@
.section .sbss, "wa" # 0x805A8C20 - 0x805A9D1F
# main
.global gpResourceFactory
gpResourceFactory:
.skip 0x4
.global gpSimplePool
gpSimplePool:
.skip 0x4
.global gpRender
gpRender:
.skip 0x4
.global gpCharacterFactoryBuilder
gpCharacterFactoryBuilder:
.skip 0x4
.global gGuiSystem
gGuiSystem:
.skip 0x4
.global gpStringTable
gpStringTable:
.skip 0x4
.global gpMain
gpMain:
.skip 0x4
.global gpController
gpController:
.skip 0x4
.global gpGameState
gpGameState:
.skip 0x4
.global gpMemoryCard
gpMemoryCard:
.skip 0x4
.global gpTweakManager
gpTweakManager:
.skip 0x4
.global gpDefaultFont
gpDefaultFont:
.skip 0x4
.global lbl_805A8C50
lbl_805A8C50:
.skip 0x4
.global lbl_805A8C54
lbl_805A8C54:
.skip 0x4
.global lbl_805A8C58
lbl_805A8C58:
.skip 0x4
.global sARAMMemArray
sARAMMemArray:
.skip 0x8
# CGameArchitectureSupport
.global lbl_805A8C64
lbl_805A8C64:
.skip 0x4
# TOneStatic<CGameArchitectureSupport>
.global lbl_805A8C68
lbl_805A8C68:
.skip 0x4
.global lbl_805A8C6C
lbl_805A8C6C:
.skip 0x4
# TOneStatic<CGameGlobalObjects>
.global lbl_805A8C70
lbl_805A8C70:
.skip 0x4
.global lbl_805A8C74
lbl_805A8C74:
.skip 0x4
# CPlayer
.global lbl_805A8C78
lbl_805A8C78:

View File

@ -1,36 +1,50 @@
.include "macros.inc"
.section .sbss2, "", @nobits # 0x805AF460 - 0x805AF4C7
# CFluidPlaneCPU
.global lbl_805AF460
lbl_805AF460:
.skip 0x8
# CWallCrawlerSwarm
.global lbl_805AF468
lbl_805AF468:
.skip 0x4
.global lbl_805AF46C
lbl_805AF46C:
.skip 0x4
# CMorphBallShadow
.global lbl_805AF470
lbl_805AF470:
.skip 0x4
.global lbl_805AF474
lbl_805AF474:
.skip 0x4
# CSlideShow
.global lbl_805AF478
lbl_805AF478:
.skip 0x4
.global lbl_805AF47C
lbl_805AF47C:
.skip 0x4
# CProjectedShadow
.global lbl_805AF480
lbl_805AF480:
.skip 0x8
# CMovingAABoxComponent
.global lbl_805AF488
lbl_805AF488:
.skip 0x4
.global lbl_805AF48C
lbl_805AF48C:
.skip 0x4
# CCubeRenderer
.global lbl_805AF490
lbl_805AF490:
.skip 0x4
@ -40,15 +54,21 @@ lbl_805AF494:
.global lbl_805AF498
lbl_805AF498:
.skip 0x8
# CGX
.global lbl_805AF4A0
lbl_805AF4A0:
.skip 0x8
# CAABox
.global lbl_805AF4A8
lbl_805AF4A8:
.skip 0x4
.global lbl_805AF4AC
lbl_805AF4AC:
.skip 0x4
# CResLoader
.global lbl_805AF4B0
lbl_805AF4B0:
.skip 0x4

View File

@ -1,18 +1,7 @@
.include "macros.inc"
.section .sdata, "wa" # 0x805A6BC0 - 0x805A8C1C
.global lbl_805A6BC0
lbl_805A6BC0:
.incbin "baserom.dol", 0x3F4560, 0x4
.global lbl_805A6BC4
lbl_805A6BC4:
.incbin "baserom.dol", 0x3F4564, 0x4
.global lbl_805A6BC8
lbl_805A6BC8:
.incbin "baserom.dol", 0x3F4568, 0x4
.global lbl_805A6BCC
lbl_805A6BCC:
.incbin "baserom.dol", 0x3F456C, 0x4
.global lbl_805A6BD0
lbl_805A6BD0:
.incbin "baserom.dol", 0x3F4570, 0x4

View File

@ -1,54 +1,7 @@
.include "macros.inc"
.section .sdata2, "a" # 0x805A9D20 - 0x805AF45C
.global lbl_805A9D20
lbl_805A9D20:
.incbin "baserom.dol", 0x3F65C0, 0x4
.global lbl_805A9D24
lbl_805A9D24:
.incbin "baserom.dol", 0x3F65C4, 0x4
.global lbl_805A9D28
lbl_805A9D28:
.incbin "baserom.dol", 0x3F65C8, 0x8
.global lbl_805A9D30
lbl_805A9D30:
.incbin "baserom.dol", 0x3F65D0, 0x8
.global lbl_805A9D38
lbl_805A9D38:
.incbin "baserom.dol", 0x3F65D8, 0x8
.global lbl_805A9D40
lbl_805A9D40:
.incbin "baserom.dol", 0x3F65E0, 0x8
.global lbl_805A9D48
lbl_805A9D48:
.incbin "baserom.dol", 0x3F65E8, 0x8
.global lbl_805A9D50
lbl_805A9D50:
.incbin "baserom.dol", 0x3F65F0, 0x4
.global lbl_805A9D54
lbl_805A9D54:
.incbin "baserom.dol", 0x3F65F4, 0x4
.global lbl_805A9D58
lbl_805A9D58:
.incbin "baserom.dol", 0x3F65F8, 0x4
.global lbl_805A9D5C
lbl_805A9D5C:
.incbin "baserom.dol", 0x3F65FC, 0x4
.global lbl_805A9D60
lbl_805A9D60:
.incbin "baserom.dol", 0x3F6600, 0x8
.global lbl_805A9D68
lbl_805A9D68:
.incbin "baserom.dol", 0x3F6608, 0x4
.global lbl_805A9D6C
lbl_805A9D6C:
.incbin "baserom.dol", 0x3F660C, 0x4
.global lbl_805A9D70
lbl_805A9D70:
.incbin "baserom.dol", 0x3F6610, 0x8
.global lbl_805A9D78
lbl_805A9D78:
.incbin "baserom.dol", 0x3F6618, 0x4
.global lbl_805A9D7C
lbl_805A9D7C:
.incbin "baserom.dol", 0x3F661C, 0x4

View File

@ -1 +1 @@
f7514df3bf7616fd34e2f7b3bb6fba602783c65b
199189b27db07266d5335de903c54ba9c8427716

View File

@ -4,6 +4,7 @@ INIT_O_FILES :=\
$(BUILD_DIR)/asm/Runtime/PPCEABI/H/__mem.o
TEXT_O_FILES :=\
$(BUILD_DIR)/asm/Kyoto_CWD/main.o\
$(BUILD_DIR)/asm/text.o\
$(BUILD_DIR)/asm/Dolphin/THPDec.o\
$(BUILD_DIR)/asm/Dolphin/THPAudio.o\