Leahnaya/pokegold
1
0
Fork 0
mirror of https://github.com/pret/pokegold.git synced 2026-03-21 17:34:16 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rangi 2024-12-27 12:35:41 -05:00 committed by GitHub
parent bcb1092774
commit 3affb23969
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
118 changed files with 188 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/cry_pointers.asm
View File

@ -1,6 +1,6 @@
Cries:
; entries correspond to CRY_* constants (see constants/cry_constants.asm)
table_width 3, Cries
table_width 3
dba Cry_Nidoran_M
dba Cry_Nidoran_F
dba Cry_Slowpoke

6
audio/engine.asm
View File

@ -223,7 +223,7 @@ UpdateChannels:
jp hl
.ChannelFunctions:
table_width 2, UpdateChannels.ChannelFunctions
table_width 2
; music channels
dw .Channel1
dw .Channel2
@ -1371,7 +1371,7 @@ ParseMusicCommand:
MusicCommands:
; entries correspond to audio constants (see macros/scripts/audio.asm)
table_width 2, MusicCommands
table_width 2
dw Music_Octave8
dw Music_Octave7
dw Music_Octave6
@ -2783,7 +2783,7 @@ StereoTracks:
db $11, $22, $44, $88
ChannelPointers:
table_width 2, ChannelPointers
table_width 2
; music channels
dw wChannel1
dw wChannel2

2
audio/music_pointers.asm
View File

@ -2,7 +2,7 @@
Music:
; entries correspond to MUSIC_* constants
table_width 3, Music
table_width 3
dba Music_Nothing
dba Music_TitleScreen
dba Music_Route1

2
audio/notes.asm
View File

@ -1,5 +1,5 @@
FrequencyTable:
table_width 2, FrequencyTable
table_width 2
dw 0 ; __
dw $f82c ; C_
dw $f89d ; C#

2
audio/sfx_pointers.asm
View File

@ -1,6 +1,6 @@
SFX:
; entries correspond to SFX_* constants
table_width 3, SFX
table_width 3
dba Sfx_DexFanfare5079
dba Sfx_Item
dba Sfx_CaughtMon

2
data/battle/effect_command_pointers.asm
View File

@ -4,7 +4,7 @@
BattleCommandPointers:
; entries correspond to macros/scripts/battle_commands.asm
table_width 2, BattleCommandPointers
table_width 2
dw BattleCommand_CheckTurn
dw BattleCommand_CheckObedience
dw BattleCommand_UsedMoveText

2
data/battle/stat_names.asm
View File

@ -1,6 +1,6 @@
StatNames:
; entries correspond to stat ids
list_start StatNames
list_start
li "ATTACK"
li "DEFENSE"
li "SPEED"

2
data/battle_anims/framesets.asm
View File

@ -1,6 +1,6 @@
BattleAnimFrameData:
; entries correspond to BATTLE_ANIM_FRAMESET_* constants
table_width 2, BattleAnimFrameData
table_width 2
dw .Frameset_HitBig ; BATTLE_ANIM_FRAMESET_HIT_BIG
dw .Frameset_Hit ; BATTLE_ANIM_FRAMESET_HIT
dw .Frameset_HitSmall ; BATTLE_ANIM_FRAMESET_HIT_SMALL

2
data/battle_anims/oam.asm
View File

@ -6,7 +6,7 @@ ENDM
BattleAnimOAMData:
; entries correspond to BATTLE_ANIM_OAMSET_* constants
table_width 4, BattleAnimOAMData
table_width 4
battleanimoam $00, 16, .OAMData_00 ; BATTLE_ANIM_OAMSET_00
battleanimoam $04, 9, .OAMData_01 ; BATTLE_ANIM_OAMSET_01
battleanimoam $08, 4, .OAMData_02 ; BATTLE_ANIM_OAMSET_02

2
data/battle_anims/object_gfx.asm
View File

@ -6,7 +6,7 @@ ENDM
AnimObjGFX:
; entries correspond to BATTLE_ANIM_GFX_* constants
table_width 4, AnimObjGFX
table_width 4
anim_obj_gfx 0, AnimObj00GFX
anim_obj_gfx 21, AnimObjHitGFX
anim_obj_gfx 6, AnimObjCutGFX

2
data/battle_anims/objects.asm
View File

@ -18,7 +18,7 @@ ENDM
BattleAnimObjects:
; entries correspond to BATTLE_ANIM_OBJ_* constants
table_width BATTLEANIMOBJ_LENGTH, BattleAnimObjects
table_width BATTLEANIMOBJ_LENGTH
; BATTLE_ANIM_OBJ_HIT_BIG_YFIX
battleanimobj RELATIVE_X, $ff, BATTLE_ANIM_FRAMESET_HIT_BIG, BATTLE_ANIM_FUNC_NULL, PAL_BATTLE_OB_GRAY, BATTLE_ANIM_GFX_HIT
; BATTLE_ANIM_OBJ_HIT_YFIX

2
data/collision/collision_permissions.asm
View File

@ -1,6 +1,6 @@
CollisionPermissionTable::
; entries correspond to COLL_* constants
table_width 1, CollisionPermissionTable
table_width 1
db LAND_TILE ; COLL_FLOOR
db LAND_TILE ; COLL_01
db LAND_TILE ; 02

2
data/credits_strings_pointers.asm
View File

@ -1,6 +1,6 @@
CreditsStringsPointers:
; entries correspond to constants/credits_constants.asm
table_width 2, CreditsStringsPointers
table_width 2
dw Credits_SatoshiTajiri
dw Credits_JunichiMasuda
dw Credits_TetsuyaWatanabe

2
data/decorations/attributes.asm
View File

@ -7,7 +7,7 @@ ENDM
DecorationAttributes:
; entries correspond to deco constants
table_width DECOATTR_STRUCT_LENGTH, DecorationAttributes
table_width DECOATTR_STRUCT_LENGTH
decoration DECO_PLANT, 0, 0, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1, 0
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b

2
data/decorations/decorations.asm
View File

@ -1,6 +1,6 @@
DecorationIDs:
; see constants/deco_constants.asm
table_width 1, DecorationIDs
table_width 1
db DECO_FEATHERY_BED ; 2
db DECO_PINK_BED ; 3

