summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-06-19 19:52:07 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2021-06-19 19:52:07 -0400
commit3eda24dc473813e44e55afb1cf8f57a354fb7a10 (patch)
tree28350b5a19f2dfdd95ed045ed256095516d4bfbe
parenta9dd70cc35acee8b5eb701da66d82ba74a1491c2 (diff)
Standardize capitalization of ".Jumptable"
-rw-r--r--engine/events/pokecenter_pc.asm8
-rw-r--r--engine/gfx/sgb_layouts.asm4
-rw-r--r--engine/movie/trade_animation.asm6
-rw-r--r--engine/overworld/decorations.asm6
-rw-r--r--engine/pokemon/mail.asm4
5 files changed, 14 insertions, 14 deletions
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 79e02d4f..d2e6ca83 100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
@@ -4,7 +4,7 @@
const PCPC_BEFORE_HOF ; 1
const PCPC_POSTGAME ; 2
- ; PokemonCenterPC.JumpTable indexes
+ ; PokemonCenterPC.Jumptable indexes
const_def
const PCPCITEM_PLAYERS_PC ; 0
const PCPCITEM_BILLS_PC ; 1
@@ -30,7 +30,7 @@ PokemonCenterPC:
call DoNthMenu
jr c, .shutdown
ld a, [wMenuSelection]
- ld hl, .JumpTable
+ ld hl, .Jumptable
call MenuJumptable
jr nc, .loop
@@ -51,9 +51,9 @@ PokemonCenterPC:
db 0 ; items
dw .WhichPC
dw PlaceNthMenuStrings
- dw .JumpTable
+ dw .Jumptable
-.JumpTable:
+.Jumptable:
; entries correspond to PCPCITEM_* constants
dw PlayersPC, .String_PlayersPC
dw BillsPC, .String_BillsPC
diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index b7a6fc3f..bdc0a77d 100644
--- a/engine/gfx/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
@@ -17,7 +17,7 @@ LoadSGBLayout:
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, _LoadSGBLayout_ReturnFromJumpTable
+ ld de, _LoadSGBLayout_ReturnFromJumptable
push de
jp hl
@@ -572,7 +572,7 @@ endr
INCLUDE "data/maps/sgb_roof_pal_inds.asm"
-_LoadSGBLayout_ReturnFromJumpTable:
+_LoadSGBLayout_ReturnFromJumptable:
push de
call PushSGBPals
pop hl
diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm
index 1d6fda65..ee00cf1d 100644
--- a/engine/movie/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
@@ -15,7 +15,7 @@ add_tradeanim: MACRO
ENDM
tradeanim: MACRO
- db (\1_TradeCmd - DoTradeAnimation.JumpTable) / 2
+ db (\1_TradeCmd - DoTradeAnimation.Jumptable) / 2
ENDM
TradeAnimation:
@@ -224,9 +224,9 @@ DoTradeAnimation:
ret
.DoTradeAnimCommand:
- jumptable .JumpTable, wJumptableIndex
+ jumptable .Jumptable, wJumptableIndex
-.JumpTable:
+.Jumptable:
; entries correspond to tradeanim_* constants (see macros/scripts/trade_anims.asm)
add_tradeanim TradeAnim_AdvanceScriptPointer ; 00
add_tradeanim TradeAnim_ShowGivemonData ; 01
diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm
index 75243d01..813cc1ed 100644
--- a/engine/overworld/decorations.asm
+++ b/engine/overworld/decorations.asm
@@ -963,13 +963,13 @@ INCLUDE "data/decorations/decorations.asm"
DescribeDecoration::
ld a, b
- ld hl, .JumpTable
+ ld hl, .Jumptable
rst JumpTable
ret
-.JumpTable:
+.Jumptable:
; entries correspond to DECODESC_* constants
- table_width 2, DescribeDecoration.JumpTable
+ table_width 2, DescribeDecoration.Jumptable
dw DecorationDesc_Poster
dw DecorationDesc_LeftOrnament
dw DecorationDesc_RightOrnament
diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm
index e70f0ec5..55e6b03f 100644
--- a/engine/pokemon/mail.asm
+++ b/engine/pokemon/mail.asm
@@ -409,13 +409,13 @@ MailboxPC:
jr c, .subexit
ld a, [wMenuCursorY]
dec a
- ld hl, .JumpTable
+ ld hl, .Jumptable
rst JumpTable
.subexit
ret
-.JumpTable:
+.Jumptable:
dw .ReadMail
dw .PutInPack
dw .AttachMail