diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-28 21:06:32 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-06-28 21:06:32 +0200 |
| commit | 272b98da6c5174db3f7f2d05ed765fc4cdefc2c6 (patch) | |
| tree | 8ac87362ab09758152a68fb4eaeb02c8b5c9ac14 /asm | |
| parent | ab36efdaf4a7f64df9bbfae153eb88cd9c5b29b0 (diff) | |
document party status summary
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/macros/battle_script.inc | 2 | ||||
| -rw-r--r-- | asm/party_menu.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_summary_screen.s | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 083107c08..73fcbeac1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -525,7 +525,7 @@ .byte \bank .endm - .macro atk62 bank + .macro hidepartystatussummary bank .byte 0x62 .byte \bank .endm diff --git a/asm/party_menu.s b/asm/party_menu.s index 6e2b1e55a..782d8ae31 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -12158,7 +12158,7 @@ sub_81B672C: @ 81B672C bl sub_81B1B5C movs r0, 0x2 bl schedule_bg_copy_tilemap_to_vram - bl sub_805EAE8 + bl HandleBattleLowHpMusicChange ldr r1, =gTasks lsls r0, r5, 2 adds r0, r5 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 901669715..e52874f57 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -1116,7 +1116,7 @@ sub_81C4778: @ 81C4778 bne _081C47AE adds r0, r1, 0 adds r0, 0xC - bl ShouldPlayNormalPokeCry + bl ShouldPlayNormalMonCry cmp r0, 0x1 bne _081C47A4 ldrh r0, [r4, 0x2] |