Format code

This commit is contained in:
Formatting bot 2023-05-06 01:16:56 +00:00
parent dcf27c86a8
commit b049941376
13 changed files with 233 additions and 233 deletions

View File

@ -50,6 +50,10 @@ D_800A3380 = 0x800A3380;
D_800A3388 = 0x800A3388;
D_800A3390 = 0x800A3390;
D_800A3398 = 0x800A3398;
g_josephsCloakLiningDark555 = 0x800A37DC;
g_josephsCloakLiningLight555 = 0x800A37DE;
g_josephsCloakExteriorDark555 = 0x800A37E0;
g_josephsCloakExteriorLight555 = 0x800A37E2;
D_800A3848 = 0x800A3848;
D_800A384C = 0x800A384C;
D_800A3860 = 0x800A3860;
@ -886,10 +890,13 @@ DrawMenuSprite = 0x800F5B90;
DrawMenuRect = 0x800F5D44;
DrawRelicsMenu = 0x800F5EF0;
DrawMenuAlucardPortrait = 0x800F622C;
DarkenCloakColor = 0x800F62E8;
ApplyJosephsCloakPalette = 0x800F6304;
DrawMenuAlucardCloakPreview = 0x800F643C;
DrawMenuChar = 0x800F678C;
DrawMenuStr = 0x800F67EC;
DrawMenuInt = 0x800F68F4;
DrawMenuTime = 0x800F6998;
DrawSettingsButton = 0x800F6FA4;
DrawSettingsReverseCloak = 0x800F70DC;
DrawSettingsSound = 0x800F7168;
@ -904,20 +911,49 @@ AddToInventory = 0x800FD874;
GetEquipProperties = 0x800FE728;
HasEnoughMp = 0x800FE8B4;
AddHearts = 0x800FE914;
DrawHudRichter = 0x80100750;
jpt_80102810 = 0x80102810;
DestroyEntity = 0x80106590;
DrawEntitiesHitbox = 0x80106670;
DrawHudRichter = 0x80100750;
SetPolyRect = 0x80107330;
CopyMapOverlayCallback = 0x801074BC;
UpdateEntityAlucard = 0x8010A5BC;
UpdateAnim = 0x8010DDA0;
AccelerateX = 0x8010E390;
GetFreeDraEntity = 0x8011879C;
EntityNumberMovesToHpMeter = 0x80118D0C;
EntityGuardText = 0x80119588;
EntityPlayerBlinkWhite = 0x8011BDA4;
EntityMpReplenished = 0x8011D9F8;
EntityHitByLightning = 0x8011F24C;
EntityHitByIce = 0x8011F934;
EntityTransparentWhiteCircle = 0x801200AC;
EntityPlayerPinkEffect = 0x80120AF8;
EntityPlayerDissolves = 0x80120DD0;
EntityLevelUpAnimation = 0x80121980;
EntityMist = 0x8012231C;
EntityTeleport = 0x801243B0;
EntitySubwpnThrownDagger = 0x80124B88;
EntitySubwpnThrownAxe = 0x80125330;
EntityHolyWater = 0x80125C2C;
EntityHolyWaterBreakGlass = 0x80125E68;
EntityHolyWaterFlame = 0x801262AC;
EntitySubwpnCrashCross = 0x801267B0;
EntitySubwpnCrashCrossParticles = 0x80126C48;
EntityExpandingCircle = 0x801279FC;
EntitySubwpnReboundStone = 0x80127F40;
EntitySubwpnThrownVibhuti = 0x80128714;
EntitySummonSpirit = 0x8012A0A4;
EntityStopWatchExpandingCircle = 0x8012A528;
EntityStopWatch = 0x8012A89C;
EntitySubwpnBible = 0x8012B990;
EntityBatEcho = 0x8012BEF8;
func_801315F8 = 0x801315F8;
PlaySfx = 0x801347F8;
IncrementRingBufferPos = 0x80135C00;
nullsub_10 = 0x801362A4;
g_GpuMaxUsage = 0x801362DC;
g_DebugPalIdx = 0x801362C0;
g_GpuMaxUsage = 0x801362DC;
g_softResetTimer = 0x80136408;
g_DecSrcPtr = 0x80137578;
g_DecDstPtr = 0x8013757C;
@ -937,49 +973,13 @@ g_OverlayCopySrc = 0x80137F80;
g_OverlayCopyDst = 0x80137F84;
g_OverlayBlockCount = 0x80137F8C;
g_OverlayLastBlockSize = 0x80137F90;
g_sfxRingBufferPos1 = 0x80139000;
g_DebugCurPal = 0x8013900C;
g_sfxRingBuffer1 = 0x801390DC;
g_sfxRingBufferPos2 = 0x80139A70;
g_volumeL = 0x8013AE8C;
g_sfxRingBuffer2 = 0x8013B3E8;
g_volumeR = 0x8013B698;
g_imgUnk8013C200 = 0x8013C200;
g_imgUnk8013C270 = 0x8013C270;
g_StageOverlay = 0x80180000;
EntitySubwpnThrownDagger = 0x80124B88;
EntitySubwpnCrashCrossParticles = 0x80126C48;
EntitySubwpnThrownAxe = 0x80125330;
EntityPlayerBlinkWhite = 0x8011BDA4;
EntitySubwpnThrownVibhuti = 0x80128714;
EntityNumberMovesToHpMeter = 0x80118D0C;
EntitySubwpnCrashCross = 0x801267B0;
EntitySubwpnReboundStone = 0x80127F40;
EntityLevelUpAnimation = 0x80121980;
EntityHolyWater = 0x80125C2C;
EntityHolyWaterFlame = 0x801262AC;
EntityExpandingCircle = 0x801279FC;
EntityHitByLightning = 0x8011F24C;
EntityMpReplenished = 0x8011D9F8;
EntityPlayerDissolves = 0x80120DD0;
EntityHitByIce = 0x8011F934;
EntityMist = 0x8012231C;
EntityGuardText = 0x80119588;
EntityTransparentWhiteCircle = 0x801200AC;
EntityPlayerPinkEffect = 0x80120AF8;
EntityHolyWaterBreakGlass = 0x80125E68;
EntityStopWatch = 0x8012A89C;
EntityStopWatchExpandingCircle = 0x8012A528;
EntitySubwpnBible = 0x8012B990;
EntityBatEcho = 0x8012BEF8;
EntitySummonSpirit = 0x8012A0A4;
EntityTeleport = 0x801243B0;
IncrementRingBufferPos = 0x80135C00;
g_sfxRingBufferPos1 = 0x80139000;
g_sfxRingBuffer1 = 0x801390DC;
g_sfxRingBufferPos2 = 0x80139A70;
g_sfxRingBuffer2 = 0x8013B3E8;
jpt_80102810 = 0x80102810;
g_josephsCloakLiningDark555 = 0x800A37DC;
g_josephsCloakLiningLight555 = 0x800A37DE;
g_josephsCloakExteriorDark555 = 0x800A37E0;
g_josephsCloakExteriorLight555 = 0x800A37E2;
ApplyJosephsCloakPalette = 0x800F6304;
DarkenCloakColor = 0x800F62E8;
DrawMenuTime = 0x800F6998;

