scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move object names, start RoomObject Subtypes

Browse Source
This commit is contained in:
scawful
2023-08-19 02:09:37 -04:00
parent a5f1a23de8
commit c25be2b76d
5 changed files with 547 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/zelda3/dungeon/room.h
View File

@@ -23,26 +23,6 @@ namespace dungeon {
constexpr int entrance_gfx_group = 0x5D97;
constexpr int gfx_animated_pointer = 0x10275; // JP 0x10624 //long pointer
class DungeonDestination {
public:
DungeonDestination(uint8_t i) : Index(i) {}
uint8_t Index;
uint8_t Target = 0;
uint8_t TargetLayer = 0;
// RoomObject* AssociatedObject = nullptr;
// bool IsAssociated() { return AssociatedObject != nullptr; }
// int RealX() { return AssociatedObject ? AssociatedObject->RealX : 0; }
// int RealY() { return AssociatedObject ? AssociatedObject->RealY : 0; }
std::string ToString() {
return std::to_string(Index) + ": To " + std::to_string(Target);
}
};
constexpr int dungeons_palettes_groups = 0x75460; // JP 0x67DD0
constexpr int dungeons_main_bg_palette_pointers = 0xDEC4B; // JP Same
constexpr int dungeons_palettes = 0xDD734;
@@ -98,6 +78,16 @@ void DrawDungeonRoomBG2(std::vector<uint8_t>& tiles_bg2_buffer,
std::vector<uint8_t>& current_gfx16,
std::vector<uint8_t>& room_bg2_ptr);
class DungeonDestination {
public:
DungeonDestination(uint8_t i) : Index(i) {}
uint8_t Index;
uint8_t Target = 0;
uint8_t TargetLayer = 0;
// RoomObject* AssociatedObject = nullptr;
};
struct object_door {
object_door(short id, uint8_t x, uint8_t y, uint8_t size, uint8_t layer)
: id_(id), x_(x), y_(y), size_(size), layer_(layer) {}