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

Move OverworldCustomASM constants to overworld_map.h

Browse Source
This commit is contained in:
scawful
2024-08-25 16:39:50 -04:00
parent eda3c4f5ef
commit dafeff2be7
2 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/zelda3/overworld/overworld.h
View File

@@ -440,38 +440,6 @@ constexpr int transition_target_west = 0x13F62;
constexpr int overworldCustomMosaicASM = 0x1301D0; constexpr int overworldCustomMosaicASM = 0x1301D0;
constexpr int overworldCustomMosaicArray = 0x1301F0; constexpr int overworldCustomMosaicArray = 0x1301F0;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomASMHasBeenApplied = 0x140145;
// 2 bytes for each overworld area (0x140)
constexpr int OverworldCustomAreaSpecificBGPalette = 0x140000;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomAreaSpecificBGEnabled = 0x140140;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomMainPaletteArray = 0x140160;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomMainPaletteEnabled = 0x140141;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomMosaicArray = 0x140200;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomMosaicEnabled = 0x140142;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomAnimatedGFXArray = 0x1402A0;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomAnimatedGFXEnabled = 0x140143;
// 2 bytes for each overworld area (0x140)
constexpr int OverworldCustomSubscreenOverlayArray = 0x140340;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomSubscreenOverlayEnabled = 0x140144;
constexpr int kMap16Tiles = 0x78000; constexpr int kMap16Tiles = 0x78000;
constexpr int kNumOverworldMaps = 160; constexpr int kNumOverworldMaps = 160;
constexpr int Map32PerScreen = 256; constexpr int Map32PerScreen = 256;

39
src/app/zelda3/overworld/overworld_map.h
View File

@@ -8,7 +8,6 @@
#include <vector> #include <vector>
#include "absl/status/status.h" #include "absl/status/status.h"
#include "app/editor/utils/gfx_context.h" #include "app/editor/utils/gfx_context.h"
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
@@ -24,6 +23,44 @@ namespace overworld {
static constexpr int kTileOffsets[] = {0, 8, 4096, 4104}; static constexpr int kTileOffsets[] = {0, 8, 4096, 4104};
// 1 byte, not 0 if enabled
constexpr int OverworldCustomASMHasBeenApplied = 0x140145;
// 2 bytes for each overworld area (0x140)
constexpr int OverworldCustomAreaSpecificBGPalette = 0x140000;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomAreaSpecificBGEnabled = 0x140140;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomMainPaletteArray = 0x140160;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomMainPaletteEnabled = 0x140141;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomMosaicArray = 0x140200;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomMosaicEnabled = 0x140142;
// 1 byte for each overworld area (0xA0)
constexpr int OverworldCustomAnimatedGFXArray = 0x1402A0;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomAnimatedGFXEnabled = 0x140143;
// 2 bytes for each overworld area (0x140)
constexpr int OverworldCustomSubscreenOverlayArray = 0x140340;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomSubscreenOverlayEnabled = 0x140144;
// 8 bytes for each overworld area (0x500)
constexpr int OverworldCustomTileGFXGroupArray = 0x140480;
// 1 byte, not 0 if enabled
constexpr int OverworldCustomTileGFXGroupEnabled = 0x140148;
/** /**
* @brief Represents a single Overworld map screen. * @brief Represents a single Overworld map screen.
*/ */