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

Keep table labels in the same files as their contents.

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-11 22:44:25 -05:00
parent fe9cb90049
commit f1f84743f7
67 changed files with 667 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
audio.asm
View File

@ -4,19 +4,10 @@ INCLUDE "includes.asm"
SECTION "Audio", ROMX
INCLUDE "audio/engine.asm"
TrainerEncounterMusic::
INCLUDE "trainers/encounter_music.asm"
Music:
INCLUDE "audio/music_pointers.asm"
INCLUDE "audio/music/nothing.asm"
Cries:
INCLUDE "audio/cry_pointers.asm"
SFX:
INCLUDE "audio/sfx_pointers.asm"

2
audio/cry_pointers.asm
View File

@ -1,4 +1,4 @@
; e91b0
Cries: ; e91b0
dba Cry_Nidoran_M
dba Cry_Nidoran_F
dba Cry_Slowpoke

4
audio/music_pointers.asm
View File

@ -1,6 +1,8 @@
; See song sections in audio.asm.
; e906e
Music: ; e906e
; entries correspond to MUSIC_* constants
dba Music_Nothing ; 0xe91a3
dba Music_TitleScreen ; 0xeb808
dba Music_Route1 ; 0xec000

4
audio/sfx_pointers.asm
View File

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

1
battle/move_names.asm
View File

@ -1,3 +1,4 @@
MoveNames::
db "POUND@"
db "KARATE CHOP@"
db "DOUBLESLAP@"

2
battle/objects/functions.asm
View File

@ -450,9 +450,7 @@ GetBallAnimPal: ; cd249 (33:5249)
ret
; cd26c (33:526c)
BallColors:
INCLUDE "data/ball_colors.asm"
; cd284
BattleAnimFunction_10: ; cd284 (33:5284)
call BattleAnim_AnonJumptable

4
constants/sprite_constants.asm
View File

@ -380,7 +380,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
const SPRITEANIMSTRUCT_0E ; e
const SPRITEANIMSTRUCT_0F ; f
; SpriteAnimFrameData indexes (see data/sprite_engine.asm)
; SpriteAnimFrameData indexes (see data/sprite_anim_frames.asm)
const_def
const SPRITE_ANIM_FRAMESET_00
const SPRITE_ANIM_FRAMESET_PARTY_MON
@ -535,7 +535,7 @@ SPRITEMOVEDATA_FIELDS EQU 6
const SPRITE_ANIM_INDEX_INTRO_SUICUNE_AWAY
const SPRITE_ANIM_INDEX_CELEBI
; SpriteAnimOAMData indexes (see data/sprite_engine.asm)
; SpriteAnimOAMData indexes (see data/sprite_anim_oam.asm)
const_def
const SPRITE_ANIM_FRAME_IDX_00
const SPRITE_ANIM_FRAME_IDX_01

3
data/ball_colors.asm
View File

@ -1,4 +1,6 @@
; colors of balls thrown in battle
BallColors: ; cd26c (33:526c)
db MASTER_BALL, PAL_BATTLE_OB_GREEN
db ULTRA_BALL, PAL_BATTLE_OB_YELLOW
db GREAT_BALL, PAL_BATTLE_OB_BLUE
@ -11,3 +13,4 @@
db MOON_BALL, PAL_BATTLE_OB_GRAY
db LOVE_BALL, PAL_BATTLE_OB_RED
db -1, PAL_BATTLE_OB_GRAY
; cd284

1
data/base_stats.asm
View File

@ -1,3 +1,4 @@
BaseData::
INCLUDE "data/base_stats/bulbasaur.asm"
INCLUDE "data/base_stats/ivysaur.asm"
INCLUDE "data/base_stats/venusaur.asm"

3
data/decoration_attributes.asm
View File

