Merge branch 'master' into twomore

Makefile.psp.mk

@@ -91,10 +91,10 @@ $(BUILD_DIR)/dra.elf: $(BUILD_DIR)/dra.ld $(addprefix $(BUILD_DIR)/src/dra/,$(ad
 $(BUILD_DIR)/tt_%.elf: $(BUILD_DIR)/tt_%.ld $$(call list_o_files_psp,servant/tt_$$*) $(BUILD_DIR)/assets/servant/tt_%/mwo_header.bin.o
 	$(call link_with_deadstrip,tt_$*,$@)
 
-ST_ST0_MERGE = title_card popup e_room_fg st_common collision e_lock_camera st_update e_red_door
+ST_ST0_MERGE = title_card popup e_room_fg st_common collision e_lock_camera st_update e_red_door create_entity
 $(BUILD_DIR)/stst0.elf: $(BUILD_DIR)/stst0.ld $(addprefix $(BUILD_DIR)/src/st/st0/,$(addsuffix .c.o,$(ST_ST0_MERGE))) $$(call list_o_files_psp,st/st0_psp) $(BUILD_DIR)/assets/st/st0/mwo_header.bin.o
 	$(call link_with_deadstrip,stst0,$@)
-ST_WRP_MERGE = st_update e_particles e_room_fg st_common st_debug e_breakable popup warp e_red_door
+ST_WRP_MERGE = st_update e_particles e_room_fg st_common st_debug e_breakable popup warp e_red_door create_entity
 $(BUILD_DIR)/stwrp.elf: $(BUILD_DIR)/stwrp.ld $(addprefix $(BUILD_DIR)/src/st/wrp/,$(addsuffix .c.o,$(ST_WRP_MERGE))) $$(call list_o_files_psp,st/wrp_psp) $(BUILD_DIR)/assets/st/wrp/mwo_header.bin.o
 	$(call link_with_deadstrip,stwrp,$@)
 

config/splat.pspeu.stst0.yaml

@@ -58,7 +58,7 @@ segments:
       - [0xFD18, c, st0_psp/st_debug]
       - [0xFDF8, c, st0_psp/2A218]
       - [0x10678, c, st0/e_lock_camera]
-      - [0x10A00, c, st0_psp/create_entity]
+      - [0x10A00, c, st0/create_entity]
       - [0x119A8, c, st0/e_red_door]
       - [0x12CB0, c, st0/st_update]
       - [0x131E8, c, st0_psp/e_particles_maria1]
@@ -94,5 +94,7 @@ segments:
       - [0x42650, .rodata, st0/e_red_door]
       - [0x42668, .rodata, st0_psp/e_collect]
       - [0x426A0, .rodata, st0_psp/3D8F0]
-      - { type: bss, vram: 0x9279D80 }
+      - [0x42700, bss, 42700]
+      - [0x44460, .bss, st0/create_entity]
+      - [0x44480, bss, 44480]
   - [0x42700]

config/splat.pspeu.stwrp.yaml

@@ -42,7 +42,7 @@ segments:
     align: 128
     subalign: 8
     subsegments:
-      - [0x80, c, wrp_psp/create_entity]
+      - [0x80, c, wrp/create_entity]
       - [0x1028, c, wrp_psp/e_stage_name]
       - [0x1EA8, c, wrp/e_red_door]
       - [0x31B0, c, wrp/st_update]
@@ -133,7 +133,7 @@ segments:
       - [0x14498, .rodata, wrp_psp/e_collect]
       - [0x144D0, .rodata, wrp_psp/e_misc]
       - [0x144F8, .rodata, wrp/warp]
-      - [0x14500, .bss, wrp_psp/create_entity]
+      - [0x14500, .bss, wrp/create_entity]
       - [0x14520, .bss, wrp_psp/e_collect]
       - [0x14560, .bss, wrp_psp/bss]
   - [0x14580]

config/symbols.hd.dra.txt

@@ -27,7 +27,6 @@ g_PlOvlAluBatSpritesheet = 0x8013C004;
 g_PlOvlSpritesheet = 0x8013C020;
 g_imgUnk8013C200 = 0x8013C200;
 g_imgUnk8013C270 = 0x8013C270;
-g_ServantDesc = 0x80170000;
 D_8017D350 = 0x8017CF1C;
 D_8018B4E0 = 0x8018B0EC;
 D_801A9C80 = 0x801A978C;

config/symbols.pspeu.stst0.txt

@@ -143,6 +143,8 @@ g_eDamageDisplayClut = 0x09279978;
 eRoomForegroundInit = 0x092799B0;
 D_80180908 = 0x09279DA0;
 D_80180660 = 0x0927BAD8;
+g_LayoutObjPosVertical = 0x0927BAE0;
+g_LayoutObjPosHorizontal = 0x0927BAE8;
 g_LayoutObjVertical = 0x0927BAF0;
 g_LayoutObjHorizontal = 0x0927BAF8;
 g_ItemIconSlots = 0x0927BB00;

config/symbols.pspeu.txt

@@ -38,9 +38,8 @@ gte_stszotz = 0x89294B4;
 SsUtSetVVol = 0x0892F75C;
 D_psp_08B42060 = 0x08B42060;
 D_08C6BC30 = 0x08C6BC30;
-D_08C6BC34 = 0x08C6BC34;
+g_pStObjLayoutVertical = 0x08C6BC34;
 g_pStObjLayoutHorizontal = 0x08C6BC38;
-g_pStObjLayoutVertical = 0x08C6BC3C;
 g_StageId = 0x091CE5B8;
 g_unkGraphicsStruct = 0x091CE5F8;
 g_randomNext = 0x091CE6B0;

config/symbols.us.bomar.txt

@@ -1,5 +1,3 @@
-actor_names = 0x80180680;
-MAR_PrizeDrops = 0x80180744;
 bird_cage_pos_x = 0x80181280;
 bird_cage_pos_y = 0x80181284;
 statue_pos_x_1 = 0x80181288;

config/symbols.us.borbo3.txt

@@ -15,143 +15,33 @@ g_eBreakableHitboxes = 0x801805C0;
 g_eBreakableExplosionTypes = 0x801805C8;
 g_eBreakableanimSets = 0x801805D0;
 g_eBreakableDrawModes = 0x801805E0;
-RBO3_PrizeDrops = 0x801805F0;
-g_SineTable = 0x80180B54;
-aluric_subweapons_idx = 0x80180EA0;
-aluric_subweapons_id = 0x80180EB4;
-g_goldCollectTexts = 0x80180EC8;
-c_GoldPrizes = 0x80180EF0;
-g_SubweaponAnimPrizeDrop = 0x80180F18;
-D_80180EB8 = 0x80180F78;
-c_HeartPrizes = 0x80180F80;
-g_ExplosionYVelocities = 0x80180F84;
-g_bigRedFireballAnim = 0x80180FAC;
-g_ExplosionAnimations = 0x80181030;
-greyPuff_rot = 0x801810B8;
-greyPuff_yVel = 0x801810C8;
-explode_yVel = 0x801810E0;
-explode_startFrame = 0x801810F8;
-explode_lifetime = 0x801810FC;
-g_olroxDroolCollOffsets = 0x80181104;
-g_UnkEntityAnimData = 0x8018110C;
-g_UnkRecursPrimVecOrder = 0x8018111C;
-g_UnkRecursPrim2Inds = 0x8018113C;
-g_ESoulStealOrbAngles = 0x80181160;
-g_ESoulStealOrbSprt = 0x80181170;
-g_ESoulStealOrbAnim = 0x801811D0;
-eRoomForegroundInit = 0x801811F4;
 explosionVariantSizes = 0x80181BA0;
 func_801A7D64 = 0x80191080;
 EntityUnkId12 = 0x80191148;
 EntityBreakable = 0x80191304;
 EntityMedusa = 0x8019179C;
-Random = 0x80193198;
 Update = 0x801931C8;
 UpdateStageEntities = 0x801934C4;
 HitDetection = 0x801935CC;
 EntityDamageDisplay = 0x801946E4;
-CreateEntityFromLayout = 0x80194D88;
-CreateEntityWhenInVerticalRange = 0x80194E4C;
-CreateEntityWhenInHorizontalRange = 0x80194F64;
-FindFirstEntityToTheRight = 0x8019507C;
-FindFirstEntityToTheLeft = 0x801950C8;
-CreateEntitiesToTheRight = 0x80195120;
-CreateEntitiesToTheLeft = 0x8019521C;
-FindFirstEntityAbove = 0x80195330; 
-FindFirstEntityBelow = 0x8019537C;
-CreateEntitiesAbove = 0x801953D4; 
-CreateEntitiesBelow = 0x801954D0; 
 InitRoomEntities = 0x801955E4;
 UpdateRoomPosition = 0x8019575C;
-CreateEntityFromCurrentEntity = 0x80195810;
-CreateEntityFromEntity = 0x80195884;
-EntityIsNearPlayer = 0x80195900;
 RBO3_EntityRedDoor = 0x80195978;
 DestroyEntity = 0x801965B0;
-DestroyEntitiesFromIndex = 0x8019661C;
-PreventEntityFromRespawning = 0x80196698;
-AnimateEntity = 0x801966E0;
-UnkAnimFunc = 0x80196798;
-GetDistanceToPlayerX = 0x801968B0;
-GetDistanceToPlayerY = 0x801968EC;
-GetSideToPlayer = 0x80196920;
-MoveEntity = 0x80196964;
-FallEntity = 0x80196994;
-UnkCollisionFunc3 = 0x801969C0;
-UnkCollisionFunc2 = 0x80196C38;
-AllocEntity = 0x80196E20;
-GetSineScaled = 0x80196E80;
-GetSine = 0x80196EAC;
-SetEntityVelocityFromAngle = 0x80196EC8;
-Ratan2Shifted = 0x80196F34;
-GetAngleBetweenEntitiesShifted = 0x80196F6C;
-GetAnglePointToEntity = 0x80196FB4;
-AdjustValueWithinThreshold = 0x80196FFC;
-UnkEntityFunc0 = 0x80197054;
-Ratan2 = 0x801970E0;
-GetAngleBetweenEntities = 0x80197110;
-GetNormalizedAngle = 0x80197190;
-SetStep = 0x801971F0;
-SetSubStep = 0x80197210;
-EntityExplosionSpawn = 0x8019722C;
 InitializeEntity = 0x801972C0;
 EntityDummy = 0x801973BC;
-UnkCollisionFunc = 0x801973E4;
-CheckFieldCollision = 0x8019750C;
-GetPlayerCollisionWith = 0x80197664;
-ReplaceBreakableWithItemDrop = 0x801979A8;
-PrizeDropFall = 0x80197A60;
-PrizeDropFall2 = 0x80197AE4;
-CollectHeart = 0x80197C40;
-CollectGold = 0x80197CC0;
-CollectSubweapon = 0x80197D9C;
-CollectHeartVessel = 0x80197EB4;
-CollectLifeVessel = 0x80197F58;
-DestroyCurrentEntity = 0x80197FA8;
 EntityPrizeDrop = 0x80197FD0;
 EntityExplosion = 0x80198844;
-BlinkItem = 0x80198940;
 EntityEquipItemDrop = 0x801989E4;
-BlitChar = 0x80198FCC;
 EntityRelicOrb = 0x8019927C;
 EntityHeartDrop = 0x80199D4C;
 EntityMessageBox = 0x80199E68;
-CheckColliderOffsets = 0x8019A3C4;
 EntityUnkId13 = 0x8019A4B4;
-EntityExplosionVariantsSpawner = 0x8019A5C4;
-EntityGreyPuffSpawner = 0x8019A6F4;
 EntityExplosionVariants = 0x8019A7DC;
 EntityGreyPuff = 0x8019A8CC;
-EntityOlroxDrool = 0x8019A9C0;
-UnkCollisionFunc5 = 0x8019ABF0;
-UnkCollisionFunc4 = 0x8019ACEC;
 EntityIntenseExplosion = 0x8019B26C;
-InitializeUnkEntity = 0x8019B36C;
-MakeEntityFromId = 0x8019B438;
-MakeExplosions = 0x8019B500;
-EntityBigRedFireball = 0x8019B5B8;
-UnkRecursivePrimFunc1 = 0x8019B790;
-UnkRecursivePrimFunc2 = 0x8019BD70;
-ClutLerp = 0x8019C470;
-PlaySfxPositional = 0x8019C668;
-StageNamePopupHelper = 0x8019C760;
 EntityStageNamePopup = 0x8019C930;
 EntitySoulStealOrb = 0x8019D5B4;
 EntityEnemyBlood = 0x8019D948;
 EntityRoomForeground = 0x8019DDF8;
-BottomCornerText = 0x8019DEE4;
-UnkPrimHelper = 0x8019E214;
-UpdateAnimation = 0x8019E5FC;
-FindFirstUnkPrim = 0x8019E74C;
-FindFirstUnkPrim2 = 0x8019E77C;
-PrimToggleVisibility = 0x8019E7F8;
-PrimResetNext = 0x8019E880;
-UnkPolyFunc2 = 0x8019E960;
-UnkPolyFunc0 = 0x8019E9B4;
-PrimDecreaseBrightness = 0x8019E9E0;
 EntityLifeUpSpawn = 0x8019EA44;
-g_LayoutObjHorizontal = 0x8019F978;
-g_LayoutObjVertical = 0x8019F97C;
-g_LayoutObjPosHorizontal = 0x8019F980;
-g_LayoutObjPosVertical = 0x8019F984;
-g_ItemIconSlots = 0x801A05F0;

config/symbols.us.dra.txt

@@ -11,5 +11,4 @@ g_PlOvlAluBatSpritesheet = 0x8013C004;
 g_PlOvlSpritesheet = 0x8013C020;
 g_imgUnk8013C200 = 0x8013C200;
 g_imgUnk8013C270 = 0x8013C270;
-g_ServantDesc = 0x80170000;
 g_StageOverlay = 0x80180000;

config/symbols.us.stcen.txt

@@ -1,9 +0,0 @@
-D_80181658 = 0x80181658;
-D_8018199C = 0x8018199C;
-D_80183A40 = 0x80183A40;
-D_80184B70 = 0x80184B70;
-D_80185830 = 0x80185830;
-CEN_EntityRedDoor = 0x8019362C;
-EntityPrizeDrop = 0x80195C84;
-EntityEquipItemDrop = 0x80196698;
-EntityStageNamePopup = 0x8019A5F0;

config/symbols.us.stdre.txt

@@ -1,4 +1,3 @@
-DRE_gfxBanks = 0x801801D0;
 DRE_EntityUpdates = 0x801803C8;
 DRE_EInitBreakable = 0x80180458;
 g_EInitObtainable = 0x80180464;