Update vscode stuff/work on CfObject headers

This commit is contained in:
Amber Brault 2024-06-22 17:20:48 -04:00
parent 3277344a90
commit 425f220e22
41 changed files with 833 additions and 692 deletions

View File

@ -1,21 +1,64 @@
{
"configurations": [
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/src",
"${workspaceFolder}/include",
"${workspaceFolder}/libs/CriWare/src",
"${workspaceFolder}/libs/monolib/include",
"${workspaceFolder}/libs/NdevExi2A/include",
"${workspaceFolder}/libs/nw4r/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include/stl",
"${workspaceFolder}/libs/RVL_SDK/include"
],
"cStandard": "c99",
"cppStandard": "c++98",
"intelliSenseMode": "linux-clang-x86",
"compilerPath": "",
"configurationProvider": "ms-vscode.makefile-tools",
"forcedInclude": [".vscode/warnings.h"]
},
{
"name": "Win32",
"includePath": [
"${workspaceFolder}/**",
"${vcpkgRoot}/x86-windows/include"
"${workspaceFolder}/src",
"${workspaceFolder}/include",
"${workspaceFolder}/libs/CriWare/src",
"${workspaceFolder}/libs/monolib/include",
"${workspaceFolder}/libs/NdevExi2A/include",
"${workspaceFolder}/libs/nw4r/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include/stl",
"${workspaceFolder}/libs/RVL_SDK/include"
],
"defines": [
"_DEBUG",
"UNICODE",
"_UNICODE"
"cStandard": "c99",
"cppStandard": "c++98",
"intelliSenseMode": "windows-clang-x86",
"compilerPath": "",
"configurationProvider": "ms-vscode.makefile-tools",
"forcedInclude": [".vscode/warnings.h"]
},
{
"name": "Mac",
"includePath": [
"${workspaceFolder}/src",
"${workspaceFolder}/include",
"${workspaceFolder}/libs/CriWare/src",
"${workspaceFolder}/libs/monolib/include",
"${workspaceFolder}/libs/NdevExi2A/include",
"${workspaceFolder}/libs/nw4r/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include",
"${workspaceFolder}/libs/PowerPC_EABI_Support/include/stl",
"${workspaceFolder}/libs/RVL_SDK/include"
],
"windowsSdkVersion": "10.0.19041.0",
"compilerPath": "cl.exe",
"cStandard": "c17",
"cppStandard": "c++17",
"intelliSenseMode": "windows-msvc-x64"
"cStandard": "c99",
"cppStandard": "c++98",
"intelliSenseMode": "macos-clang-x86",
"compilerPath": "",
"configurationProvider": "ms-vscode.makefile-tools",
"forcedInclude": [".vscode/warnings.h"]
}
],
"version": 4

14
.vscode/launch.json vendored Normal file
View File

@ -0,0 +1,14 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "F5 Anything: Custom Command",
"type": "f5anything",
"request": "launch",
"command": "ninja"
}
]
}

25
.vscode/settings.json vendored
View File

@ -1,11 +1,28 @@
{
"[c]": {
"files.encoding": "shiftjis"
"files.encoding": "shiftjis",
"editor.defaultFormatter": "ms-vscode.cpptools"
},
"[cpp]": {
"files.encoding": "shiftjis"
"files.encoding": "shiftjis",
"editor.defaultFormatter": "ms-vscode.cpptools"
},
"editor.tabSize": 4,
"files.exclude": {
"**/CVS": false
}
"**/CVS": false,
"**/*.ctx": true
},
"files.associations": {
"*.cp": "cpp",
"*.asm": "wla-dx-asm",
"__tuple": "c",
"array": "c",
"ppc_version.h": "c",
"bitset": "c",
"optional": "c",
"dstypes.h": "c",
"cc_gdev.h": "c",
"exception": "c",
"__locale": "cpp"
}
}

8
.vscode/warnings.h vendored Normal file
View File

@ -0,0 +1,8 @@
// disables the "too many characters in character constant" intellisense error, because we have u64 constants all over the place
#pragma diag_suppress 26
// disables the "invalid multibyte character sequence" error since we have to escape shift-jis misreads a lot
#pragma diag_suppress 870
// disables the "invalid arguments for operator new" error (thanks jsystem)
#pragma diag_suppress 1767
// disables the "invalid union member" error (thanks JASTrack)
#pragma diag_suppress 294

View File

@ -10685,30 +10685,30 @@
/* 8017ED68 00148328 4E 80 00 20 */ blr
.endfn CActorParam_vtableFunc21__Q22cf11CActorParamFv
.fn CBattleState_virtualFunc18__Q22cf11CActorParamFv, global
.fn CBattleState_vtableFunc18__Q22cf11CActorParamFv, global
/* 8017ED6C 0014832C 38 63 FF F8 */ addi r3, r3, -8
/* 8017ED70 00148330 4B FF E3 08 */ b CActorParam_vtableFunc180__Q22cf11CActorParamFv
.endfn CBattleState_virtualFunc18__Q22cf11CActorParamFv
.endfn CBattleState_vtableFunc18__Q22cf11CActorParamFv
.fn CBattleState_virtualFunc17__Q22cf11CActorParamFv, global
.fn CBattleState_vtableFunc17__Q22cf11CActorParamFv, global
/* 8017ED74 00148334 38 63 FF F8 */ addi r3, r3, -8
/* 8017ED78 00148338 4B FF E1 FC */ b CActorParam_vtableFunc179__Q22cf11CActorParamFv
.endfn CBattleState_virtualFunc17__Q22cf11CActorParamFv
.endfn CBattleState_vtableFunc17__Q22cf11CActorParamFv
.fn CBattleState_virtualFunc3__Q22cf11CActorParamFv, global
.fn CBattleState_vtableFunc3__Q22cf11CActorParamFv, global
/* 8017ED7C 0014833C 38 63 FF F8 */ addi r3, r3, -8
/* 8017ED80 00148340 4B FF 78 10 */ b CActorParam_vtableFunc1__Q22cf11CActorParamFv
.endfn CBattleState_virtualFunc3__Q22cf11CActorParamFv
.endfn CBattleState_vtableFunc3__Q22cf11CActorParamFv
.fn CBattleState_virtualFunc1__Q22cf11CActorParamFv, global
.fn CBattleState_vtableFunc1__Q22cf11CActorParamFv, global
/* 8017ED84 00148344 38 63 FF F8 */ addi r3, r3, -8
/* 8017ED88 00148348 4B FF 7D 60 */ b CActorParam_vtableFunc2__Q22cf11CActorParamFv
.endfn CBattleState_virtualFunc1__Q22cf11CActorParamFv
.endfn CBattleState_vtableFunc1__Q22cf11CActorParamFv
.fn CBattleState_virtualFunc2__Q22cf11CActorParamFv, global
.fn CBattleState_vtableFunc2__Q22cf11CActorParamFv, global
/* 8017ED8C 0014834C 38 63 FF F8 */ addi r3, r3, -8
/* 8017ED90 00148350 4B FD 67 44 */ b CActorParam_vtableFunc3__Q22cf11CActorParamFv
.endfn CBattleState_virtualFunc2__Q22cf11CActorParamFv
.endfn CBattleState_vtableFunc2__Q22cf11CActorParamFv
.section .rodata, "a" # 0x804F5B20 - 0x805281E0
@ -10831,42 +10831,42 @@
.obj __vt__Q22cf11CActorParam, global
.4byte __RTTI__Q22cf11CActorParam
.4byte 0
.4byte CActorState_virtualFunc1__Q22cf11CActorStateFv
.4byte CActorState_vtableFunc1__Q22cf11CActorStateFv
.4byte __RTTI__Q22cf11CActorParam
.4byte 0xFFFFFFF8
.4byte CBattleState_virtualFunc1__Q22cf11CActorParamFv
.4byte CBattleState_virtualFunc2__Q22cf11CActorParamFv
.4byte CBattleState_virtualFunc3__Q22cf11CActorParamFv
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc17__Q22cf11CActorParamFv
.4byte CBattleState_virtualFunc18__Q22cf11CActorParamFv
.4byte CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc1__Q22cf11CActorParamFv
.4byte CBattleState_vtableFunc2__Q22cf11CActorParamFv
.4byte CBattleState_vtableFunc3__Q22cf11CActorParamFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc17__Q22cf11CActorParamFv
.4byte CBattleState_vtableFunc18__Q22cf11CActorParamFv
.4byte CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.4byte CActorParam_vtableFunc1__Q22cf11CActorParamFv
.4byte CActorParam_vtableFunc2__Q22cf11CActorParamFv
.4byte CActorParam_vtableFunc3__Q22cf11CActorParamFv
@ -11054,7 +11054,7 @@
.obj __vt__Q22cf11CActorState, global
.4byte __RTTI__Q22cf11CActorState
.4byte 0
.4byte CActorState_virtualFunc1__Q22cf11CActorStateFv
.4byte CActorState_vtableFunc1__Q22cf11CActorStateFv
.endobj __vt__Q22cf11CActorState
.section .sdata2, "a" # 0x80668380 - 0x8066DCE0

View File

