From 6e8f5dd1345b4703cbd809736760c84be4fd8fa9 Mon Sep 17 00:00:00 2001 From: Skeli Date: Fri, 14 Jun 2019 11:45:33 -0400 Subject: [PATCH] Update Make Script For Merge --- linker.ld | 2 +- scripts/insert.py | 4 ++-- scripts/make.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linker.ld b/linker.ld index be27e7d..6ad0361 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x18d9580), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x1800000), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/scripts/insert.py b/scripts/insert.py index 78352e6..1b0ec71 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -8,8 +8,8 @@ import binascii import textwrap import sys -OFFSET_TO_PUT = 0x18d9580 -SOURCE_ROM = "Pokemon Unbound.gba" +OFFSET_TO_PUT = 0x1800000 +SOURCE_ROM = "BPRE0.gba" from datetime import datetime diff --git a/scripts/make.py b/scripts/make.py index 10f0212..36564ba 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -8,8 +8,8 @@ import os #Options go here. ############ -ROM_NAME = "Pokemon Unbound.gba" #The name of your rom -OFFSET_TO_PUT = 0x18D9580 +ROM_NAME = "BPRE0.gba" #The name of your rom +OFFSET_TO_PUT = 0x1800000 SEARCH_FREE_SPACE = False #Set to True if you want the script to search for free space;Set to False if you don't want to search for free space as you for example update the engine #############