Identify more labels, and use the jumptable macro when possible
This commit is contained in:
@@ -204,16 +204,7 @@ _BattleTowerBattle:
|
||||
ret
|
||||
|
||||
.do_dw
|
||||
ld a, [wBattleTowerBattleEnded]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .dw
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .dw, wBattleTowerBattleEnded
|
||||
|
||||
.dw
|
||||
dw RunBattleTowerTrainer
|
||||
@@ -625,16 +616,7 @@ Function1704e1:
|
||||
ret
|
||||
|
||||
.DoJumptable:
|
||||
ld a, [wJumptableIndex]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .dw
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .dw, wJumptableIndex
|
||||
|
||||
.dw
|
||||
dw .Jumptable_0
|
||||
@@ -869,16 +851,7 @@ Function1704e1:
|
||||
db "れきだいりーダーいちらん@"
|
||||
|
||||
BattleTowerAction:
|
||||
ld a, [wScriptVar]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .dw
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .dw, wScriptVar
|
||||
|
||||
.dw
|
||||
dw BattleTowerAction_CheckExplanationRead
|
||||
|
@@ -154,16 +154,7 @@ CutGrassGFX:
|
||||
INCBIN "gfx/overworld/cut_grass.2bpp"
|
||||
|
||||
OWCutJumptable:
|
||||
ld a, [wJumptableIndex]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .dw
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .dw, wJumptableIndex
|
||||
|
||||
.dw
|
||||
dw Cut_SpawnAnimateTree
|
||||
|
@@ -272,16 +272,7 @@ SetMagnetTrainPals:
|
||||
ret
|
||||
|
||||
MagnetTrain_Jumptable:
|
||||
ld a, [wJumptableIndex]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .Jumptable
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .Jumptable, wJumptableIndex
|
||||
|
||||
.Jumptable:
|
||||
dw .InitPlayerSpriteAnim
|
||||
|
@@ -18,19 +18,9 @@ BankOfMom:
|
||||
ret
|
||||
|
||||
.RunJumptable:
|
||||
ld a, [wJumptableIndex]
|
||||
ld e, a
|
||||
ld d, 0
|
||||
ld hl, .dw
|
||||
add hl, de
|
||||
add hl, de
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
jp hl
|
||||
jumptable .dw, wJumptableIndex
|
||||
|
||||
.dw
|
||||
|
||||
dw .CheckIfBankInitialized
|
||||
dw .InitializeBank
|
||||
dw .IsThisAboutYourMoney
|
||||
@@ -98,7 +88,7 @@ BankOfMom:
|
||||
ld hl, MomBankWhatDoYouWantToDoText
|
||||
call PrintText
|
||||
call LoadStandardMenuHeader
|
||||
ld hl, MenuHeader_0x166b5
|
||||
ld hl, BankOfMom_MenuHeader
|
||||
call CopyMenuHeader
|
||||
call VerticalMenu
|
||||
call CloseWindow
|
||||
@@ -659,13 +649,13 @@ Mom_DepositString:
|
||||
Mom_HeldString:
|
||||
db "HELD@"
|
||||
|
||||
MenuHeader_0x166b5:
|
||||
BankOfMom_MenuHeader:
|
||||
db MENU_BACKUP_TILES ; flags
|
||||
menu_coords 0, 0, 10, 10
|
||||
dw MenuData_0x166bd
|
||||
dw .MenuData
|
||||
db 1 ; default option
|
||||
|
||||
MenuData_0x166bd:
|
||||
.MenuData:
|
||||
db STATICMENU_CURSOR ; flags
|
||||
db 4 ; items
|
||||
db "GET@"
|
||||
|
@@ -204,8 +204,6 @@ endr
|
||||
|
||||
INCLUDE "data/items/mom_phone.asm"
|
||||
|
||||
db 0, 0, 0 ; unused
|
||||
|
||||
MomHiHowAreYouText:
|
||||
text_far _MomHiHowAreYouText
|
||||
text_end
|
||||
|
Reference in New Issue
Block a user