Keep table labels in the same files as their contents.

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

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

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"

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

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

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

View File

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

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

View File

@@ -4,7 +4,6 @@ INCLUDE "includes.asm"
SECTION "Evolutions and Attacks", ROMX
EvosAttacksPointers:: ; 0x425b1
INCLUDE "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

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

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

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

View File

@@ -4,6 +4,7 @@ landmark: MACRO
dw \3
ENDM
Landmarks: ; 0x1ca8c3
; entries correspond to constants/landmark_constants.asm
landmark 0, 0, SpecialMapName
landmark 148, 116, NewBarkTownName
@@ -101,7 +102,7 @@ ENDM
landmark 20, 116, TohjoFallsName
landmark 28, 84, Route28Name
landmark 148, 132, FastShipName
; 0x1caa43
NewBarkTownName: db "NEW BARK¯TOWN@"
CherrygroveCityName: db "CHERRYGROVE¯CITY@"

View File

@@ -7,7 +7,6 @@ MailEntry_Uppercase: ; 122dd
db "1 2 3 4 5 6 7 8 9 0"
db "<PK> <MN> <PO> <KE> é ♂ ♀ ¥ … ×"
db "lower DEL END "
; 1224f
MailEntry_Lowercase: ; 1224f
@@ -17,3 +16,4 @@ MailEntry_Lowercase: ; 1224f
db "'d 'l 'm 'r 's 't 'v & ( )"
db "<``> <''> [ ] ' : ; "
db "UPPER DEL END "
; 122c1

View File

@@ -1,10 +1,10 @@
; entries correspond to SPRITEMOVEDATA_* constants
sprite_movement_data: macro
db \1, \2, \3, \4, \5
dn \6, 0
endm
SpriteMovementData:: ; 4273
; entries correspond to SPRITEMOVEDATA_* constants
; function, facing, action, flags1, flags2, palette flags
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $02, $00, %0000 ; 00
sprite_movement_data SPRITEMOVEFN_STANDING, DOWN, PERSON_ACTION_STAND, $0c, $00, %0000 ; 01
@@ -44,3 +44,4 @@ endm
sprite_movement_data SPRITEMOVEFN_GRASS, DOWN, PERSON_ACTION_GRASS_SHAKE, $8e, $02, %0000 ; 23
sprite_movement_data SPRITEMOVEFN_RANDOM_WALK_XY, DOWN, PERSON_ACTION_STAND, $00, $00, %0010 ; 24
sprite_movement_data SPRITEMOVEFN_00, DOWN, PERSON_ACTION_STAND, $00, $00, %0000 ; 25
; 4357

View File

@@ -5,6 +5,7 @@ trigger_def: MACRO
dw \2
ENDM
MapTriggers:: ; 4d01e
trigger_def POKECENTER_2F, wPokecenter2FTrigger
trigger_def TRADE_CENTER, wTradeCenterTrigger
trigger_def COLOSSEUM, wColosseumTrigger
@@ -85,3 +86,4 @@ ENDM
trigger_def MOBILE_TRADE_ROOM_MOBILE, wMobileTradeRoomMobileTrigger
trigger_def MOBILE_BATTLE_ROOM, wMobileBattleRoomTrigger
db -1
; 4d15b

View File

@@ -1,4 +1,6 @@
; valid roofs: 0, 1, 2, 3, 4; -1 for none
; valid roofs: 0, 1, 2, 3, 4, or -1 for none
MapGroupRoofs: ; 1c021i
db -1 ; group 0 (unused)
db 3 ; group 1 (Olivine)
db 2 ; group 2 (Mahogany)
@@ -26,3 +28,4 @@
db 0 ; group 24 (New Bark)
db -1 ; group 25
db 0 ; group 26 (Cherrygrove)
; 1c03c

View File

@@ -1,4 +1,6 @@
; party menu icons
MonMenuIcons: ; 8eac4
db ICON_BULBASAUR ; BULBASAUR
db ICON_BULBASAUR ; IVYSAUR
db ICON_BULBASAUR ; VENUSAUR
@@ -250,3 +252,4 @@
db ICON_LUGIA ; LUGIA
db ICON_HO_OH ; HO_OH
db ICON_HUMANSHAPE ; CELEBI
; 8ebbf

View File

@@ -1,3 +1,7 @@
TRADE_EITHER_GENDER EQU 0
TRADE_MALE_ONLY EQU 1
TRADE_FEMALE_ONLY EQU 2
npctrade: MACRO
; dialog set, requested mon, offered mon, nickname, dvs, item, OT ID, OT name, gender requested
db \1, \2, \3, \4, \5, \6, \7
@@ -6,10 +10,7 @@ npctrade: MACRO
db \8, \9, 0
ENDM
TRADE_EITHER_GENDER EQU 0
TRADE_MALE_ONLY EQU 1
TRADE_FEMALE_ONLY EQU 2
NPCTrades: ; fce58
; entries correspond to NPCTRADE_* constants
npctrade 0, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_EITHER_GENDER
@@ -18,3 +19,4 @@ TRADE_FEMALE_ONLY EQU 2
npctrade 2, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_EITHER_GENDER
npctrade 3, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_EITHER_GENDER
npctrade 0, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_EITHER_GENDER
; fcf38

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