pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix triple newlines left over from removing address comments

Browse Source
This commit is contained in:
Rangi
2018-06-24 23:22:50 -04:00
parent 91f914718a
commit 67d1364c7a
193 changed files with 3 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
audio.asm
View File

@@ -11,7 +11,6 @@ INCLUDE "audio/cry_pointers.asm"
INCLUDE "audio/sfx_pointers.asm" INCLUDE "audio/sfx_pointers.asm"
SECTION "Songs 1", ROMX SECTION "Songs 1", ROMX
INCLUDE "audio/music/route36.asm" INCLUDE "audio/music/route36.asm"
@@ -130,7 +129,6 @@ INCLUDE "audio/music/battletowerlobby.asm"
INCLUDE "audio/music/mobilecenter.asm" INCLUDE "audio/music/mobilecenter.asm"
SECTION "Extra Songs 1", ROMX SECTION "Extra Songs 1", ROMX
INCLUDE "audio/music/credits.asm" INCLUDE "audio/music/credits.asm"
@@ -143,7 +141,6 @@ SECTION "Extra Songs 2", ROMX
INCLUDE "audio/music/postcredits.asm" INCLUDE "audio/music/postcredits.asm"
SECTION "Sound Effects", ROMX SECTION "Sound Effects", ROMX
INCLUDE "audio/sfx.asm" INCLUDE "audio/sfx.asm"
@@ -154,7 +151,6 @@ SECTION "Crystal Sound Effects", ROMX
INCLUDE "audio/sfx_crystal.asm" INCLUDE "audio/sfx_crystal.asm"
SECTION "Cries", ROMX SECTION "Cries", ROMX
INCLUDE "data/pokemon/cries.asm" INCLUDE "data/pokemon/cries.asm"

72
audio/engine.asm
View File

File diff suppressed because it is too large Load Diff

2
audio/music/magnettrain.asm
View File

@@ -245,7 +245,6 @@ Music_MagnetTrain_Ch4:
note B_, 16 note B_, 16
endchannel endchannel
; unused ; unused
Music_MagnetTrain_branch_ef711: Music_MagnetTrain_branch_ef711:
note G#, 1 note G#, 1
@@ -262,7 +261,6 @@ Music_MagnetTrain_branch_ef711:
note G_, 1 note G_, 1
endchannel endchannel
Music_MagnetTrain_branch_ef71e: Music_MagnetTrain_branch_ef71e:
note G#, 2 note G#, 2
note G_, 2 note G_, 2

4
constants/gfx_constants.asm
View File

@@ -8,7 +8,6 @@ PALETTE_SIZE EQU NUM_PAL_COLORS * PAL_COLOR_SIZE
PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff PALRGB_WHITE EQUS "palred 31 + palgreen 31 + palblue 31" ; $7fff
SCREEN_WIDTH EQU 20 ; tiles SCREEN_WIDTH EQU 20 ; tiles
SCREEN_HEIGHT EQU 18 ; tiles SCREEN_HEIGHT EQU 18 ; tiles
SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels SCREEN_WIDTH_PX EQU SCREEN_WIDTH * TILE_WIDTH ; pixels
@@ -23,7 +22,6 @@ SCREEN_META_HEIGHT EQU 5 ; metatiles
SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles
SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles
HP_BAR_LENGTH EQU 6 ; tiles HP_BAR_LENGTH EQU 6 ; tiles
EXP_BAR_LENGTH EQU 8 ; tiles EXP_BAR_LENGTH EQU 8 ; tiles
HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels HP_BAR_LENGTH_PX EQU HP_BAR_LENGTH * TILE_WIDTH ; pixels
@@ -34,7 +32,6 @@ HP_GREEN EQU 0
HP_YELLOW EQU 1 HP_YELLOW EQU 1
HP_RED EQU 2 HP_RED EQU 2
; sprite_oam_struct members (see macros/wram.asm) ; sprite_oam_struct members (see macros/wram.asm)
const_def const_def
const SPRITEOAMSTRUCT_YCOORD ; 0 const SPRITEOAMSTRUCT_YCOORD ; 0
@@ -44,7 +41,6 @@ HP_RED EQU 2
SPRITEOAMSTRUCT_LENGTH EQU const_value SPRITEOAMSTRUCT_LENGTH EQU const_value
NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
; PokeAnims indexes (see engine/gfx/pic_animation.asm) ; PokeAnims indexes (see engine/gfx/pic_animation.asm)
const_def const_def
const ANIM_MON_SLOW const ANIM_MON_SLOW