@ -659,11 +659,11 @@
/* 801463A0 0010F960 4E 80 00 20 */ blr
.endfn func_80146384
.fn CBattleState_virtualFunc19__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc19__Q22cf12CBattleStateFv, global
/* 801463A4 0010F964 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc5__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc5__Q22cf12CBattleStateFv, global
/* 801463A8 0010F968 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 801463AC 0010F96C 7C 08 02 A6 */ mflr r0
/* 801463B0 0010F970 90 01 00 24 */ stw r0, 0x24(r1)
@ -2117,18 +2117,18 @@
/* 80147778 00110D38 7C 08 03 A6 */ mtlr r0
/* 8014777C 00110D3C 38 21 00 20 */ addi r1, r1, 0x20
/* 80147780 00110D40 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc1__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc1__Q22cf12CBattleStateFv, global
/* 80147784 00110D44 38 60 00 00 */ li r3, 0
/* 80147788 00110D48 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc1__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc1__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc17__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc17__Q22cf12CBattleStateFv, global
/* 8014778C 00110D4C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc17__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc17__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc4__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc4__Q22cf12CBattleStateFv, global
/* 80147790 00110D50 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 80147794 00110D54 7C 08 02 A6 */ mflr r0
/* 80147798 00110D58 28 04 01 2F */ cmplwi r4, 0x12f
@ -2161,9 +2161,9 @@
/* 80147800 00110DC0 7C 08 03 A6 */ mtlr r0
/* 80147804 00110DC4 38 21 00 50 */ addi r1, r1, 0x50
/* 80147808 00110DC8 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc6__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc6__Q22cf12CBattleStateFv, global
/* 8014780C 00110DCC A0 C4 00 0C */ lhz r6, 0xc(r4)
/* 80147810 00110DD0 38 E0 00 01 */ li r7, 1
/* 80147814 00110DD4 38 A3 13 88 */ addi r5, r3, 0x1388
@ -2255,9 +2255,9 @@
/* 80147954 00110F14 38 A5 00 34 */ addi r5, r5, 0x34
/* 80147958 00110F18 42 00 FF 4C */ bdnz .L_801478A4
/* 8014795C 00110F1C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc26__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc26__Q22cf12CBattleStateFv, global
/* 80147960 00110F20 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80147964 00110F24 7C 08 02 A6 */ mflr r0
/* 80147968 00110F28 90 01 00 64 */ stw r0, 0x64(r1)
@ -2338,9 +2338,9 @@
/* 80147A80 00111040 7C 08 03 A6 */ mtlr r0
/* 80147A84 00111044 38 21 00 60 */ addi r1, r1, 0x60
/* 80147A88 00111048 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc29__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc29__Q22cf12CBattleStateFv, global
/* 80147A8C 0011104C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80147A90 00111050 7C 08 02 A6 */ mflr r0
/* 80147A94 00111054 90 01 00 24 */ stw r0, 0x24(r1)
@ -2441,9 +2441,9 @@
/* 80147BDC 0011119C 7C 08 03 A6 */ mtlr r0
/* 80147BE0 001111A0 38 21 00 20 */ addi r1, r1, 0x20
/* 80147BE4 001111A4 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc8__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc8__Q22cf12CBattleStateFv, global
/* 80147BE8 001111A8 94 21 FF A0 */ stwu r1, -0x60(r1)
/* 80147BEC 001111AC 7C 08 02 A6 */ mflr r0
/* 80147BF0 001111B0 90 01 00 64 */ stw r0, 0x64(r1)
@ -2747,13 +2747,13 @@
/* 80148004 001115C4 7C 08 03 A6 */ mtlr r0
/* 80148008 001115C8 38 21 00 60 */ addi r1, r1, 0x60
/* 8014800C 001115CC 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc18__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc18__Q22cf12CBattleStateFv, global
/* 80148010 001115D0 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc18__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc18__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc10__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc10__Q22cf12CBattleStateFv, global
/* 80148014 001115D4 94 21 FF 60 */ stwu r1, -0xa0(r1)
/* 80148018 001115D8 7C 08 02 A6 */ mflr r0
/* 8014801C 001115DC 90 01 00 A4 */ stw r0, 0xa4(r1)
@ -3064,9 +3064,9 @@
/* 8014844C 00111A0C 7C 08 03 A6 */ mtlr r0
/* 80148450 00111A10 38 21 00 A0 */ addi r1, r1, 0xa0
/* 80148454 00111A14 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc9__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc9__Q22cf12CBattleStateFv, global
/* 80148458 00111A18 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 8014845C 00111A1C 7C 08 02 A6 */ mflr r0
/* 80148460 00111A20 90 01 00 44 */ stw r0, 0x44(r1)
@ -3107,9 +3107,9 @@
/* 801484EC 00111AAC 7C 08 03 A6 */ mtlr r0
/* 801484F0 00111AB0 38 21 00 40 */ addi r1, r1, 0x40
/* 801484F4 00111AB4 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc7__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc7__Q22cf12CBattleStateFv, global
/* 801484F8 00111AB8 94 21 FF B0 */ stwu r1, -0x50(r1)
/* 801484FC 00111ABC 7C 08 02 A6 */ mflr r0
/* 80148500 00111AC0 28 04 01 2F */ cmplwi r4, 0x12f
@ -3146,9 +3146,9 @@
/* 80148578 00111B38 7C 08 03 A6 */ mtlr r0
/* 8014857C 00111B3C 38 21 00 50 */ addi r1, r1, 0x50
/* 80148580 00111B40 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc12__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc12__Q22cf12CBattleStateFv, global
/* 80148584 00111B44 28 04 01 2F */ cmplwi r4, 0x12f
/* 80148588 00111B48 4C 80 00 20 */ bgelr
/* 8014858C 00111B4C 2C 04 00 00 */ cmpwi r4, 0
@ -3167,9 +3167,9 @@
/* 801485B8 00111B78 38 63 00 34 */ addi r3, r3, 0x34
/* 801485BC 00111B7C 42 00 FF E4 */ bdnz .L_801485A0
/* 801485C0 00111B80 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc11__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc11__Q22cf12CBattleStateFv, global
/* 801485C4 00111B84 94 21 FF D0 */ stwu r1, -0x30(r1)
/* 801485C8 00111B88 7C 08 02 A6 */ mflr r0
/* 801485CC 00111B8C 90 01 00 34 */ stw r0, 0x34(r1)
@ -3276,35 +3276,35 @@
/* 8014872C 00111CEC 7C 08 03 A6 */ mtlr r0
/* 80148730 00111CF0 38 21 00 30 */ addi r1, r1, 0x30
/* 80148734 00111CF4 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc13__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc13__Q22cf12CBattleStateFv, global
/* 80148738 00111CF8 1C 04 00 34 */ mulli r0, r4, 0x34
/* 8014873C 00111CFC 7C 63 02 14 */ add r3, r3, r0
/* 80148740 00111D00 38 63 00 08 */ addi r3, r3, 8
/* 80148744 00111D04 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc14__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc14__Q22cf12CBattleStateFv, global
/* 80148748 00111D08 1C 04 00 34 */ mulli r0, r4, 0x34
/* 8014874C 00111D0C 7C 63 02 14 */ add r3, r3, r0
/* 80148750 00111D10 38 63 00 08 */ addi r3, r3, 8
/* 80148754 00111D14 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc15__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc15__Q22cf12CBattleStateFv, global
/* 80148758 00111D18 1C 04 00 34 */ mulli r0, r4, 0x34
/* 8014875C 00111D1C 7C 63 02 14 */ add r3, r3, r0
/* 80148760 00111D20 38 63 06 88 */ addi r3, r3, 0x688
/* 80148764 00111D24 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc16__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc16__Q22cf12CBattleStateFv, global
/* 80148768 00111D28 1C 04 00 34 */ mulli r0, r4, 0x34
/* 8014876C 00111D2C 7C 63 02 14 */ add r3, r3, r0
/* 80148770 00111D30 38 63 0D 08 */ addi r3, r3, 0xd08
/* 80148774 00111D34 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.fn func_80148778, global
/* 80148778 00111D38 94 21 FF D0 */ stwu r1, -0x30(r1)
@ -4298,14 +4298,14 @@
/* 8014948C 00112A4C 4E 80 00 20 */ blr
.endfn func_80149330
.fn CBattleState_virtualFunc30__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc30__Q22cf12CBattleStateFv, global
/* 80149490 00112A50 A0 03 00 04 */ lhz r0, 4(r3)
/* 80149494 00112A54 7C 00 23 78 */ or r0, r0, r4
/* 80149498 00112A58 B0 03 00 04 */ sth r0, 4(r3)
/* 8014949C 00112A5C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc31__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc31__Q22cf12CBattleStateFv, global
/* 801494A0 00112A60 28 04 01 2F */ cmplwi r4, 0x12f
/* 801494A4 00112A64 41 80 00 0C */ blt .L_801494B0
/* 801494A8 00112A68 38 60 00 00 */ li r3, 0
@ -4418,16 +4418,16 @@
/* 801495F4 00112BB4 7C 00 1B 78 */ or r0, r0, r3
/* 801495F8 00112BB8 54 03 0F FE */ srwi r3, r0, 0x1f
/* 801495FC 00112BBC 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc32__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc32__Q22cf12CBattleStateFv, global
/* 80149600 00112BC0 A0 03 00 06 */ lhz r0, 6(r3)
/* 80149604 00112BC4 7C 00 23 78 */ or r0, r0, r4
/* 80149608 00112BC8 B0 03 00 06 */ sth r0, 6(r3)
/* 8014960C 00112BCC 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc33__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc33__Q22cf12CBattleStateFv, global
/* 80149610 00112BD0 28 04 01 2F */ cmplwi r4, 0x12f
/* 80149614 00112BD4 41 80 00 0C */ blt .L_80149620
/* 80149618 00112BD8 38 60 00 00 */ li r3, 0
@ -4540,17 +4540,17 @@
/* 80149764 00112D24 7C 00 1B 78 */ or r0, r0, r3
/* 80149768 00112D28 54 03 0F FE */ srwi r3, r0, 0x1f
/* 8014976C 00112D2C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc3__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc3__Q22cf12CBattleStateFv, global
/* 80149770 00112D30 38 6D 89 C0 */ addi r3, r13, lbl_80664B40@sda21
/* 80149774 00112D34 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc3__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc3__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc2__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc2__Q22cf12CBattleStateFv, global
/* 80149778 00112D38 38 60 00 00 */ li r3, 0
/* 8014977C 00112D3C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc2__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc2__Q22cf12CBattleStateFv
.section .rodata, "a" # 0x804F5B20 - 0x805281E0
@ -4571,39 +4571,39 @@
.obj __vt__Q22cf12CBattleState, global
.4byte __RTTI__Q22cf12CBattleState
.4byte 0
.4byte CBattleState_virtualFunc1__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc2__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc3__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc17__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc18__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc1__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc2__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc3__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc17__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc18__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.4byte 0
.endobj __vt__Q22cf12CBattleState
@ -4754,63 +4754,63 @@
.obj "@eti_800282E0", local
.hidden "@eti_800282E0"
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte 0x000013DC
.4byte "@etb_8000CFFC"
.endobj "@eti_800282E0"
.obj "@eti_800282EC", local
.hidden "@eti_800282EC"
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte 0x0000007C
.4byte "@etb_8000D004"
.endobj "@eti_800282EC"
.obj "@eti_800282F8", local
.hidden "@eti_800282F8"
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte 0x0000012C
.4byte "@etb_8000D00C"
.endobj "@eti_800282F8"
.obj "@eti_80028304", local
.hidden "@eti_80028304"
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte 0x0000015C
.4byte "@etb_8000D014"
.endobj "@eti_80028304"
.obj "@eti_80028310", local
.hidden "@eti_80028310"
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte 0x00000428
.4byte "@etb_8000D01C"
.endobj "@eti_80028310"
.obj "@eti_8002831C", local
.hidden "@eti_8002831C"
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte 0x00000444
.4byte "@etb_8000D024"
.endobj "@eti_8002831C"
.obj "@eti_80028328", local
.hidden "@eti_80028328"
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte 0x000000A0
.4byte "@etb_8000D02C"
.endobj "@eti_80028328"
.obj "@eti_80028334", local
.hidden "@eti_80028334"
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte 0x0000008C
.4byte "@etb_8000D034"
.endobj "@eti_80028334"
.obj "@eti_80028340", local
.hidden "@eti_80028340"
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte 0x00000174
.4byte "@etb_8000D03C"
.endobj "@eti_80028340"

View File

@ -1909,7 +1909,7 @@
/* 8020A388 001D3948 38 80 40 00 */ li r4, 0x4000
/* 8020A38C 001D394C 38 A0 00 00 */ li r5, 0
/* 8020A390 001D3950 38 C0 00 00 */ li r6, 0
/* 8020A394 001D3954 4B EA 7D 21 */ bl __ct__Q22cf11CfObjectMapFv
/* 8020A394 001D3954 4B EA 7D 21 */ bl func_800B20B4
/* 8020A398 001D3958 2C 03 00 00 */ cmpwi r3, 0
/* 8020A39C 001D395C 7C 7F 1B 78 */ mr r31, r3
/* 8020A3A0 001D3960 41 82 00 70 */ beq .L_8020A410
@ -2212,7 +2212,7 @@
/* 8020A7D8 001D3D98 38 80 40 00 */ li r4, 0x4000
/* 8020A7DC 001D3D9C 38 A0 00 00 */ li r5, 0
/* 8020A7E0 001D3DA0 38 C0 00 00 */ li r6, 0
/* 8020A7E4 001D3DA4 4B EA 78 D1 */ bl __ct__Q22cf11CfObjectMapFv
/* 8020A7E4 001D3DA4 4B EA 78 D1 */ bl func_800B20B4
/* 8020A7E8 001D3DA8 2C 03 00 00 */ cmpwi r3, 0
/* 8020A7EC 001D3DAC 7C 7E 1B 78 */ mr r30, r3
/* 8020A7F0 001D3DB0 41 82 00 6C */ beq .L_8020A85C

