diff options
Diffstat (limited to 'engine')
-rwxr-xr-x | engine/billspc.asm | 14 | ||||
-rwxr-xr-x | engine/card_flip.asm | 6 | ||||
-rw-r--r-- | engine/credits.asm | 2 | ||||
-rwxr-xr-x | engine/crystal_intro.asm | 6 | ||||
-rwxr-xr-x | engine/debug.asm | 6 | ||||
-rw-r--r-- | engine/events.asm | 2 | ||||
-rwxr-xr-x | engine/intro_menu.asm | 4 | ||||
-rw-r--r-- | engine/map_objects.asm | 2 | ||||
-rwxr-xr-x | engine/mon_icons.asm | 2 | ||||
-rwxr-xr-x | engine/namingscreen.asm | 6 | ||||
-rwxr-xr-x | engine/options_menu.asm | 2 | ||||
-rw-r--r-- | engine/pack.asm | 14 | ||||
-rw-r--r-- | engine/pokedex.asm | 10 | ||||
-rwxr-xr-x | engine/pokegear.asm | 10 | ||||
-rwxr-xr-x | engine/printer/serial.asm | 4 | ||||
-rw-r--r-- | engine/radio.asm | 2 | ||||
-rwxr-xr-x | engine/slot_machine.asm | 12 | ||||
-rwxr-xr-x | engine/sprite_anims.asm | 6 | ||||
-rwxr-xr-x | engine/startmenu.asm | 6 | ||||
-rw-r--r-- | engine/timeofdaypals.asm | 2 | ||||
-rwxr-xr-x | engine/trade/animation.asm | 6 | ||||
-rwxr-xr-x | engine/unown_puzzle.asm | 2 |
22 files changed, 63 insertions, 63 deletions
diff --git a/engine/billspc.asm b/engine/billspc.asm index b9b51f850..4d8bf1c48 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -39,7 +39,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e23df (38:63df) @@ -147,7 +147,7 @@ _DepositPKMN: ; e2391 (38:6391) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl BillsPCDepositJumptable: ; e24a1 (38:64a1) @@ -306,7 +306,7 @@ _WithdrawPKMN: ; e2583 (38:6583) ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl .Jumptable: ; e25d2 (38:65d2) @@ -415,7 +415,7 @@ BillsPC_Withdraw: ; e2675 (38:6675) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .dw ; e2699 (38:6699) #mark dw .withdraw ; Withdraw @@ -556,7 +556,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [wJumptableIndex] ld hl, .Jumptable call BillsPC_Jumptable - jp [hl] + jp hl ; e27ac .Jumptable: ; e27ac @@ -678,7 +678,7 @@ _MovePKMNWithoutMail: ; e2759 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e2881 .Jumptable2: ; e2881 @@ -2014,7 +2014,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld l, a ld de, .dw_return push de - jp [hl] + jp hl ; e322a .dw_return ; e322a diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 0479e8248..cdf2be010 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -76,7 +76,7 @@ _CardFlip: ; e00ee (38:40ee) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e01a0 (38:41a0) .Jumptable: ; e01a0 @@ -652,7 +652,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0553 .Jumptable: ; e0553 @@ -829,7 +829,7 @@ CardFlip_CheckWinCondition: ; e0637 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e0643 .Jumptable: ; e0643 diff --git a/engine/credits.asm b/engine/credits.asm index fad8a615e..b2a1c1e93 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -263,7 +263,7 @@ Credits_Jumptable: ; 109926 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 109937 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 29bb0934f..e324ed476 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -125,7 +125,7 @@ PlaceGameFreakPresents: ; e4670 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e467f .dw ; e467f @@ -222,7 +222,7 @@ GameFreakLogoJumper: ; e46ed (39:46ed) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl GameFreakLogoScenes: ; e46fd (39:46fd) dw GameFreakLogoScene1 @@ -438,7 +438,7 @@ IntroSceneJumper: ; e490f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e491e IntroScenes: ; e491e (39:491e) diff --git a/engine/debug.asm b/engine/debug.asm index 78fc52489..9c2bb35c2 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -305,7 +305,7 @@ Function81a74: ; 81a74 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81a9a call Function81eca @@ -611,7 +611,7 @@ Function81cc2: ; 81cc2 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .asm_81cdf ld a, $4 @@ -1353,7 +1353,7 @@ Function822f0: ; 822f0 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 82301 .dw ; 82301 diff --git a/engine/events.asm b/engine/events.asm index e7598b595..2eb92d1a1 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -609,7 +609,7 @@ TryObjectEvent: ; 969b5 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nope_bugged ; pop bc diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 3e4257ab7..8e3c90204 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -1064,7 +1064,7 @@ StartTitleScreen: ; 6219 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 626a .dw @@ -1117,7 +1117,7 @@ TitleScreenScene: ; 62a3 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 62af .scenes diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 3f63030ec..d5fa84642 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -1955,7 +1955,7 @@ JumpMovementPointer: ; 505e ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 5065 ContinueReadingMovement: ; 5065 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 7e8136235..d66ea6fac 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -33,7 +33,7 @@ LoadMenuMonIcon: ; 8e83f ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8e854 diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index d80b4717b..4a7ca301a 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -70,7 +70,7 @@ NamingScreen: ; 116c1 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 1172e @@ -405,7 +405,7 @@ NamingScreenJoypadLoop: ; 11915 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 11977 @@ -1166,7 +1166,7 @@ INCBIN "gfx/icon/mail2.2bpp" ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 12017 (4:6017) dw .init_blinking_cursor diff --git a/engine/options_menu.asm b/engine/options_menu.asm index 68c1883ee..ec41288ff 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -90,7 +90,7 @@ GetOptionPointer: ; e42d6 ld a, [hli] ld h, [hl] ld l, a - jp [hl] ; jump to the code of the current highlighted item + jp hl ; jump to the code of the current highlighted item ; e42e5 .Pointers: diff --git a/engine/pack.asm b/engine/pack.asm index 19b7fccbf..8a63d22e5 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -23,7 +23,7 @@ Pack: ; 10000 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10030 @@ -144,7 +144,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10124 (4:4124) .MenuDataHeader1: ; 0x10124 @@ -306,7 +306,7 @@ Pack: ; 10000 ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10249 (4:4249) MenuDataHeader_UsableKeyItem: ; 0x10249 @@ -689,7 +689,7 @@ BattlePack: ; 10493 ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 104c3 @@ -846,7 +846,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ld a, [wMenuCursorY] dec a call Pack_GetJumptablePointer - jp [hl] + jp hl ; 10601 (4:4601) .UsableMenuDataHeader: ; 0x10601 @@ -997,7 +997,7 @@ DepositSellPack: ; 106be ld a, [wJumptableIndex] ld hl, .Jumptable call Pack_GetJumptablePointer - jp [hl] + jp hl ; 106d1 @@ -1144,7 +1144,7 @@ TutorialPack: ; 107bb ld a, [wJumptableIndex] ld hl, .dw call Pack_GetJumptablePointer - jp [hl] + jp hl ; 107e1 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index e61a24964..569bdbb0b 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -182,7 +182,7 @@ Pokedex_RunJumptable: ; 4010b ld a, [wJumptableIndex] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40115 (10:4115) @@ -366,7 +366,7 @@ Pokedex_UpdateDexEntryScreen: ; 40258 (10:4258) ld a, [wDexArrowCursorPosIndex] ld hl, DexEntryScreen_MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_prev_screen ld a, [LastVolume] @@ -545,7 +545,7 @@ Pokedex_UpdateOptionScreen: ; 403be (10:43be) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .return_to_main_screen call Pokedex_BlackOutBG @@ -647,7 +647,7 @@ Pokedex_UpdateSearchScreen: ; 40471 (10:4471) ld a, [wDexArrowCursorPosIndex] ld hl, .MenuActionJumptable call Pokedex_LoadPointer - jp [hl] + jp hl .cancel call Pokedex_BlackOutBG @@ -1621,7 +1621,7 @@ Pokedex_OrderMonsByMode: ; 40bdc ld a, [wCurrentDexMode] ld hl, .Jumptable call Pokedex_LoadPointer - jp [hl] + jp hl .Jumptable: ; 40bf0 (10:4bf0) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index d180ee875..c6ea8ed4f 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -235,7 +235,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8) ld l, a ld de, .return_from_jumptable push de - jp [hl] + jp hl .return_from_jumptable call Pokegear_FinishTilemap @@ -431,7 +431,7 @@ PokegearJumptable: ; 90f04 (24:4f04) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 90f13 (24:4f13) dw PokegearClock_Init @@ -1217,7 +1217,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Cancel: ; 913f1 ld hl, PokegearText_WhomToCall @@ -1484,7 +1484,7 @@ UpdateRadioStation: ; 9166f (24:566f) ld l, a ld de, .returnafterstation push de - jp [hl] + jp hl .returnafterstation ld a, [wPokegearRadioChannelBank] @@ -2043,7 +2043,7 @@ PlayRadio: ; 91a53 ld l, a ld de, .jump_return push de - jp [hl] + jp hl .jump_return push de diff --git a/engine/printer/serial.asm b/engine/printer/serial.asm index da1c334ed..37ed2990b 100755 --- a/engine/printer/serial.asm +++ b/engine/printer/serial.asm @@ -26,7 +26,7 @@ PrinterJumptableIteration: ; 84022 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 84031 @@ -468,7 +468,7 @@ _PrinterReceive:: ; 842db ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 842ea diff --git a/engine/radio.asm b/engine/radio.asm index ce3bc7942..99408af48 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -25,7 +25,7 @@ PlayRadioShow: ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl RadioJumptable: dw OaksPkmnTalk1 ; $00 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index ea842ea9c..93be28d9a 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -796,7 +796,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 92be4 (24:6be4) @@ -1311,7 +1311,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wFirstTwoReelsMatching] @@ -1422,7 +1422,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d ld l, a ld de, .return push de - jp [hl] + jp hl .return ld a, [wSlotMatched] @@ -1855,7 +1855,7 @@ SlotPayoutText: ; 93158 (24:7158) ld l, a ld de, .return push de - jp [hl] + jp hl .return ld hl, .Text_PrintPayout @@ -1958,7 +1958,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 9322d (24:722d) @@ -2059,7 +2059,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .Jumptable: ; 932bc (24:72bc) diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 0e25cafdf..a8755b832 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -9,7 +9,7 @@ DoAnimFrame: ; 8d24b ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8d25b .Jumptable: ; 8d25b (23:525b) @@ -134,7 +134,7 @@ DoAnimFrame: ; 8d24b .four ; 8d302 (23:5302) call .AnonymousJumptable - jp [hl] + jp hl ; 8d306 (23:5306) ; Anonymous dw (see .AnonymousJumptable) @@ -418,7 +418,7 @@ DoAnimFrame: ; 8d24b .sixteen ; 8d483 (23:5483) call .AnonymousJumptable - jp [hl] + jp hl ; 8d487 (23:5487) ; Anonymous dw (see .AnonymousJumptable) diff --git a/engine/startmenu.asm b/engine/startmenu.asm index fa61d99cb..a935b8a07 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -55,7 +55,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .MenuReturns: dw .Reopen @@ -227,7 +227,7 @@ StartMenu:: ; 125cd ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 127ef .MenuString: ; 127ef @@ -701,7 +701,7 @@ PokemonActionSubmenu: ; 12a88 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl .nothing ld a, 0 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index e9b19c6f7..263a83fc1 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -250,7 +250,7 @@ GetTimePalette: ; 8c117 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 8c126 .TimePalettes: diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index d90f45a82..fa351ba3d 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -232,7 +232,7 @@ DoTradeAnimation: ; 29082 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 290af .JumpTable: ; 290af @@ -549,7 +549,7 @@ TradeAnim_TubeAnimJumptable: ; 29281 ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 2928f .Jumptable: ; 2928f @@ -1173,7 +1173,7 @@ TradeAnim_AnimateTrademonInTube: ; 29676 (a:5676) ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; 29686 .Jumptable: ; 29686 (a:5686) diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index 8d46a02a6..a1fed2520 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -183,7 +183,7 @@ UnownPuzzleJumptable: ; e12ca ld a, [hli] ld h, [hl] ld l, a - jp [hl] + jp hl ; e12d9 .Jumptable: ; e12d9 |