2
data/decorations/names.asm
View File

@ -1,6 +1,6 @@
DecorationNames:
; entries correspond to constants/deco_constants.asm
list_start DecorationNames
list_start
li "CANCEL"
li "PUT IT AWAY"
li "MAGNAPLANT"

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, DROWZEE, 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

2
data/growth_rates.asm
View File

@ -11,7 +11,7 @@ ENDM
GrowthRates:
; entries correspond to GROWTH_* (see constants/pokemon_data_constants.asm)
table_width 4, GrowthRates
table_width 4
growth_rate 1, 1, 0, 0, 0 ; Medium Fast
growth_rate 3, 4, 10, 0, 30 ; Slightly Fast
growth_rate 3, 4, 20, 0, 70 ; Slightly Slow

2
data/icon_pointers.asm
View File

@ -1,6 +1,6 @@
IconPointers:
; entries correspond to ICON_* constants (see constants/icon_constants.asm)
table_width 2, IconPointers
table_width 2
dw NullIcon
dw PoliwagIcon
dw JigglypuffIcon

2
data/items/attributes.asm
View File

@ -7,7 +7,7 @@ ENDM
ItemAttributes:
; entries correspond to item ids (see constants/item_constants.asm)
table_width ITEMATTR_STRUCT_LENGTH, ItemAttributes
table_width ITEMATTR_STRUCT_LENGTH
; MASTER_BALL
item_attribute 0, HELD_NONE, 0, CANT_SELECT, BALL, ITEMMENU_NOUSE, ITEMMENU_CLOSE
; ULTRA_BALL

2
data/items/descriptions.asm
View File

@ -1,6 +1,6 @@
ItemDescriptions:
; entries correspond to item ids (see constants/item_constants.asm)
table_width 2, ItemDescriptions
table_width 2
dw MasterBallDesc
dw UltraBallDesc
dw BrightpowderDesc

2
data/items/fruit_trees.asm
View File

@ -1,6 +1,6 @@
FruitTreeItems:
; entries correspond to FRUITTREE_* constants
table_width 1, FruitTreeItems
table_width 1
db BERRY ; ROUTE_29
db BERRY ; ROUTE_30_1
db BERRY ; ROUTE_38

2
data/items/marts.asm
View File

@ -1,6 +1,6 @@
Marts:
; entries correspond to MART_* constants (see constants/mart_constants.asm)
table_width 2, Marts
table_width 2
dw MartCherrygrove
dw MartCherrygroveDex
dw MartViolet

2
data/items/names.asm
View File

@ -1,5 +1,5 @@
ItemNames::
list_start ItemNames
list_start
li "MASTER BALL"
li "ULTRA BALL"
li "BRIGHTPOWDER"

2
data/items/pocket_names.asm
View File

@ -1,6 +1,6 @@
ItemPocketNames:
; entries correspond to item type constants
table_width 2, ItemPocketNames
table_width 2
dw .Item
dw .Key
dw .Ball

2
data/maps/environment_colors.asm
View File

@ -1,6 +1,6 @@
EnvironmentColorsPointers:
; entries correspond to environment constants (see constants/map_data_constants.asm)
table_width 2, EnvironmentColorsPointers
table_width 2
dw .OutdoorColors ; unused
dw .OutdoorColors ; TOWN
dw .OutdoorColors ; ROUTE

2
data/maps/landmarks.asm
View File

@ -6,7 +6,7 @@ ENDM
Landmarks:
; entries correspond to constants/landmark_constants.asm
table_width 4, Landmarks
table_width 4
landmark -8, -16, SpecialMapName
landmark 140, 100, NewBarkTownName
landmark 128, 100, Route29Name

54
data/maps/maps.asm
View File

