diff options
Diffstat (limited to 'misc')
-rwxr-xr-x | misc/battle_tower_5c.asm | 8 | ||||
-rw-r--r-- | misc/crystal_misc.asm | 2 | ||||
-rwxr-xr-x | misc/fixed_words.asm | 2 | ||||
-rwxr-xr-x | misc/gfx_41.asm | 2 | ||||
-rw-r--r-- | misc/mobile_40.asm | 8 | ||||
-rwxr-xr-x | misc/mobile_41.asm | 2 | ||||
-rw-r--r-- | misc/mobile_42.asm | 2 | ||||
-rw-r--r-- | misc/mobile_45.asm | 12 | ||||
-rwxr-xr-x | misc/mobile_45_sprite_engine.asm | 2 | ||||
-rwxr-xr-x | misc/mobile_46.asm | 6 | ||||
-rwxr-xr-x | misc/mobile_5c.asm | 2 | ||||
-rw-r--r-- | misc/mobile_5f.asm | 6 | ||||
-rw-r--r-- | misc/unused_title.asm | 2 |
13 files changed, 28 insertions, 28 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 09c827146..4d996167f 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -222,7 +222,7 @@ _BattleTowerBattle: ; 17022c ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170249 .dw ; 170249 @@ -692,7 +692,7 @@ Function1704e1: ; 1704e1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 17051f .dw ; 17051f @@ -947,7 +947,7 @@ BattleTowerAction: ; 170687 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 170696 @@ -1443,7 +1443,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .invalid ld a, $5 diff --git a/misc/crystal_misc.asm b/misc/crystal_misc.asm index 66f0a92ae..fb9637d4c 100644 --- a/misc/crystal_misc.asm +++ b/misc/crystal_misc.asm @@ -1,7 +1,7 @@ INCLUDE "includes.asm" -SECTION "Misc Crystal", ROMX, BANK[MISC_CRYSTAL] +SECTION "Misc Crystal", ROMX MobileAdapterGFX:: INCBIN "gfx/misc/mobile_adapter.2bpp" diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 14ef91e9d..b471ff013 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2516,7 +2516,7 @@ AnimateEZChatCursor: ; 11d0b6 (47:50b6) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: dw .zero diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index e3a1a0375..952742ec1 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -240,7 +240,7 @@ CallInSafeGFXMode: ; 104177 ; 10419c ._hl_ ; 10419c - jp [hl] + jp hl ; 10419d diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 3c7a34710..9bece8265 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1784,7 +1784,7 @@ Function100ae7: ; 100ae7 ; 100b0a -SECTION "tetsuji", ROMX, BANK[$40] +SECTION "tetsuji", ROMX charmap " ", $20 ; revert to ascii @@ -1793,7 +1793,7 @@ Unknown_100b0a: ; 100b0a ; 100b12 -SECTION "bank40_2", ROMX, BANK[$40] +SECTION "bank40_2", ROMX Function100b12: ; 100b12 call Function100dd8 @@ -3831,7 +3831,7 @@ Function101826: ; 101826 ; 10186f -SECTION "ascii 10186f", ROMX, BANK[$40] +SECTION "ascii 10186f", ROMX charmap " ", $20 ; revert to ascii @@ -3852,7 +3852,7 @@ Unknown_101895: ; 1018a8 -SECTION "bank40_3", ROMX, BANK[$40] +SECTION "bank40_3", ROMX Function1018a8: ; 1018a8 ld hl, wccb5 diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 331242d88..6a38e67c2 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1,4 +1,4 @@ -SECTION "bank41_2", ROMX, BANK[$41] +SECTION "bank41_2", ROMX ; These functions deal with miscellaneous statistics ; which were used for Trainer Rankings in Pokémon News. diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 60f9e6d66..d08bc8882 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -377,7 +377,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 10828a .Jumptable: ; 10828a diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 10242b77e..d871b5006 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -1,5 +1,5 @@ -SECTION "bank45", ROMX, BANK[$45] +SECTION "bank45", ROMX charmap " ", $20 ; revert to ascii @@ -146,7 +146,7 @@ Function114243:: ; 114243 ld h, [hl] ld l, a pop de - jp [hl] + jp hl ; 11425c @@ -5397,7 +5397,7 @@ Function11659d: ; 11659d ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1165af @@ -6835,7 +6835,7 @@ Unknown_117356: ; 117356 ; 117656 -SECTION "Mobile Stadium", ROMX, BANK[$45] +SECTION "Mobile Stadium", ROMX Special_GiveOddEgg: ; 117656 callba GiveOddEgg @@ -6931,7 +6931,7 @@ Function117719: ; 117719 (45:7719) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_117728: ; 117728 (45:7728) dw Function117738 @@ -7419,7 +7419,7 @@ Function117ae9: ; 0x117ae9 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 0x117af8 dw Function117b06 diff --git a/misc/mobile_45_sprite_engine.asm b/misc/mobile_45_sprite_engine.asm index d0183b2ca..57c45e43c 100755 --- a/misc/mobile_45_sprite_engine.asm +++ b/misc/mobile_45_sprite_engine.asm @@ -380,7 +380,7 @@ Function1161b8: ; 1161b8 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1161c7 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index 644989872..7a76927cf 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -1,4 +1,4 @@ -SECTION "bank46", ROMX, BANK[$46] +SECTION "bank46", ROMX Function118000: ; 118000 ld a, $1 @@ -3014,7 +3014,7 @@ Unknown_1196b8: ; 1196b8 db "Sun" ; 1196cd -SECTION "bank46_2", ROMX, BANK[$46] +SECTION "bank46_2", ROMX ; A hack to use ascii above. Function1196cd: ; 1196cd (46:56cd) @@ -5874,7 +5874,7 @@ Function11ad6e: ; 11ad6e ld a, [wJumptableIndex] ld hl, Jumptable_11ad78 call Function11b239 - jp [hl] + jp hl ; 11ad78 Jumptable_11ad78: ; 11ad78 diff --git a/misc/mobile_5c.asm b/misc/mobile_5c.asm index 5f72f32c7..ef9db89a8 100755 --- a/misc/mobile_5c.asm +++ b/misc/mobile_5c.asm @@ -373,7 +373,7 @@ Function171a36: ; 171a36 (5c:5a36) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl Jumptable_171a45: ; 171a45 (5c:5a45) dw Function171a95 diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 2ce71049f..fdb5ca8b4 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -1,5 +1,5 @@ -SECTION "bank5F", ROMX, BANK[$5F] +SECTION "bank5F", ROMX Function17c000: ; 17c000 @@ -1146,7 +1146,7 @@ Function17d711: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl asm_17d721 call Function17e5af @@ -3746,7 +3746,7 @@ Function17f047: ; 17f047 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .finished scf diff --git a/misc/unused_title.asm b/misc/unused_title.asm index 0f25e8a52..92ac409b1 100644 --- a/misc/unused_title.asm +++ b/misc/unused_title.asm @@ -1,5 +1,5 @@ -SECTION "bank43", ROMX, BANK[$43] +SECTION "bank43", ROMX UnusedTitleScreen: ; 10c000 |