mirror of
https://github.com/pret/pokegold.git
synced 2024-11-23 05:29:52 +00:00
Require rgbds 0.6.0
This commit is contained in:
parent
52af53f650
commit
42ba9bbbe1
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -16,7 +16,7 @@ jobs:
|
||||
uses: actions/checkout@master
|
||||
with:
|
||||
path: rgbds
|
||||
ref: v0.5.2
|
||||
ref: v0.6.0
|
||||
repository: gbdev/rgbds
|
||||
|
||||
- name: Install rgbds
|
||||
|
24
INSTALL.md
24
INSTALL.md
@ -42,9 +42,9 @@ Run setup and leave the default settings. At the "**Select Packages**" step, cho
|
||||
|
||||
Double click on the text that says "**Skip**" next to each package to select the most recent version to install.
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.5.2**.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.6.0**.
|
||||
|
||||
**Note:** If you already have an older rgbds, you will need to update to 0.5.2. Ignore this if you have never installed rgbds before. If a version newer than 0.5.2 does not work, try downloading 0.5.2.
|
||||
**Note:** If you already have an older rgbds, you will need to update to 0.6.0. Ignore this if you have never installed rgbds before. If a version newer than 0.6.0 does not work, try downloading 0.6.0.
|
||||
|
||||
Now open the **Cygwin terminal** and enter the following commands.
|
||||
|
||||
@ -67,7 +67,7 @@ Install [**Homebrew**](https://brew.sh/). Follow the official instructions.
|
||||
|
||||
Open **Terminal** and prepare to enter commands.
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.5.2**.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for macOS to install **rgbds 0.6.0**.
|
||||
|
||||
Now you're ready to [build **pokegold**](#build-pokegold).
|
||||
|
||||
@ -84,7 +84,7 @@ To install the software required for **pokegold**:
|
||||
sudo apt-get install make gcc git
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.5.2** from source.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.0** from source.
|
||||
|
||||
### OpenSUSE
|
||||
|
||||
@ -94,7 +94,7 @@ To install the software required for **pokegold**:
|
||||
sudo zypper install make gcc git
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.5.2** from source.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.0** from source.
|
||||
|
||||
### Arch Linux
|
||||
|
||||
@ -104,9 +104,9 @@ To install the software required for **pokegold**:
|
||||
sudo pacman -S make gcc git rgbds
|
||||
```
|
||||
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Arch Linux to install **rgbds 0.5.2**.
|
||||
Then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#pre-built) for Arch Linux to install **rgbds 0.6.0**.
|
||||
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.5.2** from source.
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.0** from source.
|
||||
|
||||
### Termux
|
||||
|
||||
@ -122,7 +122,7 @@ To install **rgbds**:
|
||||
sudo apt install rgbds
|
||||
```
|
||||
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.5.2** from source.
|
||||
If you want to compile and install **rgbds** yourself instead, then follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.0** from source.
|
||||
|
||||
### Other distros
|
||||
|
||||
@ -133,7 +133,7 @@ If your distro is not listed here, try to find the required software in its repo
|
||||
- `git`
|
||||
- `rgbds`
|
||||
|
||||
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.5.2** from source.
|
||||
If `rgbds` is not available, you'll need to follow the [**rgbds** instructions](https://rgbds.gbdev.io/install#building-from-source) to build **rgbds 0.6.0** from source.
|
||||
|
||||
Now you're ready to [build **pokegold**](#build-pokegold).
|
||||
|
||||
@ -167,12 +167,12 @@ make
|
||||
|
||||
### Build with a local rgbds version
|
||||
|
||||
If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.5.2 globally. Instead, you can put its files in a directory within pokegold, such as `pokegold/rgbds-0.5.2/`. Then specify it when you run `make`:
|
||||
If you have different projects that require different versions of `rgbds`, it might not be convenient to install rgbds 0.6.0 globally. Instead, you can put its files in a directory within pokegold, such as `pokegold/rgbds-0.6.0/`. Then specify it when you run `make`:
|
||||
|
||||
```bash
|
||||
make RGBDS=rgbds-0.5.2/ gold
|
||||
make RGBDS=rgbds-0.6.0/ gold
|
||||
```
|
||||
|
||||
```bash
|
||||
make RGBDS=rgbds-0.5.2/ silver
|
||||
make RGBDS=rgbds-0.6.0/ silver
|
||||
```
|
||||
|
34
Makefile
34
Makefile
@ -107,7 +107,7 @@ tools:
|
||||
$(MAKE) -C tools/
|
||||
|
||||
|
||||
RGBASMFLAGS = -L -Weverything -Wnumeric-string=2 -Wtruncation=1
|
||||
RGBASMFLAGS = -hL -Q8 -P includes.asm -Weverything -Wnumeric-string=2 -Wtruncation=1
|
||||
# Create a sym/map for debug purposes if `make` run with `DEBUG=1`
|
||||
ifeq ($(DEBUG),1)
|
||||
RGBASMFLAGS += -E
|
||||
@ -130,7 +130,7 @@ rgbdscheck.o: rgbdscheck.asm
|
||||
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
|
||||
# It doesn't look like $(shell) can be deferred so there might not be a better way.
|
||||
define DEP
|
||||
$1: $2 $$(shell tools/scan_includes $2) | rgbdscheck.o
|
||||
$1: $2 $$(shell tools/scan_includes $2) | includes.asm rgbdscheck.o
|
||||
$$(RGBASM) $$(RGBASMFLAGS) -o $$@ $$<
|
||||
endef
|
||||
|
||||
@ -167,8 +167,8 @@ $(foreach obj, $(silver_vc_excl_obj), \
|
||||
$(eval $(call DEP,$(obj),$(obj:_silver_vc.o=_silver.asm))))
|
||||
|
||||
# Dependencies for VC files that need to run scan_includes
|
||||
%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) | rgbdscheck.o
|
||||
$(RGBASM) $< > $@
|
||||
%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) | includes.asm rgbdscheck.o
|
||||
$(RGBASM) $(RGBASMFLAGS) $< > $@
|
||||
|
||||
endif
|
||||
|
||||
@ -197,13 +197,13 @@ include gfx/lz.mk
|
||||
|
||||
### Misc file-specific graphics rules
|
||||
|
||||
gfx/pokemon/%/front.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/front_gold.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/front_silver.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/front.2bpp: rgbgfx += -Z -c embedded
|
||||
gfx/pokemon/%/front_gold.2bpp: rgbgfx += -Z -c embedded
|
||||
gfx/pokemon/%/front_silver.2bpp: rgbgfx += -Z -c embedded
|
||||
|
||||
gfx/pokemon/%/back.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/back_gold.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/back_silver.2bpp: rgbgfx += -h
|
||||
gfx/pokemon/%/back.2bpp: rgbgfx += -Z -c embedded
|
||||
gfx/pokemon/%/back_gold.2bpp: rgbgfx += -Z -c embedded
|
||||
gfx/pokemon/%/back_silver.2bpp: rgbgfx += -Z -c embedded
|
||||
|
||||
gfx/pokemon/%/back_gold.2bpp: gfx/pokemon/%/back.png
|
||||
$(RGBGFX) $(rgbgfx) -o $@ $<
|
||||
@ -215,15 +215,15 @@ gfx/pokemon/%/back_silver.2bpp: gfx/pokemon/%/back.png
|
||||
$(if $(tools/gfx),\
|
||||
tools/gfx $(tools/gfx) -o $@ $@)
|
||||
|
||||
gfx/trainers/%.2bpp: rgbgfx += -h
|
||||
gfx/trainers/%.2bpp: rgbgfx += -Z -c embedded
|
||||
|
||||
gfx/intro/fire.2bpp: tools/gfx += --remove-whitespace
|
||||
gfx/intro/fire1.2bpp: gfx/intro/charizard1.2bpp gfx/intro/charizard2_top.2bpp gfx/intro/space.2bpp ; cat $^ > $@
|
||||
gfx/intro/fire2.2bpp: gfx/intro/charizard2_bottom.2bpp gfx/intro/charizard3.2bpp ; cat $^ > $@
|
||||
gfx/intro/fire3.2bpp: gfx/intro/fire.2bpp gfx/intro/unused_blastoise_venusaur.2bpp ; cat $^ > $@
|
||||
|
||||
gfx/new_game/shrink1.2bpp: rgbgfx += -h
|
||||
gfx/new_game/shrink2.2bpp: rgbgfx += -h
|
||||
gfx/new_game/shrink1.2bpp: rgbgfx += -Z
|
||||
gfx/new_game/shrink2.2bpp: rgbgfx += -Z
|
||||
|
||||
gfx/mail/dragonite.1bpp: tools/gfx += --remove-whitespace
|
||||
gfx/mail/large_note.1bpp: tools/gfx += --remove-whitespace
|
||||
@ -233,7 +233,7 @@ gfx/mail/litebluemail_border.1bpp: tools/gfx += --remove-whitespace
|
||||
|
||||
gfx/pokedex/pokedex.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/pokedex/pokedex_sgb.2bpp: tools/gfx += --trim-whitespace
|
||||
gfx/pokedex/question_mark.2bpp: rgbgfx += -h
|
||||
gfx/pokedex/question_mark.2bpp: rgbgfx += -Z
|
||||
gfx/pokedex/slowpoke.2bpp: tools/gfx += --trim-whitespace
|
||||
|
||||
gfx/pokegear/pokegear.2bpp: rgbgfx += -x2
|
||||
@ -277,8 +277,8 @@ gfx/battle_anims/rocks.2bpp: tools/gfx += --remove-whitespace
|
||||
gfx/battle_anims/skyattack.2bpp: tools/gfx += --remove-whitespace
|
||||
gfx/battle_anims/status.2bpp: tools/gfx += --remove-whitespace
|
||||
|
||||
gfx/player/chris.2bpp: rgbgfx += -h
|
||||
gfx/player/chris_back.2bpp: rgbgfx += -h
|
||||
gfx/player/chris.2bpp: rgbgfx += -Z
|
||||
gfx/player/chris_back.2bpp: rgbgfx += -Z
|
||||
|
||||
gfx/trainer_card/leaders.2bpp: tools/gfx += --trim-whitespace
|
||||
|
||||
@ -286,7 +286,7 @@ gfx/overworld/chris_fish.2bpp: tools/gfx += --trim-whitespace
|
||||
|
||||
gfx/sprites/big_onix.2bpp: tools/gfx += --remove-whitespace --remove-xflip
|
||||
|
||||
gfx/battle/dude.2bpp: rgbgfx += -h
|
||||
gfx/battle/dude.2bpp: rgbgfx += -Z
|
||||
|
||||
gfx/font/unused_bold_font.1bpp: tools/gfx += --trim-whitespace
|
||||
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Audio", ROMX
|
||||
|
||||
INCLUDE "audio/engine.asm"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Maps", ROMX
|
||||
|
||||
INCLUDE "data/maps/scenes.asm"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Pokedex Entries 001-064", ROMX
|
||||
|
||||
BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gold/bulbasaur.asm"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Pokedex Entries 001-064", ROMX
|
||||
|
||||
BulbasaurPokedexEntry:: INCLUDE "data/pokemon/dex_entries/silver/bulbasaur.asm"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Egg Moves", ROMX
|
||||
|
||||
INCLUDE "data/pokemon/egg_move_pointers.asm"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Evolutions and Attacks", ROMX
|
||||
|
||||
; Evos+attacks data structure:
|
||||
|
@ -92,9 +92,9 @@ INCBIN "gfx/pokemon/vulpix/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/vulpix/shiny.pal"
|
||||
INCBIN "gfx/pokemon/ninetales/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/ninetales/shiny.pal"
|
||||
INCBIN "gfx/pokemon/jigglypuff/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/jigglypuff/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/jigglypuff/shiny.pal"
|
||||
INCBIN "gfx/pokemon/wigglytuff/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/wigglytuff/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/wigglytuff/shiny.pal"
|
||||
INCBIN "gfx/pokemon/zubat/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/zubat/shiny.pal"
|
||||
@ -186,7 +186,7 @@ INCBIN "gfx/pokemon/doduo/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/doduo/shiny.pal"
|
||||
INCBIN "gfx/pokemon/dodrio/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/dodrio/shiny.pal"
|
||||
INCBIN "gfx/pokemon/seel/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/seel/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/seel/shiny.pal"
|
||||
INCBIN "gfx/pokemon/dewgong/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/dewgong/shiny.pal"
|
||||
@ -242,7 +242,7 @@ INCBIN "gfx/pokemon/rhydon/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/rhydon/shiny.pal"
|
||||
INCBIN "gfx/pokemon/chansey/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/chansey/shiny.pal"
|
||||
INCBIN "gfx/pokemon/tangela/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/tangela/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/tangela/shiny.pal"
|
||||
INCBIN "gfx/pokemon/kangaskhan/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/kangaskhan/shiny.pal"
|
||||
@ -256,7 +256,7 @@ INCBIN "gfx/pokemon/seaking/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/seaking/shiny.pal"
|
||||
INCBIN "gfx/pokemon/staryu/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/staryu/shiny.pal"
|
||||
INCBIN "gfx/pokemon/starmie/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/starmie/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/starmie/shiny.pal"
|
||||
INCBIN "gfx/pokemon/mr__mime/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/mr__mime/shiny.pal"
|
||||
@ -382,7 +382,7 @@ INCBIN "gfx/pokemon/bellossom/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/bellossom/shiny.pal"
|
||||
INCBIN "gfx/pokemon/marill/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/marill/shiny.pal"
|
||||
INCBIN "gfx/pokemon/azumarill/back.gbcpal", middle_colors
|
||||
INCBIN "gfx/pokemon/azumarill/front_gold.gbcpal", middle_colors ; the back does not use all four colors
|
||||
INCLUDE "gfx/pokemon/azumarill/shiny.pal"
|
||||
INCBIN "gfx/pokemon/sudowoodo/back.gbcpal", middle_colors
|
||||
INCLUDE "gfx/pokemon/sudowoodo/shiny.pal"
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Text 1", ROMX
|
||||
|
||||
INCLUDE "data/text/common_1.asm"
|
||||
|
@ -642,6 +642,7 @@ ReceiveInfraredLEDOn:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
ldh a, [c]
|
||||
bit rRP_RECEIVING, a
|
||||
jr z, .recv_loop
|
||||
@ -656,6 +657,7 @@ ReceiveInfraredLEDOff:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
ldh a, [c]
|
||||
bit rRP_RECEIVING, a
|
||||
jr nz, .no_recv_loop
|
||||
@ -672,6 +674,7 @@ SendInfraredLEDOn:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
jr .wait
|
||||
|
||||
SendInfraredLEDOff:
|
||||
@ -684,6 +687,7 @@ SendInfraredLEDOff:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
jr .wait
|
||||
|
||||
InitializeIRCommunicationRoles:
|
||||
@ -880,6 +884,7 @@ SendIRDataMessage:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
ld a, rRP_ENABLE_READ_MASK | (1 << rRP_LED_ON)
|
||||
ldh [rRP], a
|
||||
; Turn the LED off for longer if the bit is 1
|
||||
@ -900,6 +905,7 @@ SendIRDataMessage:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
.no_halt
|
||||
ldh a, [hMGNumBits]
|
||||
dec a
|
||||
@ -913,6 +919,7 @@ SendIRDataMessage:
|
||||
xor a
|
||||
ldh [rIF], a
|
||||
halt
|
||||
nop
|
||||
|
||||
ld d, 5
|
||||
call SendInfraredLEDOn
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Credits", ROMX
|
||||
|
||||
Credits::
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "Events", ROMX
|
||||
|
||||
OverworldLoop::
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
; PokemonPicPointers and UnownPicPointers are assumed to start at the same
|
||||
; address, but in different banks. This is enforced in layout.link.
|
||||
|
||||
|
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
; PokemonPicPointers and UnownPicPointers are assumed to start at the same
|
||||
; address, but in different banks. This is enforced in layout.link.
|
||||
|
||||
|
@ -1,5 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
MACRO tilecoll
|
||||
; used in data/tilesets/*_collision.asm
|
||||
db COLL_\1, COLL_\2, COLL_\3, COLL_\4
|
||||
|
@ -5,7 +5,8 @@ DelayFrame::
|
||||
|
||||
; Wait for the next VBlank, halting to conserve battery
|
||||
.halt
|
||||
halt ; rgbasm adds a nop after this instruction by default
|
||||
halt
|
||||
nop
|
||||
ld a, [wVBlankOccurred]
|
||||
and a
|
||||
jr nz, .halt
|
||||
|
@ -187,7 +187,7 @@ MACRO dict
|
||||
jr nz, .not\@
|
||||
ld a, \2
|
||||
.not\@:
|
||||
elif STRSUB("\2", 1, 1) == "."
|
||||
elif !STRCMP(STRSUB("\2", 1, 1), ".")
|
||||
; Locals can use a short jump
|
||||
jr z, \2
|
||||
else
|
||||
|
@ -1,6 +1,25 @@
|
||||
INCLUDE "charmap.asm"
|
||||
|
||||
INCLUDE "macros.asm"
|
||||
INCLUDE "macros/asserts.asm"
|
||||
INCLUDE "macros/const.asm"
|
||||
INCLUDE "macros/predef.asm"
|
||||
INCLUDE "macros/farcall.asm"
|
||||
INCLUDE "macros/data.asm"
|
||||
INCLUDE "macros/code.asm"
|
||||
INCLUDE "macros/gfx.asm"
|
||||
INCLUDE "macros/coords.asm"
|
||||
INCLUDE "macros/vc.asm"
|
||||
|
||||
INCLUDE "macros/scripts/audio.asm"
|
||||
INCLUDE "macros/scripts/maps.asm"
|
||||
INCLUDE "macros/scripts/events.asm"
|
||||
INCLUDE "macros/scripts/text.asm"
|
||||
INCLUDE "macros/scripts/movement.asm"
|
||||
INCLUDE "macros/scripts/battle_commands.asm"
|
||||
INCLUDE "macros/scripts/battle_anims.asm"
|
||||
INCLUDE "macros/scripts/oam_anims.asm"
|
||||
|
||||
INCLUDE "macros/legacy.asm"
|
||||
|
||||
INCLUDE "constants/hardware_constants.asm"
|
||||
INCLUDE "constants/deco_constants.asm"
|
20
macros.asm
20
macros.asm
@ -1,20 +0,0 @@
|
||||
INCLUDE "macros/asserts.asm"
|
||||
INCLUDE "macros/const.asm"
|
||||
INCLUDE "macros/predef.asm"
|
||||
INCLUDE "macros/farcall.asm"
|
||||
INCLUDE "macros/data.asm"
|
||||
INCLUDE "macros/code.asm"
|
||||
INCLUDE "macros/gfx.asm"
|
||||
INCLUDE "macros/coords.asm"
|
||||
INCLUDE "macros/vc.asm"
|
||||
|
||||
INCLUDE "macros/scripts/audio.asm"
|
||||
INCLUDE "macros/scripts/maps.asm"
|
||||
INCLUDE "macros/scripts/events.asm"
|
||||
INCLUDE "macros/scripts/text.asm"
|
||||
INCLUDE "macros/scripts/movement.asm"
|
||||
INCLUDE "macros/scripts/battle_commands.asm"
|
||||
INCLUDE "macros/scripts/battle_anims.asm"
|
||||
INCLUDE "macros/scripts/oam_anims.asm"
|
||||
|
||||
INCLUDE "macros/legacy.asm"
|
@ -105,10 +105,8 @@ MACRO bcd
|
||||
ENDM
|
||||
|
||||
MACRO sine_table
|
||||
; \1 samples of sin(x) from x=0 to x<32768 (pi radians)
|
||||
DEF x = 0
|
||||
rept \1
|
||||
dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up
|
||||
DEF x += DIV(32768, \1) ; a circle has 65536 "degrees"
|
||||
; \1 samples of sin(x) from x=0 to x<0.5 turns (pi radians)
|
||||
for x, \1
|
||||
dw sin(x * 0.5 / (\1))
|
||||
endr
|
||||
ENDM
|
||||
|
3
main.asm
3
main.asm
@ -1,6 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
|
||||
SECTION "bank1", ROMX
|
||||
|
||||
INCLUDE "engine/link/place_waiting_text.asm"
|
||||
|
@ -1,18 +1,16 @@
|
||||
MAJOR EQU 0
|
||||
MINOR EQU 5
|
||||
PATCH EQU 2
|
||||
MINOR EQU 6
|
||||
PATCH EQU 0
|
||||
|
||||
MACRO wrong_rgbds
|
||||
fail "pokegold requires rgbds v0.5.2 or newer."
|
||||
ENDM
|
||||
WRONG_RGBDS EQUS "fail \"pokegold requires rgbds v0.6.0 or newer.\""
|
||||
|
||||
IF !DEF(__RGBDS_MAJOR__) || !DEF(__RGBDS_MINOR__) || !DEF(__RGBDS_PATCH__)
|
||||
wrong_rgbds
|
||||
WRONG_RGBDS
|
||||
ELSE
|
||||
IF (__RGBDS_MAJOR__ < MAJOR) || \
|
||||
(__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ < MINOR) || \
|
||||
(__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ < PATCH) || \
|
||||
(__RGBDS_MAJOR__ == MAJOR && __RGBDS_MINOR__ == MINOR && __RGBDS_PATCH__ == PATCH && DEF(__RGBDS_RC__))
|
||||
wrong_rgbds
|
||||
WRONG_RGBDS
|
||||
ENDC
|
||||
ENDC
|
||||
|
@ -39,7 +39,7 @@ function register_bank(amount) {
|
||||
}
|
||||
}
|
||||
|
||||
rom_bank && toupper($0) ~ /^[ \t]*EMPTY/ {
|
||||
rom_bank && toupper($0) ~ /^[ \t]*EMPTY$/ {
|
||||
# Empty bank
|
||||
register_bank(16384)
|
||||
}
|
||||
|
@ -1,64 +0,0 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
"""
|
||||
Usage: python used_space.py [pokegold.map] [used_space.png]
|
||||
|
||||
Generate a PNG visualizing the space used by each bank in the ROM.
|
||||
"""
|
||||
|
||||
import sys
|
||||
from colorsys import hls_to_rgb
|
||||
|
||||
import png
|
||||
from mapreader import MapReader
|
||||
|
||||
def main():
|
||||
mapfile = sys.argv[1] if len(sys.argv) >= 2 else 'pokegold.map'
|
||||
outfile = sys.argv[2] if len(sys.argv) >= 3 else 'used_space.png'
|
||||
|
||||
num_banks = 0x80
|
||||
bank_mask = 0x3FFF
|
||||
bank_size = 0x4000 # bytes
|
||||
|
||||
bpp = 8 # bytes per pixel
|
||||
height = 256 # pixels
|
||||
assert bank_size % bpp == 0 and (bank_size // bpp) % height == 0
|
||||
|
||||
pixels_per_bank = bank_size // bpp # 2048 pixels
|
||||
bank_width = pixels_per_bank // height # 8 pixels
|
||||
width = bank_width * num_banks # 1024 pixels
|
||||
|
||||
reader = MapReader()
|
||||
with open(mapfile, 'r', encoding='utf-8') as file:
|
||||
reader.read_map_data(file.readlines())
|
||||
|
||||
hit_data = []
|
||||
default_bank_data = {'sections': [], 'used': 0, 'slack': bank_size}
|
||||
for bank in range(num_banks):
|
||||
hits = [0] * pixels_per_bank
|
||||
bank_data = reader.bank_data['ROM0 bank' if bank == 0 else 'ROMX bank']
|
||||
data = bank_data.get(bank, default_bank_data)
|
||||
for s in data['sections']:
|
||||
beg = s['beg'] & bank_mask
|
||||
end = s['end'] & bank_mask
|
||||
for i in range(beg, end + 1):
|
||||
hits[i // bpp] += 1
|
||||
hit_data.append(hits)
|
||||
|
||||
pixels = [[(0xFF, 0xFF, 0xFF)] * width for _ in range(height)]
|
||||
for bank, hits in enumerate(hit_data):
|
||||
hue = 0 if bank == 0 else 210 if bank % 2 else 270
|
||||
for i, hit in enumerate(hits):
|
||||
x, y = i % bank_width + bank * bank_width, i // bank_width
|
||||
hls = (hue / 360, 1 - (85 * hit / bpp) / 100, 1)
|
||||
rgb = tuple(int(c * 0xFF) for c in hls_to_rgb(*hls))
|
||||
pixels[y][x] = rgb
|
||||
|
||||
png_data = [tuple(c for pixel in row for c in pixel) for row in pixels]
|
||||
with open(outfile, 'wb') as file:
|
||||
writer = png.Writer(width, height, greyscale=False, bitdepth=8, compression=9)
|
||||
writer.write(file, png_data)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
@ -1,5 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
; These are all the asm constants needed to make the gold_vc patch.
|
||||
|
||||
MACRO vc_const
|
||||
|
@ -1,5 +1,3 @@
|
||||
INCLUDE "constants.asm"
|
||||
|
||||
; These are all the asm constants needed to make the silver_vc patch.
|
||||
|
||||
MACRO vc_const
|
||||
|
Loading…
Reference in New Issue
Block a user