From 81ff6d189e101d399e26ebad93a3427bd20156bb Mon Sep 17 00:00:00 2001 From: xCrystal Date: Mon, 19 Feb 2018 15:19:42 +0100 Subject: Duel message box constants and more graphics and misc documenting/cleaning up --- src/engine/bank1.asm | 16 +++++++-------- src/engine/bank3.asm | 6 +++--- src/engine/bank4.asm | 6 +++--- src/engine/home.asm | 58 ++++++++++++++++++++++++++++------------------------ 4 files changed, 45 insertions(+), 41 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank1.asm b/src/engine/bank1.asm index 5be8768..eedb048 100644 --- a/src/engine/bank1.asm +++ b/src/engine/bank1.asm @@ -163,8 +163,8 @@ StartDuel: ; 409f (1:409f) .duel_finished call $5990 call Func_04a2 - ld a, $3 - call Func_2167 + ld a, BOXMSG_DECISION + call DrawDuelBoxMessage ldtx hl, DecisionText call DrawWideTextBox_WaitForInput call Func_04a2 @@ -1060,8 +1060,8 @@ Func_4b60: ; 4b60 (1:4b60) call $7133 call SwapTurn call Func_04a2 - ld a, $6 - call Func_2167 + ld a, BOXMSG_COIN_TOSS + call DrawDuelBoxMessage ld hl, $0075 call DrawWideTextBox_WaitForInput ld a, [$ff97] @@ -1146,8 +1146,8 @@ Func_4cd5: ; 4cd5 (1:4cd5) .asm_4d15 call Func_04a2 - ld a, $5 - call Func_2167 + ld a, BOXMSG_ARENA_POKEMON + call DrawDuelBoxMessage ld hl, $0069 call DrawWideTextBox_WaitForInput ld a, $1 @@ -1171,8 +1171,8 @@ Func_4cd5: ; 4cd5 (1:4cd5) .asm_4d4c call Func_04a2 - ld a, $4 - call Func_2167 + ld a, BOXMSG_BENCH_POKEMON + call DrawDuelBoxMessage ld hl, $006d call Func_2c73 ld a, $3 diff --git a/src/engine/bank3.asm b/src/engine/bank3.asm index b1fe932..c5e2fb4 100644 --- a/src/engine/bank3.asm +++ b/src/engine/bank3.asm @@ -680,7 +680,7 @@ Func_c58b: ; c58b (3:458b) call GetFloorObjectFromPos and $10 push af - ld c, SPRITE_ANIM_PROPERTY_16 + ld c, SPRITE_ANIM_FIELD_0F call GetSpriteAnimBufferProperty pop af ld a, [hl] @@ -788,7 +788,7 @@ AttemptScriptedMovement: ; c619 (3:4619) ld [wd335], a ld a, $10 ld [wd338], a - ld c, SPRITE_ANIM_PROPERTY_16 + ld c, SPRITE_ANIM_FIELD_0F call GetSpriteAnimBufferProperty set 2, [hl] ld c, SPRITE_ANIM_MOVEMENT_COUNTER @@ -918,7 +918,7 @@ Func_c6dc: ; c6dc (3:46dc) Func_c6f7: ; c6f7 (3:46f7) ld a, [wd336] ld [wWhichSprite], a - ld c, SPRITE_ANIM_PROPERTY_16 + ld c, SPRITE_ANIM_FIELD_0F call GetSpriteAnimBufferProperty res 2, [hl] ld c, SPRITE_ANIM_MOVEMENT_COUNTER diff --git a/src/engine/bank4.asm b/src/engine/bank4.asm index 42cfdac..5aed479 100644 --- a/src/engine/bank4.asm +++ b/src/engine/bank4.asm @@ -533,7 +533,7 @@ Func_10fde: ; 10fde (4:4fde) farcall CheckIfEventFlagSet or a jr nz, .asm_11015 - ld c, SPRITE_ANIM_PROPERTY_16 + ld c, SPRITE_ANIM_FIELD_0F call GetSpriteAnimBufferProperty set 7, [hl] .asm_11015 @@ -552,7 +552,7 @@ Func_11024: ; 11024 (4:5024) call PlaySFX ld a, [wd336] ld [wWhichSprite], a - ld c, SPRITE_ANIM_PROPERTY_16 + ld c, SPRITE_ANIM_FIELD_0F call GetSpriteAnimBufferProperty set 2, [hl] ld hl, Unknown_1229f @@ -1253,7 +1253,7 @@ Func_12a21: ; 12a21 (4:6a21) Func_12ab5: ; 12ab5 (4:6ab5) push hl push af - ld c, SPRITE_ANIM_PROPERTY_6 + ld c, SPRITE_ANIM_FIELD_05 call GetSpriteAnimBufferProperty pop af cp [hl] diff --git a/src/engine/home.asm b/src/engine/home.asm index beabbfc..0040051 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -1122,7 +1122,7 @@ CopyDataHLtoDE: ; 073c (0:073c) ret ; switch to rombank (A + top2 of H shifted down), -; set top2 of H to 01, +; set top2 of H to 01 (switchable ROM bank area), ; return old rombank id on top-of-stack BankpushHome: ; 0745 (0:0745) push hl @@ -4293,23 +4293,23 @@ Func_1f5f: ; 1f5f (0:1f5f) INCROM $1f96, $20b0 Func_20b0: ; 20b0 (0:20b0) - ld hl, $2fe8 + ld hl, DuelGraphics + $680 - $4000 ld a, [wConsole] cp CONSOLE_CGB jr nz, .asm_20bd - ld hl, $37f8 + ld hl, DuelGraphics + $e90 - $4000 .asm_20bd ld de, vTiles1 + $500 ld b, $30 jr CopyFontsOrDuelGraphicsTiles Func_20c4: ; 20c4 (0:20c4) - ld hl, $3028 + ld hl, DuelGraphics + $6c0 - $4000 ld a, [wConsole] cp CONSOLE_CGB - jr nz, .asm_20d1 - ld hl, $3838 -.asm_20d1 + jr nz, .copy + ld hl, DuelGraphics + $ed0 - $4000 +.copy ld de, vTiles1 + $540 ld b, $c jr CopyFontsOrDuelGraphicsTiles @@ -4321,32 +4321,32 @@ Func_20d8: ; 20d8 (0:20d8) Func_20dc: ; 20dc (0:20dc) ld b, $24 asm_20de - ld hl, $32e8 + ld hl, DuelGraphics + $980 - $4000 ld a, [wConsole] cp CONSOLE_CGB - jr nz, .asm_20eb - ld hl, $3af8 -.asm_20eb + jr nz, .copy + ld hl, DuelGraphics + $1190 - $4000 +.copy ld de, vTiles1 + $500 jr CopyFontsOrDuelGraphicsTiles Func_20f0: ; 20f0 (0:20f0) - ld hl, $4008 + ld hl, Fonts + $8 ld de, vTiles1 + $200 ld b, $d call CopyFontsOrDuelGraphicsTiles - ld hl, $3528 + ld hl, DuelGraphics + $bc0 - $4000 ld a, [wConsole] cp CONSOLE_CGB - jr nz, .asm_2108 - ld hl, $3d38 -.asm_2108 + jr nz, .copy + ld hl, DuelGraphics + $13d0 - $4000 +.copy ld de, vTiles1 + $500 ld b, $30 jr CopyFontsOrDuelGraphicsTiles Func_210f: ; 210f (0:210f) - ld hl, $40d8 + ld hl, DuelGraphics + $1770 - $4000 ld de, vTiles2 + $300 ld b, $8 jr CopyFontsOrDuelGraphicsTiles @@ -4357,7 +4357,10 @@ Func_2119: ; 2119 (0:2119) ld b, $38 ; number of tiles ; fallthrough -; copy b tiles from BANK(Fonts):hl to de +; if hl ≤ $3fff +; copy b tiles from Gfx1:hl to de +; if $4000 ≤ hl ≤ $7fff +; copy b tiles from Gfx2:hl to de CopyFontsOrDuelGraphicsTiles: ld a, BANK(Fonts); BANK(DuelGraphics); BANK(VWF) call BankpushHome @@ -4369,15 +4372,16 @@ CopyFontsOrDuelGraphicsTiles: INCROM $212f, $2167 -Func_2167: ; 2167 (0:2167) +DrawDuelBoxMessage: ; 2167 (0:2167) ld l, a - ld h, $a0 + ld h, (40 * TILE_SIZE) / 4 ; boxes are 10x4 tiles call HtimesL add hl, hl add hl, hl - ld de, $4318 + ; hl = a * $280 + ld de, DuelBoxMessages add hl, de - ld de, $8a00 + ld de, vTiles1 + $200 ld b, $28 call CopyFontsOrDuelGraphicsTiles ld a, $a0 @@ -4943,7 +4947,7 @@ Func_2518: ; 2518 (0:2518) ret Func_252e: ; 252e (0:252e) - ld a, $1d + ld a, BANK(Fonts); BANK(DuelGraphics); BANK(VWF) call BankpushHome ld de, $ccf4 push de @@ -6064,7 +6068,7 @@ Func_2f32: ; 2f32 (0:2f32) push hl call GetCardPointer jr c, .asm_2f43 - ld a, $c + ld a, BANK(CardPointers) call BankpushHome2 ld l, [hl] call BankpopHome @@ -6078,7 +6082,7 @@ Func_2f45: ; 2f45 (0:2f45) push hl call GetCardPointer jr c, .asm_2f5b - ld a, $c + ld a, BANK(CardPointers) call BankpushHome2 ld de, $0003 add hl, de @@ -6100,7 +6104,7 @@ GetCardHeader: ; 2f5d (0:2f5d) ld e, a call GetCardPointer jr c, .card_not_found - ld a, $0c + ld a, BANK(CardPointers) call BankpushHome2 ld e, [hl] ld bc, $5 @@ -8037,7 +8041,7 @@ Func_3d72: ; 3d72 (0:3d72) Func_3db7: ; 3db7 (0:3db7) push bc - ld c, SPRITE_ANIM_PROPERTY_1 + ld c, SPRITE_ANIM_FIELD_00 call GetSpriteAnimBufferProperty pop bc ret -- cgit v1.2.3