mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

format / asm

Browse Source
This commit is contained in:
TakaRikka
2021-12-04 05:57:01 -08:00
parent b48f3b7350
commit fd8ff44971
402 changed files with 2365 additions and 11015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_alink.cpp
+1300 -991
View File
File diff suppressed because it is too large Load Diff
src/d/a/d_a_player.cpp
+5 -3
View File
@@ -4,13 +4,13 @@
//
#include "d/a/d_a_player.h"
#include "SSystem/SComponent/c_math.h"
#include "d/com/d_com_inf_game.h"
#include "dol2asm.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor_iter.h"
#include "f_op/f_op_actor_mng.h"
#include "SSystem/SComponent/c_math.h"
#include "rel/d/a/d_a_boomerang/d_a_boomerang.h"
//
@@ -286,7 +286,8 @@ void daPy_boomerangMove_c::bgCheckAfterOffset(cXyz const* param_0) {
if (boomerang != NULL) {
field_0x4 = param_0->y - boomerang->mCurrent.mPosition.y;
field_0x8 = boomerang->mCurrent.mPosition.absXZ(*param_0);
field_0x2 = cM_atan2s(param_0->x - boomerang->mCurrent.mPosition.x, param_0->z - boomerang->mCurrent.mPosition.z);
field_0x2 = cM_atan2s(param_0->x - boomerang->mCurrent.mPosition.x,
param_0->z - boomerang->mCurrent.mPosition.z);
}
}
#else
@@ -957,7 +958,8 @@ bool daPy_py_c::checkBoomerangChargeTime() {
/* 8015F8D0-8015F8E4 15A210 0014+00 3/3 1/1 5/5 .text getThrowBoomerangActor__9daPy_py_cFv */
daBoomerang_c* daPy_py_c::getThrowBoomerangActor() {
return static_cast<daBoomerang_c*>(daAlink_getAlinkActorClass()->getThrowBoomerangAcKeep()->getActor());
return static_cast<daBoomerang_c*>(
daAlink_getAlinkActorClass()->getThrowBoomerangAcKeep()->getActor());
}
/* 8015F8E4-8015F914 15A224 0030+00 0/0 0/0 2/2 .text
src/d/d_att_dist.cpp
+234 -234
View File
@@ -6,238 +6,238 @@
/* ############################################################################################## */
/* 803A9C70-803AB608 006D90 1998+00 0/0 5/5 13/13 .data dist_table__12dAttention_c */
dist_entry dAttention_c::dist_table[234] = {
{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0 },
{ 250.0f, 375.0f, 500.0f, 400.0f, -400.0f, 0.5f, 0 },
{ 187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0 },
{ 375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0 },
{ 500.0f, 600.0f, 1500.0f, 2000.0f, -2000.0f, 10.0f, 0 },
{ 187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0 },
{ 80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1 },
{ 100.0f, 120.0f, 0.0f, 50.0f, -120.0f, 1.0f, 1 },
{ 100.0f, 120.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1 },
{ 100.0f, 120.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1 },
{ 80.0f, 100.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1 },
{ 80.0f, 100.0f, 0.0f, 10.0f, -130.0f, 1.0f, 1 },
{ 200.0f, 240.0f, 0.0f, 100.0f, -120.0f, 1.0f, 1 },
{ 100.0f, 120.0f, 0.0f, 30.0f, -240.0f, 1.0f, 1 },
{ 200.0f, 220.0f, 0.0f, 200.0f, -200.0f, 10.0f, 4 },
{ 100.0f, 120.0f, 300.0f, 300.0f, -200.0f, 1.0f, 4 },
{ 100.0f, 120.0f, 0.0f, 20.0f, -120.0f, 1.0f, 0 },
{ 200.0f, 200.0f, 0.0f, 400.0f, -120.0f, 1.0f, 1 },
{ 500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0 },
{ 500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0 },
{ 1000.0f, 1100.0f, 0.0f, 700.0f, -300.0f, 1.0f, 0 },
{ 150.0f, 200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0 },
{ 500.0f, 600.0f, 4500.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 400.0f, 450.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0 },
{ 2500.0f, 2600.0f, 2500.0f, 2500.0f, -2000.0f, 1.0f, 0 },
{ 5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 180.0f, 180.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0 },
{ 500.0f, 600.0f, 0.0f, 600.0f, -120.0f, 100.0f, 0 },
{ 1000.0f, 1000.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0 },
{ -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0 },
{ 120.0f, 120.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0 },
{ 150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4 },
{ 150.0f, 160.0f, 0.0f, 150.0f, -150.0f, 1.0f, 132 },
{ 1000.0f, 1200.0f, 1800.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 375.0f, 625.0f, 500.0f, 750.0f, -500.0f, 1.0f, 0 },
{ 1200.0f, 1800.0f, 1200.0f, 500.0f, -1100.0f, 1.0f, 0 },
{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0 },
{ 200.0f, 220.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 1900.0f, 1900.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 0 },
{ 1900.0f, 2000.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 1 },
{ 80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1 },
{ 100.0f, 110.0f, 0.0f, 50.0f, -120.0f, 1.0f, 4 },
{ 130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1 },
{ 160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1 },
{ 190.0f, 210.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1 },
{ 375.0f, 625.0f, 500.0f, 800.0f, -500.0f, 10.0f, 0 },
{ 100.0f, 400.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0 },
{ 150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4 },
{ 1000.0f, 1100.0f, 0.0f, 200.0f, -200.0f, 1.0f, 0 },
{ 10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 100.0f, 0 },
{ 10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0 },
{ 1500.0f, 1800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 1000.0f, 1200.0f, 0.0f, 400.0f, -400.0f, 1.0f, 4 },
{ 10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0 },
{ 200.0f, 240.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0 },
{ 600.0f, 700.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0 },
{ 700.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0 },
{ 130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 0 },
{ 100000.0f, 100100.0f, 0.0f, 100000.0f, -100000.0f, 1.0f, 0 },
{ 10000.0f, 10100.0f, 0.0f, 3000.0f, -2000.0f, 300.0f, 0 },
{ 700.0f, 1000.0f, 500.0f, 1000.0f, -500.0f, 10.0f, 0 },
{ 500.0f, 600.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0 },
{ 700.0f, 800.0f, 0.0f, 700.0f, -700.0f, 1.0f, 0 },
{ 10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0 },
{ 400.0f, 450.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4 },
{ 500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4 },
{ 2000.0f, 2200.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0 },
{ 500.0f, 600.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0 },
{ 300.0f, 350.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4 },
{ 500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4 },
{ 1200.0f, 2000.0f, 1200.0f, 800.0f, -500.0f, 2.0f, 0 },
{ 160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0 },
{ 140.0f, 150.0f, 0.0f, 250.0f, -50.0f, 1.0f, 1 },
{ 500.0f, 600.0f, 750.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 500.0f, 600.0f, 750.0f, 200.0f, -200.0f, 1.0f, 0 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4 },
{ 1000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 0 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4 },
{ 3000.0f, 3100.0f, 300.0f, 3000.0f, -3000.0f, 1.0f, 0 },
{ 2000.0f, 2100.0f, 300.0f, 2000.0f, -2000.0f, 1.0f, 0 },
{ 150.0f, 200.0f, 0.0f, 100.0f, -100.0f, 1.0f, 17 },
{ 3500.0f, 3500.0f, 0.0f, 3000.0f, -3000.0f, 100.0f, 0 },
{ 375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 40.0f, 0 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68 },
{ 150.0f, 150.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1 },
{ 100.0f, 100.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0 },
{ 375.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0 },
{ 2000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 4 },
{ 100.0f, 200.0f, 0.0f, 160.0f, -150.0f, 10.0f, 4 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260 },
{ 50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 750.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 800.0f, 950.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{ 1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4 },
{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0},
{250.0f, 375.0f, 500.0f, 400.0f, -400.0f, 0.5f, 0},
{187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0},
{375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0},
{500.0f, 600.0f, 1500.0f, 2000.0f, -2000.0f, 10.0f, 0},
{187.5f, 250.0f, 312.5f, 300.0f, -300.0f, 1.0f, 0},
{80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1},
{100.0f, 120.0f, 0.0f, 50.0f, -120.0f, 1.0f, 1},
{100.0f, 120.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1},
{100.0f, 120.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1},
{80.0f, 100.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1},
{80.0f, 100.0f, 0.0f, 10.0f, -130.0f, 1.0f, 1},
{200.0f, 240.0f, 0.0f, 100.0f, -120.0f, 1.0f, 1},
{100.0f, 120.0f, 0.0f, 30.0f, -240.0f, 1.0f, 1},
{200.0f, 220.0f, 0.0f, 200.0f, -200.0f, 10.0f, 4},
{100.0f, 120.0f, 300.0f, 300.0f, -200.0f, 1.0f, 4},
{100.0f, 120.0f, 0.0f, 20.0f, -120.0f, 1.0f, 0},
{200.0f, 200.0f, 0.0f, 400.0f, -120.0f, 1.0f, 1},
{500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0},
{500.0f, 700.0f, 0.0f, 800.0f, -800.0f, 1.0f, 0},
{1000.0f, 1100.0f, 0.0f, 700.0f, -300.0f, 1.0f, 0},
{150.0f, 200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0},
{500.0f, 600.0f, 4500.0f, 2000.0f, -2000.0f, 1.0f, 0},
{400.0f, 450.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0},
{2500.0f, 2600.0f, 2500.0f, 2500.0f, -2000.0f, 1.0f, 0},
{5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0},
{5000.0f, 5500.0f, 0.0f, 2000.0f, -2000.0f, 1.0f, 0},
{180.0f, 180.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0},
{500.0f, 600.0f, 0.0f, 600.0f, -120.0f, 100.0f, 0},
{1000.0f, 1000.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0},
{-1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0},
{120.0f, 120.0f, 0.0f, 30.0f, -130.0f, 1.0f, 0},
{150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4},
{150.0f, 160.0f, 0.0f, 150.0f, -150.0f, 1.0f, 132},
{1000.0f, 1200.0f, 1800.0f, 2000.0f, -2000.0f, 1.0f, 0},
{375.0f, 625.0f, 500.0f, 750.0f, -500.0f, 1.0f, 0},
{1200.0f, 1800.0f, 1200.0f, 500.0f, -1100.0f, 1.0f, 0},
{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.01f, 0},
{200.0f, 220.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{1900.0f, 1900.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 0},
{1900.0f, 2000.0f, 0.0f, 2000.0f, -300.0f, 1.0f, 1},
{80.0f, 100.0f, 0.0f, 30.0f, -130.0f, 1.0f, 1},
{100.0f, 110.0f, 0.0f, 50.0f, -120.0f, 1.0f, 4},
{130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 1},
{160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1},
{190.0f, 210.0f, 0.0f, 40.0f, -110.0f, 1.0f, 1},
{375.0f, 625.0f, 500.0f, 800.0f, -500.0f, 10.0f, 0},
{100.0f, 400.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0},
{150.0f, 160.0f, 0.0f, 200.0f, -200.0f, 1.0f, 4},
{1000.0f, 1100.0f, 0.0f, 200.0f, -200.0f, 1.0f, 0},
{10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 100.0f, 0},
{10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0},
{1500.0f, 1800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{1000.0f, 1200.0f, 0.0f, 400.0f, -400.0f, 1.0f, 4},
{10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 0},
{200.0f, 240.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0},
{600.0f, 700.0f, 0.0f, 700.0f, 100.0f, 1.0f, 0},
{700.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0},
{130.0f, 140.0f, 0.0f, 45.0f, -125.0f, 1.0f, 0},
{100000.0f, 100100.0f, 0.0f, 100000.0f, -100000.0f, 1.0f, 0},
{10000.0f, 10100.0f, 0.0f, 3000.0f, -2000.0f, 300.0f, 0},
{700.0f, 1000.0f, 500.0f, 1000.0f, -500.0f, 10.0f, 0},
{500.0f, 600.0f, 0.0f, 500.0f, -500.0f, 1.0f, 0},
{700.0f, 800.0f, 0.0f, 700.0f, -700.0f, 1.0f, 0},
{10000.0f, 10200.0f, 0.0f, 10000.0f, -10000.0f, 1.0f, 0},
{400.0f, 450.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4},
{500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4},
{2000.0f, 2200.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0},
{500.0f, 600.0f, 200.0f, 500.0f, -500.0f, 1.0f, 0},
{300.0f, 350.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4},
{500.0f, 550.0f, 0.0f, 600.0f, -600.0f, 1.0f, 4},
{1200.0f, 2000.0f, 1200.0f, 800.0f, -500.0f, 2.0f, 0},
{160.0f, 180.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0},
{140.0f, 150.0f, 0.0f, 250.0f, -50.0f, 1.0f, 1},
{500.0f, 600.0f, 750.0f, 2000.0f, -2000.0f, 1.0f, 0},
{500.0f, 600.0f, 750.0f, 200.0f, -200.0f, 1.0f, 0},
{200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4},
{300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 4},
{1000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 0},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 2.5f, 4},
{3000.0f, 3100.0f, 300.0f, 3000.0f, -3000.0f, 1.0f, 0},
{2000.0f, 2100.0f, 300.0f, 2000.0f, -2000.0f, 1.0f, 0},
{150.0f, 200.0f, 0.0f, 100.0f, -100.0f, 1.0f, 17},
{3500.0f, 3500.0f, 0.0f, 3000.0f, -3000.0f, 100.0f, 0},
{375.0f, 625.0f, 500.0f, 500.0f, -500.0f, 40.0f, 0},
{200.0f, 250.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68},
{300.0f, 350.0f, 0.0f, 300.0f, -1000.0f, 1.0f, 68},
{150.0f, 150.0f, 0.0f, 40.0f, -130.0f, 1.0f, 1},
{100.0f, 100.0f, 0.0f, 40.0f, -130.0f, 1.0f, 0},
{375.0f, 1000.0f, 500.0f, 500.0f, -500.0f, 10.0f, 0},
{2000.0f, 2000.0f, 0.0f, 1000.0f, -1000.0f, 0.1f, 4},
{100.0f, 200.0f, 0.0f, 160.0f, -150.0f, 10.0f, 4},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 12},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{200.0f, 240.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 20},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{650.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 36},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 68},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 132},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{750.0f, 850.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{800.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 260},
{50.0f, 70.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{100.0f, 120.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{150.0f, 180.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{200.0f, 250.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{250.0f, 300.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{300.0f, 350.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{350.0f, 400.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{400.0f, 450.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{450.0f, 500.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{500.0f, 550.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{550.0f, 650.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{600.0f, 700.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{650.0f, 750.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{700.0f, 800.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{750.0f, 900.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{800.0f, 950.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{850.0f, 1000.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{900.0f, 1100.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{950.0f, 1150.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
{1000.0f, 1200.0f, 0.0f, 300.0f, -300.0f, 1.0f, 4},
};
src/d/event/d_event_data.cpp
+7 -6
View File
@@ -282,13 +282,13 @@ static int dEvDt_Next_Stage(int index, int wipe_type) {
s16 point;
s8 roomNo;
s8 layer;
u32 mode = 0; // uvar8 - retail
u32 mode = 0; // uvar8 - retail
s8 wipe = wipe_type; // ivar10
int noVisit = true;
int wipe_time = 0; // bvar9
int wipe_time = 0; // bvar9
f32 speed = FLOAT_LABEL(lit_4264); // dvar12
bool setHour = false; // bvar2
f32 hour = speed; // set to 0.0f dvar13
bool setHour = false; // bvar2
f32 hour = speed; // set to 0.0f dvar13
int* p_id = dComIfGp_evmng_getMyIntegerP(index, "ID");
if (p_id != NULL) {
@@ -371,7 +371,8 @@ static int dEvDt_Next_Stage(int index, int wipe_type) {
if (setHour) {
dKy_set_nexttime(15.0f * hour);
}
dComIfGp_setNextStage(stage, point, roomNo, layer, speed, mode, 1, wipe, 0, noVisit, wipe_time);
dComIfGp_setNextStage(stage, point, roomNo, layer, speed, mode, 1, wipe, 0, noVisit,
wipe_time);
}
return 1;
}
@@ -760,7 +761,7 @@ int dEvDtBase_c::init(char* p_data, int roomNo) {
return 0;
} else {
setHeaderP((event_binary_data_header*)p_data);
if (getEventNum() > 0) {
setEventP((dEvDtEvent_c*)(p_data + getEventTop()));
}
src/d/event/d_event_manager.cpp
+17 -29
View File
@@ -200,20 +200,10 @@ SECTION_DEAD static char const* const stringBase_8037A071 = "(!BAD DATA!)";
/* 803A8270-803A82A8 -00001 0038+00 1/1 0/0 0/0 .data soecial_names$3966 */
SECTION_DATA static char* soecial_names[14] = {
"NORMAL_COMEBACK",
"DEFAULT_START",
"SHUTTER_START",
"SHUTTER_START_STOP",
"BS_SHUTTER_START",
"BS_SHUTTER_START_B",
"KNOB_START",
"KNOB_START_B",
"FMASTER_START",
"FALL_START",
"CRAWLOUT_START",
"BOSSWARP_START",
"PORTALWARP_START",
"PORTALWARP_START_B",
"NORMAL_COMEBACK", "DEFAULT_START", "SHUTTER_START", "SHUTTER_START_STOP",
"BS_SHUTTER_START", "BS_SHUTTER_START_B", "KNOB_START", "KNOB_START_B",
"FMASTER_START", "FALL_START", "CRAWLOUT_START", "BOSSWARP_START",
"PORTALWARP_START", "PORTALWARP_START_B",
};
/* 80046480-800465E8 040DC0 0168+00 1/1 0/0 0/0 .text getEventName__18dEvent_exception_cFv */
@@ -232,15 +222,15 @@ void* dEvent_manager_c::getSubstance(dEvDtData_c* p_data, int type) {
if (p_data->getIndex() < 0 || p_data->getNumber() <= 0) {
return NULL;
} else {
switch(p_data->getType()) {
case dEvDtData_c::TYPE_FLOAT:
case dEvDtData_c::TYPE_VEC:
case 2:
return getBase().getFDataP(p_data->getIndex());
case dEvDtData_c::TYPE_INT:
return getBase().getIDataP(p_data->getIndex());
case dEvDtData_c::TYPE_STRING:
return getBase().getSDataP(p_data->getIndex());
switch (p_data->getType()) {
case dEvDtData_c::TYPE_FLOAT:
case dEvDtData_c::TYPE_VEC:
case 2:
return getBase().getFDataP(p_data->getIndex());
case dEvDtData_c::TYPE_INT:
return getBase().getIDataP(p_data->getIndex());
case dEvDtData_c::TYPE_STRING:
return getBase().getSDataP(p_data->getIndex());
}
return NULL;
}
@@ -328,7 +318,7 @@ void dEvent_manager_c::roomInit(int roomNo) {
tmp = i;
continue;
}
if (mEventList[i].roomNo() == roomNo) {
tmp = i;
break;
@@ -721,11 +711,9 @@ inline dEvt_control_c& dComIfGp_getEvent() {
dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type) {
if (dComIfGp_getEvent().getMode() == 0) {
return NULL;
}
else if (index == -1) {
} else if (index == -1) {
return NULL;
}
else if (field_0x1aa == -1) {
} else if (field_0x1aa == -1) {
return NULL;
} else {
dEvDtCut_c* cut;
@@ -743,7 +731,7 @@ dEvDtData_c* dEvent_manager_c::getMyDataP(int index, char const* name, int type)
}
top = data->getNext();
}
return NULL;
}
}
src/d/particle/d_particle.cpp
+7 -9
View File
@@ -11,7 +11,6 @@
// Types:
//
struct mDoLib_clipper {
static u8 mClipper[92];
};
@@ -69,7 +68,6 @@ struct JPAEmitterManager {
/* 8027E354 */ void clearResourceManager(u8);
};
struct dPa_simpleData_c {
/* 8004B024 */ ~dPa_simpleData_c();
/* 8004B060 */ dPa_simpleData_c();
@@ -2053,10 +2051,10 @@ static asm void dPa_kankyocolor_set(f32 param_0, JPABaseEmitter* param_1,
#pragma optimization_level 0
#pragma optimizewithasm off
asm u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* param_3,
dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6,
u8 param_7, dPa_levelEcallBack* param_8, s8 param_9,
_GXColor const* param_10, _GXColor const* param_11,
cXyz const* param_12, f32 param_13) {
dKy_tevstr_c const* param_4, csXyz const* param_5, cXyz const* param_6,
u8 param_7, dPa_levelEcallBack* param_8, s8 param_9,
_GXColor const* param_10, _GXColor const* param_11, cXyz const* param_12,
f32 param_13) {
nofralloc
#include "asm/d/particle/d_particle/func_8004D4CC.s"
}
@@ -2069,9 +2067,9 @@ asm u32 dPa_control_c::set(u32 param_0, u8 param_1, u16 param_2, cXyz const* par
#pragma optimization_level 0
#pragma optimizewithasm off
asm u32 dPa_control_c::setPoly(u32 param_0, u16 param_1, cBgS_PolyInfo& param_2,
cXyz const* param_3, dKy_tevstr_c const* param_4,
csXyz const* param_5, cXyz const* param_6, int param_7,
dPa_levelEcallBack* param_8, s8 param_9, cXyz const* param_10) {
cXyz const* param_3, dKy_tevstr_c const* param_4,
csXyz const* param_5, cXyz const* param_6, int param_7,
dPa_levelEcallBack* param_8, s8 param_9, cXyz const* param_10) {
nofralloc
#include "asm/d/particle/d_particle/func_8004D6A4.s"
}