@ -5,6 +5,8 @@ decoration: MACRO
db \5
ENDM
DecorationAttributes: ; 26a4f
; entries correspond to deco constants
decoration DECO_PLANT, $00, $0, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_PLANT, PUT_IT_AWAY, PUT_AWAY_BED, EVENT_GAVE_KURT_APRICORNS, $00
decoration DECO_BED, FEATHERY_BED, SET_UP_BED, EVENT_DECO_BED_1, $1b
@ -58,3 +60,4 @@ ENDM
decoration DECO_DOLL, TENTACOOL, SET_UP_DOLL, EVENT_DECO_TENTACOOL_DOLL, SPRITE_TENTACOOL
decoration DECO_PLANT, GOLD_TROPHY, SET_UP_DOLL, EVENT_DECO_GOLD_TROPHY, SPRITE_GOLD_TROPHY
decoration DECO_PLANT, SILVER_TROPHY, SET_UP_DOLL, EVENT_DECO_SILVER_TROPHY, SPRITE_SILVER_TROPHY
; 26b8d

2
data/default_options.asm
View File

@ -1,3 +1,4 @@
DefaultOptions: ; 14f7c
; Options: med text speed
db TEXT_DELAY_MED
; wSaveFileExists: no
@ -14,3 +15,4 @@
db $00
; $cfd3: ??
db $00
; 14f84

2
data/egg_move_pointers.asm
View File

@ -1,3 +1,4 @@
EggMovePointers:: ; 0x23b11
dw BulbasaurEggMoves
dw NoEggMoves
dw NoEggMoves
@ -253,3 +254,4 @@ endc
dw NoEggMoves
dw NoEggMoves
dw NoEggMoves
; 0x23d07

1
data/egg_moves.asm
View File

@ -10,7 +10,6 @@ SECTION "Egg Moves", ROMX
; and can only breed with Ditto.
EggMovePointers:: ; 0x23b11
INCLUDE "data/egg_move_pointers.asm"

2
data/emote_headers.asm
View File

@ -5,6 +5,7 @@ emote_header: MACRO
dw VTiles1 tile \3
ENDM
EmotesPointers: ; 144d
; entries correspond to EMOTE_* constants
emote_header ShockEmote, 4, $78
emote_header QuestionEmote, 4, $78
@ -18,3 +19,4 @@ ENDM
emote_header FishingRodGFX, 2, $7c
emote_header BoulderDustGFX, 2, $7e
emote_header GrassRustleGFX, 1, $7e
; 14495

3
data/engine_flags.asm
View File

@ -2,6 +2,7 @@ engine_flag: MACRO
dwb \1, 1 << \2
ENDM
EngineFlags: ; 80462
; location, bit
; (all locations are in WRAM bank 1)
@ -201,3 +202,5 @@ ENDM
engine_flag SwarmFlags, 2 ; dunsparce swarm ; $a0
engine_flag SwarmFlags, 3 ; yanma swarm
; 80648

1
data/evos_attacks.asm
View File

@ -4,7 +4,6 @@ INCLUDE "includes.asm"
SECTION "Evolutions and Attacks", ROMX
EvosAttacksPointers:: ; 0x425b1
INCLUDE "data/evos_attacks_pointers.asm"

2
data/evos_attacks_pointers.asm
View File

@ -1,5 +1,6 @@
; Evolutions and attacks are grouped together since they're both checked at level-up.
EvosAttacksPointers:: ; 0x425b1
dw BulbasaurEvosAttacks
dw IvysaurEvosAttacks
dw VenusaurEvosAttacks
@ -251,3 +252,4 @@
dw LugiaEvosAttacks
dw HoOhEvosAttacks
dw CelebiEvosAttacks
; 0x427a7

3
data/fruit_tree_items.asm
View File

@ -1,5 +1,5 @@
FruitTreeItems: ; 44097
; entries correspond to FRUITTREE_* constants
db BERRY ; ROUTE_29
db BERRY ; ROUTE_30_1
db BERRY ; ROUTE_38
@ -30,3 +30,4 @@
db ICE_BERRY ; PEWTER_CITY_1
db MINT_BERRY ; PEWTER_CITY_2
db BURNT_BERRY ; FUCHSIA_CITY
; 440b5

2
data/happiness_changes.asm
View File

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

3
data/hm_moves.asm
View File

@ -1,4 +1,6 @@
; HM moves can't be forgotten
HMMoves: ; 34f0
db CUT
db FLY
db SURF
@ -7,3 +9,4 @@
db WATERFALL
db WHIRLPOOL
db -1 ; end
; 34f8

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