@ -16,7 +16,7 @@ ENDM
MapGroupPointers::
; pointers to the first map of each map group
table_width 2, MapGroupPointers
table_width 2
dw MapGroup_Olivine ; 1
dw MapGroup_Mahogany ; 2
dw MapGroup_Dungeons ; 3
@ -46,7 +46,7 @@ MapGroupPointers::
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
table_width MAP_LENGTH, MapGroup_Olivine
table_width MAP_LENGTH
map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map OlivineTimsHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -64,7 +64,7 @@ MapGroup_Olivine:
assert_table_length NUM_OLIVINE_MAPS
MapGroup_Mahogany:
table_width MAP_LENGTH, MapGroup_Mahogany
table_width MAP_LENGTH
map MahoganyRedGyaradosSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map MahoganyGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -75,7 +75,7 @@ MapGroup_Mahogany:
assert_table_length NUM_MAHOGANY_MAPS
MapGroup_Dungeons:
table_width MAP_LENGTH, MapGroup_Dungeons
table_width MAP_LENGTH
map SproutTower1F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SproutTower2F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SproutTower3F, TILESET_TOWER, DUNGEON, LANDMARK_SPROUT_TOWER, MUSIC_SPROUT_TOWER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -161,7 +161,7 @@ MapGroup_Dungeons:
assert_table_length NUM_DUNGEONS_MAPS
MapGroup_Ecruteak:
table_width MAP_LENGTH, MapGroup_Ecruteak
table_width MAP_LENGTH
map EcruteakTinTowerEntrance, TILESET_TOWER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakTinTowerBackEntrance, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map EcruteakPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_ECRUTEAK_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -174,7 +174,7 @@ MapGroup_Ecruteak:
assert_table_length NUM_ECRUTEAK_MAPS
MapGroup_Blackthorn:
table_width MAP_LENGTH, MapGroup_Blackthorn
table_width MAP_LENGTH
map BlackthornGym1F, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BlackthornGym2F, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map BlackthornDragonSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_BLACKTHORN_CITY, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -188,7 +188,7 @@ MapGroup_Blackthorn:
assert_table_length NUM_BLACKTHORN_MAPS
MapGroup_Cinnabar:
table_width MAP_LENGTH, MapGroup_Cinnabar
table_width MAP_LENGTH
map CinnabarPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CinnabarPokecenter2FBeta, TILESET_POKECENTER, INDOOR, LANDMARK_CINNABAR_ISLAND, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route19FuchsiaGate, TILESET_GATE, GATE, LANDMARK_ROUTE_19, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -200,7 +200,7 @@ MapGroup_Cinnabar:
assert_table_length NUM_CINNABAR_MAPS
MapGroup_Cerulean:
table_width MAP_LENGTH, MapGroup_Cerulean
table_width MAP_LENGTH
map CeruleanGymBadgeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CeruleanPoliceStation, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CeruleanTradeSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_CERULEAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -222,7 +222,7 @@ MapGroup_Cerulean:
assert_table_length NUM_CERULEAN_MAPS
MapGroup_Azalea:
table_width MAP_LENGTH, MapGroup_Azalea
table_width MAP_LENGTH
map AzaleaPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CharcoalKiln, TILESET_HOUSE, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map AzaleaMart, TILESET_MART, INDOOR, LANDMARK_AZALEA_TOWN, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -233,7 +233,7 @@ MapGroup_Azalea:
assert_table_length NUM_AZALEA_MAPS
MapGroup_LakeOfRage:
table_width MAP_LENGTH, MapGroup_LakeOfRage
table_width MAP_LENGTH
map LakeOfRageHiddenPowerHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRageMagikarpHouse, TILESET_HOUSE, INDOOR, LANDMARK_LAKE_OF_RAGE, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route43MahoganyGate, TILESET_GATE, GATE, LANDMARK_ROUTE_43, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -243,7 +243,7 @@ MapGroup_LakeOfRage:
assert_table_length NUM_LAKE_OF_RAGE_MAPS
MapGroup_Violet:
table_width MAP_LENGTH, MapGroup_Violet
table_width MAP_LENGTH
map Route32, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_32, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH
map Route35, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_35, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_POND
map Route36, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_36, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
@ -264,7 +264,7 @@ MapGroup_Violet:
assert_table_length NUM_VIOLET_MAPS
MapGroup_Goldenrod:
table_width MAP_LENGTH, MapGroup_Goldenrod
table_width MAP_LENGTH
map Route34, TILESET_JOHTO_MODERN, ROUTE, LANDMARK_ROUTE_34, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map GoldenrodCity, TILESET_JOHTO_MODERN, TOWN, LANDMARK_GOLDENROD_CITY, MUSIC_GOLDENROD_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map GoldenrodGym, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_GOLDENROD_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@ -290,7 +290,7 @@ MapGroup_Goldenrod:
assert_table_length NUM_GOLDENROD_MAPS
MapGroup_Vermilion:
table_width MAP_LENGTH, MapGroup_Vermilion
table_width MAP_LENGTH
map Route6, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_6, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
map Route11, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_11, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map VermilionCity, TILESET_KANTO, TOWN, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
@ -307,7 +307,7 @@ MapGroup_Vermilion:
assert_table_length NUM_VERMILION_MAPS
MapGroup_Pallet:
table_width MAP_LENGTH, MapGroup_Pallet
table_width MAP_LENGTH
map Route1, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_1, MUSIC_ROUTE_1, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PalletTown, TILESET_KANTO, TOWN, LANDMARK_PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map RedsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_PALLET_TOWN, MUSIC_PALLET_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -317,7 +317,7 @@ MapGroup_Pallet:
assert_table_length NUM_PALLET_MAPS
MapGroup_Pewter:
table_width MAP_LENGTH, MapGroup_Pewter
table_width MAP_LENGTH
map Route3, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_3, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PewterCity, TILESET_KANTO, TOWN, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map PewterNidoranSpeechHouse, TILESET_HOUSE, INDOOR, LANDMARK_PEWTER_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -329,7 +329,7 @@ MapGroup_Pewter:
assert_table_length NUM_PEWTER_MAPS
MapGroup_FastShip:
table_width MAP_LENGTH, MapGroup_FastShip
table_width MAP_LENGTH
map OlivinePort, TILESET_PORT, ROUTE, LANDMARK_OLIVINE_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map VermilionPort, TILESET_PORT, ROUTE, LANDMARK_VERMILION_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map FastShip1F, TILESET_LIGHTHOUSE, INDOOR, LANDMARK_FAST_SHIP, MUSIC_SS_AQUA, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -345,7 +345,7 @@ MapGroup_FastShip:
assert_table_length NUM_FAST_SHIP_MAPS
MapGroup_Indigo:
table_width MAP_LENGTH, MapGroup_Indigo
table_width MAP_LENGTH
map Route23, TILESET_KANTO, TOWN, LANDMARK_ROUTE_23, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map IndigoPlateauPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map WillsRoom, TILESET_ELITE_FOUR_ROOM, INDOOR, LANDMARK_INDIGO_PLATEAU, MUSIC_INDIGO_PLATEAU, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@ -357,7 +357,7 @@ MapGroup_Indigo:
assert_table_length NUM_INDIGO_MAPS
MapGroup_Fuchsia:
table_width MAP_LENGTH, MapGroup_Fuchsia
table_width MAP_LENGTH
map Route13, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_13, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
map Route14, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_14, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route15, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_15, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
@ -374,7 +374,7 @@ MapGroup_Fuchsia:
assert_table_length NUM_FUCHSIA_MAPS
MapGroup_Lavender:
table_width MAP_LENGTH, MapGroup_Lavender
table_width MAP_LENGTH
map Route8, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_8, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route12, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_12, MUSIC_ROUTE_12, FALSE, PALETTE_AUTO, FISHGROUP_QWILFISH_NO_SWARM
map Route10South, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_10, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
@ -392,7 +392,7 @@ MapGroup_Lavender:
assert_table_length NUM_LAVENDER_MAPS
MapGroup_Silver:
table_width MAP_LENGTH, MapGroup_Silver
table_width MAP_LENGTH
map Route28, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
map SilverCaveOutside, TILESET_KANTO, TOWN, LANDMARK_SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
map SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -400,7 +400,7 @@ MapGroup_Silver:
assert_table_length NUM_SILVER_MAPS
MapGroup_CableClub:
table_width MAP_LENGTH, MapGroup_CableClub
table_width MAP_LENGTH
map Pokecenter2F, TILESET_POKECENTER, INDOOR, LANDMARK_SPECIAL, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map TradeCenter, TILESET_GATE, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Colosseum, TILESET_GATE, INDOOR, LANDMARK_SPECIAL, MUSIC_CHERRYGROVE_CITY, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@ -408,7 +408,7 @@ MapGroup_CableClub:
assert_table_length NUM_CABLE_CLUB_MAPS
MapGroup_Celadon:
table_width MAP_LENGTH, MapGroup_Celadon
table_width MAP_LENGTH
map Route7, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_7, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route16, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_16, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route17, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_17, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_NONE
@ -438,7 +438,7 @@ MapGroup_Celadon:
assert_table_length NUM_CELADON_MAPS
MapGroup_Cianwood:
table_width MAP_LENGTH, MapGroup_Cianwood
table_width MAP_LENGTH
map Route40, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_40, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route41, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_41, MUSIC_ROUTE_36, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map CianwoodCity, TILESET_JOHTO, TOWN, LANDMARK_CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
@ -451,7 +451,7 @@ MapGroup_Cianwood:
assert_table_length NUM_CIANWOOD_MAPS
MapGroup_Viridian:
table_width MAP_LENGTH, MapGroup_Viridian
table_width MAP_LENGTH
map Route2, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route22, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_22, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_POND
map ViridianCity, TILESET_KANTO, TOWN, LANDMARK_VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_POND
@ -468,7 +468,7 @@ MapGroup_Viridian:
assert_table_length NUM_VIRIDIAN_MAPS
MapGroup_NewBark:
table_width MAP_LENGTH, MapGroup_NewBark
table_width MAP_LENGTH
map Route26, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_26, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map Route27, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_27, MUSIC_ROUTE_26, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map Route29, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
@ -485,7 +485,7 @@ MapGroup_NewBark:
assert_table_length NUM_NEW_BARK_MAPS
MapGroup_Saffron:
table_width MAP_LENGTH, MapGroup_Saffron
table_width MAP_LENGTH
map Route5, TILESET_KANTO, ROUTE, LANDMARK_ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map SaffronCity, TILESET_KANTO, TOWN, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map FightingDojo, TILESET_TRAIN_STATION, INDOOR, LANDMARK_SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@ -504,7 +504,7 @@ MapGroup_Saffron:
assert_table_length NUM_SAFFRON_MAPS
MapGroup_Cherrygrove:
table_width MAP_LENGTH, MapGroup_Cherrygrove
table_width MAP_LENGTH
map Route30, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
map Route31, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
map CherrygroveCity, TILESET_JOHTO, TOWN, LANDMARK_CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

