Move event data to data/events/

constants/item_data_constants.asm

@@ -18,14 +18,18 @@ const_value set 1
 
 ; item menu types
 ; UseItem.dw indexes (see engine/pack.asm)
+; UseRegisteredItem.SwitchTo indexes (see engine/select_menu.asm)
 ITEMMENU_NOUSE   EQU 0
 ITEMMENU_CURRENT EQU 4
 ITEMMENU_PARTY   EQU 5
 ITEMMENU_CLOSE   EQU 6
 
 ; item actions
-CANT_SELECT EQU 1 << 6
+CANT_SELECT_F EQU 6
-CANT_TOSS   EQU 1 << 7
+CANT_TOSS_F   EQU 7
+
+CANT_SELECT EQU 1 << CANT_SELECT_F
+CANT_TOSS   EQU 1 << CANT_TOSS_F
 
 
 ; pack pockets
@@ -34,7 +38,7 @@ CANT_TOSS   EQU 1 << 7
 	const BALL_POCKET     ; 1
 	const KEY_ITEM_POCKET ; 2
 	const TM_HM_POCKET    ; 3
-NUM_POCKETS EQU const_value +- 1
+NUM_POCKETS EQU const_value
 
 MAX_ITEMS     EQU 20
 MAX_BALLS     EQU 12
@@ -170,29 +174,3 @@ const_value set 70
 	const MART_MT_MOON
 	const MART_INDIGO_PLATEAU
 	const MART_UNDERGROUND
-
-
-; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
-	const_def
-	const PARTYMENUACTION_CHOOSE_POKEMON
-	const PARTYMENUACTION_HEALING_ITEM
-	const PARTYMENUACTION_SWITCH
-	const PARTYMENUACTION_TEACH_TMHM
-	const PARTYMENUACTION_MOVE
-	const PARTYMENUACTION_EVO_STONE
-	const PARTYMENUACTION_GIVE_MON
-	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
-	const PARTYMENUACTION_GIVE_ITEM
-	const PARTYMENUACTION_MOBILE ; mobile
-; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
-const_value set $f0
-	const PARTYMENUTEXT_HEAL_PSN
-	const PARTYMENUTEXT_HEAL_BRN
-	const PARTYMENUTEXT_HEAL_FRZ
-	const PARTYMENUTEXT_HEAL_SLP
-	const PARTYMENUTEXT_HEAL_PAR
-	const PARTYMENUTEXT_HEAL_HP
-	const PARTYMENUTEXT_HEAL_ALL
-	const PARTYMENUTEXT_REVIVE
-	const PARTYMENUTEXT_LEVEL_UP
-	const PARTYMENUTEXT_HEAL_CONFUSION

constants/menu_constants.asm

@@ -69,3 +69,29 @@ NUM_MONMENU_ITEMS EQU 8
 ; start/select menu return values
 HMENURETURN_SCRIPT EQU %10000000
 HMENURETURN_ASM    EQU %11111111
+
+
+; PartyMenuQualityPointers indexes (see data/party_menu_qualities.asm)
+	const_def
+	const PARTYMENUACTION_CHOOSE_POKEMON
+	const PARTYMENUACTION_HEALING_ITEM
+	const PARTYMENUACTION_SWITCH
+	const PARTYMENUACTION_TEACH_TMHM
+	const PARTYMENUACTION_MOVE
+	const PARTYMENUACTION_EVO_STONE
+	const PARTYMENUACTION_GIVE_MON
+	const PARTYMENUACTION_GIVE_MON_FEMALE ; unused
+	const PARTYMENUACTION_GIVE_ITEM
+	const PARTYMENUACTION_MOBILE ; mobile
+; PrintPartyMenuActionText arguments (see engine/party_menu.asm)
+const_value set $f0
+	const PARTYMENUTEXT_HEAL_PSN
+	const PARTYMENUTEXT_HEAL_BRN
+	const PARTYMENUTEXT_HEAL_FRZ
+	const PARTYMENUTEXT_HEAL_SLP
+	const PARTYMENUTEXT_HEAL_PAR
+	const PARTYMENUTEXT_HEAL_HP
+	const PARTYMENUTEXT_HEAL_ALL
+	const PARTYMENUTEXT_REVIVE
+	const PARTYMENUTEXT_LEVEL_UP
+	const PARTYMENUTEXT_HEAL_CONFUSION

