darkkirb/donut-decomp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

merge namespace info::cutin

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2022-10-21 17:29:27 +01:00
parent ebbd2abfa3
commit 346cf1f0e7
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
5 changed files with 101 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
asm/src/CutIn_80457768.s
View file

@ -1,72 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@52354"
"@52354":
.4byte 0x73746570
.4byte 0x2F6C766D
.4byte 0x61702F43
.4byte 0x7574696E
.4byte 0x616E696D
.4byte 0x65000000
.4byte 0x43757469
.4byte 0x6E416E69
.4byte 0x6D650000
.4byte 0x4C762564
.4byte 0x54657874
.4byte 0x4E000000
.4byte 0x5469746C
.4byte 0x65546578
.4byte 0x74000000
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x65000000
.4byte 0x5469746C
.4byte 0x65546578
.4byte 0x74536800
.4byte 0
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787400
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x654D6169
.4byte 0x6E5F3030
.4byte 0
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787453
.4byte 0x68000000
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787432
.4byte 0
.4byte 0
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x65537562
.4byte 0x5F303000
.4byte 0x4C762564
.4byte 0x41726561
.4byte 0x54657874
.4byte 0
.4byte 0x4C762564
.4byte 0x41726561
.4byte 0x54657874
.4byte 0x53680000
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000

26
asm/src/CutIn_80557138.s
View file

@ -1,26 +0,0 @@
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@52448_80557138"
"@52448_80557138":
.4byte 0x4C762564
.4byte 0
.global "@52452"
"@52452":
.4byte 0x53746172
.4byte 0x74000000
.global "@52455_80557148"
"@52455_80557148":
.4byte 0x456E6400
.global "@52458"
"@52458":
.4byte 0x57616974
.4byte 0
.4byte 0

98
asm/src/CutIn_801ab11c.s → asm/src/info/cutin/CutIn.s
View file

@ -333,3 +333,101 @@ procReadyToRender__Q34info5cutin5CutInFv:
.global draw__Q34info5cutin5CutInCFv
draw__Q34info5cutin5CutInCFv:
/* 801AB600 001A7440 48 00 1D 78 */ b draw__Q23lyt6LayoutCFv
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@52354"
"@52354":
.4byte 0x73746570
.4byte 0x2F6C766D
.4byte 0x61702F43
.4byte 0x7574696E
.4byte 0x616E696D
.4byte 0x65000000
.4byte 0x43757469
.4byte 0x6E416E69
.4byte 0x6D650000
.4byte 0x4C762564
.4byte 0x54657874
.4byte 0x4E000000
.4byte 0x5469746C
.4byte 0x65546578
.4byte 0x74000000
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x65000000
.4byte 0x5469746C
.4byte 0x65546578
.4byte 0x74536800
.4byte 0
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787400
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x654D6169
.4byte 0x6E5F3030
.4byte 0
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787453
.4byte 0x68000000
.4byte 0x4C762564
.4byte 0x4D61704E
.4byte 0x616D6554
.4byte 0x65787432
.4byte 0
.4byte 0
.4byte 0x4C762564
.4byte 0x5469746C
.4byte 0x65537562
.4byte 0x5F303000
.4byte 0x4C762564
.4byte 0x41726561
.4byte 0x54657874
.4byte 0
.4byte 0x4C762564
.4byte 0x41726561
.4byte 0x54657874
.4byte 0x53680000
.4byte 0x4E573452
.4byte 0x3A506F69
.4byte 0x6E746572
.4byte 0x206D7573
.4byte 0x74206E6F
.4byte 0x74206265
.4byte 0x204E554C
.4byte 0x4C202870
.4byte 0x29000000
.4byte 0x4C696E6B
.4byte 0x4C697374
.4byte 0x2E680000
.include "macros.inc"
.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0
.global "@52448_80557138"
"@52448_80557138":
.4byte 0x4C762564
.4byte 0
.global "@52452"
"@52452":
.4byte 0x53746172
.4byte 0x74000000
.global "@52455_80557148"
"@52455_80557148":
.4byte 0x456E6400
.global "@52458"
"@52458":
.4byte 0x57616974
.4byte 0
.4byte 0

0
asm/src/Manager_801ab604.s → asm/src/info/cutin/Manager.s
View file

7
obj_files.mk
View file

@ -863,10 +863,11 @@ $(BUILD_DIR)/asm/src/info/common/SkipHelp.o \
$(BUILD_DIR)/asm/src/info/common/TotalScore.o \
$(BUILD_DIR)/asm/src/info/common/WiiButton.o \
\
$(BUILD_DIR)/asm/src/info/cutin/CutIn.o \
$(BUILD_DIR)/asm/src/info/cutin/Manager.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/CutIn_801ab11c.o \
$(BUILD_DIR)/asm/src/Manager_801ab604.o \
$(BUILD_DIR)/asm/src/Ticker_801aba4c.o \
$(BUILD_DIR)/asm/src/TickerContext_801ac058.o \
$(BUILD_DIR)/asm/src/AllocatorChanger_801ac0d8.o \
@ -3139,7 +3140,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/CutIn_80457768.o \
$(BUILD_DIR)/asm/src/Layout_80457870.o \
$(BUILD_DIR)/asm/src/MaterialAccessor_80457988.o \
$(BUILD_DIR)/asm/src/SystemTagProcessor_80457a00.o \
@ -4711,7 +4711,6 @@ $(BUILD_DIR)/asm/src/ModelDesc_80554a50.o \
$(BUILD_DIR)/asm/src/Table_80556398.o
# .sdata
O_FILES += \
$(BUILD_DIR)/asm/src/CutIn_80557138.o \
$(BUILD_DIR)/asm/src/Layout_80557158.o \
$(BUILD_DIR)/asm/src/UserTagProcessor_80557170.o \
$(BUILD_DIR)/asm/src/ActorDiamond_80557200.o \