From 164e1b89afc1773a14598c377c8c8d0bfa01a1a1 Mon Sep 17 00:00:00 2001 From: Rangi Date: Fri, 17 Apr 2020 11:02:29 -0400 Subject: [PATCH] Rename pokecrystal.link to layout.link This is independent of the project name, and clearly applies to pokecrystal11, pokecrystal-au, etc. --- FAQ.md | 2 +- Makefile | 12 ++++++------ docs/design_flaws.md | 6 +++--- gfx/pics.asm | 2 +- pokecrystal.link => layout.link | 0 5 files changed, 11 insertions(+), 11 deletions(-) rename pokecrystal.link => layout.link (100%) diff --git a/FAQ.md b/FAQ.md index c21960340..7ed5e006f 100644 --- a/FAQ.md +++ b/FAQ.md @@ -58,7 +58,7 @@ If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64- If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)). -If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB ($4000 bytes) each, numbered $00 to $7F. The linkerscript [pokecrystal.link](pokecrystal.link) lists which `SECTION`s go in which banks. Try moving some code into a new section. +If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB ($4000 bytes) each, numbered $00 to $7F. The linkerscript [layout.link](layout.link) lists which `SECTION`s go in which banks. Try moving some code into a new section. ### "Invalid file or object file version" diff --git a/Makefile b/Makefile index a8709f914..f2a49073b 100644 --- a/Makefile +++ b/Makefile @@ -95,16 +95,16 @@ $(foreach obj, $(crystal_obj), $(eval $(call DEP,$(obj),$(obj:.o=.asm)))) endif -pokecrystal.gbc: $(crystal_obj) pokecrystal.link - $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l pokecrystal.link -p 0 -o $@ $(crystal_obj) +pokecrystal.gbc: $(crystal_obj) layout.link + $(RGBLINK) -n pokecrystal.sym -m pokecrystal.map -l layout.link -p 0 -o $@ $(crystal_obj) $(RGBFIX) -Cjv -t PM_CRYSTAL -i BYTE -k 01 -l 0x33 -m 0x10 -r 3 -p 0 $@ -pokecrystal11.gbc: $(crystal11_obj) pokecrystal.link - $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l pokecrystal.link -p 0 -o $@ $(crystal11_obj) +pokecrystal11.gbc: $(crystal11_obj) layout.link + $(RGBLINK) -n pokecrystal11.sym -m pokecrystal11.map -l layout.link -p 0 -o $@ $(crystal11_obj) $(RGBFIX) -Cjv -t PM_CRYSTAL -i BYTE -n 1 -k 01 -l 0x33 -m 0x10 -r 3 -p 0 $@ -pokecrystal-au.gbc: $(crystal_au_obj) pokecrystal.link - $(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l pokecrystal.link -p 0 -o $@ $(crystal_au_obj) +pokecrystal-au.gbc: $(crystal_au_obj) layout.link + $(RGBLINK) -n pokecrystal-au.sym -m pokecrystal-au.map -l layout.link -p 0 -o $@ $(crystal_au_obj) $(RGBFIX) -Cjv -t PM_CRYSTAL -i BYTU -k 01 -l 0x33 -m 0x10 -r 3 -p 0 $@ diff --git a/docs/design_flaws.md b/docs/design_flaws.md index f1a672346..26560b58f 100644 --- a/docs/design_flaws.md +++ b/docs/design_flaws.md @@ -85,7 +85,7 @@ In [gfx/pics.asm](https://github.com/pret/pokecrystal/blob/master/gfx/pics.asm): ```asm ; PokemonPicPointers and UnownPicPointers are assumed to start at the same -; address, but in different banks. This is enforced in pokecrystal.link. +; address, but in different banks. This is enforced in layout.link. SECTION "Pic Pointers", ROMX @@ -98,7 +98,7 @@ SECTION "Unown Pic Pointers", ROMX INCLUDE "data/pokemon/unown_pic_pointers.asm" ``` -In [pokecrystal.link](https://github.com/pret/pokecrystal/blob/master/pokecrystal.link): +In [layout.link](https://github.com/pret/pokecrystal/blob/master/layout.link): ``` ROMX $48 @@ -113,7 +113,7 @@ ROMX $49 **Fix:** -Don't enforce `org $4000` in [pokecrystal.link](https://github.com/pret/pokecrystal/blob/master/pokecrystal.link). +Don't enforce `org $4000` in [layout.link](https://github.com/pret/pokecrystal/blob/master/layout.link). Edit `GetFrontpicPointer`: diff --git a/gfx/pics.asm b/gfx/pics.asm index d771b63d2..a268b6db4 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -2,7 +2,7 @@ INCLUDE "constants.asm" ; PokemonPicPointers and UnownPicPointers are assumed to start at the same -; address, but in different banks. This is enforced in pokecrystal.link. +; address, but in different banks. This is enforced in layout.link. SECTION "Pic Pointers", ROMX diff --git a/pokecrystal.link b/layout.link similarity index 100% rename from pokecrystal.link rename to layout.link