From 0db13c69bba4aed37b15bbf985a9b591c840dc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Silva?= Date: Wed, 27 May 2026 23:10:34 +0100 Subject: [PATCH 1/2] Replace another hardcoded address. --- src/engine/bank05.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm index 6aacfc8..ee6d2e6 100644 --- a/src/engine/bank05.asm +++ b/src/engine/bank05.asm @@ -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 From 3e7bccf473eb186ffdcea281b1467f5976fc67f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Silva?= Date: Wed, 27 May 2026 23:18:29 +0100 Subject: [PATCH 2/2] Clarify some bits of scenes.asm. --- src/engine/scenes.asm | 76 +++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/engine/scenes.asm b/src/engine/scenes.asm index 5575bf2..4faa89a 100644 --- a/src/engine/scenes.asm +++ b/src/engine/scenes.asm @@ -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