diff --git a/config/RSBE01_02/rels/sora_enemy/splits.txt b/config/RSBE01_02/rels/sora_enemy/splits.txt index 4d870ba..173e993 100644 --- a/config/RSBE01_02/rels/sora_enemy/splits.txt +++ b/config/RSBE01_02/rels/sora_enemy/splits.txt @@ -62,6 +62,13 @@ mo_enemy/sora_enemy/killer/em_killer_param_accesser.cpp: .data start:0x000084B8 end:0x00008518 .bss start:0x000002F0 end:0x00000308 +mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp: + .text start:0x000395FC end:0x0003986C + .ctors start:0x00000048 end:0x0000004C + .rodata start:0x00000EC0 end:0x00000EC8 + .data start:0x000094B8 end:0x00009518 + .bss start:0x00000348 end:0x00000360 + mo_enemy/sora_enemy/cymal/em_cymal_param_accesser.cpp: .text start:0x0003A3E0 end:0x0003A618 .ctors start:0x00000054 end:0x00000058 @@ -69,9 +76,44 @@ mo_enemy/sora_enemy/cymal/em_cymal_param_accesser.cpp: .data start:0x00009A18 end:0x00009A78 .bss start:0x00000388 end:0x000003A0 +mo_enemy/sora_enemy/dekakuribo/em_dekakuribo_param_accesser.cpp: + .text start:0x0003BFE0 end:0x0003C27C + .ctors start:0x0000005C end:0x00000060 + .rodata start:0x00000EE8 end:0x00000EF0 + .data start:0x0000A7D0 end:0x0000A838 + .bss start:0x000003B8 end:0x000003D0 + +mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp: + .text start:0x0003C7A0 end:0x0003CA40 + .ctors start:0x00000060 end:0x00000064 + .rodata start:0x00000EF8 end:0x00000F00 + .data start:0x0000AA88 end:0x0000AB08 + .bss start:0x000003D0 end:0x000003E8 + +mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp: + .text start:0x0003F34C end:0x0003F5D8 + .ctors start:0x0000006C end:0x00000070 + .rodata start:0x00000F20 end:0x00000F28 + .data start:0x0000BD18 end:0x0000BDA0 + .bss start:0x00000410 end:0x00000428 + mo_enemy/sora_enemy/wnem/wn_em_report.cpp: .text start:0x0004833C end:0x0004838C +mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp: + .text start:0x00048B34 end:0x00048DD8 + .ctors start:0x00000088 end:0x0000008C + .rodata start:0x00001040 end:0x00001048 + .data start:0x0000F238 end:0x0000F2B8 + .bss start:0x00000550 end:0x00000568 + +mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp: + .text start:0x00049564 end:0x000497D4 + .ctors start:0x00000090 end:0x00000094 + .rodata start:0x00001058 end:0x00001060 + .data start:0x0000F7D8 end:0x0000F838 + .bss start:0x00000580 end:0x00000598 + mo_enemy/sora_enemy/teckin/em_teckin_param_accesser.cpp: .text start:0x000499C8 end:0x00049C24 .ctors start:0x00000094 end:0x00000098 @@ -93,6 +135,13 @@ mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp: .data start:0x000127F8 end:0x00012878 .bss start:0x000005F8 end:0x00000610 +mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp: + .text start:0x0004F9D0 end:0x0004FCAC + .ctors start:0x000000A8 end:0x000000AC + .rodata start:0x000010A0 end:0x000010A8 + .data start:0x00012AC8 end:0x00012B70 + .bss start:0x00000610 end:0x00000628 + mo_enemy/sora_enemy/faulong/em_faulong_param_accesser.cpp: .text start:0x0004FEA0 end:0x00050108 .ctors start:0x000000AC end:0x000000B0 @@ -107,6 +156,13 @@ mo_enemy/sora_enemy/patapata/em_patapata_param_accesser.cpp: .data start:0x00013350 end:0x000133D0 .bss start:0x00000668 end:0x00000680 +mo_enemy/sora_enemy/jdus/em_jdus_param_accesser.cpp: + .text start:0x000514C4 end:0x00051734 + .ctors start:0x000000BC end:0x000000C0 + .rodata start:0x000010C8 end:0x000010D0 + .data start:0x00013620 end:0x000136A8 + .bss start:0x00000680 end:0x00000698 + mo_enemy/sora_enemy/ghamgha/em_ghamgha_param_accesser.cpp: .text start:0x00052A70 end:0x00052CF0 .ctors start:0x000000C0 end:0x000000C4 @@ -121,6 +177,20 @@ mo_enemy/sora_enemy/robobeam/em_robobeam_param_accesser.cpp: .data start:0x00014B08 end:0x00014B88 .bss start:0x000006B0 end:0x000006C8 +mo_enemy/sora_enemy/robodistance/em_robodistance_param_accesser.cpp: + .text start:0x00055080 end:0x000552CC + .ctors start:0x000000C8 end:0x000000CC + .rodata start:0x000010E8 end:0x000010F0 + .data start:0x00015340 end:0x000153A8 + .bss start:0x000006C8 end:0x000006E0 + +mo_enemy/sora_enemy/robohoming/em_robohoming_param_accesser.cpp: + .text start:0x000565B0 end:0x000567FC + .ctors start:0x000000CC end:0x000000D0 + .rodata start:0x000010F0 end:0x000010F8 + .data start:0x00015DA0 end:0x00015E08 + .bss start:0x000006E0 end:0x000006F8 + mo_enemy/sora_enemy/robopunch/em_robopunch_param_accesser.cpp: .text start:0x000569F0 end:0x00056C24 .ctors start:0x000000D0 end:0x000000D4 diff --git a/config/RSBE01_02/rels/sora_enemy/symbols.txt b/config/RSBE01_02/rels/sora_enemy/symbols.txt index c50df6e..c6bab69 100644 --- a/config/RSBE01_02/rels/sora_enemy/symbols.txt +++ b/config/RSBE01_02/rels/sora_enemy/symbols.txt @@ -1570,12 +1570,12 @@ fn_41_393C0 = .text:0x000393C0; // type:function size:0x48 __ct__9emJyakeelFUlP8emCreate = .text:0x00039408; // type:function size:0x134 fn_41_3953C = .text:0x0003953C; // type:function size:0xB8 fn_41_395F4 = .text:0x000395F4; // type:function size:0x8 -fn_41_395FC = .text:0x000395FC; // type:function size:0x48 -fn_41_39644 = .text:0x00039644; // type:function size:0x4C -fn_41_39690 = .text:0x00039690; // type:function size:0x80 -fn_41_39710 = .text:0x00039710; // type:function size:0xB8 -fn_41_397C8 = .text:0x000397C8; // type:function size:0x5C -fn_41_39824 = .text:0x00039824; // type:function size:0x48 +__ct__22emJyakeelParamAccesserFv = .text:0x000395FC; // type:function size:0x48 +getParamFloat__22emJyakeelParamAccesserFP16soModuleAccesserl = .text:0x00039644; // type:function size:0x4C +getParamInt__22emJyakeelParamAccesserFP16soModuleAccesserl = .text:0x00039690; // type:function size:0x80 +getParamIndefinite__22emJyakeelParamAccesserFP16soModuleAccesserl = .text:0x00039710; // type:function size:0xB8 +__dt__22emJyakeelParamAccesserFv = .text:0x000397C8; // type:function size:0x5C +__sinit_\em_jyakeel_param_accesser_cpp = .text:0x00039824; // type:function size:0x48 scope:local __ct__9emAroarosFUlP8emCreate = .text:0x0003986C; // type:function size:0x168 fn_41_399D4 = .text:0x000399D4; // type:function size:0xB8 fn_41_39A8C = .text:0x00039A8C; // type:function size:0x220 @@ -1638,12 +1638,12 @@ fn_41_3BD8C = .text:0x0003BD8C; // type:function size:0xB8 fn_41_3BE44 = .text:0x0003BE44; // type:function size:0x18C fn_41_3BFD0 = .text:0x0003BFD0; // type:function size:0x8 fn_41_3BFD8 = .text:0x0003BFD8; // type:function size:0x8 -fn_41_3BFE0 = .text:0x0003BFE0; // type:function size:0x48 -fn_41_3C028 = .text:0x0003C028; // type:function size:0xB0 -fn_41_3C0D8 = .text:0x0003C0D8; // type:function size:0x48 -fn_41_3C120 = .text:0x0003C120; // type:function size:0xB8 -fn_41_3C1D8 = .text:0x0003C1D8; // type:function size:0x5C -fn_41_3C234 = .text:0x0003C234; // type:function size:0x48 +__ct__25emDekakuriboParamAccesserFv = .text:0x0003BFE0; // type:function size:0x48 +getParamFloat__25emDekakuriboParamAccesserFP16soModuleAccesserl = .text:0x0003C028; // type:function size:0xB0 +getParamInt__25emDekakuriboParamAccesserFP16soModuleAccesserl = .text:0x0003C0D8; // type:function size:0x48 +getParamIndefinite__25emDekakuriboParamAccesserFP16soModuleAccesserl = .text:0x0003C120; // type:function size:0xB8 +__dt__25emDekakuriboParamAccesserFv = .text:0x0003C1D8; // type:function size:0x5C +__sinit_\em_dekakuribo_param_accesser_cpp = .text:0x0003C234; // type:function size:0x48 scope:local __ct__10emBucyulusFUlP8emCreate = .text:0x0003C27C; // type:function size:0x134 fn_41_3C3B0 = .text:0x0003C3B0; // type:function size:0xB8 fn_41_3C468 = .text:0x0003C468; // type:function size:0x248 @@ -1651,12 +1651,12 @@ fn_41_3C6B0 = .text:0x0003C6B0; // type:function size:0xD8 fn_41_3C788 = .text:0x0003C788; // type:function size:0x8 fn_41_3C790 = .text:0x0003C790; // type:function size:0x8 fn_41_3C798 = .text:0x0003C798; // type:function size:0x8 -fn_41_3C7A0 = .text:0x0003C7A0; // type:function size:0x48 -fn_41_3C7E8 = .text:0x0003C7E8; // type:function size:0xC0 -fn_41_3C8A8 = .text:0x0003C8A8; // type:function size:0x48 -fn_41_3C8F0 = .text:0x0003C8F0; // type:function size:0xAC -fn_41_3C99C = .text:0x0003C99C; // type:function size:0x5C -fn_41_3C9F8 = .text:0x0003C9F8; // type:function size:0x48 +__ct__23emBucyulusParamAccesserFv = .text:0x0003C7A0; // type:function size:0x48 +getParamFloat__23emBucyulusParamAccesserFP16soModuleAccesserl = .text:0x0003C7E8; // type:function size:0xC0 +getParamInt__23emBucyulusParamAccesserFP16soModuleAccesserl = .text:0x0003C8A8; // type:function size:0x48 +getParamIndefinite__23emBucyulusParamAccesserFP16soModuleAccesserl = .text:0x0003C8F0; // type:function size:0xAC +__dt__23emBucyulusParamAccesserFv = .text:0x0003C99C; // type:function size:0x5C +__sinit_\em_bucyulus_param_accesser_cpp = .text:0x0003C9F8; // type:function size:0x48 scope:local __ct__8emBotronFUlP8emCreate = .text:0x0003CA40; // type:function size:0x1BC fn_41_3CBFC = .text:0x0003CBFC; // type:function size:0x60 fn_41_3CC5C = .text:0x0003CC5C; // type:function size:0x6C @@ -1712,12 +1712,12 @@ fn_41_3F32C = .text:0x0003F32C; // type:function size:0x8 fn_41_3F334 = .text:0x0003F334; // type:function size:0x8 fn_41_3F33C = .text:0x0003F33C; // type:function size:0x8 fn_41_3F344 = .text:0x0003F344; // type:function size:0x8 -fn_41_3F34C = .text:0x0003F34C; // type:function size:0x48 -fn_41_3F394 = .text:0x0003F394; // type:function size:0x70 -fn_41_3F404 = .text:0x0003F404; // type:function size:0x6C -fn_41_3F470 = .text:0x0003F470; // type:function size:0xC4 -fn_41_3F534 = .text:0x0003F534; // type:function size:0x5C -fn_41_3F590 = .text:0x0003F590; // type:function size:0x48 +__ct__21emGyraanParamAccesserFv = .text:0x0003F34C; // type:function size:0x48 +getParamFloat__21emGyraanParamAccesserFP16soModuleAccesserl = .text:0x0003F394; // type:function size:0x70 +getParamInt__21emGyraanParamAccesserFP16soModuleAccesserl = .text:0x0003F404; // type:function size:0x6C +getParamIndefinite__21emGyraanParamAccesserFP16soModuleAccesserl = .text:0x0003F470; // type:function size:0xC4 +__dt__21emGyraanParamAccesserFv = .text:0x0003F534; // type:function size:0x5C +__sinit_\em_gyraan_param_accesser_cpp = .text:0x0003F590; // type:function size:0x48 scope:local __ct__6emMiteFUlP8emCreate = .text:0x0003F5D8; // type:function size:0x134 fn_41_3F70C = .text:0x0003F70C; // type:function size:0xB8 fn_41_3F7C4 = .text:0x0003F7C4; // type:function size:0x8 @@ -1884,12 +1884,12 @@ fn_41_488F8 = .text:0x000488F8; // type:function size:0x48 __ct__7emFlowsFUlP8emCreate = .text:0x00048940; // type:function size:0x134 fn_41_48A74 = .text:0x00048A74; // type:function size:0xB8 fn_41_48B2C = .text:0x00048B2C; // type:function size:0x8 -fn_41_48B34 = .text:0x00048B34; // type:function size:0x48 -fn_41_48B7C = .text:0x00048B7C; // type:function size:0x4C -fn_41_48BC8 = .text:0x00048BC8; // type:function size:0xB4 -fn_41_48C7C = .text:0x00048C7C; // type:function size:0xB8 -fn_41_48D34 = .text:0x00048D34; // type:function size:0x5C -fn_41_48D90 = .text:0x00048D90; // type:function size:0x48 +__ct__20emFlowsParamAccesserFv = .text:0x00048B34; // type:function size:0x48 +getParamFloat__20emFlowsParamAccesserFP16soModuleAccesserl = .text:0x00048B7C; // type:function size:0x4C +getParamInt__20emFlowsParamAccesserFP16soModuleAccesserl = .text:0x00048BC8; // type:function size:0xB4 +getParamIndefinite__20emFlowsParamAccesserFP16soModuleAccesserl = .text:0x00048C7C; // type:function size:0xB8 +__dt__20emFlowsParamAccesserFv = .text:0x00048D34; // type:function size:0x5C +__sinit_\em_flows_param_accesser_cpp = .text:0x00048D90; // type:function size:0x48 scope:local __ct__8emTautauFUlP8emCreate = .text:0x00048DD8; // type:function size:0x134 fn_41_48F0C = .text:0x00048F0C; // type:function size:0xB8 fn_41_48FC4 = .text:0x00048FC4; // type:function size:0x8 @@ -1902,12 +1902,12 @@ fn_41_49328 = .text:0x00049328; // type:function size:0x48 __ct__8emShellyFUlP8emCreate = .text:0x00049370; // type:function size:0x134 fn_41_494A4 = .text:0x000494A4; // type:function size:0xB8 fn_41_4955C = .text:0x0004955C; // type:function size:0x8 -fn_41_49564 = .text:0x00049564; // type:function size:0x48 -fn_41_495AC = .text:0x000495AC; // type:function size:0x84 -fn_41_49630 = .text:0x00049630; // type:function size:0x48 -fn_41_49678 = .text:0x00049678; // type:function size:0xB8 -fn_41_49730 = .text:0x00049730; // type:function size:0x5C -fn_41_4978C = .text:0x0004978C; // type:function size:0x48 +__ct__21emShellyParamAccesserFv = .text:0x00049564; // type:function size:0x48 +getParamFloat__21emShellyParamAccesserFP16soModuleAccesserl = .text:0x000495AC; // type:function size:0x84 +getParamInt__21emShellyParamAccesserFP16soModuleAccesserl = .text:0x00049630; // type:function size:0x48 +getParamIndefinite__21emShellyParamAccesserFP16soModuleAccesserl = .text:0x00049678; // type:function size:0xB8 +__dt__21emShellyParamAccesserFv = .text:0x00049730; // type:function size:0x5C +__sinit_\em_shelly_param_accesser_cpp = .text:0x0004978C; // type:function size:0x48 scope:local __ct__8emTeckinFUlP8emCreate = .text:0x000497D4; // type:function size:0x134 fn_41_49908 = .text:0x00049908; // type:function size:0xB8 fn_41_499C0 = .text:0x000499C0; // type:function size:0x8 @@ -2048,12 +2048,12 @@ __sinit_\em_bombhead_param_accesser_cpp = .text:0x0004F794; // type:function siz __ct__8emNgagogFUlP8emCreate = .text:0x0004F7DC; // type:function size:0x134 fn_41_4F910 = .text:0x0004F910; // type:function size:0xB8 fn_41_4F9C8 = .text:0x0004F9C8; // type:function size:0x8 -fn_41_4F9D0 = .text:0x0004F9D0; // type:function size:0x48 -fn_41_4FA18 = .text:0x0004FA18; // type:function size:0xC0 -fn_41_4FAD8 = .text:0x0004FAD8; // type:function size:0x6C -fn_41_4FB44 = .text:0x0004FB44; // type:function size:0xC4 -fn_41_4FC08 = .text:0x0004FC08; // type:function size:0x5C -fn_41_4FC64 = .text:0x0004FC64; // type:function size:0x48 +__ct__21emNgagogParamAccesserFv = .text:0x0004F9D0; // type:function size:0x48 +getParamFloat__21emNgagogParamAccesserFP16soModuleAccesserl = .text:0x0004FA18; // type:function size:0xC0 +getParamInt__21emNgagogParamAccesserFP16soModuleAccesserl = .text:0x0004FAD8; // type:function size:0x6C +getParamIndefinite__21emNgagogParamAccesserFP16soModuleAccesserl = .text:0x0004FB44; // type:function size:0xC4 +__dt__21emNgagogParamAccesserFv = .text:0x0004FC08; // type:function size:0x5C +__sinit_\em_ngagog_param_accesser_cpp = .text:0x0004FC64; // type:function size:0x48 scope:local __ct__9emFaulongFUlP8emCreate = .text:0x0004FCAC; // type:function size:0x134 fn_41_4FDE0 = .text:0x0004FDE0; // type:function size:0xB8 fn_41_4FE98 = .text:0x0004FE98; // type:function size:0x8 @@ -2090,12 +2090,12 @@ __sinit_\em_patapata_param_accesser_cpp = .text:0x00051288; // type:function siz __ct__6emJdusFUlP8emCreate = .text:0x000512D0; // type:function size:0x134 fn_41_51404 = .text:0x00051404; // type:function size:0xB8 fn_41_514BC = .text:0x000514BC; // type:function size:0x8 -fn_41_514C4 = .text:0x000514C4; // type:function size:0x48 -fn_41_5150C = .text:0x0005150C; // type:function size:0x4C -fn_41_51558 = .text:0x00051558; // type:function size:0x6C -fn_41_515C4 = .text:0x000515C4; // type:function size:0xCC -fn_41_51690 = .text:0x00051690; // type:function size:0x5C -fn_41_516EC = .text:0x000516EC; // type:function size:0x48 +__ct__19emJdusParamAccesserFv = .text:0x000514C4; // type:function size:0x48 +getParamFloat__19emJdusParamAccesserFP16soModuleAccesserl = .text:0x0005150C; // type:function size:0x4C +getParamInt__19emJdusParamAccesserFP16soModuleAccesserl = .text:0x00051558; // type:function size:0x6C +getParamIndefinite__19emJdusParamAccesserFP16soModuleAccesserl = .text:0x000515C4; // type:function size:0xCC +__dt__19emJdusParamAccesserFv = .text:0x00051690; // type:function size:0x5C +__sinit_\em_jdus_param_accesser_cpp = .text:0x000516EC; // type:function size:0x48 scope:local __ct__9emGhamghaFUlP8emCreate = .text:0x00051734; // type:function size:0x1F0 fn_41_51924 = .text:0x00051924; // type:function size:0x60 fn_41_51984 = .text:0x00051984; // type:function size:0x6C @@ -2176,12 +2176,12 @@ fn_41_55050 = .text:0x00055050; // type:function size:0x18 fn_41_55068 = .text:0x00055068; // type:function size:0x8 fn_41_55070 = .text:0x00055070; // type:function size:0x8 fn_41_55078 = .text:0x00055078; // type:function size:0x8 -fn_41_55080 = .text:0x00055080; // type:function size:0x48 -fn_41_550C8 = .text:0x000550C8; // type:function size:0x4C -fn_41_55114 = .text:0x00055114; // type:function size:0x48 -fn_41_5515C = .text:0x0005515C; // type:function size:0xCC -fn_41_55228 = .text:0x00055228; // type:function size:0x5C -fn_41_55284 = .text:0x00055284; // type:function size:0x48 +__ct__27emRobodistanceParamAccesserFv = .text:0x00055080; // type:function size:0x48 +getParamFloat__27emRobodistanceParamAccesserFP16soModuleAccesserl = .text:0x000550C8; // type:function size:0x4C +getParamInt__27emRobodistanceParamAccesserFP16soModuleAccesserl = .text:0x00055114; // type:function size:0x48 +getParamIndefinite__27emRobodistanceParamAccesserFP16soModuleAccesserl = .text:0x0005515C; // type:function size:0xCC +__dt__27emRobodistanceParamAccesserFv = .text:0x00055228; // type:function size:0x5C +__sinit_\em_robodistance_param_accesser_cpp = .text:0x00055284; // type:function size:0x48 scope:local __ct__12emRobohomingFUlP8emCreate = .text:0x000552CC; // type:function size:0x1F0 fn_41_554BC = .text:0x000554BC; // type:function size:0x60 fn_41_5551C = .text:0x0005551C; // type:function size:0x6C @@ -2207,12 +2207,12 @@ fn_41_56540 = .text:0x00056540; // type:function size:0x58 fn_41_56598 = .text:0x00056598; // type:function size:0x8 fn_41_565A0 = .text:0x000565A0; // type:function size:0x8 fn_41_565A8 = .text:0x000565A8; // type:function size:0x8 -fn_41_565B0 = .text:0x000565B0; // type:function size:0x48 -fn_41_565F8 = .text:0x000565F8; // type:function size:0x4C -fn_41_56644 = .text:0x00056644; // type:function size:0x48 -fn_41_5668C = .text:0x0005668C; // type:function size:0xCC -fn_41_56758 = .text:0x00056758; // type:function size:0x5C -fn_41_567B4 = .text:0x000567B4; // type:function size:0x48 +__ct__25emRobohomingParamAccesserFv = .text:0x000565B0; // type:function size:0x48 +getParamFloat__25emRobohomingParamAccesserFP16soModuleAccesserl = .text:0x000565F8; // type:function size:0x4C +getParamInt__25emRobohomingParamAccesserFP16soModuleAccesserl = .text:0x00056644; // type:function size:0x48 +getParamIndefinite__25emRobohomingParamAccesserFP16soModuleAccesserl = .text:0x0005668C; // type:function size:0xCC +__dt__25emRobohomingParamAccesserFv = .text:0x00056758; // type:function size:0x5C +__sinit_\em_robohoming_param_accesser_cpp = .text:0x000567B4; // type:function size:0x48 scope:local __ct__11emRobopunchFUlP8emCreate = .text:0x000567FC; // type:function size:0x134 fn_41_56930 = .text:0x00056930; // type:function size:0xB8 fn_41_569E8 = .text:0x000569E8; // type:function size:0x8 @@ -3557,10 +3557,10 @@ lbl_41_data_9268 = .data:0x00009268; // type:object size:0x1A0 lbl_41_data_9408 = .data:0x00009408; // type:object size:0xC lbl_41_data_9414 = .data:0x00009414; // type:object size:0x9C lbl_41_data_94B0 = .data:0x000094B0; // type:object size:0x8 -lbl_41_data_94B8 = .data:0x000094B8; // type:object size:0x24 +__vt__22emJyakeelParamAccesser = .data:0x000094B8; // type:object size:0x24 lbl_41_data_94DC = .data:0x000094DC; // type:object size:0x18 lbl_41_data_94F4 = .data:0x000094F4; // type:object size:0x1C -lbl_41_data_9510 = .data:0x00009510; // type:object size:0x8 +__RTTI__22emJyakeelParamAccesser = .data:0x00009510; // type:object size:0x8 lbl_41_data_9518 = .data:0x00009518; // type:object size:0x1A0 lbl_41_data_96B8 = .data:0x000096B8; // type:object size:0xC lbl_41_data_96C4 = .data:0x000096C4; // type:object size:0x9C @@ -3628,19 +3628,19 @@ lbl_41_data_A578 = .data:0x0000A578; // type:object size:0x1A0 lbl_41_data_A718 = .data:0x0000A718; // type:object size:0x10 lbl_41_data_A728 = .data:0x0000A728; // type:object size:0x9C lbl_41_data_A7C4 = .data:0x0000A7C4; // type:object size:0xC -lbl_41_data_A7D0 = .data:0x0000A7D0; // type:object size:0x24 +__vt__25emDekakuriboParamAccesser = .data:0x0000A7D0; // type:object size:0x24 lbl_41_data_A7F4 = .data:0x0000A7F4; // type:object size:0x1C lbl_41_data_A810 = .data:0x0000A810; // type:object size:0x1C -lbl_41_data_A82C = .data:0x0000A82C; // type:object size:0xC +__RTTI__25emDekakuriboParamAccesser = .data:0x0000A82C; // type:object size:0xC lbl_41_data_A838 = .data:0x0000A838; // type:object size:0x1A0 lbl_41_data_A9D8 = .data:0x0000A9D8; // type:object size:0xC lbl_41_data_A9E4 = .data:0x0000A9E4; // type:object size:0x9C lbl_41_data_AA80 = .data:0x0000AA80; // type:object size:0x8 jumptable_41_data_AA88 = .data:0x0000AA88; // type:object size:0x20 scope:local -lbl_41_data_AAA8 = .data:0x0000AAA8; // type:object size:0x24 +__vt__23emBucyulusParamAccesser = .data:0x0000AAA8; // type:object size:0x24 lbl_41_data_AACC = .data:0x0000AACC; // type:object size:0x18 data:string lbl_41_data_AAE4 = .data:0x0000AAE4; // type:object size:0x1C -lbl_41_data_AB00 = .data:0x0000AB00; // type:object size:0x8 +__RTTI__23emBucyulusParamAccesser = .data:0x0000AB00; // type:object size:0x8 lbl_41_data_AB08 = .data:0x0000AB08; // type:object size:0x1A0 lbl_41_data_ACA8 = .data:0x0000ACA8; // type:object size:0xC lbl_41_data_ACB4 = .data:0x0000ACB4; // type:object size:0x9C @@ -3713,10 +3713,10 @@ jumptable_41_data_BC48 = .data:0x0000BC48; // type:object size:0x44 scope:local jumptable_41_data_BC8C = .data:0x0000BC8C; // type:object size:0x44 scope:local jumptable_41_data_BCD0 = .data:0x0000BCD0; // type:object size:0x44 scope:local jumptable_41_data_BD18 = .data:0x0000BD18; // type:object size:0x24 scope:local -lbl_41_data_BD3C = .data:0x0000BD3C; // type:object size:0x24 +__vt__21emGyraanParamAccesser = .data:0x0000BD3C; // type:object size:0x24 lbl_41_data_BD60 = .data:0x0000BD60; // type:object size:0x18 lbl_41_data_BD78 = .data:0x0000BD78; // type:object size:0x1C -lbl_41_data_BD94 = .data:0x0000BD94; // type:object size:0xC +__RTTI__21emGyraanParamAccesser = .data:0x0000BD94; // type:object size:0xC lbl_41_data_BDA0 = .data:0x0000BDA0; // type:object size:0x1A0 lbl_41_data_BF40 = .data:0x0000BF40; // type:object size:0x8 lbl_41_data_BF48 = .data:0x0000BF48; // type:object size:0x9C @@ -3906,10 +3906,10 @@ lbl_41_data_F188 = .data:0x0000F188; // type:object size:0x8 data:string lbl_41_data_F190 = .data:0x0000F190; // type:object size:0x9C lbl_41_data_F22C = .data:0x0000F22C; // type:object size:0xC jumptable_41_data_F238 = .data:0x0000F238; // type:object size:0x1C scope:local -lbl_41_data_F254 = .data:0x0000F254; // type:object size:0x24 +__vt__20emFlowsParamAccesser = .data:0x0000F254; // type:object size:0x24 lbl_41_data_F278 = .data:0x0000F278; // type:object size:0x18 lbl_41_data_F290 = .data:0x0000F290; // type:object size:0x1C -lbl_41_data_F2AC = .data:0x0000F2AC; // type:object size:0xC +__RTTI__20emFlowsParamAccesser = .data:0x0000F2AC; // type:object size:0xC lbl_41_data_F2B8 = .data:0x0000F2B8; // type:object size:0x1A0 lbl_41_data_F458 = .data:0x0000F458; // type:object size:0xC lbl_41_data_F464 = .data:0x0000F464; // type:object size:0x9C @@ -3923,10 +3923,10 @@ lbl_41_data_F588 = .data:0x0000F588; // type:object size:0x1A0 lbl_41_data_F728 = .data:0x0000F728; // type:object size:0xC lbl_41_data_F734 = .data:0x0000F734; // type:object size:0x9C lbl_41_data_F7D0 = .data:0x0000F7D0; // type:object size:0x8 -lbl_41_data_F7D8 = .data:0x0000F7D8; // type:object size:0x24 +__vt__21emShellyParamAccesser = .data:0x0000F7D8; // type:object size:0x24 lbl_41_data_F7FC = .data:0x0000F7FC; // type:object size:0x18 lbl_41_data_F814 = .data:0x0000F814; // type:object size:0x1C -lbl_41_data_F830 = .data:0x0000F830; // type:object size:0x8 +__RTTI__21emShellyParamAccesser = .data:0x0000F830; // type:object size:0x8 lbl_41_data_F838 = .data:0x0000F838; // type:object size:0x1A0 lbl_41_data_F9D8 = .data:0x0000F9D8; // type:object size:0xC lbl_41_data_F9E4 = .data:0x0000F9E4; // type:object size:0x9C @@ -4127,10 +4127,10 @@ lbl_41_data_12A24 = .data:0x00012A24; // type:object size:0x9C lbl_41_data_12AC0 = .data:0x00012AC0; // type:object size:0x8 jumptable_41_data_12AC8 = .data:0x00012AC8; // type:object size:0x20 scope:local jumptable_41_data_12AE8 = .data:0x00012AE8; // type:object size:0x24 scope:local -lbl_41_data_12B0C = .data:0x00012B0C; // type:object size:0x24 +__vt__21emNgagogParamAccesser = .data:0x00012B0C; // type:object size:0x24 lbl_41_data_12B30 = .data:0x00012B30; // type:object size:0x18 lbl_41_data_12B48 = .data:0x00012B48; // type:object size:0x1C -lbl_41_data_12B64 = .data:0x00012B64; // type:object size:0xC +__RTTI__21emNgagogParamAccesser = .data:0x00012B64; // type:object size:0xC lbl_41_data_12B70 = .data:0x00012B70; // type:object size:0x1A0 lbl_41_data_12D10 = .data:0x00012D10; // type:object size:0xC lbl_41_data_12D1C = .data:0x00012D1C; // type:object size:0x9C @@ -4162,10 +4162,10 @@ lbl_41_data_13570 = .data:0x00013570; // type:object size:0x8 lbl_41_data_13578 = .data:0x00013578; // type:object size:0x9C lbl_41_data_13614 = .data:0x00013614; // type:object size:0xC jumptable_41_data_13620 = .data:0x00013620; // type:object size:0x28 scope:local -lbl_41_data_13648 = .data:0x00013648; // type:object size:0x24 +__vt__19emJdusParamAccesser = .data:0x00013648; // type:object size:0x24 lbl_41_data_1366C = .data:0x0001366C; // type:object size:0x14 data:string lbl_41_data_13680 = .data:0x00013680; // type:object size:0x1C -lbl_41_data_1369C = .data:0x0001369C; // type:object size:0xC +__RTTI__19emJdusParamAccesser = .data:0x0001369C; // type:object size:0xC lbl_41_data_136A8 = .data:0x000136A8; // type:object size:0x1A0 lbl_41_data_13848 = .data:0x00013848; // type:object size:0xC lbl_41_data_13854 = .data:0x00013854; // type:object size:0x9C @@ -4281,10 +4281,10 @@ jumptable_41_data_15230 = .data:0x00015230; // type:object size:0x44 scope:local jumptable_41_data_15274 = .data:0x00015274; // type:object size:0x44 scope:local jumptable_41_data_152B8 = .data:0x000152B8; // type:object size:0x44 scope:local jumptable_41_data_152FC = .data:0x000152FC; // type:object size:0x44 scope:local -lbl_41_data_15340 = .data:0x00015340; // type:object size:0x24 +__vt__27emRobodistanceParamAccesser = .data:0x00015340; // type:object size:0x24 lbl_41_data_15364 = .data:0x00015364; // type:object size:0x1C data:string lbl_41_data_15380 = .data:0x00015380; // type:object size:0x1C -lbl_41_data_1539C = .data:0x0001539C; // type:object size:0xC +__RTTI__27emRobodistanceParamAccesser = .data:0x0001539C; // type:object size:0xC lbl_41_data_153A8 = .data:0x000153A8; // type:object size:0x1A0 lbl_41_data_15548 = .data:0x00015548; // type:object size:0x10 lbl_41_data_15558 = .data:0x00015558; // type:object size:0x9C @@ -4324,10 +4324,10 @@ jumptable_41_data_15C90 = .data:0x00015C90; // type:object size:0x44 scope:local jumptable_41_data_15CD4 = .data:0x00015CD4; // type:object size:0x44 scope:local jumptable_41_data_15D18 = .data:0x00015D18; // type:object size:0x44 scope:local jumptable_41_data_15D5C = .data:0x00015D5C; // type:object size:0x44 scope:local -lbl_41_data_15DA0 = .data:0x00015DA0; // type:object size:0x24 +__vt__25emRobohomingParamAccesser = .data:0x00015DA0; // type:object size:0x24 lbl_41_data_15DC4 = .data:0x00015DC4; // type:object size:0x1C lbl_41_data_15DE0 = .data:0x00015DE0; // type:object size:0x1C -lbl_41_data_15DFC = .data:0x00015DFC; // type:object size:0xC +__RTTI__25emRobohomingParamAccesser = .data:0x00015DFC; // type:object size:0xC lbl_41_data_15E08 = .data:0x00015E08; // type:object size:0x1A0 lbl_41_data_15FA8 = .data:0x00015FA8; // type:object size:0xC data:string lbl_41_data_15FB4 = .data:0x00015FB4; // type:object size:0x9C @@ -5076,7 +5076,7 @@ lbl_41_bss_324 = .bss:0x00000324; // type:object size:0xC lbl_41_bss_330 = .bss:0x00000330; // type:object size:0xC lbl_41_bss_33C = .bss:0x0000033C; // type:object size:0xC lbl_41_bss_348 = .bss:0x00000348; // type:object size:0xC -lbl_41_bss_354 = .bss:0x00000354; // type:object size:0xC +g_emJykParamAccesser = .bss:0x00000354; // type:object size:0xC lbl_41_bss_360 = .bss:0x00000360; // type:object size:0x8 lbl_41_bss_368 = .bss:0x00000368; // type:object size:0x8 lbl_41_bss_370 = .bss:0x00000370; // type:object size:0xC @@ -5086,15 +5086,15 @@ g_emCymulParamAccesser = .bss:0x00000394; // type:object size:0xC lbl_41_bss_3A0 = .bss:0x000003A0; // type:object size:0xC lbl_41_bss_3AC = .bss:0x000003AC; // type:object size:0xC lbl_41_bss_3B8 = .bss:0x000003B8; // type:object size:0xC -lbl_41_bss_3C4 = .bss:0x000003C4; // type:object size:0xC +g_emGiantGoombaParamAccesser = .bss:0x000003C4; // type:object size:0xC lbl_41_bss_3D0 = .bss:0x000003D0; // type:object size:0xC -lbl_41_bss_3DC = .bss:0x000003DC; // type:object size:0xC +g_emBucculusParamAccesser = .bss:0x000003DC; // type:object size:0xC lbl_41_bss_3E8 = .bss:0x000003E8; // type:object size:0xC lbl_41_bss_3F4 = .bss:0x000003F4; // type:object size:0xC lbl_41_bss_400 = .bss:0x00000400; // type:object size:0x8 lbl_41_bss_408 = .bss:0x00000408; // type:object size:0x8 lbl_41_bss_410 = .bss:0x00000410; // type:object size:0xC -lbl_41_bss_41C = .bss:0x0000041C; // type:object size:0xC +g_emGreapParamAccesser = .bss:0x0000041C; // type:object size:0xC lbl_41_bss_428 = .bss:0x00000428; // type:object size:0xC lbl_41_bss_434 = .bss:0x00000434; // type:object size:0xC lbl_41_bss_440 = .bss:0x00000440; // type:object size:0xC @@ -5108,11 +5108,11 @@ lbl_41_bss_504 = .bss:0x00000504; // type:object size:0x34 data:4byte lbl_41_bss_538 = .bss:0x00000538; // type:object size:0xC lbl_41_bss_544 = .bss:0x00000544; // type:object size:0xC lbl_41_bss_550 = .bss:0x00000550; // type:object size:0xC -lbl_41_bss_55C = .bss:0x0000055C; // type:object size:0xC +g_emFloowParamAccesser = .bss:0x0000055C; // type:object size:0xC lbl_41_bss_568 = .bss:0x00000568; // type:object size:0xC lbl_41_bss_574 = .bss:0x00000574; // type:object size:0xC lbl_41_bss_580 = .bss:0x00000580; // type:object size:0xC -lbl_41_bss_58C = .bss:0x0000058C; // type:object size:0xC +g_emShellpodParamAccesser = .bss:0x0000058C; // type:object size:0xC lbl_41_bss_598 = .bss:0x00000598; // type:object size:0xC g_emTickenParamAccesser = .bss:0x000005A4; // type:object size:0xC lbl_41_bss_5B0 = .bss:0x000005B0; // type:object size:0xC @@ -5124,7 +5124,7 @@ lbl_41_bss_5EC = .bss:0x000005EC; // type:object size:0xC lbl_41_bss_5F8 = .bss:0x000005F8; // type:object size:0xC g_emBombedParamAccesser = .bss:0x00000604; // type:object size:0xC lbl_41_bss_610 = .bss:0x00000610; // type:object size:0xC -lbl_41_bss_61C = .bss:0x0000061C; // type:object size:0xC +g_emNagagogParamAccesser = .bss:0x0000061C; // type:object size:0xC lbl_41_bss_628 = .bss:0x00000628; // type:object size:0xC lbl_41_bss_634 = .bss:0x00000634; // type:object size:0xC lbl_41_bss_640 = .bss:0x00000640; // type:object size:0xC @@ -5134,15 +5134,15 @@ lbl_41_bss_660 = .bss:0x00000660; // type:object size:0x8 lbl_41_bss_668 = .bss:0x00000668; // type:object size:0xC g_emKoopaParamAccesser = .bss:0x00000674; // type:object size:0xC lbl_41_bss_680 = .bss:0x00000680; // type:object size:0xC -lbl_41_bss_68C = .bss:0x0000068C; // type:object size:0xC +g_emShaydasParamAccesser = .bss:0x0000068C; // type:object size:0xC lbl_41_bss_698 = .bss:0x00000698; // type:object size:0xC g_emGamygaParamAccesser = .bss:0x000006A4; // type:object size:0xC lbl_41_bss_6B0 = .bss:0x000006B0; // type:object size:0xC g_emROBBlasterParamAccesser = .bss:0x000006BC; // type:object size:0xC lbl_41_bss_6C8 = .bss:0x000006C8; // type:object size:0xC -lbl_41_bss_6D4 = .bss:0x000006D4; // type:object size:0xC +g_emROBDistanceParamAccesser = .bss:0x000006D4; // type:object size:0xC lbl_41_bss_6E0 = .bss:0x000006E0; // type:object size:0xC -lbl_41_bss_6EC = .bss:0x000006EC; // type:object size:0xC +g_emROBLauncherParamAccesser = .bss:0x000006EC; // type:object size:0xC lbl_41_bss_6F8 = .bss:0x000006F8; // type:object size:0xC g_emROBSentryParamAccesser = .bss:0x00000704; // type:object size:0xC lbl_41_bss_710 = .bss:0x00000710; // type:object size:0xC diff --git a/configure.py b/configure.py index 5e61230..f7bc2cd 100755 --- a/configure.py +++ b/configure.py @@ -701,15 +701,25 @@ def MatchingFor(*versions): Object(Matching, "mo_enemy/sora_enemy/boobas/em_boobas_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/roada/em_roada_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/killer/em_killer_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/cymal/em_cymal_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/dekakuribo/em_dekakuribo_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_report.cpp"), + Object(Matching, "mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/teckin/em_teckin_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/hammerbros/em_hammerbros_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/faulong/em_faulong_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/patapata/em_patapata_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/jdus/em_jdus_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/ghamgha/em_ghamgha_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/robobeam/em_robobeam_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/robodistance/em_robodistance_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/robohoming/em_robohoming_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/robopunch/em_robopunch_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/galfire/em_galfire_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/ghamghabase/em_ghamghabase_param_accesser.cpp"), diff --git a/include/lib/BrawlHeaders b/include/lib/BrawlHeaders index ee16518..5702ef2 160000 --- a/include/lib/BrawlHeaders +++ b/include/lib/BrawlHeaders @@ -1 +1 @@ -Subproject commit ee165186675ae15045cc660b5b1e6109d6a436dd +Subproject commit 5702ef20df7010aab7368dfc85157a41f5ce8d0e diff --git a/src/mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp b/src/mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp index 4876413..204fcbc 100644 --- a/src/mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/bombhead/em_bombhead_param_accesser.cpp @@ -28,7 +28,7 @@ s32 emBombheadParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { acc->getResourceModule()).unk2C; switch (p2) { case 24000: - return ptr->unk398; + return ptr->unk398.i; default: return 0; } diff --git a/src/mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp b/src/mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp new file mode 100644 index 0000000..7362829 --- /dev/null +++ b/src/mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp @@ -0,0 +1,59 @@ +#include +#include +#include +#include + +emBucyulusParamAccesser g_emBucculusParamAccesser; + +emBucyulusParamAccesser::emBucyulusParamAccesser() + : emExtendParamAccesser(Enemy_Bucculus) { } + +float emBucyulusParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk344.f; + case 4001: + return ptr->unk348; + case 4002: + return ptr->unk34C; + case 4003: + return ptr->unk350; + case 4004: + return ptr->unk354; + case 4005: + return ptr->unk368.f; + case 4006: + return ptr->unk36C.f; + case 4007: + return ptr->unk370.f; + default: + return 0.0f; + } +} + +s32 emBucyulusParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0; +} + +void* emBucyulusParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk300; + case 44002: + return &ptr->unk324; + case 44003: + return &ptr->unk358; + default: + return nullptr; + } +} + +emBucyulusParamAccesser::~emBucyulusParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/dekakuribo/em_dekakuribo_param_accesser.cpp b/src/mo_enemy/sora_enemy/dekakuribo/em_dekakuribo_param_accesser.cpp new file mode 100644 index 0000000..76d222c --- /dev/null +++ b/src/mo_enemy/sora_enemy/dekakuribo/em_dekakuribo_param_accesser.cpp @@ -0,0 +1,55 @@ +#include +#include +#include +#include + +emDekakuriboParamAccesser g_emGiantGoombaParamAccesser; + +emDekakuriboParamAccesser::emDekakuriboParamAccesser() + : emExtendParamAccesser(Enemy_GiantGoomba) { } + +float emDekakuriboParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk388; + case 4001: + return ptr->unk388; + case 4002: + return ptr->unk390; + case 4003: + return ptr->unk394; + case 4004: + return ptr->unk398.f; + default: + return 0.0f; + } +} + +s32 emDekakuriboParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0; +} + +void* emDekakuriboParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk280; + case 44002: + return &ptr->unk310; + case 44003: + return &ptr->unk370; + case 44004: + return &ptr->unk378; + default: + return nullptr; + } +} + +emDekakuriboParamAccesser::~emDekakuriboParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp b/src/mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp index b893279..d522f26 100644 --- a/src/mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp @@ -18,7 +18,7 @@ s32 emFalconflyerParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { acc->getResourceModule()).unk2C; switch (p2) { case 24000: - return ptr->unk344; + return ptr->unk344.i; default: return 0; } diff --git a/src/mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp b/src/mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp new file mode 100644 index 0000000..444665a --- /dev/null +++ b/src/mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp @@ -0,0 +1,59 @@ +#include +#include +#include +#include + +emFlowsParamAccesser g_emFloowParamAccesser; + +emFlowsParamAccesser::emFlowsParamAccesser() + : emExtendParamAccesser(Enemy_Floow) { } + +float emFlowsParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0.0f; +} + +s32 emFlowsParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk35C; + case 24001: + return ptr->unk360; + case 24002: + return ptr->unk364; + case 24003: + return ptr->unk368.i; + case 24004: + return ptr->unk36C.i; + case 24005: + return ptr->unk370.i; + case 24006: + return ptr->unk374; + default: + return 0; + } +} + +void* emFlowsParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk200; + case 44002: + return &ptr->unk2FC; + case 44003: + return &ptr->unk378; + case 44004: + return &ptr->unk39C; + default: + return nullptr; + } +} + +emFlowsParamAccesser::~emFlowsParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp b/src/mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp new file mode 100644 index 0000000..b54cec4 --- /dev/null +++ b/src/mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp @@ -0,0 +1,60 @@ +#include +#include +#include +#include + +emGyraanParamAccesser g_emGreapParamAccesser; + +emGyraanParamAccesser::emGyraanParamAccesser() + : emExtendParamAccesser(Enemy_Greap) { } + +float emGyraanParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk510; + default: + return 0.0f; + } +} + +s32 emGyraanParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk50C; + default: + return 0; + } +} + +void* emGyraanParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk440; + case 44002: + return &ptr->unk4AC; + case 44003: + return &ptr->unk514; + case 44004: + return &ptr->unk51C; + case 44005: + return &ptr->unk524; + case 44006: + return &ptr->unk52C; + case 44007: + return &ptr->unk5A8; + case 44008: + return &ptr->unk624; + default: + return nullptr; + } +} + +emGyraanParamAccesser::~emGyraanParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/jdus/em_jdus_param_accesser.cpp b/src/mo_enemy/sora_enemy/jdus/em_jdus_param_accesser.cpp new file mode 100644 index 0000000..3229329 --- /dev/null +++ b/src/mo_enemy/sora_enemy/jdus/em_jdus_param_accesser.cpp @@ -0,0 +1,57 @@ +#include +#include +#include +#include + +emJdusParamAccesser g_emShaydasParamAccesser; + +emJdusParamAccesser::emJdusParamAccesser() + : emExtendParamAccesser(Enemy_Shaydas) { } + +float emJdusParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0.0f; +} + +s32 emJdusParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk65C; + default: + return 0; + } +} + +void* emJdusParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return &ptr->unk0; + case 44001: + return &ptr->unk500; + case 44002: + return &ptr->unk5B4; + case 44003: + return &ptr->unk634; + case 44004: + return &ptr->unk644; + case 44005: + return &ptr->unk654; + case 44006: + return &ptr->unk660; + case 44007: + return &ptr->unk668; + case 44008: + return &ptr->unk670; + case 44009: + return &ptr->unk688; + default: + return nullptr; + } +} + +emJdusParamAccesser::~emJdusParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp b/src/mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp new file mode 100644 index 0000000..2809f3e --- /dev/null +++ b/src/mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp @@ -0,0 +1,49 @@ +#include +#include +#include +#include + +emJyakeelParamAccesser g_emJykParamAccesser; + +emJyakeelParamAccesser::emJyakeelParamAccesser() + : emExtendParamAccesser(Enemy_Jyk) { } + +float emJyakeelParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0.0f; +} + +s32 emJyakeelParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk264; + case 24001: + return ptr->unk268; + default: + return 0; + } +} + +void* emJyakeelParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk200; + case 44002: + return &ptr->unk224; + case 44003: + return &ptr->unk244; + case 44004: + return &ptr->unk254; + default: + return nullptr; + } +} + +emJyakeelParamAccesser::~emJyakeelParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp b/src/mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp new file mode 100644 index 0000000..6575059 --- /dev/null +++ b/src/mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp @@ -0,0 +1,74 @@ +#include +#include +#include +#include + +emNgagogParamAccesser g_emNagagogParamAccesser; + +emNgagogParamAccesser::emNgagogParamAccesser() + : emExtendParamAccesser(Enemy_Nagagog) { } + +float emNgagogParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk9F4; + case 4001: + return ptr->unk9F8; + case 4002: + return ptr->unk9FC; + case 4003: + return ptr->unkA00; + case 4004: + return ptr->unkA04; + case 4005: + return ptr->unkA08; + case 4006: + return ptr->unkA0C; + case 4007: + return ptr->unk9CC; + default: + return 0.0f; + } +} + +s32 emNgagogParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk9E0; + default: + return 0; + } +} + +void* emNgagogParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk900; + case 44002: + return &ptr->unk96C; + case 44003: + return &ptr->unk9D0; + case 44004: + return &ptr->unk9E4; + case 44005: + return &ptr->unkA10; + case 44006: + return &ptr->unkA34; + case 44007: + return &ptr->unkA64; + case 44008: + return &ptr->unkAA0; + default: + return nullptr; + } +} + +emNgagogParamAccesser::~emNgagogParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/robodistance/em_robodistance_param_accesser.cpp b/src/mo_enemy/sora_enemy/robodistance/em_robodistance_param_accesser.cpp new file mode 100644 index 0000000..05a8a94 --- /dev/null +++ b/src/mo_enemy/sora_enemy/robodistance/em_robodistance_param_accesser.cpp @@ -0,0 +1,44 @@ +#include +#include +#include +#include + +emRobodistanceParamAccesser g_emROBDistanceParamAccesser; + +emRobodistanceParamAccesser::emRobodistanceParamAccesser() + : emExtendParamAccesser(Enemy_ROB_Distance) { } + +float emRobodistanceParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0.0f; +} + +s32 emRobodistanceParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0; +} + +void* emRobodistanceParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk180; + case 44002: + return &ptr->unk258; + case 44003: + return &ptr->unk2F8; + case 44004: + return &ptr->unk300; + case 44005: + return &ptr->unk308; + default: + return nullptr; + } +} + +emRobodistanceParamAccesser::~emRobodistanceParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/robohoming/em_robohoming_param_accesser.cpp b/src/mo_enemy/sora_enemy/robohoming/em_robohoming_param_accesser.cpp new file mode 100644 index 0000000..d16bec2 --- /dev/null +++ b/src/mo_enemy/sora_enemy/robohoming/em_robohoming_param_accesser.cpp @@ -0,0 +1,44 @@ +#include +#include +#include +#include + +emRobohomingParamAccesser g_emROBLauncherParamAccesser; + +emRobohomingParamAccesser::emRobohomingParamAccesser() + : emExtendParamAccesser(Enemy_ROB_Launcher) { } + +float emRobohomingParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0.0f; +} + +s32 emRobohomingParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0; +} + +void* emRobohomingParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return &ptr->unk0; + case 44001: + return &ptr->unk140; + case 44002: + return &ptr->unk188; + case 44003: + return &ptr->unk1A8; + case 44004: + return &ptr->unk1B0; + case 44005: + return &ptr->unk22C; + default: + return nullptr; + } +} + +emRobohomingParamAccesser::~emRobohomingParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp b/src/mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp new file mode 100644 index 0000000..66f951e --- /dev/null +++ b/src/mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp @@ -0,0 +1,49 @@ +#include +#include +#include +#include + +emShellyParamAccesser g_emShellpodParamAccesser; + +emShellyParamAccesser::emShellyParamAccesser() + : emExtendParamAccesser(Enemy_Shellpod) { } + +float emShellyParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk2A8; + case 4001: + return ptr->unk2AC; + default: + return 0.0f; + } +} + +s32 emShellyParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + return 0; +} + +void* emShellyParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk200; + case 44002: + return &ptr->unk248; + case 44003: + return &ptr->unk288; + case 44004: + return &ptr->unk298; + default: + return nullptr; + } +} + +emShellyParamAccesser::~emShellyParamAccesser() { }