View File

@ -1,6 +1,4 @@
g_richter_spritesheet = 0x8013C020;
UpdateEntityRichter = 0x80157BFC;
func_8017328C = 0x8017328C;
D_80154D00 = 0x80154D00;
D_80154D10 = 0x80154D10;
D_80154D20 = 0x80154D20;
@ -29,4 +27,6 @@ D_80155230 = 0x80155230;
D_80155234 = 0x80155234;
D_80155238 = 0x80155238;
D_8015523C = 0x8015523C;
D_80155240 = 0x80155240;
D_80155240 = 0x80155240;
UpdateEntityRichter = 0x80157BFC;
func_8017328C = 0x8017328C;

View File

@ -1,37 +1,37 @@
g_SpriteBanks = 0x80180040;
g_Rooms = 0x801812D4;
EntityBackgroundBlock = 0x8018D600;
EntityUnkId12 = 0x8018D6E0;
EntityUnkId01 = 0x8018D89C;
EntityUnkId16 = 0x8018E7C8;
EntityPlatform = 0x8018F95C;
EntityRoomDarkness = 0x8019007C;
EntityMaria = 0x80190374;
EntityElevatorStationary = 0x80190540;
EntityUnkId1B = 0x80190A78;
EntityMovingElevator = 0x80190B64;
Random = 0x80190E4C;
EntityNumericDamage = 0x80192398;
CreateEntityWhenInVerticalRange = 0x80192B00;
CreateEntityWhenInHorizontalRange = 0x80192C18;
CreateEntityFromCurrentEntity = 0x801934C4;
EntityRedDoor = 0x8019362C;
DestroyEntity = 0x80194264;
MoveEntity = 0x80194618;
AllocEntity = 0x80194AD4;
InitializeEntity = 0x80194F74;
CreateEntityWhenInVerticalRange = 0x80192B00;
CreateEntityWhenInHorizontalRange = 0x80192C18;
CreateEntityFromCurrentEntity = 0x801934C4;
EntityUnkId01 = 0x8018D89C;
EntityExplosion = 0x801964F8;
CollectHeart = 0x801958F4;
EntityPrizeDrop = 0x80195C84;
EntityNumericDamage = 0x80192398;
EntityRedDoor = 0x8019362C;
EntityIntenseExplosion = 0x80198F2C;
EntityAbsorbOrb = 0x8019B274;
EntityUnkId08 = 0x8019BAB8;
EntityStageNamePopup = 0x8019A5F0;
EntityExplosion = 0x801964F8;
EntityEquipItemDrop = 0x80196698;
EntityRelicOrb = 0x80196F30;
EntityHeartDrop = 0x80197A00;
EntityEnemyBlood = 0x8019B608;
EntityUnkId0E = 0x80197B28;
EntityBackgroundBlock = 0x8018D600;
EntityUnkId12 = 0x8018D6E0;
EntityUnkId13 = 0x80198174;
EntityExplosion14 = 0x8019849C;
EntityUnkId15 = 0x8019858C;
EntityUnkId16 = 0x8018E7C8;
EntityPlatform = 0x8018F95C;
EntityMaria = 0x80190374;
EntityRoomDarkness = 0x8019007C;
EntityElevatorStationary = 0x80190540;
EntityUnkId1B = 0x80190A78;
EntityMovingElevator = 0x80190B64;
CollectHeart = 0x801958F4;
EntityIntenseExplosion = 0x80198F2C;
EntityStageNamePopup = 0x8019A5F0;
EntityAbsorbOrb = 0x8019B274;
EntityEnemyBlood = 0x8019B608;
EntityUnkId08 = 0x8019BAB8;

