diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/debug/debug_room.asm | 2 | ||||
| -rw-r--r-- | engine/events/lucky_number.asm | 2 | ||||
| -rw-r--r-- | engine/menus/save.asm | 4 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc.asm | 23 | ||||
| -rw-r--r-- | engine/pokemon/bills_pc_top.asm | 6 |
5 files changed, 22 insertions, 15 deletions
diff --git a/engine/debug/debug_room.asm b/engine/debug/debug_room.asm index 3af67311..a2309dad 100644 --- a/engine/debug/debug_room.asm +++ b/engine/debug/debug_room.asm @@ -1174,6 +1174,7 @@ DebugRoom_BoxStructStrings: .SendBox: db "SEND BOX@" DebugRoom_BoxAddresses: + table_width 3, DebugRoom_BoxAddresses dba sBox1 dba sBox2 dba sBox3 @@ -1188,6 +1189,7 @@ DebugRoom_BoxAddresses: dba sBox12 dba sBox13 dba sBox14 + assert_table_length NUM_BOXES DebugRoomMenu_RTCEdit: ld hl, .PagedValuesHeader diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index e4189245..3d3c5904 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -193,6 +193,7 @@ CheckForLuckyNumberWinners: ret .BoxBankAddresses: + table_width 3, CheckForLuckyNumberWinners.BoxBankAddresses dba sBox1 dba sBox2 dba sBox3 @@ -207,6 +208,7 @@ CheckForLuckyNumberWinners: dba sBox12 dba sBox13 dba sBox14 + assert_table_length NUM_BOXES .LuckyNumberMatchPartyText: text_far _LuckyNumberMatchPartyText diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 9c3eced3..1853589f 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -1028,7 +1028,8 @@ EraseBoxes: ret BoxAddresses: -; dbww bank, address, address + table_width 5, BoxAddresses + ; dbww bank, start address, end address dbww BANK(sBox1), sBox1, sBox1End dbww BANK(sBox2), sBox2, sBox2End dbww BANK(sBox3), sBox3, sBox3End @@ -1043,6 +1044,7 @@ BoxAddresses: dbww BANK(sBox12), sBox12, sBox12End dbww BANK(sBox13), sBox13, sBox13End dbww BANK(sBox14), sBox14, sBox14End + assert_table_length NUM_BOXES Checksum: ld de, 0 diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index b0b4c158..937bac8e 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -2118,7 +2118,7 @@ GetBoxPointer: dec b ld c, b ld b, 0 - ld hl, .boxes + ld hl, .BoxBankAddresses add hl, bc add hl, bc add hl, bc @@ -2129,8 +2129,8 @@ GetBoxPointer: ld l, a ret -.boxes - ; bank, address +.BoxBankAddresses: + table_width 3, GetBoxPointer.BoxBankAddresses dba sBox1 dba sBox2 dba sBox3 @@ -2145,6 +2145,7 @@ GetBoxPointer: dba sBox12 dba sBox13 dba sBox14 + assert_table_length NUM_BOXES BillsPC_ApplyPalettes: ld b, a @@ -2297,19 +2298,15 @@ BillsPC_PrintBoxCountAndCapacity: ld de, wTextDecimalByte lb bc, 1, 2 call PrintNum - ld de, .out_of_20 + ld de, .OutOf20 call PlaceString ret .Pokemon: db "#MON@" -.out_of_20 - ; db "/20@" - db "/" - db "0" + MONS_PER_BOX / 10 ; "2" - db "0" + MONS_PER_BOX % 10 ; "0" - db "@" +.OutOf20: + db "/{d:MONS_PER_BOX}@" ; "/20@" GetBoxCount: ld a, [wCurBox] @@ -2320,7 +2317,7 @@ GetBoxCount: jr z, .activebox ld c, a ld b, 0 - ld hl, .boxbanks + ld hl, .BoxBankAddresses add hl, bc add hl, bc add hl, bc @@ -2352,7 +2349,8 @@ GetBoxCount: call CloseSRAM ret -.boxbanks +.BoxBankAddresses: + table_width 3, GetBoxCount.BoxBankAddresses dba sBox1 dba sBox2 dba sBox3 @@ -2367,6 +2365,7 @@ GetBoxCount: dba sBox12 dba sBox13 dba sBox14 + assert_table_length NUM_BOXES BillsPC_PrintBoxName: hlcoord 0, 0 diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index 1e4cf872..480adefa 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -266,7 +266,7 @@ LoadBoxMonListing: ; unreferenced cp b jr z, .same_box ld a, b - ld hl, .BoxAddrs + ld hl, .BoxAddresses ld bc, 3 call AddNTimes ld a, [hli] @@ -364,7 +364,8 @@ LoadBoxMonListing: ; unreferenced call CloseSRAM ret -.BoxAddrs: +.BoxAddresses: + table_width 3, LoadBoxMonListing.BoxAddresses dba sBox1 dba sBox2 dba sBox3 @@ -379,3 +380,4 @@ LoadBoxMonListing: ; unreferenced dba sBox12 dba sBox13 dba sBox14 + assert_table_length NUM_BOXES |