From 399b690b591f694fc05f350a6b8afeb5fd01fb3c Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Sun, 19 Jan 2025 08:05:20 +0100 Subject: [PATCH] defs: Move .section to their proper locations --- src/defs.s | 1 - src/main.s | 4 +--- src/mapram.s | 3 +-- src/oam.s | 2 -- src/wram.s | 3 +-- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/defs.s b/src/defs.s index 6013798..daae301 100644 --- a/src/defs.s +++ b/src/defs.s @@ -1,3 +1,2 @@ ; This file contains struct defintions -.section structs diff --git a/src/main.s b/src/main.s index 98b16aa..9db5668 100644 --- a/src/main.s +++ b/src/main.s @@ -7,14 +7,12 @@ #include "hram.s" #include "sram.s" -.section boot - .org 0x0 +.section prgrom #include "jmp.inc" .fill 0, 0x100 - $ #include "header.inc" -.section prgrom entry: ld sp, STACK_BEGIN diff --git a/src/mapram.s b/src/mapram.s index 4c9ad87..7593b79 100644 --- a/src/mapram.s +++ b/src/mapram.s @@ -1,9 +1,8 @@ -.section wram - #define MAPRAM 0xD000 ; this RAM bank stores the current map .org MAPRAM +.section wram ; first map map0: .adv roomb_size * ROOMS_TOTAL diff --git a/src/oam.s b/src/oam.s index 287bf25..b71df91 100644 --- a/src/oam.s +++ b/src/oam.s @@ -1,5 +1,3 @@ -.section oamdef - ; oam memory layout .se 0 .de oamy, 1 diff --git a/src/wram.s b/src/wram.s index 9260436..95ede26 100644 --- a/src/wram.s +++ b/src/wram.s @@ -1,11 +1,10 @@ -.section wram - #define WRAM 0xC000 #define WRAMLEN 0xFFF #define STACK_BEGIN 0xDFFF .org WRAM +.section wram .def int OAMDMAFN = 0xFF80 -- 2.30.2