From 6d55487ac33ccbdd89ef1f3bbdc197e0d9fab56c Mon Sep 17 00:00:00 2001
From: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
Date: Fri, 6 Oct 2023 07:03:29 -0300
Subject: [PATCH] makerom and main

---
 yamls/us/main.yaml    |  2 +-
 yamls/us/makerom.yaml | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/yamls/us/main.yaml b/yamls/us/main.yaml
index 6141774e..798b6f4e 100644
--- a/yamls/us/main.yaml
+++ b/yamls/us/main.yaml
@@ -1,8 +1,8 @@
   - name: main
     type: code
+    dir: main
     start: 0x1050
     vram: 0x80000450
-    follows_vram: entry
     bss_size: 0x9B1F0
     subsegments:
       - [0x1050, bin]
diff --git a/yamls/us/makerom.yaml b/yamls/us/makerom.yaml
index 9418ad32..33f73a51 100644
--- a/yamls/us/makerom.yaml
+++ b/yamls/us/makerom.yaml
@@ -1,14 +1,10 @@
-  - name: header
-    type: header
-    start: 0x0
-
-  - name: boot
-    type: bin
-    start: 0x40
-
-  - name: entry
+  - name: makerom
     type: code
-    start: 0x1000
-    vram: 0x80000400
+    start: 0x0
     subsegments:
-      - [0x1000, asm]
+      - [0x000000, header, makerom/header]
+      - [0x000040, bin, makerom/ipl3]
+      - start: 0x001000
+        type: hasm
+        name: makerom/entry
+        vram: 0x80000400