View File

@ -4,48 +4,11 @@ g_eBreakableAnimations = 0x80180610;
g_eBreakableHitboxes = 0x80180630;
g_eBreakableExplosionTypes = 0x80180638;
g_eBreakableanimSets = 0x80180640;
g_Rooms = 0x80181498;
g_eBreakableBlendModes = 0x80180650;
Update = 0x80196FC0;
CreateEntityFromCurrentEntity = 0x80199608;
CreateEntityFromEntity = 0x8019967C;
DestroyEntity = 0x8019A3A8;
DestroyEntityFromIndex = 0x8019A414;
PreventEntityFromRespawning = 0x8019A490;
AnimateEntity = 0x8019A4D8;
InitializeEntity = 0x8019B0B8;
CreateEntityWhenInVerticalRange = 0x80198C44;
CreateEntityWhenInHorizontalRange = 0x80198D5C;
MoveEntity = 0x8019A75C;
FallEntity = 0x8019A78C;
AllocEntity = 0x8019AC18;
CollectHeartVessel = 0x8019BCAC;
CollectLifeVessel = 0x8019BD50;
c_HeartPrizes = 0x801811AC;
CreateEntityFromLayout = 0x80198B80;
func_801A2018 = 0x801A2018;
Random = 0x80196F90;
EntityBreakable = 0x80191D00;
EntityExplosion = 0x8019C63C;
DestroyCurrentEntity = 0x8019BDA0;
EntityPrizeDrop = 0x8019BDC8;
EntityNumericDamage = 0x801984DC;
EntityRedDoor = 0x80199770;
EntityIntenseExplosion = 0x8019F070;
EntityAbsorbOrb = 0x801A13B8;
EntityRoomForeground = 0x801A1BFC;
EntityStageNamePopup = 0x801A0734;
EntityEquipItemDrop = 0x8019C7DC;
EntityRelicOrb = 0x8019D074;
EntityHeartDrop = 0x8019DB44;
EntityEnemyBlood = 0x801A174C;
EntityUnkId0E = 0x8019DC6C;
g_Rooms = 0x80181498;
EntityUnkId11 = 0x80191A64;
EntityUnkId13 = 0x8019E2B8;
EntityExplosion14 = 0x8019E5E0;
EntityUnkId15 = 0x8019E6D0;
Entity3DBackgroundHouse = 0x801A2F10;
EntityUnkId17 = 0x801A2E20;
EntityBreakable = 0x80191D00;
EntityBackgroundClouds = 0x80191E34;
EntityMother = 0x80192104;
EntitySuccubusPetal = 0x80193B3C;
@ -56,6 +19,43 @@ EntitySuccubusWingSpike = 0x80194488;
EntityUnkId1F = 0x801946C4;
EntitySuccubusIntroCutscene = 0x801950F8;
EntityUnkId21 = 0x80196238;
EntityFadeToWhite1 = 0x8019697C;
EntityUnkId23 = 0x80196678;
EntityFadeToWhite1 = 0x8019697C;
EntityFadeToWhite2 = 0x80196CC8;
Random = 0x80196F90;
Update = 0x80196FC0;
EntityNumericDamage = 0x801984DC;
CreateEntityFromLayout = 0x80198B80;
CreateEntityWhenInVerticalRange = 0x80198C44;
CreateEntityWhenInHorizontalRange = 0x80198D5C;
CreateEntityFromCurrentEntity = 0x80199608;
CreateEntityFromEntity = 0x8019967C;
EntityRedDoor = 0x80199770;
DestroyEntity = 0x8019A3A8;
DestroyEntityFromIndex = 0x8019A414;
PreventEntityFromRespawning = 0x8019A490;
AnimateEntity = 0x8019A4D8;
MoveEntity = 0x8019A75C;
FallEntity = 0x8019A78C;
AllocEntity = 0x8019AC18;
InitializeEntity = 0x8019B0B8;
CollectHeartVessel = 0x8019BCAC;
CollectLifeVessel = 0x8019BD50;
DestroyCurrentEntity = 0x8019BDA0;
EntityPrizeDrop = 0x8019BDC8;
EntityExplosion = 0x8019C63C;
EntityEquipItemDrop = 0x8019C7DC;
EntityRelicOrb = 0x8019D074;
EntityHeartDrop = 0x8019DB44;
EntityUnkId0E = 0x8019DC6C;
EntityUnkId13 = 0x8019E2B8;
EntityExplosion14 = 0x8019E5E0;
EntityUnkId15 = 0x8019E6D0;
EntityIntenseExplosion = 0x8019F070;
EntityStageNamePopup = 0x801A0734;
EntityAbsorbOrb = 0x801A13B8;
EntityEnemyBlood = 0x801A174C;
EntityRoomForeground = 0x801A1BFC;
func_801A2018 = 0x801A2018;
EntityUnkId17 = 0x801A2E20;
Entity3DBackgroundHouse = 0x801A2F10;

