Merge remote-tracking branch 'remotes/pokered/master'

.github/workflows/main.yml

@@ -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

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** install instructions](https://rgbds.gbdev.io/install#pre-built) for Windows with Cygwin to install **rgbds 0.5.2**.
+Then follow the [**rgbds** install 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 **pokeyellow**](#build-pokeyellow).
 
@@ -84,7 +84,7 @@ To install the software required for **pokeyellow**:
 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 **pokeyellow**:
 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 **pokeyellow**:
 sudo pacman -S make gcc git
 ```
 
-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 **pokeyellow**](#build-pokeyellow).
 
@@ -155,8 +155,8 @@ 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 pokeyellow, such as `pokeyellow/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 pokeyellow, such as `pokeyellow/rgbds-0.6.0/`. Then specify it when you run `make`:
 
 ```bash
-make RGBDS=rgbds-0.5.2/
+make RGBDS=rgbds-0.6.0/
 ```

Makefile

@@ -81,7 +81,7 @@ tools:
 	$(MAKE) -C tools/
 
 
-RGBASMFLAGS = -h -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
@@ -100,7 +100,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
 
@@ -116,8 +116,8 @@ $(foreach obj, $(pokeyellow_debug_obj), $(eval $(call DEP,$(obj),$(obj:_debug.o=
 $(foreach obj, $(pokeyellow_vc_obj), $(eval $(call DEP,$(obj),$(obj:_vc.o=.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
 
@@ -138,8 +138,8 @@ opts = -cjsv -k 01 -l 0x33 -m 0x1b -p 0 -r 03 -t "POKEMON YELLOW"
 
 ### Misc file-specific graphics rules
 
-gfx/battle/attack_anim_1.2bpp: tools/gfx += --trim-whitespace
-gfx/battle/attack_anim_2.2bpp: tools/gfx += --trim-whitespace
+gfx/battle/move_anim_0.2bpp: tools/gfx += --trim-whitespace
+gfx/battle/move_anim_1.2bpp: tools/gfx += --trim-whitespace
 
 gfx/credits/the_end.2bpp: tools/gfx += --interleave --png=$<
 

audio.asm

@@ -1,6 +1,3 @@
-INCLUDE "constants.asm"
-
-
 SECTION "Sound Effect Headers 1", ROMX
 INCLUDE "audio/headers/sfxheaders1.asm"
 

constants/move_animation_constants.asm

@@ -45,93 +45,96 @@ DEF FIRST_SE_ID EQU const_value
 
 ; subanimations that are part of move animations
 ; SubanimationPointers indexes (see data/battle_anims/subanimations.asm)
+
+; The 0 or 1 in the name of a subanim indicates whether to use tileset 0 or 1 data/moves/animations.asm.
+; "Both" indicates either can be used for different images using the same animation.
 	const_def
-	const SUBANIM_00
-	const SUBANIM_01
-	const SUBANIM_02
-	const SUBANIM_03
-	const SUBANIM_04
-	const SUBANIM_05
-	const SUBANIM_06
-	const SUBANIM_07
-	const SUBANIM_08
-	const SUBANIM_09
-	const SUBANIM_0A
-	const SUBANIM_0B
-	const SUBANIM_0C
-	const SUBANIM_0D
-	const SUBANIM_0E
-	const SUBANIM_0F
-	const SUBANIM_10
-	const SUBANIM_11
-	const SUBANIM_12
-	const SUBANIM_13
-	const SUBANIM_14
-	const SUBANIM_15
-	const SUBANIM_16
-	const SUBANIM_17
-	const SUBANIM_18
-	const SUBANIM_19
-	const SUBANIM_1A
-	const SUBANIM_1B
-	const SUBANIM_1C
-	const SUBANIM_1D
-	const SUBANIM_1E
-	const SUBANIM_1F
-	const SUBANIM_20
-	const SUBANIM_21
-	const SUBANIM_22
-	const SUBANIM_23
-	const SUBANIM_24
-	const SUBANIM_25
-	const SUBANIM_26
-	const SUBANIM_27
-	const SUBANIM_28
-	const SUBANIM_29
-	const SUBANIM_2A
-	const SUBANIM_2B
-	const SUBANIM_2C
-	const SUBANIM_2D
-	const SUBANIM_2E
-	const SUBANIM_2F
-	const SUBANIM_30
-	const SUBANIM_31
-	const SUBANIM_32
-	const SUBANIM_33
-	const SUBANIM_34
-	const SUBANIM_35
-	const SUBANIM_36
-	const SUBANIM_37
-	const SUBANIM_38
-	const SUBANIM_39
-	const SUBANIM_3A
-	const SUBANIM_3B
-	const SUBANIM_3C
-	const SUBANIM_3D
-	const SUBANIM_3E
-	const SUBANIM_3F
-	const SUBANIM_40
-	const SUBANIM_41
-	const SUBANIM_42
-	const SUBANIM_43
-	const SUBANIM_44
-	const SUBANIM_45
-	const SUBANIM_46
-	const SUBANIM_47
-	const SUBANIM_48
-	const SUBANIM_49
-	const SUBANIM_4A
-	const SUBANIM_4B
-	const SUBANIM_4C
-	const SUBANIM_4D
-	const SUBANIM_4E
-	const SUBANIM_4F
-	const SUBANIM_50
-	const SUBANIM_51
-	const SUBANIM_52
-	const SUBANIM_53
-	const SUBANIM_54
-	const SUBANIM_55
+	const SUBANIM_0_STAR
+	const SUBANIM_0_STAR_TWICE
+	const SUBANIM_0_STAR_THRICE
+	const SUBANIM_0_STAR_DESCENDING
+	const SUBANIM_1_STAR_BIG_MOVING
+	const SUBANIM_1_STAR_BIG
+	const SUBANIM_0_BALL_TOSS_HIGH
+	const SUBANIM_0_BALL_TOSS_MIDDLE
+	const SUBANIM_0_BALL_TOSS_LOW
+	const SUBANIM_0_BALL_SHAKE_ENEMY
+	const SUBANIM_0_BALL_POOF_ENEMY
+	const SUBANIM_0_BALL_BLOCK
+	const SUBANIM_1_FLAME_COLUMN_1
+	const SUBANIM_1_FLAME_COLUMN_2
+	const SUBANIM_1_FLAME_COLUMN_3
+	const SUBANIM_0_SCRATCHES
+	const SUBANIM_1_TORNADO
+	const SUBANIM_1_FLAMES
+	const SUBANIM_0_HEART_1_MUSIC
+	const SUBANIM_1_BLOB_TOSS
+	const SUBANIM_1_BLOB_DRIP_ENEMY
+	const SUBANIM_1_SHOUT
+	const SUBANIM_0_SLICE
+	const SUBANIM_0_BIRDIES_CIRCLING_ENEMY
+	const SUBANIM_1_SWORDS_CIRCLING
+	const SUBANIM_1_CLOUD_TOSS
+	const SUBANIM_0_WATER_COLUMNS
+	const SUBANIM_1_SEED_TOSS
+	const SUBANIM_1_SEED_LAND
+	const SUBANIM_0_ROCKS_LIFT
+	const SUBANIM_0_ROCKS_TOSS
+	const SUBANIM_1_FLAME_BEAM
+	const SUBANIM_1_FLAME_STAR
+	const SUBANIM_0_CIRCLES_1_SQUARES_CENTERING_ENEMY
+	const SUBANIM_0_CIRCLE_1_SQUARE_TOSS_BACK
+	const SUBANIM_0_BIND
+	const SUBANIM_0_STATUS_PARALYZED
+	const SUBANIM_0_STATUS_CONFUSED
+	const SUBANIM_0_STATUS_CONFUSED_ENEMY
+	const SUBANIM_0_STATUS_POISONED
+	const SUBANIM_1_SAND
+	const SUBANIM_1_LIGHTNING_BALL
+	const SUBANIM_0_SLICE_BOTH_SIDES
+	const SUBANIM_1_LIGHTNING
+	const SUBANIM_0_WATER_DROPLETS
+	const SUBANIM_0_CIRCLES_CENTERING
+	const SUBANIM_0_BEAM
+	const SUBANIM_0_ICE_RISE
+	const SUBANIM_0_ROCKS_FALL_ENEMY
+	const SUBANIM_0_SOUND_WAVE
+	const SUBANIM_0_CIRCLE_1_SQUARE_HALF_TOSS ; unused
+	const SUBANIM_1_BARRIER
+	const SUBANIM_1_SELFDESTRUCT
+	const SUBANIM_0_WATER_BUBBLES
+	const SUBANIM_0_CIRCLES_FALLING
+	const SUBANIM_0_STRING_SHOT
+	const SUBANIM_0_ICE_FALL
+	const SUBANIM_0_CIRCLE_1_SQUARE_APPEARS ; unused
+	const SUBANIM_0_STATUS_SLEEP
+	const SUBANIM_0_STATUS_SLEEP_ENEMY
+	const SUBANIM_0_WATER_1_FIRE_BARRIER ; unused
+	const SUBANIM_0_WATER_1_FIRE_GEYSER ; unused
+	const SUBANIM_1_STAR_BIG_TOSS
+	const SUBANIM_1_STARS_SMALL_TOSS
+	const SUBANIM_1_MUSIC_CIRCLING_ENEMY
+	const SUBANIM_1_CIRCLE_BLACK_TOSS
+	const SUBANIM_1_EXPLOSION_SMALL_ENEMY
+	const SUBANIM_0_CIRCLE_1_SQUARE_CLOSING
+	const SUBANIM_1_LEAVES_TOSS
+	const SUBANIM_0_HORN_JAB_TWICE
+	const SUBANIM_0_HORN_JAB_THRICE
+	const SUBANIM_0_BALL_POOF
+	const SUBANIM_2_TRADE_BALL_DROP
+	const SUBANIM_2_TRADE_BALL_SHAKE
+	const SUBANIM_2_TRADE_BALL_APPEAR
+	const SUBANIM_2_TRADE_BALL_POOF
+	const SUBANIM_0_EGG_SHAKING
+	const SUBANIM_1_TRIANGLE_TOSS
+	const SUBANIM_1_SPHERE_BIG
+	const SUBANIM_1_SPHERE_BIG_RISE
+	const SUBANIM_1_SPHERE_BIG_FALL
+	const SUBANIM_0_SHELL
+	const SUBANIM_0_COIN_BOUNCE
+	const SUBANIM_0_SAFARI_ROCK
+	const SUBANIM_0_SAFARI_BAIT
+	const SUBANIM_0_STAR_HIGH
 DEF NUM_SUBANIMS EQU const_value
 
 ; types of subanimations

constants/sprite_set_constants.asm

@@ -0,0 +1,41 @@
+; sprite set ids
+; indexes for SpriteSets (see data/maps/sprite_sets.asm)
+; values for MapSpriteSets and SplitMapSpriteSets (see data/maps/sprite_sets.asm)
+	const_def 1
+	const SPRITESET_PALLET_VIRIDIAN ; 01
+	const SPRITESET_PEWTER_CERULEAN ; 02
+	const SPRITESET_LAVENDER        ; 03
+	const SPRITESET_VERMILION       ; 04
+	const SPRITESET_CELADON         ; 05
+	const SPRITESET_INDIGO          ; 06
+	const SPRITESET_SAFFRON         ; 07
+	const SPRITESET_SILENCE_BRIDGE  ; 08
+	const SPRITESET_CYCLING_ROAD    ; 09
+	const SPRITESET_FUCHSIA         ; 0a
+DEF NUM_SPRITE_SETS EQU const_value - 1
+
+; split sprite set ids
+; indexes for SplitMapSpriteSets (see data/maps/sprite_sets.asm)
+; values for MapSpriteSets (see data/maps/sprite_sets.asm)
+	const_next $f1
+DEF FIRST_SPLIT_SET EQU const_value
+	const SPLITSET_ROUTE_2  ; f1
+	const SPLITSET_ROUTE_10 ; f2
+	const SPLITSET_ROUTE_11 ; f3
+	const SPLITSET_ROUTE_12 ; f4
+	const SPLITSET_ROUTE_15 ; f5
+	const SPLITSET_ROUTE_16 ; f6
+	const SPLITSET_ROUTE_18 ; f7
+	const SPLITSET_ROUTE_20 ; f8
+	const SPLITSET_ROUTE_5  ; f9
+	const SPLITSET_ROUTE_6  ; fa
+	const SPLITSET_ROUTE_7  ; fb
+	const SPLITSET_ROUTE_8  ; fc
+DEF NUM_SPLIT_SETS EQU const_value - FIRST_SPLIT_SET
+
+; split directions
+DEF EAST_WEST   EQU 1
+DEF NORTH_SOUTH EQU 2
+
+; each sprite set has 9 walking sprites and 2 still sprites
+DEF SPRITE_SET_LENGTH EQU 9 + 2