constants/pokemon_constants.asm

@@ -277,6 +277,13 @@ NUM_POKEMON EQU const_value +- 1
 	const MON_FE     ; fe
 
 ; Unown forms
+; indexes for:
+; - UnownWords (see data/pokemon/unown_words.asm)
+; - UnownPicPointers (see data/pokemon/unown_pic_pointers.asm)
+; - UnownAnimationPointers (see gfx/pokemon/unown_anim_pointers.asm)
+; - UnownAnimationIdlePointers (see gfx/pokemon/unown_idle_pointers.asm)
+; - UnownBitmasksPointers (see gfx/pokemon/unown_bitmask_pointers.asm)
+; - UnownFramesPointers (see gfx/pokemon/unown_frame_pointers.asm)
 const_value set 1
 	const UNOWN_A ;  1
 	const UNOWN_B ;  2

data/events/happiness_chances.asm

@@ -0,0 +1,12 @@
+HappinessData_YoungerHaircutBrother: ; 7459
+	db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance
+	db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance
+	db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance
+
+HappinessData_OlderHaircutBrother: ; 7462
+	db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance
+	db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance
+	db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance
+
+HappinessData_DaisysGrooming: ; 746b
+	db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance

data/events/magikarp_lengths.asm

@@ -0,0 +1,21 @@
+MagikarpLengths: ; fbca8
+; [wMagikarpLength] = z * 100 + (bc - x) / y
+; First argument is the bc threshold as well as x.
+; Second argument is y.
+; In reality, due to the bug at .BCLessThanDE,
+; the threshold is determined by only register b.
+	dwb   110, 1 ; not used unless the bug is fixed
+	dwb   310, 2
+	dwb   710, 4
+	dwb  2710, 20
+	dwb  7710, 50
+	dwb 17710, 100
+	dwb 32710, 150
+	dwb 47710, 150
+	dwb 57710, 100
+	dwb 62710, 50
+	dwb 64710, 20
+	dwb 65210, 5
+	dwb 65410, 2
+	dwb 65510, 1 ; not used
+; fbcd2

data/events/pokedex_ratings.asm

@@ -0,0 +1,24 @@
+OakRatings: ; 0x2667f
+; if you caught at most this many, play this sound, load this text
+; (text is defined in engine/events/prof_oaks_pc.asm)
+	dbww   9, SFX_DEX_FANFARE_LESS_THAN_20, OakRating01
+	dbww  19, SFX_DEX_FANFARE_LESS_THAN_20, OakRating02
+	dbww  34, SFX_DEX_FANFARE_20_49,        OakRating03
+	dbww  49, SFX_DEX_FANFARE_20_49,        OakRating04
+	dbww  64, SFX_DEX_FANFARE_50_79,        OakRating05
+	dbww  79, SFX_DEX_FANFARE_50_79,        OakRating06
+	dbww  94, SFX_DEX_FANFARE_80_109,       OakRating07
+	dbww 109, SFX_DEX_FANFARE_80_109,       OakRating08
+	dbww 124, SFX_CAUGHT_MON,               OakRating09
+	dbww 139, SFX_CAUGHT_MON,               OakRating10
+	dbww 154, SFX_DEX_FANFARE_140_169,      OakRating11
+	dbww 169, SFX_DEX_FANFARE_140_169,      OakRating12
+	dbww 184, SFX_DEX_FANFARE_170_199,      OakRating13
+	dbww 199, SFX_DEX_FANFARE_170_199,      OakRating14
+	dbww 214, SFX_DEX_FANFARE_200_229,      OakRating15
+	dbww 229, SFX_DEX_FANFARE_200_229,      OakRating16
+	dbww 239, SFX_DEX_FANFARE_230_PLUS,     OakRating17
+	dbww 248, SFX_DEX_FANFARE_230_PLUS,     OakRating18
+	dbww 255, SFX_DEX_FANFARE_230_PLUS,     OakRating19
+ ; 0x266de
+ 

data/items/pocket_names.asm

@@ -0,0 +1,11 @@
+ItemPocketNames:
+; entries correspond to item type constants
+	dw .Item
+	dw .Key
+	dw .Ball
+	dw .TM
+
+.Item: db "ITEM POCKET@"
+.Key:  db "KEY POCKET@"
+.Ball: db "BALL POCKET@"
+.TM:   db "TM POCKET@"

