github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add color index array for VRAM viewer. Various documentation and bug fixes. (#156)

Browse Source 
* Add a color buffer for VRAM view

* Fix graphics not being processes in-time

* Progress on sub_8002B20

* Some more sub_8002B20 matching

* Remove constants in on-screen checks

* Some documentation and cleanup

* Win-Range and screen range documentation

* Fix nullpointer dereference in water_effects.c

* Rename STAGE_FLAG__4 -> STAGE_FLAG__TIMER_REVERSED

* Rename MapHeader.h -> MapHeader.tileset. Use Tilemap* for gTilemaps and gTilemapsRef

* Rename some camera background flags for accuracy

* BACKGROUND_DONT_UPDATE_TILESET and BACKGROUND_DONT_UPDATE_PALETTE -> BACKGROUND_DISABLE_TILESET_UPDATE and BACKGROUND_DISABLE_PALETTE_UPDATE

* Fix Note Blocks not spawning

* Use (DISPLAY_HEIGHT - 1) in Hot Crater's BG code

* Temp hack for Magnet Shield softlocking

* Some bgmap cleanup, fixes and documentation

* Remove invalid scratch link

* Rename Sprite.timeUntilNextFrame -> .qAnimDelay
This commit is contained in:
JaceCear authored and GitHub committed 2024-10-01 11:11:19 +02:00
1 parent 8d3dc36b97
commit 55a59adbf9
164 files changed
+922 -797
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/maps/zone_1/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_1_act_1_fg1[] = INCBIN_U16("data/maps/zone_1/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_1/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_1_act_2_fg1[] = INCBIN_U16("data/maps/zone_1/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_1/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_1_act_boss_fg1[] = INCBIN_U16("data/maps/zone_1/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_1/act_dummy/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_1_act_dummy_fg1[] = INCBIN_U16("data/maps/zone_1/act_dummy/ti
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_1_act_dummy_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_2/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_2_act_1_fg1[] = INCBIN_U16("data/maps/zone_2/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_2/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_2_act_2_fg1[] = INCBIN_U16("data/maps/zone_2/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_2/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_2_act_boss_fg1[] = INCBIN_U16("data/maps/zone_2/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_2_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_3/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_3_act_1_fg1[] = INCBIN_U16("data/maps/zone_3/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 256,
@@ -35,7 +35,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 256,
data/maps/zone_3/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_3_act_2_fg1[] = INCBIN_U16("data/maps/zone_3/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 256,
@@ -35,7 +35,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 256,
data/maps/zone_3/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_3_act_boss_fg1[] = INCBIN_U16("data/maps/zone_3/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_3_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_4/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_4_act_1_fg1[] = INCBIN_U16("data/maps/zone_4/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_4/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_4_act_2_fg1[] = INCBIN_U16("data/maps/zone_4/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_4/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_4_act_boss_fg1[] = INCBIN_U16("data/maps/zone_4/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_4_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_5/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_5_act_1_fg1[] = INCBIN_U16("data/maps/zone_5/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_5/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_5_act_2_fg1[] = INCBIN_U16("data/maps/zone_5/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_5/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_5_act_boss_fg1[] = INCBIN_U16("data/maps/zone_5/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_5_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_6/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_6_act_1_fg1[] = INCBIN_U16("data/maps/zone_6/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
@@ -35,7 +35,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
data/maps/zone_6/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_6_act_2_fg1[] = INCBIN_U16("data/maps/zone_6/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
@@ -35,7 +35,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
data/maps/zone_6/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_6_act_boss_fg1[] = INCBIN_U16("data/maps/zone_6/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
@@ -35,7 +35,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_6_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 800,
data/maps/zone_7/act_1/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_7_act_1_fg1[] = INCBIN_U16("data/maps/zone_7/act_1/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_1_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_7/act_2/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_7_act_2_fg1[] = INCBIN_U16("data/maps/zone_7/act_2/tilemaps/f
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_2_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_7/act_boss/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_7_act_boss_fg1[] = INCBIN_U16("data/maps/zone_7/act_boss/tile
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_7_act_boss_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_final/act_ta53/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_final_act_ta53_fg1[] = INCBIN_U16("data/maps/zone_final/act_t
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_ta53_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_final/act_unused/tilemaps/fg/header.c
+2 -2
View File
@@ -15,7 +15,7 @@ const u16 Map_zone_final_act_unused_fg1[] = INCBIN_U16("data/maps/zone_final/act
// = 0x08933538
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -36,7 +36,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg0 =
// = 0x0893355C
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_unused_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
data/maps/zone_final/act_xx/tilemaps/fg/header.c
+2 -2
View File
@@ -14,7 +14,7 @@ const u16 Map_zone_final_act_xx_fg1[] = INCBIN_U16("data/maps/zone_final/act_xx/
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg0 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,
@@ -34,7 +34,7 @@ ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg0 =
ALIGNED(4) const struct MapHeader MapHeader_zone_final_act_xx_fg1 =
{
.h = {
.tileset = {
.xTiles = 12,
.yTiles = 12,
.animTileSize = 0,