Merge branch 'master' into rbo3-decomp

config/splat.us.bomar.yaml

@@ -35,7 +35,7 @@ segments:
  - name: bomar
  type: code
  start: 0
- vram:  0x80180000
+ vram: 0x80180000
  align: 4
  subalign: 4
  subsegments:
@@ -58,7 +58,7 @@ segments:
  - [0x1058, .data, e_misc]
  - [0x1174, .data, e_particles]
  - [0x11F4, .data, e_room_fg]
- - [0x1280, data] # 17FEC
+ - [0x1280, data, clock_room]
  - [0x12EC, .data, rooms]
  - [0x1308, .data, e_life_up]
  - [0x135C, .data, e_layout] # layout entries data
@@ -77,7 +77,7 @@ segments:
  - [0xAAC8, .rodata, e_collect]
  - [0xAB50, .rodata, e_misc]
  - [0xAB9C, .rodata, e_stage_name]
- - [0xABD0, .rodata, 17FEC]
+ - [0xABD0, .rodata, clock_room]
  - [0xABE8, .rodata, prim_helpers]
  - [0xABF0, .rodata, e_life_up]
  - [0xAC0C, c, st_debug]
@@ -96,7 +96,7 @@ segments:
  - [0x1738C, c, e_particles]
  - [0x17BD0, c, e_room_fg]
  - [0x17CBC, c, popup]
- - [0x17FEC, c]
+ - [0x17FEC, c, clock_room]
  - [0x1911C, c, prim_helpers]
  - [0x1994C, c, e_life_up]
  - [0x1A200, .bss, unk]

config/splat.us.stno0.yaml

@@ -54,6 +54,8 @@ segments:
  - [0x184C, .data, e_collect]
  - [0x1B3C, .data, e_misc]
  - [0x1C14, data]
+ - [0x1C34, data, clock_room]
+ - [0x1CA0, data]
  - [0x2478, .data, e_axe_knight]
  - [0x25CC, data]
  - [0x2680, .data, e_skeleton]
@@ -63,7 +65,8 @@ segments:
  - [0x4137C, .rodata, e_red_door]
  - [0x41394, .rodata, e_collect]
  - [0x4141C, .rodata, e_misc]
- - [0x41468, .rodata, 4C750]
+ - [0x41468, .rodata, clock_room]
+ - [0x414A8, .rodata, 4C750]
  - [0x414B8, .rodata, e_stage_name]
  - [0x414EC, .rodata, unk_4F4A8]
  - [0x4178C, .rodata, e_axe_knight]
@@ -86,6 +89,8 @@ segments:
  - [0x4A21C, c, blit_char]
  - [0x4A4CC, c, e_misc]
  - [0x4C750, c]
+ - [0x4CAAC, c, clock_room]
+ - [0x4E2E0, c]
  - [0x4E654, c, e_stage_name]
  - [0x4F4A8, c, unk_4F4A8]
  - [0x5AEBC, c, e_axe_knight]

config/symbols.us.bomar.txt

@@ -1,3 +1,14 @@
 actor_names = 0x80180680;
 MAR_PrizeDrops = 0x80180744;
+bird_cage_pos_x = 0x80181280;
+bird_cage_pos_y = 0x80181284;
+statue_pos_x_1 = 0x80181288;
+statue_pos_x_2 = 0x8018128C;
+gear_pos_x = 0x80181290;
+stone_door_pos_x_1 = 0x80181294;
+stone_door_pos_x_2 = 0x80181298;
+statue_pos_x_3 = 0x801812A0;
+anim_bird_cage = 0x801812A8;
+anim_gear_1 = 0x801812C4;
+anim_gear_2 = 0x801812D0;
 g_StoneDoorTiles = 0x801812DC;

config/symbols.us.stno0.txt

@@ -53,6 +53,17 @@ explode_startFrame = 0x80181BF0;
 explode_lifetime = 0x80181BF4;
 g_olroxDroolCollOffsets = 0x80181BFC;
 g_UnkEntityAnimData = 0x80181C04;
+bird_cage_pos_x = 0x80181C34;
+bird_cage_pos_y = 0x80181C38;
+statue_pos_x_1 = 0x80181C3C;
+statue_pos_x_2 = 0x80181C40;
+gear_pos_x = 0x80181C44;
+stone_door_pos_x_1 = 0x80181C48;
+stone_door_pos_x_2 = 0x80181C4C;
+statue_pos_x_3 = 0x80181C54;
+anim_bird_cage = 0x80181C5C;
+anim_gear_1 = 0x80181C78;
+anim_gear_2 = 0x80181C84;
 g_StoneDoorTiles = 0x80181C90;
 anim_bone_rot = 0x801821DC;
 steps = 0x801825AC;
@@ -157,7 +168,14 @@ MakeExplosions = 0x801CC1D0;
 EntityBigRedFireball = 0x801CC288;
 ClutLerp = 0x801CC460;
 PlaySfxPositional = 0x801CC658;
+EntityClockHands = 0x801CD750;
+EntityBirdcageDoor = 0x801CD864;
 UpdateStatueTiles = 0x801CDAD4;
+EntityStatue = 0x801CDB20;
+EntityStatueGear = 0x801CDE48;
+UpdateStoneDoorTiles = 0x801CE058;
+EntityStoneDoor = 0x801CE0F8;
+EntityClockRoomUnused = 0x801CE2D8;
 StageNamePopupHelper = 0x801CE654;
 EntityStageNamePopup = 0x801CE824;
 func_801CD78C = 0x801D2374;
@@ -186,4 +204,5 @@ g_LayoutObjHorizontal = 0x801DE8CC;
 g_LayoutObjVertical = 0x801DE8D0;
 g_LayoutObjPosHorizontal = 0x801DE8D4;
 g_LayoutObjPosVertical = 0x801DE8D8;
+g_Statues = 0x801DF548;
 g_ItemIconSlots = 0x801DF54C;