View File

@ -7,10 +7,55 @@ g_eBreakableHitboxes = 0x80180E70;
g_eBreakableExplosionTypes = 0x80180E78;
g_eBreakableanimSets = 0x80180E80;
g_eBreakableBlendModes = 0x80180E90;
g_TrapDoorFlag = 0x8018123C;
c_GoldPrizes = 0x80182460;
g_Rooms = 0x80183CC4;
g_TrapDoorFlag = 0x8018123C;
EntityCavernDoorVase = 0x801B77D4;
EntityUnkId12 = 0x801B78A8;
EntityBreakable = 0x801B7A64;
EntityUnkId16 = 0x801B7B98;
EntityBackgroundLightning = 0x801B7C4C;
EntityShuttingWindow = 0x801B8254;
EntityCastleDoor = 0x801B8564;
EntityBackgroundBushes = 0x801B8A74;
EntityUnkId1C = 0x801B8ED0;
EntityTransparentWater = 0x801B9198;
EntityCavernDoorLever = 0x801B9650;
EntityCavernDoorPlatform = 0x801B97D0;
EntityCavernDoor = 0x801B989C;
EntityClickSwitch = 0x801B9CE8;
EntityPathBlockSmallWeight = 0x801B9E10;
EntityPathBlockTallWeight = 0x801BA0A0;
EntityTrapDoor = 0x801BA348;
EntityMermanRockLeftSide = 0x801BA4C0;
EntityMermanRockRightSide = 0x801BA868;
EntityUnkId26 = 0x801BABE8;
EntityFallingRock2 = 0x801BAD6C;
EntityUnkId5C = 0x801BAEF0;
EntityFallingRock = 0x801BB3BC;
EntityDeathSkySwirl = 0x801BBB8C;
EntityUnkId29 = 0x801BBDC0;
EntityUnkId2A = 0x801BBE70;
EntitySwitch = 0x801BBF38;
EntityHeartRoomGoldDoor = 0x801BC05C;
EntityUnkId49 = 0x801BC3FC;
EntityPushAlucard = 0x801BC4EC;
EntityUnkId53 = 0x801BC780;
EntityForegroundTree = 0x801BC93C;
EntityUnkId50 = 0x801BCC4C;
EntityBackgroundPineTrees = 0x801BCE08;
EntityUnkId52 = 0x801BD564;
EntityUnkId54 = 0x801BD71C;
EntityUnkId55 = 0x801BDEB0;
EntityBackgroundCastleWall = 0x801BE080;
EntityFlyingOwlAndLeaves = 0x801BE134;
EntityFallingLeaf = 0x801BE444;
EntityRoomTransition1 = 0x801BEEB0;
EntityRoomTransition2 = 0x801BFF00;
EntityDeathStolenItem = 0x801C033C;
EntityUnkId5A = 0x801C083C;
EntityUnkId5B = 0x801C11A4;
EntityUnkId5E = 0x801C12E8;
EntityWargExplosionPuffOpaque = 0x801C14B8;
Random = 0x801C184C;
Update = 0x801C187C;
@ -35,8 +80,8 @@ ReplaceBreakableWithItemDrop = 0x801C605C;
CollectHeart = 0x801C62F4;
CollectGold = 0x801C6374;
CollectSubweapon = 0x801C6450;
CollectLifeVessel = 0x801C660C;
CollectHeartVessel = 0x801C6568;
CollectLifeVessel = 0x801C660C;
DestroyCurrentEntity = 0x801C665C;
EntityPrizeDrop = 0x801C6684;
EntityExplosion = 0x801C6EF8;
@ -44,89 +89,44 @@ EntityEquipItemDrop = 0x801C7098;
EntityRelicOrb = 0x801C7930;
EntityHeartDrop = 0x801C8400;
EntityUnkId0E = 0x801C8528;
EntityUnkId13 = 0x801C8B74;
EntityUnkId14 = 0x801C8E9C;
EntityUnkId15 = 0x801C8F8C;
EntityIntenseExplosion = 0x801C992C;
EntityStageNamePopup = 0x801CAFF0;
EntityAbsorbOrb = 0x801CBC74;
EntityEnemyBlood = 0x801CC008;
EntityRoomForeground = 0x801CC4B8;
EntityStrongWarg = 0x801CC974;
EntityUnkId30 = 0x801CDD80;
EntityUnkId31 = 0x801CDF10;
EntityExplosion3 = 0x801CE2F4;
EntityStrongWargWaveAttack = 0x801CE98C;
EntityUnkId2F = 0x801CED60;
EntityStrongWargDeathBeams = 0x801CEF88;
EntityWarg = 0x801CF740;
EntityWargExplosionPuffTransparent = 0x801D0624;
EntityMerman2 = 0x801D49C4;
EntityMerman = 0x801D4B20;
EntityBoneScimitar = 0x801D5AAC;
EntityBat = 0x801D6264;
EntityZombie = 0x801D64B0;
EntityFallingLeaf = 0x801BE444;
EntityFlyingOwlAndLeaves = 0x801BE134;
EntityUnkId5E = 0x801C12E8;
EntityFallingRock = 0x801BB3BC;
EntityUnkId5C = 0x801BAEF0;
EntityUnkId5B = 0x801C11A4;
EntityUnkId5A = 0x801C083C;
EntityDeathStolenItem = 0x801C033C;
EntityRoomTransition2 = 0x801BFF00;
EntityRoomTransition1 = 0x801BEEB0;
EntityBackgroundCastleWall = 0x801BE080;
EntityUnkId55 = 0x801BDEB0;
EntityUnkId54 = 0x801BD71C;
EntityUnkId53 = 0x801BC780;
EntityUnkId52 = 0x801BD564;
EntityBackgroundPineTrees = 0x801BCE08;
EntityUnkId50 = 0x801BCC4C;
EntityForegroundTree = 0x801BC93C;
EntityPushAlucard = 0x801BC4EC;
EntityUnkId4D = 0x801D6710;
EntityUnkId4B = 0x801D04A4;
EntityUnkId49 = 0x801BC3FC;
EntityBoneScimitarParts = 0x801D615C;
EntityMermanExplosion = 0x801D58D4;
EntityFallingObject = 0x801D583C;
EntityMermanFireball = 0x801D56D8;
EntityFallingObject2 = 0x801D4668;
EntityLargeFallingObject = 0x801D48F8;
EntityWargExplosionPuffTransparent = 0x801D0624;
EntityAlucardWaterEffect = 0x801D0B34;
EntityLargeUpwardsSplash = 0x801D16B4;
EntityAlucardSplash = 0x801D1FC0;
EntitySidewaysWaterDroplets = 0x801D24AC;
EntitySmallUpwardsSplash = 0x801D2840;
EntitySmallWaterSplash = 0x801D2A9C;
EntityMerman3 = 0x801D2E4C;
EntityExplosion2 = 0x801D3F38;
EntityUnkId3D = 0x801D4700;
EntityMediumWaterSplash = 0x801D4168;
EntityLargeWaterSplash = 0x801D423C;
EntityMerman3 = 0x801D2E4C;
EntitySmallWaterSplash = 0x801D2A9C;
EntityCavernDoorVase = 0x801B77D4;
EntitySmallUpwardsSplash = 0x801D2840;
EntitySidewaysWaterDroplets = 0x801D24AC;
EntityAlucardSplash = 0x801D1FC0;
EntityLargeUpwardsSplash = 0x801D16B4;
EntityAlucardWaterEffect = 0x801D0B34;
EntityStrongWargDeathBeams = 0x801CEF88;
EntityExplosion3 = 0x801CE2F4;
EntityUnkId31 = 0x801CDF10;
EntityUnkId30 = 0x801CDD80;
EntityUnkId2F = 0x801CED60;
EntityStrongWargWaveAttack = 0x801CE98C;
EntityStrongWarg = 0x801CC974;
EntityHeartRoomGoldDoor = 0x801BC05C;
EntitySwitch = 0x801BBF38;
EntityUnkId2A = 0x801BBE70;
EntityUnkId29 = 0x801BBDC0;
EntityDeathSkySwirl = 0x801BBB8C;
EntityFallingRock2 = 0x801BAD6C;
EntityUnkId26 = 0x801BABE8;
EntityMermanRockRightSide = 0x801BA868;
EntityMermanRockLeftSide = 0x801BA4C0;
EntityTrapDoor = 0x801BA348;
EntityPathBlockTallWeight = 0x801BA0A0;
EntityPathBlockSmallWeight = 0x801B9E10;
EntityClickSwitch = 0x801B9CE8;
EntityCavernDoor = 0x801B989C;
EntityCavernDoorPlatform = 0x801B97D0;
EntityCavernDoorLever = 0x801B9650;
EntityUnkId1C = 0x801B8ED0;
EntityBackgroundBushes = 0x801B8A74;
EntityCastleDoor = 0x801B8564;
EntityShuttingWindow = 0x801B8254;
EntityTransparentWater = 0x801B9198;
EntityBackgroundLightning = 0x801B7C4C;
EntityUnkId16 = 0x801B7B98;
EntityUnkId15 = 0x801C8F8C;
EntityUnkId14 = 0x801C8E9C;
EntityUnkId13 = 0x801C8B74;
EntityUnkId12 = 0x801B78A8;
EntityFallingObject2 = 0x801D4668;
EntityUnkId3D = 0x801D4700;
EntityLargeFallingObject = 0x801D48F8;
EntityMerman2 = 0x801D49C4;
EntityMerman = 0x801D4B20;
EntityMermanFireball = 0x801D56D8;
EntityFallingObject = 0x801D583C;
EntityMermanExplosion = 0x801D58D4;
EntityBoneScimitar = 0x801D5AAC;
EntityBoneScimitarParts = 0x801D615C;
EntityBat = 0x801D6264;
EntityZombie = 0x801D64B0;
EntityUnkId4D = 0x801D6710;