View File

@ -886,7 +886,7 @@
/* 802066FC 001CFCBC 38 80 40 00 */ li r4, 0x4000
/* 80206700 001CFCC0 38 A0 00 00 */ li r5, 0
/* 80206704 001CFCC4 38 C0 00 00 */ li r6, 0
/* 80206708 001CFCC8 4B EA B9 AD */ bl __ct__Q22cf11CfObjectMapFv
/* 80206708 001CFCC8 4B EA B9 AD */ bl func_800B20B4
/* 8020670C 001CFCCC 2C 03 00 00 */ cmpwi r3, 0
/* 80206710 001CFCD0 7C 7D 1B 78 */ mr r29, r3
/* 80206714 001CFCD4 41 82 00 AC */ beq .L_802067C0

View File

@ -49,7 +49,7 @@
.fn CActorParam_vtableFunc1__Q22cf13CfObjectActorFv, global
/* 8016FF0C 001394CC 38 63 3E 9C */ addi r3, r3, 0x3e9c
/* 8016FF10 001394D0 4B F4 E1 E4 */ b CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
/* 8016FF10 001394D0 4B F4 E1 E4 */ b CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.endfn CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.fn func_8016FF14, global
@ -2709,42 +2709,42 @@
.obj __vt__Q22cf13CfObjectActor, global
.4byte __RTTI__Q22cf13CfObjectActor
.4byte 0
.4byte CActorState_virtualFunc1__Q22cf11CActorStateFv
.4byte CActorState_vtableFunc1__Q22cf11CActorStateFv
.4byte __RTTI__Q22cf13CfObjectActor
.4byte 0xFFFFFFF8
.4byte CBattleState_virtualFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.4byte CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc3__Q22cf13CfObjectActorFv
@ -2932,25 +2932,25 @@
.4byte CAIAction_vtableFunc2__Q22cf9CAIActionFv
.4byte __RTTI__Q22cf13CfObjectActor
.4byte 0xFFFFC164
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte func_801725DC__Q22cf13CfObjectActorFv
.4byte CfObject_vtableFunc2__Q22cf13CfObjectModelFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -1482,25 +1482,25 @@
.obj __vt__Q22cf12CfObjectColl, global
.4byte __RTTI__Q22cf12CfObjectColl
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte func_800C136C__Q22cf13CfObjectPointFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf12CfObjectCollFv
.4byte func_800AB3EC__Q22cf12CfObjectCollFv
.4byte func_800AB498__Q22cf12CfObjectCollFv

View File

@ -2,7 +2,7 @@
.section .text, "ax" # 0x80039220 - 0x804F5900
.fn __ct__800AC62C, global
.fn __ct__Q22cf11CfObjectEffFv, global
/* 800AC62C 00075BEC 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800AC630 00075BF0 7C 08 02 A6 */ mflr r0
/* 800AC634 00075BF4 3D 80 80 53 */ lis r12, __vt__Q22cf8CfObject@ha
@ -80,7 +80,7 @@
/* 800AC750 00075D10 7C 08 03 A6 */ mtlr r0
/* 800AC754 00075D14 38 21 00 10 */ addi r1, r1, 0x10
/* 800AC758 00075D18 4E 80 00 20 */ blr
.endfn __ct__800AC62C
.endfn __ct__Q22cf11CfObjectEffFv
.fn CfObject_vtableFunc3__Q22cf8CfObjectFv, global
/* 800AC75C 00075D1C 4E 80 00 20 */ blr
@ -1435,25 +1435,25 @@
.obj __vt__Q22cf11CfObjectEff, global
.4byte __RTTI__Q22cf11CfObjectEff
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf11CfObjectEffFv
.4byte func_800AC7CC__Q22cf11CfObjectEffFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv
@ -1727,7 +1727,7 @@
.obj "@eti_80024D10", local
.hidden "@eti_80024D10"
.4byte __ct__800AC62C
.4byte __ct__Q22cf11CfObjectEffFv
.4byte 0x00000130
.4byte "@etb_80009480"
.endobj "@eti_80024D10"

View File

