diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-09 20:33:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-09 20:33:28 -0400 |
| commit | c61603fb3812011981e22478bce93aba8b7ec183 (patch) | |
| tree | 0bcf628e1f3615159cbae3e5c638825544699182 /asm/battle_setup.s | |
| parent | 77a6ee507fdeef8d6a3b8146c70df107e124b0b5 (diff) | |
| parent | f3bd7f06c9f260597575f60af8daf8985ce80fe1 (diff) | |
Merge pull request #113 from PikalaxALT/main_menu
Main menu and Song Constants
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index c5b4510b7..5a9797056 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -28,7 +28,7 @@ _0807F644: bl FldEffPoison_IsActive cmp r0, 0 bne _0807F686 - bl sub_812B478 + bl HelpSystem_Disable ldrb r0, [r4, 0x2] bl BT_StartOnField ldrh r0, [r4] @@ -41,7 +41,7 @@ _0807F65E: lsrs r0, 24 cmp r0, 0x1 bne _0807F686 - bl sub_812B484 + bl HelpSystem_Enable bl CleanupOverworldWindowsAndTilemaps ldr r0, _0807F68C @ =sub_800FD9C bl SetMainCallback2 |