2
data/maps/outdoor_sprites.asm
View File

@ -3,7 +3,7 @@
OutdoorSprites:
; entries correspond to MAPGROUP_* constants
table_width 2, OutdoorSprites
table_width 2
dw OlivineGroupSprites
dw MahoganyGroupSprites
dw DungeonsGroupSprites

4
data/maps/roofs.asm
View File

@ -10,7 +10,7 @@ DEF NUM_ROOFS EQU const_value
MapGroupRoofs:
; entries correspond to MAPGROUP_* constants
; values are indexes for Roofs (see below)
table_width 1, MapGroupRoofs
table_width 1
db -1 ; 0
db ROOF_OLIVINE ; 1 (Olivine)
db ROOF_AZALEA ; 2 (Mahogany)
@ -42,7 +42,7 @@ MapGroupRoofs:
Roofs:
; entries correspond to ROOF_* constants
table_width ROOF_LENGTH * LEN_2BPP_TILE, Roofs
table_width ROOF_LENGTH * LEN_2BPP_TILE
INCBIN "gfx/tilesets/roofs/new_bark.2bpp"
INCBIN "gfx/tilesets/roofs/violet.2bpp"
INCBIN "gfx/tilesets/roofs/azalea.2bpp"

2
data/maps/setup_scripts.asm
View File

@ -1,6 +1,6 @@
MapSetupScripts:
; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
table_width 2, MapSetupScripts
table_width 2
dw MapSetupScript_Warp
dw MapSetupScript_Continue
dw MapSetupScript_ReloadMap

2
data/maps/sgb_roof_pal_inds.asm
View File

@ -1,6 +1,6 @@
MapGroupRoofSGBPalInds:
; entries correspond to map groups
table_width 1, MapGroupRoofSGBPalInds
table_width 1
db PREDEFPAL_ROUTES
db PREDEFPAL_OLIVINE
db PREDEFPAL_MAHOGANY

2
data/maps/spawn_points.asm
View File

@ -6,7 +6,7 @@ ENDM
SpawnPoints:
; entries correspond to SPAWN_* constants
table_width 4, SpawnPoints
table_width 4
spawn PLAYERS_HOUSE_2F, 3, 3
spawn VIRIDIAN_POKECENTER_1F, 5, 3

4
data/mon_menu.asm
View File

@ -11,7 +11,7 @@ DEF NUM_MONMENUVALUES EQU const_value - 1
MonMenuOptionStrings:
; entries correspond to MONMENUVALUE_* constants
list_start MonMenuOptionStrings
list_start
li "STATS"
li "SWITCH"
li "ITEM"
@ -23,7 +23,7 @@ MonMenuOptionStrings:
MonMenuOptions:
; category, item, value; actions are in PokemonActionSubmenu (see engine/pokemon/mon_menu.asm)
table_width 3, MonMenuOptions
table_width 3
; moves
db MONMENU_FIELD_MOVE, MONMENUITEM_CUT, CUT
db MONMENU_FIELD_MOVE, MONMENUITEM_FLY, FLY

2
data/moves/animations.asm
View File

@ -1,6 +1,6 @@
BattleAnimations::
; entries correspond to constants/move_constants.asm
table_width 2, BattleAnimations
table_width 2
dw BattleAnim_Dummy
dw BattleAnim_Pound
dw BattleAnim_KarateChop

2
data/moves/descriptions.asm
View File

@ -1,6 +1,6 @@
MoveDescriptions::
; entries correspond to move ids (see constants/move_constants.asm)
table_width 2, MoveDescriptions
table_width 2
dw PoundDescription
dw KarateChopDescription
dw DoubleslapDescription

2
data/moves/effects_pointers.asm
View File

