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

engine/movie/evolution.asm

@@ -8,7 +8,7 @@ EvolveMon:
 	push af
 	xor a
 	ld [wLowHealthAlarm], a
-;	ld [wChannelSoundIDs + Ch5], a
+;	ld [wChannelSoundIDs + CHAN5], a
 	dec a ; SFX_STOP_ALL_MUSIC
 ;	ld [wNewSoundID], a
 	call PlaySound

engine/movie/intro.asm

@@ -3,7 +3,7 @@
 	const MOVE_GENGAR_RIGHT
 	const MOVE_GENGAR_LEFT
 
-ANIMATION_END EQU 80
+DEF ANIMATION_END EQU 80
 
 PlayIntro:
 	xor a
@@ -158,7 +158,7 @@ AnimateIntroNidorino:
 	jr AnimateIntroNidorino
 
 UpdateIntroNidorinoOAM:
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld a, [wIntroNidorinoBaseTile]
 	ld d, a
 .loop
@@ -177,7 +177,7 @@ UpdateIntroNidorinoOAM:
 	ret
 
 InitIntroNidorinoOAM:
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld d, 0
 .loop
 	push bc

engine/movie/oak_speech/init_player_data.asm

@@ -14,14 +14,14 @@ InitPlayerData2:
 
 	ld hl, wPartyCount
 	call InitializeEmptyList
-	ld hl, wNumInBox
+	ld hl, wBoxCount
 	call InitializeEmptyList
 	ld hl, wNumBagItems
 	call InitializeEmptyList
 	ld hl, wNumBoxItems
 	call InitializeEmptyList
 
-START_MONEY EQU $3000
+DEF START_MONEY EQU $3000
 	ld hl, wPlayerMoney + 1
 	ld a, HIGH(START_MONEY)
 	ld [hld], a

engine/movie/oak_speech/oak_speech2.asm

@@ -15,7 +15,7 @@ ChoosePlayerName:
 	xor a ; NAME_PLAYER_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
@@ -48,7 +48,7 @@ ChooseRivalName:
 	ld a, NAME_RIVAL_SCREEN
 	ld [wNamingScreenType], a
 	call DisplayNamingScreen
-	ld a, [wcf4b]
+	ld a, [wStringBuffer]
 	cp "@"
 	jr z, .customName
 	call ClearScreen
@@ -210,7 +210,7 @@ GetDefaultName:
 	ld h, d
 	ld l, e
 	ld de, wcd6d
-	ld bc, $14
+	ld bc, NAME_BUFFER_LENGTH
 	jp CopyData
 
 INCLUDE "data/player_names_list.asm"

engine/movie/splash.asm

@@ -3,24 +3,24 @@ LoadShootingStarGraphics:
 	ldh [rOBP0], a
 	ld a, $a4
 	ldh [rOBP1], a
-	ld de, AnimationTileset2 tile 3 ; star tile (top left quadrant)
+	ld de, MoveAnimationTiles1 tile 3 ; star tile (top left quadrant)
 	ld hl, vChars1 tile $20
-	lb bc, BANK(AnimationTileset2), 1
+	lb bc, BANK(MoveAnimationTiles1), 1
 	call CopyVideoData
-	ld de, AnimationTileset2 tile 19 ; star tile (bottom left quadrant)
+	ld de, MoveAnimationTiles1 tile 19 ; star tile (bottom left quadrant)
 	ld hl, vChars1 tile $21
-	lb bc, BANK(AnimationTileset2), 1
+	lb bc, BANK(MoveAnimationTiles1), 1
 	call CopyVideoData
 	ld de, FallingStar
 	ld hl, vChars1 tile $22
 	lb bc, BANK(FallingStar), (FallingStarEnd - FallingStar) / $10
 	call CopyVideoData
 	ld hl, GameFreakLogoOAMData
-	ld de, wOAMBuffer + $60
+	ld de, wShadowOAMSprite24
 	ld bc, GameFreakLogoOAMDataEnd - GameFreakLogoOAMData
 	call CopyData
 	ld hl, GameFreakShootingStarOAMData
-	ld de, wOAMBuffer
+	ld de, wShadowOAM
 	ld bc, GameFreakShootingStarOAMDataEnd - GameFreakShootingStarOAMData
 	jp CopyData
 
@@ -30,7 +30,7 @@ AnimateShootingStar:
 	call PlaySound
 
 ; Move the big star down and left across the screen.
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	lb bc, $a0, $4
 .bigStarLoop
 	push hl
@@ -60,7 +60,7 @@ AnimateShootingStar:
 	jr nz, .bigStarLoop
 
 ; Clear big star OAM.
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld c, 4
 	ld de, 4
 .clearOAMLoop
