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

Remove all address comments

Browse Source
This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/maps/flypoints.asm
View File

@@ -3,7 +3,7 @@ flypoint: MACRO
db \2, SPAWN_\1
ENDM
Flypoints: ; 91c5e
Flypoints:
; landmark, spawn point
const_def
; Johto
@@ -35,4 +35,3 @@ KANTO_FLYPOINT EQU const_value
flypoint CINNABAR, CINNABAR_ISLAND
flypoint INDIGO, INDIGO_PLATEAU
db -1
; 91c8f

81
data/maps/outdoor_sprites.asm
View File

@@ -1,7 +1,7 @@
; Valid sprite IDs for each map group.
; Maps with environment ROUTE or TOWN can only use these sprites.
OutdoorSprites: ; 144b8
OutdoorSprites:
; entries correspond to map groups
dw OlivineGroupSprites
dw MahoganyGroupSprites
@@ -29,10 +29,9 @@ OutdoorSprites: ; 144b8
dw NewBarkGroupSprites
dw SaffronGroupSprites
dw CherrygroveGroupSprites
; 144ec
PalletGroupSprites: ; 144ec
PalletGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -56,9 +55,8 @@ PalletGroupSprites: ; 144ec
db SPRITE_SWIMMER_GUY
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14503
ViridianGroupSprites: ; 14503
ViridianGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -82,9 +80,8 @@ ViridianGroupSprites: ; 14503
db SPRITE_SWIMMER_GUY
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 1451a
PewterGroupSprites: ; 1451a
PewterGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -108,9 +105,8 @@ PewterGroupSprites: ; 1451a
db SPRITE_SWIMMER_GUY
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14531
CinnabarGroupSprites: ; 14531
CinnabarGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -134,9 +130,8 @@ CinnabarGroupSprites: ; 14531
db SPRITE_SWIMMER_GUY
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14548
CeruleanGroupSprites: ; 14548
CeruleanGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -160,9 +155,8 @@ CeruleanGroupSprites: ; 14548
db SPRITE_MISTY
db SPRITE_POKE_BALL
db SPRITE_SLOWPOKE
; 1455f
SaffronGroupSprites: ; 1455f
SaffronGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -186,9 +180,8 @@ SaffronGroupSprites: ; 1455f
db SPRITE_MISTY
db SPRITE_POKE_BALL
db SPRITE_SLOWPOKE
; 14576
CeladonGroupSprites: ; 14576
CeladonGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -212,9 +205,8 @@ CeladonGroupSprites: ; 14576
db SPRITE_BLUE
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 1458d
LavenderGroupSprites: ; 1458d
LavenderGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -238,9 +230,8 @@ LavenderGroupSprites: ; 1458d
db SPRITE_BIKER
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 145a4
VermilionGroupSprites: ; 145a4
VermilionGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -264,9 +255,8 @@ VermilionGroupSprites: ; 145a4
db SPRITE_BIKER
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 145bb
FuchsiaGroupSprites: ; 145bb
FuchsiaGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -290,9 +280,8 @@ FuchsiaGroupSprites: ; 145bb
db SPRITE_BIKER
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 145d2
IndigoGroupSprites: ; 145d2
IndigoGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -316,9 +305,8 @@ IndigoGroupSprites: ; 145d2
db SPRITE_BIKER
db SPRITE_POKE_BALL
db SPRITE_BOULDER
; 145e9
NewBarkGroupSprites: ; 145e9
NewBarkGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -342,9 +330,8 @@ NewBarkGroupSprites: ; 145e9
db SPRITE_COOLTRAINER_F
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14600
CherrygroveGroupSprites: ; 14600
CherrygroveGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -368,9 +355,8 @@ CherrygroveGroupSprites: ; 14600
db SPRITE_COOLTRAINER_F
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14617
SilverGroupSprites: ; 14617
SilverGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -394,9 +380,8 @@ SilverGroupSprites: ; 14617
db SPRITE_COOLTRAINER_F
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 1462e
VioletGroupSprites: ; 1462e
VioletGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -420,9 +405,8 @@ VioletGroupSprites: ; 1462e
db SPRITE_WEIRD_TREE
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 14645
EcruteakGroupSprites: ; 14645
EcruteakGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -446,9 +430,8 @@ EcruteakGroupSprites: ; 14645
db SPRITE_WEIRD_TREE
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
; 1465c
AzaleaGroupSprites: ; 1465c
AzaleaGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -472,9 +455,8 @@ AzaleaGroupSprites: ; 1465c
db SPRITE_SILVER
db SPRITE_FRUIT_TREE
db SPRITE_SLOWPOKE
; 14673
GoldenrodGroupSprites: ; 14673
GoldenrodGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_POKE_BALL
@@ -498,9 +480,8 @@ GoldenrodGroupSprites: ; 14673
db SPRITE_DAY_CARE_MON_2
db SPRITE_FRUIT_TREE
db SPRITE_SLOWPOKE
; 1468a
CianwoodGroupSprites: ; 1468a
CianwoodGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -524,9 +505,8 @@ CianwoodGroupSprites: ; 1468a
db SPRITE_TAUROS
db SPRITE_FRUIT_TREE
db SPRITE_ROCK
; 146a1
OlivineGroupSprites: ; 146a1
OlivineGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -550,9 +530,8 @@ OlivineGroupSprites: ; 146a1
db SPRITE_TAUROS
db SPRITE_FRUIT_TREE
db SPRITE_ROCK
; 146b8
LakeOfRageGroupSprites: ; 146b8
LakeOfRageGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -576,9 +555,8 @@ LakeOfRageGroupSprites: ; 146b8
db SPRITE_GYARADOS
db SPRITE_FRUIT_TREE
db SPRITE_POKE_BALL
; 146cf
MahoganyGroupSprites: ; 146cf
MahoganyGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -602,9 +580,8 @@ MahoganyGroupSprites: ; 146cf
db SPRITE_FISHER
db SPRITE_FRUIT_TREE
db SPRITE_POKE_BALL
; 146e6
BlackthornGroupSprites: ; 146e6
BlackthornGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -628,9 +605,8 @@ BlackthornGroupSprites: ; 146e6
db SPRITE_FISHER
db SPRITE_FRUIT_TREE
db SPRITE_POKE_BALL
; 146fd
DungeonsGroupSprites: ; 146fd
DungeonsGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -654,9 +630,8 @@ DungeonsGroupSprites: ; 146fd
db SPRITE_SCIENTIST
db SPRITE_POKE_BALL
db SPRITE_BOULDER
; 14714
FastShipGroupSprites: ; 14714
FastShipGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
@@ -680,9 +655,8 @@ FastShipGroupSprites: ; 14714
db SPRITE_FAIRY
db SPRITE_POKE_BALL
db SPRITE_ROCK
; 1472b
CableClubGroupSprites: ; 1472b
CableClubGroupSprites:
db SPRITE_OAK
db SPRITE_FISHER
db SPRITE_TEACHER
@@ -694,4 +668,3 @@ CableClubGroupSprites: ; 1472b
db SPRITE_FISHING_GURU
db SPRITE_POKE_BALL
db SPRITE_POKEDEX
; 14736