@ -1,6 +1,6 @@
MoveEffectsPointers:
; entries correspond to EFFECT_* constants
table_width 2, MoveEffectsPointers
table_width 2
dw NormalHit
dw DoSleep
dw PoisonHit

2
data/moves/moves.asm
View File

@ -13,7 +13,7 @@ ENDM
Moves:
; entries correspond to move ids (see constants/move_constants.asm)
table_width MOVE_LENGTH, Moves
table_width MOVE_LENGTH
move POUND, EFFECT_NORMAL_HIT, 40, NORMAL, 100, 35, 0
move KARATE_CHOP, EFFECT_NORMAL_HIT, 50, FIGHTING, 100, 25, 0
move DOUBLESLAP, EFFECT_MULTI_HIT, 15, NORMAL, 85, 10, 0

2
data/moves/names.asm
View File

@ -1,5 +1,5 @@
MoveNames::
list_start MoveNames
list_start
li "POUND"
li "KARATE CHOP"
li "DOUBLESLAP"

2
data/moves/tmhm_moves.asm
View File

@ -3,7 +3,7 @@
TMHMMoves:
; entries correspond to *_TMNUM constants (see constants/item_constants.asm)
table_width 1, TMHMMoves
table_width 1
; TMs
for n, 1, NUM_TMS + 1

2
data/party_menu_qualities.asm
View File

@ -19,7 +19,7 @@ ENDM
PartyMenuQualityPointers:
; entries correspond to PARTYMENUACTION_* constants
table_width 2, PartyMenuQualityPointers
table_width 2
dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON
dw .Default ; PARTYMENUACTION_HEALING_ITEM
dw .Default ; PARTYMENUACTION_SWITCH

2
data/phone/non_trainer_names.asm
View File

@ -1,6 +1,6 @@
NonTrainerCallerNames:
; entries correspond to PHONECONTACT_* constants (see constants/trainer_constants.asm)
table_width 2, NonTrainerCallerNames
table_width 2
dw .none
dw .mom
dw .bikeshop

2
data/phone/phone_contacts.asm
View File

@ -10,7 +10,7 @@ ENDM
PhoneContacts:
; entries correspond to PHONE_* constants
table_width PHONE_CONTACT_SIZE, PhoneContacts
table_width PHONE_CONTACT_SIZE
phone TRAINER_NONE, PHONE_00, N_A, 0, UnusedPhoneScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_MOM, PLAYERS_HOUSE_1F, ANYTIME, MomPhoneCalleeScript, 0, UnusedPhoneScript
phone TRAINER_NONE, PHONECONTACT_BIKESHOP, OAKS_LAB, 0, UnusedPhoneScript, 0, UnusedPhoneScript

2
data/phone/special_calls.asm
View File

@ -7,7 +7,7 @@ ENDM
SpecialPhoneCallList:
; entries correspond to SPECIALCALL_* constants
table_width SPECIALCALL_SIZE, SpecialPhoneCallList
table_width SPECIALCALL_SIZE
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript
specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM, ElmPhoneCallerScript

2
data/pokemon/base_stats.asm
View File

@ -22,7 +22,7 @@ MACRO tmhm
ENDM
BaseData::
table_width BASE_DATA_SIZE, BaseData
table_width BASE_DATA_SIZE
INCLUDE "data/pokemon/base_stats/bulbasaur.asm"
INCLUDE "data/pokemon/base_stats/ivysaur.asm"
INCLUDE "data/pokemon/base_stats/venusaur.asm"

2
data/pokemon/cries.asm
View File

@ -5,7 +5,7 @@ ENDM
PokemonCries::
; entries correspond to constants/pokemon_constants.asm
table_width MON_CRY_LENGTH, PokemonCries
table_width MON_CRY_LENGTH
mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR
mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR
mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR

2
data/pokemon/dex_entry_pointers.asm
View File

@ -1,6 +1,6 @@
PokedexDataPointerTable:
; entries correspond to constants/pokemon_constants.asm
table_width 2, PokedexDataPointerTable
table_width 2
dw BulbasaurPokedexEntry
dw IvysaurPokedexEntry
dw VenusaurPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View File

@ -1,7 +1,7 @@
; Every Pokémon sorted alphabetically by name.
AlphabeticalPokedexOrder:
table_width 1, AlphabeticalPokedexOrder
table_width 1
db ABRA
db AERODACTYL
db AIPOM

2
data/pokemon/dex_order_new.asm
View File

@ -1,7 +1,7 @@
; Every Pokémon sorted in New Pokédex Order.
NewPokedexOrder:
table_width 1, NewPokedexOrder
table_width 1
db CHIKORITA
db BAYLEEF
db MEGANIUM

2
data/pokemon/egg_move_pointers.asm
View File

@ -1,5 +1,5 @@
EggMovePointers::
table_width 2, EggMovePointers
table_width 2
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves

2
data/pokemon/evos_attacks_pointers.asm
View File

@ -1,7 +1,7 @@
; Evolutions and attacks are grouped together since they're both checked at level-up.
EvosAttacksPointers::
table_width 2, EvosAttacksPointers
table_width 2
dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks
dw VenusaurEvosAttacks

2
data/pokemon/gen1_base_special.asm
View File

@ -1,7 +1,7 @@
; The original base Special stat for each Pokémon from Red/Blue
KantoMonSpecials:
table_width 1, KantoMonSpecials
table_width 1
db 65 ; BULBASAUR
db 80 ; IVYSAUR
db 100 ; VENUSAUR

2
data/pokemon/gen1_order.asm
View File

@ -1,5 +1,5 @@
Pokered_MonIndices:
table_width 1, Pokered_MonIndices
table_width 1
db RHYDON
db KANGASKHAN
db NIDORAN_M

2
data/pokemon/menu_icons.asm
View File

@ -1,7 +1,7 @@
; party menu icons
MonMenuIcons:
table_width 1, MonMenuIcons
table_width 1
db ICON_BULBASAUR ; BULBASAUR
db ICON_BULBASAUR ; IVYSAUR
db ICON_BULBASAUR ; VENUSAUR

2
data/pokemon/names.asm
View File