@ -2337,32 +2337,32 @@
/* 800AFB00 000790C0 4E 80 00 20 */ blr
.endfn CActorParam_vtableFunc2__Q22cf13CfObjectActorFv
.fn CActorState_virtualFunc1__Q22cf11CActorStateFv, global
.fn CActorState_vtableFunc1__Q22cf11CActorStateFv, global
/* 800AFB04 000790C4 80 63 00 04 */ lwz r3, 4(r3)
/* 800AFB08 000790C8 81 83 00 00 */ lwz r12, 0(r3)
/* 800AFB0C 000790CC 81 8C 00 38 */ lwz r12, 0x38(r12)
/* 800AFB10 000790D0 7D 89 03 A6 */ mtctr r12
/* 800AFB14 000790D4 4E 80 04 20 */ bctr
.endfn CActorState_virtualFunc1__Q22cf11CActorStateFv
.endfn CActorState_vtableFunc1__Q22cf11CActorStateFv
.fn CBattleState_virtualFunc28__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc28__Q22cf12CBattleStateFv, global
/* 800AFB18 000790D8 54 80 20 36 */ slwi r0, r4, 4
/* 800AFB1C 000790DC 7C 63 02 14 */ add r3, r3, r0
/* 800AFB20 000790E0 38 63 15 2C */ addi r3, r3, 0x152c
/* 800AFB24 000790E4 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc27__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc27__Q22cf12CBattleStateFv, global
/* 800AFB28 000790E8 38 63 15 2C */ addi r3, r3, 0x152c
/* 800AFB2C 000790EC 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc25__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc25__Q22cf12CBattleStateFv, global
/* 800AFB30 000790F0 38 63 00 08 */ addi r3, r3, 8
/* 800AFB34 000790F4 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc24__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc24__Q22cf12CBattleStateFv, global
/* 800AFB38 000790F8 38 00 02 A4 */ li r0, 0x2a4
/* 800AFB3C 000790FC 38 A3 00 04 */ addi r5, r3, 4
/* 800AFB40 00079100 38 84 FF FC */ addi r4, r4, -4
@ -2374,35 +2374,35 @@
/* 800AFB54 00079114 94 05 00 08 */ stwu r0, 8(r5)
/* 800AFB58 00079118 42 00 FF F0 */ bdnz .L_800AFB48
/* 800AFB5C 0007911C 4E 80 00 20 */ blr
.endfn CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc23__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc23__Q22cf12CBattleStateFv, global
/* 800AFB60 00079120 81 83 00 00 */ lwz r12, 0(r3)
/* 800AFB64 00079124 81 8C 00 44 */ lwz r12, 0x44(r12)
/* 800AFB68 00079128 7D 89 03 A6 */ mtctr r12
/* 800AFB6C 0007912C 4E 80 04 20 */ bctr
.endfn CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc22__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc22__Q22cf12CBattleStateFv, global
/* 800AFB70 00079130 81 83 00 00 */ lwz r12, 0(r3)
/* 800AFB74 00079134 81 8C 00 40 */ lwz r12, 0x40(r12)
/* 800AFB78 00079138 7D 89 03 A6 */ mtctr r12
/* 800AFB7C 0007913C 4E 80 04 20 */ bctr
.endfn CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc21__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc21__Q22cf12CBattleStateFv, global
/* 800AFB80 00079140 81 83 00 00 */ lwz r12, 0(r3)
/* 800AFB84 00079144 81 8C 00 3C */ lwz r12, 0x3c(r12)
/* 800AFB88 00079148 7D 89 03 A6 */ mtctr r12
/* 800AFB8C 0007914C 4E 80 04 20 */ bctr
.endfn CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.fn CBattleState_virtualFunc20__Q22cf12CBattleStateFv, global
.fn CBattleState_vtableFunc20__Q22cf12CBattleStateFv, global
/* 800AFB90 00079150 81 83 00 00 */ lwz r12, 0(r3)
/* 800AFB94 00079154 81 8C 00 38 */ lwz r12, 0x38(r12)
/* 800AFB98 00079158 7D 89 03 A6 */ mtctr r12
/* 800AFB9C 0007915C 4E 80 04 20 */ bctr
.endfn CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.endfn CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.fn CActorParam_vtableFunc181__Q22cf11CActorParamFv, global
/* 800AFBA0 00079160 90 83 2A 80 */ stw r4, 0x2a80(r3)
@ -3359,35 +3359,35 @@
/* 800B0630 00079BF0 4E 80 00 20 */ blr
.endfn CfObjectActor_vtableFunc12__Q22cf13CfObjectActorFv
.fn CBattleState_virtualFunc18__Q22cf13CfObjectActorFv, global
.fn CBattleState_vtableFunc18__Q22cf13CfObjectActorFv, global
/* 800B0634 00079BF4 38 63 FF F8 */ addi r3, r3, -8
/* 800B0638 00079BF8 48 0C 10 80 */ b CActorParam_vtableFunc180__Q22cf13CfObjectActorFv
.endfn CBattleState_virtualFunc18__Q22cf13CfObjectActorFv
.endfn CBattleState_vtableFunc18__Q22cf13CfObjectActorFv
.fn CBattleState_virtualFunc17__Q22cf13CfObjectActorFv, global
.fn CBattleState_vtableFunc17__Q22cf13CfObjectActorFv, global
/* 800B063C 00079BFC 38 63 FF F8 */ addi r3, r3, -8
/* 800B0640 00079C00 48 0C 0F 68 */ b CActorParam_vtableFunc179__Q22cf13CfObjectActorFv
.endfn CBattleState_virtualFunc17__Q22cf13CfObjectActorFv
.endfn CBattleState_vtableFunc17__Q22cf13CfObjectActorFv
.fn CBattleState_virtualFunc3__Q22cf13CfObjectActorFv, global
.fn CBattleState_vtableFunc3__Q22cf13CfObjectActorFv, global
/* 800B0644 00079C04 38 63 FF F8 */ addi r3, r3, -8
/* 800B0648 00079C08 48 0B F8 C4 */ b CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.endfn CBattleState_virtualFunc3__Q22cf13CfObjectActorFv
.endfn CBattleState_vtableFunc3__Q22cf13CfObjectActorFv
.fn CBattleState_virtualFunc1__Q22cf13CfObjectActorFv, global
.fn CBattleState_vtableFunc1__Q22cf13CfObjectActorFv, global
/* 800B064C 00079C0C 38 63 FF F8 */ addi r3, r3, -8
/* 800B0650 00079C10 4B FF F4 B0 */ b CActorParam_vtableFunc2__Q22cf13CfObjectActorFv
.endfn CBattleState_virtualFunc1__Q22cf13CfObjectActorFv
.endfn CBattleState_vtableFunc1__Q22cf13CfObjectActorFv
.fn CBattleState_virtualFunc2__Q22cf13CfObjectActorFv, global
.fn CBattleState_vtableFunc2__Q22cf13CfObjectActorFv, global
/* 800B0654 00079C14 38 63 FF F8 */ addi r3, r3, -8
/* 800B0658 00079C18 4B FF F4 A4 */ b CActorParam_vtableFunc3__Q22cf13CfObjectActorFv
.endfn CBattleState_virtualFunc2__Q22cf13CfObjectActorFv
.endfn CBattleState_vtableFunc2__Q22cf13CfObjectActorFv
.fn CObjectParam_virtualFunc4__Q22cf11CfObjectEneFv, global
.fn CObjectParam_vtableFunc4__Q22cf11CfObjectEneFv, global
/* 800B065C 00079C1C 38 63 C1 64 */ addi r3, r3, -16028
/* 800B0660 00079C20 4B FF D7 48 */ b func_800ADDA8__Q22cf11CfObjectEneFv
.endfn CObjectParam_virtualFunc4__Q22cf11CfObjectEneFv
.endfn CObjectParam_vtableFunc4__Q22cf11CfObjectEneFv
.fn CfObject_vtableFunc31__Q22cf13CfObjectActorFv, global
/* 800B0664 00079C24 38 63 C1 64 */ addi r3, r3, -16028
@ -3404,10 +3404,10 @@
/* 800B0678 00079C38 4B FF F4 7C */ b CfObjectActor_vtableFunc2__Q22cf13CfObjectActorFv
.endfn CfObjectMove_vtableFunc15__Q22cf13CfObjectActorFv
.fn CObjectParam_virtualFunc2__Q22cf13CfObjectActorFv, global
.fn CObjectParam_vtableFunc2__Q22cf13CfObjectActorFv, global
/* 800B067C 00079C3C 38 63 C1 64 */ addi r3, r3, -16028
/* 800B0680 00079C40 48 0B F8 8C */ b CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.endfn CObjectParam_virtualFunc2__Q22cf13CfObjectActorFv
.endfn CObjectParam_vtableFunc2__Q22cf13CfObjectActorFv
.fn CfObjectMove_vtableFunc6__Q22cf13CfObjectActorFv, global
/* 800B0684 00079C44 38 63 C1 64 */ addi r3, r3, -16028
@ -3551,42 +3551,42 @@
.obj __vt__Q22cf11CfObjectEne, global
.4byte __RTTI__Q22cf11CfObjectEne
.4byte 0
.4byte CActorState_virtualFunc1__Q22cf11CActorStateFv
.4byte CActorState_vtableFunc1__Q22cf11CActorStateFv
.4byte __RTTI__Q22cf11CfObjectEne
.4byte 0xFFFFFFF8
.4byte CBattleState_virtualFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.4byte CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc3__Q22cf13CfObjectActorFv
@ -3774,25 +3774,25 @@
.4byte CAIAction_vtableFunc2__Q22cf9CAIActionFv
.4byte __RTTI__Q22cf11CfObjectEne
.4byte 0xFFFFC164
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf11CfObjectEneFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf11CfObjectEneFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte func_800B069C__Q22cf11CfObjectEneFv
.4byte CfObject_vtableFunc2__Q22cf11CfObjectEneFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -1020,25 +1020,25 @@
.obj __vt__Q22cf11CfObjectMap, global
.4byte __RTTI__Q22cf11CfObjectMap
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf11CfObjectMapFv
.4byte func_800B9A70__Q22cf11CfObjectMapFv
.4byte func_800B9C64__Q22cf11CfObjectMapFv

