Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up .Jumptable: spaces

This commit is contained in:
xCrystal 2017-12-29 13:52:42 +01:00
parent 9f017cbab8
commit def3b60493
20 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/battle_anims/bg_effects.asm
View File

@ -2066,6 +2066,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
dw .cgb_zero
dw .cgb_one
dw .cgb_two
.cgb_zero
call BattleBGEffects_IncrementJumptable
ld hl, BG_EFFECT_STRUCT_03

7
engine/billspc.asm
View File

@ -42,14 +42,12 @@ _DepositPKMN: ; e2391 (38:6391)
jp hl
.Jumptable: ; e23df (38:63df)
dw .Init
dw .HandleJoypad
dw .WhatsUp
dw .Submenu
dw BillsPC_EndJumptableLoop
.Init: ; e23e9 (38:63e9)
xor a
ld [hBGMapMode], a
@ -150,7 +148,6 @@ _DepositPKMN: ; e2391 (38:6391)
jp hl
BillsPCDepositJumptable: ; e24a1 (38:64a1)
dw BillsPCDepositFuncDeposit ; Deposit Pokemon
dw BillsPCDepositFuncStats ; Pokemon Stats
dw BillsPCDepositFuncRelease ; Release Pokemon
@ -309,14 +306,12 @@ _WithdrawPKMN: ; e2583 (38:6583)
jp hl
.Jumptable: ; e25d2 (38:65d2)
dw .Init
dw .Joypad
dw .PrepSubmenu
dw BillsPC_Withdraw
dw BillsPC_EndJumptableLoop
.Init: ; e25dc (38:65dc)
ld a, NUM_BOXES + 1
ld [wBillsPC_LoadedBox], a
@ -560,7 +555,6 @@ _MovePKMNWithoutMail: ; e2759
; e27ac
.Jumptable: ; e27ac
dw .Init
dw .Joypad
dw .PrepSubmenu
@ -2029,7 +2023,6 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
; e3245
.Jumptable: ; e3245
dw .BoxToBox
dw .PartyToBox
dw .BoxToParty

3
engine/card_flip.asm
View File

@ -80,7 +80,6 @@ _CardFlip: ; e00ee (38:40ee)
; e01a0 (38:41a0)
.Jumptable: ; e01a0
dw .AskPlayWithThree
dw .DeductCoins
dw .ChooseACard
@ -656,7 +655,6 @@ CardFlip_BlankDiscardedCardSlot: ; e0534
; e0553
.Jumptable: ; e0553
dw .Level1
dw .Level2
dw .Level3
@ -833,7 +831,6 @@ CardFlip_CheckWinCondition: ; e0637
; e0643
.Jumptable: ; e0643
dw .Impossible
dw .Impossible
dw .PikaJiggly

3
engine/credits.asm
View File

@ -152,9 +152,7 @@ Credits_Jumptable: ; 109926
jp hl
; 109937
.Jumptable: ; 109937 (42:5937)
dw ParseCredits
dw Credits_Next
dw Credits_Next
@ -169,7 +167,6 @@ Credits_Jumptable: ; 109926
dw Credits_RequestGFX
dw Credits_LoopBack
Credits_Next: ; 109951 (42:5951)
ld hl, wJumptableIndex
inc [hl]

1
engine/events/magnet_train.asm
View File

@ -303,7 +303,6 @@ MagnetTrain_Jumptable: ; 8cdf7
; 8ce06
.Jumptable: ; 8ce06
dw .InitPlayerSpriteAnim
dw .WaitScene
dw .MoveTrain1

1
engine/events/overworld.asm
View File

@ -128,7 +128,6 @@ CutFunction: ; c785
ret
.Jumptable: ; c796 (3:4796)
dw .CheckAble
dw .DoCut
dw .FailCut

1
engine/main_menu.asm
View File

@ -54,7 +54,6 @@ MainMenu: ; 49cdc
db "MOBILE STUDIUM@"
.Jumptable: ; 0x49d60
dw MainMenu_Continue
dw MainMenu_NewGame
dw MainMenu_Options

1
engine/mon_icons.asm
View File

@ -46,7 +46,6 @@ LoadMenuMonIcon: ; 8e83f
dw Mobile_InitPartyMenuBGPal71 ; mobile
dw .GetPartyMenuMonIcon ; unused
.GetPartyMenuMonIcon: ; 8e862 (23:6862)
call InitPartyMenuIcon
call .GetPartyMonItemGFX

7
engine/pack.asm
View File

@ -28,7 +28,6 @@ Pack: ; 10000
; 10030
.Jumptable: ; 10030 (4:4030)
dw .InitGFX ; 0
dw .InitItemsPocket ; 1
dw .ItemsPocketMenu ; 2
@ -694,7 +693,6 @@ BattlePack: ; 10493
; 104c3
.Jumptable: ; 104c3 (4:44c3)
dw .InitGFX ; 0
dw .InitItemsPocket ; 1
dw .ItemsPocketMenu ; 2
@ -865,7 +863,6 @@ TMHMSubmenu: ; 105dc (4:45dc)
; 0x10614
.UsableJumptable: ; 10614
dw .Use
dw .Quit
; 10618
@ -885,7 +882,6 @@ TMHMSubmenu: ; 105dc (4:45dc)
; 0x10627
.UnusableJumptable: ; 10627
dw .Quit
; 10629
@ -897,7 +893,6 @@ TMHMSubmenu: ; 105dc (4:45dc)
ret
.ItemFunctionJumptable: ; 10637 (4:4637)
dw .Oak
dw .Oak
dw .Oak
@ -1002,11 +997,11 @@ DepositSellPack: ; 106be
; 106d1
.Jumptable: ; 106d1 (4:46d1)
dw .ItemsPocket
dw .BallsPocket
dw .KeyItemsPocket
dw .TMHMPocket
.ItemsPocket: ; 106d9 (4:46d9)
xor a
call InitPocket