@ -1,5 +1,5 @@
PokemonNames::
table_width NAME_LENGTH - 1, PokemonNames
table_width NAME_LENGTH - 1
db "BULBASAUR@"
db "IVYSAUR@@@"
db "VENUSAUR@@"

2
data/pokemon/palettes.asm
View File

@ -7,7 +7,7 @@ PokemonPalettes:
; Shiny palettes are defined directly, not generated.
; 2 middle palettes, front and shiny, with 2 colors each
table_width PAL_COLOR_SIZE * 2 * 2, PokemonPalettes
table_width PAL_COLOR_SIZE * 2 * 2
; 000
RGB 30, 22, 17

2
data/pokemon/pic_pointers.asm
View File

@ -2,7 +2,7 @@
PokemonPicPointers::
; entries correspond to Pokémon species
table_width 3 * 2, PokemonPicPointers
table_width 3 * 2
dba_pics BulbasaurFrontpic, BulbasaurBackpic
dba_pics IvysaurFrontpic, IvysaurBackpic
dba_pics VenusaurFrontpic, VenusaurBackpic

2
data/pokemon/unown_pic_pointers.asm
View File

@ -1,6 +1,6 @@
UnownPicPointers::
; entries correspond to Unown letters
table_width 3 * 2, UnownPicPointers
table_width 3 * 2
dba_pics UnownAFrontpic, UnownABackpic
dba_pics UnownBFrontpic, UnownBBackpic
dba_pics UnownCFrontpic, UnownCBackpic

2
data/pokemon/unown_words.asm
View File

@ -7,7 +7,7 @@ ENDM
UnownWords:
; entries correspond to UNOWN_* form constants
table_width 2, UnownWords
table_width 2
dw UnownWordA ; unused
dw UnownWordA
dw UnownWordB

2
data/radio/channel_music.asm
View File

@ -1,6 +1,6 @@
RadioChannelSongs:
; entries correspond to radio channel ids (see constants/radio_constants.asm)
table_width 2, RadioChannelSongs
table_width 2
dw MUSIC_POKEMON_TALK
dw MUSIC_POKEMON_CENTER
dw MUSIC_TITLE

2
data/sprite_anims/framesets.asm
View File

@ -1,6 +1,6 @@
SpriteAnimFrameData:
; entries correspond to SPRITE_ANIM_FRAMESET_* constants (see constants/sprite_anim_constants.asm)
table_width 2, SpriteAnimFrameData
table_width 2
dw .Frameset_00
dw .Frameset_PartyMon
dw .Frameset_PartyMonWithMail

2
data/sprite_anims/oam.asm
View File

@ -6,7 +6,7 @@ ENDM
SpriteAnimOAMData:
; entries correspond to SPRITE_ANIM_OAMSET_* constants (see constants/sprite_anim_constants.asm)
table_width 3, SpriteAnimOAMData
table_width 3
spriteanimoam $00, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_1
spriteanimoam $04, .OAMData_RedWalk ; SPRITE_ANIM_OAMSET_RED_WALK_2
spriteanimoam $4c, .OAMData_1x1_Palette0 ; SPRITE_ANIM_OAMSET_GS_INTRO_BUBBLE_1

2
data/sprite_anims/unused_gfx.asm
View File

@ -6,7 +6,7 @@ ENDM
UnusedSpriteAnimGFX:
; entries correspond to SPRITE_ANIM_DICT_* constants
table_width 4, UnusedSpriteAnimGFX
table_width 4
; # tiles, gfx bank, gfx pointer
; (all pointers were dummied out to .DeletedGFX)
sprite_anim_obj_gfx 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_DEFAULT

2
data/sprites/emotes.asm
View File

@ -7,7 +7,7 @@ ENDM
Emotes:
; entries correspond to EMOTE_* constants
table_width EMOTE_LENGTH, Emotes
table_width EMOTE_LENGTH
emote ShockEmote, 4, $f8
emote QuestionEmote, 4, $f8
emote HappyEmote, 4, $f8

2
data/sprites/facings.asm
View File

@ -1,6 +1,6 @@
Facings:
; entries correspond to FACING_* constants (see constants/map_object_constants.asm)
table_width 2, Facings
table_width 2
dw FacingStepDown0
dw FacingStepDown1
dw FacingStepDown2

2
data/sprites/map_objects.asm
View File

@ -1,6 +1,6 @@
SpriteMovementData::
; entries correspond to SPRITEMOVEDATA_* constants
table_width NUM_SPRITEMOVEDATA_FIELDS, SpriteMovementData
table_width NUM_SPRITEMOVEDATA_FIELDS
; SPRITEMOVEDATA_00
db SPRITEMOVEFN_00 ; movement function

2
data/sprites/sprite_mons.asm
View File

@ -1,6 +1,6 @@
SpriteMons:
; entries correspond to SPRITE_* constants past SPRITE_POKEMON
table_width 1, SpriteMons
table_width 1
db UNOWN
db GEODUDE
db GROWLITHE

2
data/sprites/sprites.asm
View File

@ -6,7 +6,7 @@ ENDM
OverworldSprites:
; entries correspond to SPRITE_* constants
table_width NUM_SPRITEDATA_FIELDS, OverworldSprites
table_width NUM_SPRITEDATA_FIELDS
overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN

2
data/tilesets.asm
View File

@ -12,7 +12,7 @@ ENDM
Tilesets::
; entries correspond to TILESET_* constants (see constants/tileset_constants.asm)
table_width TILESET_LENGTH, Tilesets
table_width TILESET_LENGTH
tileset Tileset0
tileset TilesetJohto
tileset TilesetJohtoModern

2
data/trainers/attributes.asm
View File

@ -1,6 +1,6 @@
TrainerClassAttributes:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width NUM_TRAINER_ATTRIBUTES, TrainerClassAttributes
table_width NUM_TRAINER_ATTRIBUTES
; Falkner
db NO_ITEM, NO_ITEM ; items

2
data/trainers/class_names.asm
View File

@ -1,6 +1,6 @@
TrainerClassNames::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
list_start TrainerClassNames
list_start
li "LEADER"
li "LEADER"
li "LEADER"

2
data/trainers/dvs.asm
View File

