Skip to content

Commit

Permalink
CBattleManager.cpp work
Browse files Browse the repository at this point in the history 
kill me
  • Loading branch information
@CelestialAmber
CelestialAmber committed Oct 4, 2024
1 parent 2cc5560 commit bc89def
Show file tree
Hide file tree
Showing 63 changed files with 401 additions and 118 deletions.
6 changes: 0 additions & 6 deletions config/eu/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ splits: config/eu/splits.txt
mw_comment_version: 15
symbols_known: true
fill_gaps: true

block_relocations:
# extab contains these values, but they're not dtors
- target: 0x80080000
- target: 0x800A0000
- target: 0x804A0000
6 changes: 0 additions & 6 deletions config/jp/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ splits: config/jp/splits.txt
mw_comment_version: 15 # Wii Linker 1.1
symbols_known: true # Very fast analysis
fill_gaps: false # Alignments known

block_relocations:
# extab contains these values, but they're not dtors
- target: 0x80080000
- target: 0x800A0000
- target: 0x804A0000
30 changes: 15 additions & 15 deletions config/jp/splits.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ kyoshin/appgame/cf/CfCollCapsuleImpl.cpp:
extabindex start:0x80024C08 end:0x80024C14
.text start:0x800AB2E4 end:0x800AB3D0

kyoshin/appgame/cf/CfObjectColl.cpp:
kyoshin/appgame/cf/object/CfObjectColl.cpp:
extab start:0x800093C4 end:0x80009480
extabindex start:0x80024C14 end:0x80024D10
.text start:0x800AB3D0 end:0x800AC62C
Expand All @@ -484,14 +484,14 @@ kyoshin/appgame/cf/CfObjectColl.cpp:
.sbss start:0x806667A0 end:0x806667C8
.sdata2 start:0x806691D8 end:0x80669220

kyoshin/appgame/cf/CfObjectEff.cpp:
kyoshin/appgame/cf/object/CfObjectEff.cpp:
extab start:0x80009480 end:0x80009584
extabindex start:0x80024D10 end:0x80024E18
.text start:0x800AC62C end:0x800AD888
.data start:0x8052C028 end:0x8052C1E8
.sdata2 start:0x80669220 end:0x80669230

kyoshin/appgame/cf/CfObjectEne.cpp:
kyoshin/appgame/cf/object/CfObjectEne.cpp:
extab start:0x80009584 end:0x8000964C
extabindex start:0x80024E18 end:0x80024F08
.text start:0x800AD888 end:0x800B06A4
Expand All @@ -512,7 +512,7 @@ kyoshin/appgame/code_800B06A4.cpp:
.sbss start:0x806667C8 end:0x806667F0
.sdata2 start:0x80669298 end:0x80669300

kyoshin/appgame/cf/CfObjectMap.cpp:
kyoshin/appgame/cf/object/CfObjectMap.cpp:
extab start:0x80009AE4 end:0x80009B68
extabindex start:0x80025574 end:0x800255EC
.text start:0x800B9A70 end:0x800BA7E8
Expand All @@ -521,23 +521,23 @@ kyoshin/appgame/cf/CfObjectMap.cpp:
.sdata start:0x80664600 end:0x80664608
.sdata2 start:0x80669300 end:0x80669330

kyoshin/appgame/cf/CfObjectModel.cpp:
kyoshin/appgame/cf/object/CfObjectModel.cpp:
extab start:0x80009B68 end:0x80009C8C
extabindex start:0x800255EC end:0x80025784
.text start:0x800BA7E8 end:0x800BBC4C
.rodata start:0x804F7D70 end:0x804F7D78
.data start:0x8052CAE8 end:0x8052CE60
.sdata2 start:0x80669330 end:0x80669350

