Leahnaya/pokepinballrs
1
0
Fork 0
mirror of https://github.com/pret/pokepinballrs.git synced 2026-04-25 15:49:08 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct spelling of collision

Browse Source
This commit is contained in:
Retnuhytnuob 2026-02-23 01:46:17 -06:00
parent 5e12e183f4
commit 597ca3b97d
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/rom_2.s
View File

@ -527,7 +527,7 @@ gUnknown_086ACDF4:: @ 0x086ACDF4
.2byte 0x0000, 0x00F0, 0x008C, 0x00C8
.2byte 0,0,0,0,0,0,0,0
@ suspected as board level colision detection logic; one per board;
@ suspected as board level collision detection logic; one per board;
@ similar contents for boards decompiled.
BoardCollisionFuncts_086ACE0C:: @ 0x086ACE0C
.4byte COLLISION_CHECK_RUBY_14E08, COLLISION_CHECK_SAPPHIRE_16090;

6
include/constants/dusclops_states.h
View File

@ -12,9 +12,9 @@ enum DusclopsBoardStates{
};
enum DusclopsEntityColisionMode{
DUSCLOPS_ENTITY_COLISION_MODE_NONE = 0,
DUSCLOPS_ENTITY_COLISION_MODE_DUSKULL = 1,
DUSCLOPS_ENTITY_COLISION_MODE_DUSCLOPS = 2
DUSCLOPS_ENTITY_COLLISION_MODE_NONE = 0,
DUSCLOPS_ENTITY_COLLISION_MODE_DUSKULL = 1,
DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS = 2
};
enum DuskullEntityState{

16
src/board_process3_dusclops.c
View File

@ -32,7 +32,7 @@ void DuskullBonus_Setup(void)
gCurrentPinballGame->ball->unk0 = 1;
gCurrentPinballGame->bonusModeHitCount = 0;
gCurrentPinballGame->returnToMainBoardFlag = 0;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_NONE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
gCurrentPinballGame->unk392 = 0;
gCurrentPinballGame->unk394 = 0;
gCurrentPinballGame->minionActiveCount = 0;
@ -111,7 +111,7 @@ void DusclopsBoardProcess_3B_33130(void)
gMain.blendControl = 0x1C10;
gMain.blendAlpha = 0x30D;
}
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_DUSKULL;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_DUSKULL;
DuskullPhase_ProcessEntityLogic();
DuskullPhase_ProcessGraphics();
break;
@ -120,7 +120,7 @@ void DusclopsBoardProcess_3B_33130(void)
gMain.spriteGroups[13].available = TRUE;
gMain.spriteGroups[14].available = TRUE;
gMain.spriteGroups[12].available = TRUE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_NONE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
gCurrentPinballGame->bonusModeHitCount = 0;
m4aSongNumStart(MUS_BONUS_FIELD_DUSCLOPS);
break;
@ -730,7 +730,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
}
else
{
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_DUSCLOPS;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS;
gCurrentPinballGame->unk294 = 2;
}
@ -843,7 +843,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
tileOffset = DUSCLOPS_TILE_OFFSET_HIT;
m4aSongNumStart(SE_DUSCLOPS_HIT); //Dusclops hit
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_NONE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
playRumbleType(7);
break;
}
@ -861,7 +861,7 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
gCurrentPinballGame->unk3E4 = 128;
gCurrentPinballGame->unk3E2 = DUSCLOPS_FRAME_WALK_NEUTRAL;
gCurrentPinballGame->unk3DC = DUSCLOPS_ENTITY_STATE_GUARD_READY;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_NONE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
tileOffset = DUSCLOPS_TILE_OFFSET_HIT;
}
else
@ -931,12 +931,12 @@ void DusclopsPhase_ProcessEntityLogicAndGraphics(void)
if (gCurrentPinballGame->ballSpeed != 0)
{
if ((gCurrentPinballGame->unk3E2 == DUSCLOPS_FRAME_ABSOLB_LAUNCH) && (gCurrentPinballGame->unk3E4 > 4))
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_DUSCLOPS;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS;
}
else
{
if ((gCurrentPinballGame->unk3E2 == DUSCLOPS_FRAME_ABSOLB_LAUNCH) && (gCurrentPinballGame->unk3E4 != 0))
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_DUSCLOPS;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS;
}
if (gCurrentPinballGame->unk5A6 <= 29)

6
src/collision_checks.c
View File

@ -1578,7 +1578,7 @@ void CheckDusclopsEntitiesCollision(struct Vector16 *arg0, s16* arg1, u8* arg2)
maskedResult = 0;
lowerNibble = 0;
if(gCurrentPinballGame->boardEntityCollisionMode == DUSCLOPS_ENTITY_COLISION_MODE_DUSCLOPS)
if(gCurrentPinballGame->boardEntityCollisionMode == DUSCLOPS_ENTITY_COLLISION_MODE_DUSCLOPS)
{
if (*arg2 != 0)
return;
@ -1608,7 +1608,7 @@ void CheckDusclopsEntitiesCollision(struct Vector16 *arg0, s16* arg1, u8* arg2)
return;
}
if(gCurrentPinballGame->boardEntityCollisionMode == DUSCLOPS_ENTITY_COLISION_MODE_DUSKULL)
if(gCurrentPinballGame->boardEntityCollisionMode == DUSCLOPS_ENTITY_COLLISION_MODE_DUSKULL)
{
if (*arg2 != 0)
return;
@ -1687,7 +1687,7 @@ void CheckDusclopsAbzorbZoneHit(u8 arg0, u16 *arg1, u16 *arg2)
case 4:
gCurrentPinballGame->unk3DC = DUSCLOPS_ENTITY_STATE_HIT_ABSORB_ZONE;
gCurrentPinballGame->unk1F = 1;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLISION_MODE_NONE;
gCurrentPinballGame->boardEntityCollisionMode = DUSCLOPS_ENTITY_COLLISION_MODE_NONE;
break;
case 5:
case 6:

2
src/rom_1A98C.c
View File

@ -88,7 +88,7 @@ void sub_1AA38(void)
* When this function is nulled out at sub_1A9E8, the banner *doesn't* show, and
* the ball bounces off the sharpedo. However, the grid still shows a picked mon,
* and the mode otherwise works mostly normally, with the exception of affecting
* the 'tilt' behavior, and the colision with the cyndaquil pushback.
* the 'tilt' behavior, and the collision with the cyndaquil pushback.
*/
void sub_1AAA0(void)
{