6
data/maps/roofs.asm
View File

@@ -6,7 +6,7 @@
const ROOF_OLIVINE ; 3
const ROOF_GOLDENROD ; 4
MapGroupRoofs: ; 1c021i
MapGroupRoofs:
; entries correspond to map groups
; values are indexes for Roofs (see below)
db -1 ; 0
@@ -36,13 +36,11 @@ MapGroupRoofs: ; 1c021i
db ROOF_NEW_BARK ; 24 (New Bark)
db -1 ; 25
db ROOF_NEW_BARK ; 26 (Cherrygrove)
; 1c03c
Roofs: ; 1c03c
Roofs:
; entries correspond to ROOF_* constants
INCBIN "gfx/tilesets/roofs/0.2bpp"
INCBIN "gfx/tilesets/roofs/1.2bpp"
INCBIN "gfx/tilesets/roofs/2.2bpp"
INCBIN "gfx/tilesets/roofs/3.2bpp"
INCBIN "gfx/tilesets/roofs/4.2bpp"
; 1c30c

3
data/maps/scenes.asm
View File

@@ -4,7 +4,7 @@ scene_var: MACRO
dw \2
ENDM
MapScenes:: ; 4d01e
MapScenes::
scene_var POKECENTER_2F, wPokecenter2FSceneID
scene_var TRADE_CENTER, wTradeCenterSceneID
scene_var COLOSSEUM, wColosseumSceneID
@@ -85,4 +85,3 @@ MapScenes:: ; 4d01e
scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID
scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID
db -1
; 4d15b