kyoshin/appgame/cf/CfObjectMove.cpp:
kyoshin/appgame/cf/object/CfObjectMove.cpp:
extab start:0x80009C8C end:0x80009EB8
extabindex start:0x80025784 end:0x800259DC
.text start:0x800BBC4C end:0x800BF340
.rodata start:0x804F7D78 end:0x804F7D98
.data start:0x8052CE60 end:0x8052D088
.sdata2 start:0x80669350 end:0x806693A8

kyoshin/appgame/cf/CfObjectNpc.cpp:
kyoshin/appgame/cf/object/CfObjectNpc.cpp:
extab start:0x80009EB8 end:0x80009F18
extabindex start:0x800259DC end:0x80025A30
.text start:0x800BF340 end:0x800BF98C
Expand All @@ -546,23 +546,23 @@ kyoshin/appgame/cf/CfObjectNpc.cpp:
.sdata start:0x80664608 end:0x80664610
.sdata2 start:0x806693A8 end:0x806693D0

kyoshin/appgame/cf/CfObjectObj.cpp:
kyoshin/appgame/cf/object/CfObjectObj.cpp:
extab start:0x80009F18 end:0x80009F70
extabindex start:0x80025A30 end:0x80025A78
.text start:0x800BF98C end:0x800BFC90
.rodata start:0x804F7DD8 end:0x804F7E00
.data start:0x8052D2E8 end:0x8052D570
.sdata start:0x80664610 end:0x80664620

kyoshin/appgame/cf/CfObjectPc.cpp:
kyoshin/appgame/cf/object/CfObjectPc.cpp:
extab start:0x80009F70 end:0x8000A058
extabindex start:0x80025A78 end:0x80025B98
.text start:0x800BFC90 end:0x800C1274
.rodata start:0x804F7E00 end:0x804F7E68
.data start:0x8052D570 end:0x8052DB80
.sdata2 start:0x806693D0 end:0x80669410

kyoshin/appgame/cf/CfObjectPoint.cpp:
kyoshin/appgame/cf/object/CfObjectPoint.cpp:
extab start:0x8000A058 end:0x8000A0AC
extabindex start:0x80025B98 end:0x80025BF8
.text start:0x800C1274 end:0x800C17DC
Expand Down Expand Up @@ -900,7 +900,7 @@ kyoshin/appgame/menu/CMenuLandTelop.cpp:
.sbss start:0x80666A90 end:0x80666A98
.sdata2 start:0x80669C88 end:0x80669CC0

kyoshin/appgame/cf/CBattleState.cpp:
kyoshin/appgame/cf/object/CBattleState.cpp:
extab start:0x8000CFE4 end:0x8000D04C
extabindex start:0x800282BC end:0x80028358
.text start:0x80145B1C end:0x80149780
Expand All @@ -919,7 +919,7 @@ kyoshin/appgame/menu/CMenuGetItem.cpp:
.sbss start:0x80666A98 end:0x80666AA0
.sdata2 start:0x80669CD8 end:0x80669CE8

kyoshin/appgame/cf/CAIAction.cpp:
kyoshin/appgame/cf/object/CAIAction.cpp:
extab start:0x8000D194 end:0x8000D32C
extabindex start:0x8002840C end:0x800284C0
.text start:0x8014A86C end:0x80153BEC
Expand Down Expand Up @@ -1070,7 +1070,7 @@ kyoshin/appgame/cf/CfMapEffectManager.cpp:
.sbss start:0x80666B80 end:0x80666B88
.sdata2 start:0x80669FC0 end:0x80669FF8

kyoshin/appgame/cf/CfObjectActor.cpp:
kyoshin/appgame/cf/object/CfObjectActor.cpp:
extab start:0x8000E1BC end:0x8000E254
extabindex start:0x80029204 end:0x800292AC
.text start:0x8016FE68 end:0x801725E4
Expand All @@ -1096,7 +1096,7 @@ kyoshin/appgame/cf/CfMapItemManager.cpp:
.sbss start:0x80666B88 end:0x80666B90
.sdata2 start:0x8066A040 end:0x8066A0A0