@ -1,6 +1,6 @@
TrainerClassDVs:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 2, TrainerClassDVs
table_width 2
; atk,def,spd,spc
dn 9, 10, 7, 7 ; FALKNER
dn 8, 8, 8, 8 ; WHITNEY

2
data/trainers/encounter_music.asm
View File

@ -2,7 +2,7 @@
TrainerEncounterMusic::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 1, TrainerEncounterMusic
table_width 1
db MUSIC_HIKER_ENCOUNTER ; none
db MUSIC_YOUNGSTER_ENCOUNTER ; falkner
db MUSIC_LASS_ENCOUNTER ; whitney

2
data/trainers/palettes.asm
View File

@ -4,7 +4,7 @@ TrainerPalettes:
; Each .gbcpal is generated from the corresponding .png, and
; only the middle two colors are included, not black or white.
table_width PAL_COLOR_SIZE * 2, TrainerPalettes
table_width PAL_COLOR_SIZE * 2
PlayerPalette: ; Chris uses the same colors as Cal
INCBIN "gfx/trainers/cal.gbcpal", middle_colors

2
data/trainers/party_pointers.asm
View File

@ -2,7 +2,7 @@
TrainerGroups:
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 2, TrainerGroups
table_width 2
dw FalknerGroup
dw WhitneyGroup
dw BugsyGroup

2
data/trainers/pic_pointers.asm
View File

@ -2,7 +2,7 @@
TrainerPicPointers::
; entries correspond to trainer classes (see constants/trainer_constants.asm)
table_width 3, TrainerPicPointers
table_width 3
dba_pic FalknerPic
dba_pic WhitneyPic
dba_pic BugsyPic

2
data/types/names.asm
View File

@ -1,6 +1,6 @@
TypeNames:
; entries correspond to types (see constants/type_constants.asm)
table_width 2, TypeNames
table_width 2
dw Normal
dw Fighting
dw Flying

2
data/types/search_strings.asm
View File

@ -1,6 +1,6 @@
PokedexTypeSearchStrings:
; entries correspond with PokedexTypeSearchConversionTable (see data/types/search_types.asm)
table_width POKEDEX_TYPE_STRING_LENGTH, PokedexTypeSearchStrings
table_width POKEDEX_TYPE_STRING_LENGTH
db " ---- @"
db " NORMAL @"
db " FIRE @"

2
data/types/search_types.asm
View File

@ -1,6 +1,6 @@
PokedexTypeSearchConversionTable:
; entries correspond with PokedexTypeSearchStrings (see data/types/search_strings.asm)
table_width 1, PokedexTypeSearchConversionTable
table_width 1
db NORMAL
db FIRE
db WATER

2
data/wild/fish.asm
View File

@ -8,7 +8,7 @@ ENDM
FishGroups:
; entries correspond to FISHGROUP_* constants
table_width FISHGROUP_DATA_LENGTH, FishGroups
table_width FISHGROUP_DATA_LENGTH
fishgroup 50 percent + 1, .Shore_Old, .Shore_Good, .Shore_Super
fishgroup 50 percent + 1, .Ocean_Old, .Ocean_Good, .Ocean_Super
fishgroup 50 percent + 1, .Lake_Old, .Lake_Good, .Lake_Super

4
data/wild/probabilities.asm
View File

@ -4,7 +4,7 @@ MACRO mon_prob
ENDM
GrassMonProbTable:
table_width 2, GrassMonProbTable
table_width 2
mon_prob 30, 0 ; 30% chance
mon_prob 60, 1 ; 30% chance
mon_prob 80, 2 ; 20% chance
@ -15,7 +15,7 @@ GrassMonProbTable:
assert_table_length NUM_GRASSMON
WaterMonProbTable:
table_width 2, WaterMonProbTable
table_width 2
mon_prob 60, 0 ; 60% chance
mon_prob 90, 1 ; 30% chance
mon_prob 100, 2 ; 10% chance

2
data/wild/roammon_maps.asm
View File

@ -13,7 +13,7 @@ MACRO roam_map
ENDM
RoamMaps:
list_start RoamMaps
list_start
; start map, ...other maps
roam_map ROUTE_29, ROUTE_30, ROUTE_46
roam_map ROUTE_30, ROUTE_29, ROUTE_31

2
data/wild/treemons.asm
View File

@ -1,6 +1,6 @@
TreeMons:
; entries correspond to TREEMON_SET_* constants
table_width 2, TreeMons
table_width 2
dw TreeMonSet_None
dw TreeMonSet_Forest
dw TreeMonSet_Canyon

2
engine/battle_anims/anim_commands.asm
View File

@ -304,7 +304,7 @@ RunBattleAnimCommand:
BattleAnimCommands::
; entries correspond to anim_* constants (see macros/scripts/battle_anims.asm)
table_width 2, BattleAnimCommands
table_width 2
dw BattleAnimCmd_Obj
dw BattleAnimCmd_1GFX
dw BattleAnimCmd_2GFX

2
engine/battle_anims/functions.asm
View File

@ -13,7 +13,7 @@ DoBattleAnimFrame:
.Jumptable:
; entries correspond to BATTLE_ANIM_FUNC_* constants
table_width 2, DoBattleAnimFrame.Jumptable
table_width 2
dw BattleAnimFunction_Null
dw BattleAnimFunction_MoveFromUserToTarget
dw BattleAnimFunction_MoveFromUserToTargetAndDisappear

2
engine/debug/debug_room.asm
View File

@ -1174,7 +1174,7 @@ DebugRoom_BoxStructStrings:
.SendBox: db "SEND BOX@"
DebugRoom_BoxAddresses:
table_width 3, DebugRoom_BoxAddresses
table_width 3
for n, 1, NUM_BOXES + 1
dba sBox{d:n}
endr

2
engine/events/lucky_number.asm
View File

@ -193,7 +193,7 @@ CheckForLuckyNumberWinners:
ret
.BoxBankAddresses:
table_width 3, CheckForLuckyNumberWinners.BoxBankAddresses
table_width 3
for n, 1, NUM_BOXES + 1
dba sBox{d:n}
endr

6
engine/games/slot_machine.asm
View File