View File

@ -1041,7 +1041,7 @@
/* 800BB590 00084B50 4E 80 00 20 */ blr
.endfn CfObject_vtableFunc55__Q22cf13CfObjectModelFv
.fn CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv, global
.fn CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv, global
/* 800BB594 00084B54 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800BB598 00084B58 7C 08 02 A6 */ mflr r0
/* 800BB59C 00084B5C 90 01 00 14 */ stw r0, 0x14(r1)
@ -1067,7 +1067,7 @@
/* 800BB5E4 00084BA4 7C 08 03 A6 */ mtlr r0
/* 800BB5E8 00084BA8 38 21 00 10 */ addi r1, r1, 0x10
/* 800BB5EC 00084BAC 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv
.endfn CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv
.fn CfObjectModel_vtableFunc3__Q22cf13CfObjectModelFv, global
/* 800BB5F0 00084BB0 80 63 00 98 */ lwz r3, 0x98(r3)
@ -1597,25 +1597,25 @@
.obj __vt__Q22cf13CfObjectModel, global
.4byte __RTTI__Q22cf13CfObjectModel
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf13CfObjectModelFv
.4byte CfObject_vtableFunc2__Q22cf13CfObjectModelFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv
@ -1715,25 +1715,25 @@
.obj __vt__Q22cf8CfObject, global
.4byte __RTTI__Q22cf8CfObject
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf8CfObjectFv
.4byte 0
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv
@ -2272,7 +2272,7 @@
.obj "@eti_80025730", local
.hidden "@eti_80025730"
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv
.4byte 0x0000005C
.4byte "@etb_80009C54"
.endobj "@eti_80025730"

View File

@ -2644,9 +2644,9 @@
/* 800BE0F0 000876B0 4E 80 00 20 */ blr
.endfn CfObjectMove_vtableFunc4__Q22cf12CfObjectMoveFv
.fn CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv, global
/* 800BE0F4 000876B4 4B FF D4 A0 */ b CObjectParam_virtualFunc2__Q22cf13CfObjectModelFv
.endfn CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
.fn CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv, global
/* 800BE0F4 000876B4 4B FF D4 A0 */ b CObjectParam_vtableFunc2__Q22cf13CfObjectModelFv
.endfn CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.fn func_800BE0F8, global
/* 800BE0F8 000876B8 80 A3 00 98 */ lwz r5, 0x98(r3)
@ -4124,25 +4124,25 @@
.obj __vt__Q22cf12CfObjectMove, global
.4byte __RTTI__Q22cf12CfObjectMove
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf12CfObjectMoveFv
.4byte CfObject_vtableFunc2__Q22cf13CfObjectModelFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -469,25 +469,25 @@
.obj __vt__Q22cf11CfObjectNpc, global
.4byte __RTTI__Q22cf11CfObjectNpc
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte func_800BF764__Q22cf11CfObjectNpcFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf11CfObjectNpcFv
.4byte func_800BF46C__Q22cf11CfObjectNpcFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -267,25 +267,25 @@
.obj __vt__Q22cf11CfObjectObj, global
.4byte __RTTI__Q22cf11CfObjectObj
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte func_800BFAAC__Q22cf11CfObjectObjFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__800BFA14
.4byte func_800BFA88__Q22cf11CfObjectObjFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -1514,10 +1514,10 @@
/* 800C11EC 0008A7AC 4E 80 00 20 */ blr
.endfn func_800C11CC__Q22cf10CfObjectPcFv
.fn CObjectParam_virtualFunc4__Q22cf10CfObjectPcFv, global
.fn CObjectParam_vtableFunc4__Q22cf10CfObjectPcFv, global
/* 800C11F0 0008A7B0 38 63 C1 64 */ addi r3, r3, -16028
/* 800C11F4 0008A7B4 4B FF EE CC */ b func_800C00C0__Q22cf10CfObjectPcFv
.endfn CObjectParam_virtualFunc4__Q22cf10CfObjectPcFv
.endfn CObjectParam_vtableFunc4__Q22cf10CfObjectPcFv
.fn CfObject_vtableFunc3__Q22cf10CfObjectPcFv, global
/* 800C11F8 0008A7B8 38 63 C1 64 */ addi r3, r3, -16028
@ -1610,42 +1610,42 @@
.obj __vt__Q22cf10CfObjectPc, global
.4byte __RTTI__Q22cf10CfObjectPc
.4byte 0
.4byte CActorState_virtualFunc1__Q22cf11CActorStateFv
.4byte CActorState_vtableFunc1__Q22cf11CActorStateFv
.4byte __RTTI__Q22cf10CfObjectPc
.4byte 0xFFFFFFF8
.4byte CBattleState_virtualFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_virtualFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_virtualFunc33__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc3__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc4__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc5__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc6__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc7__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc8__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc9__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc10__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc11__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc12__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc13__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc14__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc15__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc16__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc17__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc18__Q22cf13CfObjectActorFv
.4byte CBattleState_vtableFunc19__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc20__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc21__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc22__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc23__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc24__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc25__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc26__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc27__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc28__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc29__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc30__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc31__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc32__Q22cf12CBattleStateFv
.4byte CBattleState_vtableFunc33__Q22cf12CBattleStateFv
.4byte CActorParam_vtableFunc1__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CActorParam_vtableFunc3__Q22cf13CfObjectActorFv
@ -1833,25 +1833,25 @@
.4byte CAIAction_vtableFunc2__Q22cf9CAIActionFv
.4byte __RTTI__Q22cf10CfObjectPc
.4byte 0xFFFFC164
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf10CfObjectPcFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf13CfObjectActorFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf10CfObjectPcFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte func_800C1220__Q22cf10CfObjectPcFv
.4byte CfObject_vtableFunc2__Q22cf10CfObjectPcFv
.4byte CfObject_vtableFunc3__Q22cf10CfObjectPcFv

View File

@ -411,25 +411,25 @@
.obj __vt__Q22cf13CfObjectPoint, global
.4byte __RTTI__Q22cf13CfObjectPoint
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte func_800C136C__Q22cf13CfObjectPointFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf13CfObjectPointFv
.4byte func_800C1244__Q22cf13CfObjectPointFv
.4byte func_800C1324__Q22cf13CfObjectPointFv

View File

@ -121,25 +121,25 @@
.obj __vt__Q22cf12CfObjectTbox, global
.4byte __RTTI__Q22cf12CfObjectTbox
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CfObjectMoveFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte func_800BFAAC__Q22cf11CfObjectObjFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.4byte __dt__Q22cf12CfObjectTboxFv
.4byte func_800BFA88__Q22cf11CfObjectObjFv
.4byte CfObject_vtableFunc3__Q22cf8CfObjectFv

View File

@ -1230,7 +1230,7 @@
/* 80094898 0005DE58 4E 80 00 20 */ blr
.endfn func_80093F28
.fn CObjectState_virtualFunc5__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc5__Q22cf12CObjectStateFv, global
/* 8009489C 0005DE5C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 800948A0 0005DE60 7C 08 02 A6 */ mflr r0
/* 800948A4 0005DE64 28 04 00 3F */ cmplwi r4, 0x3f
@ -1255,7 +1255,7 @@
/* 800948EC 0005DEAC 7C 08 03 A6 */ mtlr r0
/* 800948F0 0005DEB0 38 21 00 10 */ addi r1, r1, 0x10
/* 800948F4 0005DEB4 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.fn func_800948F8, global
/* 800948F8 0005DEB8 7C 04 28 50 */ subf r0, r4, r5
@ -4097,7 +4097,7 @@
.obj "@eti_80024380", local
.hidden "@eti_80024380"
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte 0x0000005C
.4byte "@etb_80008D14"
.endobj "@eti_80024380"

View File

