diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-04 23:50:41 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-07-04 23:50:41 +0100 |
| commit | ced986e050b539e94a087fb7ad3834fb4c77b1d1 (patch) | |
| tree | 5fa6bd7d916aca05d57edfdbf538840b9493a519 /src | |
| parent | 62521e80a6a44e80ea816ff579572f49b3eb3c0c (diff) | |
Label Check menu functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank01.asm | 6 | ||||
| -rw-r--r-- | src/engine/bank02.asm | 2 | ||||
| -rw-r--r-- | src/engine/home.asm | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index fff7239..3ea4ca9 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -812,7 +812,7 @@ UsePokemonCard: ; 44db (1:44db) ; triggered by selecting the "Check" item in the duel menu DuelMenu_Check: ; 4585 (1:4585) call Func_3b31 - call Func_3096 + call CallDuelCheckInterface jp DuelMainInterface ; triggered by pressing SELECT in the duel menu @@ -5199,7 +5199,7 @@ Func_60dd: ; 60dd (1:60dd) jr z, .asm_6119 or a jr z, .asm_6132 - call Func_3096 + call CallDuelCheckInterface jr .asm_60f2 .asm_6132 call OpenTurnHolderHandScreen_Simple @@ -6297,7 +6297,7 @@ Func_67fb: ; 67fb (1:67fb) ld a, [wCurrentDuelMenuItem] or a jr z, .asm_6839 - call Func_3096 + call CallDuelCheckInterface jr .asm_6829 .asm_6839 call OpenTurnHolderHandScreen_Simple diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index d0a3ea0..aa99d5d 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -1,4 +1,4 @@ -Func_8000: ; 8000 (2:4000) +DuelCheckInterface: ; 8000 (2:4000) .begin call Func_905a xor a diff --git a/src/engine/home.asm b/src/engine/home.asm index 0101028..4043ff5 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -9276,12 +9276,12 @@ CompareDEtoBC: ; 3090 (0:3090) cp c ret -Func_3096: ; 3096 (0:3096) +CallDuelCheckInterface: ; 3096 (0:3096) ldh a, [hBankROM] push af - ld a, BANK(Func_8000) + ld a, BANK(DuelCheckInterface) call BankswitchROM - call Func_8000 + call DuelCheckInterface pop af call BankswitchROM ret |