View File

@ -7,8 +7,8 @@ g_eBreakableHitboxes = 0x80180E48;
g_eBreakableExplosionTypes = 0x80180E50;
g_eBreakableanimSets = 0x80180E58;
g_eBreakableBlendModes = 0x80180E68;
g_Rooms = 0x80183A7C;
g_TrapDoorFlag = 0x80181104;
g_Rooms = 0x80183A7C;
EntityBreakable = 0x801B26FC;
EntityShuttingWindow = 0x801B2C20;
EntityCavernDoorLever = 0x801B3E84;
@ -19,8 +19,8 @@ EntityPathBlockTallWeight = 0x801B4940;
EntityTrapDoor = 0x801B4BE8;
EntityMermanRockLeftSide = 0x801B4D60;
EntityMermanRockRightSide = 0x801B5108;
EntityFallingRock = 0x801B5C5C;
EntityFallingRock2 = 0x801B560C;
EntityFallingRock = 0x801B5C5C;
EntitySwitch = 0x801B5F60;
EntityUnkId49 = 0x801B644C;
EntitySlograSpearProjectile = 0x801B7798;
@ -73,8 +73,8 @@ EntityMerman = 0x801C8238;
EntityMermanExplosion = 0x801C8FEC;
EntityBoneScimitar = 0x801C91C4;
EntityBoneScimitarParts = 0x801C9874;
EntityBloodSplatter = 0x801C9F98;
EntityBat = 0x801C997C;
EntityZombie = 0x801C9BC8;
EntityUnkId4D = 0x801C9E28;
EntityBloodSplatter = 0x801C9F98;
EntityBloodyZombie = 0x801CA654;

