pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix accidental corruption of board menu OAM data (#11) [bug fix to 1f2be83ebc)

Browse Source
This commit is contained in:
xCrystal 2023-09-30 13:19:06 +02:00
parent 1f2be83ebc
commit 49a3f6b8c8
2 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
data/sprite_anims/oam.asm
View File

@ -210,13 +210,6 @@ SpriteAnimOAMData:
dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP dbsprite -1, 0, 0, 0, $00, 7 | Y_FLIP
dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP dbsprite 0, 0, 0, 0, $00, 7 | X_FLIP | Y_FLIP
.OAMData_Unknown1: ; unreferenced
db 4
dbsprite -1, -1, 0, 0, $00, 0 | PRIORITY
dbsprite 0, -1, 0, 0, $00, 0 | X_FLIP | PRIORITY
dbsprite -1, 0, 0, 0, $00, 0 | Y_FLIP | PRIORITY
dbsprite 0, 0, 0, 0, $00, 0 | X_FLIP | Y_FLIP | PRIORITY
.OAMData_TradePoofBubble: .OAMData_TradePoofBubble:
db 16 db 16
dbsprite -2, -2, 0, 0, $00, 0 dbsprite -2, -2, 0, 0, $00, 0
@ -334,45 +327,6 @@ SpriteAnimOAMData:
dbsprite 1, 0, 4, 4, $17, 0 dbsprite 1, 0, 4, 4, $17, 0
dbsprite 1, 1, 4, 4, $18, 0 dbsprite 1, 1, 4, 4, $18, 0
.OAMData_Unknown2: ; unreferenced
db 36
dbsprite -3, -3, 0, 0, $00, 0
dbsprite -2, -3, 0, 0, $01, 0
dbsprite -1, -3, 0, 0, $02, 0
dbsprite 0, -3, 0, 0, $03, 0
dbsprite 1, -3, 0, 0, $04, 0
dbsprite 2, -3, 0, 0, $05, 0
dbsprite -3, -2, 0, 0, $06, 0
dbsprite -2, -2, 0, 0, $07, 0
dbsprite -1, -2, 0, 0, $08, 0
dbsprite 0, -2, 0, 0, $09, 0
dbsprite 1, -2, 0, 0, $0a, 0
dbsprite 2, -2, 0, 0, $0b, 0
dbsprite -3, -1, 0, 0, $0c, 0
dbsprite -2, -1, 0, 0, $0d, 0
dbsprite -1, -1, 0, 0, $0e, 0
dbsprite 0, -1, 0, 0, $0f, 0
dbsprite 1, -1, 0, 0, $10, 0
dbsprite 2, -1, 0, 0, $11, 0
dbsprite -3, 0, 0, 0, $12, 0
dbsprite -2, 0, 0, 0, $13, 0
dbsprite -1, 0, 0, 0, $14, 0
dbsprite 0, 0, 0, 0, $15, 0
dbsprite 1, 0, 0, 0, $16, 0
dbsprite 2, 0, 0, 0, $17, 0
dbsprite -3, 1, 0, 0, $18, 0
dbsprite -2, 1, 0, 0, $19, 0
dbsprite -1, 1, 0, 0, $1a, 0
dbsprite 0, 1, 0, 0, $1b, 0
dbsprite 1, 1, 0, 0, $1c, 0
dbsprite 2, 1, 0, 0, $1d, 0
dbsprite -3, 2, 0, 0, $1e, 0
dbsprite -2, 2, 0, 0, $1f, 0
dbsprite -1, 2, 0, 0, $20, 0
dbsprite 0, 2, 0, 0, $21, 0
dbsprite 1, 2, 0, 0, $22, 0
dbsprite 2, 2, 0, 0, $23, 0
.OAMData_RedWalk: .OAMData_RedWalk:
db 4 db 4
dbsprite -1, -1, 0, 0, $00, PAL_OW_RED dbsprite -1, -1, 0, 0, $00, PAL_OW_RED

6
data/sprites/secondary_sprites.asm Executable file → Normal file
View File

@ -10,13 +10,13 @@ BoardMenuOAM:
dbsprite 3, 18, 4, 0, BOARD_MENU_OAM_FIRST_TILE + 7, PAL_OW_MISC dbsprite 3, 18, 4, 0, BOARD_MENU_OAM_FIRST_TILE + 7, PAL_OW_MISC
dbsprite 4, 18, 4, 0, BOARD_MENU_OAM_FIRST_TILE + 8, PAL_OW_MISC dbsprite 4, 18, 4, 0, BOARD_MENU_OAM_FIRST_TILE + 8, PAL_OW_MISC
; BOARDMENUITEM_PARTY ; BOARDMENUITEM_PARTY
dbsprite 3, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 9, PAL_OW_MISC dbsprite 6, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 9, PAL_OW_MISC
dbsprite 7, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 10, PAL_OW_MISC dbsprite 7, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 10, PAL_OW_MISC
dbsprite 8, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 11, PAL_OW_MISC dbsprite 8, 16, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 11, PAL_OW_MISC
dbsprite 3, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 12, PAL_OW_MISC dbsprite 6, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 12, PAL_OW_MISC
dbsprite 7, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 13, PAL_OW_MISC dbsprite 7, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 13, PAL_OW_MISC
dbsprite 8, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 14, PAL_OW_MISC dbsprite 8, 17, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 14, PAL_OW_MISC
dbsprite 3, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 15, PAL_OW_MISC dbsprite 6, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 15, PAL_OW_MISC
dbsprite 7, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 16, PAL_OW_MISC dbsprite 7, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 16, PAL_OW_MISC
dbsprite 8, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 17, PAL_OW_MISC dbsprite 8, 18, 0, 0, BOARD_MENU_OAM_FIRST_TILE + 17, PAL_OW_MISC
; BOARDMENUITEM_PACK ; BOARDMENUITEM_PACK