Skip to content

Some SA1 and SA2 alignment #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JaceCear merged 6 commits into from
Sep 29, 2025
Merged

Some SA1 and SA2 alignment #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b128517
Align types.h with SA1
JaceCear Sep 23, 2025
f191740
Finish aligning sprite.c with SA1, except for Hitbox.b cases
JaceCear Sep 23, 2025
1ce0b2e
More alignment of SA1 and SA2
JaceCear Sep 23, 2025
f52aceb
Move set registers to the top because of headless TAS testing
JaceCear Sep 23, 2025
96efabd
Fix erroneously edited indices
JaceCear Sep 24, 2025
4e16bd3
Merge branch 'main' into new_sa1_sa2_align
JaceCear Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 asm/non_matching/engine/unused_transform.inc → asm/non_matching/engine/UnusedTransform.inc
View file
Open in desktop
File renamed without changes.
0 asm/non_matching/engine/sub_8004E14.inc → asm/non_matching/engine/sa2__sub_8004E14.inc
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion include/gba/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ extern uint8_t OAM[OAM_SIZE];

#define BG_VRAM VRAM
#define BG_CHAR_ADDR(n) (BG_VRAM + ((n) << 14))
#define BG_CHAR_ADDR_FROM_BGCNT(bg) (BG_VRAM + ((gBgCntRegs[bg] & BGCNT_CHARBASE(0x3)) << 12))
#define BG_CHAR_ADDR_FROM_BGCNT(bg) ((u8*)BG_VRAM + ((gBgCntRegs[bg] & BGCNT_CHARBASE(0x3)) << 12))
// TODO: Maybe rename BG_SCREEN_ADDR
#define BG_SCREEN_ADDR(n) (BG_VRAM + (0x800 * (n)))
#define BG_TILE_ADDR(n) (BG_VRAM + (0x80 * (n)))
Expand Down
5 changes: 2 additions & 3 deletions include/gba/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#ifndef GUARD_GBA_TYPES_H
#define GUARD_GBA_TYPES_H

#include "gba/defines.h"
#include "gba/defines.h" // for int_vcount (TODO)

#ifndef GEN_CTX
#if !GEN_CTX
#include <stdint.h>
#endif

Expand All @@ -20,7 +20,6 @@
typedef struct __attribute__((packed)) name struct_body name;
#endif


typedef uint8_t u8;
typedef uint16_t u16;
typedef uint32_t u32;
Expand Down
1 change: 1 addition & 0 deletions src/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ static void ClearOamBufferDma(void)
DmaFill16(3, 0x200, gOamBuffer + (OAM_ENTRY_COUNT / 4) * 1, OAM_SIZE / 4);
DmaFill16(3, 0x200, gOamBuffer + (OAM_ENTRY_COUNT / 4) * 2, OAM_SIZE / 4);
DmaFill16(3, 0x200, gOamBuffer + (OAM_ENTRY_COUNT / 4) * 3, OAM_SIZE / 4);

gNumVBlankCallbacks = 0;
gFlags &= ~FLAGS_10;
}
Expand Down
4 changes: 2 additions & 2 deletions src/game/sa1_sa2_shared/rings_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ NONMATCH("asm/non_matching/game/sa1_sa2_shared/Task_RingsMgrMain_collect_rings.i

DmaCopy16(3, oamDat, oamAllocated, sizeof(OamDataShort));

// TODO: Can these be done more explicitly?
#if !EXTENDED_OAM
// TODO: Can these be done more explicitly?
oamAllocated->all.attr1 &= 0xFE00;
oamAllocated->all.attr0 &= 0xFF00;
oamAllocated->all.attr0 += ((ry - gCamera.y) - dimensions->offsetY) & 0xFF;
Expand Down Expand Up @@ -437,8 +437,8 @@ NONMATCH("asm/non_matching/game/sa1_sa2_shared/Task_RingsMgrMain_collect_rings.i

DmaCopy16(3, oamDat, oamAllocated, sizeof(OamDataShort));

// TODO: Can these be done more explicitly?
#if !EXTENDED_OAM
// TODO: Can these be done more explicitly?
oamAllocated->all.attr1 &= 0xFE00;
oamAllocated->all.attr0 &= 0xFF00;
oamAllocated->all.attr0 += ((ry - gCamera.y) - dimensions->offsetY) & 0xFF;
Expand Down
2 changes: 1 addition & 1 deletion src/platform/pret_sdl/sdl2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,4 +1950,4 @@ u16 Sqrt(u32 num)
return bound;
}

int MultiBoot(struct MultiBootParam *mp) { return 0; }
int MultiBoot(struct MultiBootParam *mp) { return 0; }
Loading
Loading