diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-05 08:28:45 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-05 08:28:45 +0100 |
| commit | 60ecedab9e7f1fc01c289306f1196a8a0bd62886 (patch) | |
| tree | 0f7ded7fac86e204be7c312a1f3304d68d35f42c | |
| parent | f26a3e2b4dbfae41a908e7819f7b0a650c277517 (diff) | |
Identify duel check function table
| -rw-r--r-- | src/engine/bank02.asm | 28 | ||||
| -rw-r--r-- | src/engine/bank06.asm | 1 |
2 files changed, 24 insertions, 5 deletions
diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 7cf480d..f4b873c 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -19,15 +19,33 @@ DuelCheckInterface: ; 8000 (2:4000) ld b, a ld a, [wCursorDuelXPosition] add b - ld hl, $4031 + ld hl, DuelCheckMenuFunctionTable call JumpToFunctionInTable jr .begin -; 0x8031 -Func_8031: ; 8031 (2:4031) - INCROM $8031, $8158 +DuelCheckMenuFunctionTable: ; 8031 (2:4031) + dw DuelCheckMenu_InPlayArea + dw DuelCheckMenu_Glossary + dw DuelCheckMenu_YourPlayArea + dw DuelCheckMenu_OppPlayArea -CheckMenuData ; (2:4158) +DuelCheckMenu_InPlayArea: ; 8039 (2:4039) + xor a + ld [wce60], a + farcall Func_180d5 + ret + +DuelCheckMenu_Glossary: ; 8042 (2:4042) + farcall Func_006_44c8 + ret + +DuelCheckMenu_YourPlayArea: ; 8047 (2:4047) + INCROM $8047, $80da + +DuelCheckMenu_OppPlayArea: ; 80da (2:40da) + INCROM $80da, $8158 + +CheckMenuData: ; (2:4158) textitem 2, 14, InPlayAreaText textitem 2, 16, YourPlayAreaText textitem 12, 14, GlossaryText diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 7aec911..d25dccb 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -568,6 +568,7 @@ Func_006_44bf: ; 184bf (6:44bf) ld [wVBlankOAMCopyToggle], a ret +Func_006_44c8: ; 184c8 (6:44c8) xor a ld [wGlossaryPageNo], a call Func_006_452b |