Leahnaya/poketcg2
1
0
Fork 0
mirror of https://github.com/pret/poketcg2.git synced 2026-07-14 23:34:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #67 from jamsilva/tweaks

Browse Source
This commit is contained in:
dannye 2026-07-09 20:40:54 -05:00 committed by GitHub
commit e9db6b1993
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/bank05.asm
View File

@ -9967,7 +9967,7 @@ CheckIfCardCanBePlayed:
; this seems like a branch that is never taken
bank1call CheckCantUseTrainerDueToEffect
ret c
call $6968
call LoadNonPokemonCardEffectCommands ; BUG: should be bank1call
ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
call TryExecuteEffectCommandFunction
ret

76
src/engine/scenes.asm
View File

@ -114,8 +114,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -126,8 +126,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -138,8 +138,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -150,8 +150,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -162,8 +162,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -174,8 +174,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -186,8 +186,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -198,8 +198,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_PACK_OAM
dw $091 ; ?
dw $158 ; ?
dw SPRITE_ANIM_91
dw FRAMESET_158
dw PALETTE_160
db $ff, $ff ; end
@ -240,8 +240,8 @@ SceneDataPointers:
db $00, $00 ; x, y
dw TILESET_CARD_POP_MENU_OAM
dw $0a3 ; ?
dw $16b ; ?
dw SPRITE_ANIM_A3
dw FRAMESET_16B
dw PALETTE_171
db $ff, $ff ; end
@ -252,8 +252,8 @@ SceneDataPointers:
db $50, $48 ; x, y
dw TILESET_CARD_POP_OAM
dw $0a5 ; ?
dw $16d ; ?
dw SPRITE_ANIM_A5
dw FRAMESET_16D
dw PALETTE_174
db $ff, $ff ; end
@ -264,8 +264,8 @@ SceneDataPointers:
db $40, $30 ; x, y
dw TILESET_LINK_CROSS
dw $0a4 ; ?
dw $16c ; ?
dw SPRITE_ANIM_A4
dw FRAMESET_16C
dw PALETTE_173
db $ff, $ff ; end
@ -282,8 +282,8 @@ SceneDataPointers:
db $50, $30 ; x, y
dw TILESET_RARE_CARD_POP_OAM
dw $0a6 ; ?
dw $16e ; ?
dw SPRITE_ANIM_A6
dw FRAMESET_16E
dw PALETTE_177
db $ff, $ff ; end
@ -294,8 +294,8 @@ SceneDataPointers:
db $40, $30 ; x, y
dw TILESET_LINK_CROSS
dw $0a4 ; ?
dw $16c ; ?
dw SPRITE_ANIM_A4
dw FRAMESET_16C
dw PALETTE_173
db $ff, $ff ; end
@ -306,8 +306,8 @@ SceneDataPointers:
db $50, $48 ; x, y
dw TILESET_PRINTER_OAM
dw $0a7 ; ?
dw $16f ; ?
dw SPRITE_ANIM_A7
dw FRAMESET_16F
dw PALETTE_17A
db $ff, $ff ; end
@ -318,8 +318,8 @@ SceneDataPointers:
db $50, $40 ; x, y
dw TILESET_PRINTER_OAM
dw $0a7 ; ?
dw $170 ; ?
dw SPRITE_ANIM_A7
dw FRAMESET_170
dw PALETTE_17A
db $ff, $ff ; end
@ -360,8 +360,8 @@ SceneDataPointers:
db $28, $20 ; x, y
dw TILESET_MAIL_CROSS
dw $0a8 ; ?
dw $171 ; ?
dw SPRITE_ANIM_A8
dw FRAMESET_171
dw PALETTE_17C
db $ff, $ff ; end
@ -372,8 +372,8 @@ SceneDataPointers:
db $28, $20 ; x, y
dw TILESET_GOT_MAIL_ANIM
dw $0a9 ; ?
dw $172 ; ?
dw SPRITE_ANIM_A9
dw FRAMESET_172
dw PALETTE_17E
db $ff, $ff ; end
@ -396,8 +396,8 @@ SceneDataPointers:
db $50, $4c ; x, y
dw TILESET_LINK_OAM
dw $0ab ; ?
dw $174 ; ?
dw SPRITE_ANIM_AB
dw FRAMESET_174
dw PALETTE_183
db $ff, $ff ; end
@ -408,8 +408,8 @@ SceneDataPointers:
db $50, $48 ; x, y
dw TILESET_LINK_OAM
dw $0ab ; ?
dw $175 ; ?
dw SPRITE_ANIM_AB
dw FRAMESET_175
dw PALETTE_183
db $ff, $ff ; end