View File

@ -1,8 +1,8 @@
g_SpriteBanks = 0x8018002C;
D_80180040 = 0x80180040;
g_Cluts = 0x80180160;
g_TileLayers = 0x80180394;
g_EntityGfxs = 0x80180888;
D_80180040 = 0x80180040;
c_GoldPrizes = 0x80181D14;
c_HeartPrizes = 0x80181DA4;
g_Rooms = 0x8018272C;
@ -42,6 +42,25 @@ D_801A0E5C = 0x801A0E5C;
D_801A4E6C = 0x801A4E6C;
D_801A6E7C = 0x801A6E7C;
EntityBreakable = 0x801B0EEC;
EntityRedEyeBust = 0x801B11C0;
EntityPurpleBrickScrollingBackground = 0x801B12E8;
EntityLeftSecretRoomWall = 0x801B14C4;
EntityBottomSecretRoomFloor = 0x801B1770;
EntityMoveableBox = 0x801B20CC;
EntityCannonLever = 0x801B23B4;
EntityCannon = 0x801B25C4;
EntityCannonShot = 0x801B2874;
EntityCannonWall = 0x801B2978;
EntityFloorSpikes = 0x801B3294;
EntityTableWithGlobe = 0x801B3534;
EntityCloseBossRoom = 0x801B3FCC;
EntityBossRoomBlock = 0x801B4518;
EntitySlogra = 0x801B4778;
EntitySlograSpearProjectile = 0x801B5654;
EntityGaibon = 0x801B5778;
EntitySmallGaibonProjectile = 0x801B6AAC;
EntityLargeGaibonProjectile = 0x801B6BBC;
EntityMariaCutscene = 0x801B7D58;
Random = 0x801B94D4;
Update = 0x801B9504;
TestCollisions = 0x801B9908;
@ -82,35 +101,16 @@ EntityEnemyBlood = 0x801C2E3C;
EntityRoomForeground = 0x801C32EC;
EntityBoneScimitar = 0x801C37E4;
EntityBoneScimitarParts = 0x801C3E94;
EntityBloodSkeleton = 0x801C7958;
EntityStageNamePopup = 0x801C8CAC;
EntityMoveableBox = 0x801B20CC;
EntityCannonLever = 0x801B23B4;
EntityCannon = 0x801B25C4;
EntityCannonShot = 0x801B2874;
EntityCannonWall = 0x801B2978;
EntityRedEyeBust = 0x801B11C0;
EntityLeftSecretRoomWall = 0x801B14C4;
EntityBottomSecretRoomFloor = 0x801B1770;
EntityAxeKnight = 0x801C45BC;
EntityAxeKnightRotateAxe = 0x801C4CC0;
EntityAxeKnightThrowingAxe = 0x801C4D18;
EntityBloodyZombie = 0x801C5568;
EntityBloodSplatter = 0x801C4EAC;
EntityBloodyZombie = 0x801C5568;
EntitySkeleton = 0x801C5FC4;
EntitySpittleBone = 0x801C672C;
EntitySpittleBoneSpit = 0x801C6C6C;
EntityTableWithGlobe = 0x801B3534;
EntityFloorSpikes = 0x801B3294;
EntitySubWeaponContainer = 0x801C7048;
EntityCloseBossRoom = 0x801B3FCC;
EntityBossRoomBlock = 0x801B4518;
EntitySlogra = 0x801B4778;
EntitySlograSpearProjectile = 0x801B5654;
EntityGaibon = 0x801B5778;
EntitySmallGaibonProjectile = 0x801B6AAC;
EntityLargeGaibonProjectile = 0x801B6BBC;
EntityLifeUpSpawn = 0x801CA160;
EntityBloodSkeleton = 0x801C7958;
EntityMagicallySealedDoor = 0x801C7D68;
EntityMariaCutscene = 0x801B7D58;
EntityPurpleBrickScrollingBackground = 0x801B12E8;
EntityStageNamePopup = 0x801C8CAC;
EntityLifeUpSpawn = 0x801CA160;