@ -6699,36 +6699,36 @@
/* 800A3484 0006CA44 4E 80 00 20 */ blr
.endfn func_800A33C8
.fn CObjectState_virtualFunc13__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc13__Q22cf12CObjectStateFv, global
/* 800A3488 0006CA48 80 03 00 08 */ lwz r0, 8(r3)
/* 800A348C 0006CA4C 90 03 00 0C */ stw r0, 0xc(r3)
/* 800A3490 0006CA50 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.fn CObjectState_virtualFunc12__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc12__Q22cf12CObjectStateFv, global
/* 800A3494 0006CA54 38 63 00 0C */ addi r3, r3, 0xc
/* 800A3498 0006CA58 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.fn CObjectState_virtualFunc6__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc6__Q22cf12CObjectStateFv, global
/* 800A349C 0006CA5C 38 00 00 00 */ li r0, 0
/* 800A34A0 0006CA60 90 03 00 08 */ stw r0, 8(r3)
/* 800A34A4 0006CA64 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.fn CObjectState_virtualFunc4__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc4__Q22cf12CObjectStateFv, global
/* 800A34A8 0006CA68 38 00 00 00 */ li r0, 0
/* 800A34AC 0006CA6C 90 03 00 04 */ stw r0, 4(r3)
/* 800A34B0 0006CA70 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.fn CObjectParam_virtualFunc3__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc3__Q22cf12CObjectParamFv, global
/* 800A34B4 0006CA74 80 63 00 30 */ lwz r3, 0x30(r3)
/* 800A34B8 0006CA78 7C 03 00 D0 */ neg r0, r3
/* 800A34BC 0006CA7C 7C 00 1B 78 */ or r0, r0, r3
/* 800A34C0 0006CA80 54 03 0F FE */ srwi r3, r0, 0x1f
/* 800A34C4 0006CA84 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.fn func_800A34C8, global
/* 800A34C8 0006CA88 38 00 00 00 */ li r0, 0
@ -7383,43 +7383,43 @@
.obj __vt__Q22cf12CObjectParam, global
.4byte __RTTI__Q22cf12CObjectParam
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc3__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.endobj __vt__Q22cf12CObjectParam
.obj __vt__Q22cf12CObjectState, global
.4byte __RTTI__Q22cf12CObjectState
.4byte 0
.4byte CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_virtualFunc13__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc4__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc5__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc6__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc12__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc13__Q22cf12CObjectStateFv
.endobj __vt__Q22cf12CObjectState

View File

@ -5117,11 +5117,11 @@
/* 8008063C 00049BFC 4E 80 00 20 */ blr
.endfn __dt__Q22cf14CfObjectImplPcFv
.fn CObjectParam_virtualFunc4__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc4__Q22cf12CObjectParamFv, global
/* 80080640 00049C00 38 00 00 00 */ li r0, 0
/* 80080644 00049C04 90 03 00 34 */ stw r0, 0x34(r3)
/* 80080648 00049C08 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc4__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc4__Q22cf12CObjectParamFv
.fn func_8008064C, global
/* 8008064C 00049C0C 94 21 FF B0 */ stwu r1, -0x50(r1)
@ -12540,12 +12540,12 @@
/* 80086B48 00050108 4B FE 33 58 */ b func_80069EA0
.endfn func_80086B48
.fn CObjectState_virtualFunc7__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc7__Q22cf12CObjectStateFv, global
/* 80086B4C 0005010C 80 03 00 08 */ lwz r0, 8(r3)
/* 80086B50 00050110 7C 00 20 78 */ andc r0, r0, r4
/* 80086B54 00050114 90 03 00 08 */ stw r0, 8(r3)
/* 80086B58 00050118 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc7__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc7__Q22cf12CObjectStateFv
.fn func_80086B5C, global
/* 80086B5C 0005011C 94 21 FF D0 */ stwu r1, -0x30(r1)

View File

@ -1989,7 +1989,7 @@
/* 800B20B0 0007B670 4E 80 00 20 */ blr
.endfn func_800B20A0
.fn __ct__Q22cf11CfObjectMapFv, global
.fn func_800B20B4, global
/* 800B20B4 0007B674 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 800B20B8 0007B678 7C 08 02 A6 */ mflr r0
/* 800B20BC 0007B67C 90 01 00 44 */ stw r0, 0x44(r1)
@ -2614,7 +2614,7 @@
/* 800B2990 0007BF50 48 38 20 CD */ bl heap_malloc__3mtlFUli
/* 800B2994 0007BF54 2C 03 00 00 */ cmpwi r3, 0
/* 800B2998 0007BF58 41 82 00 08 */ beq .L_800B29A0
/* 800B299C 0007BF5C 4B FF 9C 91 */ bl __ct__800AC62C
/* 800B299C 0007BF5C 4B FF 9C 91 */ bl __ct__Q22cf11CfObjectEffFv
.L_800B29A0:
/* 800B29A0 0007BF60 7C 7F 1B 78 */ mr r31, r3
.L_800B29A4:
@ -2860,7 +2860,7 @@
/* 800B2D1C 0007C2DC 7C 08 03 A6 */ mtlr r0
/* 800B2D20 0007C2E0 38 21 00 40 */ addi r1, r1, 0x40
/* 800B2D24 0007C2E4 4E 80 00 20 */ blr
.endfn __ct__Q22cf11CfObjectMapFv
.endfn func_800B20B4
.fn func_800B2D28, global
/* 800B2D28 0007C2E8 80 63 00 04 */ lwz r3, 4(r3)
@ -10514,7 +10514,7 @@
/* 800B9500 00082AC0 38 A1 00 08 */ addi r5, r1, 8
/* 800B9504 00082AC4 38 80 02 00 */ li r4, 0x200
/* 800B9508 00082AC8 38 C0 00 00 */ li r6, 0
/* 800B950C 00082ACC 4B FF 8B A9 */ bl __ct__Q22cf11CfObjectMapFv
/* 800B950C 00082ACC 4B FF 8B A9 */ bl func_800B20B4
/* 800B9510 00082AD0 80 01 00 44 */ lwz r0, 0x44(r1)
/* 800B9514 00082AD4 83 E1 00 3C */ lwz r31, 0x3c(r1)
/* 800B9518 00082AD8 7C 08 03 A6 */ mtlr r0
@ -10543,7 +10543,7 @@
/* 800B955C 00082B1C 38 A0 00 00 */ li r5, 0
/* 800B9560 00082B20 38 84 80 00 */ addi r4, r4, -0x8000
/* 800B9564 00082B24 38 C0 00 00 */ li r6, 0
/* 800B9568 00082B28 4B FF 8B 4D */ bl __ct__Q22cf11CfObjectMapFv
/* 800B9568 00082B28 4B FF 8B 4D */ bl func_800B20B4
/* 800B956C 00082B2C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 800B9570 00082B30 7C 08 03 A6 */ mtlr r0
/* 800B9574 00082B34 38 21 00 10 */ addi r1, r1, 0x10
@ -10584,7 +10584,7 @@
/* 800B95F4 00082BB4 38 A1 00 08 */ addi r5, r1, 8
/* 800B95F8 00082BB8 38 80 01 00 */ li r4, 0x100
/* 800B95FC 00082BBC 38 C0 00 00 */ li r6, 0
/* 800B9600 00082BC0 4B FF 8A B5 */ bl __ct__Q22cf11CfObjectMapFv
/* 800B9600 00082BC0 4B FF 8A B5 */ bl func_800B20B4
/* 800B9604 00082BC4 2C 03 00 00 */ cmpwi r3, 0
/* 800B9608 00082BC8 7C 7E 1B 78 */ mr r30, r3
/* 800B960C 00082BCC 41 82 00 9C */ beq .L_800B96A8
@ -10763,7 +10763,7 @@
/* 800B9830 00082DF0 7F E4 FB 78 */ mr r4, r31
/* 800B9834 00082DF4 7F A5 EB 78 */ mr r5, r29
/* 800B9838 00082DF8 7F C6 F3 78 */ mr r6, r30
/* 800B983C 00082DFC 4B FF 88 79 */ bl __ct__Q22cf11CfObjectMapFv
/* 800B983C 00082DFC 4B FF 88 79 */ bl func_800B20B4
/* 800B9840 00082E00 80 01 00 24 */ lwz r0, 0x24(r1)
/* 800B9844 00082E04 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 800B9848 00082E08 83 C1 00 18 */ lwz r30, 0x18(r1)
@ -12358,7 +12358,7 @@
.obj "@eti_80025088", local
.hidden "@eti_80025088"
.4byte __ct__Q22cf11CfObjectMapFv
.4byte func_800B20B4
.4byte 0x00000C74
.4byte "@etb_8000974C"
.endobj "@eti_80025088"

View File

