jumptable macro repurposed

This commit is contained in:
PikalaxALT
2015-12-26 21:59:03 -05:00
parent 2bd45ca574
commit f030315b1f
66 changed files with 1241 additions and 1759 deletions

View File

@@ -273,9 +273,8 @@ PrintDayCareText: ; 1689b
ld e, a
ld d, 0
ld hl, .TextTable
rept 2
add hl, de
endr
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -780,9 +779,8 @@ DayCare_InitBreeding: ; 16a3b
ld hl, wEggMonHappiness
ld [hli], a
xor a
rept 2
ld [hli], a
endr
ld [hli], a
ld [hl], a
ld a, [CurPartyLevel]
ld [wEggMonLevel], a

View File

@@ -163,7 +163,7 @@ OWCutJumptable: ; 8ca0c
ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, .jumptable
ld hl, .dw
rept 2
add hl, de
endr
@@ -174,7 +174,7 @@ endr
; 8ca1b
.jumptable: ; 8ca1b (23:4a1b)
.dw: ; 8ca1b (23:4a1b)
dw Cut_SpawnAnimateTree
dw Cut_SpawnAnimateLeaves
dw Cut_StartWaiting

View File

@@ -61,9 +61,9 @@ Special_MagnetTrain: ; 8cc04
ld [hVBlank], a
call ClearBGPalettes
xor a
ld [hLCDStatCustom], a
ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a
ld [hFFC6], a
ld [hFFC7], a
ld [hFFC8], a
ld [hSCX], a
ld [Requested2bppSource], a
ld [Requested2bppSource + 1], a
@@ -254,7 +254,7 @@ MagnetTrain_InitLYOverrides: ; 8cda6
ld a, [wMagnetTrainInitPosition]
call ByteFill
ld a, $43
ld [hLCDStatCustom], a
ld [hFFC6], a
ret
; 8cdc3
@@ -306,14 +306,14 @@ endr
; 8ce06
.Jumptable: ; 8ce06
jumptable_start
jumptable .InitPlayerSpriteAnim
jumptable .WaitScene
jumptable .MoveTrain1
jumptable .WaitScene
jumptable .MoveTrain2
jumptable .WaitScene
jumptable .TrainArrived
dw .InitPlayerSpriteAnim
dw .WaitScene
dw .MoveTrain1
dw .WaitScene
dw .MoveTrain2
dw .WaitScene
dw .TrainArrived
; 8ce14
.Next: ; 8ce14

View File

@@ -22,7 +22,7 @@ Special_BankOfMom: ; 16218
ld a, [wJumptableIndex]
ld e, a
ld d, 0
ld hl, .jumptable
ld hl, .dw
rept 2
add hl, de
endr
@@ -32,17 +32,17 @@ endr
jp [hl]
; 16242
.jumptable: ; 16242
jumptable_start
jumptable .CheckIfBankInitialized
jumptable .InitializeBank
jumptable .IsThisAboutYourMoney
jumptable .AccessBankOfMom
jumptable .StoreMoney
jumptable .TakeMoney
jumptable .StopOrStartSavingMoney
jumptable .AskDST
jumptable .JustDoWhatYouCan
.dw: ; 16242
dw .CheckIfBankInitialized
dw .InitializeBank
dw .IsThisAboutYourMoney
dw .AccessBankOfMom
dw .StoreMoney
dw .TakeMoney
dw .StopOrStartSavingMoney
dw .AskDST
dw .JustDoWhatYouCan
; 16254
.CheckIfBankInitialized: ; 16254