Merge branch 'master' of https://github.com/pret/pokered

README.md

@@ -15,6 +15,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
 
 - [**Wiki**][wiki] (includes [tutorials][tutorials])
 - [**Symbols**][symbols]
+- [**Tools**][tools]
 
 You can find us on [Discord (pret, #pokered)](https://discord.gg/d5dubZ3).
 
@@ -23,5 +24,6 @@ For other pret projects, see [pret.github.io](https://pret.github.io/).
 [wiki]: https://github.com/pret/pokeyellow/wiki
 [tutorials]: https://github.com/pret/pokeyellow/wiki/Tutorials
 [symbols]: https://github.com/pret/pokeyellow/tree/symbols
+[tools]: https://github.com/pret/gb-asm-tools
 [ci]: https://github.com/pret/pokeyellow/actions
 [ci-badge]: https://github.com/pret/pokeyellow/actions/workflows/main.yml/badge.svg

audio/wave_samples.asm

@@ -30,3 +30,9 @@
 
 ; duty 5 reads from sfx data
 .wave5
+; in audio 1: (used by audio/music/lavender.asm)
+;	dn  2,  1, 14,  2,  3,  3,  2,  8, 14,  1,  2,  2, 15, 15, 14, 10,  1,  0,  1,  4, 13, 12,  1,  0, 14,  3,  4,  1,  5,  1,  7,  3
+; in audio 2:
+;	dn 14, 12,  0,  2,  2,  0,  9,  1,  0,  7, 12,  0,  2,  0,  8,  1,  0,  7, 13,  0,  2,  0,  9,  1,  0,  7, 12,  0,  2, 12, 10,  1
+; in audio 3: (used by audio/music/pokemontower.asm)
+;	dn  2,  1, 14,  2,  3,  3,  2,  8, 14,  1,  2,  2, 15, 15,  2,  2, 15,  7,  2,  4,  2,  2, 15,  7,  3,  4,  2,  4, 15,  7,  4,  4

engine/movie/oak_speech/init_player_data.asm

@@ -39,7 +39,7 @@ DEF START_MONEY EQU $3000
 
 	ld hl, wObtainedBadges
 	ld [hli], a
-
+	assert wObtainedBadges + 1 == wUnusedObtainedBadges
 	ld [hl], a
 
 	ld hl, wPlayerCoins

engine/movie/trade.asm

@@ -312,7 +312,7 @@ Trade_AnimateBallEnteringLinkCable:
 .moveBallInsideLinkCableLoop
 	push bc
 	xor a
-	ld de, Trade_BallInsideLinkCableOAM
+	ld de, Trade_BallInsideLinkCableOAMBlock
 	call WriteOAMBlock
 	ld a, [wLinkCableAnimBulgeToggle]
 	xor $1
@@ -348,9 +348,11 @@ Trade_AnimateBallEnteringLinkCable:
 	ldh [hAutoBGTransferEnabled], a
 	ret
 
-Trade_BallInsideLinkCableOAM:
-	dbsprite  0, 15,  0,  6, $7e, OAM_HFLIP
-	dbsprite  8, 15,  0,  6, $7e, OAM_HFLIP | OAM_VFLIP
+Trade_BallInsideLinkCableOAMBlock:
+	db $7e, 0
+	db $7e, OAM_HFLIP
+	db $7e, OAM_VFLIP
+	db $7e, OAM_HFLIP | OAM_VFLIP
 
 Trade_ShowEnemyMon:
 	ld a, TRADE_BALL_TILT_ANIM
@@ -620,7 +622,7 @@ Trade_AnimCircledMon:
 
 Trade_WriteCircledMonOAM:
 	farcall WriteMonPartySpriteOAMBySpecies
-	call Trade_WriteCircleOAM
+	call Trade_WriteCircleOAMBlock
 
 Trade_AddOffsetsToOAMCoords:
 	ld hl, wShadowOAM
@@ -674,11 +676,11 @@ Trade_AnimMonMoveVertical:
 	jr nz, .loop
 	ret
 
-Trade_WriteCircleOAM:
+Trade_WriteCircleOAMBlock:
 ; Writes the OAM blocks for the circle around the traded mon as it passes
 ; the link cable.
-	ld hl, Trade_CircleOAMPointers
-	ld c, $4
+	ld hl, Trade_CircleOAMBlocks
+	ld c, 4
 	xor a
 .loop
 	push bc
@@ -701,33 +703,41 @@ Trade_WriteCircleOAM:
 	jr nz, .loop
 	ret
 
-MACRO trade_circle_oam
+MACRO trade_circle_oam_block
+	; oam block pointer, upper-left x coord, upper-left y coord
 	dw \1
 	db \2, \3
 ENDM
 
-Trade_CircleOAMPointers:
-	; oam pointer, upper-left x coord, upper-left y coord
-	trade_circle_oam Trade_CircleOAM0, $08, $08
-	trade_circle_oam Trade_CircleOAM1, $18, $08
-	trade_circle_oam Trade_CircleOAM2, $08, $18
-	trade_circle_oam Trade_CircleOAM3, $18, $18
-
-Trade_CircleOAM0:
-	dbsprite  2,  7,  0,  0, ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1
-	dbsprite  2,  7,  0,  2, ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1
-
-Trade_CircleOAM1:
-	dbsprite  6,  7,  0,  1, ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP
-	dbsprite  6,  7,  0,  3, ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP
-
-Trade_CircleOAM2:
-	dbsprite 10,  7,  0,  2, ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_VFLIP
-	dbsprite 10,  7,  0,  0, ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_VFLIP
-
-Trade_CircleOAM3:
-	dbsprite 14,  7,  0,  3, ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
-	dbsprite 14,  7,  0,  1, ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+Trade_CircleOAMBlocks:
+	trade_circle_oam_block .OAMBlock0,  8,  8
+	trade_circle_oam_block .OAMBlock1, 24,  8
+	trade_circle_oam_block .OAMBlock2,  8, 24
+	trade_circle_oam_block .OAMBlock3, 24, 24
+
+.OAMBlock0:
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1
+
+.OAMBlock1:
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP
+
+.OAMBlock2:
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_VFLIP
+
+.OAMBlock3:
+	db ICON_TRADEBUBBLE << 2 + 3, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 2, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 1, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
+	db ICON_TRADEBUBBLE << 2 + 0, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
 
 ; a = species
 Trade_LoadMonSprite:

engine/overworld/cut.asm

@@ -120,12 +120,15 @@ LoadCutGrassAnimationTilePattern:
 WriteCutOrBoulderDustAnimationOAMBlock:
 	call GetCutOrBoulderDustAnimationOffsets
 	ld a, $9
-	ld de, CutOrBoulderDustAnimationTilesAndAttributes
+	ld de, .OAMBlock
 	jp WriteOAMBlock
 
-CutOrBoulderDustAnimationTilesAndAttributes:
-	dbsprite  2, -1,  4,  4, $fd, OAM_OBP1 | OAM_HIGH_PALS
-	dbsprite  2, -1,  4,  6, $ff, OAM_OBP1 | OAM_HIGH_PALS
+.OAMBlock:
+; tile ID, attributes
+	db $fc, OAM_OBP1 | OAM_HIGH_PALS
+	db $fd, OAM_OBP1 | OAM_HIGH_PALS
+	db $fe, OAM_OBP1 | OAM_HIGH_PALS
+	db $ff, OAM_OBP1 | OAM_HIGH_PALS
 
 GetCutOrBoulderDustAnimationOffsets:
 	ld hl, wSpritePlayerStateData1YPixels

engine/overworld/emotion_bubbles.asm

@@ -54,7 +54,7 @@ EmotionBubble:
 	add $8
 	ld c, a
 
-	ld de, EmotionBubblesOAM
+	ld de, EmotionBubblesOAMBlock
 	xor a
 	call WriteOAMBlock
 	ld c, 60
@@ -66,9 +66,12 @@ EmotionBubble:
 	ret
 
 
-EmotionBubblesOAM:
-	dbsprite  0, -1,  0,  0, $f9, 0
-	dbsprite  0, -1,  0,  2, $fb, 0
+EmotionBubblesOAMBlock:
+; tile ID, attributes
+	db $f8, 0
+	db $f9, 0
+	db $fa, 0
+	db $fb, 0
 
 EmotionBubbles:
 ShockEmote:    INCBIN "gfx/emotes/shock.2bpp"

engine/overworld/npc_movement_2.asm

@@ -1,7 +1,7 @@
-FreezeEnemyTrainerSprite::
+SetEnemyTrainerToStayAndFaceAnyDirection::
 	ld a, [wCurMap]
 	cp POKEMON_TOWER_7F
-	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them
+	ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't set them
 	ld hl, RivalIDs
 	ld a, [wEngagedTrainerClass]
 	ld b, a
@@ -10,7 +10,7 @@ FreezeEnemyTrainerSprite::
 	cp -1
 	jr z, .notRival
 	cp b
-	ret z ; the rival leaves after battling, so don't freeze him
+	ret z ; the rival leaves after battling, so don't set him
 	jr .loop
 .notRival
 	ld a, [wSpriteIndex]

home/map_objects.asm

@@ -293,9 +293,9 @@ SetSpriteMovementBytesToFE::
 SetSpriteMovementBytesToFF::
 	push hl
 	call GetSpriteMovementByte1Pointer
-	ld [hl], $FF
+	ld [hl], STAY
 	call GetSpriteMovementByte2Pointer
-	ld [hl], $FF ; prevent person from walking?
+	ld [hl], NONE
 	pop hl
 	ret
 

home/trainers.asm

@@ -358,7 +358,7 @@ PrintEndBattleText::
 	pop af
 	ldh [hLoadedROMBank], a
 	ld [MBC1RomBank], a
-	farcall FreezeEnemyTrainerSprite
+	farcall SetEnemyTrainerToStayAndFaceAnyDirection
 	jp WaitForSoundToFinish
 
 GetSavedEndBattleTextPointer::

ram/wram.asm

@@ -639,10 +639,13 @@ wPlayerMonMinimized:: db
 
 	ds 13
 
-; number of hits by enemy in attacks like Double Slap, etc.
-wEnemyNumHits:: ; db
+UNION
 ; the amount of damage accumulated by the enemy while biding
 wEnemyBideAccumulatedDamage:: dw
+NEXTU
+; number of hits by enemy in attacks like Double Slap, etc.
+wEnemyNumHits:: db
+ENDU
 
 	ds 8
 wMiscBattleDataEnd::
@@ -1919,7 +1922,7 @@ wOptions:: db
 
 wObtainedBadges:: flag_array NUM_BADGES
 
-	ds 1
+wUnusedObtainedBadges:: db
 
 wLetterPrintingDelayFlags:: db
 
@@ -2395,7 +2398,7 @@ wSerialEnemyDataBlock:: ; ds $1a8
 
 	ds 9
 
-wEnemyPartyCount:: ds 1
+wEnemyPartyCount:: db
 wEnemyPartySpecies:: ds PARTY_LENGTH + 1
 
 wEnemyMons::

scripts/VermilionDock.asm

@@ -155,7 +155,7 @@ VermilionDock_EmitSmokePuff:
 	ret
 
 VermilionDockOAMBlock:
-	; tile id, attribute
+; tile ID, attributes
 	db $fc, $10
 	db $fd, $10
 	db $fe, $10

tools/Makefile

@@ -16,8 +16,5 @@ all: $(tools)
 clean:
 	$(RM) $(tools)
 
-gfx: common.h
-scan_includes: common.h
-
-%: %.c
+%: %.c common.h
 	$(CC) $(CFLAGS) -o $@ $<