View File

@ -1,6 +1,6 @@
g_SpriteBanks = 0x80180040;
g_Rooms = 0x801811AC;
Update = 0x8018A198;
func_801951F0 = 0x801951F0;
CreateEntityWhenInVerticalRange = 0x8018BE1C;
CreateEntityWhenInHorizontalRange = 0x8018BF34;
func_801951F0 = 0x801951F0;

View File

@ -1519,8 +1519,6 @@ D_801ABF84 = 0x801ABF84;
D_801ABF8C = 0x801ABF8C;
D_801ABF90 = 0x801ABF90;
D_801ABF94 = 0x801ABF94;
g_MemCardSelectorX = 0x801BC3D8;
g_MemCardSelectorY = 0x801BC3DC;
SetupFileChoose = 0x801AC048;
func_801AC084 = 0x801AC084;
func_801AC174 = 0x801AC174;
@ -1691,5 +1689,7 @@ func_801BABA4 = 0x801BABA4;
g_memCardRStep = 0x801BAFEC;
g_memCardRStepSub = 0x801BAFF0;
g_memCardRetryCount = 0x801BAFF8;
g_MemCardSelectorX = 0x801BC3D8;
g_MemCardSelectorY = 0x801BC3DC;
g_InputCursorPos = 0x801D6B08;
g_InputSaveName = 0x801D6B14;
g_InputSaveName = 0x801D6B14;

