merge namespace info::sequence

This commit is contained in:
Charlotte 🦝 Delenk 2022-10-21 17:13:04 +01:00
parent de12074ff4
commit 649bd6b8ef
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 92 additions and 92 deletions

View file

@ -1,90 +0,0 @@
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@55949"
"@55949":
.4byte 0
.4byte 0xFFFFFFFF
.4byte reset__Q34info8sequence7CommandFv
.global __vt__Q34info8sequence11CommandWait
__vt__Q34info8sequence11CommandWait:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandWaitFv
.4byte start__Q34info8sequence11CommandWaitFv
.4byte proc__Q34info8sequence11CommandWaitFv
.global __vt__Q34info8sequence11CommandProc
__vt__Q34info8sequence11CommandProc:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandProcFv
.4byte start__Q34info8sequence7CommandFv
.4byte proc__Q34info8sequence11CommandProcFv
.global __vt__Q34info8sequence15CommandInterval
__vt__Q34info8sequence15CommandInterval:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence15CommandIntervalFv
.4byte start__Q34info8sequence15CommandIntervalFv
.4byte proc__Q34info8sequence15CommandIntervalFv
.global __vt__Q34info8sequence11CommandCall
__vt__Q34info8sequence11CommandCall:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandCallFv
.4byte start__Q34info8sequence11CommandCallFv
.4byte proc__Q34info8sequence7CommandFv
.global "__vt__Q34util17Delegate<Fv_v,64>12DelegateHeap"
"__vt__Q34util17Delegate<Fv_v,64>12DelegateHeap":
.4byte 0
.4byte 0
.4byte "__dt__Q34util17Delegate<Fv_v,64>12DelegateHeapFv"
.4byte "allocatorAlloc__Q34util17Delegate<Fv_v,64>12DelegateHeapFUll"
.4byte "allocatorFree__Q34util17Delegate<Fv_v,64>12DelegateHeapFPv"
.global "__vt__Q34util17Delegate<Fv_b,64>12DelegateHeap"
"__vt__Q34util17Delegate<Fv_b,64>12DelegateHeap":
.4byte 0
.4byte 0
.4byte "__dt__Q34util17Delegate<Fv_b,64>12DelegateHeapFv"
.4byte "allocatorAlloc__Q34util17Delegate<Fv_b,64>12DelegateHeapFUll"
.4byte "allocatorFree__Q34util17Delegate<Fv_b,64>12DelegateHeapFPv"
.global __vt__Q34info8sequence11CommandAnim
__vt__Q34info8sequence11CommandAnim:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandAnimFv
.4byte start__Q34info8sequence11CommandAnimFv
.4byte proc__Q34info8sequence11CommandAnimFv
.global __vt__Q34info8sequence7Command
__vt__Q34info8sequence7Command:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence7CommandFv
.4byte start__Q34info8sequence7CommandFv
.4byte proc__Q34info8sequence7CommandFv
.global "@56161_80457294"
"@56161_80457294":
.4byte 0x6261645F
.4byte 0x66756E63
.4byte 0x74696F6E
.4byte 0x5F63616C
.4byte 0x6C000000

View file

@ -1594,3 +1594,93 @@ lbl_801A6FFC:
.global __dt__Q34info8sequence11CommandWaitFv
__dt__Q34info8sequence11CommandWaitFv:
/* 801A7018 001A2E58 4B FF FB 94 */ b __dt__Q34info8sequence11CommandAnimFv
.include "macros.inc"
.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0
.global "@55949"
"@55949":
.4byte 0
.4byte 0xFFFFFFFF
.4byte reset__Q34info8sequence7CommandFv
.global __vt__Q34info8sequence11CommandWait
__vt__Q34info8sequence11CommandWait:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandWaitFv
.4byte start__Q34info8sequence11CommandWaitFv
.4byte proc__Q34info8sequence11CommandWaitFv
.global __vt__Q34info8sequence11CommandProc
__vt__Q34info8sequence11CommandProc:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandProcFv
.4byte start__Q34info8sequence7CommandFv
.4byte proc__Q34info8sequence11CommandProcFv
.global __vt__Q34info8sequence15CommandInterval
__vt__Q34info8sequence15CommandInterval:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence15CommandIntervalFv
.4byte start__Q34info8sequence15CommandIntervalFv
.4byte proc__Q34info8sequence15CommandIntervalFv
.global __vt__Q34info8sequence11CommandCall
__vt__Q34info8sequence11CommandCall:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandCallFv
.4byte start__Q34info8sequence11CommandCallFv
.4byte proc__Q34info8sequence7CommandFv
.global "__vt__Q34util17Delegate<Fv_v,64>12DelegateHeap"
"__vt__Q34util17Delegate<Fv_v,64>12DelegateHeap":
.4byte 0
.4byte 0
.4byte "__dt__Q34util17Delegate<Fv_v,64>12DelegateHeapFv"
.4byte "allocatorAlloc__Q34util17Delegate<Fv_v,64>12DelegateHeapFUll"
.4byte "allocatorFree__Q34util17Delegate<Fv_v,64>12DelegateHeapFPv"
.global "__vt__Q34util17Delegate<Fv_b,64>12DelegateHeap"
"__vt__Q34util17Delegate<Fv_b,64>12DelegateHeap":
.4byte 0
.4byte 0
.4byte "__dt__Q34util17Delegate<Fv_b,64>12DelegateHeapFv"
.4byte "allocatorAlloc__Q34util17Delegate<Fv_b,64>12DelegateHeapFUll"
.4byte "allocatorFree__Q34util17Delegate<Fv_b,64>12DelegateHeapFPv"
.global __vt__Q34info8sequence11CommandAnim
__vt__Q34info8sequence11CommandAnim:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence11CommandAnimFv
.4byte start__Q34info8sequence11CommandAnimFv
.4byte proc__Q34info8sequence11CommandAnimFv
.global __vt__Q34info8sequence7Command
__vt__Q34info8sequence7Command:
.4byte 0
.4byte 0
.4byte __dt__Q34info8sequence7CommandFv
.4byte start__Q34info8sequence7CommandFv
.4byte proc__Q34info8sequence7CommandFv
.global "@56161_80457294"
"@56161_80457294":
.4byte 0x6261645F
.4byte 0x66756E63
.4byte 0x74696F6E
.4byte 0x5F63616C
.4byte 0x6C000000

View file

@ -851,9 +851,10 @@ $(BUILD_DIR)/asm/src/hid/Stick.o \
\
$(BUILD_DIR)/asm/src/info/Util.o \
\
$(BUILD_DIR)/asm/src/info/sequence/Sequence.o \
\
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \
$(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \
$(BUILD_DIR)/asm/src/Sequence_801a5b58.o \
$(BUILD_DIR)/asm/src/AddWiiRemote_801a701c.o \
$(BUILD_DIR)/asm/src/Button_801a7db0.o \
$(BUILD_DIR)/asm/src/ButtonHelp_801a830c.o \
@ -3138,7 +3139,6 @@ $(BUILD_DIR)/asm/src/SoundManager_80420f28.o \
$(BUILD_DIR)/asm/src/BackupFileData2_80420fc8.o
# .data
O_FILES += \
$(BUILD_DIR)/asm/src/Sequence_804571e8.o \
$(BUILD_DIR)/asm/src/AddWiiRemote_804572a8.o \
$(BUILD_DIR)/asm/src/Button_80457340.o \
$(BUILD_DIR)/asm/src/ButtonHelp_804573c8.o \