kyoshin/appgame/cf/CActorParam.cpp:
kyoshin/appgame/cf/object/CActorParam.cpp:
extab start:0x8000E380 end:0x8000E540
extabindex start:0x80029408 end:0x800295C4
.text start:0x80175264 end:0x8017ED94
Expand Down Expand Up @@ -1596,7 +1596,7 @@ kyoshin/appgame/cf/CfGimmickObject.cpp:
.sdata start:0x80664FF8 end:0x80665008
.sdata2 start:0x8066AA28 end:0x8066AA90

kyoshin/appgame/cf/CfObjectTbox.cpp:
kyoshin/appgame/cf/object/CfObjectTbox.cpp:
extab start:0x800123F8 end:0x80012438
extabindex start:0x8002C570 end:0x8002C594
.text start:0x801F8CB4 end:0x801F8E34
Expand Down
32 changes: 16 additions & 16 deletions config/jp/symbols.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19809,22 +19809,22 @@ func_800D7A04 = .text:0x800D7A04; // type:function size:0x320 scope:global align
func_800D7D24 = .text:0x800D7D24; // type:function size:0x17C scope:global align:4
func_800D7EA0 = .text:0x800D7EA0; // type:function size:0x308 scope:global align:4
func_800D81A8 = .text:0x800D81A8; // type:function size:0x354 scope:global align:4
__ct__cf_CBattleManager = .text:0x800D84FC; // type:function size:0x388 scope:global align:4
__dt__800D8884 = .text:0x800D8884; // type:function size:0x40 scope:global align:4
__dt___reslist_base_cf_CfObjectActor = .text:0x800D88C4; // type:function size:0xB4 scope:global align:4
__dt__reslist_cf_CfObjectActor = .text:0x800D8978; // type:function size:0xB8 scope:global align:4
__dt___reslist_base_cf_IBattleEvent = .text:0x800D8A30; // type:function size:0xB4 scope:global align:4
__dt__reslist_cf_IBattleEvent = .text:0x800D8AE4; // type:function size:0xB8 scope:global align:4
__dt__800D8B9C = .text:0x800D8B9C; // type:function size:0x80 scope:global align:4
__ct__Q22cf14CBattleManagerFv = .text:0x800D84FC; // type:function size:0x388 scope:global align:4
__dt__Q22cf13IFactoryEventFv = .text:0x800D8884; // type:function size:0x40 scope:global align:4
__dt__36_reslist_base<PQ22cf13CfObjectActor>Fv = .text:0x800D88C4; // type:function size:0xB4 scope:global align:4
__dt__30reslist<PQ22cf13CfObjectActor>Fv = .text:0x800D8978; // type:function size:0xB8 scope:global align:4
__dt__35_reslist_base<PQ22cf12IBattleEvent>Fv = .text:0x800D8A30; // type:function size:0xB4 scope:global align:4
__dt__29reslist<PQ22cf12IBattleEvent>Fv = .text:0x800D8AE4; // type:function size:0xB8 scope:global align:4
__dt__Q22cf17UnkClass_800D8B9CFv = .text:0x800D8B9C; // type:function size:0x80 scope:global align:4
__dt__Q22cf11CChainComboFv = .text:0x800D8C1C; // type:function size:0x40 scope:global align:4
__dt__Q22cf12CChainChanceFv = .text:0x800D8C5C; // type:function size:0x40 scope:global align:4
__dt__Q22cf11CChainTimerFv = .text:0x800D8C9C; // type:function size:0x40 scope:global align:4
__dt__Q22cf10CChainTimeFv = .text:0x800D8CDC; // type:function size:0x60 scope:global align:4
__dt__Q22cf12CChainEffectFv = .text:0x800D8D3C; // type:function size:0x40 scope:global align:4
__dt__Q22cf12CChainMemberFv = .text:0x800D8D7C; // type:function size:0x40 scope:global align:4
__dt__800D8DBC = .text:0x800D8DBC; // type:function size:0x74 scope:global align:4
__dt__Q22cf17UnkClass_800D8DBCFv = .text:0x800D8DBC; // type:function size:0x74 scope:global align:4
__dt__Q22cf10CChainTempFv = .text:0x800D8E30; // type:function size:0x40 scope:global align:4
__dt__cf_Flusher_cf_CfObjectActor = .text:0x800D8E70; // type:function size:0x40 scope:global align:4
__dt__Q22cf29Flusher<Q22cf13CfObjectActor>Fv = .text:0x800D8E70; // type:function size:0x40 scope:global align:4
__dt__Q22cf12CSuddenCommuFv = .text:0x800D8EB0; // type:function size:0x40 scope:global align:4
__dt__Q22cf14CBattleManagerFv = .text:0x800D8EF0; // type:function size:0x298 scope:global align:4
getInstance__Q22cf14CBattleManagerFv = .text:0x800D9188; // type:function size:0x8 scope:global align:4
Expand Down Expand Up @@ -22038,7 +22038,7 @@ func_801A30B8 = .text:0x801A30B8; // type:function size:0x8 scope:global align:4
func_801A30C0 = .text:0x801A30C0; // type:function size:0x8 scope:global align:4
func_801A30C8 = .text:0x801A30C8; // type:function size:0x8 scope:global align:4
func_801A30D0 = .text:0x801A30D0; // type:function size:0x8 scope:global align:4
__ct__cf_CVision = .text:0x801A30D8; // type:function size:0x2D4 scope:global align:4
__ct__Q22cf7CVisionFv = .text:0x801A30D8; // type:function size:0x2D4 scope:global align:4
__ct__801A33AC = .text:0x801A33AC; // type:function size:0x324 scope:global align:4
__dt__801A36D0 = .text:0x801A36D0; // type:function size:0x58 scope:global align:4
__dt__801A3728 = .text:0x801A3728; // type:function size:0x4C scope:global align:4
Expand Down Expand Up @@ -22202,7 +22202,7 @@ CMenuGetItemMulti_OnFileEvent = .text:0x801BA12C; // type:function size:0x8 scop
func_801BA134 = .text:0x801BA134; // type:function size:0x8 scope:global align:4
func_801BA13C = .text:0x801BA13C; // type:function size:0x8 scope:global align:4
func_801BA144 = .text:0x801BA144; // type:function size:0x8 scope:global align:4
__ct__cf_CSuddenCommu = .text:0x801BA14C; // type:function size:0x90 scope:global align:4
__ct__Q22cf12CSuddenCommuFv = .text:0x801BA14C; // type:function size:0x90 scope:global align:4
func_801BA1DC = .text:0x801BA1DC; // type:function size:0x74 scope:global align:4
func_801BA250 = .text:0x801BA250; // type:function size:0xC scope:global align:4
func_801BA25C = .text:0x801BA25C; // type:function size:0x6C scope:global align:4
Expand Down Expand Up @@ -24919,7 +24919,7 @@ func_80276CAC = .text:0x80276CAC; // type:function size:0x84 scope:global align:
func_80276D30 = .text:0x80276D30; // type:function size:0x3EC scope:global align:4
func_8027711C = .text:0x8027711C; // type:function size:0x38 scope:global align:4
func_80277154 = .text:0x80277154; // type:function size:0x20 scope:global align:4
__ct__80277174 = .text:0x80277174; // type:function size:0x118 scope:global align:4
__ct__Q22cf17UnkClass_800D8B9CFv = .text:0x80277174; // type:function size:0x118 scope:global align:4
func_8027728C = .text:0x8027728C; // type:function size:0xA0 scope:global align:4
func_8027732C = .text:0x8027732C; // type:function size:0xC0 scope:global align:4
func_802773EC = .text:0x802773EC; // type:function size:0x120 scope:global align:4
Expand Down Expand Up @@ -25007,11 +25007,11 @@ func_8027CAE0 = .text:0x8027CAE0; // type:function size:0x108 scope:global align
func_8027CBE8 = .text:0x8027CBE8; // type:function size:0x54 scope:global align:4
func_8027CC3C = .text:0x8027CC3C; // type:function size:0xCC scope:global align:4
func_8027CD08 = .text:0x8027CD08; // type:function size:0xCC scope:global align:4
__ct__cf_CChainTime = .text:0x8027CDD4; // type:function size:0x5C scope:global align:4
func_8027CE30 = .text:0x8027CE30; // type:function size:0x80 scope:global align:4
__ct__Q22cf10CChainTimeFv = .text:0x8027CDD4; // type:function size:0x5C scope:global align:4
func_8027CE30__Q22cf10CChainTimeFv = .text:0x8027CE30; // type:function size:0x80 scope:global align:4
func_8027CEB0 = .text:0x8027CEB0; // type:function size:0x8C scope:global align:4
func_8027CF3C = .text:0x8027CF3C; // type:function size:0x1AC scope:global align:4
__ct__8027D0E8 = .text:0x8027D0E8; // type:function size:0xBC scope:global align:4
__ct__Q22cf17UnkClass_800D8DBCFv = .text:0x8027D0E8; // type:function size:0xBC scope:global align:4
func_8027D1A4 = .text:0x8027D1A4; // type:function size:0x68 scope:global align:4
func_8027D20C = .text:0x8027D20C; // type:function size:0x26C scope:global align:4
func_8027D478 = .text:0x8027D478; // type:function size:0x44C scope:global align:4
Expand Down Expand Up @@ -44116,7 +44116,7 @@ lbl_806667E0 = .sbss:0x806667E0; // type:object size:0x4 scope:global align:4 da
lbl_806667E4 = .sbss:0x806667E4; // type:object size:0x4 scope:global align:4 data:4byte
lbl_806667E8 = .sbss:0x806667E8; // type:object size:0x8 scope:global align:8 data:byte
float_806667F0 = .sbss:0x806667F0; // type:object size:0x8 scope:local align:8 data:float
instance__Q22cf14CBattleManagerFv = .sbss:0x806667F8; // type:object size:0x4 scope:global align:4 data:4byte
instance__Q22cf14CBattleManager = .sbss:0x806667F8; // type:object size:0x4 scope:global align:4 data:4byte
lbl_80666800 = .sbss:0x80666800; // type:object size:0x8 scope:global align:8 data:byte
float_80666808 = .sbss:0x80666808; // type:object size:0x4 scope:local align:4 data:float
lbl_8066680C = .sbss:0x8066680C; // type:object size:0x4 scope:global align:4 data:4byte
Expand Down
6 changes: 0 additions & 6 deletions config/us/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ splits: config/us/splits.txt
mw_comment_version: 15
symbols_known: true
fill_gaps: true