3
constants/item_data_constants.asm
View File

@@ -32,7 +32,6 @@ NO_LIMITS EQU 0
CANT_SELECT EQU 1 << CANT_SELECT_F CANT_SELECT EQU 1 << CANT_SELECT_F
CANT_TOSS EQU 1 << CANT_TOSS_F CANT_TOSS EQU 1 << CANT_TOSS_F
; pack pockets ; pack pockets
const_def const_def
const ITEM_POCKET ; 0 const ITEM_POCKET ; 0
@@ -46,14 +45,12 @@ MAX_BALLS EQU 12
MAX_KEY_ITEMS EQU 25 MAX_KEY_ITEMS EQU 25
MAX_PC_ITEMS EQU 50 MAX_PC_ITEMS EQU 50
; mail ; mail
MAIL_LINE_LENGTH EQU $10 MAIL_LINE_LENGTH EQU $10
MAIL_MSG_LENGTH EQU $20 MAIL_MSG_LENGTH EQU $20
MAILBOX_CAPACITY EQU 10 MAILBOX_CAPACITY EQU 10
MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct MAIL_STRUCT_LENGTH EQU $2f ; mailmsg struct
; held item effects ; held item effects
const_def const_def
const HELD_NONE const HELD_NONE

1
constants/landmark_constants.asm
View File

@@ -105,7 +105,6 @@ KANTO_LANDMARK EQU const_value
GIFT_LOCATION EQU $7e GIFT_LOCATION EQU $7e
EVENT_LOCATION EQU $7f EVENT_LOCATION EQU $7f
; Regions ; Regions
const_def const_def
const JOHTO_REGION ; 0 const JOHTO_REGION ; 0

4
constants/map_data_constants.asm
View File

@@ -3,7 +3,6 @@ MAP_N_A EQU -1
GROUP_NONE EQU 0 GROUP_NONE EQU 0
MAP_NONE EQU 0 MAP_NONE EQU 0
; map struct members (see data/maps/maps.asm) ; map struct members (see data/maps/maps.asm)
const_def const_def
const MAP_MAPATTRIBUTES_BANK ; 0 const MAP_MAPATTRIBUTES_BANK ; 0
@@ -51,7 +50,6 @@ MAP_NONE EQU 0
const FISHGROUP_REMORAID const FISHGROUP_REMORAID
const FISHGROUP_QWILFISH_NO_SWARM const FISHGROUP_QWILFISH_NO_SWARM
; connection directions (see data/maps/data.asm) ; connection directions (see data/maps/data.asm)
const_def const_def
const EAST_F const EAST_F
@@ -66,7 +64,6 @@ MAP_NONE EQU 0
shift_const SOUTH shift_const SOUTH
shift_const NORTH shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm) ; SpawnPoints indexes (see data/maps/spawn_points.asm)
const_value = -1 const_value = -1
const SPAWN_N_A const SPAWN_N_A
@@ -102,7 +99,6 @@ const_value = -1
const SPAWN_FAST_SHIP const SPAWN_FAST_SHIP
NUM_SPAWNS EQU const_value NUM_SPAWNS EQU const_value
; outdoor sprite limits (see engine/overworld/overworld.asm) ; outdoor sprite limits (see engine/overworld/overworld.asm)
MAX_OUTDOOR_SPRITES EQU 23 MAX_OUTDOOR_SPRITES EQU 23
SPRITE_GFX_LIST_CAPACITY EQU $20 SPRITE_GFX_LIST_CAPACITY EQU $20

2
constants/map_object_constants.asm
View File

@@ -126,7 +126,6 @@ NUM_SPRITEMOVEDATA_FIELDS EQU const_value
MAPOBJECT_SCREEN_WIDTH EQU (SCREEN_WIDTH / 2) + 2 MAPOBJECT_SCREEN_WIDTH EQU (SCREEN_WIDTH / 2) + 2
MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2 MAPOBJECT_SCREEN_HEIGHT EQU (SCREEN_HEIGHT / 2) + 2
; SpriteMovementData indexes (see data/sprites/map_objects.asm) ; SpriteMovementData indexes (see data/sprites/map_objects.asm)
const_def const_def
const SPRITEMOVEDATA_00 ; 00 const SPRITEMOVEDATA_00 ; 00
@@ -283,7 +282,6 @@ NUM_SPRITEMOVEDATA EQU const_value
const FACING_GRASS_1 ; 1e const FACING_GRASS_1 ; 1e
const FACING_GRASS_2 ; 1f const FACING_GRASS_2 ; 1f
; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm) ; DoPlayerMovement.DoStep arguments (see engine/overworld/player_movement.asm)
const_def const_def
const STEP_SLOW ; 0 const STEP_SLOW ; 0

