Split several minigame rels
M408, M409, M410, M411, and M450 are all split. I labeled chrman.c more as well.
This commit is contained in:
parent
0c003afbaa
commit
a276a37302
16 changed files with 171 additions and 45 deletions
|
|
@ -5,3 +5,29 @@ Sections:
|
|||
.rodata type:rodata align:8
|
||||
.data type:data align:8
|
||||
.bss type:bss align:8
|
||||
|
||||
REL/executor.c:
|
||||
.text start:0x00000000 end:0x000000A0
|
||||
|
||||
REL/m408Dll/main.c:
|
||||
.text start:0x000000A0 end:0x00008958
|
||||
.rodata start:0x00000000 end:0x000002C8
|
||||
.data start:0x00000000 end:0x00000198
|
||||
.bss start:0x00000000 end:0x00000080
|
||||
|
||||
REL/m408Dll/camera.c:
|
||||
.text start:0x00008958 end:0x0000C44C
|
||||
.rodata start:0x000002C8 end:0x000004C0
|
||||
.bss start:0x00000080 end:0x00000118
|
||||
|
||||
REL/m408Dll/stage.c:
|
||||
.text start:0x0000C44C end:0x000118D0
|
||||
.rodata start:0x000004C0 end:0x000006C0
|
||||
.data start:0x00000198 end:0x000001A0
|
||||
.bss start:0x00000118 end:0x00000168
|
||||
|
||||
REL/m408Dll/object.c:
|
||||
.text start:0x000118D0 end:0x000163C8
|
||||
.rodata start:0x000006C0 end:0x000007F4
|
||||
.data start:0x000001A0 end:0x00000574
|
||||
.bss start:0x00000168 end:0x000075AC
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
|
||||
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
|
||||
fn_1_A0 = .text:0x000000A0; // type:function size:0x47C
|
||||
ModuleProlog = .text:0x000000A0; // type:function size:0x47C
|
||||
fn_1_51C = .text:0x0000051C; // type:function size:0x50
|
||||
fn_1_56C = .text:0x0000056C; // type:function size:0x438
|
||||
fn_1_9A4 = .text:0x000009A4; // type:function size:0x4C
|
||||
|
|
@ -465,7 +465,9 @@ lbl_1_rodata_7F0 = .rodata:0x000007F0; // type:object size:0x4 data:float
|
|||
lbl_1_data_0 = .data:0x00000000; // type:object size:0x20
|
||||
lbl_1_data_20 = .data:0x00000020; // type:object size:0xC
|
||||
lbl_1_data_2C = .data:0x0000002C; // type:object size:0xC
|
||||
lbl_1_data_38 = .data:0x00000038; // type:object size:0x20
|
||||
lbl_1_data_38 = .data:0x00000038; // type:object size:0x4
|
||||
lbl_1_data_3C = .data:0x0000003C; // type:object size:0x18
|
||||
lbl_1_data_54 = .data:0x00000054; // type:object size:0x4
|
||||
lbl_1_data_58 = .data:0x00000058; // type:object size:0xC
|
||||
lbl_1_data_64 = .data:0x00000064; // type:object size:0xC
|
||||
lbl_1_data_70 = .data:0x00000070; // type:object size:0xC
|
||||
|
|
@ -478,7 +480,8 @@ lbl_1_data_A0 = .data:0x000000A0; // type:object size:0x28
|
|||
lbl_1_data_C8 = .data:0x000000C8; // type:object size:0x20
|
||||
lbl_1_data_E8 = .data:0x000000E8; // type:object size:0x1C
|
||||
lbl_1_data_104 = .data:0x00000104; // type:object size:0x40
|
||||
lbl_1_data_144 = .data:0x00000144; // type:object size:0x58
|
||||
lbl_1_data_144 = .data:0x00000144; // type:object size:0x54
|
||||
lbl_1_data_198 = .data:0x00000198; // type:object size:0x4
|
||||
lbl_1_data_19C = .data:0x0000019C; // type:object size:0x4 data:4byte
|
||||
lbl_1_data_1A0 = .data:0x000001A0; // type:object size:0x24
|
||||
lbl_1_data_1C4 = .data:0x000001C4; // type:object size:0x24
|
||||
|
|
@ -516,7 +519,7 @@ lbl_1_bss_66 = .bss:0x00000066; // type:object size:0x6 data:2byte
|
|||
lbl_1_bss_6C = .bss:0x0000006C; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_70 = .bss:0x00000070; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_74 = .bss:0x00000074; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x8 data:4byte
|
||||
lbl_1_bss_78 = .bss:0x00000078; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_80 = .bss:0x00000080; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_84 = .bss:0x00000084; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_88 = .bss:0x00000088; // type:object size:0xC
|
||||
|
|
@ -526,7 +529,7 @@ lbl_1_bss_A4 = .bss:0x000000A4; // type:object size:0x50 data:4byte
|
|||
lbl_1_bss_F4 = .bss:0x000000F4; // type:object size:0xC data:float
|
||||
lbl_1_bss_100 = .bss:0x00000100; // type:object size:0xC data:float
|
||||
lbl_1_bss_10C = .bss:0x0000010C; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_110 = .bss:0x00000110; // type:object size:0x8 data:4byte
|
||||
lbl_1_bss_110 = .bss:0x00000110; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_118 = .bss:0x00000118; // type:object size:0x2 data:2byte
|
||||
lbl_1_bss_11C = .bss:0x0000011C; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_120 = .bss:0x00000120; // type:object size:0x8 data:4byte
|
||||
|
|
|
|||
|
|
@ -5,3 +5,22 @@ Sections:
|
|||
.rodata type:rodata align:8
|
||||
.data type:data align:8
|
||||
.bss type:bss align:8
|
||||
|
||||
REL/executor.c:
|
||||
.text start:0x00000000 end:0x000000A0
|
||||
|
||||
REL/m409Dll/main.c:
|
||||
.text start:0x000000A0 end:0x000067E0
|
||||
.rodata start:0x00000000 end:0x000001A0
|
||||
.data start:0x00000000 end:0x00000138
|
||||
.bss start:0x00000000 end:0x000000F0
|
||||
|
||||
REL/m409Dll/player.c:
|
||||
.text start:0x000067E0 end:0x0000BF88
|
||||
.rodata start:0x000001A0 end:0x00000430
|
||||
.data start:0x00000138 end:0x000001F0
|
||||
.bss start:0x000000F0 end:0x000003B0
|
||||
|
||||
REL/m409Dll/cursor.c:
|
||||
.text start:0x0000BF88 end:0x0000F588
|
||||
.rodata start:0x00000430 end:0x00000488
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
|
||||
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
|
||||
fn_1_A0 = .text:0x000000A0; // type:function size:0x394
|
||||
ModuleProlog = .text:0x000000A0; // type:function size:0x394
|
||||
fn_1_434 = .text:0x00000434; // type:function size:0xA8
|
||||
fn_1_4DC = .text:0x000004DC; // type:function size:0x48
|
||||
fn_1_524 = .text:0x00000524; // type:function size:0x65C
|
||||
|
|
@ -294,7 +294,8 @@ lbl_1_data_CD = .data:0x000000CD; // type:object size:0x9 data:string
|
|||
lbl_1_data_D6 = .data:0x000000D6; // type:object size:0x3 data:string
|
||||
lbl_1_data_D9 = .data:0x000000D9; // type:object size:0x10 data:string
|
||||
lbl_1_data_E9 = .data:0x000000E9; // type:object size:0x26 data:string
|
||||
lbl_1_data_10F = .data:0x0000010F; // type:object size:0x2D
|
||||
lbl_1_data_10F = .data:0x0000010F; // type:object size:0x24 data:string
|
||||
lbl_1_data_138 = .data:0x00000138; // type:object size:0x4
|
||||
lbl_1_data_13C = .data:0x0000013C; // type:object size:0x1C
|
||||
lbl_1_data_158 = .data:0x00000158; // type:object size:0x20
|
||||
lbl_1_data_178 = .data:0x00000178; // type:object size:0x40
|
||||
|
|
@ -321,7 +322,7 @@ lbl_1_bss_40 = .bss:0x00000040; // type:object size:0x9C data:2byte
|
|||
lbl_1_bss_DC = .bss:0x000000DC; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_E0 = .bss:0x000000E0; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_E4 = .bss:0x000000E4; // type:object size:0x2 data:2byte
|
||||
lbl_1_bss_E8 = .bss:0x000000E8; // type:object size:0x8 data:4byte
|
||||
lbl_1_bss_E8 = .bss:0x000000E8; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_F0 = .bss:0x000000F0; // type:object size:0x14 data:4byte
|
||||
lbl_1_bss_104 = .bss:0x00000104; // type:object size:0x2 data:2byte
|
||||
lbl_1_bss_106 = .bss:0x00000106; // type:object size:0x2 data:2byte
|
||||
|
|
|
|||
|
|
@ -5,3 +5,28 @@ Sections:
|
|||
.rodata type:rodata align:8
|
||||
.data type:data align:8
|
||||
.bss type:bss align:8
|
||||
|
||||
REL/executor.c:
|
||||
.text start:0x00000000 end:0x000000A0
|
||||
|
||||
REL/m410Dll/main.c:
|
||||
.text start:0x000000A0 end:0x000031A4
|
||||
.rodata start:0x00000000 end:0x000000D0
|
||||
.data start:0x00000000 end:0x000000D8
|
||||
.bss start:0x00000000 end:0x00000030
|
||||
|
||||
REL/m410Dll/stage.c:
|
||||
.text start:0x000031A4 end:0x000033A8
|
||||
.rodata start:0x000000D0 end:0x000000D8
|
||||
|
||||
REL/m410Dll/game.c:
|
||||
.text start:0x000033A8 end:0x00007E30
|
||||
.rodata start:0x000000D8 end:0x000001E8
|
||||
.data start:0x000000D8 end:0x00000130
|
||||
.bss start:0x00000030 end:0x00000060
|
||||
|
||||
REL/m410Dll/player.c:
|
||||
.text start:0x00007E30 end:0x0000B784
|
||||
.rodata start:0x000001E8 end:0x000003A8
|
||||
.data start:0x00000130 end:0x000002B4
|
||||
.bss start:0x00000060 end:0x00000078
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
|
||||
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
|
||||
fn_1_A0 = .text:0x000000A0; // type:function size:0x444
|
||||
ModuleProlog = .text:0x000000A0; // type:function size:0x444
|
||||
fn_1_4E4 = .text:0x000004E4; // type:function size:0xC4
|
||||
fn_1_5A8 = .text:0x000005A8; // type:function size:0x94
|
||||
fn_1_63C = .text:0x0000063C; // type:function size:0x16C
|
||||
|
|
@ -278,7 +278,7 @@ lbl_1_data_DC = .data:0x000000DC; // type:object size:0x20
|
|||
lbl_1_data_FC = .data:0x000000FC; // type:object size:0x8
|
||||
lbl_1_data_104 = .data:0x00000104; // type:object size:0xC
|
||||
lbl_1_data_110 = .data:0x00000110; // type:object size:0x4 data:4byte
|
||||
lbl_1_data_114 = .data:0x00000114; // type:object size:0x1C
|
||||
lbl_1_data_114 = .data:0x00000114; // type:object size:0x16 data:string
|
||||
lbl_1_data_130 = .data:0x00000130; // type:object size:0x10
|
||||
lbl_1_data_140 = .data:0x00000140; // type:object size:0x20
|
||||
lbl_1_data_160 = .data:0x00000160; // type:object size:0xC
|
||||
|
|
@ -299,7 +299,7 @@ lbl_1_bss_16 = .bss:0x00000016; // type:object size:0x6 data:2byte
|
|||
lbl_1_bss_1C = .bss:0x0000001C; // type:object size:0x2 data:2byte
|
||||
lbl_1_bss_20 = .bss:0x00000020; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_24 = .bss:0x00000024; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x8 data:4byte
|
||||
lbl_1_bss_28 = .bss:0x00000028; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_30 = .bss:0x00000030; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_34 = .bss:0x00000034; // type:object size:0x4 data:4byte
|
||||
lbl_1_bss_38 = .bss:0x00000038; // type:object size:0x4 data:4byte
|
||||
|
|
|
|||
|
|
@ -5,3 +5,12 @@ Sections:
|
|||
.rodata type:rodata align:8
|
||||
.data type:data align:8
|
||||
.bss type:bss align:8
|
||||
|
||||
REL/executor.c:
|
||||
.text start:0x00000000 end:0x000000A0
|
||||
|
||||
REL/m411Dll/main.c:
|
||||
.text start:0x000000A0 end:0x0000B8A8
|
||||
.rodata start:0x00000000 end:0x000002F4
|
||||
.data start:0x00000000 end:0x0000033D
|
||||
.bss start:0x00000000 end:0x00000EA2
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
_prolog = .text:0x00000000; // type:function size:0x54 scope:global
|
||||
_epilog = .text:0x00000054; // type:function size:0x4C scope:global
|
||||
fn_1_A0 = .text:0x000000A0; // type:function size:0xDE0
|
||||
ModuleProlog = .text:0x000000A0; // type:function size:0xDE0
|
||||
fn_1_E80 = .text:0x00000E80; // type:function size:0x10C
|
||||
fn_1_F8C = .text:0x00000F8C; // type:function size:0xE8
|
||||
fn_1_1074 = .text:0x00001074; // type:function size:0x424
|
||||
|
|
|
|||
|
|
@ -5,3 +5,9 @@ Sections:
|
|||
.rodata type:rodata align:8
|
||||
.data type:data align:8
|
||||
.bss type:bss align:8
|
||||
|
||||
REL/m450Dll/main.c:
|
||||
.text start:0x00000000 end:0x000299BC
|
||||
.rodata start:0x00000000 end:0x00000398
|
||||
.data start:0x00000000 end:0x000017C4
|
||||
.bss start:0x00000000 end:0x00000364
|
||||
|
|
|
|||
|
|
@ -860,10 +860,10 @@ CreateEffect = .text:0x8004C180; // type:function size:0x1CC scope:local
|
|||
UpdateEffect = .text:0x8004C34C; // type:function size:0x4A0 scope:local
|
||||
RotateEffect = .text:0x8004C7EC; // type:function size:0x1E8 scope:local
|
||||
PlayEffectSound = .text:0x8004C9D4; // type:function size:0x344 scope:local
|
||||
CharMotionCreate = .text:0x8004CD18; // type:function size:0x1D0
|
||||
CharMotionSet = .text:0x8004CEE8; // type:function size:0x88
|
||||
CharMotionKill = .text:0x8004CF70; // type:function size:0x9C
|
||||
CharMotionDataClose = .text:0x8004D00C; // type:function size:0x2B8
|
||||
CharModelMotionCreate = .text:0x8004CD18; // type:function size:0x1D0
|
||||
CharModelMotionIndexSet = .text:0x8004CEE8; // type:function size:0x88
|
||||
CharModelMotionKill = .text:0x8004CF70; // type:function size:0x9C
|
||||
CharModelMotionDataClose = .text:0x8004D00C; // type:function size:0x2B8
|
||||
CharModelDataClose = .text:0x8004D2C4; // type:function size:0x430
|
||||
CharModelKill = .text:0x8004D6F4; // type:function size:0x244
|
||||
CharModelMotionSet = .text:0x8004D938; // type:function size:0x7C
|
||||
|
|
@ -879,11 +879,11 @@ CharModelMotionShiftSet = .text:0x8004DD84; // type:function size:0x84
|
|||
CharModelMotionShiftTimeGet = .text:0x8004DE08; // type:function size:0x44
|
||||
CharModelMotionSpeedSet = .text:0x8004DE4C; // type:function size:0x4C
|
||||
CharModelLayerSetAll = .text:0x8004DE98; // type:function size:0x80
|
||||
CharModelCreateItemHook = .text:0x8004DF18; // type:function size:0x1D4
|
||||
CharModelItemHookCreate = .text:0x8004DF18; // type:function size:0x1D4
|
||||
UpdateItemHook = .text:0x8004E0EC; // type:function size:0x484 scope:local
|
||||
CharModelCreateParticle = .text:0x8004E570; // type:function size:0x3FC
|
||||
CharModelEffectCreate = .text:0x8004E570; // type:function size:0x3FC
|
||||
OrbitEffect = .text:0x8004E96C; // type:function size:0x168 scope:local
|
||||
CharModelCreateCoinParticle = .text:0x8004EAD4; // type:function size:0x1A0
|
||||
CharModelCoinEffectCreate = .text:0x8004EAD4; // type:function size:0x1A0
|
||||
fn_8004EC74 = .text:0x8004EC74; // type:function size:0x130
|
||||
fn_8004EDA4 = .text:0x8004EDA4; // type:function size:0x2B4
|
||||
fn_8004F058 = .text:0x8004F058; // type:function size:0xE4
|
||||
|
|
@ -891,10 +891,10 @@ fn_8004F13C = .text:0x8004F13C; // type:function size:0x2B4
|
|||
CharModelLayerSetAll2 = .text:0x8004F3F0; // type:function size:0x80
|
||||
CharModelVoiceEnableSet = .text:0x8004F470; // type:function size:0xBC
|
||||
fn_8004F52C = .text:0x8004F52C; // type:function size:0x4C
|
||||
fn_8004F578 = .text:0x8004F578; // type:function size:0xB0
|
||||
fn_8004F628 = .text:0x8004F628; // type:function size:0x2CC
|
||||
fn_8004F8F4 = .text:0x8004F8F4; // type:function size:0x2CC
|
||||
fn_8004FBC0 = .text:0x8004FBC0; // type:function size:0xF80
|
||||
CharModelEffectEnableSet = .text:0x8004F578; // type:function size:0xB0
|
||||
CharModelEffectNpcInit = .text:0x8004F628; // type:function size:0x2CC
|
||||
CharModelEffectNpcInitSilent = .text:0x8004F8F4; // type:function size:0x2CC
|
||||
UpdateNpcEffect = .text:0x8004FBC0; // type:function size:0xF80 scope:local
|
||||
CharModelStepTypeSet = .text:0x80050B40; // type:function size:0x30
|
||||
PlayStepFX = .text:0x80050B70; // type:function size:0xEC scope:local
|
||||
MapWall = .text:0x80050C5C; // type:function size:0x1B8
|
||||
|
|
|
|||
37
configure.py
37
configure.py
|
|
@ -836,6 +836,43 @@ config.libs = [
|
|||
Object(NonMatching, "REL/m407dll/score.c"),
|
||||
}
|
||||
),
|
||||
Rel('m408Dll',
|
||||
objects = {
|
||||
Object(Matching, "REL/executor.c"),
|
||||
Object(NonMatching, "REL/m408Dll/main.c"),
|
||||
Object(NonMatching, "REL/m408Dll/camera.c"),
|
||||
Object(NonMatching, "REL/m408Dll/stage.c"),
|
||||
Object(NonMatching, "REL/m408Dll/object.c"),
|
||||
}
|
||||
),
|
||||
Rel('m409Dll',
|
||||
objects = {
|
||||
Object(Matching, "REL/executor.c"),
|
||||
Object(NonMatching, "REL/m409Dll/main.c"),
|
||||
Object(NonMatching, "REL/m409Dll/player.c"),
|
||||
Object(NonMatching, "REL/m409Dll/cursor.c"),
|
||||
}
|
||||
),
|
||||
Rel('m410Dll',
|
||||
objects = {
|
||||
Object(Matching, "REL/executor.c"),
|
||||
Object(NonMatching, "REL/m410Dll/main.c"),
|
||||
Object(NonMatching, "REL/m410Dll/stage.c"),
|
||||
Object(NonMatching, "REL/m410Dll/game.c"),
|
||||
Object(NonMatching, "REL/m410Dll/player.c"),
|
||||
}
|
||||
),
|
||||
Rel('m411Dll',
|
||||
objects = {
|
||||
Object(Matching, "REL/executor.c"),
|
||||
Object(NonMatching, "REL/m411Dll/main.c"),
|
||||
}
|
||||
),
|
||||
Rel('m450Dll',
|
||||
objects = {
|
||||
Object(NonMatching, "REL/m450Dll/main.c"),
|
||||
}
|
||||
),
|
||||
Rel('mentDll',
|
||||
objects = {
|
||||
Object(NonMatching, "REL/mentDll/common.c"),
|
||||
|
|
|
|||
|
|
@ -8,19 +8,19 @@ void MGSeqKillAll(void);
|
|||
void MGSeqPracticeInit(void);
|
||||
void CharMotionClose(s16 character);
|
||||
void CharModelClose(s16 character);
|
||||
void CharMotionDataClose(s16 character);
|
||||
void CharModelMotionDataClose(s16 character);
|
||||
void CharModelKill(s16 character);
|
||||
s16 CharModelCreate(s16 character, s16 lod);
|
||||
s16 CharMotionCreate(s16 character, s32 data_num);
|
||||
s16 CharModelMotionCreate(s16 character, s32 data_num);
|
||||
void CharModelMotionSet(s16 character, s16 motion);
|
||||
float CharModelMotionMaxTimeGet(s16 character);
|
||||
float CharModelMotionTimeGet(s16 character);
|
||||
void CharModelMotionShiftSet(s16 model, s16 motion, float time, float shift_time, u32 attr);
|
||||
void CharModelMotionTimeSet(s16 character, float time);
|
||||
void CharModelMotionSpeedSet(s16 character, float speed);
|
||||
void CharMotionKill(s16 character, s32 motion);
|
||||
void CharModelMotionKill(s16 character, s32 motion);
|
||||
void CharModelVoiceEnableSet(s16 character, s16 motion, s32 flag);
|
||||
void CharModelCreateCoinParticle(s16, Vec *);
|
||||
void CharModelCoinEffectCreate(s16, Vec *);
|
||||
|
||||
s32 CharModelMotionEndCheck(s16 character);
|
||||
|
||||
|
|
|
|||
|
|
@ -231,19 +231,19 @@ void fn_1_29C(omObjData * arg0)
|
|||
Hu3DModelLayerSet(lbl_1_bss_98A[var_r31], 1);
|
||||
}
|
||||
|
||||
lbl_1_bss_88A[var_r31][0] = CharMotionCreate(chrIdx, lbl_1_data_0[0]);
|
||||
lbl_1_bss_88A[var_r31][1] = CharMotionCreate(chrIdx, lbl_1_data_0[1]);
|
||||
lbl_1_bss_88A[var_r31][2] = CharMotionCreate(chrIdx, lbl_1_data_0[2]);
|
||||
lbl_1_bss_88A[var_r31][3] = CharMotionCreate(chrIdx, lbl_1_data_0[3]);
|
||||
lbl_1_bss_88A[var_r31][4] = CharMotionCreate(chrIdx, lbl_1_data_0[4]);
|
||||
lbl_1_bss_88A[var_r31][5] = CharMotionCreate(chrIdx, lbl_1_data_0[5]);
|
||||
lbl_1_bss_88A[var_r31][6] = CharMotionCreate(chrIdx, lbl_1_data_0[6]);
|
||||
lbl_1_bss_88A[var_r31][7] = CharMotionCreate(chrIdx, lbl_1_data_0[7]);
|
||||
lbl_1_bss_88A[var_r31][0] = CharMotionCreate(chrIdx, 0x5F004D);
|
||||
lbl_1_bss_88A[var_r31][0] = CharModelMotionCreate(chrIdx, lbl_1_data_0[0]);
|
||||
lbl_1_bss_88A[var_r31][1] = CharModelMotionCreate(chrIdx, lbl_1_data_0[1]);
|
||||
lbl_1_bss_88A[var_r31][2] = CharModelMotionCreate(chrIdx, lbl_1_data_0[2]);
|
||||
lbl_1_bss_88A[var_r31][3] = CharModelMotionCreate(chrIdx, lbl_1_data_0[3]);
|
||||
lbl_1_bss_88A[var_r31][4] = CharModelMotionCreate(chrIdx, lbl_1_data_0[4]);
|
||||
lbl_1_bss_88A[var_r31][5] = CharModelMotionCreate(chrIdx, lbl_1_data_0[5]);
|
||||
lbl_1_bss_88A[var_r31][6] = CharModelMotionCreate(chrIdx, lbl_1_data_0[6]);
|
||||
lbl_1_bss_88A[var_r31][7] = CharModelMotionCreate(chrIdx, lbl_1_data_0[7]);
|
||||
lbl_1_bss_88A[var_r31][0] = CharModelMotionCreate(chrIdx, 0x5F004D);
|
||||
CharModelMotionSet(chrIdx, lbl_1_bss_88A[var_r31][0]);
|
||||
Hu3DModelAttrSet(lbl_1_bss_98A[var_r31], 0x40000001U);
|
||||
Hu3DModelPosSet(lbl_1_bss_98A[var_r31], (var_r31 / 4 * 0xC8) - 100, 0.0f, -(var_r31 % 4) * 0x96);
|
||||
CharMotionDataClose(chrIdx);
|
||||
CharModelMotionDataClose(chrIdx);
|
||||
}
|
||||
temp_r26 = OSGetTick();
|
||||
|
||||
|
|
|
|||
|
|
@ -197,13 +197,13 @@ void fn_1_46F0(void)
|
|||
var_r30 = var_r31;
|
||||
lbl_1_bss_9EC[var_r31] = CharModelCreate(var_r30, 8);
|
||||
Hu3DModelShadowSet(lbl_1_bss_9EC[var_r31]);
|
||||
lbl_1_bss_9AC[var_r31][0] = CharMotionCreate(var_r30, 0x5F0002);
|
||||
lbl_1_bss_9AC[var_r31][0] = CharModelMotionCreate(var_r30, 0x5F0002);
|
||||
CharModelMotionSet(var_r30, lbl_1_bss_9AC[var_r31][0]);
|
||||
Hu3DModelAttrSet(lbl_1_bss_9EC[var_r31], 0x40000001U);
|
||||
Hu3DModelCameraSet(lbl_1_bss_9EC[var_r31], lbl_1_data_358[var_r31]);
|
||||
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], ((( var_r31 / 4) * 200) - 100), 0.0f, (-( var_r31 % 4) * 150));
|
||||
Hu3DModelPosSet(lbl_1_bss_9EC[var_r31], 0.0f, 0.0f, 0.0f);
|
||||
CharMotionDataClose(var_r30);
|
||||
CharModelMotionDataClose(var_r30);
|
||||
}
|
||||
|
||||
var_r31 = Hu3DModelCreateFile(0x700024);
|
||||
|
|
@ -220,7 +220,7 @@ void fn_1_46F0(void)
|
|||
sp20.z =
|
||||
sp20.y = 0.0f;
|
||||
sp20.y += 200.0f;
|
||||
CharModelCreateCoinParticle(4, &sp20);
|
||||
CharModelCoinEffectCreate(4, &sp20);
|
||||
}
|
||||
HuPrcVSleep();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -670,7 +670,7 @@ void fn_1_95B8(omObjData* arg0) {
|
|||
var_r30->unk8.y += -0.08166667f * temp_f31 * temp_f31 * 0.75f;
|
||||
if (var_r30->unk8.y < temp_r29->unk8) {
|
||||
var_r30->unk8.y = temp_r29->unk8;
|
||||
CharModelCreateCoinParticle(1, &var_r30->unk8);
|
||||
CharModelCoinEffectCreate(1, &var_r30->unk8);
|
||||
BoardModelVisibilitySet(var_r30->unk_02, 0);
|
||||
HuAudFXPlay(7);
|
||||
BoardPlayerCoinsAdd(temp_r29->unk4, 1);
|
||||
|
|
|
|||
|
|
@ -381,8 +381,8 @@ s32 BoardModelMotionCreate(s16 model, s32 data_num)
|
|||
}
|
||||
model = Hu3DJointMotion(model_ptr->id, model_ptr->mot_data[i]);
|
||||
} else {
|
||||
model = CharMotionCreate(model_ptr->character, data_num);
|
||||
CharMotionDataClose(model_ptr->character);
|
||||
model = CharModelMotionCreate(model_ptr->character, data_num);
|
||||
CharModelMotionDataClose(model_ptr->character);
|
||||
}
|
||||
model_ptr->mot_id[i] = model;
|
||||
model_ptr->mot_count++;
|
||||
|
|
@ -406,7 +406,7 @@ s32 BoardModelMotionKill(s16 model, s32 motion)
|
|||
if(model_ptr->character == -1) {
|
||||
Hu3DMotionKill(model_ptr->mot_id[motion]);
|
||||
} else {
|
||||
CharMotionKill(model_ptr->character, model_ptr->mot_id[motion]);
|
||||
CharModelMotionKill(model_ptr->character, model_ptr->mot_id[motion]);
|
||||
}
|
||||
model_ptr->mot_id[motion] = -1;
|
||||
}
|
||||
|
|
@ -1170,7 +1170,7 @@ static s32 CreateBoardModelMotion(BoardModel *model, s32 count, s32 *data_num)
|
|||
}
|
||||
index = Hu3DJointMotion(model->id, data);
|
||||
} else {
|
||||
index = CharMotionCreate(model->character, data_num[i]);
|
||||
index = CharModelMotionCreate(model->character, data_num[i]);
|
||||
}
|
||||
if(index < 0) {
|
||||
return -1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue