Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't pass redundant label names to table_width and list_start (#1160)

Browse Source
This commit is contained in:
Rangi
2024-12-27 12:35:35 -05:00
committed by GitHub
parent 3f686e67da
commit 85ddf0e90a
140 changed files with 214 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/events/bug_contest_flags.asm
View File

@@ -1,5 +1,5 @@
BugCatchingContestantEventFlagTable:
table_width 2, BugCatchingContestantEventFlagTable
table_width 2
dw EVENT_BUG_CATCHING_CONTESTANT_1A
dw EVENT_BUG_CATCHING_CONTESTANT_2A
dw EVENT_BUG_CATCHING_CONTESTANT_3A

2
data/events/bug_contest_winners.asm
View File

@@ -1,5 +1,5 @@
BugContestantPointers:
table_width 2, BugContestantPointers
table_width 2
dw BugContestant_BugCatcherDon ; this reverts back to the player
dw BugContestant_BugCatcherDon
dw BugContestant_BugCatcherEd

2
data/events/elevator_floors.asm
View File

@@ -1,6 +1,6 @@
ElevatorFloorNames:
; entries correspond to FLOOR_* constants
table_width 2, ElevatorFloorNames
table_width 2
dw .B4F
dw .B3F
dw .B2F

2
data/events/engine_flags.asm
View File

@@ -6,7 +6,7 @@ ENDM
EngineFlags:
; entries correspond to ENGINE_* constants
table_width 3, EngineFlags
table_width 3
; pokegear
engine_flag wPokegearFlags, POKEGEAR_RADIO_CARD_F

2
data/events/happiness_changes.asm
View File

@@ -1,6 +1,6 @@
HappinessChanges:
; entries correspond to HAPPINESS_* constants
table_width 3, HappinessChanges
table_width 3
; change if happiness < 100, change if happiness < 200, change otherwise
db +5, +3, +2 ; Gained a level
db +5, +3, +2 ; Vitamin

2
data/events/npc_trades.asm
View File

@@ -7,7 +7,7 @@ ENDM
NPCTrades:
; entries correspond to NPCTRADE_* constants
table_width NPCTRADE_STRUCT_LENGTH, NPCTrades
table_width NPCTRADE_STRUCT_LENGTH
npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER
npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER
npctrade TRADE_DIALOGSET_HAPPY, KRABBY, VOLTORB, "VOLTY@@@@@@", $98, $88, PRZCUREBERRY, 29189, "TIM@@@@@@@@", TRADE_GENDER_EITHER

4
data/events/odd_eggs.asm
View File

@@ -7,7 +7,7 @@ ENDM
OddEggProbabilities:
; entries correspond to OddEggs (below)
table_width 2, OddEggProbabilities
table_width 2
DEF prob_total = 0
; Pichu
prob 8
@@ -34,7 +34,7 @@ DEF prob_total = 0
assert prob_total == 100, "OddEggProbabilities do not sum to 100%!"
OddEggs:
table_width NICKNAMED_MON_STRUCT_LENGTH, OddEggs
table_width NICKNAMED_MON_STRUCT_LENGTH
db PICHU
db NO_ITEM

4
data/events/unown_walls.asm
View File

@@ -6,7 +6,7 @@ DEF UNOWNWORD_{d:UNOWNWORDS_HO_OH} EQUS "HO-OH"
UnownWalls:
; entries correspond to UNOWNWORDS_* constants
list_start UnownWalls
list_start
for x, NUM_UNOWN_WALLS
li "{UNOWNWORD_{d:x}}"
endr
@@ -14,7 +14,7 @@ UnownWalls:
MenuHeaders_UnownWalls:
; entries correspond to UNOWNWORDS_* constants
table_width UNOWN_WALL_MENU_HEADER_SIZE, MenuHeaders_UnownWalls
table_width UNOWN_WALL_MENU_HEADER_SIZE
for x, NUM_UNOWN_WALLS
DEF n = CHARLEN("{UNOWNWORD_{d:x}}")
db MENU_BACKUP_TILES ; flags