From 0a3e4070aaf3610c510c1df52d204535b4a31316 Mon Sep 17 00:00:00 2001 From: mparisi20 Date: Sun, 22 Jun 2025 19:37:41 -0400 Subject: [PATCH] Match 10 files from sora_enemy.rel - Match em_bosspackun_param_accesser.cpp - Match em_cataguard_param_accesser.cpp - Match em_crazyhand_param_accesser.cpp - Match em_galleom_param_accesser.cpp - Match em_masterhand_param_accesser.cpp - Match em_metaridley_param_accesser.cpp - Match em_mite_param_accesser.cpp - Match em_popperam_param_accesser.cpp - Match em_rayquaza_param_accesser.cpp - Match em_tautau_param_accesser.cpp --- config/RSBE01_02/rels/sora_enemy/splits.txt | 70 +++++++ config/RSBE01_02/rels/sora_enemy/symbols.txt | 184 +++++++++--------- configure.py | 10 + include/lib/BrawlHeaders | 2 +- .../em_bosspackun_param_accesser.cpp | 104 ++++++++++ .../bucyulus/em_bucyulus_param_accesser.cpp | 2 +- .../cataguard/em_cataguard_param_accesser.cpp | 80 ++++++++ .../crazyhand/em_crazyhand_param_accesser.cpp | 102 ++++++++++ .../galleom/em_galleom_param_accesser.cpp | 102 ++++++++++ .../em_masterhand_param_accesser.cpp | 108 ++++++++++ .../em_metaridley_param_accesser.cpp | 94 +++++++++ .../mite/em_mite_param_accesser.cpp | 76 ++++++++ .../ngagog/em_ngagog_param_accesser.cpp | 2 +- .../popperam/em_popperam_param_accesser.cpp | 84 ++++++++ .../rayquaza/em_rayquaza_param_accesser.cpp | 106 ++++++++++ .../ridley/em_ridley_param_accesser.cpp | 4 +- .../siralamos/em_siralamos_param_accesser.cpp | 6 +- .../tautau/em_tautau_param_accesser.cpp | 74 +++++++ 18 files changed, 1110 insertions(+), 100 deletions(-) create mode 100644 src/mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/popperam/em_popperam_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp create mode 100644 src/mo_enemy/sora_enemy/tautau/em_tautau_param_accesser.cpp diff --git a/config/RSBE01_02/rels/sora_enemy/splits.txt b/config/RSBE01_02/rels/sora_enemy/splits.txt index 2918ef1..002abab 100644 --- a/config/RSBE01_02/rels/sora_enemy/splits.txt +++ b/config/RSBE01_02/rels/sora_enemy/splits.txt @@ -69,6 +69,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/popperam/em_popperam_param_accesser.cpp: + .text start:0x00038C68 end:0x00038F7C + .ctors start:0x00000040 end:0x00000044 + .rodata start:0x00000EB0 end:0x00000EB8 + .data start:0x00008F18 end:0x00008FB8 + .bss start:0x00000318 end:0x00000330 + mo_enemy/sora_enemy/pacci/em_pacci_param_accesser.cpp: .text start:0x00039170 end:0x00039408 .ctors start:0x00000044 end:0x00000048 @@ -132,6 +139,20 @@ mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp: .data start:0x0000BD18 end:0x0000BDA0 .bss start:0x00000410 end:0x00000428 +mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp: + .text start:0x0003F7CC end:0x0003FAB0 + .ctors start:0x00000070 end:0x00000074 + .rodata start:0x00000F28 end:0x00000F30 + .data start:0x0000BFF0 end:0x0000C088 + .bss start:0x00000428 end:0x00000440 + +mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp: + .text start:0x00043C6C end:0x00043F68 + .ctors start:0x00000078 end:0x0000007C + .rodata start:0x00000F70 end:0x00000F78 + .data start:0x0000E438 end:0x0000E4D8 + .bss start:0x00000458 end:0x00000470 + mo_enemy/sora_enemy/wnem/wn_em_report.cpp: .text start:0x0004833C end:0x0004838C @@ -149,6 +170,13 @@ mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp: .data start:0x0000F238 end:0x0000F2B8 .bss start:0x00000550 end:0x00000568 +mo_enemy/sora_enemy/tautau/em_tautau_param_accesser.cpp: + .text start:0x00048FCC end:0x00049370 + .ctors start:0x0000008C end:0x00000090 + .rodata start:0x00001048 end:0x00001058 + .data start:0x0000F508 end:0x0000F588 + .bss start:0x00000568 end:0x00000580 + mo_enemy/sora_enemy/shelly/em_shelly_param_accesser.cpp: .text start:0x00049564 end:0x000497D4 .ctors start:0x00000090 end:0x00000094 @@ -275,6 +303,13 @@ mo_enemy/sora_enemy/galfire/em_galfire_param_accesser.cpp: .data start:0x00017308 end:0x00017368 .bss start:0x00000728 end:0x00000740 +mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp: + .text start:0x0005A678 end:0x0005AA0C + .ctors start:0x000000DC end:0x000000E0 + .rodata start:0x00001118 end:0x00001128 + .data start:0x00017BA0 end:0x00017C48 + .bss start:0x00000740 end:0x00000758 + mo_enemy/sora_enemy/ghamghabase/em_ghamghabase_param_accesser.cpp: .text start:0x0005AC00 end:0x0005AE88 .ctors start:0x000000E0 end:0x000000E4 @@ -282,6 +317,13 @@ mo_enemy/sora_enemy/ghamghabase/em_ghamghabase_param_accesser.cpp: .data start:0x00017EA0 end:0x00017F08 .bss start:0x00000758 end:0x00000770 +mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp: + .text start:0x0005C16C end:0x0005C4C8 + .ctors start:0x000000E4 end:0x000000E8 + .rodata start:0x00001130 end:0x00001138 + .data start:0x000188F8 end:0x000189C0 + .bss start:0x00000770 end:0x00000788 + mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp: .text start:0x0005C9FC end:0x0005CD04 .ctors start:0x000000E8 end:0x000000EC @@ -289,6 +331,20 @@ mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp: .data start:0x00018CB8 end:0x00018D50 .bss start:0x00000788 end:0x000007A0 +mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp: + .text start:0x0005E040 end:0x0005E3A4 + .ctors start:0x000000EC end:0x000000F0 + .rodata start:0x00001148 end:0x00001150 + .data start:0x00019740 end:0x00019810 + .bss start:0x000007A0 end:0x000007B8 + +mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp: + .text start:0x00063F34 end:0x0006427C + .ctors start:0x000000F8 end:0x000000FC + .rodata start:0x00001180 end:0x00001188 + .data start:0x0001C698 end:0x0001C760 + .bss start:0x000007E8 end:0x00000800 + mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp: .text start:0x00064848 end:0x00064A98 .ctors start:0x000000FC end:0x00000100 @@ -296,6 +352,20 @@ mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp: .data start:0x0001CA78 end:0x0001CAE0 .bss start:0x00000800 end:0x00000818 +mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp: + .text start:0x00068C74 end:0x00068FF0 + .ctors start:0x00000104 end:0x00000108 + .rodata start:0x000011B8 end:0x000011C0 + .data start:0x0001EA10 end:0x0001EB00 + .bss start:0x00000830 end:0x00000848 + +mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp: + .text start:0x0006B29C end:0x0006B5F4 + .ctors start:0x00000108 end:0x0000010C + .rodata start:0x000011C8 end:0x000011D0 + .data start:0x0001FD68 end:0x0001FE48 + .bss start:0x00000848 end:0x00000860 + mo_enemy/mo_enemy.cpp: .text start:0x0006B760 end:0x0006B7FC .data start:0x0001FE78 end:0x0001FE85 diff --git a/config/RSBE01_02/rels/sora_enemy/symbols.txt b/config/RSBE01_02/rels/sora_enemy/symbols.txt index 6b5b6ac..5ef2410 100644 --- a/config/RSBE01_02/rels/sora_enemy/symbols.txt +++ b/config/RSBE01_02/rels/sora_enemy/symbols.txt @@ -1098,7 +1098,7 @@ fn_41_2BDEC = .text:0x0002BDEC; // type:function size:0x8 fn_41_2BDF4 = .text:0x0002BDF4; // type:function size:0x8 fn_41_2BDFC = .text:0x0002BDFC; // type:function size:0x8 fn_41_2BE04 = .text:0x0002BE04; // type:function size:0x54 -fn_41_2BE58 = .text:0x0002BE58; // type:function size:0xC +getInstance__15emWeaponManagerFv = .text:0x0002BE58; // type:function size:0xC fn_41_2BE64 = .text:0x0002BE64; // type:function size:0x58 fn_41_2BEBC = .text:0x0002BEBC; // type:function size:0xB0 fn_41_2BF6C = .text:0x0002BF6C; // type:function size:0x14 @@ -1118,7 +1118,7 @@ fn_41_2C3D0 = .text:0x0002C3D0; // type:function size:0x78 fn_41_2C448 = .text:0x0002C448; // type:function size:0xA8 fn_41_2C4F0 = .text:0x0002C4F0; // type:function size:0x10C fn_41_2C5FC = .text:0x0002C5FC; // type:function size:0xC8 -fn_41_2C6C4 = .text:0x0002C6C4; // type:function size:0x100 +GetManagedWeapon__15emWeaponManagerFUlUlUl = .text:0x0002C6C4; // type:function size:0x100 fn_41_2C7C4 = .text:0x0002C7C4; // type:function size:0x170 fn_41_2C934 = .text:0x0002C934; // type:function size:0xBC fn_41_2C9F0 = .text:0x0002C9F0; // type:function size:0x14 @@ -1552,12 +1552,12 @@ fn_41_38C0C = .text:0x00038C0C; // type:function size:0x44 fn_41_38C50 = .text:0x00038C50; // type:function size:0x8 fn_41_38C58 = .text:0x00038C58; // type:function size:0x8 fn_41_38C60 = .text:0x00038C60; // type:function size:0x8 -fn_41_38C68 = .text:0x00038C68; // type:function size:0x48 -fn_41_38CB0 = .text:0x00038CB0; // type:function size:0xC0 -fn_41_38D70 = .text:0x00038D70; // type:function size:0x6C -fn_41_38DDC = .text:0x00038DDC; // type:function size:0xFC -fn_41_38ED8 = .text:0x00038ED8; // type:function size:0x5C -fn_41_38F34 = .text:0x00038F34; // type:function size:0x48 +__ct__23emPopperamParamAccesserFv = .text:0x00038C68; // type:function size:0x48 +getParamFloat__23emPopperamParamAccesserFP16soModuleAccesserl = .text:0x00038CB0; // type:function size:0xC0 +getParamInt__23emPopperamParamAccesserFP16soModuleAccesserl = .text:0x00038D70; // type:function size:0x6C +getParamIndefinite__23emPopperamParamAccesserFP16soModuleAccesserl = .text:0x00038DDC; // type:function size:0xFC +__dt__23emPopperamParamAccesserFv = .text:0x00038ED8; // type:function size:0x5C +__sinit_\em_popperam_param_accesser_cpp = .text:0x00038F34; // type:function size:0x48 scope:local __ct__7emPacciFUlP8emCreate = .text:0x00038F7C; // type:function size:0x134 fn_41_390B0 = .text:0x000390B0; // type:function size:0xB8 fn_41_39168 = .text:0x00039168; // type:function size:0x8 @@ -1721,12 +1721,12 @@ __sinit_\em_gyraan_param_accesser_cpp = .text:0x0003F590; // type:function size: __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 -fn_41_3F7CC = .text:0x0003F7CC; // type:function size:0x48 -fn_41_3F814 = .text:0x0003F814; // type:function size:0x98 -fn_41_3F8AC = .text:0x0003F8AC; // type:function size:0x6C -fn_41_3F918 = .text:0x0003F918; // type:function size:0xF4 -fn_41_3FA0C = .text:0x0003FA0C; // type:function size:0x5C -fn_41_3FA68 = .text:0x0003FA68; // type:function size:0x48 +__ct__19emMiteParamAccesserFv = .text:0x0003F7CC; // type:function size:0x48 +getParamFloat__19emMiteParamAccesserFP16soModuleAccesserl = .text:0x0003F814; // type:function size:0x98 +getParamInt__19emMiteParamAccesserFP16soModuleAccesserl = .text:0x0003F8AC; // type:function size:0x6C +getParamIndefinite__19emMiteParamAccesserFP16soModuleAccesserl = .text:0x0003F918; // type:function size:0xF4 +__dt__19emMiteParamAccesserFv = .text:0x0003FA0C; // type:function size:0x5C +__sinit_\em_mite_param_accesser_cpp = .text:0x0003FA68; // type:function size:0x48 scope:local __ct__6emPrimFUlP8emCreate = .text:0x0003FAB0; // type:function size:0x24C fn_41_3FCFC = .text:0x0003FCFC; // type:function size:0x60 fn_41_3FD5C = .text:0x0003FD5C; // type:function size:0x6C @@ -1806,12 +1806,12 @@ fn_41_43C3C = .text:0x00043C3C; // type:function size:0x18 fn_41_43C54 = .text:0x00043C54; // type:function size:0x8 fn_41_43C5C = .text:0x00043C5C; // type:function size:0x8 fn_41_43C64 = .text:0x00043C64; // type:function size:0x8 -fn_41_43C6C = .text:0x00043C6C; // type:function size:0x48 -fn_41_43CB4 = .text:0x00043CB4; // type:function size:0xB0 -fn_41_43D64 = .text:0x00043D64; // type:function size:0x6C -fn_41_43DD0 = .text:0x00043DD0; // type:function size:0xF4 -fn_41_43EC4 = .text:0x00043EC4; // type:function size:0x5C -fn_41_43F20 = .text:0x00043F20; // type:function size:0x48 +__ct__24emCataguardParamAccesserFv = .text:0x00043C6C; // type:function size:0x48 +getParamFloat__24emCataguardParamAccesserFP16soModuleAccesserl = .text:0x00043CB4; // type:function size:0xB0 +getParamInt__24emCataguardParamAccesserFP16soModuleAccesserl = .text:0x00043D64; // type:function size:0x6C +getParamIndefinite__24emCataguardParamAccesserFP16soModuleAccesserl = .text:0x00043DD0; // type:function size:0xF4 +__dt__24emCataguardParamAccesserFv = .text:0x00043EC4; // type:function size:0x5C +__sinit_\em_cataguard_param_accesser_cpp = .text:0x00043F20; // type:function size:0x48 scope:local fn_41_43F68 = .text:0x00043F68; // type:function size:0x50 fn_41_43FB8 = .text:0x00043FB8; // type:function size:0x170 fn_41_44128 = .text:0x00044128; // type:function size:0x6C @@ -1893,12 +1893,12 @@ __sinit_\em_flows_param_accesser_cpp = .text:0x00048D90; // type:function size:0 __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 -fn_41_48FCC = .text:0x00048FCC; // type:function size:0x48 -fn_41_49014 = .text:0x00049014; // type:function size:0x140 -fn_41_49154 = .text:0x00049154; // type:function size:0xBC -fn_41_49210 = .text:0x00049210; // type:function size:0xBC -fn_41_492CC = .text:0x000492CC; // type:function size:0x5C -fn_41_49328 = .text:0x00049328; // type:function size:0x48 +__ct__21emTautauParamAccesserFv = .text:0x00048FCC; // type:function size:0x48 +getParamFloat__21emTautauParamAccesserFP16soModuleAccesserl = .text:0x00049014; // type:function size:0x140 +getParamInt__21emTautauParamAccesserFP16soModuleAccesserl = .text:0x00049154; // type:function size:0xBC +getParamIndefinite__21emTautauParamAccesserFP16soModuleAccesserl = .text:0x00049210; // type:function size:0xBC +__dt__21emTautauParamAccesserFv = .text:0x000492CC; // type:function size:0x5C +__sinit_\em_tautau_param_accesser_cpp = .text:0x00049328; // type:function size:0x48 scope:local __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 @@ -2300,12 +2300,12 @@ fn_41_5A658 = .text:0x0005A658; // type:function size:0x8 fn_41_5A660 = .text:0x0005A660; // type:function size:0x8 fn_41_5A668 = .text:0x0005A668; // type:function size:0x8 fn_41_5A670 = .text:0x0005A670; // type:function size:0x8 -fn_41_5A678 = .text:0x0005A678; // type:function size:0x48 -fn_41_5A6C0 = .text:0x0005A6C0; // type:function size:0x118 -fn_41_5A7D8 = .text:0x0005A7D8; // type:function size:0x94 -fn_41_5A86C = .text:0x0005A86C; // type:function size:0xFC -fn_41_5A968 = .text:0x0005A968; // type:function size:0x5C -fn_41_5A9C4 = .text:0x0005A9C4; // type:function size:0x48 +__ct__25emBosspackunParamAccesserFv = .text:0x0005A678; // type:function size:0x48 +getParamFloat__25emBosspackunParamAccesserFP16soModuleAccesserl = .text:0x0005A6C0; // type:function size:0x118 +getParamInt__25emBosspackunParamAccesserFP16soModuleAccesserl = .text:0x0005A7D8; // type:function size:0x94 +getParamIndefinite__25emBosspackunParamAccesserFP16soModuleAccesserl = .text:0x0005A86C; // type:function size:0xFC +__dt__25emBosspackunParamAccesserFv = .text:0x0005A968; // type:function size:0x5C +__sinit_\em_bosspackun_param_accesser_cpp = .text:0x0005A9C4; // type:function size:0x48 scope:local __ct__13emGhamghabaseFUlP8emCreate = .text:0x0005AA0C; // type:function size:0x134 fn_41_5AB40 = .text:0x0005AB40; // type:function size:0xB8 fn_41_5ABF8 = .text:0x0005ABF8; // type:function size:0x8 @@ -2340,12 +2340,12 @@ fn_41_5C0FC = .text:0x0005C0FC; // type:function size:0x58 fn_41_5C154 = .text:0x0005C154; // type:function size:0x8 fn_41_5C15C = .text:0x0005C15C; // type:function size:0x8 fn_41_5C164 = .text:0x0005C164; // type:function size:0x8 -fn_41_5C16C = .text:0x0005C16C; // type:function size:0x48 -fn_41_5C1B4 = .text:0x0005C1B4; // type:function size:0xA4 -fn_41_5C258 = .text:0x0005C258; // type:function size:0x80 -fn_41_5C2D8 = .text:0x0005C2D8; // type:function size:0x14C -fn_41_5C424 = .text:0x0005C424; // type:function size:0x5C -fn_41_5C480 = .text:0x0005C480; // type:function size:0x48 +__ct__22emGalleomParamAccesserFv = .text:0x0005C16C; // type:function size:0x48 +getParamFloat__22emGalleomParamAccesserFP16soModuleAccesserl = .text:0x0005C1B4; // type:function size:0xA4 +getParamInt__22emGalleomParamAccesserFP16soModuleAccesserl = .text:0x0005C258; // type:function size:0x80 +getParamIndefinite__22emGalleomParamAccesserFP16soModuleAccesserl = .text:0x0005C2D8; // type:function size:0x14C +__dt__22emGalleomParamAccesserFv = .text:0x0005C424; // type:function size:0x5C +__sinit_\em_galleom_param_accesser_cpp = .text:0x0005C480; // type:function size:0x48 scope:local fn_41_5C4C8 = .text:0x0005C4C8; // type:function size:0xB8 fn_41_5C580 = .text:0x0005C580; // type:function size:0xD8 fn_41_5C658 = .text:0x0005C658; // type:function size:0xBC @@ -2384,12 +2384,12 @@ fn_41_5DFD0 = .text:0x0005DFD0; // type:function size:0x58 fn_41_5E028 = .text:0x0005E028; // type:function size:0x8 fn_41_5E030 = .text:0x0005E030; // type:function size:0x8 fn_41_5E038 = .text:0x0005E038; // type:function size:0x8 -fn_41_5E040 = .text:0x0005E040; // type:function size:0x48 -fn_41_5E088 = .text:0x0005E088; // type:function size:0xB0 -fn_41_5E138 = .text:0x0005E138; // type:function size:0x6C -fn_41_5E1A4 = .text:0x0005E1A4; // type:function size:0x15C -fn_41_5E300 = .text:0x0005E300; // type:function size:0x5C -fn_41_5E35C = .text:0x0005E35C; // type:function size:0x48 +__ct__23emRayquazaParamAccesserFv = .text:0x0005E040; // type:function size:0x48 +getParamFloat__23emRayquazaParamAccesserFP16soModuleAccesserl = .text:0x0005E088; // type:function size:0xB0 +getParamInt__23emRayquazaParamAccesserFP16soModuleAccesserl = .text:0x0005E138; // type:function size:0x6C +getParamIndefinite__23emRayquazaParamAccesserFP16soModuleAccesserl = .text:0x0005E1A4; // type:function size:0x15C +__dt__23emRayquazaParamAccesserFv = .text:0x0005E300; // type:function size:0x5C +__sinit_\em_rayquaza_param_accesser_cpp = .text:0x0005E35C; // type:function size:0x48 scope:local fn_41_5E3A4 = .text:0x0005E3A4; // type:function size:0x84 fn_41_5E428 = .text:0x0005E428; // type:function size:0xB8 fn_41_5E4E0 = .text:0x0005E4E0; // type:function size:0xA8 @@ -2511,12 +2511,12 @@ fn_41_63F14 = .text:0x00063F14; // type:function size:0x8 fn_41_63F1C = .text:0x00063F1C; // type:function size:0x8 fn_41_63F24 = .text:0x00063F24; // type:function size:0x8 fn_41_63F2C = .text:0x00063F2C; // type:function size:0x8 -fn_41_63F34 = .text:0x00063F34; // type:function size:0x48 -fn_41_63F7C = .text:0x00063F7C; // type:function size:0xB8 -fn_41_64034 = .text:0x00064034; // type:function size:0xA0 -fn_41_640D4 = .text:0x000640D4; // type:function size:0x104 -fn_41_641D8 = .text:0x000641D8; // type:function size:0x5C -fn_41_64234 = .text:0x00064234; // type:function size:0x48 +__ct__25emMetaridleyParamAccesserFv = .text:0x00063F34; // type:function size:0x48 +getParamFloat__25emMetaridleyParamAccesserFP16soModuleAccesserl = .text:0x00063F7C; // type:function size:0xB8 +getParamInt__25emMetaridleyParamAccesserFP16soModuleAccesserl = .text:0x00064034; // type:function size:0xA0 +getParamIndefinite__25emMetaridleyParamAccesserFP16soModuleAccesserl = .text:0x000640D4; // type:function size:0x104 +__dt__25emMetaridleyParamAccesserFv = .text:0x000641D8; // type:function size:0x5C +__sinit_\em_metaridley_param_accesser_cpp = .text:0x00064234; // type:function size:0x48 scope:local fn_41_6427C = .text:0x0006427C; // type:function size:0x84 fn_41_64300 = .text:0x00064300; // type:function size:0x130 fn_41_64430 = .text:0x00064430; // type:function size:0x130 @@ -2614,12 +2614,12 @@ fn_41_68C54 = .text:0x00068C54; // type:function size:0x8 fn_41_68C5C = .text:0x00068C5C; // type:function size:0x8 fn_41_68C64 = .text:0x00068C64; // type:function size:0x8 fn_41_68C6C = .text:0x00068C6C; // type:function size:0x8 -fn_41_68C74 = .text:0x00068C74; // type:function size:0x48 -fn_41_68CBC = .text:0x00068CBC; // type:function size:0xF0 -fn_41_68DAC = .text:0x00068DAC; // type:function size:0xB4 -fn_41_68E60 = .text:0x00068E60; // type:function size:0xEC -fn_41_68F4C = .text:0x00068F4C; // type:function size:0x5C -fn_41_68FA8 = .text:0x00068FA8; // type:function size:0x48 +__ct__25emMasterhandParamAccesserFv = .text:0x00068C74; // type:function size:0x48 +getParamFloat__25emMasterhandParamAccesserFP16soModuleAccesserl = .text:0x00068CBC; // type:function size:0xF0 +getParamInt__25emMasterhandParamAccesserFP16soModuleAccesserl = .text:0x00068DAC; // type:function size:0xB4 +getParamIndefinite__25emMasterhandParamAccesserFP16soModuleAccesserl = .text:0x00068E60; // type:function size:0xEC +__dt__25emMasterhandParamAccesserFv = .text:0x00068F4C; // type:function size:0x5C +__sinit_\em_masterhand_param_accesser_cpp = .text:0x00068FA8; // type:function size:0x48 scope:local __ct__11emCrazyhandFUlP8emCreate = .text:0x00068FF0; // type:function size:0x374 fn_41_69364 = .text:0x00069364; // type:function size:0x60 fn_41_693C4 = .text:0x000693C4; // type:function size:0x6C @@ -2664,12 +2664,12 @@ fn_41_6B27C = .text:0x0006B27C; // type:function size:0x8 fn_41_6B284 = .text:0x0006B284; // type:function size:0x8 fn_41_6B28C = .text:0x0006B28C; // type:function size:0x8 fn_41_6B294 = .text:0x0006B294; // type:function size:0x8 -fn_41_6B29C = .text:0x0006B29C; // type:function size:0x48 -fn_41_6B2E4 = .text:0x0006B2E4; // type:function size:0xE8 -fn_41_6B3CC = .text:0x0006B3CC; // type:function size:0x80 -fn_41_6B44C = .text:0x0006B44C; // type:function size:0x104 -fn_41_6B550 = .text:0x0006B550; // type:function size:0x5C -fn_41_6B5AC = .text:0x0006B5AC; // type:function size:0x48 +__ct__24emCrazyhandParamAccesserFv = .text:0x0006B29C; // type:function size:0x48 +getParamFloat__24emCrazyhandParamAccesserFP16soModuleAccesserl = .text:0x0006B2E4; // type:function size:0xE8 +getParamInt__24emCrazyhandParamAccesserFP16soModuleAccesserl = .text:0x0006B3CC; // type:function size:0x80 +getParamIndefinite__24emCrazyhandParamAccesserFP16soModuleAccesserl = .text:0x0006B44C; // type:function size:0x104 +__dt__24emCrazyhandParamAccesserFv = .text:0x0006B550; // type:function size:0x5C +__sinit_\em_crazyhand_param_accesser_cpp = .text:0x0006B5AC; // type:function size:0x48 scope:local fn_41_6B5F4 = .text:0x0006B5F4; // type:function size:0x78 fn_41_6B66C = .text:0x0006B66C; // type:function size:0xF4 _prolog = .text:0x0006B760; // type:function size:0x48 scope:global @@ -3541,10 +3541,10 @@ jumptable_41_data_8E48 = .data:0x00008E48; // type:object size:0x44 scope:local jumptable_41_data_8E8C = .data:0x00008E8C; // type:object size:0x44 scope:local jumptable_41_data_8ED0 = .data:0x00008ED0; // type:object size:0x44 scope:local jumptable_41_data_8F18 = .data:0x00008F18; // type:object size:0x40 scope:local -lbl_41_data_8F58 = .data:0x00008F58; // type:object size:0x24 +__vt__23emPopperamParamAccesser = .data:0x00008F58; // type:object size:0x24 lbl_41_data_8F7C = .data:0x00008F7C; // type:object size:0x18 data:string lbl_41_data_8F94 = .data:0x00008F94; // type:object size:0x1C -lbl_41_data_8FB0 = .data:0x00008FB0; // type:object size:0x8 +__RTTI__23emPopperamParamAccesser = .data:0x00008FB0; // type:object size:0x8 lbl_41_data_8FB8 = .data:0x00008FB8; // type:object size:0x1A0 lbl_41_data_9158 = .data:0x00009158; // type:object size:0x8 data:string lbl_41_data_9160 = .data:0x00009160; // type:object size:0x9C @@ -3722,10 +3722,10 @@ lbl_41_data_BF40 = .data:0x0000BF40; // type:object size:0x8 lbl_41_data_BF48 = .data:0x0000BF48; // type:object size:0x9C lbl_41_data_BFE4 = .data:0x0000BFE4; // type:object size:0xC jumptable_41_data_BFF0 = .data:0x0000BFF0; // type:object size:0x3C scope:local -lbl_41_data_C02C = .data:0x0000C02C; // type:object size:0x24 +__vt__19emMiteParamAccesser = .data:0x0000C02C; // type:object size:0x24 lbl_41_data_C050 = .data:0x0000C050; // type:object size:0x14 data:string lbl_41_data_C064 = .data:0x0000C064; // type:object size:0x1C -lbl_41_data_C080 = .data:0x0000C080; // type:object size:0x8 +__RTTI__19emMiteParamAccesser = .data:0x0000C080; // type:object size:0x8 lbl_41_data_C088 = .data:0x0000C088; // type:object size:0x1A0 lbl_41_data_C228 = .data:0x0000C228; // type:object size:0x8 lbl_41_data_C230 = .data:0x0000C230; // type:object size:0x9C @@ -3853,10 +3853,10 @@ jumptable_41_data_E368 = .data:0x0000E368; // type:object size:0x44 scope:local jumptable_41_data_E3AC = .data:0x0000E3AC; // type:object size:0x44 scope:local jumptable_41_data_E3F0 = .data:0x0000E3F0; // type:object size:0x44 scope:local jumptable_41_data_E438 = .data:0x0000E438; // type:object size:0x3C scope:local -lbl_41_data_E474 = .data:0x0000E474; // type:object size:0x24 +__vt__24emCataguardParamAccesser = .data:0x0000E474; // type:object size:0x24 lbl_41_data_E498 = .data:0x0000E498; // type:object size:0x1C lbl_41_data_E4B4 = .data:0x0000E4B4; // type:object size:0x1C -lbl_41_data_E4D0 = .data:0x0000E4D0; // type:object size:0x8 +__RTTI__24emCataguardParamAccesser = .data:0x0000E4D0; // type:object size:0x8 lbl_41_data_E4D8 = .data:0x0000E4D8; // type:object size:0x36 data:string lbl_41_data_E50E = .data:0x0000E50E; // type:object size:0x36 data:string lbl_41_data_E544 = .data:0x0000E544; // type:object size:0x21 data:string @@ -3915,10 +3915,10 @@ lbl_41_data_F458 = .data:0x0000F458; // type:object size:0xC lbl_41_data_F464 = .data:0x0000F464; // type:object size:0x9C lbl_41_data_F500 = .data:0x0000F500; // type:object size:0x8 jumptable_41_data_F508 = .data:0x0000F508; // type:object size:0x20 scope:local -lbl_41_data_F528 = .data:0x0000F528; // type:object size:0x24 +__vt__21emTautauParamAccesser = .data:0x0000F528; // type:object size:0x24 lbl_41_data_F54C = .data:0x0000F54C; // type:object size:0x18 lbl_41_data_F564 = .data:0x0000F564; // type:object size:0x1C -lbl_41_data_F580 = .data:0x0000F580; // type:object size:0x8 +__RTTI__21emTautauParamAccesser = .data:0x0000F580; // type:object size:0x8 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 @@ -4440,10 +4440,10 @@ jumptable_41_data_17AD0 = .data:0x00017AD0; // type:object size:0x44 scope:local jumptable_41_data_17B14 = .data:0x00017B14; // type:object size:0x44 scope:local jumptable_41_data_17B58 = .data:0x00017B58; // type:object size:0x44 scope:local jumptable_41_data_17BA0 = .data:0x00017BA0; // type:object size:0x40 scope:local -lbl_41_data_17BE0 = .data:0x00017BE0; // type:object size:0x24 +__vt__25emBosspackunParamAccesser = .data:0x00017BE0; // type:object size:0x24 lbl_41_data_17C04 = .data:0x00017C04; // type:object size:0x1C lbl_41_data_17C20 = .data:0x00017C20; // type:object size:0x1C -lbl_41_data_17C3C = .data:0x00017C3C; // type:object size:0xC +__RTTI__25emBosspackunParamAccesser = .data:0x00017C3C; // type:object size:0xC lbl_41_data_17C48 = .data:0x00017C48; // type:object size:0x1A0 lbl_41_data_17DE8 = .data:0x00017DE8; // type:object size:0x10 lbl_41_data_17DF8 = .data:0x00017DF8; // type:object size:0x9C @@ -4492,10 +4492,10 @@ jumptable_41_data_1882C = .data:0x0001882C; // type:object size:0x44 scope:local jumptable_41_data_18870 = .data:0x00018870; // type:object size:0x44 scope:local jumptable_41_data_188B4 = .data:0x000188B4; // type:object size:0x44 scope:local jumptable_41_data_188F8 = .data:0x000188F8; // type:object size:0x68 scope:local -lbl_41_data_18960 = .data:0x00018960; // type:object size:0x24 +__vt__22emGalleomParamAccesser = .data:0x00018960; // type:object size:0x24 lbl_41_data_18984 = .data:0x00018984; // type:object size:0x18 lbl_41_data_1899C = .data:0x0001899C; // type:object size:0x1C -lbl_41_data_189B8 = .data:0x000189B8; // type:object size:0x8 +__RTTI__22emGalleomParamAccesser = .data:0x000189B8; // type:object size:0x8 lbl_41_data_189C0 = .data:0x000189C0; // type:object size:0x24 data:string lbl_41_data_189E4 = .data:0x000189E4; // type:object size:0x38 data:string lbl_41_data_18A1C = .data:0x00018A1C; // type:object size:0x21 data:string @@ -4549,10 +4549,10 @@ jumptable_41_data_19674 = .data:0x00019674; // type:object size:0x44 scope:local jumptable_41_data_196B8 = .data:0x000196B8; // type:object size:0x44 scope:local jumptable_41_data_196FC = .data:0x000196FC; // type:object size:0x44 scope:local jumptable_41_data_19740 = .data:0x00019740; // type:object size:0x70 scope:local -lbl_41_data_197B0 = .data:0x000197B0; // type:object size:0x24 +__vt__23emRayquazaParamAccesser = .data:0x000197B0; // type:object size:0x24 lbl_41_data_197D4 = .data:0x000197D4; // type:object size:0x18 data:string lbl_41_data_197EC = .data:0x000197EC; // type:object size:0x1C -lbl_41_data_19808 = .data:0x00019808; // type:object size:0x8 +__RTTI__23emRayquazaParamAccesser = .data:0x00019808; // type:object size:0x8 lbl_41_data_19810 = .data:0x00019810; // type:object size:0x27 data:string lbl_41_data_19837 = .data:0x00019837; // type:object size:0x2B data:string lbl_41_data_19862 = .data:0x00019862; // type:object size:0x2E @@ -4763,10 +4763,10 @@ jumptable_41_data_1C610 = .data:0x0001C610; // type:object size:0x44 scope:local jumptable_41_data_1C654 = .data:0x0001C654; // type:object size:0x44 scope:local jumptable_41_data_1C698 = .data:0x0001C698; // type:object size:0x1C scope:local jumptable_41_data_1C6B4 = .data:0x0001C6B4; // type:object size:0x44 scope:local -lbl_41_data_1C6F8 = .data:0x0001C6F8; // type:object size:0x24 +__vt__25emMetaridleyParamAccesser = .data:0x0001C6F8; // type:object size:0x24 lbl_41_data_1C71C = .data:0x0001C71C; // type:object size:0x1C lbl_41_data_1C738 = .data:0x0001C738; // type:object size:0x1C -lbl_41_data_1C754 = .data:0x0001C754; // type:object size:0xC +__RTTI__25emMetaridleyParamAccesser = .data:0x0001C754; // type:object size:0xC lbl_41_data_1C760 = .data:0x0001C760; // type:object size:0x2E data:string lbl_41_data_1C78E = .data:0x0001C78E; // type:object size:0x30 data:string lbl_41_data_1C7BE = .data:0x0001C7BE; // type:object size:0x2C data:string @@ -4918,10 +4918,10 @@ jumptable_41_data_1E9CC = .data:0x0001E9CC; // type:object size:0x44 scope:local jumptable_41_data_1EA10 = .data:0x0001EA10; // type:object size:0x38 scope:local jumptable_41_data_1EA48 = .data:0x0001EA48; // type:object size:0x1C scope:local jumptable_41_data_1EA64 = .data:0x0001EA64; // type:object size:0x38 scope:local -lbl_41_data_1EA9C = .data:0x0001EA9C; // type:object size:0x24 +__vt__25emMasterhandParamAccesser = .data:0x0001EA9C; // type:object size:0x24 lbl_41_data_1EAC0 = .data:0x0001EAC0; // type:object size:0x1C lbl_41_data_1EADC = .data:0x0001EADC; // type:object size:0x1C -lbl_41_data_1EAF8 = .data:0x0001EAF8; // type:object size:0x8 +__RTTI__25emMasterhandParamAccesser = .data:0x0001EAF8; // type:object size:0x8 lbl_41_data_1EB00 = .data:0x0001EB00; // type:object size:0x1A0 lbl_41_data_1ECA0 = .data:0x0001ECA0; // type:object size:0xC data:string lbl_41_data_1ECAC = .data:0x0001ECAC; // type:object size:0x9C @@ -5008,10 +5008,10 @@ jumptable_41_data_1FCDC = .data:0x0001FCDC; // type:object size:0x44 scope:local jumptable_41_data_1FD20 = .data:0x0001FD20; // type:object size:0x44 scope:local jumptable_41_data_1FD68 = .data:0x0001FD68; // type:object size:0x34 scope:local jumptable_41_data_1FD9C = .data:0x0001FD9C; // type:object size:0x44 scope:local -lbl_41_data_1FDE0 = .data:0x0001FDE0; // type:object size:0x24 +__vt__24emCrazyhandParamAccesser = .data:0x0001FDE0; // type:object size:0x24 lbl_41_data_1FE04 = .data:0x0001FE04; // type:object size:0x1C lbl_41_data_1FE20 = .data:0x0001FE20; // type:object size:0x1C -lbl_41_data_1FE3C = .data:0x0001FE3C; // type:object size:0xC +__RTTI__24emCrazyhandParamAccesser = .data:0x0001FE3C; // type:object size:0xC lbl_41_data_1FE48 = .data:0x0001FE48; // type:object size:0x30 lbl_41_data_1FE78 = .data:0x0001FE78; // type:object size:0xD scope:local align:4 data:string HomeBtnIcon = .data:0x0001FEA0; // type:object size:0x18C0 scope:global align:32 @@ -5072,7 +5072,7 @@ lbl_41_bss_2FC = .bss:0x000002FC; // type:object size:0xC lbl_41_bss_308 = .bss:0x00000308; // type:object size:0x8 lbl_41_bss_310 = .bss:0x00000310; // type:object size:0x8 lbl_41_bss_318 = .bss:0x00000318; // type:object size:0xC -lbl_41_bss_324 = .bss:0x00000324; // type:object size:0xC +g_emPoppantParamAccesser = .bss:0x00000324; // type:object size:0xC lbl_41_bss_330 = .bss:0x00000330; // type:object size:0xC g_emFeyeshParamAccesser = .bss:0x0000033C; // type:object size:0xC lbl_41_bss_348 = .bss:0x00000348; // type:object size:0xC @@ -5096,11 +5096,11 @@ lbl_41_bss_408 = .bss:0x00000408; // type:object size:0x8 lbl_41_bss_410 = .bss:0x00000410; // 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 +g_emMiteParamAccesser = .bss:0x00000434; // type:object size:0xC lbl_41_bss_440 = .bss:0x00000440; // type:object size:0xC lbl_41_bss_44C = .bss:0x0000044C; // type:object size:0xC lbl_41_bss_458 = .bss:0x00000458; // type:object size:0xC -lbl_41_bss_464 = .bss:0x00000464; // type:object size:0xC +g_emAutolanceParamAccesser = .bss:0x00000464; // type:object size:0xC lbl_41_bss_470 = .bss:0x00000470; // type:object size:0xC lbl_41_bss_47C = .bss:0x0000047C; // type:object size:0xC lbl_41_bss_488 = .bss:0x00000488; // type:object size:0x7C @@ -5110,7 +5110,7 @@ g_emGoombaParamAccesser = .bss:0x00000544; // type:object size:0xC lbl_41_bss_550 = .bss:0x00000550; // 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 +g_emTowtowParamAccesser = .bss:0x00000574; // type:object size:0xC lbl_41_bss_580 = .bss:0x00000580; // type:object size:0xC g_emShellpodParamAccesser = .bss:0x0000058C; // type:object size:0xC lbl_41_bss_598 = .bss:0x00000598; // type:object size:0xC @@ -5150,26 +5150,26 @@ g_emArmankParamAccesser = .bss:0x0000071C; // type:object size:0xC lbl_41_bss_728 = .bss:0x00000728; // type:object size:0xC g_emGlireParamAccesser = .bss:0x00000734; // type:object size:0xC lbl_41_bss_740 = .bss:0x00000740; // type:object size:0xC -lbl_41_bss_74C = .bss:0x0000074C; // type:object size:0xC +g_emPeteyPiranhaParamAccesser = .bss:0x0000074C; // type:object size:0xC lbl_41_bss_758 = .bss:0x00000758; // type:object size:0xC g_emGamygaBaseParamAccesser = .bss:0x00000764; // type:object size:0xC lbl_41_bss_770 = .bss:0x00000770; // type:object size:0xC -lbl_41_bss_77C = .bss:0x0000077C; // type:object size:0xC +g_emGalleomParamAccesser = .bss:0x0000077C; // type:object size:0xC lbl_41_bss_788 = .bss:0x00000788; // type:object size:0xC g_emRidleyParamAccesser = .bss:0x00000794; // type:object size:0xC lbl_41_bss_7A0 = .bss:0x000007A0; // type:object size:0xC -lbl_41_bss_7AC = .bss:0x000007AC; // type:object size:0xC +g_emRayquazaParamAccesser = .bss:0x000007AC; // type:object size:0xC lbl_41_bss_7B8 = .bss:0x000007B8; // type:object size:0xC lbl_41_bss_7C4 = .bss:0x000007C4; // type:object size:0xC lbl_41_bss_7D0 = .bss:0x000007D0; // type:object size:0xC lbl_41_bss_7DC = .bss:0x000007DC; // type:object size:0xC lbl_41_bss_7E8 = .bss:0x000007E8; // type:object size:0xC -lbl_41_bss_7F4 = .bss:0x000007F4; // type:object size:0xC +g_emMetaRidleyParamAccesser = .bss:0x000007F4; // type:object size:0xC lbl_41_bss_800 = .bss:0x00000800; // type:object size:0xC g_emFalconFlyerParamAccesser = .bss:0x0000080C; // type:object size:0xC lbl_41_bss_818 = .bss:0x00000818; // type:object size:0xC lbl_41_bss_824 = .bss:0x00000824; // type:object size:0xC lbl_41_bss_830 = .bss:0x00000830; // type:object size:0xC -lbl_41_bss_83C = .bss:0x0000083C; // type:object size:0xC +g_emMasterHandParamAccesser = .bss:0x0000083C; // type:object size:0xC lbl_41_bss_848 = .bss:0x00000848; // type:object size:0xC -lbl_41_bss_854 = .bss:0x00000854; // type:object size:0xC +g_emCrazyHandParamAccesser = .bss:0x00000854; // type:object size:0xC diff --git a/configure.py b/configure.py index 4c7b782..257fbeb 100755 --- a/configure.py +++ b/configure.py @@ -702,6 +702,7 @@ def MatchingFor(*versions): Object(Matching, "mo_enemy/sora_enemy/siralamos/em_siralamos_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/popperam/em_popperam_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/pacci/em_pacci_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/jyakeel/em_jyakeel_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/aroaros/em_aroaros_param_accesser.cpp"), @@ -711,9 +712,12 @@ def MatchingFor(*versions): Object(Matching, "mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/botron/em_botron_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/gyraan/em_gyraan_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/wnem/wn_em_report.cpp"), Object(Matching, "mo_enemy/sora_enemy/kuribo/em_kuribo_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/flows/em_flows_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/tautau/em_tautau_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/spar/em_spar_param_accesser.cpp"), @@ -732,9 +736,15 @@ def MatchingFor(*versions): Object(Matching, "mo_enemy/sora_enemy/robopunch/em_robopunch_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/arman/em_arman_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/galfire/em_galfire_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/ghamghabase/em_ghamghabase_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp"), Object(Matching, "mo_enemy/sora_enemy/falconflyer/em_falconflyer_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp"), + Object(Matching, "mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp"), Object(Matching, "mo_enemy/mo_enemy.cpp"), ], }, diff --git a/include/lib/BrawlHeaders b/include/lib/BrawlHeaders index 2dece3f..d67f56c 160000 --- a/include/lib/BrawlHeaders +++ b/include/lib/BrawlHeaders @@ -1 +1 @@ -Subproject commit 2dece3f155721542e28dace002cfff00c32c8130 +Subproject commit d67f56cc2b6a7933645ca2455dbdbf3e3a4d8b11 diff --git a/src/mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp b/src/mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp new file mode 100644 index 0000000..cc930e2 --- /dev/null +++ b/src/mo_enemy/sora_enemy/bosspackun/em_bosspackun_param_accesser.cpp @@ -0,0 +1,104 @@ +#include "wn/wn_em_simple.h" +#include +#include +#include +#include +#include + +emBosspackunParamAccesser g_emPeteyPiranhaParamAccesser; + +emBosspackunParamAccesser::emBosspackunParamAccesser() + : emExtendParamAccesser(Enemy_Boss_PeteyPiranha) { } + +float emBosspackunParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + u32 taskId; + wnemSimple* wn; + float f1; + switch (p2) { + case 4000: + return ptr->unk150; + case 4001: + case 4002: + taskId = acc->m_stageObject->m_taskId; + if (taskId == -1) { + return 100.0f; + } + if (p2 == 4001) { + wn = emWeaponManager::getInstance()->GetManagedWeapon(taskId, 0, 0); + } else { + wn = emWeaponManager::getInstance()->GetManagedWeapon(taskId, 1, 0); + } + + if (!wn) { + return 100.0f; + } + + f1 = wn->unk21D8; + if (f1 <= 0.0f) { + f1 = 1.0f; + } + return 100.0f * (wn->unk21D4 / f1); + default: + return 0.0f; + } +} + +s32 emBosspackunParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk144; + case 24001: + return ptr->unk148; + case 24002: + return ptr->unk14C; + default: + return 0; + } +} + +void* emBosspackunParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk100; + case 44002: + return &ptr->unk124; + case 44003: + return &ptr->unk154; + case 44004: + return &ptr->unk164; + case 44005: + return &ptr->unk174; + case 44006: + return &ptr->unk17C; + case 44007: + return &ptr->unk188; + case 44008: + return &ptr->unk194; + case 44009: + return &ptr->unk1AC; + case 44010: + return &ptr->unk1D0; + case 44011: + return &ptr->unk1E8; + case 44012: + return &ptr->unk200; + case 44013: + return &ptr->unk27C; + case 44014: + return &ptr->unk2F8; + case 44015: + return &ptr->unk314; + default: + return nullptr; + } +} + +emBosspackunParamAccesser::~emBosspackunParamAccesser() { } 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 index 7362829..869a9bf 100644 --- a/src/mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/bucyulus/em_bucyulus_param_accesser.cpp @@ -17,7 +17,7 @@ float emBucyulusParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { case 4001: return ptr->unk348; case 4002: - return ptr->unk34C; + return ptr->unk34C.f; case 4003: return ptr->unk350; case 4004: diff --git a/src/mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp b/src/mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp new file mode 100644 index 0000000..5d12c33 --- /dev/null +++ b/src/mo_enemy/sora_enemy/cataguard/em_cataguard_param_accesser.cpp @@ -0,0 +1,80 @@ +#include +#include +#include +#include + +emCataguardParamAccesser g_emAutolanceParamAccesser; + +emCataguardParamAccesser::emCataguardParamAccesser() + : emExtendParamAccesser(Enemy_Autolance) { } + +float emCataguardParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk510; + case 4001: + return ptr->unk53C; + case 4002: + return ptr->unk544; + case 4003: + return ptr->unk548; + case 4004: + return ptr->unk54C; + default: + return 0.0f; + } +} + +s32 emCataguardParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk540; + default: + return 0; + } +} + +void* emCataguardParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk380; + case 44002: + return &ptr->unk458; + case 44003: + return &ptr->unk4F8; + case 44004: + return &ptr->unk514; + case 44005: + return &ptr->unk51C; + case 44006: + return &ptr->unk524; + case 44007: + return &ptr->unk52C; + case 44008: + return &ptr->unk534; + case 44009: + return &ptr->unk550; + case 44010: + return &ptr->unk5CC; + case 44011: + return &ptr->unk648; + case 44012: + return &ptr->unk6C4; + case 44013: + return &ptr->unk740; + case 44014: + return &ptr->unk7BC; + default: + return nullptr; + } +} + +emCataguardParamAccesser::~emCataguardParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp b/src/mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp new file mode 100644 index 0000000..4237f82 --- /dev/null +++ b/src/mo_enemy/sora_enemy/crazyhand/em_crazyhand_param_accesser.cpp @@ -0,0 +1,102 @@ +#include +#include +#include +#include + +emCrazyhandParamAccesser g_emCrazyHandParamAccesser; + +emCrazyhandParamAccesser::emCrazyhandParamAccesser() + : emExtendParamAccesser(Enemy_Boss_CrazyHand) { } + +float emCrazyhandParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk9E0.f; + case 4001: + return ptr->unk9E4; + case 4002: + return ptr->unk9E8; + case 4003: + return ptr->unk9EC; + case 4004: + return ptr->unk9F0; + case 4005: + return ptr->unk9F4; + case 4006: + return ptr->unk9C4; + case 4007: + return ptr->unk9C8; + case 4008: + return ptr->unk9CC; + case 4009: + return ptr->unk9D0; + case 4010: + return ptr->unk9DC; + case 4011: + return ptr->unk9F8; + case 4012: + return ptr->unk9FC; + default: + return 0.0f; + } +} + +s32 emCrazyhandParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk9D4; + case 24001: + return ptr->unk9D8; + default: + return 0; + } +} + +void* emCrazyhandParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk980; + case 44002: + return &ptr->unk9A4; + case 44003: + return &ptr->unkA00; + case 44004: + return &ptr->unkA10; + case 44005: + return &ptr->unkA1C; + case 44006: + return &ptr->unkA28; + case 44007: + return &ptr->unkA34; + case 44008: + return &ptr->unkA40; + case 44009: + return &ptr->unkA4C; + case 44010: + return &ptr->unkA70; + case 44011: + return &ptr->unkAA0; + case 44012: + return &ptr->unkAD0; + case 44013: + return &ptr->unkAF4; + case 44014: + return &ptr->unkB24; + case 44015: + return &ptr->unkB54; + case 44016: + return &ptr->unkBD0; + default: + return nullptr; + } +} + +emCrazyhandParamAccesser::~emCrazyhandParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp b/src/mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp new file mode 100644 index 0000000..f76489f --- /dev/null +++ b/src/mo_enemy/sora_enemy/galleom/em_galleom_param_accesser.cpp @@ -0,0 +1,102 @@ +#include +#include +#include +#include + +emGalleomParamAccesser g_emGalleomParamAccesser; + +emGalleomParamAccesser::emGalleomParamAccesser() + : emExtendParamAccesser(Enemy_Boss_Galleom) { } + +float emGalleomParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk40C; + case 4001: + return ptr->unk410; + case 4002: + return ptr->unk414; + case 4003: + return ptr->unk418; + default: + return 0.0f; + } +} + +s32 emGalleomParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk404; + case 24001: + return ptr->unk408; + default: + return 0; + } +} + +void* emGalleomParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk3C0; + case 44002: + return &ptr->unk3E4; + case 44003: + return &ptr->unk41C; + case 44004: + return &ptr->unk424; + case 44005: + return &ptr->unk42C; + case 44006: + return &ptr->unk434; + case 44007: + return &ptr->unk43C; + case 44008: + return &ptr->unk56C; + case 44009: + return &ptr->unk578; + case 44010: + return &ptr->unk584; + case 44011: + return &ptr->unk590; + case 44012: + return &ptr->unk59C; + case 44013: + return &ptr->unk5A8; + case 44014: + return &ptr->unk44C; + case 44015: + return &ptr->unk464; + case 44016: + return &ptr->unk488; + case 44017: + return &ptr->unk4AC; + case 44018: + return &ptr->unk4D0; + case 44019: + return &ptr->unk4F4; + case 44020: + return &ptr->unk524; + case 44021: + return &ptr->unk548; + case 44022: + return &ptr->unk5B4; + case 44023: + return &ptr->unk630; + case 44024: + return &ptr->unk6AC; + case 44025: + return &ptr->unk728; + default: + return nullptr; + } +} + +emGalleomParamAccesser::~emGalleomParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp b/src/mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp new file mode 100644 index 0000000..ea0e1cd --- /dev/null +++ b/src/mo_enemy/sora_enemy/masterhand/em_masterhand_param_accesser.cpp @@ -0,0 +1,108 @@ +#include +#include +#include +#include + +emMasterhandParamAccesser g_emMasterHandParamAccesser; + +emMasterhandParamAccesser::emMasterhandParamAccesser() + : emExtendParamAccesser(Enemy_Boss_MasterHand) { } + +float emMasterhandParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unkBA4; + case 4001: + return ptr->unkBA8; + case 4002: + return ptr->unkBAC; + case 4003: + return ptr->unkBB0; + case 4004: + return ptr->unkBB4; + case 4005: + return ptr->unkBB8; + case 4006: + return ptr->unkBBC; + case 4007: + return ptr->unkBC0; + case 4008: + return ptr->unkBC4; + case 4009: + return ptr->unkBC8; + case 4010: + return ptr->unkBCC; + case 4011: + return ptr->unkBD0; + case 4012: + return ptr->unkBD4; + case 4013: + return ptr->unkBD8; + default: + return 0.0f; + } +} + +s32 emMasterhandParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unkB88; + case 24001: + return ptr->unkB8C; + case 24002: + return ptr->unkB90; + case 24003: + return ptr->unkB94; + case 24004: + return ptr->unkB98; + case 24005: + return ptr->unkB9C; + case 24006: + return ptr->unkBA0; + default: + return 0; + } +} + +void* emMasterhandParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unkB00; + case 44002: + return &ptr->unkB48; + case 44003: + return &ptr->unkBDC; + case 44004: + return &ptr->unkBEC; + case 44005: + return &ptr->unkBF8; + case 44006: + return &ptr->unkC04; + case 44007: + return &ptr->unkC10; + case 44008: + return &ptr->unkC1C; + case 44009: + return &ptr->unkC40; + case 44010: + return &ptr->unkC64; + case 44011: + return &ptr->unkC88; + case 44012: + return &ptr->unkCAC; + case 44013: + return &ptr->unkCC4; + default: + return nullptr; + } +} + +emMasterhandParamAccesser::~emMasterhandParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp b/src/mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp new file mode 100644 index 0000000..fbb0de4 --- /dev/null +++ b/src/mo_enemy/sora_enemy/metaridley/em_metaridley_param_accesser.cpp @@ -0,0 +1,94 @@ +#include +#include +#include +#include + +emMetaridleyParamAccesser g_emMetaRidleyParamAccesser; + +emMetaridleyParamAccesser::emMetaridleyParamAccesser() + : emExtendParamAccesser(Enemy_Boss_MetaRidley) { } + +float emMetaridleyParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk5D8; + case 4001: + return ptr->unk5DC; + case 4002: + return ptr->unk5E0; + case 4003: + return ptr->unk5E4; + case 4004: + return ptr->unk5E8; + case 4005: + return ptr->unk5EC; + case 4006: + return ptr->unk5F0; + default: + return 0.0f; + } +} + +s32 emMetaridleyParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk5C8.i; + case 24001: + return ptr->unk5CC.i; + case 24002: + return ptr->unk5D0; + case 24003: + return ptr->unk5D4; + default: + return 0; + } +} + +void* emMetaridleyParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk540; + case 44002: + return &ptr->unk588; + case 44003: + return &ptr->unk5F4; + case 44004: + return &ptr->unk5FC; + case 44005: + return &ptr->unk60C; + case 44006: + return &ptr->unk618; + case 44007: + return &ptr->unk624; + case 44008: + return &ptr->unk630; + case 44009: + return &ptr->unk63C; + case 44010: + return &ptr->unk654; + case 44011: + return &ptr->unk66C; + case 44012: + return &ptr->unk684; + case 44013: + return &ptr->unk69C; + case 44014: + return &ptr->unk718; + case 44015: + return &ptr->unk794; + case 44016: + return &ptr->unk810; + default: + return nullptr; + } +} + +emMetaridleyParamAccesser::~emMetaridleyParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp b/src/mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp new file mode 100644 index 0000000..6f4e574 --- /dev/null +++ b/src/mo_enemy/sora_enemy/mite/em_mite_param_accesser.cpp @@ -0,0 +1,76 @@ +#include +#include +#include +#include + +emMiteParamAccesser g_emMiteParamAccesser; + +emMiteParamAccesser::emMiteParamAccesser() + : emExtendParamAccesser(Enemy_Mite) { } + +float emMiteParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unkA40; + case 4001: + return ptr->unkA44; + case 4002: + return ptr->unkA48; + default: + return 0.0f; + } +} + +s32 emMiteParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unkA4C; + default: + return 0; + } +} + +void* emMiteParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk700; + case 44002: + return &ptr->unk7FC; + case 44003: + return &ptr->unk8DC; + case 44004: + return &ptr->unk90C; + case 44005: + return &ptr->unk93C; + case 44006: + return &ptr->unk96C; + case 44007: + return &ptr->unk978; + case 44008: + return &ptr->unk99C; + case 44009: + return &ptr->unk9CC; + case 44010: + return &ptr->unk9E4; + case 44011: + return &ptr->unk9FC; + case 44012: + return &ptr->unkA0C; + case 44013: + return &ptr->unkA30; + case 44014: + return &ptr->unkA38; + default: + return nullptr; + } +} + +emMiteParamAccesser::~emMiteParamAccesser() { } 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 index 6575059..8c7366a 100644 --- a/src/mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/ngagog/em_ngagog_param_accesser.cpp @@ -38,7 +38,7 @@ s32 emNgagogParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { acc->getResourceModule()).unk2C; switch (p2) { case 24000: - return ptr->unk9E0; + return ptr->unk9E0.i; default: return 0; } diff --git a/src/mo_enemy/sora_enemy/popperam/em_popperam_param_accesser.cpp b/src/mo_enemy/sora_enemy/popperam/em_popperam_param_accesser.cpp new file mode 100644 index 0000000..1d59019 --- /dev/null +++ b/src/mo_enemy/sora_enemy/popperam/em_popperam_param_accesser.cpp @@ -0,0 +1,84 @@ +#include +#include +#include +#include + +emPopperamParamAccesser g_emPoppantParamAccesser; + +emPopperamParamAccesser::emPopperamParamAccesser() + : emExtendParamAccesser(Enemy_Poppant) { } + +float emPopperamParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk4C4.f; + case 4001: + return ptr->unk4C8.f; + case 4002: + return ptr->unk4CC.f; + case 4003: + return ptr->unk4D0; + case 4004: + return ptr->unk4D4; + case 4005: + return ptr->unk4D8; + default: + return 0.0f; + } +} + +s32 emPopperamParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk4DC; + default: + return 0; + } +} + +void* emPopperamParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk3C0; + case 44002: + return &ptr->unk42C; + case 44003: + return &ptr->unk48C; + case 44004: + return &ptr->unk49C; + case 44005: + return &ptr->unk4AC; + case 44006: + return &ptr->unk550; + case 44007: + return &ptr->unk5CC; + case 44008: + return &ptr->unk4E0; + case 44009: + return &ptr->unk4F0; + case 44010: + return &ptr->unk648; + case 44011: + return &ptr->unk670; + case 44012: + return &ptr->unk698; + case 44013: + return &ptr->unk6C0; + case 44014: + return &ptr->unk6E8; + case 44015: + return &ptr->unk710; + default: + return nullptr; + } +} + +emPopperamParamAccesser::~emPopperamParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp b/src/mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp new file mode 100644 index 0000000..6cce3db --- /dev/null +++ b/src/mo_enemy/sora_enemy/rayquaza/em_rayquaza_param_accesser.cpp @@ -0,0 +1,106 @@ +#include +#include +#include +#include + +emRayquazaParamAccesser g_emRayquazaParamAccesser; + +emRayquazaParamAccesser::emRayquazaParamAccesser() + : emExtendParamAccesser(Enemy_Boss_Rayquaza) { } + +float emRayquazaParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return ptr->unk354; + case 4001: + return ptr->unk358; + case 4002: + return ptr->unk344.f; + case 4003: + return ptr->unk348; + case 4004: + return ptr->unk350; + default: + return 0.0f; + } +} + +s32 emRayquazaParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk34C.i; + default: + return 0; + } +} + +void* emRayquazaParamAccesser::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->unk35C; + case 44004: + return &ptr->unk364; + case 44005: + return &ptr->unk36C; + case 44006: + return &ptr->unk374; + case 44007: + return &ptr->unk37C; + case 44008: + return &ptr->unk384; + case 44009: + return &ptr->unk38C; + case 44010: + return &ptr->unk468; + case 44011: + return &ptr->unk474; + case 44012: + return &ptr->unk480; + case 44013: + return &ptr->unk48C; + case 44014: + return &ptr->unk498; + case 44015: + return &ptr->unk39C; + case 44016: + return &ptr->unk3B4; + case 44017: + return &ptr->unk3CC; + case 44018: + return &ptr->unk3E4; + case 44019: + return &ptr->unk3FC; + case 44020: + return &ptr->unk414; + case 44021: + return &ptr->unk42C; + case 44022: + return &ptr->unk450; + case 44023: + return &ptr->unk4A4; + case 44024: + return &ptr->unk520; + case 44025: + return &ptr->unk59C; + case 44026: + return &ptr->unk618; + case 44027: + return &ptr->unk694; + default: + return nullptr; + } +} + +emRayquazaParamAccesser::~emRayquazaParamAccesser() { } diff --git a/src/mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp b/src/mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp index 2cae182..8719d28 100644 --- a/src/mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/ridley/em_ridley_param_accesser.cpp @@ -13,9 +13,9 @@ float emRidleyParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { acc->getResourceModule()).unk2C; switch (p2) { case 4000: - return ptr->unk5C8; + return ptr->unk5C8.f; case 4001: - return ptr->unk5CC; + return ptr->unk5CC.f; default: return 0.0f; } diff --git a/src/mo_enemy/sora_enemy/siralamos/em_siralamos_param_accesser.cpp b/src/mo_enemy/sora_enemy/siralamos/em_siralamos_param_accesser.cpp index 840df25..d065a9a 100644 --- a/src/mo_enemy/sora_enemy/siralamos/em_siralamos_param_accesser.cpp +++ b/src/mo_enemy/sora_enemy/siralamos/em_siralamos_param_accesser.cpp @@ -19,11 +19,11 @@ s32 emSiralamosParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { acc->getResourceModule()).unk2C; switch (p2) { case 24000: - return ptr->unk4C4; + return ptr->unk4C4.i; case 24001: - return ptr->unk4C8; + return ptr->unk4C8.i; case 24002: - return ptr->unk4CC; + return ptr->unk4CC.i; default: return 0; } diff --git a/src/mo_enemy/sora_enemy/tautau/em_tautau_param_accesser.cpp b/src/mo_enemy/sora_enemy/tautau/em_tautau_param_accesser.cpp new file mode 100644 index 0000000..f975faf --- /dev/null +++ b/src/mo_enemy/sora_enemy/tautau/em_tautau_param_accesser.cpp @@ -0,0 +1,74 @@ +#include +#include +#include +#include + +emTautauParamAccesser g_emTowtowParamAccesser; + +emTautauParamAccesser::emTautauParamAccesser() + : emExtendParamAccesser(Enemy_Towtow) { } + +float emTautauParamAccesser::getParamFloat(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 4000: + return static_cast(ptr->unk4A0); + case 4001: + return static_cast(ptr->unk4A4); + case 4002: + return static_cast(ptr->unk4A8); + case 4003: + return static_cast(ptr->unk4AC); + default: + return 0.0f; + } +} + +s32 emTautauParamAccesser::getParamInt(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 24000: + return ptr->unk434; + case 24001: + return ptr->unk438; + case 24002: + return ptr->unk488; + case 24003: + return ptr->unk48C; + case 24004: + return ptr->unk490; + case 24005: + return ptr->unk494; + default: + return 0; + } +} + +void* emTautauParamAccesser::getParamIndefinite(soModuleAccesser* acc, s32 p2) { + UnkParamAccesser* ptr = dynamic_cast( + acc->getResourceModule()).unk2C; + switch (p2) { + case 44000: + return ptr; + case 44001: + return &ptr->unk2C0; + case 44002: + return &ptr->unk374; + case 44003: + return &ptr->unk414; + case 44004: + return &ptr->unk424; + case 44005: + return &ptr->unk43C; + case 44006: + return &ptr->unk44C; + case 44007: + return &ptr->unk498; + default: + return nullptr; + } +} + +emTautauParamAccesser::~emTautauParamAccesser() { }