diff options
| -rw-r--r-- | constants/radio_constants.asm | 1 | ||||
| -rw-r--r-- | data/events/odd_eggs.asm | 2 | ||||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 4 | ||||
| -rw-r--r-- | engine/events/pokecenter_pc.asm | 8 | ||||
| -rw-r--r-- | engine/gfx/sgb_layouts.asm | 4 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/decorations.asm | 6 | ||||
| -rw-r--r-- | engine/pokegear/radio.asm | 6 | ||||
| -rw-r--r-- | engine/pokemon/mail.asm | 4 |
9 files changed, 23 insertions, 18 deletions
diff --git a/constants/radio_constants.asm b/constants/radio_constants.asm index e9c7abaf3..f0899e071 100644 --- a/constants/radio_constants.asm +++ b/constants/radio_constants.asm @@ -129,3 +129,4 @@ NUM_BUENA_PRIZES EQU 9 const BUENA_ITEM const BUENA_MOVE const BUENA_STRING +NUM_BUENA_FUNCTIONS EQU const_value diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm index 20bac2dc1..00eaf0664 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -6,6 +6,7 @@ prob_total = prob_total + (\1) ENDM OddEggProbabilities: +; entries correspond to OddEggs (below) table_width 2, OddEggProbabilities prob_total = 0 ; Pichu @@ -30,6 +31,7 @@ prob_total = 0 prob 10 prob 1 assert_table_length NUM_ODD_EGGS + assert prob_total == 100, "OddEggProbabilities do not sum to 100%!" OddEggs: table_width NICKNAMED_MON_STRUCT_LENGTH, OddEggs diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 785e43238..1e424f09e 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1331,7 +1331,7 @@ Function1709bb: ; BattleTowerAction $10 jr nc, .invalid ld e, a ld d, 0 - ld hl, .jumptable + ld hl, .Jumptable add hl, de add hl, de ld a, [hli] @@ -1347,7 +1347,7 @@ Function1709bb: ; BattleTowerAction $10 call CloseSRAM ret -.jumptable: +.Jumptable: dw .NoAction dw .NoAction dw .DoAction1 diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm index 79e02d4f4..d2e6ca83f 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 66892997f..69615a616 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 @@ -566,7 +566,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 999091280..2a48dbd40 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: @@ -237,9 +237,9 @@ DoTradeAnimation: ret .DoTradeAnimCommand: - jumptable .JumpTable, wJumptableIndex + jumptable .Jumptable, wJumptableIndex -.JumpTable: +.Jumptable: add_tradeanim TradeAnim_AdvanceScriptPointer ; 00 add_tradeanim TradeAnim_ShowGivemonData ; 01 add_tradeanim TradeAnim_ShowGetmonData ; 02 diff --git a/engine/overworld/decorations.asm b/engine/overworld/decorations.asm index d8ec6d9bc..4acebba19 100644 --- a/engine/overworld/decorations.asm +++ b/engine/overworld/decorations.asm @@ -970,13 +970,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/pokegear/radio.asm b/engine/pokegear/radio.asm index dd03b5c3f..3ee68bf8d 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -1518,7 +1518,7 @@ GetBuenasPassword: and $f ld c, a push hl - ld hl, .StringFunctionJumpTable + ld hl, .StringFunctionJumptable ld e, b add hl, de add hl, de @@ -1531,12 +1531,14 @@ GetBuenasPassword: ld c, [hl] ret -.StringFunctionJumpTable: +.StringFunctionJumptable: ; entries correspond to BUENA_* constants + table_width 2, GetBuenasPassword.StringFunctionJumptable dw .Mon ; BUENA_MON dw .Item ; BUENA_ITEM dw .Move ; BUENA_MOVE dw .RawString ; BUENA_STRING + assert_table_length NUM_BUENA_FUNCTIONS .Mon: call .GetTheIndex diff --git a/engine/pokemon/mail.asm b/engine/pokemon/mail.asm index e70f0ec53..55e6b03fb 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 |