thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal

Browse source
This commit is contained in:
Rangi 2020-07-17 15:58:06 -04:00
parent f53341efa1
commit 76289dfda0
15 changed files with 893 additions and 872 deletions
Download patch file Download diff file Expand all files Collapse all files

74
engine/movie/gamefreak.asm
View file

@ -146,7 +146,7 @@ AnimateShootingStar:
ret
SmallStarsOAM:
db $00,$00,$A2,$90
dbsprite 0, 0, 0, 0, $A2, OAM_BEHIND_BG | OAM_OBP1
SmallStarsOAMEnd:
SmallStarsWaveCoordsPointerTable:
@ -161,28 +161,28 @@ SmallStarsWaveCoordsPointerTable:
; These arrays contain the Y and X coordinates of each OAM entry.
SmallStarsWave1Coords:
db $68,$30
db $68,$40
db $68,$58
db $68,$78
db $68, $30
db $68, $40
db $68, $58
db $68, $78
SmallStarsWave2Coords:
db $68,$38
db $68,$48
db $68,$60
db $68,$70
db $68, $38
db $68, $48
db $68, $60
db $68, $70
SmallStarsWave3Coords:
db $68,$34
db $68,$4C
db $68,$54
db $68,$64
db $68, $34
db $68, $4C
db $68, $54
db $68, $64
SmallStarsWave4Coords:
db $68,$3C
db $68,$5C
db $68,$6C
db $68,$74
db $68, $3C
db $68, $5C
db $68, $6C
db $68, $74
SmallStarsEmptyWave:
db $FF
@ -213,29 +213,29 @@ MoveDownSmallStars:
ret
GameFreakLogoOAMData:
db $48,$50,$8D,$00
db $48,$58,$8E,$00
db $50,$50,$8F,$00
db $50,$58,$90,$00
db $58,$50,$91,$00
db $58,$58,$92,$00
db $60,$30,$80,$00
db $60,$38,$81,$00
db $60,$40,$82,$00
db $60,$48,$83,$00
db $60,$50,$93,$00
db $60,$58,$84,$00
db $60,$60,$85,$00
db $60,$68,$83,$00
db $60,$70,$81,$00
db $60,$78,$86,$00
dbsprite 10, 9, 0, 0, $8d, 0
dbsprite 11, 9, 0, 0, $8e, 0
dbsprite 10, 10, 0, 0, $8f, 0
dbsprite 11, 10, 0, 0, $90, 0
dbsprite 10, 11, 0, 0, $91, 0
dbsprite 11, 11, 0, 0, $92, 0
dbsprite 6, 12, 0, 0, $80, 0
dbsprite 7, 12, 0, 0, $81, 0
dbsprite 8, 12, 0, 0, $82, 0
dbsprite 9, 12, 0, 0, $83, 0
dbsprite 10, 12, 0, 0, $93, 0
dbsprite 11, 12, 0, 0, $84, 0
dbsprite 12, 12, 0, 0, $85, 0
dbsprite 13, 12, 0, 0, $83, 0
dbsprite 14, 12, 0, 0, $81, 0
dbsprite 15, 12, 0, 0, $86, 0
GameFreakLogoOAMDataEnd:
GameFreakShootingStarOAMData:
db $00,$A0,$A0,$10
db $00,$A8,$A0,$30
db $08,$A0,$A1,$10
db $08,$A8,$A1,$30
dbsprite 20, 0, 0, 0, $a0, OAM_OBP1
dbsprite 21, 0, 0, 0, $a0, OAM_OBP1 | OAM_HFLIP
dbsprite 20, 1, 0, 0, $a1, OAM_OBP1
dbsprite 21, 1, 0, 0, $a1, OAM_OBP1 | OAM_HFLIP
GameFreakShootingStarOAMDataEnd:
FallingStar:

46
engine/movie/trade.asm
View file

@ -59,11 +59,11 @@ TradeAnimCommon:
addtradefunc: MACRO
\1TradeFunc::
dw \1
ENDM
ENDM
tradefunc: MACRO
db (\1TradeFunc - TradeFuncPointerTable) / 2
ENDM
ENDM
; The functions in the sequences below are executed in order by TradeFuncCommon.
; They are from opposite perspectives. The external clock one makes use of
@ -86,7 +86,7 @@ InternalClockTradeFuncSequence:
tradefunc Trade_ShowEnemyMon
tradefunc Trade_Delay100
tradefunc Trade_Cleanup
db $FF
db -1 ; end
ExternalClockTradeFuncSequence:
tradefunc LoadTradingGFXAndMonNames
@ -110,7 +110,7 @@ ExternalClockTradeFuncSequence:
tradefunc Trade_ShowClearedWindow
tradefunc PrintTradeWentToText
tradefunc Trade_Cleanup
db $FF
db -1 ; end
TradeFuncPointerTable:
addtradefunc LoadTradingGFXAndMonNames
@ -346,8 +346,8 @@ Trade_AnimateBallEnteringLinkCable:
ret
Trade_BallInsideLinkCableOAM:
db $7E,$00,$7E,$20
db $7E,$40,$7E,$60
dbsprite 0, 15, 0, 6, $7e, OAM_HFLIP
dbsprite 8, 15, 0, 6, $7e, OAM_HFLIP | OAM_VFLIP
Trade_ShowEnemyMon:
ld a, TRADE_BALL_TILT_ANIM
@ -697,31 +697,33 @@ Trade_WriteCircleOAM:
jr nz, .loop
ret
trade_circle_oam: MACRO
dw \1
db \2, \3
ENDM
Trade_CircleOAMPointers:
dw Trade_CircleOAM0
db $08,$08
dw Trade_CircleOAM1
db $18,$08
dw Trade_CircleOAM2
db $08,$18
dw Trade_CircleOAM3
db $18,$18
; 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:
db $38,$10,$39,$10
db $3A,$10,$3B,$10
dbsprite 2, 7, 0, 0, $39, OAM_OBP1
dbsprite 2, 7, 0, 2, $3b, OAM_OBP1
Trade_CircleOAM1:
db $39,$30,$38,$30
db $3B,$30,$3A,$30
dbsprite 6, 7, 0, 1, $38, OAM_OBP1 | OAM_HFLIP
dbsprite 6, 7, 0, 3, $3a, OAM_OBP1 | OAM_HFLIP
Trade_CircleOAM2:
db $3A,$50,$3B,$50
db $38,$50,$39,$50
dbsprite 10, 7, 0, 2, $3b, OAM_OBP1 | OAM_VFLIP
dbsprite 10, 7, 0, 0, $39, OAM_OBP1 | OAM_VFLIP
Trade_CircleOAM3:
db $3B,$70,$3A,$70
db $39,$70,$38,$70
dbsprite 14, 7, 0, 3, $3a, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
dbsprite 14, 7, 0, 1, $38, OAM_OBP1 | OAM_HFLIP | OAM_VFLIP
; a = species
Trade_LoadMonSprite: