Document villa furniture

generated/meson.build

@@ -117,7 +117,7 @@ metang_generators = {
     'tutor_locations': {'type': 'enum', 'tag': 'TutorLocation'},
     'vars_flags': {'type': 'enum', 'tag': 'VarFlag'},
     'versions': {'type': 'enum', 'tag': 'Version'},
-    'villa_furnitures': {'type': 'enum', 'tag': 'VillaFurniture'},
+    'villa_furniture_type': {'type': 'enum', 'tag': 'VillaFurnitureType'},
     'mart_specialties_id': {'type': 'enum', 'tag': 'MartSpecialtiesID'},
     'mart_decor_id': {'type': 'enum', 'tag': 'MartDecorID'},
     'mart_seal_id': {'type': 'enum', 'tag': 'MartSealID'},

include/map_object.h

@@ -25,7 +25,8 @@
 #include "narc.h"
 #include "sys_task_manager.h"
 
-#define MAP_OBJECT_COORD_TO_FX32(coord) ((coord << 4) * FX32_ONE) + (MAP_OBJECT_TILE_SIZE >> 1)
+#define MAP_OBJECT_COORD_CENTER_TO_FX32(coord) ((coord << 4) * FX32_ONE) + (MAP_OBJECT_TILE_SIZE >> 1)
+#define MAP_OBJECT_COORD_EDGE_TO_FX32(coord)   ((coord << 4) * FX32_ONE)
 
 typedef struct MapObjectSave {
     u32 status;

include/overlay005/villa_furniture.h

@@ -0,0 +1,15 @@
+#ifndef POKEPLATINUM_VILLA_FURNITURE_H
+#define POKEPLATINUM_VILLA_FURNITURE_H
+
+#include "field/field_system_decl.h"
+
+typedef struct VillaPersistedData {
+    int dummy;
+} VillaPersistedData;
+
+void Villa_DynamicMapFeaturesInit(FieldSystem *fieldSystem);
+void Villa_DynamicMapFeaturesFree(FieldSystem *fieldSystem);
+BOOL Villa_DynamicMapFeaturesCheckCollision(FieldSystem *fieldSystem, const int tileX, const int tileZ, const fx32 height, BOOL *isColliding);
+BOOL FieldSystem_TrySetVillaFurnitureScript(FieldSystem *fieldSystem, const int param1, const int param2, const int direction);
+
+#endif // POKEPLATINUM_VILLA_FURNITURE_H

include/system_flags.h

@@ -6,7 +6,7 @@
 #include "generated/giratina_shadow_animations.h"
 #include "generated/map_headers.h"
 #include "generated/pokemon_contest_types.h"
-#include "generated/villa_furnitures.h"
+#include "generated/villa_furniture_type.h"
 
 #include "vars_flags.h"
 
@@ -67,7 +67,7 @@ BOOL SystemFlag_HandleForceBikingInGate(VarsFlags *varsFlags, enum HandleFlagOp
 BOOL SystemFlag_HandleJournalAcquired(VarsFlags *varsFlags, enum HandleFlagOp op);
 BOOL SystemFlag_HandleFirstArrivalToZone(VarsFlags *varsFlags, enum HandleFlagOp op, u32 firstArrival);
 void SystemFlag_SetConnectedToWiFi(VarsFlags *varsFlags);
-BOOL SystemFlag_HandleOwnsVillaFurniture(VarsFlags *varsFlags, enum HandleFlagOp op, enum VillaFurniture furniture);
+BOOL SystemFlag_HandleOwnsVillaFurniture(VarsFlags *varsFlags, enum HandleFlagOp op, enum VillaFurnitureType furniture);
 void SystemFlag_ClearVillaVisitorInside(VarsFlags *varsFlags);
 void SystemFlag_ClearVillaVisitorOutside(VarsFlags *varsFlags);
 BOOL SystemFlag_HandleGiratinaAnimation(VarsFlags *varsFlags, enum HandleFlagOp op, enum GiratinaShadowAnimation anim);

platinum.us/main.lsf

@@ -552,7 +552,7 @@ Overlay overlay5
 	Object main.nef.p/src_overlay005_ov5_021F61BC.c.o
 	Object main.nef.p/src_overlay005_ov5_021F6454.c.o
 	Object main.nef.p/src_overlay005_scrcmd_move_tutor.c.o
-	Object main.nef.p/src_overlay005_ov5_021F8370.c.o
+	Object main.nef.p/src_overlay005_villa_furniture.c.o
 	Object main.nef.p/src_overlay005_dist_world_surf_mount_renderer.c.o
 }
 

res/field/props/model_sets/prop_model_set_047.json

@@ -1,25 +1,25 @@
 {
     "mapPropModels": [
         "prop_model_078_nsbmd",
-        "prop_model_559_nsbmd",
-        "prop_model_560_nsbmd",
-        "prop_model_561_nsbmd",
-        "prop_model_562_nsbmd",
-        "prop_model_563_nsbmd",
-        "prop_model_564_nsbmd",
-        "prop_model_565_nsbmd",
-        "prop_model_566_nsbmd",
-        "prop_model_567_nsbmd",
-        "prop_model_568_nsbmd",
-        "prop_model_569_nsbmd",
-        "prop_model_570_nsbmd",
-        "prop_model_571_nsbmd",
-        "prop_model_572_nsbmd",
-        "prop_model_573_nsbmd",
-        "prop_model_574_nsbmd",
-        "prop_model_575_nsbmd",
-        "prop_model_576_nsbmd",
-        "prop_model_577_nsbmd",
-        "prop_model_578_nsbmd"
+        "villa_furniture_table_nsbmd",
+        "villa_furniture_big_sofa_nsbmd",
+        "villa_furniture_small_sofa_nsbmd",
+        "villa_furniture_bed_nsbmd",
+        "villa_furniture_night_table_nsbmd",
+        "villa_furniture_tv_nsbmd",
+        "villa_furniture_audio_system_nsbmd",
+        "villa_furniture_bookshelf_nsbmd",
+        "villa_furniture_rack_nsbmd",
+        "villa_furniture_houseplant_nsbmd",
+        "villa_furniture_pc_desk_nsbmd",
+        "villa_furniture_music_box_nsbmd",
+        "villa_furniture_pokemon_bust_nsbmd",
+        "villa_furniture_pokemon_bust_silver_nsbmd",
+        "villa_furniture_piano_nsbmd",
+        "villa_furniture_guest_set_nsbmd",
+        "villa_furniture_wall_clock_nsbmd",
+        "villa_furniture_masterpiece_nsbmd",
+        "villa_furniture_tea_set_nsbmd",
+        "villa_furniture_chandelier_nsbmd"
     ]
 }

res/field/props/models/map_prop_models.order

@@ -557,26 +557,26 @@ prop_model_555.nsbmd
 prop_model_556.nsbmd
 prop_model_557.nsbmd
 prop_model_558.nsbmd
-prop_model_559.nsbmd
-prop_model_560.nsbmd
-prop_model_561.nsbmd
-prop_model_562.nsbmd
-prop_model_563.nsbmd
-prop_model_564.nsbmd
-prop_model_565.nsbmd
-prop_model_566.nsbmd
-prop_model_567.nsbmd
-prop_model_568.nsbmd
-prop_model_569.nsbmd
-prop_model_570.nsbmd
-prop_model_571.nsbmd
-prop_model_572.nsbmd
-prop_model_573.nsbmd
-prop_model_574.nsbmd
-prop_model_575.nsbmd
-prop_model_576.nsbmd
-prop_model_577.nsbmd
-prop_model_578.nsbmd
+villa_furniture_table.nsbmd
+villa_furniture_big_sofa.nsbmd
+villa_furniture_small_sofa.nsbmd
+villa_furniture_bed.nsbmd
+villa_furniture_night_table.nsbmd
+villa_furniture_tv.nsbmd
+villa_furniture_audio_system.nsbmd
+villa_furniture_bookshelf.nsbmd
+villa_furniture_rack.nsbmd
+villa_furniture_houseplant.nsbmd
+villa_furniture_pc_desk.nsbmd
+villa_furniture_music_box.nsbmd
+villa_furniture_pokemon_bust.nsbmd
+villa_furniture_pokemon_bust_silver.nsbmd
+villa_furniture_piano.nsbmd
+villa_furniture_guest_set.nsbmd
+villa_furniture_wall_clock.nsbmd
+villa_furniture_masterpiece.nsbmd
+villa_furniture_tea_set.nsbmd
+villa_furniture_chandelier.nsbmd
 prop_model_579.nsbmd
 prop_model_580.nsbmd
 prop_model_581.nsbmd

res/field/props/models/meson.build

@@ -558,26 +558,26 @@ map_prop_model_files = copy_gen.process(files(
     'prop_model_556.nsbmd',
     'prop_model_557.nsbmd',
     'prop_model_558.nsbmd',
-    'prop_model_559.nsbmd',
-    'prop_model_560.nsbmd',
-    'prop_model_561.nsbmd',
-    'prop_model_562.nsbmd',
-    'prop_model_563.nsbmd',
-    'prop_model_564.nsbmd',
-    'prop_model_565.nsbmd',
-    'prop_model_566.nsbmd',
-    'prop_model_567.nsbmd',
-    'prop_model_568.nsbmd',
-    'prop_model_569.nsbmd',
-    'prop_model_570.nsbmd',
-    'prop_model_571.nsbmd',
-    'prop_model_572.nsbmd',
-    'prop_model_573.nsbmd',
-    'prop_model_574.nsbmd',
-    'prop_model_575.nsbmd',
-    'prop_model_576.nsbmd',
-    'prop_model_577.nsbmd',
-    'prop_model_578.nsbmd',
+    'villa_furniture_table.nsbmd',
+    'villa_furniture_big_sofa.nsbmd',
+    'villa_furniture_small_sofa.nsbmd',
+    'villa_furniture_bed.nsbmd',
+    'villa_furniture_night_table.nsbmd',
+    'villa_furniture_tv.nsbmd',
+    'villa_furniture_audio_system.nsbmd',
+    'villa_furniture_bookshelf.nsbmd',
+    'villa_furniture_rack.nsbmd',
+    'villa_furniture_houseplant.nsbmd',
+    'villa_furniture_pc_desk.nsbmd',
+    'villa_furniture_music_box.nsbmd',
+    'villa_furniture_pokemon_bust.nsbmd',
+    'villa_furniture_pokemon_bust_silver.nsbmd',
+    'villa_furniture_piano.nsbmd',
+    'villa_furniture_guest_set.nsbmd',
+    'villa_furniture_wall_clock.nsbmd',
+    'villa_furniture_masterpiece.nsbmd',
+    'villa_furniture_tea_set.nsbmd',
+    'villa_furniture_chandelier.nsbmd',
     'prop_model_579.nsbmd',
     'prop_model_580.nsbmd',
     'prop_model_581.nsbmd',