ref: def3b6049387a6d2afab66780f7f09dbb61d6166
parent: 9f017cbab8e6856680c35278829c6388e9fdf697
author: xCrystal <rgr.crystal@gmail.com>
date: Fri Dec 29 08:52:42 EST 2017
Clean up .Jumptable: spaces
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -2066,6 +2066,7 @@
dw .cgb_zero
dw .cgb_one
dw .cgb_two
+
.cgb_zero
call BattleBGEffects_IncrementJumptable
ld hl, BG_EFFECT_STRUCT_03
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -42,7 +42,6 @@
jp hl
.Jumptable: ; e23df (38:63df)
-
dw .Init
dw .HandleJoypad
dw .WhatsUp
@@ -49,7 +48,6 @@
dw .Submenu
dw BillsPC_EndJumptableLoop
-
.Init: ; e23e9 (38:63e9)
xor a
ld [hBGMapMode], a
@@ -150,7 +148,6 @@
jp hl
BillsPCDepositJumptable: ; e24a1 (38:64a1)
-
dw BillsPCDepositFuncDeposit ; Deposit Pokemon
dw BillsPCDepositFuncStats ; Pokemon Stats
dw BillsPCDepositFuncRelease ; Release Pokemon
@@ -309,7 +306,6 @@
jp hl
.Jumptable: ; e25d2 (38:65d2)
-
dw .Init
dw .Joypad
dw .PrepSubmenu
@@ -316,7 +312,6 @@
dw BillsPC_Withdraw
dw BillsPC_EndJumptableLoop
-
.Init: ; e25dc (38:65dc)
ld a, NUM_BOXES + 1
ld [wBillsPC_LoadedBox], a
@@ -560,7 +555,6 @@
; e27ac
.Jumptable: ; e27ac
-
dw .Init
dw .Joypad
dw .PrepSubmenu
@@ -2029,7 +2023,6 @@
; e3245
.Jumptable: ; e3245
-
dw .BoxToBox
dw .PartyToBox
dw .BoxToParty
--- a/engine/card_flip.asm
+++ b/engine/card_flip.asm
@@ -80,7 +80,6 @@
; e01a0 (38:41a0)
.Jumptable: ; e01a0
-
dw .AskPlayWithThree
dw .DeductCoins
dw .ChooseACard
@@ -656,7 +655,6 @@
; e0553
.Jumptable: ; e0553
-
dw .Level1
dw .Level2
dw .Level3
@@ -833,7 +831,6 @@
; e0643
.Jumptable: ; e0643
-
dw .Impossible
dw .Impossible
dw .PikaJiggly
--- a/engine/credits.asm
+++ b/engine/credits.asm
@@ -152,9 +152,7 @@
jp hl
; 109937
-
.Jumptable: ; 109937 (42:5937)
-
dw ParseCredits
dw Credits_Next
dw Credits_Next
@@ -168,7 +166,6 @@
dw Credits_UpdateGFXRequestPath
dw Credits_RequestGFX
dw Credits_LoopBack
-
Credits_Next: ; 109951 (42:5951)
ld hl, wJumptableIndex
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
@@ -303,7 +303,6 @@
; 8ce06
.Jumptable: ; 8ce06
-
dw .InitPlayerSpriteAnim
dw .WaitScene
dw .MoveTrain1
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
@@ -128,7 +128,6 @@
ret
.Jumptable: ; c796 (3:4796)
-
dw .CheckAble
dw .DoCut
dw .FailCut
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -54,7 +54,6 @@
db "MOBILE STUDIUM@"
.Jumptable: ; 0x49d60
-
dw MainMenu_Continue
dw MainMenu_NewGame
dw MainMenu_Options
--- a/engine/mon_icons.asm
+++ b/engine/mon_icons.asm
@@ -46,7 +46,6 @@
dw Mobile_InitPartyMenuBGPal71 ; mobile
dw .GetPartyMenuMonIcon ; unused
-
.GetPartyMenuMonIcon: ; 8e862 (23:6862)
call InitPartyMenuIcon
call .GetPartyMonItemGFX
--- a/engine/pack.asm
+++ b/engine/pack.asm
@@ -28,7 +28,6 @@
; 10030
.Jumptable: ; 10030 (4:4030)
-
dw .InitGFX ; 0
dw .InitItemsPocket ; 1
dw .ItemsPocketMenu ; 2
@@ -694,7 +693,6 @@
; 104c3
.Jumptable: ; 104c3 (4:44c3)
-
dw .InitGFX ; 0
dw .InitItemsPocket ; 1
dw .ItemsPocketMenu ; 2
@@ -865,7 +863,6 @@
; 0x10614
.UsableJumptable: ; 10614
-
dw .Use
dw .Quit
; 10618
@@ -885,7 +882,6 @@
; 0x10627
.UnusableJumptable: ; 10627
-
dw .Quit
; 10629
@@ -897,7 +893,6 @@
ret
.ItemFunctionJumptable: ; 10637 (4:4637)
-
dw .Oak
dw .Oak
dw .Oak
@@ -1002,11 +997,11 @@
; 106d1
.Jumptable: ; 106d1 (4:46d1)
-
dw .ItemsPocket
dw .BallsPocket
dw .KeyItemsPocket
dw .TMHMPocket
+
.ItemsPocket: ; 106d9 (4:46d9)
xor a
call InitPocket
--- a/engine/player_step.asm
+++ b/engine/player_step.asm
@@ -59,7 +59,6 @@
ret
.Jumptable: ; d4f2 (3:54f2)
-
dw GetMovementPermissions
dw BufferScreen
dw .mobile
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -184,7 +184,6 @@
call Pokedex_LoadPointer
jp hl
-
.Jumptable: ; 40115 (10:4115)
dw Pokedex_InitMainScreen
dw Pokedex_UpdateMainScreen
@@ -201,7 +200,6 @@
dw Pokedex_UpdateUnownMode
dw Pokedex_Exit
-
Pokedex_IncrementDexPointer: ; 40131 (10:4131)
ld hl, wJumptableIndex
inc [hl]
@@ -1623,12 +1621,10 @@
call Pokedex_LoadPointer
jp hl
-
.Jumptable: ; 40bf0 (10:4bf0)
dw .NewMode
dw .OldMode
dw Pokedex_ABCMode
-
.NewMode: ; 40bf6 (10:4bf6)
ld de, NewPokedexOrder
--- a/engine/pokegear.asm
+++ b/engine/pokegear.asm
@@ -285,7 +285,6 @@
dw .Map
dw .Phone
dw .Radio
-
; 90e1a
.Clock: ; 90e1a
--- a/engine/printer_serial.asm
+++ b/engine/printer_serial.asm
@@ -29,9 +29,7 @@
jp hl
; 84031
-
.Jumptable: ; 84031 (21:4031)
-
dw Print_InitPrinterHandshake ; 00
dw Printer_CheckConnectionStatus ; 01
dw Printer_WaitSerial ; 02
@@ -55,7 +53,6 @@
dw Printer_WaitLoopBack ; 12
dw Printer_WaitLoopBack_ ; 13
-
Printer_NextSection: ; 84059 (21:4059)
ld hl, wJumptableIndex
inc [hl]
@@ -471,7 +468,6 @@
jp hl
; 842ea
-
.Jumptable: ; 842ea (21:42ea)
dw Printer_DoNothing ; 00
@@ -508,7 +504,6 @@
dw Printer_Send0x00 ; 1d
dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 1e
dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop ; 1f
-
Printer_NextInstruction: ; 8432a (21:432a)
ld hl, wPrinterOpcode
--- a/engine/slot_machine.asm
+++ b/engine/slot_machine.asm
@@ -20,8 +20,8 @@
const SLOTS_WAIT_REEL3
const SLOTS_WAIT_STOP_REEL3
const SLOTS_NEXT_09
- const SLOTS_NEXT_0a
- const SLOTS_NEXT_0b
+ const SLOTS_NEXT_0A
+ const SLOTS_NEXT_0B
const SLOTS_FLASH_IF_WIN
const SLOTS_FLASH_SCREEN
const SLOTS_GIVE_EARNED_COINS
@@ -1437,7 +1437,6 @@
; 92ebd
.Jumptable: ; 92ebd
-
dw .zero
dw .one
dw .two
@@ -1552,7 +1551,6 @@
; 92f48
.Jumptable: ; 92f48
-
dw .zero
dw .one
dw .two
@@ -2032,7 +2030,7 @@
; or this code was intended to lead to flipped percentages.
ld a, [wKeepSevenBiasChance]
and a
- jr nz, .lowerSevenStreakOdds
+ jr nz, .lower_seven_streak_odds
call Random
and %0010100
ret z ; 25% chance to stick with seven symbol bias
@@ -2040,7 +2038,7 @@
ld [wSlotBias], a
ret
-.lowerSevenStreakOdds
+.lower_seven_streak_odds
call Random
and %0011100
ret z ; 12.5% chance to stick with seven symbol bias
@@ -2080,12 +2078,10 @@
jp hl
.Jumptable: ; 9322d (24:722d)
-
dw .init
dw .fall
dw .roll
-
.init ; 93233 (24:7233)
ld hl, SPRITEANIMSTRUCT_0E
add hl, bc
@@ -2181,11 +2177,9 @@
jp hl
.Jumptable: ; 932bc (24:72bc)
-
dw .walk
dw .one
dw .two
-
.walk ; 932c2 (24:72c2)
ld hl, SPRITEANIMSTRUCT_XCOORD
--- a/engine/sprite_anims.asm
+++ b/engine/sprite_anims.asm
@@ -50,7 +50,6 @@
dw .IntroUnownF
dw .IntroSuicuneAway
-
.Null: ; 8d2a1 (23:52a1)
ret
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -534,12 +534,10 @@
ret
.Jumptable: ; 4e00d (13:600d)
-
dw .PinkPage
dw .GreenPage
dw .BluePage
-
.PinkPage: ; 4e013 (13:6013)
hlcoord 0, 9
ld b, $0
@@ -887,7 +885,6 @@
dw .BoxMon
dw .Tempmon
dw .Wildmon
-
.PartyMon: ; 4e2bf (13:62bf)
ld a, [CurPartyMon]
--- a/engine/trainer_card.asm
+++ b/engine/trainer_card.asm
@@ -80,7 +80,6 @@
dw TrainerCard_Page3_Joypad
dw TrainerCard_Quit
-
TrainerCard_IncrementJumptable: ; 251ab (9:51ab)
ld hl, wJumptableIndex
inc [hl]
--- a/engine/unown_puzzle.asm
+++ b/engine/unown_puzzle.asm
@@ -188,7 +188,6 @@
; e12d9
.Jumptable: ; e12d9
-
dw .Function
; e12db
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -381,7 +381,6 @@
; 10828a
.Jumptable: ; 10828a
-
dw GetMobileTradeAnimByte ; 00
dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01
dw MobileTradeAnim_02 ; 02
--- a/mobile/mobile_46.asm
+++ b/mobile/mobile_46.asm
@@ -7398,6 +7398,7 @@
.RunJumptable:
jumptable .Jumptable, wJumptableIndex
+
.Jumptable:
dw Function11b66d
dw Function11b6b3