diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-09-14 12:17:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 12:17:11 -0500 |
| commit | b8c9d9a980303d4bcd1cfd9400926736363d1df9 (patch) | |
| tree | ee871c7da0eb3ad427231b1cdbd2e2dc51a5832e /asm | |
| parent | 095cbbc5c297055d2cb2c01a2c8c04dc7d055cb6 (diff) | |
| parent | b860d583e4a5b6fd39e725df998ee9837f7f3029 (diff) | |
Merge pull request #324 from Diegoisawesome/master
Document main_menu
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_frontier_2.s | 2 | ||||
| -rw-r--r-- | asm/rom_8011DC0.s | 4 | ||||
| -rw-r--r-- | asm/trade.s | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index c7966b48d..27eee478a 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -2156,7 +2156,7 @@ sub_81A0A34: @ 81A0A34 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 - bl sub_8197224 + bl RunTextPrintersAndIsPrinter0Active lsls r0, 16 cmp r0, 0 bne _081A0A68 diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 84573367a..33ace5757 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -2831,7 +2831,7 @@ sub_8017020: @ 8017020 thumb_func_start sub_801704C sub_801704C: @ 801704C push {lr} - bl sub_8197224 + bl RunTextPrintersAndIsPrinter0Active lsls r0, 16 cmp r0, 0 beq _0801705C @@ -2871,7 +2871,7 @@ _08017076: b _080170AE .pool _0801709C: - bl sub_8197224 + bl RunTextPrintersAndIsPrinter0Active lsls r0, 16 lsrs r0, 16 cmp r0, 0 diff --git a/asm/trade.s b/asm/trade.s index 1c9d1f17b..f81d8c6b2 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -1881,7 +1881,7 @@ sub_807825C: @ 807825C lsrs r1, 24 movs r0, 0x1C bl SetGpuReg - bl sub_8197224 + bl RunTextPrintersAndIsPrinter0Active bl RunTasks bl AnimateSprites bl BuildOamBuffer |