diff options
| author | dannye <33dannye@gmail.com> | 2020-05-24 18:59:05 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-05-24 18:59:05 -0500 |
| commit | 9a8811b492115a3b078a260c0e6be37b2e4c1ee4 (patch) | |
| tree | 9404e9750120195b0756b81ae1239dec37b5e177 | |
| parent | 4889e8fa3ea9401a7692ed588ab24239b328f30e (diff) | |
Misc minor clean up
spotted by comparing against pokeyellow
| -rwxr-xr-x | engine/battle/animations.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rwxr-xr-x | engine/cable_club.asm | 2 | ||||
| -rw-r--r-- | engine/menu/bills_pc.asm | 2 | ||||
| -rwxr-xr-x | text/map_names.asm | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 74e48535..7d5ab20d 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2427,7 +2427,7 @@ MoveSoundTable: db SFX_BATTLE_2A, $f0,$60 ; BUBBLEBEAM db SFX_BATTLE_28, $00,$80 ; AURORA_BEAM db SFX_BATTLE_36, $00,$80 ; HYPER_BEAM - db SFX_PECK,$01, $a0 ; PECK + db SFX_PECK, $01,$a0 ; PECK db SFX_BATTLE_13, $f0,$20 ; DRILL_PECK db SFX_BATTLE_23, $01,$c0 ; SUBMISSION db SFX_BATTLE_23, $00,$80 ; LOW_KICK diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 2b00a812..90033b53 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -2576,7 +2576,7 @@ MoveSelectionMenu: coord hl, 4, 12 ld b, 4 ld c, 14 - di ; out of pure coincidence, it is possible for vblank to occur between the di and ei + di ; out of pure coincidence, it is possible for vblank to occur between the di and ei ; so it is necessary to put the di ei block to not cause tearing call TextBoxBorder coord hl, 4, 12 diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 3e72daa9..141ed396 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -826,7 +826,7 @@ TradeCenter_Trade: ld [wTradedEnemyMonSpecies], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, $2 + ld a, BANK(Music_SafariZone) ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE ld [wNewSoundID], a diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 0864828a..a05676c4 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -550,5 +550,5 @@ JustAMomentText:: tx_pre_jump OpenBillsPCText OpenBillsPCText:: - db $FD ; FuncTX_BillsPC + TX_BILLS_PC diff --git a/text/map_names.asm b/text/map_names.asm index cd9f6640..c2642942 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -98,7 +98,7 @@ RocketHQName: SilphCoName: db "SILPH CO.@" PokemonMansionName: - db $4a," MANSION@" + db "<pkmn> MANSION@" SafariZoneName: db "SAFARI ZONE@" CeruleanCaveName: |