block_relocations:
# extab contains these values, but they're not dtors
- target: 0x80080000
- target: 0x800A0000
- target: 0x804A0000
32 changes: 16 additions & 16 deletions configure.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
# Tool versions
config.binutils_tag = "2.42-1"
config.compilers_tag = "20240706"
config.dtk_tag = "v1.0.0"
config.dtk_tag = "v1.1.0"
config.objdiff_tag = "v2.2.1"
config.sjiswrap_tag = "v1.1.1"
config.wibo_tag = "0.6.11"
Expand Down Expand Up @@ -435,17 +435,17 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "kyoshin/appgame/cf/CfCollAABBImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfCollCylinderImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfCollCapsuleImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectColl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectEff.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectEne.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectColl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectEff.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectEne.cpp"),
Object(NonMatching, "kyoshin/appgame/code_800B06A4.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectMap.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectModel.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectMove.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectNpc.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectObj.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectPc.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectPoint.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectMap.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectModel.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectMove.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectNpc.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectObj.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectPc.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectPoint.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/code_800C17DC.cpp"),
Object(NonMatching, "kyoshin/cfsys/CfObjectImplWalker.cpp"),
Object(NonMatching, "kyoshin/cfsys/CfObjectImplPc.cpp"),
Expand Down Expand Up @@ -480,9 +480,9 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "kyoshin/appgame/cf/CfBdat.cpp"),
Object(NonMatching, "kyoshin/appgame/menu/CMenuUpdate.cpp"),
Object(NonMatching, "kyoshin/appgame/menu/CMenuLandTelop.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CBattleState.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CBattleState.cpp"),
Object(NonMatching, "kyoshin/appgame/menu/CMenuGetItem.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CAIAction.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CAIAction.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CArtsSet.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CArtsParam.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CItem.cpp"),
Expand All @@ -498,10 +498,10 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "kyoshin/appgame/cf/CfResObjImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfResReloadImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfMapEffectManager.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectActor.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectActor.cpp"),
Object(NonMatching, "kyoshin/appgame/realtimeevt/CREvtModel.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfMapItemManager.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CActorParam.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CActorParam.cpp"),
Object(NonMatching, "kyoshin/appgame/menu/CMenuZeal.cpp"),
Object(NonMatching, "kyoshin/appgame/realtimeevt/CREvtCamera.cpp"),
Object(NonMatching, "kyoshin/appgame/realtimeevt/CREvtModelMap.cpp"),
Expand Down Expand Up @@ -554,7 +554,7 @@ def nw4rLib(lib_name, objects, extra_cflags=[]):
Object(NonMatching, "kyoshin/appgame/CScrollBar.cpp"),
Object(NonMatching, "kyoshin/appgame/code_801F3BE0.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfGimmickObject.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfObjectTbox.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/object/CfObjectTbox.cpp"),
Object(NonMatching, "kyoshin/appgame/cf/CfResTboxImpl.cpp"),
Object(NonMatching, "kyoshin/appgame/CPartyStateWin.cpp"),
Object(NonMatching, "kyoshin/appgame/CModelDisp.cpp"),
Expand Down
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/CNBanner.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class CNBanner : IWorkEvent {
CNBanner();
virtual ~CNBanner();
void init();
virtual bool OnFileEvent(CEventFile* eventFile);
virtual bool OnFileEvent(CEventFile* pEventFile);
void func_804F52F8(const char* str);
void func_804F5304(const char* str);
void func_804F5310(const char* str);
Expand Down
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/CPackItem.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class CPackItem : IWorkEvent {
public:
CPackItem(const char* name, UNKWORD r5);
virtual ~CPackItem();
virtual bool OnFileEvent(CEventFile* eventFile);
virtual bool OnFileEvent(CEventFile* pEventFile);

void update();
bool func_804DE78C(const char* filename, char** r5, u32* r6, u32* r7, u32* r8);
Expand Down
2 changes: 1 addition & 1 deletion libs/monolib/include/monolib/IWorkEvent.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class IWorkEvent {
public:
virtual ~IWorkEvent(){}
virtual bool WorkEvent1(){ return false; }
virtual bool OnFileEvent(CEventFile* eventFile){ return false; }
virtual bool OnFileEvent(CEventFile* pEventFile){ return false; }
virtual bool WorkEvent3(){ return false; }
virtual bool WorkEvent4(){ return false; }
virtual void WorkEvent5(UNKTYPE* r4){}
Expand Down
6 changes: 3 additions & 3 deletions libs/monolib/src/CPackItem.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@ void CPackItem::func_804DE948() {
}
}

bool CPackItem::OnFileEvent(CEventFile* eventFile){
if(eventFile->mFileHandle == mFileHandle){
if(eventFile->unk0 == 1){
bool CPackItem::OnFileEvent(CEventFile* pEventFile){
if(pEventFile->mFileHandle == mFileHandle){
if(pEventFile->unk0 == 1){
void* data = mFileHandle->data;
mFileHandle->data = nullptr;
mPackHeader = static_cast<PackHeader*>(data);
Expand Down
Loading

0 comments on commit bc89def

Please sign in to comment.