From ad80f13149885f8420db32ab12f291de30473d9b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 2 May 2021 04:03:42 +0900 Subject: [PATCH] Battle Area + Effect Data (#289) * part 2 dun * DivActorLevel4 * Dist3D * SetBackgroundAlpha & FreeIcon * update symbol_addrs * UnkBackgroundFunc3 * anudder * UnkFogFunc2 * Disasm most remaining data * model stuff and renames * update symbol_addrs --- include/common_structs.h | 25 +- include/functions.h | 5 + src/102610_len_2330.c | 4 +- src/102C80.c | 12 +- src/104940_len_dc0.c | 14 +- src/105700_len_2130.c | 8 +- src/105F90.c | 2 +- src/106EF0.c | 6 +- src/109660_len_1270.c | 2 +- src/10A230.c | 6 +- src/10A8D0.c | 4 +- src/325AD0.c | 21 +- src/4ac90_len_3910.c | 2 +- src/a5dd0_len_114e0.c | 23 +- src/battle/area_flo2/5CE690.c | 14 +- src/battle/area_kmr_part_2/439A90.c | 15 +- src/battle/area_kmr_part_3/447D50.c | 24 +- src/battle/area_kmr_part_3/448E20.c | 2 +- src/battle/area_kpa3/6BBC60.c | 4 +- src/battle/area_mac/464560.c | 4 +- src/battle/area_mim/4F7F40.c | 2 +- src/battle/area_pra3/669D80.c | 4 +- src/battle/area_sam/623BA0.c | 4 +- src/battle/area_sam2/63D1E0.c | 6 +- src/battle/item/sleepy_sheep/lib.c | 1 - src/battle/partner/703AF0.c | 4 +- src/common/Dist3D.inc.c | 18 + src/common/DivActorLevel4.inc.c | 9 + src/common/FreeIcon.inc.c | 7 + src/common/SetBackgroundAlpha.inc.c | 9 + src/common/UnkBackgroundFunc3.inc.c | 8 + src/common/UnkFogFunc2.inc.c | 12 + ver/us/asm/data/3255E0.data.s | 6 + ver/us/asm/data/326160.data.s | 129 +++ ver/us/asm/data/328050.data.s | 18 + ver/us/asm/data/328D20.data.s | 33 + ver/us/asm/data/32C770.data.s | 12 + ver/us/asm/data/32CEB0.data.s | 6 + ver/us/asm/data/32EC10.data.s | 24 + ver/us/asm/data/32F550.data.s | 18 + ver/us/asm/data/330440.data.s | 12 + ver/us/asm/data/332690.data.s | 9 + ver/us/asm/data/334B50.data.s | 36 + ver/us/asm/data/337F10.data.s | 39 + ver/us/asm/data/339F10.data.s | 15 + ver/us/asm/data/33BB70.data.s | 30 + ver/us/asm/data/33D5D0.data.s | 24 + ver/us/asm/data/33EFE0.data.s | 15 + ver/us/asm/data/3407C0.data.s | 30 + ver/us/asm/data/342120.data.s | 9 + ver/us/asm/data/342FD0.data.s | 24 + ver/us/asm/data/343F30.data.s | 24 + ver/us/asm/data/345190.data.s | 30 + ver/us/asm/data/345B10.data.s | 15 + ver/us/asm/data/34E710.data.s | 21 + ver/us/asm/data/34F480.data.s | 18 + ver/us/asm/data/350160.data.s | 24 + ver/us/asm/data/352CB0.data.s | 21 + ver/us/asm/data/353B40.data.s | 21 + ver/us/asm/data/354F20.data.s | 12 + ver/us/asm/data/355D10.data.s | 51 ++ ver/us/asm/data/3564E0.data.s | 30 + ver/us/asm/data/357380.data.s | 12 + ver/us/asm/data/359320.data.s | 36 + ver/us/asm/data/35A580.data.s | 27 + ver/us/asm/data/35BFB0.data.s | 9 + ver/us/asm/data/35C530.data.s | 12 + ver/us/asm/data/35D460.data.s | 12 + ver/us/asm/data/35E8A0.data.s | 51 ++ ver/us/asm/data/35F0A0.data.s | 24 + ver/us/asm/data/360A10.data.s | 12 + ver/us/asm/data/361640.data.s | 18 + ver/us/asm/data/362C30.data.s | 12 + ver/us/asm/data/363890.data.s | 21 + ver/us/asm/data/364BC0.data.s | 27 + ver/us/asm/data/365970.data.s | 21 + ver/us/asm/data/366C80.data.s | 15 + ver/us/asm/data/36AE80.data.s | 15 + ver/us/asm/data/36DE10.data.s | 21 + ver/us/asm/data/36ED30.data.s | 9 + ver/us/asm/data/373390.data.s | 27 + ver/us/asm/data/374D80.data.s | 30 + ver/us/asm/data/375500.data.s | 6 + ver/us/asm/data/376FC0.data.s | 21 + ver/us/asm/data/377F00.data.s | 33 + ver/us/asm/data/37ACF0.data.s | 18 + ver/us/asm/data/37D140.data.s | 24 + ver/us/asm/data/37D9A0.data.s | 6 + ver/us/asm/data/380350.data.s | 18 + ver/us/asm/data/381D80.data.s | 18 + ver/us/asm/data/386340.data.s | 12 + ver/us/asm/data/3897E0.data.s | 45 + ver/us/asm/data/38A2F0.data.s | 21 + ver/us/asm/data/38BAB0.data.s | 45 + ver/us/asm/data/38D040.data.s | 18 + ver/us/asm/data/38E8F0.data.s | 39 + ver/us/asm/data/38F6F0.data.s | 9 + ver/us/asm/data/390340.data.s | 33 + ver/us/asm/data/3923C0.data.s | 12 + ver/us/asm/data/393080.data.s | 15 + ver/us/asm/data/3960C0.data.s | 9 + ver/us/asm/data/397010.data.s | 12 + ver/us/asm/data/3A0D10.data.s | 39 + ver/us/asm/data/3A3360.data.s | 12 + ver/us/asm/data/3A42B0.data.s | 24 + ver/us/asm/data/3A5BE0.data.s | 6 + ver/us/asm/data/3A7710.data.s | 18 + ver/us/asm/data/3AAFE0.data.s | 9 + ver/us/asm/data/3AF5D0.data.s | 27 + ver/us/asm/data/3B4690.data.s | 9 + ver/us/asm/data/3B5330.data.s | 6 + ver/us/asm/data/3B69E0.data.s | 24 + ver/us/asm/data/3B78B0.data.s | 15 + ver/us/asm/data/3B8470.data.s | 18 + ver/us/asm/data/3B9A50.data.s | 12 + ver/us/asm/data/3BAC60.data.s | 24 + ver/us/asm/data/3BCA50.data.s | 21 + ver/us/asm/data/3BD770.data.s | 33 + ver/us/asm/data/3C1B60.data.s | 12 + ver/us/asm/data/3CB7C0.data.s | 24 + ver/us/asm/data/3CD670.data.s | 36 + ver/us/asm/data/3CFAB0.data.s | 21 + ver/us/asm/data/3D11B0.data.s | 18 + ver/us/asm/data/3D2460.data.s | 36 + ver/us/asm/data/3D3910.data.s | 15 + ver/us/asm/data/3D4930.data.s | 21 + ver/us/asm/data/3D4E70.data.s | 15 + ver/us/asm/data/3D5E60.data.s | 36 + ver/us/asm/data/3D6FA0.data.s | 9 + ver/us/asm/data/3D7740.data.s | 15 + ver/us/asm/data/3D80B0.data.s | 9 + ver/us/asm/data/3D8F30.data.s | 24 + ver/us/asm/data/3DBEA0.data.s | 24 + ver/us/asm/data/3DCD00.data.s | 21 + ver/us/asm/data/3DED90.data.s | 42 + ver/us/asm/data/3E11B0.data.s | 27 + ver/us/asm/data/3E1CC0.data.s | 9 + ver/us/asm/data/3E2930.data.s | 18 + ver/us/asm/data/3E5060.data.s | 39 + ver/us/asm/data/3E5ED0.data.s | 21 + ver/us/asm/data/3EBC30.data.s | 24 + ver/us/asm/data/3F8CA0.data.s | 15 + ver/us/asm/data/3FA480.data.s | 12 + ver/us/asm/data/3FF180.data.s | 15 + ver/us/asm/data/4032A0.data.s | 60 ++ ver/us/asm/data/403BB0.data.s | 18 + ver/us/asm/data/404E40.data.s | 21 + ver/us/asm/data/407040.data.s | 15 + ver/us/asm/data/40A180.data.s | 21 + ver/us/asm/data/40BB70.data.s | 15 + ver/us/asm/data/40D130.data.s | 48 + ver/us/asm/data/412FD0.data.s | 33 + ver/us/asm/data/413F20.data.s | 54 ++ ver/us/asm/data/415020.data.s | 9 + ver/us/asm/data/422A90.data.s | 6 + ver/us/asm/data/4233B0.data.s | 6 + ver/us/asm/data/423C30.data.s | 6 + ver/us/asm/data/424550.data.s | 93 ++ ver/us/asm/data/425B10.data.s | 6 + ver/us/asm/data/426130.data.s | 6 + ver/us/asm/data/426970.data.s | 12 + ver/us/asm/data/427320.data.s | 21 + ver/us/asm/data/427A30.data.s | 6 + ver/us/asm/data/428280.data.s | 12 + ver/us/asm/data/428A30.data.s | 6 + ver/us/asm/data/4292C0.data.s | 12 + ver/us/asm/data/429C90.data.s | 21 + ver/us/asm/data/42A480.data.s | 15 + ver/us/asm/data/42B650.data.s | 84 ++ ver/us/asm/data/42CEB0.data.s | 12 + ver/us/asm/data/42D9B0.data.s | 12 + ver/us/asm/data/42E330.data.s | 12 + ver/us/asm/data/42ED70.data.s | 24 + ver/us/asm/data/42F680.data.s | 12 + ver/us/asm/data/42FFC0.data.s | 12 + ver/us/asm/data/430940.data.s | 12 + .../asm/data/battle/area_flo2/5CFF00.data.s | 4 +- .../data/battle/area_kmr_part_2/43B1E0.data.s | 4 +- .../data/battle/area_kmr_part_3/4495F0.data.s | 6 +- .../asm/data/battle/area_kpa3/6BD250.data.s | 4 +- ver/us/asm/data/battle/area_mac/4661E0.data.s | 4 +- ver/us/asm/data/battle/area_mim/4F7FA0.data.s | 2 +- .../asm/data/battle/area_pra3/66BC90.data.s | 4 +- ver/us/asm/data/battle/area_sam/626A30.data.s | 4 +- .../asm/data/battle/area_sam2/63F040.data.s | 2 +- ver/us/asm/data/battle/partner/704A80.data.s | 8 +- .../104940_len_dc0/func_802E3BA4.s | 6 +- .../1086a0_len_fc0/func_802E7034.s | 2 +- .../asm/nonmatchings/325AD0/func_E0200000.s | 22 - .../asm/nonmatchings/325AD0/func_E0200044.s | 34 - .../a5dd0_len_114e0/AssignScript.s | 23 - .../a5dd0_len_114e0/func_80112328.s | 11 - .../a5dd0_len_114e0/func_8011B1C0.s | 10 - ...y_updatecmd.s => set_entity_commandlist.s} | 2 +- .../439A90/func_80218780_43A210.s | 16 - .../439A90/func_80218A30_43A4C0.s | 16 - .../439A90/func_80218A60_43A4F0.s | 48 - .../447D50/func_802189DC_447E1C.s | 54 -- .../447D50/func_80218AA4_447EE4.s | 15 - .../447D50/func_80218E1C_44825C.s | 86 -- .../447D50/func_80218F60_4483A0.s | 21 - .../447D50/func_80218FA4_4483E4.s | 19 - .../448E20/func_802199E0_448E20.s | 28 - .../area_kpa3/6BBC60/func_8021950C_6BD09C.s | 21 - .../area_kpa3/6BBC60/func_80219550_6BD0E0.s | 18 - .../area_mac/464560/func_8021973C_465BCC.s | 21 - .../area_mac/464560/func_80219780_465C10.s | 18 - .../area_mim/4F7F40/func_80218360_4F7F40.s | 28 - .../area_pra3/669D80/func_8021943C_66B1BC.s | 21 - .../area_pra3/669D80/func_80219480_66B200.s | 18 - .../area_sam/623BA0/func_8021943C_624FDC.s | 21 - .../area_sam/623BA0/func_80219480_625020.s | 18 - .../area_sam2/63D1E0/func_80218314_63D4F4.s | 86 -- .../area_sam2/63D1E0/func_80218458_63D638.s | 21 - .../area_sam2/63D1E0/func_8021849C_63D67C.s | 18 - .../partner/703AF0/func_80238434_703F24.s | 21 - .../partner/703AF0/func_80238478_703F68.s | 18 - ver/us/splat.yaml | 290 +++--- ver/us/symbol_addrs.txt | 326 +++---- ver/us/undefined_syms_auto.txt | 827 ------------------ 220 files changed, 3673 insertions(+), 1992 deletions(-) create mode 100644 src/common/Dist3D.inc.c create mode 100644 src/common/DivActorLevel4.inc.c create mode 100644 src/common/FreeIcon.inc.c create mode 100644 src/common/SetBackgroundAlpha.inc.c create mode 100644 src/common/UnkBackgroundFunc3.inc.c create mode 100644 src/common/UnkFogFunc2.inc.c create mode 100644 ver/us/asm/data/3255E0.data.s create mode 100644 ver/us/asm/data/326160.data.s create mode 100644 ver/us/asm/data/328050.data.s create mode 100644 ver/us/asm/data/328D20.data.s create mode 100644 ver/us/asm/data/32C770.data.s create mode 100644 ver/us/asm/data/32CEB0.data.s create mode 100644 ver/us/asm/data/32EC10.data.s create mode 100644 ver/us/asm/data/32F550.data.s create mode 100644 ver/us/asm/data/330440.data.s create mode 100644 ver/us/asm/data/332690.data.s create mode 100644 ver/us/asm/data/334B50.data.s create mode 100644 ver/us/asm/data/337F10.data.s create mode 100644 ver/us/asm/data/339F10.data.s create mode 100644 ver/us/asm/data/33BB70.data.s create mode 100644 ver/us/asm/data/33D5D0.data.s create mode 100644 ver/us/asm/data/33EFE0.data.s create mode 100644 ver/us/asm/data/3407C0.data.s create mode 100644 ver/us/asm/data/342120.data.s create mode 100644 ver/us/asm/data/342FD0.data.s create mode 100644 ver/us/asm/data/343F30.data.s create mode 100644 ver/us/asm/data/345190.data.s create mode 100644 ver/us/asm/data/345B10.data.s create mode 100644 ver/us/asm/data/34E710.data.s create mode 100644 ver/us/asm/data/34F480.data.s create mode 100644 ver/us/asm/data/350160.data.s create mode 100644 ver/us/asm/data/352CB0.data.s create mode 100644 ver/us/asm/data/353B40.data.s create mode 100644 ver/us/asm/data/354F20.data.s create mode 100644 ver/us/asm/data/355D10.data.s create mode 100644 ver/us/asm/data/3564E0.data.s create mode 100644 ver/us/asm/data/357380.data.s create mode 100644 ver/us/asm/data/359320.data.s create mode 100644 ver/us/asm/data/35A580.data.s create mode 100644 ver/us/asm/data/35BFB0.data.s create mode 100644 ver/us/asm/data/35C530.data.s create mode 100644 ver/us/asm/data/35D460.data.s create mode 100644 ver/us/asm/data/35E8A0.data.s create mode 100644 ver/us/asm/data/35F0A0.data.s create mode 100644 ver/us/asm/data/360A10.data.s create mode 100644 ver/us/asm/data/361640.data.s create mode 100644 ver/us/asm/data/362C30.data.s create mode 100644 ver/us/asm/data/363890.data.s create mode 100644 ver/us/asm/data/364BC0.data.s create mode 100644 ver/us/asm/data/365970.data.s create mode 100644 ver/us/asm/data/366C80.data.s create mode 100644 ver/us/asm/data/36AE80.data.s create mode 100644 ver/us/asm/data/36DE10.data.s create mode 100644 ver/us/asm/data/36ED30.data.s create mode 100644 ver/us/asm/data/373390.data.s create mode 100644 ver/us/asm/data/374D80.data.s create mode 100644 ver/us/asm/data/375500.data.s create mode 100644 ver/us/asm/data/376FC0.data.s create mode 100644 ver/us/asm/data/377F00.data.s create mode 100644 ver/us/asm/data/37ACF0.data.s create mode 100644 ver/us/asm/data/37D140.data.s create mode 100644 ver/us/asm/data/37D9A0.data.s create mode 100644 ver/us/asm/data/380350.data.s create mode 100644 ver/us/asm/data/381D80.data.s create mode 100644 ver/us/asm/data/386340.data.s create mode 100644 ver/us/asm/data/3897E0.data.s create mode 100644 ver/us/asm/data/38A2F0.data.s create mode 100644 ver/us/asm/data/38BAB0.data.s create mode 100644 ver/us/asm/data/38D040.data.s create mode 100644 ver/us/asm/data/38E8F0.data.s create mode 100644 ver/us/asm/data/38F6F0.data.s create mode 100644 ver/us/asm/data/390340.data.s create mode 100644 ver/us/asm/data/3923C0.data.s create mode 100644 ver/us/asm/data/393080.data.s create mode 100644 ver/us/asm/data/3960C0.data.s create mode 100644 ver/us/asm/data/397010.data.s create mode 100644 ver/us/asm/data/3A0D10.data.s create mode 100644 ver/us/asm/data/3A3360.data.s create mode 100644 ver/us/asm/data/3A42B0.data.s create mode 100644 ver/us/asm/data/3A5BE0.data.s create mode 100644 ver/us/asm/data/3A7710.data.s create mode 100644 ver/us/asm/data/3AAFE0.data.s create mode 100644 ver/us/asm/data/3AF5D0.data.s create mode 100644 ver/us/asm/data/3B4690.data.s create mode 100644 ver/us/asm/data/3B5330.data.s create mode 100644 ver/us/asm/data/3B69E0.data.s create mode 100644 ver/us/asm/data/3B78B0.data.s create mode 100644 ver/us/asm/data/3B8470.data.s create mode 100644 ver/us/asm/data/3B9A50.data.s create mode 100644 ver/us/asm/data/3BAC60.data.s create mode 100644 ver/us/asm/data/3BCA50.data.s create mode 100644 ver/us/asm/data/3BD770.data.s create mode 100644 ver/us/asm/data/3C1B60.data.s create mode 100644 ver/us/asm/data/3CB7C0.data.s create mode 100644 ver/us/asm/data/3CD670.data.s create mode 100644 ver/us/asm/data/3CFAB0.data.s create mode 100644 ver/us/asm/data/3D11B0.data.s create mode 100644 ver/us/asm/data/3D2460.data.s create mode 100644 ver/us/asm/data/3D3910.data.s create mode 100644 ver/us/asm/data/3D4930.data.s create mode 100644 ver/us/asm/data/3D4E70.data.s create mode 100644 ver/us/asm/data/3D5E60.data.s create mode 100644 ver/us/asm/data/3D6FA0.data.s create mode 100644 ver/us/asm/data/3D7740.data.s create mode 100644 ver/us/asm/data/3D80B0.data.s create mode 100644 ver/us/asm/data/3D8F30.data.s create mode 100644 ver/us/asm/data/3DBEA0.data.s create mode 100644 ver/us/asm/data/3DCD00.data.s create mode 100644 ver/us/asm/data/3DED90.data.s create mode 100644 ver/us/asm/data/3E11B0.data.s create mode 100644 ver/us/asm/data/3E1CC0.data.s create mode 100644 ver/us/asm/data/3E2930.data.s create mode 100644 ver/us/asm/data/3E5060.data.s create mode 100644 ver/us/asm/data/3E5ED0.data.s create mode 100644 ver/us/asm/data/3EBC30.data.s create mode 100644 ver/us/asm/data/3F8CA0.data.s create mode 100644 ver/us/asm/data/3FA480.data.s create mode 100644 ver/us/asm/data/3FF180.data.s create mode 100644 ver/us/asm/data/4032A0.data.s create mode 100644 ver/us/asm/data/403BB0.data.s create mode 100644 ver/us/asm/data/404E40.data.s create mode 100644 ver/us/asm/data/407040.data.s create mode 100644 ver/us/asm/data/40A180.data.s create mode 100644 ver/us/asm/data/40BB70.data.s create mode 100644 ver/us/asm/data/40D130.data.s create mode 100644 ver/us/asm/data/412FD0.data.s create mode 100644 ver/us/asm/data/413F20.data.s create mode 100644 ver/us/asm/data/415020.data.s create mode 100644 ver/us/asm/data/422A90.data.s create mode 100644 ver/us/asm/data/4233B0.data.s create mode 100644 ver/us/asm/data/423C30.data.s create mode 100644 ver/us/asm/data/424550.data.s create mode 100644 ver/us/asm/data/425B10.data.s create mode 100644 ver/us/asm/data/426130.data.s create mode 100644 ver/us/asm/data/426970.data.s create mode 100644 ver/us/asm/data/427320.data.s create mode 100644 ver/us/asm/data/427A30.data.s create mode 100644 ver/us/asm/data/428280.data.s create mode 100644 ver/us/asm/data/428A30.data.s create mode 100644 ver/us/asm/data/4292C0.data.s create mode 100644 ver/us/asm/data/429C90.data.s create mode 100644 ver/us/asm/data/42A480.data.s create mode 100644 ver/us/asm/data/42B650.data.s create mode 100644 ver/us/asm/data/42CEB0.data.s create mode 100644 ver/us/asm/data/42D9B0.data.s create mode 100644 ver/us/asm/data/42E330.data.s create mode 100644 ver/us/asm/data/42ED70.data.s create mode 100644 ver/us/asm/data/42F680.data.s create mode 100644 ver/us/asm/data/42FFC0.data.s create mode 100644 ver/us/asm/data/430940.data.s delete mode 100644 ver/us/asm/nonmatchings/325AD0/func_E0200000.s delete mode 100644 ver/us/asm/nonmatchings/325AD0/func_E0200044.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/AssignScript.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/func_80112328.s delete mode 100644 ver/us/asm/nonmatchings/a5dd0_len_114e0/func_8011B1C0.s rename ver/us/asm/nonmatchings/a5dd0_len_114e0/{set_entity_updatecmd.s => set_entity_commandlist.s} (93%) delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218780_43A210.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A30_43A4C0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_2/439A90/func_80218A60_43A4F0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_802189DC_447E1C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218AA4_447EE4.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218E1C_44825C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218F60_4483A0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/447D50/func_80218FA4_4483E4.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kmr_part_3/448E20/func_802199E0_448E20.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_8021950C_6BD09C.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_kpa3/6BBC60/func_80219550_6BD0E0.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_mac/464560/func_8021973C_465BCC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_mac/464560/func_80219780_465C10.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_mim/4F7F40/func_80218360_4F7F40.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_8021943C_66B1BC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_pra3/669D80/func_80219480_66B200.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_8021943C_624FDC.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam/623BA0/func_80219480_625020.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218314_63D4F4.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63D1E0/func_80218458_63D638.s delete mode 100644 ver/us/asm/nonmatchings/battle/area_sam2/63D1E0/func_8021849C_63D67C.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238434_703F24.s delete mode 100644 ver/us/asm/nonmatchings/battle/partner/703AF0/func_80238478_703F68.s diff --git a/include/common_structs.h b/include/common_structs.h index 9d1db0f469..51a1a5b934 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -319,28 +319,31 @@ typedef struct Entity { /* 0x00 */ s32 flags; /* 0x04 */ u8 listIndex; /* 0x05 */ char unk_05; - /* 0x06 */ u8 unk_06; + /* 0x06 */ u8 collisionFlags; /* 0x07 */ s8 unk_07; - /* 0x08 */ char unk_08[2]; - /* 0x0A */ u8 unk_0A; + /* 0x08 */ char unk_08; + /* 0x09 */ s8 hasEntityScript; + /* 0x0A */ u8 type; /* 0x0B */ u8 alpha; /* 0x0C */ Vec3s aabb; - /* 0x12 */ char unk_12[2]; + /* 0x12 */ s16 vertexSegment; /* 0x14 */ s16 virtualModelIndex; /* 0x16 */ s16 shadowIndex; - /* 0x18 */ char unk_18[8]; - /* 0x20 */ UNK_PTR buildMatrixOverride; - /* 0x24 */ char unk_24[4]; - /* 0x28 */ Bytecode* boundScript; - /* 0x2C */ char unk_2C[12]; + /* 0x18 */ s32* scriptReadPos; + /* 0x1C */ UNK_FUN_PTR(updateScriptCallback); + /* 0x20 */ UNK_FUN_PTR(updateMatrixOverride); + /* 0x24 */ ScriptInstance* boundScript; + /* 0x28 */ Bytecode* boundScriptBytecode; + /* 0x2C */ s32* savedReadPos; + /* 0x30 */ char unk_30[0x8]; /* 0x38 */ struct StaticEntityData* staticData; - /* 0x3C */ UNK_PTR unk_3C; // pointer to draw func(?) + /* 0x3C */ UNK_PTR renderSetupFunc; // pointer to draw func(?) /* 0x40 */ void* dataBuf; /* 0x44 */ Mtx* vertexData; /* 0x48 */ Vec3f position; /* 0x54 */ Vec3f scale; /* 0x60 */ Vec3f rotation; - /* 0x6C */ char unk_6C[4]; + /* 0x6C */ f32 shadowPosY; /* 0x70 */ Matrix4f* inverseTransformMatrix; /* world-to-local */ /* 0x74 */ char unk_74[60]; /* 0xB0 */ float effectiveSize; diff --git a/include/functions.h b/include/functions.h index d5c03cbd0a..760a947b6c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -225,6 +225,10 @@ s32 is_ability_active(s32 arg0); f32 update_lerp(Easing easing, f32 start, f32 end, s32 elapsed, s32 duration); void sin_cos_deg(f32 rad, f32* outSinTheta, f32* outCosTheta); +void enable_world_fog(void); +void set_world_fog_dist(s32 start, s32 end); +void set_world_fog_color(s32 r, s32 g, s32 b, s32 a); + s32 make_item_entity(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 facingAngleSign, s32 pickupVar); s32 make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 itemSpawnMode, s32 pickupDelay, s32 pickupVar); @@ -303,6 +307,7 @@ void func_80070130(s32 arg0, f32 arg1, f32 arg2, f32 arg3); void func_800701F0(s32 arg0, f32 arg1, f32 arg2, f32 arg3); void add_xz_vec3f(Vec3f* vector, f32 speed, f32 angleDeg); void play_movement_dust_effects(s32 var0, f32 xPos, f32 yPos, f32 zPos, f32 angleDeg); +void fx_walk_large(s32, f32, f32, f32, s32); void func_80138D88(s32, s32, s32, s32, f32); s32 func_80071030(s32 a0, f32 a1, f32 a2, f32 a3, s32 a4); diff --git a/src/102610_len_2330.c b/src/102610_len_2330.c index 2436aee842..e51ec0736d 100644 --- a/src/102610_len_2330.c +++ b/src/102610_len_2330.c @@ -94,7 +94,7 @@ void func_802E1350(Entity* entity) { s32* temp = &D_802EB390; if (*temp != 0) { if (D_802EB398->currentOption == 1) { - set_entity_updatecmd(entity, &D_802E99DC); + set_entity_commandlist(entity, &D_802E99DC); } else { exec_entity_updatecmd(entity); } @@ -106,6 +106,6 @@ void func_802E13B8(Entity* entity) { struct802E3650* temp = entity->dataBuf; entity_init_Hammer23Block_normal(entity); - entity->unk_3C = func_802E0DE0; + entity->renderSetupFunc = func_802E0DE0; temp->unk_04 = 8; } diff --git a/src/102C80.c b/src/102C80.c index 8ba1df15eb..27d925e118 100644 --- a/src/102C80.c +++ b/src/102C80.c @@ -6,7 +6,7 @@ void func_802E1400(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; struct802E1400* temp = entity->dataBuf; - if (entity->unk_06 & 1) { + if (entity->collisionFlags & 1) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { exec_entity_updatecmd(entity); temp->unk_22 = 8; @@ -66,7 +66,7 @@ void func_802E153C(Entity* entity) { void func_802E1614(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - if (entity->unk_06 & 1) { + if (entity->collisionFlags & 1) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { exec_entity_updatecmd(entity); @@ -81,7 +81,7 @@ void func_802E1660(Entity* entity) { func_802E153C(entity); - if (entity->unk_06 & 0x40) { + if (entity->collisionFlags & 0x40) { if (playerStatus->actionState == ACTION_STATE_HAMMER) { if (gPlayerData.hammerLevel < 0) { return; @@ -105,8 +105,8 @@ void func_802E1660(Entity* entity) { return; } - if (!(entity->unk_06 & 1)) { - if (!(entity->unk_06 & 0x80)) { + if (!(entity->collisionFlags & 1)) { + if (!(entity->collisionFlags & 0x80)) { return; } } @@ -121,7 +121,7 @@ void func_802E1660(Entity* entity) { } void func_802E1740(Entity* entity) { - if (!(entity->unk_06 & 1)) { + if (!(entity->collisionFlags & 1)) { exec_entity_updatecmd(entity); } } diff --git a/src/104940_len_dc0.c b/src/104940_len_dc0.c index 7c086095d0..5b8c2fb2a5 100644 --- a/src/104940_len_dc0.c +++ b/src/104940_len_dc0.c @@ -148,7 +148,7 @@ void func_802E38D8(Entity* entity) { if ((temp->unk_04 == 0) || (temp->unk_06 == 0)) { temp->unk_03 = 1; - set_entity_updatecmd(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, + set_entity_commandlist(get_entity_by_index(create_entity(&D_802EA07C, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000)), &D_802E9E54); entity->flags |= 0x20000020; @@ -160,7 +160,7 @@ void func_802E3A00(Entity* entity) { struct802E3650* temp = (struct802E3650*)entity->dataBuf; s16 phi_return; - if (entity->unk_0A == 0xE) { + if (entity->type == 0xE) { if (temp->unk_04 != 0xA) { temp->unk_06 -= 1; if (temp->unk_06 < 0) { @@ -175,7 +175,7 @@ void func_802E3A48(Entity* entity) { s32 temp_v0; struct802E3650* temp = (struct802E3650*)entity->dataBuf; - if ((entity->unk_06 & 0x80) != 0) { + if ((entity->collisionFlags & 0x80) != 0) { exec_entity_updatecmd(entity); return; } @@ -278,7 +278,7 @@ s32 func_802E3BA4(Entity* entity) { if (!bVar2) { return 1; } - set_entity_updatecmd(entity, &D_802E9E80); + set_entity_commandlist(entity, &D_802E9E80); sfx_play_sound_at_position(0x14f, 0, entity->position.x, entity->position.y, entity->position.z); break; case 0x16: @@ -293,7 +293,7 @@ s32 func_802E3BA4(Entity* entity) { if (!bVar2) { return 1; } - set_entity_updatecmd(entity, &D_802E9E80); + set_entity_commandlist(entity, &D_802E9E80); sfx_play_sound_at_position(0x150, 0, entity->position.x, entity->position.y, entity->position.z); break; case 0x17: @@ -301,7 +301,7 @@ s32 func_802E3BA4(Entity* entity) { if (gPlayerData.hammerLevel < '\x02') { return 1; } - set_entity_updatecmd(entity, &D_802E9E80); + set_entity_commandlist(entity, &D_802E9E80); sfx_play_sound_at_position(0x151, 0, entity->position.x, entity->position.y, entity->position.z); break; case 0x1b: @@ -324,7 +324,7 @@ INCLUDE_ASM(s32, "104940_len_dc0", func_802E3BA4, Entity* entity); void entity_init_Hammer1Block_normal(Entity* entity) { entity_init_Hammer23Block_normal(entity); - entity->unk_3C = func_802E30C0; + entity->renderSetupFunc = func_802E30C0; } s32 entity_init_HammerBlock_small(Entity* entity) { diff --git a/src/105700_len_2130.c b/src/105700_len_2130.c index 1d8fcd59e2..f844140c83 100644 --- a/src/105700_len_2130.c +++ b/src/105700_len_2130.c @@ -81,7 +81,7 @@ void func_802E4154(Entity* entity) { phi_a0 = &D_802EA0A0; } create_entity(phi_a0, entity->position.x, entity->position.y, entity->position.z, entity->rotation.y, 0x80000000); - set_entity_updatecmd(entity, &D_802EA310); + set_entity_commandlist(entity, &D_802EA310); } else { exec_entity_updatecmd(entity); } @@ -162,7 +162,7 @@ void func_802E4484(Entity* entity) { } s32 func_802E44CC(Entity* entity) { - if (entity->boundScript != NULL) { + if (entity->boundScriptBytecode != NULL) { entity->flags |= 0x1000000; return TRUE; } @@ -209,7 +209,7 @@ void func_802E464C(Entity* entity) { temp = entity->dataBuf; temp->unk_10 = D_8015C7D2; temp->unk_0A = 0xFFFF; - entity->unk_3C = func_802E455C; + entity->renderSetupFunc = func_802E455C; } void func_802E4694(Entity* entity) { @@ -221,7 +221,7 @@ void func_802E46BC(Entity* entity) { AnimatedMesh* animMesh; entity_init_Hammer23Block_normal(entity); - entity->unk_3C = func_802E455C; + entity->renderSetupFunc = func_802E455C; animMesh = get_anim_mesh(entity->virtualModelIndex); animMesh->renderMode = 0x11; animMesh->flags |= 0x10000; diff --git a/src/105F90.c b/src/105F90.c index 109b749911..76dcaa1c04 100644 --- a/src/105F90.c +++ b/src/105F90.c @@ -26,7 +26,7 @@ void func_802E4B60(Entity* entity) { struct802E4B10* temp_s0; Entity* someEntity; - entity->unk_3C = func_802E4AEC; + entity->renderSetupFunc = func_802E4AEC; entity->alpha = 255; temp_s0 = entity->dataBuf; entity->flags |= 0x2000; diff --git a/src/106EF0.c b/src/106EF0.c index 2c0c592494..6c75489613 100644 --- a/src/106EF0.c +++ b/src/106EF0.c @@ -75,7 +75,7 @@ void func_802E5E50(Entity* entity) { func_802E581C(entity); if (temp_s0->unk_0A != 0) { - entity->unk_3C = NULL; + entity->renderSetupFunc = NULL; } entity->rotation.y = clamp_angle(entity->rotation.y + 3.0); @@ -99,7 +99,7 @@ void func_802E5F50(Entity* entity) { temp->unk_128 = &D_0A000328; temp->unk_12C = &D_0A000380; - entity->unk_3C = func_802E586C; + entity->renderSetupFunc = func_802E586C; } void func_802E5F7C(Entity* entity) { @@ -107,5 +107,5 @@ void func_802E5F7C(Entity* entity) { temp->unk_128 = &D_0A000800; temp->unk_12C = &D_0A000750; - entity->unk_3C = func_802E586C; + entity->renderSetupFunc = func_802E586C; } diff --git a/src/109660_len_1270.c b/src/109660_len_1270.c index 42012f8e70..70f3f77290 100644 --- a/src/109660_len_1270.c +++ b/src/109660_len_1270.c @@ -52,7 +52,7 @@ s32 func_802E8858(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; s32 phi_a0 = FALSE; - if (entity->unk_06 & 1) { + if (entity->collisionFlags & 1) { if ((playerStatus->actionState == ACTION_STATE_GROUND_POUND) || (playerStatus->actionState == ACTION_STATE_ULTRA_POUND)) { set_action_state(ACTION_STATE_FALLING); phi_a0 = TRUE; diff --git a/src/10A230.c b/src/10A230.c index ff2bb24eb6..afe3fcf2d5 100644 --- a/src/10A230.c +++ b/src/10A230.c @@ -60,7 +60,7 @@ void func_802E8A58(Entity* entity) { void func_802E8ADC(Entity* entity) { PlayerStatus* playerStatus = &gPlayerStatus; - if ((entity->unk_06 & 1) != 0) { + if ((entity->collisionFlags & 1) != 0) { gOverrideFlags |= 0x40; if (!(playerStatus->flags & 0x3000)) { @@ -141,7 +141,7 @@ void func_802E8E10(Entity* entity) { Bytecode* triggerScriptStart = ((Trigger*)entity->dataBuf)->scriptSource; gOverrideFlags &= ~0x40; - entity->boundScript = triggerScriptStart; + entity->boundScriptBytecode = triggerScriptStart; func_80110678(entity); } @@ -158,7 +158,7 @@ f32 func_802E8F94(Entity* entity) { temp2 = temp[0]; temp3 = temp[1]; temp4 = temp[2]; - entity->unk_3C = &push_entity_matrix; + entity->renderSetupFunc = &push_entity_matrix; temp_s0 = entity->dataBuf; temp5 = &entity->position.y; // required... wtf temp_s0->unk_0C = temp2; diff --git a/src/10A8D0.c b/src/10A8D0.c index 54c4de549c..822ff3ad41 100644 --- a/src/10A8D0.c +++ b/src/10A8D0.c @@ -5,9 +5,9 @@ void func_802E9050(Entity* entity) { f32 val = fabsf(clamp_angle(180.0f - entity->rotation.y) - clamp_angle(atan2(entity->position.x, entity->position.z, playerStatus->position.x, playerStatus->position.z))); - if (!(playerStatus->animFlags & 1) && !(entity->unk_06 & 1) && (val <= 40.0f || val >= 320.0f)) { + if (!(playerStatus->animFlags & 1) && !(entity->collisionFlags & 1) && (val <= 40.0f || val >= 320.0f)) { entity->flags |= 0x1000; - if ((playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) && (entity->unk_06 & 8)) { + if ((playerStatus->animFlags & PLAYER_ANIM_FLAG_INTERACT_PROMPT) && (entity->collisionFlags & 8)) { func_80110678(entity); } } else { diff --git a/src/325AD0.c b/src/325AD0.c index 9a6af3ea3a..70f46fa3dc 100644 --- a/src/325AD0.c +++ b/src/325AD0.c @@ -1,7 +1,24 @@ #include "common.h" -INCLUDE_ASM(s32, "325AD0", func_E0200000); +extern u32 D_E0200690; +extern u32 D_E0200734[]; -INCLUDE_ASM(s32, "325AD0", func_E0200044); +u32 func_E0200000(s32 arg0) { + s32 temp_v0 = D_E0200690 * 4; + + D_E0200690 = (u32) ((temp_v0 + 2) * (temp_v0 + 3)) / 4; + + return D_E0200690 % (arg0 + 1); +} + +s32 func_E0200044(s32 arg0, s32 arg1) { + s32 temp_v0 = D_E0200734[arg1 - ((arg1 / 128) * 128)]; + + if (temp_v0 < 0) { + temp_v0 = -temp_v0; + } + + return temp_v0 % (arg0 + 1); +} INCLUDE_ASM(s32, "325AD0", func_E02000AC); diff --git a/src/4ac90_len_3910.c b/src/4ac90_len_3910.c index f4828acf74..cd08995f22 100644 --- a/src/4ac90_len_3910.c +++ b/src/4ac90_len_3910.c @@ -14,7 +14,7 @@ INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FA10); INCLUDE_ASM(s32, "4ac90_len_3910", func_8006FA70); -INCLUDE_ASM(s32, "4ac90_len_3910", fx_walk_large); +INCLUDE_ASM(void, "4ac90_len_3910", fx_walk_large, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4); INCLUDE_ASM(void, "4ac90_len_3910", fx_walk_normal, s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); diff --git a/src/a5dd0_len_114e0.c b/src/a5dd0_len_114e0.c index a47d949bdb..cb06bf12b7 100644 --- a/src/a5dd0_len_114e0.c +++ b/src/a5dd0_len_114e0.c @@ -39,7 +39,7 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", update_entities); INCLUDE_ASM(s32, "a5dd0_len_114e0", update_shadows); -INCLUDE_ASM(s32, "a5dd0_len_114e0", set_entity_updatecmd); +INCLUDE_ASM(s32, "a5dd0_len_114e0", set_entity_commandlist); INCLUDE_ASM(s32, "a5dd0_len_114e0", step_entity_updatecmd); @@ -254,7 +254,18 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80111E9C); INCLUDE_ASM(s32, "a5dd0_len_114e0", UseDynamicShadow); -INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignScript, ScriptInstance* script, s32 isInitialCall); +ApiStatus AssignScript(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + if (isInitialCall == TRUE) { + Bytecode* toBind = get_variable(script, *args++); + + get_entity_by_index(gLastCreatedEntityIndex)->boundScriptBytecode = toBind; + return ApiStatus_DONE2; + } + + return ApiStatus_DONE1; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", AssignAreaFlag, ScriptInstance* script, s32 isInitialCall); @@ -281,7 +292,9 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", create_entity_shadow); INCLUDE_ASM(Shadow*, "a5dd0_len_114e0", create_shadow_type, s32 type, f32 x, f32 y, f32 z); -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112328); +void func_80112328(s32 shadowIndex) { + func_8011085C(shadowIndex); +} INCLUDE_ASM(s32, "a5dd0_len_114e0", func_80112344); @@ -492,7 +505,9 @@ INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B090); INCLUDE_ASM(void, "a5dd0_len_114e0", get_model_center_and_size, s32 modelID, f32* centerX, f32* centerY, f32* centerZ, f32* sizeX, f32* sizeY, f32* sizeZ); -INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1C0); +Model* func_8011B1C0(s32 index) { + return (*D_801512E0)[index]; +} INCLUDE_ASM(s32, "a5dd0_len_114e0", func_8011B1D8); diff --git a/src/battle/area_flo2/5CE690.c b/src/battle/area_flo2/5CE690.c index 96a19d6658..03f65f3d6f 100644 --- a/src/battle/area_flo2/5CE690.c +++ b/src/battle/area_flo2/5CE690.c @@ -18,19 +18,9 @@ INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_80218620_5CECB0); INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_80218774_5CEE04); -ApiStatus func_802188A8_5CEF38(ScriptInstance* script, s32 isInitialCall) { - func_8011D82C(1); - *D_801512F0 = 1; - set_background_color_blend(0, 0, 0, 0); - return ApiStatus_DONE2; -} +#include "common/UnkBackgroundFunc3.inc.c" -ApiStatus func_802188EC_5CEF7C(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - - set_background_color_blend(0, 0, 0, get_variable(script, *args++)); - return ApiStatus_DONE2; -} +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/area_flo2/5CE690", func_80218924_5CEFB4); diff --git a/src/battle/area_kmr_part_2/439A90.c b/src/battle/area_kmr_part_2/439A90.c index e2e161354d..cc078024b9 100644 --- a/src/battle/area_kmr_part_2/439A90.c +++ b/src/battle/area_kmr_part_2/439A90.c @@ -12,12 +12,21 @@ #include "common/BattleAreaAngleStuff.inc.c" #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218780_43A210); +#include "common/DivActorLevel4.inc.c" #define NAMESPACE dup3_b_area_kmr_part_2 #include "common/BattleAreaAngleStuff.inc.c" #define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218A30_43A4C0); +#define NAMESPACE dup_b_area_kmr_part_2 +#include "common/DivActorLevel4.inc.c" +#define NAMESPACE b_area_kmr_part_2 -INCLUDE_ASM(s32, "battle/area_kmr_part_2/439A90", func_80218A60_43A4F0); +ApiStatus func_80218A60_43A4F0(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + + fx_walk_large(2, var1, var2, get_variable(script, *args++), 0); + return ApiStatus_DONE2; +} diff --git a/src/battle/area_kmr_part_3/447D50.c b/src/battle/area_kmr_part_3/447D50.c index 2598bc0699..fb3c3166a2 100644 --- a/src/battle/area_kmr_part_3/447D50.c +++ b/src/battle/area_kmr_part_3/447D50.c @@ -1,14 +1,28 @@ #include "common.h" +extern s32 D_80104A28; + #define NAMESPACE b_area_kmr_part_3 #define NAMESPACE dup_b_area_kmr_part_3 #include "common/UnkBattleFunc1.inc.c" #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_802189DC_447E1C); +ApiStatus func_802189DC_447E1C(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + f32 posX = get_float_variable(script, *args++); + f32 posY = get_float_variable(script, *args++); + MenuIcon* icon = create_icon(&D_80104A28); -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218AA4_447EE4); + set_icon_render_pos(icon, posX, posY); + set_hud_element_scale(icon, 1.5f); + clear_icon_flags(icon, 0x200002); + set_variable(script, *args++, icon); + load_tattle_flags(0x8B); + return ApiStatus_DONE2; +} + +#include "common/FreeIcon.inc.c" #define NAMESPACE dup2_b_area_kmr_part_3 #include "common/UnkBattleFunc1.inc.c" @@ -18,8 +32,8 @@ INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218AA4_447EE4); #include "common/BattleAreaAngleStuff.inc.c" #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218E1C_44825C); +#include "common/Dist3D.inc.c" -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218F60_4483A0); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_kmr_part_3/447D50", func_80218FA4_4483E4); +#include "common/SetBackgroundAlpha.inc.c" diff --git a/src/battle/area_kmr_part_3/448E20.c b/src/battle/area_kmr_part_3/448E20.c index abd125c897..9c1c56ff81 100644 --- a/src/battle/area_kmr_part_3/448E20.c +++ b/src/battle/area_kmr_part_3/448E20.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_kmr_part_3 -INCLUDE_ASM(s32, "battle/area_kmr_part_3/448E20", func_802199E0_448E20); +#include "common/UnkFogFunc2.inc.c" diff --git a/src/battle/area_kpa3/6BBC60.c b/src/battle/area_kpa3/6BBC60.c index f2f0850d8d..6ba296b3ae 100644 --- a/src/battle/area_kpa3/6BBC60.c +++ b/src/battle/area_kpa3/6BBC60.c @@ -32,9 +32,9 @@ INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219474_6BD004); INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_802194C0_6BD050); -INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_8021950C_6BD09C); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219550_6BD0E0); +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/area_kpa3/6BBC60", func_80219588_6BD118); diff --git a/src/battle/area_mac/464560.c b/src/battle/area_mac/464560.c index e8cd0ecccd..bbc5f50c9b 100644 --- a/src/battle/area_mac/464560.c +++ b/src/battle/area_mac/464560.c @@ -36,9 +36,9 @@ INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196A4_465B34); INCLUDE_ASM(s32, "battle/area_mac/464560", func_802196F0_465B80); -INCLUDE_ASM(s32, "battle/area_mac/464560", func_8021973C_465BCC); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_mac/464560", func_80219780_465C10); +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/area_mac/464560", func_802197B8_465C48); diff --git a/src/battle/area_mim/4F7F40.c b/src/battle/area_mim/4F7F40.c index 7c40ffa103..e4e68317a2 100644 --- a/src/battle/area_mim/4F7F40.c +++ b/src/battle/area_mim/4F7F40.c @@ -2,4 +2,4 @@ #define NAMESPACE b_area_mim -INCLUDE_ASM(s32, "battle/area_mim/4F7F40", func_80218360_4F7F40); +#include "common/UnkFogFunc2.inc.c" diff --git a/src/battle/area_pra3/669D80.c b/src/battle/area_pra3/669D80.c index e03c6d0aee..0b353a8c59 100644 --- a/src/battle/area_pra3/669D80.c +++ b/src/battle/area_pra3/669D80.c @@ -32,9 +32,9 @@ INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193A4_66B124); INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802193F0_66B170); -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_8021943C_66B1BC); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_80219480_66B200); +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/area_pra3/669D80", func_802194B8_66B238); diff --git a/src/battle/area_sam/623BA0.c b/src/battle/area_sam/623BA0.c index 2f7940d4b8..67a8c08d0e 100644 --- a/src/battle/area_sam/623BA0.c +++ b/src/battle/area_sam/623BA0.c @@ -30,9 +30,9 @@ INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802193A4_624F44); INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802193F0_624F90); -INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_8021943C_624FDC); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_80219480_625020); +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/area_sam/623BA0", func_802194B8_625058); diff --git a/src/battle/area_sam2/63D1E0.c b/src/battle/area_sam2/63D1E0.c index 1098f8fec5..9128f89433 100644 --- a/src/battle/area_sam2/63D1E0.c +++ b/src/battle/area_sam2/63D1E0.c @@ -4,10 +4,10 @@ INCLUDE_ASM(s32, "battle/area_sam2/63D1E0", func_80218000_63D1E0); -INCLUDE_ASM(s32, "battle/area_sam2/63D1E0", func_80218314_63D4F4); +#include "common/Dist3D.inc.c" -INCLUDE_ASM(s32, "battle/area_sam2/63D1E0", func_80218458_63D638); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/area_sam2/63D1E0", func_8021849C_63D67C); +#include "common/SetBackgroundAlpha.inc.c" #include "common/StartRumbleWithParams.inc.c" diff --git a/src/battle/item/sleepy_sheep/lib.c b/src/battle/item/sleepy_sheep/lib.c index b7b2e32715..c0c30da648 100644 --- a/src/battle/item/sleepy_sheep/lib.c +++ b/src/battle/item/sleepy_sheep/lib.c @@ -84,7 +84,6 @@ s32 N(D_802A3F28_721578)[] = { 0x802A32E0, 0x802A3260 }; -void fx_walk_large(s32, f32, f32, f32, s32); void func_802D4364(s32, s32, s32, s32); void func_802D43AC(s32, f32, f32, f32); void func_802D43F4(s32); diff --git a/src/battle/partner/703AF0.c b/src/battle/partner/703AF0.c index 5a06dcbb2c..39d7f244ff 100644 --- a/src/battle/partner/703AF0.c +++ b/src/battle/partner/703AF0.c @@ -16,9 +16,9 @@ INCLUDE_ASM(s32, "battle/partner/703AF0", func_802383F8_703EE8); INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238408_703EF8); -INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238434_703F24); +#include "common/UnkBackgroundFunc3.inc.c" -INCLUDE_ASM(s32, "battle/partner/703AF0", func_80238478_703F68); +#include "common/SetBackgroundAlpha.inc.c" INCLUDE_ASM(s32, "battle/partner/703AF0", func_802384B0_703FA0); diff --git a/src/common/Dist3D.inc.c b/src/common/Dist3D.inc.c new file mode 100644 index 0000000000..8b7d0b5cd0 --- /dev/null +++ b/src/common/Dist3D.inc.c @@ -0,0 +1,18 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(Dist3D)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + s32 var3 = get_variable(script, *args++); + s32 var4 = get_variable(script, *args++); + s32 var5 = get_variable(script, *args++); + s32 var6 = get_variable(script, *args++); + f32 diff1 = var1 - var4; + f32 diff2 = var2 - var5; + f32 diff3 = var3 - var6; + + set_variable(script, *args++, sqrtf(SQ(diff1) + SQ(diff2) + SQ(diff3))); + return ApiStatus_DONE2; +} diff --git a/src/common/DivActorLevel4.inc.c b/src/common/DivActorLevel4.inc.c new file mode 100644 index 0000000000..a2a3a67a47 --- /dev/null +++ b/src/common/DivActorLevel4.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "battle/battle.h" + +ApiStatus N(DivActorLevel4)(ScriptInstance* script, s32 isInitialCall) { + ActorDesc* actorData = get_actor(script->owner1.actorID)->staticActorData; + + actorData->level /= 4; + return ApiStatus_DONE2; +} diff --git a/src/common/FreeIcon.inc.c b/src/common/FreeIcon.inc.c new file mode 100644 index 0000000000..2de0c783f1 --- /dev/null +++ b/src/common/FreeIcon.inc.c @@ -0,0 +1,7 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(FreeIcon)(ScriptInstance* script, s32 isInitialCall) { + free_icon(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} diff --git a/src/common/SetBackgroundAlpha.inc.c b/src/common/SetBackgroundAlpha.inc.c new file mode 100644 index 0000000000..791e5e1e7c --- /dev/null +++ b/src/common/SetBackgroundAlpha.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +ApiStatus N(SetBackgroundAlpha)(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + + set_background_color_blend(0, 0, 0, get_variable(script, *args++)); + return ApiStatus_DONE2; +} diff --git a/src/common/UnkBackgroundFunc3.inc.c b/src/common/UnkBackgroundFunc3.inc.c new file mode 100644 index 0000000000..fc656f8940 --- /dev/null +++ b/src/common/UnkBackgroundFunc3.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +ApiStatus N(UnkBackgroundFunc3)(ScriptInstance* script, s32 isInitialCall) { + func_8011D82C(1); + *D_801512F0 = 1; + set_background_color_blend(0, 0, 0, 0); + return ApiStatus_DONE2; +} diff --git a/src/common/UnkFogFunc2.inc.c b/src/common/UnkFogFunc2.inc.c new file mode 100644 index 0000000000..2a1553cbce --- /dev/null +++ b/src/common/UnkFogFunc2.inc.c @@ -0,0 +1,12 @@ +#include "common.h" + +ApiStatus N(UnkFogFunc2)(ScriptInstance* script, s32 isInitialCall) { + enable_world_fog(); + set_world_fog_dist(950, 1000); + set_world_fog_color(16, 16, 16, 255); + gCameras[1].backgroundColor[0] = 20; + gCameras[1].backgroundColor[1] = 20; + gCameras[1].backgroundColor[2] = 28; + + return ApiStatus_DONE2; +} diff --git a/ver/us/asm/data/3255E0.data.s b/ver/us/asm/data/3255E0.data.s new file mode 100644 index 0000000000..53e0b017c4 --- /dev/null +++ b/ver/us/asm/data/3255E0.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_802BD510_3255E0 +.word 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x0000002D, 0x00000043, 0x00000007, MakeItemEntity, 0xFE363C8A, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000001, 0x00000000, 0x00000024, 0x00000002, 0xFE363C8A, 0xFE363C80, 0x00000008, 0x00000001, 0x0000000F, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000014, 0x00000043, 0x00000004, D_802C0000, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000002, RemoveItemEntity, 0xFE363C8A, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000002, PlaySound, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001C, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000056, 0x00000000, 0x00000005, 0x00000001, 0x00000004, 0x00000043, 0x00000002, PlaySound, 0x00002095, 0x00000008, 0x00000001, 0x0000000A, 0x00000006, 0x00000000, 0x00000057, 0x00000000, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010025, 0x00000008, 0x00000001, 0x0000002D, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x0000004D, 0x00000001, 0x00000000, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000001, 0x00000043, 0x00000002, GetCurrentPartner, 0xFE363C80, 0x0000000B, 0x00000002, 0xFE363C80, 0x00000000, 0x00000043, 0x00000001, func_802D2B6C, 0x00000008, 0x00000001, 0x00000014, 0x00000013, 0x00000000, 0x00000043, 0x00000001, 0x802C02E4, 0x00000043, 0x00000002, 0x802C0358, 0xFE363C8A, 0x00000046, 0x00000001, 0x802C0410, 0x0000000A, 0x00000002, 0xFE363C8D, 0x00000000, 0x00000046, 0x00000001, 0x802C04F4, 0x00000012, 0x00000000, 0x00000046, 0x00000001, 0x802C0560, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000001, 0x00000043, 0x00000002, SetPlayerAnimation, 0x0001001D, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000000, 0x00000027, 0x00000002, 0xFE363C81, 0x00000023, 0x00000043, 0x00000005, 0x802C00AC, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000D, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C80, 0x00000014, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, 0x802C016C, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8C, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000027, 0x00000002, 0xFE363C81, 0x00000019, 0x00000043, 0x00000005, func_802D7520, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x0000000B, 0x00000002, 0xFE363C8B, 0x00000000, 0x00000043, 0x00000002, 0x802C022C, 0xFE363C8B, 0x00000013, 0x00000000, 0x0000000B, 0x00000002, 0xFE363C8C, 0x00000000, 0x00000043, 0x00000002, 0x802C0288, 0xFE363C8C, 0x00000013, 0x00000000, 0x0000000A, 0x00000002, 0xFE363C8F, 0x00000000, 0x00000008, 0x00000001, 0x0000000A, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010032, 0x00000008, 0x00000001, 0x0000001E, 0x00000012, 0x00000000, 0x00000008, 0x00000001, 0x0000001E, 0x00000013, 0x00000000, 0x00000043, 0x00000004, GetPlayerPos, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0x00000043, 0x00000005, func_802D75D8, 0xFE363C80, 0xFE363C81, 0xFE363C82, 0xFE363C8B, 0x00000043, 0x00000002, SetPlayerAnimation, 0x00010002, 0x00000008, 0x00000001, 0x00000014, 0x00000043, 0x00000001, 0x802C03E8, 0x00000043, 0x00000002, DisablePlayerInput, 0x00000000, 0x00000043, 0x00000001, 0x802C031C, 0x00000002, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/326160.data.s b/ver/us/asm/data/326160.data.s new file mode 100644 index 0000000000..c42e77b7cd --- /dev/null +++ b/ver/us/asm/data/326160.data.s @@ -0,0 +1,129 @@ +.include "macro.inc" + +.section .data + +glabel D_E0200690 +.word 0x1E6D3457 + +glabel D_E0200694 +.word guRotateF + +glabel D_E0200698 +.word guTranslateF + +glabel D_E020069C +.word guTranslate + +glabel D_E02006A0 +.word guScaleF + +glabel D_E02006A4 +.word guMtxCatF + +glabel D_E02006A8 +.word guMtxF2L + +glabel D_E02006AC +.word guMtxL2F + +glabel D_E02006B0 +.word queue_render_task + +glabel D_E02006B4 +.word func_8005A2BC + +glabel D_E02006B8 +.word remove_effect + +glabel D_E02006BC +.word general_heap_malloc + +glabel D_E02006C0 +.word mem_clear + +glabel D_E02006C4 +.word 0x00000000 + +glabel D_E02006C8 +.word rand_int + +glabel D_E02006CC +.word clamp_angle + +glabel D_E02006D0 +.word sin_deg + +glabel D_E02006D4 +.word cos_deg + +glabel D_E02006D8 +.word atan2 + +glabel D_E02006DC +.word func_800DCB7C + +glabel D_E02006E0 +.word load_effect + +glabel D_E02006E4 +.word sqrtf + +glabel D_E02006E8 +.word func_8011D72C + +glabel D_E02006EC +.word func_8011CFBC + +glabel D_E02006F0 +.word guPerspectiveF + +glabel D_E02006F4 +.word guMtxIdentF + +glabel D_E02006F8 +.word transform_point + +glabel D_E02006FC +.word guLookAtHiliteF + +glabel D_E0200700 +.word set_transition_stencil_zoom_1 + +glabel D_E0200704 +.word set_transition_stencil_center + +glabel D_E0200708 +.word set_transition_stencil_center_worldpos + +glabel D_E020070C +.word func_8011D7E4 + +glabel D_E0200710 +.word guPositionF + +glabel D_E0200714 +.word guOrthoF + +glabel D_E0200718 +.word guFrustumF + +glabel D_E020071C +.word func_80138D88 + +glabel D_E0200720 +.word draw_box + +glabel D_E0200724 +.word draw_msg + +glabel D_E0200728 +.word get_string_width + +glabel D_E020072C +.word get_background_color_blend + +glabel D_E0200730 +.word sfx_play_sound_at_position + +glabel D_E0200734 +.word 0x100B2AF5, 0x45B59924, 0x35094B45, 0x4ABFA67A, 0x164F5371, 0x7B195845, 0x58562A56, 0x25733D41, 0x48008107, 0x0E004F28, 0x6963B8AD, 0x5B82AB71, 0x6BC1F51B, 0x3D947816, 0x39705175, 0x44409A59, 0x0ED99067, 0x5F70B6F8, 0x3225AEEE, 0x08B5E97C, 0x2CDE7594, 0x5E9E5B7D, 0x5B2A2888, 0x107F0F50, 0x58FBC53B, 0x65F69F19, 0x3AF6CEF3, 0x15C3894F, 0x4C931A2C, 0x39A897E9, 0x5945BB8C, 0x5C9E4521, 0x7F5E310D, 0x0E4F06D2, 0x275DEB9C, 0x15AD847F, 0x09685F17, 0x7FB415F2, 0x3B20C1C0, 0x5168E01E, 0x0DB4651A, 0x24847A6D, 0x2CEB8B8F, 0x79765A35, 0x6218F283, 0x665BDD04, 0x3DB6F48F, 0x70F282EB, 0x45CC93FC, 0x6FDCA37D, 0x79A86C67, 0x72AB0990, 0x4E7AFEFA, 0x54D294F0, 0x032A18E0, 0x2776C435, 0x3AC93409, 0x3E20E7D4, 0x3D3A4D85, 0x075C4E35, 0x77C97FBD, 0x16800911, 0x63FA9357, 0x7727B0CB, 0x24CF0FE3, 0x0B587EF3, 0x0CD5354A, 0x2E376EFA, 0x0B0C94E5, 0x47F5F70A, 0x7FA04F19, 0x18C0FA00, 0x6C7A7178, 0x2C8BDAA8, 0x12375435, 0x4E9363FB, 0x12E7B7AD, 0x4FEE48C4, 0x3F85E6E6, 0x58B44BA9, 0x3FCAEC41, 0x392E534E, 0x4B5F553A, 0x0E45EB3C, 0x0E00E83E, 0x4E896E1A, 0x35BCAF71, 0x48CA1C47, 0x0CAA55EE, 0x72F6FCF6, 0x50266A7D, 0x0473D5AC, 0x09770608, 0x3420FDD4, 0x7B9B8677, 0x2E4615EB, 0x3F797CC7, 0x0870BBC1, 0x5C7D84E6, 0x4A8611AC, 0x5066B2CB, 0x5C1DD3FF, 0x63470BAC, 0x3CE12443, 0x08A9AEA7, 0x757E5FE2, 0x0B74883F, 0x1B916654, 0x456CA8A6, 0x4AFA6F25, 0x7445B1FE, 0x053794E8, 0x0428C273, 0x3FA50738, 0x137D8024, 0x1229AAB1, 0x0E2E7552, 0x493A2F95, 0x5AF3C6F9, 0x1AD8CB41, 0x3C312C8C, 0x2B1A3176, 0x1F4CA0ED, 0x45A83294, 0x5F3B2F4A, 0x1AE82764, 0x73EE487F, 0x1EB4AC11, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/328050.data.s b/ver/us/asm/data/328050.data.s new file mode 100644 index 0000000000..da9f32e5f5 --- /dev/null +++ b/ver/us/asm/data/328050.data.s @@ -0,0 +1,18 @@ +.include "macro.inc" + +.section .data + +glabel D_E0002760 +.word 0x41200000, 0x42200000, 0x42A00000, 0x432A0000, 0x430C0000, 0x42C80000, 0x41C80000, 0x431B0000, 0x42700000, 0x42F00000 + +glabel D_E0002788 +.word 0x400CCCCD, 0x402CCCCD, 0x40400000, 0x400CCCCD, 0x402CCCCD, 0x40400000, 0x3FF33333, 0x3FF33333, 0x3FC00000, 0x3FC00000 + +glabel D_E00027B0 +.float 1.4, 1.3, 1.2, 1.3, 1.4, 1.3, 1.6, 1.6, 1.6, 1.6 + +glabel D_E00027D8 +.word 0x00000000, 0x436A0000, 0x43EA0000, 0x442F8000, 0x446A0000, 0x449D8000, 0x44AF8000, 0x44CCC000, 0x44EDC000, 0x44F70000 + +glabel D_E0002800 +.word 0x09000FA0, 0x09001060, 0x09001120, 0x090011E0, 0x090012A0, 0x09001360, 0x09001420, 0x00000000 diff --git a/ver/us/asm/data/328D20.data.s b/ver/us/asm/data/328D20.data.s new file mode 100644 index 0000000000..2886354a24 --- /dev/null +++ b/ver/us/asm/data/328D20.data.s @@ -0,0 +1,33 @@ +.include "macro.inc" + +.section .data + +glabel D_E000CC10 +.word 0x09002B20, 0x09002B40, 0x09002B60, 0x09002B60, 0x09002B60 + +glabel D_E000CC24 +.word 0x09002780, 0x09002868, 0x09002950, 0x09002A38, 0x09002A38 + +glabel D_E000CC38 +.word 0x0001021A, 0x031B041C, 0x05153546, 0x4646FF00 + +glabel D_E000CC48 +.word 0x0001021A, 0x031B041C, 0x051D0616, 0x26475767, 0xFF000000 + +glabel D_E000CC5C +.word 0x00081018, 0x20283038, 0x01091119, 0x21293139, 0x02020A0A, 0x12121A1A, 0x22222A2A, 0x32323A3A, 0x03030B0B, 0x13131B1B, 0x23232B2B, 0x33333B3B, 0x04040C0C, 0x14141C1C, 0x24242C2C, 0x34343C3C, 0x05050D0D, 0x15151D1D, 0x25252D2D, 0x35353D3D, 0x0606060E, 0x0E0E1616, 0x161E1E1E, 0x2626262E, 0x2E2E3636, 0x363E3E3E, 0x4747474F, 0x4F4F5757, 0x575F5F5F, 0x6767676F, 0x6F6F7777, 0x777F7F7F, 0xFF000000 + +glabel D_E000CCE0 +.word 0x00102030, 0x01112131, 0x020A121A, 0x222A323A, 0x030B131B, 0x232B333B, 0x040C141C, 0x242C343C, 0x050D151D, 0x252D353D, 0x06060E16, 0x161E2626, 0x2E36363E, 0x47474F57, 0x575F6767, 0x6F77777F, 0xFF000000 + +glabel D_E000CD24 +.word D_E000CC38, D_E000CC48, D_E000CC5C, D_E000CCE0, 0x00000000, 0x00000000, 0x00000000 + +glabel jtbl_E000CD40 +.word LE000C28C_32839C, LE000C28C_32839C, LE000C29C_3283AC, LE000C294_3283A4, LE000C29C_3283AC, 0 + +glabel jtbl_E000CD58 +.word LE000C2DC_3283EC, LE000C2DC_3283EC, LE000C614_328724, LE000C394_3284A4, LE000C514_328624, 0 + +glabel D_E000CD70 +.word 0xE000C6F8, 0xE000C6F8, 0xE000C720, 0xE000C708, 0xE000C718, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/32C770.data.s b/ver/us/asm/data/32C770.data.s new file mode 100644 index 0000000000..8d0ae3c92f --- /dev/null +++ b/ver/us/asm/data/32C770.data.s @@ -0,0 +1,12 @@ +.include "macro.inc" + +.section .data + +glabel D_E000E660 +.word 0x00010202, 0x03030404, 0x05050506, 0x0606FF00 + +glabel D_E000E670 +.word 0x00010202, 0x03030404, 0x05050606, 0x06070707, 0xFF000000 + +glabel D_E000E684 +.word D_E000E660, D_E000E670, 0x00000000 diff --git a/ver/us/asm/data/32CEB0.data.s b/ver/us/asm/data/32CEB0.data.s new file mode 100644 index 0000000000..06fdc621f3 --- /dev/null +++ b/ver/us/asm/data/32CEB0.data.s @@ -0,0 +1,6 @@ +.include "macro.inc" + +.section .data + +glabel D_E0010710 +.word 0x3FEB3333, 0x33333333, 0x00000000, 0x00000000, 0x11111111, 0x11003333, 0x11111100, 0x00222233, 0x11110000, 0x02222323, 0x11100002, 0x22223220, 0x11000022, 0x22232220, 0x10000222, 0x22322200, 0x10000222, 0x23222201, 0x10000222, 0x22222001, 0x10000222, 0x22222001, 0x10000022, 0x22220001, 0x10000002, 0x22200011, 0x11000000, 0x00000011, 0x11000000, 0x00000111, 0x11100000, 0x00001111, 0x11111000, 0x00011111, 0x11111111, 0x11111111, 0xF4ABF1D8, 0xF6B7EFE7, 0x5D7A016F, 0x5AFF5AFE, 0x5AFF5AFE, 0x08610860, 0x08610860, 0x08610860, 0xFE49FC82, 0xFF5DFFC7, 0x9B7E016F, 0x18C7695A, 0x695F695A, 0xF1BD695A, 0x18C718C6, 0x18C7695A, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x5BC35BC3, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x5BC35BC3, 0x5BC33200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32006483, 0x64833200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x64836483, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x64836483, 0x5BC33200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32005BC3, 0x5BC33200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32005BC3, 0x5BC33200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D83200, 0x32003200, 0x32004B03, 0x4B033200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0x32003200, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7EFE7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7EFE7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7EFE7, 0xF6B7F4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xEFE7EFE7, 0xEFE7EFE7, 0xEFE7EFE7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7EFE7, 0xEFE7EFE7, 0xEFE7EFE7, 0xEFE7F6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7EFE7, 0xEFE7F6B7, 0xF6B7F6B7, 0xF6B7EFE7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF6B7F6B7, 0xF4ABF6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xEFE7F6B7, 0xF6B7F4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF4ABF4AB, 0xF6B7F6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF6B7, 0xF6B7F6B7, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF6B7F6B7, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF4ABF4AB, 0xF4ABF4AB, 0xF4ABF1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xF1D8F1D8, 0xFFF70008, 0xFFF90000, 0x00000200, 0xFFFFFFFF, 0xFFF70004, 0x00020000, 0x02000200, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x02000000, 0xFFFFFFFF, 0x00000004, 0xFFF70000, 0x00000000, 0xFFFFFFFF, 0x00000004, 0x00090000, 0x00000000, 0xFFFFFFFF, 0xFFF70004, 0xFFFE0000, 0x02000200, 0xFFFFFFFF, 0xFFF70008, 0x00070000, 0x00000200, 0xFFFFFFFF, 0x00090008, 0x00070000, 0x00000200, 0xFFFFFFFF, 0x00090004, 0xFFFE0000, 0x00000000, 0xFFFFFFFF, 0x00000004, 0x00090000, 0x02000200, 0xFFFFFFFF, 0x00000004, 0xFFF70000, 0x02000200, 0xFFFFFFFF, 0x00090004, 0x00020000, 0x00000000, 0xFFFFFFFF, 0x00090008, 0xFFF90000, 0x00000200, 0xFFFFFFFF, 0x00000000, 0xFFFF0000, 0x00000000, 0x64A03CFF, 0x00000000, 0x00010000, 0x00000000, 0x64A03CFF, 0xFFFFFFF9, 0x00020000, 0x00000000, 0x64A03CFF, 0xFFFFFFF9, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFFFFEF, 0x00020000, 0x00000000, 0x64A03CFF, 0xFFFFFFEF, 0x00000000, 0x00000000, 0x64A03CFF, 0x00010000, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFF0000, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFEFFF9, 0x00000000, 0x00000000, 0x64A03CFF, 0x0000FFF9, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFEFFEF, 0x00000000, 0x00000000, 0x64A03CFF, 0x0000FFEF, 0x00000000, 0x00000000, 0x64A03CFF, 0x000A0000, 0x000A0000, 0x0400FE00, 0xFFFFFFFF, 0x000A0000, 0xFFF60000, 0x04000200, 0xFFFFFFFF, 0xFFF60000, 0xFFF60000, 0x00000200, 0xFFFFFFFF, 0xFFF60000, 0x000A0000, 0x0000FE00, 0xFFFFFFFF, 0x0000FFFF, 0x00000000, 0x00000000, 0x64A03CFF, 0x0002FFEF, 0x00000000, 0x00000000, 0x64A03CFF, 0x00080000, 0x00080000, 0x04000000, 0xFFFFFFFF, 0x00080000, 0xFFF80000, 0x04000400, 0xFFFFFFFF, 0xFFF80000, 0xFFF80000, 0x00000400, 0xFFFFFFFF, 0xFFF80000, 0x00080000, 0x00000000, 0xFFFFFFFF, 0x000CFFF6, 0x00000000, 0x00000000, 0x64A03CFF, 0x0005FFF7, 0x00000000, 0x00000000, 0x64A03CFF, 0x0003FFF0, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFDFFF0, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFCFFF9, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFF5FFFB, 0x00000000, 0x00000000, 0x64A03CFF, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC119623, 0xFF2FFFFF, 0xFA000000, 0xF0F0F0FF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x09000000, 0xF5500000, 0x07050140, 0xE6000000, 0x00000000, 0xF3000000, 0x0703F800, 0xE7000000, 0x00000000, 0xF5400200, 0x00050140, 0xF2000000, 0x0003C03C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, 0x09000080, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC119623, 0xFF2FFFFF, 0xFA000000, 0xF0C0F0FF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x09000000, 0xF5500000, 0x07050140, 0xE6000000, 0x00000000, 0xF3000000, 0x0703F800, 0xE7000000, 0x00000000, 0xF5400200, 0x00050140, 0xF2000000, 0x0003C03C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, 0x090000A0, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC409681, 0xFF2FFFFF, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD100000, 0x090000C0, 0xF5100000, 0x07054150, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF100, 0xE7000000, 0x00000000, 0xF5101000, 0x00054150, 0xF2000000, 0x0007C07C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xDF000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x005049D8, 0xD9DDF9FF, 0x00000000, 0x01004008, 0x09000AB0, 0x06000204, 0x00000406, 0xDF000000, 0x00000000, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x005049D8, 0xD9DDF9FF, 0x00000000, 0x01004008, 0x09000A50, 0x06000204, 0x00000406, 0xE7000000, 0x00000000, 0xFCFFFFFF, 0xFFFE793C, 0xD7000000, 0x00800080, 0x0100600C, 0x09000AF0, 0x06000204, 0x0006080A, 0xD9FFFBFF, 0x00000000, 0x01001002, 0x09000A30, 0x01002006, 0x09000A90, 0xDF000000, 0x00000000, 0xDE000000, 0x09000CD0, 0xDE000000, 0x09000D58, 0xDF000000, 0x00000000, 0xDE000000, 0x09000B50, 0xDE000000, 0x09000D90, 0xDF000000, 0x00000000, 0xDE000000, 0x09000C10, 0xDE000000, 0x09000D90, 0xDF000000, 0x00000000 diff --git a/ver/us/asm/data/32EC10.data.s b/ver/us/asm/data/32EC10.data.s new file mode 100644 index 0000000000..69f17591d3 --- /dev/null +++ b/ver/us/asm/data/32EC10.data.s @@ -0,0 +1,24 @@ +.include "macro.inc" + +.section .data + +glabel D_E0014780 +.double 0.03 + +glabel D_E0014788 +.double 1.7 + +glabel D_E0014790 +.double 0.1 + +glabel D_E0014798 +.double 0.83 + +glabel D_E00147A0 +.double 0.006 + +glabel D_E00147A8 +.double 0.98 + +glabel D_E00147B0 +.word 0x3FECCCCC, 0xCCCCCCCD, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000011, 0x11100000, 0x00111155, 0x54110000, 0x01111555, 0x55411000, 0x11554555, 0x55411000, 0x15555555, 0x55411000, 0x15555555, 0x55554110, 0x14555555, 0x55555411, 0x11445555, 0x55555411, 0x01155555, 0x55553411, 0x01555555, 0x55334110, 0x01455555, 0x55311100, 0x01144455, 0x53410000, 0x00111144, 0x44110000, 0x00000111, 0x11100000, 0x00000011, 0x11000000, 0x39CE6293, 0x00019C1D, 0xAD27B5AD, 0x00010001, 0x41890001, 0x7AD19C5F, 0xB5AD0001, 0x00010001, 0xFFF80007, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00070007, 0x00000000, 0x02000000, 0xFFFFFFFF, 0xFFF8FFF8, 0x00000000, 0x00000200, 0xFFFFFFFF, 0x0007FFF8, 0x00000000, 0x02000200, 0xFFFFFFFF, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xFC6096C1, 0xFF2DFEFF, 0xE3000C00, 0x00080000, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xE3001001, 0x00008000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xFD100000, 0x09000080, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE200001C, 0x00504A50, 0xFD500000, 0x09000000, 0xF5500000, 0x07090240, 0xE6000000, 0x00000000, 0xF3000000, 0x0703F800, 0xE7000000, 0x00000000, 0xF5400200, 0x00090240, 0xF2000000, 0x0003C03C, 0xD9DDF9FF, 0x00000000, 0xD9FFFFFF, 0x00000005, 0xDF000000, 0x00000000, 0x01004008, 0x090000A0, 0x06000602, 0x00000406, 0xE7000000, 0x00000000, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/32F550.data.s b/ver/us/asm/data/32F550.data.s new file mode 100644 index 0000000000..46d3942455 --- /dev/null +++ b/ver/us/asm/data/32F550.data.s @@ -0,0 +1,18 @@ +.include "macro.inc" + +.section .data + +glabel D_E0016720 +.double 0.03 + +glabel D_E0016728 +.double 1.4 + +glabel D_E0016730 +.double 0.1 + +glabel D_E0016738 +.double 0.94 + +glabel D_E0016740 +.double 0.14, 0.0 diff --git a/ver/us/asm/data/330440.data.s b/ver/us/asm/data/330440.data.s new file mode 100644 index 0000000000..dd61d43f6d --- /dev/null +++ b/ver/us/asm/data/330440.data.s @@ -0,0 +1,12 @@ +.include "macro.inc" + +.section .data + +glabel D_E001A610 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000 + +glabel D_E001A620 +.double 0.001 + +glabel D_E001A628 +.word 0x3F46F006, 0x8DB8BAC7, 0x11111111, 0x11003333, 0x11111100, 0x00222233, 0x11110000, 0x02222323, 0x11100002, 0x22223220, 0x11000022, 0x22232220, 0x10000222, 0x22322200, 0x10000222, 0x23222201, 0x10000222, 0x22222001, 0x10000222, 0x22222001, 0x10000022, 0x22220001, 0x10000002, 0x22200011, 0x11000000, 0x00000011, 0x11000000, 0x00000111, 0x11100000, 0x00001111, 0x11111000, 0x00011111, 0x11111111, 0x11111111, 0xF4ABF1D8, 0xF6B7EFE7, 0x5D7A016F, 0x5AFF5AFE, 0x5AFF5AFE, 0x08610860, 0x08610860, 0x08610860, 0xFFF70008, 0xFFF90000, 0x001001F0, 0xFFFFFFFF, 0xFFF70004, 0x00020000, 0x01F001F0, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x01F00010, 0xFFFFFFFF, 0x00000004, 0xFFF70000, 0x00100010, 0xFFFFFFFF, 0x00000004, 0x00090000, 0x00100010, 0xFFFFFFFF, 0xFFF70004, 0xFFFE0000, 0x01F001F0, 0xFFFFFFFF, 0xFFF70008, 0x00070000, 0x001001F0, 0xFFFFFFFF, 0x00090008, 0x00070000, 0x001001F0, 0xFFFFFFFF, 0x00090004, 0xFFFE0000, 0x00100010, 0xFFFFFFFF, 0x00000004, 0x00090000, 0x01F001F0, 0xFFFFFFFF, 0x00000004, 0xFFF70000, 0x01F001F0, 0xFFFFFFFF, 0x00090004, 0x00020000, 0x00100010, 0xFFFFFFFF, 0x00090008, 0xFFF90000, 0x001001F0, 0xFFFFFFFF, 0x00000000, 0xFFFF0000, 0x00100010, 0x64A03CFF, 0x00000000, 0x00010000, 0x00100010, 0x64A03CFF, 0xFFFFFFF9, 0x00020000, 0x00100010, 0x64A03CFF, 0xFFFFFFF9, 0x00000000, 0x00100010, 0x64A03CFF, 0xFFFFFFEF, 0x00020000, 0x00100010, 0x64A03CFF, 0xFFFFFFEF, 0x00000000, 0x00100010, 0x64A03CFF, 0x00010000, 0x00000000, 0x00100010, 0x64A03CFF, 0xFFFF0000, 0x00000000, 0x00100010, 0x64A03CFF, 0xFFFEFFF9, 0x00000000, 0x00100010, 0x64A03CFF, 0x0000FFF9, 0x00000000, 0x00100010, 0x64A03CFF, 0xFFFEFFEF, 0x00000000, 0x00100010, 0x64A03CFF, 0x0000FFEF, 0x00000000, 0x00100010, 0x64A03CFF, 0x0000FFFF, 0xFFFF0000, 0x00000000, 0x64A03CFF, 0x0000FFFF, 0x00010000, 0x00000000, 0x64A03CFF, 0xFFFFFFF8, 0x00020000, 0x00000000, 0x64A03CFF, 0xFFFFFFF8, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFFFFEE, 0x00020000, 0x00000000, 0x64A03CFF, 0xFFFFFFEE, 0x00000000, 0x00000000, 0x64A03CFF, 0x0001FFFF, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFEFFF8, 0x00000000, 0x00000000, 0x64A03CFF, 0x0000FFF8, 0x00000000, 0x00000000, 0x64A03CFF, 0xFFFEFFEE, 0x00000000, 0x00000000, 0x64A03CFF, 0x0000FFEE, 0x00000000, 0x00000000, 0x64A03CFF, 0xD7000002, 0xFFFFFFFF, 0xE7000000, 0x00000000, 0xFC157E2A, 0xFFFFF3F9, 0xE3000D01, 0x00000000, 0xE3000F00, 0x00000000, 0xFD500000, 0x09000000, 0xF5500000, 0x070D0340, 0xE6000000, 0x00000000, 0xF3000000, 0x0703F800, 0xE7000000, 0x00000000, 0xF5400200, 0x000D0340, 0xF2000000, 0x0003C03C, 0xF2000000, 0x0007C07C, 0xE3000C00, 0x00080000, 0xE3001001, 0x00008000, 0xFD100000, 0x09000080, 0xE8000000, 0x00000000, 0xF5000100, 0x07000000, 0xE6000000, 0x00000000, 0xF0000000, 0x0703C000, 0xE7000000, 0x00000000, 0xE3001201, 0x00002000, 0xE3001402, 0x00000C00, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00553078, 0xD9DDF9FF, 0x00000000, 0x0100D01A, 0x090000A0, 0x06000204, 0x00000406, 0x0608040A, 0x00080A0C, 0x060E1004, 0x000E0412, 0x06140416, 0x00141618, 0xE7000000, 0x00000000, 0xE3000A01, 0x00000000, 0xE200001C, 0x00552078, 0xFC457E8A, 0xFFFFFDFE, 0xD7000000, 0x00800080, 0xD9DDF9FF, 0x00000000, 0x0100C018, 0x09000170, 0x06000204, 0x00000406, 0x0604080A, 0x00040A06, 0x060C0E10, 0x000C1012, 0x06101416, 0x00101612, 0xDF000000, 0x00000000, 0xE7000000, 0x00000000, 0xE200001C, 0x00552078, 0xFC457E8A, 0xFFFFFDFE, 0xD7000000, 0x00800080, 0xD9DDF9FF, 0x00000000, 0x0100C018, 0x09000230, 0x06000204, 0x00000406, 0x0604080A, 0x00040A06, 0x060C0E10, 0x000C1012, 0x06101416, 0x00101612, 0xDF000000, 0x00000000, 0x00000000, 0x00000000 diff --git a/ver/us/asm/data/332690.data.s b/ver/us/asm/data/332690.data.s new file mode 100644 index 0000000000..1fa3523287 --- /dev/null +++ b/ver/us/asm/data/332690.data.s @@ -0,0 +1,9 @@ +.include "macro.inc" + +.section .data + +glabel D_E001ED50 +.double 0.6 + +glabel D_E001ED58 +.double 0.7 diff --git a/ver/us/asm/data/334B50.data.s b/ver/us/asm/data/334B50.data.s new file mode 100644 index 0000000000..81908f6df4 --- /dev/null +++ b/ver/us/asm/data/334B50.data.s @@ -0,0 +1,36 @@ +.include "macro.inc" + +.section .data + +glabel D_E0020C90 +.word 0x090022E0, 0x00000000, 0x090023B0, 0x09002480, 0x09002550 + +glabel D_E0020CA4 +.word 0x09002238, 0x00000000, 0x09002308, 0x090023D8, 0x090024A8 + +glabel D_E0020CB8 +.word 0x00000102, 0x03050405, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x05050505, 0x0505FF00 + +glabel D_E0020CE0 +.word 0x00000000, 0x00000000, 0x01010101, 0x00000000, 0x00000000, 0x01010101, 0xFF000000 + +glabel D_E0020CFC +.word 0x00000201, 0x03020303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03FF0000 + +glabel D_E0020D24 +.word 0x00000101, 0x02020303, 0xF3000000 + +glabel D_E0020D30 +.word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01010101, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x03030303, 0x0303FF00 + +glabel D_E0020D80 +.word D_E0020CB8, D_E0020CE0, D_E0020CFC, D_E0020D24, D_E0020D30 + +glabel D_E0020D94 +.byte 0x40 + +glabel D_E0020D95 +.byte 0x00 + +glabel D_E0020D96 +.byte 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x40, 0x00, 0x20, 0x20, 0x00, 0x40, 0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 diff --git a/ver/us/asm/data/337F10.data.s b/ver/us/asm/data/337F10.data.s new file mode 100644 index 0000000000..2df1bb255c --- /dev/null +++ b/ver/us/asm/data/337F10.data.s @@ -0,0 +1,39 @@ +.include "macro.inc" + +.section .data + +glabel D_E0022CD0 +.word 0x09001210, 0x09001228, 0x09001240, 0x09001258, 0x09001270, 0x090011C8, 0x090011E0, 0x090011F8 + +glabel D_E0022CF0 +.word 0xFEACACFE, 0xACD5FEB4, 0x9AD5B4FE, 0xB4B4FEB4, 0xDDFEB4FE, 0xFEB4FED5, 0xB4FEB4D5, 0xFEB4FEFE, 0xB4FED5AC + +glabel D_E0022D14 +.word 0x1E3C505F, 0x64686A00 + +glabel D_E0022D1C +.ascii "