@ -502,10 +502,10 @@
/* 8003C2E8 000058A8 4E 80 00 20 */ blr
.endfn func_8003C260
.fn CObjectParam_virtualFunc2__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc2__Q22cf12CObjectParamFv, global
/* 8003C2EC 000058AC 38 63 00 10 */ addi r3, r3, 0x10
/* 8003C2F0 000058B0 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc2__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc2__Q22cf12CObjectParamFv
.fn func_8003C2F4, local
/* 8003C2F4 000058B4 94 21 FF E0 */ stwu r1, -0x20(r1)
@ -868,7 +868,7 @@
/* 8003C7F4 00005DB4 4E 80 00 20 */ blr
.endfn func_8003C78C
.fn CObjectParam_virtualFunc1__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc1__Q22cf12CObjectParamFv, global
/* 8003C7F8 00005DB8 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8003C7FC 00005DBC 7C 08 02 A6 */ mflr r0
/* 8003C800 00005DC0 90 01 00 14 */ stw r0, 0x14(r1)
@ -888,7 +888,7 @@
/* 8003C838 00005DF8 7C 08 03 A6 */ mtlr r0
/* 8003C83C 00005DFC 38 21 00 10 */ addi r1, r1, 0x10
/* 8003C840 00005E00 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.fn isValid, local
/* 8003C844 00005E04 38 60 00 00 */ li r3, 0
@ -1104,7 +1104,7 @@
/* 8003CB1C 000060DC 4E 80 00 20 */ blr
.endfn dispOff
.fn CObjectState_virtualFunc8__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc8__Q22cf12CObjectStateFv, global
/* 8003CB20 000060E0 28 04 00 3F */ cmplwi r4, 0x3f
/* 8003CB24 000060E4 40 80 00 1C */ bge .L_8003CB40
/* 8003CB28 000060E8 80 03 00 08 */ lwz r0, 8(r3)
@ -1120,16 +1120,16 @@
/* 8003CB4C 0000610C 7C 00 1B 78 */ or r0, r0, r3
/* 8003CB50 00006110 54 03 0F FE */ srwi r3, r0, 0x1f
/* 8003CB54 00006114 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc8__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc8__Q22cf12CObjectStateFv
.fn CObjectState_virtualFunc2__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc2__Q22cf12CObjectStateFv, global
/* 8003CB58 00006118 80 03 00 04 */ lwz r0, 4(r3)
/* 8003CB5C 0000611C 7C 03 20 38 */ and r3, r0, r4
/* 8003CB60 00006120 7C 03 00 D0 */ neg r0, r3
/* 8003CB64 00006124 7C 00 1B 78 */ or r0, r0, r3
/* 8003CB68 00006128 54 03 0F FE */ srwi r3, r0, 0x1f
/* 8003CB6C 0000612C 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc2__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc2__Q22cf12CObjectStateFv
.fn func_8003CB70, local
/* 8003CB70 00006130 94 21 FF F0 */ stwu r1, -0x10(r1)
@ -1994,10 +1994,10 @@
/* 8003D7AC 00006D6C 4E 80 00 20 */ blr
.endfn isTalk
.fn CObjectState_virtualFunc11__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc11__Q22cf12CObjectStateFv, global
/* 8003D7B0 00006D70 38 63 00 08 */ addi r3, r3, 8
/* 8003D7B4 00006D74 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc11__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc11__Q22cf12CObjectStateFv
.fn onEvent, local
/* 8003D7B8 00006D78 94 21 FF E0 */ stwu r1, -0x20(r1)
@ -2075,7 +2075,7 @@
/* 8003D8BC 00006E7C 4E 80 00 20 */ blr
.endfn onEvent
.fn CObjectState_virtualFunc10__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc10__Q22cf12CObjectStateFv, global
/* 8003D8C0 00006E80 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8003D8C4 00006E84 7C 08 02 A6 */ mflr r0
/* 8003D8C8 00006E88 2C 05 00 00 */ cmpwi r5, 0
@ -2129,9 +2129,9 @@
/* 8003D980 00006F40 7C 08 03 A6 */ mtlr r0
/* 8003D984 00006F44 38 21 00 20 */ addi r1, r1, 0x20
/* 8003D988 00006F48 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.fn CObjectState_virtualFunc9__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc9__Q22cf12CObjectStateFv, global
/* 8003D98C 00006F4C 28 04 00 3F */ cmplwi r4, 0x3f
/* 8003D990 00006F50 40 80 00 1C */ bge .L_8003D9AC
/* 8003D994 00006F54 80 03 00 0C */ lwz r0, 0xc(r3)
@ -2147,7 +2147,7 @@
/* 8003D9B8 00006F78 7C 00 1B 78 */ or r0, r0, r3
/* 8003D9BC 00006F7C 54 03 0F FE */ srwi r3, r0, 0x1f
/* 8003D9C0 00006F80 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc9__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc9__Q22cf12CObjectStateFv
.fn func_8003D9C4, local
/* 8003D9C4 00006F84 94 21 FF E0 */ stwu r1, -0x20(r1)
@ -2333,17 +2333,17 @@
/* 8003DC60 00007220 4E 80 00 20 */ blr
.endfn winTalk
.fn CObjectState_virtualFunc1__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc1__Q22cf12CObjectStateFv, global
/* 8003DC64 00007224 80 03 00 04 */ lwz r0, 4(r3)
/* 8003DC68 00007228 7C 00 23 78 */ or r0, r0, r4
/* 8003DC6C 0000722C 90 03 00 04 */ stw r0, 4(r3)
/* 8003DC70 00007230 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc1__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc1__Q22cf12CObjectStateFv
.fn CObjectParam_virtualFunc6__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc6__Q22cf12CObjectParamFv, global
/* 8003DC74 00007234 90 83 00 34 */ stw r4, 0x34(r3)
/* 8003DC78 00007238 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc6__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc6__Q22cf12CObjectParamFv
.fn func_8003DC7C, local
/* 8003DC7C 0000723C 94 21 FF F0 */ stwu r1, -0x10(r1)
@ -2398,12 +2398,12 @@
/* 8003DD30 000072F0 4E 80 00 20 */ blr
.endfn func_8003DC7C
.fn CObjectState_virtualFunc3__Q22cf12CObjectStateFv, global
.fn CObjectState_vtableFunc3__Q22cf12CObjectStateFv, global
/* 8003DD34 000072F4 80 03 00 04 */ lwz r0, 4(r3)
/* 8003DD38 000072F8 7C 00 20 78 */ andc r0, r0, r4
/* 8003DD3C 000072FC 90 03 00 04 */ stw r0, 4(r3)
/* 8003DD40 00007300 4E 80 00 20 */ blr
.endfn CObjectState_virtualFunc3__Q22cf12CObjectStateFv
.endfn CObjectState_vtableFunc3__Q22cf12CObjectStateFv
.fn func_8003DD44, local
/* 8003DD44 00007304 94 21 FF F0 */ stwu r1, -0x10(r1)
@ -3056,10 +3056,10 @@
/* 8003E660 00007C20 4E 80 00 20 */ blr
.endfn func_8003E528
.fn CObjectParam_virtualFunc5__Q22cf12CObjectParamFv, global
.fn CObjectParam_vtableFunc5__Q22cf12CObjectParamFv, global
/* 8003E664 00007C24 80 63 00 34 */ lwz r3, 0x34(r3)
/* 8003E668 00007C28 4E 80 00 20 */ blr
.endfn CObjectParam_virtualFunc5__Q22cf12CObjectParamFv
.endfn CObjectParam_vtableFunc5__Q22cf12CObjectParamFv
.fn func_8003E66C, local
/* 8003E66C 00007C2C 94 21 FF E0 */ stwu r1, -0x20(r1)
@ -7186,7 +7186,7 @@
.obj "@eti_800213E0", local
.hidden "@eti_800213E0"
.4byte CObjectParam_virtualFunc1__Q22cf12CObjectParamFv
.4byte CObjectParam_vtableFunc1__Q22cf12CObjectParamFv
.4byte 0x0000004C
.4byte "@etb_800069AC"
.endobj "@eti_800213E0"
@ -7333,7 +7333,7 @@
.obj "@eti_800214DC", local
.hidden "@eti_800214DC"
.4byte CObjectState_virtualFunc10__Q22cf12CObjectStateFv
.4byte CObjectState_vtableFunc10__Q22cf12CObjectStateFv
.4byte 0x000000CC
.4byte "@etb_80006A54"
.endobj "@eti_800214DC"

View File