1
engine/player_step.asm
View File

@ -59,7 +59,6 @@ HandlePlayerStep: ; d4e5 (3:54e5)
ret
.Jumptable: ; d4f2 (3:54f2)
dw GetMovementPermissions
dw BufferScreen
dw .mobile

4
engine/pokedex.asm
View File

@ -184,7 +184,6 @@ Pokedex_RunJumptable: ; 4010b
call Pokedex_LoadPointer
jp hl
.Jumptable: ; 40115 (10:4115)
dw Pokedex_InitMainScreen
dw Pokedex_UpdateMainScreen
@ -201,7 +200,6 @@ Pokedex_RunJumptable: ; 4010b
dw Pokedex_UpdateUnownMode
dw Pokedex_Exit
Pokedex_IncrementDexPointer: ; 40131 (10:4131)
ld hl, wJumptableIndex
inc [hl]
@ -1623,13 +1621,11 @@ Pokedex_OrderMonsByMode: ; 40bdc
call Pokedex_LoadPointer
jp hl
.Jumptable: ; 40bf0 (10:4bf0)
dw .NewMode
dw .OldMode
dw Pokedex_ABCMode
.NewMode: ; 40bf6 (10:4bf6)
ld de, NewPokedexOrder
ld hl, wPokedexOrder

1
engine/pokegear.asm
View File

@ -285,7 +285,6 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
dw .Map
dw .Phone
dw .Radio
; 90e1a
.Clock: ; 90e1a

5
engine/printer_serial.asm
View File

@ -29,9 +29,7 @@ PrinterJumptableIteration: ; 84022
jp hl
; 84031
.Jumptable: ; 84031 (21:4031)
dw Print_InitPrinterHandshake ; 00
dw Printer_CheckConnectionStatus ; 01
dw Printer_WaitSerial ; 02
@ -55,7 +53,6 @@ PrinterJumptableIteration: ; 84022
dw Printer_WaitLoopBack ; 12
dw Printer_WaitLoopBack_ ; 13
Printer_NextSection: ; 84059 (21:4059)
ld hl, wJumptableIndex
inc [hl]
@ -471,7 +468,6 @@ _PrinterReceive:: ; 842db
jp hl
; 842ea
.Jumptable: ; 842ea (21:42ea)
dw Printer_DoNothing ; 00
@ -509,7 +505,6 @@ _PrinterReceive:: ; 842db
dw Printer_ReceiveTowPrinterHandshakeAndSend0x00 ; 1e
dw Printer_ReceiveTowPrinterStatusFlagsAndExitSendLoop ; 1f
Printer_NextInstruction: ; 8432a (21:432a)
ld hl, wPrinterOpcode
inc [hl]

14
engine/slot_machine.asm
View File

@ -20,8 +20,8 @@ REEL_SIZE EQU 15
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 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
; 92ebd
.Jumptable: ; 92ebd
dw .zero
dw .one
dw .two
@ -1552,7 +1551,6 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
; 92f48
.Jumptable: ; 92f48
dw .zero
dw .one
dw .two
@ -2032,7 +2030,7 @@ endr
; 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 @@ endr
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 @@ Slots_AnimateGolem: ; 9321d (24:721d)
jp hl
.Jumptable: ; 9322d (24:722d)
dw .init
dw .fall
dw .roll
.init ; 93233 (24:7233)
ld hl, SPRITEANIMSTRUCT_0E
add hl, bc
@ -2181,12 +2177,10 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
jp hl
.Jumptable: ; 932bc (24:72bc)
dw .walk
dw .one
dw .two
.walk ; 932c2 (24:72c2)
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc

1
engine/sprite_anims.asm
View File

@ -50,7 +50,6 @@ DoAnimFrame: ; 8d24b
dw .IntroUnownF
dw .IntroSuicuneAway
.Null: ; 8d2a1 (23:52a1)
ret

3
engine/stats_screen.asm
View File

@ -534,12 +534,10 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
ret
.Jumptable: ; 4e00d (13:600d)
dw .PinkPage
dw .GreenPage
dw .BluePage
.PinkPage: ; 4e013 (13:6013)
hlcoord 0, 9
ld b, $0
@ -888,7 +886,6 @@ StatsScreen_GetAnimationParam: ; 4e2ad (13:62ad)
dw .Tempmon
dw .Wildmon
.PartyMon: ; 4e2bf (13:62bf)
ld a, [CurPartyMon]
ld hl, PartyMon1

1
engine/trainer_card.asm
View File

@ -80,7 +80,6 @@ TrainerCard: ; 25105
dw TrainerCard_Page3_Joypad
dw TrainerCard_Quit
TrainerCard_IncrementJumptable: ; 251ab (9:51ab)
ld hl, wJumptableIndex
inc [hl]

1
engine/unown_puzzle.asm
View File

@ -188,7 +188,6 @@ UnownPuzzleJumptable: ; e12ca
; e12d9
.Jumptable: ; e12d9
dw .Function
; e12db

1
mobile/mobile_42.asm
View File

@ -381,7 +381,6 @@ MobileTradeAnim_JumptableLoop: ; 10824b
; 10828a
.Jumptable: ; 10828a
dw GetMobileTradeAnimByte ; 00
dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01
dw MobileTradeAnim_02 ; 02

1
mobile/mobile_46.asm
View File

@ -7398,6 +7398,7 @@ Function11b5e8: ; 11b5e8
.RunJumptable:
jumptable .Jumptable, wJumptableIndex
.Jumptable:
dw Function11b66d
dw Function11b6b3