data/phone/non_trainer_names.asm

@@ -0,0 +1,16 @@
+NonTrainerCallerNames: ; 903d6
+; entries correspond to PHONECONTACT_* constants
+	dw .none
+	dw .mom
+	dw .bikeshop
+	dw .bill
+	dw .elm
+	dw .buena
+
+.none:     db "----------@"
+.mom:      db "MOM:@"
+.bill:     db "BILL:@"
+.elm:      db "PROF.ELM:@"
+.bikeshop: db "BIKE SHOP:@"
+.buena:    db "BUENA:<LNBRK>   DISC JOCKEY@"
+; 90423

data/phone/special_calls.asm

@@ -7,12 +7,12 @@ ENDM
 
 SpecialPhoneCallList: ; 90627
 ; entries correspond to SPECIALCALL_* constants
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_ELM,      ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_OAK, BikeShopPhoneScript
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_BIKESHOP, BikeShopPhoneScript
-	specialcall SpecialCallWhereverYouAre,  PHONE_MOM, MomPhoneLectureScript
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_MOM,      MomPhoneLectureScript
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
 ; 90657

data/pokemon/unown_words.asm

@@ -0,0 +1,67 @@
+unownword: MACRO
+x = 1
+	rept STRLEN(\1)
+	db STRSUB(\1, x, 1) - $40
+x = x + 1
+	endr
+	db -1
+ENDM
+
+UnownWords: ; fba5a
+; entries correspond to UNOWN_* form constants
+	dw UnownWordA
+	dw UnownWordA
+	dw UnownWordB
+	dw UnownWordC
+	dw UnownWordD
+	dw UnownWordE
+	dw UnownWordF
+	dw UnownWordG
+	dw UnownWordH
+	dw UnownWordI
+	dw UnownWordJ
+	dw UnownWordK
+	dw UnownWordL
+	dw UnownWordM
+	dw UnownWordN
+	dw UnownWordO
+	dw UnownWordP
+	dw UnownWordQ
+	dw UnownWordR
+	dw UnownWordS
+	dw UnownWordT
+	dw UnownWordU
+	dw UnownWordV
+	dw UnownWordW
+	dw UnownWordX
+	dw UnownWordY
+	dw UnownWordZ
+; fba90
+
+UnownWordA: unownword "ANGRY"
+UnownWordB: unownword "BEAR"
+UnownWordC: unownword "CHASE"
+UnownWordD: unownword "DIRECT"
+UnownWordE: unownword "ENGAGE"
+UnownWordF: unownword "FIND"
+UnownWordG: unownword "GIVE"
+UnownWordH: unownword "HELP"
+UnownWordI: unownword "INCREASE"
+UnownWordJ: unownword "JOIN"
+UnownWordK: unownword "KEEP"
+UnownWordL: unownword "LAUGH"
+UnownWordM: unownword "MAKE"
+UnownWordN: unownword "NUZZLE"
+UnownWordO: unownword "OBSERVE"
+UnownWordP: unownword "PERFORM"
+UnownWordQ: unownword "QUICKEN"
+UnownWordR: unownword "REASSURE"
+UnownWordS: unownword "SEARCH"
+UnownWordT: unownword "TELL"
+UnownWordU: unownword "UNDO"
+UnownWordV: unownword "VANISH"
+UnownWordW: unownword "WANT"
+UnownWordX: unownword "XXXXX"
+UnownWordY: unownword "YIELD"
+UnownWordZ: unownword "ZOOM"
+; fbb32

data/sprites/player_sprites.asm

@@ -0,0 +1,13 @@
+ChrisStateSprites:
+	db PLAYER_NORMAL,    SPRITE_CHRIS
+	db PLAYER_BIKE,      SPRITE_CHRIS_BIKE
+	db PLAYER_SURF,      SPRITE_SURF
+	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
+	db -1 ; end
+
+KrisStateSprites:
+	db PLAYER_NORMAL,    SPRITE_KRIS
+	db PLAYER_BIKE,      SPRITE_KRIS_BIKE
+	db PLAYER_SURF,      SPRITE_SURF
+	db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
+	db -1 ; end