View File

@ -59,4 +59,4 @@ EntityCutscenePhotograph = 0x801BB764;
EntityCutscenePhotographFire = 0x801BC4D0;
func_801BC5C0 = 0x801BC5C0;
func_801BD8F0 = 0x801BD8F0;
EntityBackgroundVortex = 0x801BE1B4;
EntityBackgroundVortex = 0x801BE1B4;

View File

@ -104,4 +104,4 @@ EntityStageNamePopup = 0x8019198C;
EntityAbsorbOrb = 0x80192610;
EntityEnemyBlood = 0x801929A4;
EntityRoomForeground = 0x80192E54;
func_80193270 = 0x80193270;
func_80193270 = 0x80193270;

View File

@ -1 +1 @@
DestroyEntity = 0x80173E0C;
DestroyEntity = 0x80173E0C;

View File

@ -1,3 +1,4 @@
CdLastCom = 0x8001944;
aDraBin1 = 0x80010040;
aFMapBin1 = 0x8001004C;
a0123456789abcd = 0x8001005C;
@ -328,7 +329,6 @@ def_cbread = 0x800193EC;
DeliverEvent = 0x80019414;
CdStatus = 0x80019424;
CdMode = 0x80019434;
CdLastCom = 0x8001944;
CdLastPos = 0x80019454;
CdReset = 0x80019464;
CdFlush = 0x800194D0;
@ -561,19 +561,30 @@ g_roomCount = 0x8003C760;
g_api = 0x8003C774;
g_api_o_TestCollisions = 0x8003C778;
g_api_o_unk08 = 0x8003C77C;
D_8003C77C = 0x8003C77C;
g_api_o_InitRoomEntities = 0x8003C780;
g_pfnInitRoomEntities = 0x8003C780;
g_api_o_rooms = 0x8003C784;
D_8003C784 = 0x8003C784;
g_api_o_spriteBanks = 0x8003C788;
D_8003C788 = 0x8003C788;
g_api_o_cluts = 0x8003C78C;
D_8003C78C = 0x8003C78C;
g_api_o_unk1C = 0x8003C790;
g_api_o_tileLayers = 0x8003C794;
D_8003C794 = 0x8003C794;
g_api_o_entityGfxs = 0x8003C798;
D_8003C798 = 0x8003C798;
g_api_o_unk28 = 0x8003C79C;
D_8003C79C = 0x8003C79C;
g_api_o_unk2c = 0x8003C7A0;
D_8003C7A0 = 0x8003C7A0;
g_api_o_unk30 = 0x8003C7A4;
D_8003C7A4 = 0x8003C7A4;
g_api_o_unk34 = 0x8003C7A8;
g_api_o_unk38 = 0x8003C7AC;
g_api_o_unk3C = 0x8003C7B0;
D_8003C7B0 = 0x8003C7B0;
g_api_FreePrimitives = 0x8003C7B4;
g_api_AllocPrimitives = 0x8003C7B8;
g_api_CheckCollision = 0x8003C7BC;
@ -582,17 +593,6 @@ g_api_UpdateAnim = 0x8003C7C4;
g_api_AccelerateX = 0x8003C7C8;
g_api_GetFreeDraEntity = 0x8003C7CC;
g_api_8003C7D0 = 0x8003C7D0;
D_8003C77C = 0x8003C77C;
g_pfnInitRoomEntities = 0x8003C780;
D_8003C784 = 0x8003C784;
D_8003C788 = 0x8003C788;
D_8003C78C = 0x8003C78C;
D_8003C794 = 0x8003C794;
D_8003C798 = 0x8003C798;
D_8003C79C = 0x8003C79C;
D_8003C7A0 = 0x8003C7A0;
D_8003C7A4 = 0x8003C7A4;
D_8003C7B0 = 0x8003C7B0;
D_8003C8B8 = 0x8003C8B8;
D_8003C8C4 = 0x8003C8C4;
D_8003C908 = 0x8003C908;
@ -638,11 +638,11 @@ D_8003CB08_buf_draw_r0 = 0x8003CB25;
D_8003CB08_buf_draw_g0 = 0x8003CB26;
D_8003CB08_buf_draw_b0 = 0x8003CB27;
D_800542FC = 0x800542FC;
D_80054300 = 0x80054300;
D_80054302 = 0x80054302;
D_800542FC_buf_draw_r0 = 0x80054319;
D_800542FC_buf_draw_g0 = 0x8005431A;
D_800542FC_buf_draw_b0 = 0x8005431B;
D_80054300 = 0x80054300;
D_80054302 = 0x80054302;
D_8005435C = 0x8005435C;
D_80057F70 = 0x80057F70;
D_80061B70 = 0x80061B70;