27
data/maps/setup_scripts.asm
View File

@@ -1,4 +1,4 @@
MapSetupScripts: ; 15377
MapSetupScripts:
; entries correspond to MAPSETUP_* constants (see constants/map_setup_constants.asm)
dw MapSetupScript_Warp
dw MapSetupScript_Continue
@@ -12,14 +12,13 @@ MapSetupScripts: ; 15377
dw MapSetupScript_Submenu
dw MapSetupScript_BadWarp
dw MapSetupScript_Fly
; 1538f
MapSetupScript_Teleport: ; 1538f
MapSetupScript_Teleport:
db map_prolong_sprites
MapSetupScript_Fly: ; 15390
MapSetupScript_Fly:
db map_fade_out_palettes
db map_keep_roam
MapSetupScript_Warp: ; 15392
MapSetupScript_Warp:
db map_lcd_off
db map_sound_off
db map_load_spawn
@@ -44,7 +43,7 @@ MapSetupScript_Warp: ; 15392
db map_wildmons
db map_end
MapSetupScript_BadWarp: ; 153a9
MapSetupScript_BadWarp:
db map_load_spawn
db map_load_attributes
db map_change_callback
@@ -68,7 +67,7 @@ MapSetupScript_BadWarp: ; 153a9
db map_wildmons
db map_end
MapSetupScript_Connection: ; 153bf
MapSetupScript_Connection:
db map_animations_off
db map_load_connection
db map_load_attributes
@@ -87,11 +86,11 @@ MapSetupScript_Connection: ; 153bf
db map_animations_on
db map_end
MapSetupScript_Fall: ; 153d0
MapSetupScript_Fall:
db map_prolong_sprites
MapSetupScript_Door: ; 153d1
MapSetupScript_Door:
db map_fade_out_palettes
MapSetupScript_Train: ; 153d2
MapSetupScript_Train:
db map_load_warp
db map_load_attributes
db map_warp_face
@@ -114,7 +113,7 @@ MapSetupScript_Train: ; 153d2
db map_update_roam
db map_end
MapSetupScript_ReloadMap: ; 153e7
MapSetupScript_ReloadMap:
db map_fade
db map_clear_bg_palettes
db map_lcd_off
@@ -132,7 +131,7 @@ MapSetupScript_ReloadMap: ; 153e7
db map_wildmons
db map_end
MapSetupScript_LinkReturn: ; 153f7
MapSetupScript_LinkReturn:
db map_fade
db map_lcd_off
db map_sound_off
@@ -151,7 +150,7 @@ MapSetupScript_LinkReturn: ; 153f7
db map_text_scroll_off
db map_end
MapSetupScript_Continue: ; 15408
MapSetupScript_Continue:
db map_lcd_off
db map_sound_off
db map_load_attributes_2
@@ -171,7 +170,7 @@ MapSetupScript_Continue: ; 15408
db map_wildmons
db map_end
MapSetupScript_Submenu: ; 1541a
MapSetupScript_Submenu:
db map_load_blocks
db map_connection_blocks
db map_end

3
data/maps/sgb_roof_pal_inds.asm
View File

@@ -1,6 +1,6 @@
; Crystal does not support SGB, so this is unused.
MapGroupRoofSGBPalInds: ; 8a45
MapGroupRoofSGBPalInds:
; entries correspond to map groups
db PREDEFPAL_00
db PREDEFPAL_OLIVINE
@@ -29,4 +29,3 @@ MapGroupRoofSGBPalInds: ; 8a45
db PREDEFPAL_NEW_BARK
db PREDEFPAL_SAFFRON
db PREDEFPAL_CHERRYGROVE
; 8a60

1
data/maps/spawn_points.asm
View File

@@ -38,4 +38,3 @@ SpawnPoints: ; 0x152ab
spawn SILVER_CAVE_OUTSIDE, 23, 20
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
spawn N_A, -1, -1
; 1531f