mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Standardize capitalization of ".Jumptable"
This commit is contained in:
parent
7a03fecc38
commit
f59f1bdb88
@ -129,3 +129,4 @@ NUM_BUENA_PRIZES EQU 9
|
|||||||
const BUENA_ITEM
|
const BUENA_ITEM
|
||||||
const BUENA_MOVE
|
const BUENA_MOVE
|
||||||
const BUENA_STRING
|
const BUENA_STRING
|
||||||
|
NUM_BUENA_FUNCTIONS EQU const_value
|
||||||
|
@ -6,6 +6,7 @@ prob_total = prob_total + (\1)
|
|||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
OddEggProbabilities:
|
OddEggProbabilities:
|
||||||
|
; entries correspond to OddEggs (below)
|
||||||
table_width 2, OddEggProbabilities
|
table_width 2, OddEggProbabilities
|
||||||
prob_total = 0
|
prob_total = 0
|
||||||
; Pichu
|
; Pichu
|
||||||
@ -30,6 +31,7 @@ prob_total = 0
|
|||||||
prob 10
|
prob 10
|
||||||
prob 1
|
prob 1
|
||||||
assert_table_length NUM_ODD_EGGS
|
assert_table_length NUM_ODD_EGGS
|
||||||
|
assert prob_total == 100, "OddEggProbabilities do not sum to 100%!"
|
||||||
|
|
||||||
OddEggs:
|
OddEggs:
|
||||||
table_width NICKNAMED_MON_STRUCT_LENGTH, OddEggs
|
table_width NICKNAMED_MON_STRUCT_LENGTH, OddEggs
|
||||||
|
@ -1331,7 +1331,7 @@ Function1709bb: ; BattleTowerAction $10
|
|||||||
jr nc, .invalid
|
jr nc, .invalid
|
||||||
ld e, a
|
ld e, a
|
||||||
ld d, 0
|
ld d, 0
|
||||||
ld hl, .jumptable
|
ld hl, .Jumptable
|
||||||
add hl, de
|
add hl, de
|
||||||
add hl, de
|
add hl, de
|
||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
@ -1347,7 +1347,7 @@ Function1709bb: ; BattleTowerAction $10
|
|||||||
call CloseSRAM
|
call CloseSRAM
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.jumptable:
|
.Jumptable:
|
||||||
dw .NoAction
|
dw .NoAction
|
||||||
dw .NoAction
|
dw .NoAction
|
||||||
dw .DoAction1
|
dw .DoAction1
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
const PCPC_BEFORE_HOF ; 1
|
const PCPC_BEFORE_HOF ; 1
|
||||||
const PCPC_POSTGAME ; 2
|
const PCPC_POSTGAME ; 2
|
||||||
|
|
||||||
; PokemonCenterPC.JumpTable indexes
|
; PokemonCenterPC.Jumptable indexes
|
||||||
const_def
|
const_def
|
||||||
const PCPCITEM_PLAYERS_PC ; 0
|
const PCPCITEM_PLAYERS_PC ; 0
|
||||||
const PCPCITEM_BILLS_PC ; 1
|
const PCPCITEM_BILLS_PC ; 1
|
||||||
@ -30,7 +30,7 @@ PokemonCenterPC:
|
|||||||
call DoNthMenu
|
call DoNthMenu
|
||||||
jr c, .shutdown
|
jr c, .shutdown
|
||||||
ld a, [wMenuSelection]
|
ld a, [wMenuSelection]
|
||||||
ld hl, .JumpTable
|
ld hl, .Jumptable
|
||||||
call MenuJumptable
|
call MenuJumptable
|
||||||
jr nc, .loop
|
jr nc, .loop
|
||||||
|
|
||||||
@ -51,9 +51,9 @@ PokemonCenterPC:
|
|||||||
db 0 ; items
|
db 0 ; items
|
||||||
dw .WhichPC
|
dw .WhichPC
|
||||||
dw PlaceNthMenuStrings
|
dw PlaceNthMenuStrings
|
||||||
dw .JumpTable
|
dw .Jumptable
|
||||||
|
|
||||||
.JumpTable:
|
.Jumptable:
|
||||||
; entries correspond to PCPCITEM_* constants
|
; entries correspond to PCPCITEM_* constants
|
||||||
dw PlayersPC, .String_PlayersPC
|
dw PlayersPC, .String_PlayersPC
|
||||||
dw BillsPC, .String_BillsPC
|
dw BillsPC, .String_BillsPC
|
||||||
|
@ -17,7 +17,7 @@ LoadSGBLayout:
|
|||||||
ld a, [hli]
|
ld a, [hli]
|
||||||
ld h, [hl]
|
ld h, [hl]
|
||||||
ld l, a
|
ld l, a
|
||||||
ld de, _LoadSGBLayout_ReturnFromJumpTable
|
ld de, _LoadSGBLayout_ReturnFromJumptable
|
||||||
push de
|
push de
|
||||||
jp hl
|
jp hl
|
||||||
|
|
||||||
@ -566,7 +566,7 @@ endr
|
|||||||
|
|
||||||
INCLUDE "data/maps/sgb_roof_pal_inds.asm"
|
INCLUDE "data/maps/sgb_roof_pal_inds.asm"
|
||||||
|
|
||||||
_LoadSGBLayout_ReturnFromJumpTable:
|
_LoadSGBLayout_ReturnFromJumptable:
|
||||||
push de
|
push de
|
||||||
call PushSGBPals
|
call PushSGBPals
|
||||||
pop hl
|
pop hl
|
||||||
|
@ -15,7 +15,7 @@ add_tradeanim: MACRO
|
|||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
tradeanim: MACRO
|
tradeanim: MACRO
|
||||||
db (\1_TradeCmd - DoTradeAnimation.JumpTable) / 2
|
db (\1_TradeCmd - DoTradeAnimation.Jumptable) / 2
|
||||||
ENDM
|
ENDM
|
||||||
|
|
||||||
TradeAnimation:
|
TradeAnimation:
|
||||||
@ -237,9 +237,9 @@ DoTradeAnimation:
|
|||||||
ret
|
ret
|
||||||
|
|
||||||
.DoTradeAnimCommand:
|
.DoTradeAnimCommand:
|
||||||
jumptable .JumpTable, wJumptableIndex
|
jumptable .Jumptable, wJumptableIndex
|
||||||
|
|
||||||
.JumpTable:
|
.Jumptable:
|
||||||
add_tradeanim TradeAnim_AdvanceScriptPointer ; 00
|
add_tradeanim TradeAnim_AdvanceScriptPointer ; 00
|
||||||
add_tradeanim TradeAnim_ShowGivemonData ; 01
|
add_tradeanim TradeAnim_ShowGivemonData ; 01
|
||||||
add_tradeanim TradeAnim_ShowGetmonData ; 02
|
add_tradeanim TradeAnim_ShowGetmonData ; 02
|
||||||
|
@ -970,13 +970,13 @@ INCLUDE "data/decorations/decorations.asm"
|
|||||||
|
|
||||||
DescribeDecoration::
|
DescribeDecoration::
|
||||||
ld a, b
|
ld a, b
|
||||||
ld hl, .JumpTable
|
ld hl, .Jumptable
|
||||||
rst JumpTable
|
rst JumpTable
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.JumpTable:
|
.Jumptable:
|
||||||
; entries correspond to DECODESC_* constants
|
; entries correspond to DECODESC_* constants
|
||||||
table_width 2, DescribeDecoration.JumpTable
|
table_width 2, DescribeDecoration.Jumptable
|
||||||
dw DecorationDesc_Poster
|
dw DecorationDesc_Poster
|
||||||
dw DecorationDesc_LeftOrnament
|
dw DecorationDesc_LeftOrnament
|
||||||
dw DecorationDesc_RightOrnament
|
dw DecorationDesc_RightOrnament
|
||||||
|
@ -1518,7 +1518,7 @@ GetBuenasPassword:
|
|||||||
and $f
|
and $f
|
||||||
ld c, a
|
ld c, a
|
||||||
push hl
|
push hl
|
||||||
ld hl, .StringFunctionJumpTable
|
ld hl, .StringFunctionJumptable
|
||||||
ld e, b
|
ld e, b
|
||||||
add hl, de
|
add hl, de
|
||||||
add hl, de
|
add hl, de
|
||||||
@ -1531,12 +1531,14 @@ GetBuenasPassword:
|
|||||||
ld c, [hl]
|
ld c, [hl]
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.StringFunctionJumpTable:
|
.StringFunctionJumptable:
|
||||||
; entries correspond to BUENA_* constants
|
; entries correspond to BUENA_* constants
|
||||||
|
table_width 2, GetBuenasPassword.StringFunctionJumptable
|
||||||
dw .Mon ; BUENA_MON
|
dw .Mon ; BUENA_MON
|
||||||
dw .Item ; BUENA_ITEM
|
dw .Item ; BUENA_ITEM
|
||||||
dw .Move ; BUENA_MOVE
|
dw .Move ; BUENA_MOVE
|
||||||
dw .RawString ; BUENA_STRING
|
dw .RawString ; BUENA_STRING
|
||||||
|
assert_table_length NUM_BUENA_FUNCTIONS
|
||||||
|
|
||||||
.Mon:
|
.Mon:
|
||||||
call .GetTheIndex
|
call .GetTheIndex
|
||||||
|
@ -409,13 +409,13 @@ MailboxPC:
|
|||||||
jr c, .subexit
|
jr c, .subexit
|
||||||
ld a, [wMenuCursorY]
|
ld a, [wMenuCursorY]
|
||||||
dec a
|
dec a
|
||||||
ld hl, .JumpTable
|
ld hl, .Jumptable
|
||||||
rst JumpTable
|
rst JumpTable
|
||||||
|
|
||||||
.subexit
|
.subexit
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.JumpTable:
|
.Jumptable:
|
||||||
dw .ReadMail
|
dw .ReadMail
|
||||||
dw .PutInPack
|
dw .PutInPack
|
||||||
dw .AttachMail
|
dw .AttachMail
|
||||||
|
Loading…
Reference in New Issue
Block a user