2
constants/menu_constants.asm
View File

@@ -32,7 +32,6 @@
shift_const SCROLLINGMENU_ENABLE_START shift_const SCROLLINGMENU_ENABLE_START
shift_const SCROLLINGMENU_ENABLE_SELECT shift_const SCROLLINGMENU_ENABLE_SELECT
; MonMenuOptions indexes (see data/mon_menu.asm) ; MonMenuOptions indexes (see data/mon_menu.asm)
; used by PokemonActionSubmenu (see engine/menus/start_menu.asm) ; used by PokemonActionSubmenu (see engine/menus/start_menu.asm)
const_def 1 const_def 1
@@ -70,7 +69,6 @@ NUM_MONMENU_ITEMS EQU 8
HMENURETURN_SCRIPT EQU %10000000 HMENURETURN_SCRIPT EQU %10000000
HMENURETURN_ASM EQU %11111111 HMENURETURN_ASM EQU %11111111
; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm) ; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
const_def const_def
const PARTYMENUACTION_CHOOSE_POKEMON const PARTYMENUACTION_CHOOSE_POKEMON

9
constants/pokemon_data_constants.asm
View File

@@ -62,11 +62,9 @@ GENDER_UNKNOWN EQU -1
const EGG_DRAGON ; e const EGG_DRAGON ; e
const EGG_NONE ; f (Undiscovered) const EGG_NONE ; f (Undiscovered)
; pokedex entries (see data/pokemon/dex_entries.asm) ; pokedex entries (see data/pokemon/dex_entries.asm)
NUM_DEX_ENTRY_BANKS EQU 4 NUM_DEX_ENTRY_BANKS EQU 4
; party_struct members (see macros/wram.asm) ; party_struct members (see macros/wram.asm)
MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)" MON_SPECIES EQUS "(wPartyMon1Species - wPartyMon1)"
MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)" MON_ITEM EQUS "(wPartyMon1Item - wPartyMon1)"
@@ -101,7 +99,6 @@ BOXMON_STRUCT_LENGTH EQUS "(wPartyMon1End - wPartyMon1)"
PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)" PARTYMON_STRUCT_LENGTH EQUS "(wPartyMon1StatsEnd - wPartyMon1)"
REDMON_STRUCT_LENGTH EQU 44 REDMON_STRUCT_LENGTH EQU 44
; caught data ; caught data
CAUGHT_TIME_MASK EQU %11000000 CAUGHT_TIME_MASK EQU %11000000
@@ -116,7 +113,6 @@ CAUGHT_BY_BOY EQU 2
CAUGHT_EGG_LEVEL EQU 1 CAUGHT_EGG_LEVEL EQU 1
; maximum number of party pokemon ; maximum number of party pokemon
PARTY_LENGTH EQU 6 PARTY_LENGTH EQU 6
@@ -129,7 +125,6 @@ HOF_MON_LENGTH = 1 + 2 + 2 + 1 + (MON_NAME_LENGTH + -1) ; species, id, dvs, leve
HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator HOF_LENGTH = 1 + HOF_MON_LENGTH * PARTY_LENGTH + 1 ; win count, party, terminator
NUM_HOF_TEAMS = 30 NUM_HOF_TEAMS = 30
; evolution types (used in data/pokemon/evos_attacks.asm) ; evolution types (used in data/pokemon/evos_attacks.asm)
const_def 1 const_def 1
const EVOLVE_LEVEL const EVOLVE_LEVEL
@@ -150,7 +145,6 @@ NUM_HOF_TEAMS = 30
const ATK_LT_DEF const ATK_LT_DEF
const ATK_EQ_DEF const ATK_EQ_DEF
; wild data ; wild data
NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size NUM_GRASSMON EQU 7 ; data/wild/*_grass.asm table size
@@ -162,7 +156,6 @@ FISHGROUP_DATA_LENGTH EQU 1 + 2 * 3
NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm) NUM_ROAMMON_MAPS EQU 16 ; RoamMaps table size (see data/wild/roammon_maps.asm)
; treemon sets ; treemon sets
; TreeMons indexes (see data/wild/treemons.asm) ; TreeMons indexes (see data/wild/treemons.asm)
const_def const_def
@@ -182,7 +175,6 @@ NUM_TREEMON_SETS EQU const_value
const TREEMON_SCORE_GOOD ; 1 const TREEMON_SCORE_GOOD ; 1
const TREEMON_SCORE_RARE ; 2 const TREEMON_SCORE_RARE ; 2
; ChangeHappiness arguments (see data/happiness_changes.asm) ; ChangeHappiness arguments (see data/happiness_changes.asm)
const_value = 1 const_value = 1
const HAPPINESS_GAINLEVEL ; 01 const HAPPINESS_GAINLEVEL ; 01
@@ -212,7 +204,6 @@ HAPPINESS_TO_EVOLVE EQU 220
HAPPINESS_THRESHOLD_1 EQU 100 HAPPINESS_THRESHOLD_1 EQU 100
HAPPINESS_THRESHOLD_2 EQU 200 HAPPINESS_THRESHOLD_2 EQU 200
; PP ; PP
PP_UP_MASK EQU %11000000 PP_UP_MASK EQU %11000000
PP_UP_ONE EQU %01000000 PP_UP_ONE EQU %01000000

9
constants/script_constants.asm
View File

@@ -2,7 +2,6 @@
PLAYER EQU 0 PLAYER EQU 0
LAST_TALKED EQU -2 LAST_TALKED EQU -2
; memory constants ; memory constants
const_def const_def
const MEM_BUFFER_0 ; use wStringBuffer3 const MEM_BUFFER_0 ; use wStringBuffer3
@@ -10,7 +9,6 @@ LAST_TALKED EQU -2
const MEM_BUFFER_2 ; use wStringBuffer5 const MEM_BUFFER_2 ; use wStringBuffer5
NUM_MEM_BUFFERS EQU const_value NUM_MEM_BUFFERS EQU const_value
; checkmoney/takemoney accounts ; checkmoney/takemoney accounts
const_def const_def
const YOUR_MONEY ; 0 const YOUR_MONEY ; 0
@@ -36,7 +34,6 @@ NUM_MEM_BUFFERS EQU const_value
const PHONE_CONTACTS_FULL ; 1 const PHONE_CONTACTS_FULL ; 1
const PHONE_CONTACT_REFUSED ; 2 const PHONE_CONTACT_REFUSED ; 2
; writecode/checkcode arguments ; writecode/checkcode arguments
; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm) ; _GetVarAction.VarActionTable indexes (see engine/overworld/variables.asm)
const_def const_def
@@ -74,7 +71,6 @@ RETVAR_STRBUF2 EQU (0 << 6)
RETVAR_ADDR_DE EQU (1 << 6) RETVAR_ADDR_DE EQU (1 << 6)
RETVAR_EXECUTE EQU (2 << 6) RETVAR_EXECUTE EQU (2 << 6)
; PlayerEventScriptPointers indexes (see engine/overworld/events.asm) ; PlayerEventScriptPointers indexes (see engine/overworld/events.asm)
const_def -1 const_def -1
const PLAYEREVENT_MAPSCRIPT const PLAYEREVENT_MAPSCRIPT
@@ -90,7 +86,6 @@ RETVAR_EXECUTE EQU (2 << 6)
const PLAYEREVENT_JOYCHANGEFACING const PLAYEREVENT_JOYCHANGEFACING
NUM_PLAYER_EVENTS EQU const_value NUM_PLAYER_EVENTS EQU const_value
; bg_event types ; bg_event types
; TryBGEvent arguments (see engine/overworld/events.asm) ; TryBGEvent arguments (see engine/overworld/events.asm)
const_def const_def
@@ -115,7 +110,6 @@ NUM_PLAYER_EVENTS EQU const_value
const OBJECTTYPE_5 const OBJECTTYPE_5
const OBJECTTYPE_6 const OBJECTTYPE_6
; command queue members ; command queue members
CMDQUEUE_TYPE EQU 0 CMDQUEUE_TYPE EQU 0
CMDQUEUE_ADDR EQU 1 CMDQUEUE_ADDR EQU 1
@@ -128,7 +122,6 @@ CMDQUEUE_CAPACITY EQU 4
; command queue types ; command queue types
CMDQUEUE_STONETABLE EQU 2 CMDQUEUE_STONETABLE EQU 2
; elevfloor macro values ; elevfloor macro values
; ElevatorFloorNames indexes (see data/events/elevator_floors.asm) ; ElevatorFloorNames indexes (see data/events/elevator_floors.asm)
const_def const_def
@@ -149,7 +142,6 @@ CMDQUEUE_STONETABLE EQU 2
const FLOOR_11F const FLOOR_11F
const FLOOR_ROOF const FLOOR_ROOF
; showemote arguments ; showemote arguments
; Emotes indexes (see data/sprites/emotes.asm) ; Emotes indexes (see data/sprites/emotes.asm)
const_def const_def
@@ -217,7 +209,6 @@ NUM_FRUIT_TREES EQU const_value + -1
const SWARM_DUNSPARCE ; 0 const SWARM_DUNSPARCE ; 0
const SWARM_YANMA ; 1 const SWARM_YANMA ; 1
; ActivateFishingSwarm writebyte arguments ; ActivateFishingSwarm writebyte arguments
const_def const_def
const FISHSWARM_NONE ; 0 const FISHSWARM_NONE ; 0

210
data/battle_tower/parties.asm
View File

File diff suppressed because it is too large Load Diff

1
data/events/field_move_blocks.asm
View File

@@ -42,7 +42,6 @@ CutTreeBlockPointers:
db $0f, $17, 0 db $0f, $17, 0
db -1 ; end db -1 ; end
WhirlpoolBlockPointers: WhirlpoolBlockPointers:
dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO, .johto
db -1 ; end db -1 ; end

1
data/events/odd_eggs.asm
View File

@@ -27,7 +27,6 @@ prob_total = 0
prob 10 prob 10
prob 1 prob 1
OddEggs: OddEggs:
OddEgg1: OddEgg1:

1
data/items/marts.asm
View File

@@ -36,7 +36,6 @@ Marts:
dw MartUnderground dw MartUnderground
.End .End
MartCherrygrove: MartCherrygrove:
db 4 ; # items db 4 ; # items
db POTION db POTION

1
data/maps/attributes.asm
View File

@@ -63,7 +63,6 @@ elif "\1" == "east"
endc endc
ENDM ENDM
map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST map_attributes NewBarkTown, NEW_BARK_TOWN, $05, WEST | EAST
connection west, Route29, ROUTE_29, 0, 0, 9 connection west, Route29, ROUTE_29, 0, 0, 9
connection east, Route27, ROUTE_27, 0, 0, 9 connection east, Route27, ROUTE_27, 0, 0, 9

1
data/maps/map_data.asm
View File

@@ -6,7 +6,6 @@ SECTION "Maps", ROMX
INCLUDE "data/maps/maps.asm" INCLUDE "data/maps/maps.asm"
INCLUDE "data/maps/attributes.asm" INCLUDE "data/maps/attributes.asm"
INCLUDE "data/maps/blocks.asm" INCLUDE "data/maps/blocks.asm"
INCLUDE "data/maps/scripts.asm" INCLUDE "data/maps/scripts.asm"

1
data/maps/maps.asm
View File

@@ -43,7 +43,6 @@ MapGroupPointers::
dw MapGroup_Saffron ; 25 dw MapGroup_Saffron ; 25
dw MapGroup_Cherrygrove ; 26 dw MapGroup_Cherrygrove ; 26
MapGroup_Olivine: MapGroup_Olivine:
map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE map OlivinePokecenter1F, TILESET_POKECENTER, INDOOR, OLIVINE_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE map OlivineGym, TILESET_CHAMPIONS_ROOM, INDOOR, OLIVINE_CITY, MUSIC_GYM, TRUE, PALETTE_DAY, FISHGROUP_SHORE

1
data/maps/outdoor_sprites.asm
View File

@@ -30,7 +30,6 @@ OutdoorSprites:
dw SaffronGroupSprites dw SaffronGroupSprites
dw CherrygroveGroupSprites dw CherrygroveGroupSprites
PalletGroupSprites: PalletGroupSprites:
db SPRITE_SUICUNE db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY db SPRITE_SILVER_TROPHY

1
data/party_menu_qualities.asm
View File

@@ -18,7 +18,6 @@ endr
db -1 ; end db -1 ; end
ENDM ENDM
PartyMenuQualityPointers: PartyMenuQualityPointers:
; entries correspond to PARTYMENUACTION_* constants ; entries correspond to PARTYMENUACTION_* constants
dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON dw .Default ; PARTYMENUACTION_CHOOSE_POKEMON

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