@ -5,7 +5,7 @@
namespace cf{
class CActorState{
public:
virtual void CActorState_virtualFunc1();
virtual void CActorState_vtableFunc1();
u32 unk4;
};

View File

@ -5,39 +5,39 @@
namespace cf{
class CBattleState{
public:
virtual void CBattleState_virtualFunc1();
virtual void CBattleState_virtualFunc2();
virtual void CBattleState_virtualFunc3();
virtual void CBattleState_virtualFunc4();
virtual void CBattleState_virtualFunc5();
virtual void CBattleState_virtualFunc6();
virtual void CBattleState_virtualFunc7();
virtual void CBattleState_virtualFunc8();
virtual void CBattleState_virtualFunc9();
virtual void CBattleState_virtualFunc10();
virtual void CBattleState_virtualFunc11();
virtual void CBattleState_virtualFunc12();
virtual void CBattleState_virtualFunc13();
virtual void CBattleState_virtualFunc14();
virtual void CBattleState_virtualFunc15();
virtual void CBattleState_virtualFunc16();
virtual void CBattleState_virtualFunc17();
virtual void CBattleState_virtualFunc18();
virtual void CBattleState_virtualFunc19();
virtual void CBattleState_virtualFunc20();
virtual void CBattleState_virtualFunc21();
virtual void CBattleState_virtualFunc22();
virtual void CBattleState_virtualFunc23();
virtual void CBattleState_virtualFunc24();
virtual void CBattleState_virtualFunc25();
virtual void CBattleState_virtualFunc26();
virtual void CBattleState_virtualFunc27();
virtual void CBattleState_virtualFunc28();
virtual void CBattleState_virtualFunc29();
virtual void CBattleState_virtualFunc30();
virtual void CBattleState_virtualFunc31();
virtual void CBattleState_virtualFunc32();
virtual void CBattleState_virtualFunc33();
virtual void CBattleState_vtableFunc1();
virtual void CBattleState_vtableFunc2();
virtual void CBattleState_vtableFunc3();
virtual void CBattleState_vtableFunc4();
virtual void CBattleState_vtableFunc5();
virtual void CBattleState_vtableFunc6();
virtual void CBattleState_vtableFunc7();
virtual void CBattleState_vtableFunc8();
virtual void CBattleState_vtableFunc9();
virtual void CBattleState_vtableFunc10();
virtual void CBattleState_vtableFunc11();
virtual void CBattleState_vtableFunc12();
virtual void CBattleState_vtableFunc13();
virtual void CBattleState_vtableFunc14();
virtual void CBattleState_vtableFunc15();
virtual void CBattleState_vtableFunc16();
virtual void CBattleState_vtableFunc17();
virtual void CBattleState_vtableFunc18();
virtual void CBattleState_vtableFunc19();
virtual void CBattleState_vtableFunc20();
virtual void CBattleState_vtableFunc21();
virtual void CBattleState_vtableFunc22();
virtual void CBattleState_vtableFunc23();
virtual void CBattleState_vtableFunc24();
virtual void CBattleState_vtableFunc25();
virtual void CBattleState_vtableFunc26();
virtual void CBattleState_vtableFunc27();
virtual void CBattleState_vtableFunc28();
virtual void CBattleState_vtableFunc29();
virtual void CBattleState_vtableFunc30();
virtual void CBattleState_vtableFunc31();
virtual void CBattleState_vtableFunc32();
virtual void CBattleState_vtableFunc33();
u8 unkC[0x15D0];
};

View File

@ -4,13 +4,18 @@
#include "kyoshin/appgame/cf/CObjectState.hpp"
namespace cf{
//min size: 0x38
class CObjectParam : public CObjectState{
public:
virtual void CObjectParam_virtualFunc1();
virtual void CObjectParam_virtualFunc2();
virtual void CObjectParam_virtualFunc3();
virtual void CObjectParam_virtualFunc4();
virtual void CObjectParam_virtualFunc5();
virtual void CObjectParam_virtualFunc6();
virtual void CObjectParam_vtableFunc1();
virtual void CObjectParam_vtableFunc2();
virtual void CObjectParam_vtableFunc3();
virtual void CObjectParam_vtableFunc4();
virtual void CObjectParam_vtableFunc5();
virtual void CObjectParam_vtableFunc6();
//0x0: vtable
//0x0-10: CObjectState
u8 unk10_3[0x28];
};
}

View File

@ -3,20 +3,24 @@
#include "types.h"
namespace cf{
//min size: 0x10
class CObjectState{
public:
virtual void CObjectState_virtualFunc1();
virtual void CObjectState_virtualFunc2();
virtual void CObjectState_virtualFunc3();
virtual void CObjectState_virtualFunc4();
virtual void CObjectState_virtualFunc5();
virtual void CObjectState_virtualFunc6();
virtual void CObjectState_virtualFunc7();
virtual void CObjectState_virtualFunc8();
virtual void CObjectState_virtualFunc9();
virtual void CObjectState_virtualFunc10();
virtual void CObjectState_virtualFunc11();
virtual void CObjectState_virtualFunc12();
virtual void CObjectState_virtualFunc13();
virtual void CObjectState_vtableFunc1();
virtual void CObjectState_vtableFunc2();
virtual void CObjectState_vtableFunc3();
virtual void CObjectState_vtableFunc4();
virtual void CObjectState_vtableFunc5();
virtual void CObjectState_vtableFunc6();
virtual void CObjectState_vtableFunc7();
virtual void CObjectState_vtableFunc8();
virtual void CObjectState_vtableFunc9();
virtual void CObjectState_vtableFunc10();
virtual void CObjectState_vtableFunc11();
virtual void CObjectState_vtableFunc12();
virtual void CObjectState_vtableFunc13();
//0x0: vtable
u8 unk4_3[0xC];
};
}

View File

@ -4,6 +4,7 @@
#include "kyoshin/appgame/cf/CObjectParam.hpp"
namespace cf{
//min size: 0x70
class CfObject : public CObjectParam{
public:
//vtable 1 (CfObject)
@ -83,5 +84,10 @@ namespace cf{
//not sure if belongs here? (can be in any class from CObjectState to CfObjectMove)
void func_800BE898(int, u32, float, float);
//0x0: vtable
//0x0-38: CObjectParam
u8 unk38_3[0x38];
};
}

View File

@ -6,6 +6,7 @@
#include "kyoshin/appgame/cf/CActorParam.hpp"
namespace cf{
//min size: 0x45BC
class CfObjectActor : public CActorParam, public CAIAction, public CfObjectMove{
public:
//vtable 4 (CfObjectActor)
@ -22,5 +23,11 @@ namespace cf{
virtual void CfObjectActor_vtableFunc11();
virtual void CfObjectActor_vtableFunc12();
virtual void CfObjectActor_vtableFunc13();
//0x0: vtable 1
//0x0-3e98: CActorParam/CAIAction
//0x3e9c: vtable 3
//0x3e9c-45b4: CfObjectMove
u8 unk45B4[0x8];
};
}

View File

@ -4,7 +4,11 @@
#include "kyoshin/appgame/cf/CfObject.hpp"
namespace cf{
class CfObjectEff : CfObject{
//size: 0xC0
class CfObjectEff : public CfObject{
public:
//0x0: vtable
//0x0-70: CfObject
u8 unk70[0x50];
};
}

View File

@ -4,6 +4,7 @@
#include "kyoshin/appgame/cf/CfObjectActor.hpp"
namespace cf{
//size: 0x45CC
class CfObjectEne : public CfObjectActor{
public:
virtual ~CfObjectEne();
@ -11,5 +12,9 @@ namespace cf{
virtual void func_800ADBD4();
virtual void func_800ADDA8();
virtual void func_800AEC68();
//0x0: vtable
//0x0-45BC: CfObjectActor
u8 unk45BC[0x10];
};
}

View File

@ -4,7 +4,11 @@
#include "kyoshin/appgame/cf/CfObjectModel.hpp"
namespace cf{
class CfObjectMap : CfObjectModel{
//size: 0x2F50
class CfObjectMap : public CfObjectModel{
public:
//0x0: vtable
//0x0-BE: CfObjectModel
u8 unkBE[0x2E92];
};
}

View File

@ -4,6 +4,7 @@
#include "kyoshin/appgame/cf/CfObject.hpp"
namespace cf{
//min size: 0xbe
class CfObjectModel : public CfObject{
public:
//vtable 1 (CfObject)
@ -29,5 +30,11 @@ namespace cf{
virtual void CfObjectModel_vtableFunc18();
virtual void CfObjectModel_vtableFunc19();
virtual void CfObjectModel_vtableFunc20();
//0x0: vtable
//0x0-70: CfObject
u8 unk70_3[0x1C];
u16 unk8C_3;
u8 unk8E_3[0x30];
};
}

View File

@ -4,6 +4,7 @@
#include "kyoshin/appgame/cf/CfObjectModel.hpp"
namespace cf{
//min size: 0x715
class CfObjectMove : public CfObjectModel{
public:
//vtable 1 (CfObject)
@ -32,5 +33,10 @@ namespace cf{
virtual void CfObjectMove_vtableFunc21();
virtual void CfObjectMove_vtableFunc22();
virtual void CfObjectMove_vtableFunc23();
//0x0: vtable
//0x0-BE: CfObjectModel
u8 unkBE_3[0x657];
u8 unk715[3]; //might not belong here
};
}

View File

@ -4,7 +4,11 @@
#include "kyoshin/appgame/cf/CfObjectMove.hpp"
namespace cf{
class CfObjectNpc : CfObjectMove{
//size: 0x71C
class CfObjectNpc : public CfObjectMove{
public:
//0x0: vtable
//0x0-718: CfObjectMove
u8 unk718[4];
};
}

View File

@ -4,7 +4,10 @@
#include "kyoshin/appgame/cf/CfObjectMove.hpp"
namespace cf{
class CfObjectObj : CfObjectMove{
//size 0x718
class CfObjectObj : public CfObjectMove{
public:
//0x0: vtable 1
//0x0-718: CfObjectMove
};
}

View File

@ -4,11 +4,10 @@
#include "kyoshin/appgame/cf/CfObjectActor.hpp"
namespace cf{
//size: 0x45C0
class CfObjectPc : public CfObjectActor{
public:
//vtable 4 (CfObjectActor)
virtual ~CfObjectPc();
//vtable 4 (CfObjectPc)
virtual void func_800BFF20();
virtual void func_800C0080();
virtual void func_800C0524();
@ -24,7 +23,8 @@ namespace cf{
virtual void func_800C0514();
virtual void func_800C11CC();
u8 unk3EA0[0x88];
u16 unk3F28;
//0x0: vtable
//0x0-45BC: CfObjectActor
u8 unk45BC[0x4];
};
}

View File

@ -4,7 +4,11 @@
#include "kyoshin/appgame/cf/CfObjectObj.hpp"
namespace cf{
class CfObjectTbox : CfObjectObj{
//size: 0x738
class CfObjectTbox : public CfObjectObj{
public:
//0x0: vtable
//0x0-718: CfObjectObj
u8 unk718[0x20];
};
}

View File

@ -18,7 +18,7 @@ int voice_play(_sVMThread* pThread) {
while((u32)node != (u32)list->unk4){
cf::CfObjectPc* object = (cf::CfObjectPc*)node->item;
if(object->CActorParam_vtableFunc138() == 0){
if(r30 == object->unk3F28){
if(r30 == object->unk8C_3){
object->func_800BE898(r27, 0x14, 1.0f, 30.0f);
break;
}