@@ -83,7 +83,7 @@ AnimateShootingStar:
 
 ; Copy 24 instances of the small stars OAM data.
 ; Note that their coordinates put them off-screen.
-	ld de, wOAMBuffer
+	ld de, wShadowOAM
 	ld a, 24
 .initSmallStarsOAMLoop
 	push af
@@ -106,7 +106,7 @@ AnimateShootingStar:
 	ld d, a
 	push bc
 	push hl
-	ld hl, wOAMBuffer + $50
+	ld hl, wShadowOAMSprite20
 	ld c, 4
 .smallStarsInnerLoop ; introduce new wave of 4 small stars OAM entries
 	ld a, [de]
@@ -131,8 +131,8 @@ AnimateShootingStar:
 	push af
 
 ; shift the existing OAM entries down to make room for the next wave
-	ld hl, wOAMBuffer + $10
-	ld de, wOAMBuffer
+	ld hl, wShadowOAMSprite04
+	ld de, wShadowOAM
 	ld bc, $50
 	call CopyData
 
@@ -186,7 +186,7 @@ SmallStarsEmptyWave:
 MoveDownSmallStars:
 	ld b, 8
 .loop
-	ld hl, wOAMBuffer + $5c
+	ld hl, wShadowOAMSprite23
 	ld a, [wMoveDownSmallStarsOAMCount]
 	ld de, -4
 	ld c, a

engine/movie/title.asm

@@ -93,7 +93,7 @@ DisplayTitleScreen:
 	call DrawPlayerCharacter
 
 ; put a pokeball in the player's hand
-	ld hl, wOAMBuffer + $28
+	ld hl, wShadowOAMSprite10
 	ld a, $74
 	ld [hl], a
 
@@ -322,7 +322,7 @@ DrawPlayerCharacter:
 	call ClearSprites
 	xor a
 	ld [wPlayerCharacterOAMTile], a
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	lb de, $60, $5a
 	ld b, 7
 .loop

engine/movie/title2.asm

@@ -115,6 +115,6 @@ GetTitleBallY:
 	pop de
 	and a
 	ret z
-	ld [wOAMBuffer + $28], a
+	ld [wShadowOAMSprite10YCoord], a
 	inc e
 	ret

engine/movie/trade.asm

@@ -56,12 +56,12 @@ TradeAnimCommon:
 	ld [wOptions], a
 	ret
 
-addtradefunc: MACRO
+MACRO addtradefunc
 \1TradeFunc::
 	dw \1
 ENDM
 
-tradefunc: MACRO
+MACRO tradefunc
 	db (\1TradeFunc - TradeFuncPointerTable) / 2
 ENDM
 
@@ -189,7 +189,7 @@ LoadTradingGFXAndMonNames:
 	ld [wd11e], a
 	call GetMonName
 	ld hl, wcd6d
-	ld de, wcf4b
+	ld de, wStringBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld a, [wTradedEnemyMonSpecies]
@@ -315,7 +315,7 @@ Trade_AnimateBallEnteringLinkCable:
 	xor $1
 	ld [wLinkCableAnimBulgeToggle], a
 	add $7e
-	ld hl, wOAMBuffer + $02
+	ld hl, wShadowOAMSprite00TileID
 	ld de, 4
 	ld c, e
 .cycleLinkCableBulgeTile
@@ -599,7 +599,7 @@ Trade_AnimCircledMon:
 	ldh a, [rBGP]
 	xor $3c ; make link cable flash
 	ldh [rBGP], a
-	ld hl, wOAMBuffer + $02
+	ld hl, wShadowOAMSprite00TileID
 	ld de, $4
 	ld c, $14
 .loop
@@ -619,7 +619,7 @@ Trade_WriteCircledMonOAM:
 	call Trade_WriteCircleOAM
 
 Trade_AddOffsetsToOAMCoords:
-	ld hl, wOAMBuffer
+	ld hl, wShadowOAM
 	ld c, $14
 .loop
 	ld a, [wBaseCoordY]
@@ -697,7 +697,7 @@ Trade_WriteCircleOAM:
 	jr nz, .loop
 	ret
 
-trade_circle_oam: MACRO
+MACRO trade_circle_oam
 	dw \1
 	db \2, \3
 ENDM

engine/movie/trade2.asm

@@ -10,7 +10,7 @@ Trade_PrintPlayerMonInfoText:
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	hlcoord 5, 2
-	ld de, wcf4b
+	ld de, wStringBuffer
 	call PlaceString
 	hlcoord 8, 4
 	ld de, wTradedPlayerMonOT