@ -866,7 +866,7 @@ GetUnknownSlotReelData: ; unreferenced
ret
.data:
table_width 1, GetUnknownSlotReelData.data
table_width 1
db 0 ; SLOTS_SEVEN
db 1 ; SLOTS_POKEBALL
db 2 ; SLOTS_CHERRY
@ -1839,7 +1839,7 @@ Slots_GetPayout:
ret
.PayoutTable:
table_width 2, Slots_GetPayout.PayoutTable
table_width 2
dw 300 ; SLOTS_SEVEN
dw 50 ; SLOTS_POKEBALL
dw 6 ; SLOTS_CHERRY
@ -1887,7 +1887,7 @@ Slots_PayoutText:
ret
.PayoutStrings:
table_width 6, Slots_PayoutText.PayoutStrings
table_width 6
dbw "300@", .LinedUpSevens ; SLOTS_SEVEN
dbw "50@@", .LinedUpPokeballs ; SLOTS_POKEBALL
dbw "6@@@", .LinedUpMonOrCherry ; SLOTS_CHERRY

2
engine/gfx/cgb_layouts.asm
View File

@ -30,7 +30,7 @@ LoadSGBLayoutCGB:
CGBLayoutJumptable:
; entries correspond to SCGB_* constants (see constants/scgb_constants.asm)
table_width 2, CGBLayoutJumptable
table_width 2
dw _CGB_BattleGrayscale
dw _CGB_BattleColors
dw _CGB_PokegearPals

4
engine/gfx/color.asm
View File

@ -1088,7 +1088,7 @@ INCLUDE "gfx/sgb/pal_packets.asm"
INCLUDE "data/sgb_ctrl_packets.asm"
PredefPals:
table_width PALETTE_SIZE, PredefPals
table_width PALETTE_SIZE
INCLUDE "gfx/sgb/predef.pal"
assert_table_length NUM_PREDEF_PALS
@ -1218,7 +1218,7 @@ MapObjectPals::
INCLUDE "gfx/overworld/npc_sprites.pal"
RoofPals:
table_width PAL_COLOR_SIZE * 2 * 2, RoofPals
table_width PAL_COLOR_SIZE * 2 * 2
INCLUDE "gfx/tilesets/roofs.pal"
assert_table_length NUM_MAP_GROUPS + 1

2
engine/gfx/sgb_layouts.asm
View File

@ -23,7 +23,7 @@ LoadSGBLayout:
SGBLayoutJumptable:
; entries correspond to SCGB_* constants (see constants/scgb_constants.asm)
table_width 2, SGBLayoutJumptable
table_width 2
dw .SGB_BattleGrayscale
dw .SGB_BattleColors
dw .SGB_PokegearPals

2
engine/items/item_effects.asm
View File

@ -13,7 +13,7 @@ _DoItemEffect::
ItemEffects:
; entries correspond to item ids (see constants/item_constants.asm)
table_width 2, ItemEffects
table_width 2
dw PokeBallEffect ; MASTER_BALL
dw PokeBallEffect ; ULTRA_BALL
dw NoEffect ; BRIGHTPOWDER

2
engine/menus/save.asm
View File

@ -1028,7 +1028,7 @@ EraseBoxes:
ret
BoxAddresses:
table_width 5, BoxAddresses
table_width 5
for n, 1, NUM_BOXES + 1
db BANK(sBox{d:n}) ; aka BANK(sBox{d:n}End)
dw sBox{d:n}, sBox{d:n}End

10
engine/overworld/decorations.asm
View File

@ -49,7 +49,7 @@ _PlayerDecorationMenu:
dw .category_pointers
.category_pointers:
table_width 2 + 2, _PlayerDecorationMenu.category_pointers
table_width 2 + 2
dw DecoBedMenu, .bed
dw DecoCarpetMenu, .carpet
dw DecoPlantMenu, .plant
@ -124,7 +124,7 @@ _PlayerDecorationMenu:
ret
.owned_pointers:
table_width 3, _PlayerDecorationMenu.owned_pointers
table_width 3
dwb FindOwnedBeds, 0 ; bed
dwb FindOwnedCarpets, 1 ; carpet
dwb FindOwnedPlants, 2 ; plant
@ -455,7 +455,7 @@ DoDecorationAction2:
ret
.DecoActions:
table_width 2, DoDecorationAction2.DecoActions
table_width 2
dw DecoAction_nothing
dw DecoAction_setupbed
dw DecoAction_putawaybed
@ -513,7 +513,7 @@ GetDecoName:
ret
.NameFunctions:
table_width 2, GetDecoName.NameFunctions
table_width 2
dw .invalid
dw .plant
dw .bed
@ -969,7 +969,7 @@ DescribeDecoration::
.Jumptable:
; entries correspond to DECODESC_* constants
table_width 2, DescribeDecoration.Jumptable
table_width 2
dw DecorationDesc_Poster
dw DecorationDesc_LeftOrnament
dw DecorationDesc_RightOrnament

8
engine/overworld/events.asm
View File

@ -558,7 +558,7 @@ TryObjectEvent:
ret
ObjectEventTypeArray:
table_width 3, ObjectEventTypeArray
table_width 3
dbw OBJECTTYPE_SCRIPT, .script
dbw OBJECTTYPE_ITEMBALL, .itemball
dbw OBJECTTYPE_TRAINER, .trainer
@ -629,7 +629,7 @@ TryBGEvent:
ret
BGEventJumptable:
table_width 2, BGEventJumptable
table_width 2
dw .read
dw .up
dw .down
@ -748,7 +748,7 @@ PlayerMovement:
PlayerMovementPointers:
; entries correspond to PLAYERMOVEMENT_* constants
table_width 2, PlayerMovementPointers
table_width 2
dw .normal
dw .warp
dw .turn
@ -964,7 +964,7 @@ DoPlayerEvent:
PlayerEventScriptPointers:
; entries correspond to PLAYEREVENT_* constants
table_width 3, PlayerEventScriptPointers
table_width 3
dba InvalidEventScript ; PLAYEREVENT_NONE
dba SeenByTrainerScript ; PLAYEREVENT_SEENBYTRAINER
dba TalkToTrainerScript ; PLAYEREVENT_TALKTOTRAINER

Some files were not shown because too many files have changed in this diff Show More