Move event data to data/events/

18 files changed, 172 insertions, 75 deletions

diff --git a/data/bug_contest_flags.asm b/data/events/bug_contest_flags.asm
index 04d748270..04d748270 100644
--- a/data/bug_contest_flags.asm
+++ b/data/events/bug_contest_flags.asm
diff --git a/data/bug_contest_winners.asm b/data/events/bug_contest_winners.asm
index 7a465edf5..7a465edf5 100644
--- a/data/bug_contest_winners.asm
+++ b/data/events/bug_contest_winners.asm
diff --git a/data/collision_stdscripts.asm b/data/events/collision_stdscripts.asm
index 8156d039d..8156d039d 100644
--- a/data/collision_stdscripts.asm
+++ b/data/events/collision_stdscripts.asm
diff --git a/data/elevator_floors.asm b/data/events/elevator_floors.asm
index abc793cf2..abc793cf2 100644
--- a/data/elevator_floors.asm
+++ b/data/events/elevator_floors.asm
diff --git a/data/field_move_blocks.asm b/data/events/field_move_blocks.asm
index d97fdc995..d97fdc995 100644
--- a/data/field_move_blocks.asm
+++ b/data/events/field_move_blocks.asm
diff --git a/data/events/happiness_chances.asm b/data/events/happiness_chances.asm
new file mode 100644
index 000000000..22a7395d9
--- /dev/null
+++ b/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
diff --git a/data/happiness_changes.asm b/data/events/happiness_changes.asm
index de60ea32d..de60ea32d 100644
--- a/data/happiness_changes.asm
+++ b/data/events/happiness_changes.asm
diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm
new file mode 100644
index 000000000..a631ef719
--- /dev/null
+++ b/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
diff --git a/data/npc_trades.asm b/data/events/npc_trades.asm
index d16670984..d16670984 100644
--- a/data/npc_trades.asm
+++ b/data/events/npc_trades.asm
diff --git a/data/odd_eggs.asm b/data/events/odd_eggs.asm
index aa7e8176b..aa7e8176b 100644
--- a/data/odd_eggs.asm
+++ b/data/events/odd_eggs.asm
diff --git a/data/events/pokedex_ratings.asm b/data/events/pokedex_ratings.asm
new file mode 100644
index 000000000..be23c401f
--- /dev/null
+++ b/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
+ 
\ No newline at end of file
diff --git a/data/unown_walls.asm b/data/events/unown_walls.asm
index c05d37004..c05d37004 100644
--- a/data/unown_walls.asm
+++ b/data/events/unown_walls.asm
diff --git a/data/items/pocket_names.asm b/data/items/pocket_names.asm
new file mode 100644
index 000000000..880e08fe3
--- /dev/null
+++ b/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@"
diff --git a/data/phone/non_trainer_names.asm b/data/phone/non_trainer_names.asm
new file mode 100644
index 000000000..184a93113
--- /dev/null
+++ b/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
diff --git a/data/phone/special_calls.asm b/data/phone/special_calls.asm
index 03c27743a..5dba36fc9 100644
--- a/data/phone/special_calls.asm
+++ b/data/phone/special_calls.asm
@@ -7,12 +7,12 @@ ENDM
 
 SpecialPhoneCallList: ; 90627
 ; entries correspond to SPECIALCALL_* constants
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_ELM, ElmPhoneScript2
-	specialcall SpecialCallWhereverYouAre,  PHONE_OAK, BikeShopPhoneScript
-	specialcall SpecialCallWhereverYouAre,  PHONE_MOM, MomPhoneLectureScript
-	specialcall SpecialCallOnlyWhenOutside, PHONE_ELM, ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_ELM,      ElmPhoneScript2
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_BIKESHOP, BikeShopPhoneScript
+	specialcall SpecialCallWhereverYouAre,  PHONECONTACT_MOM,      MomPhoneLectureScript
+	specialcall SpecialCallOnlyWhenOutside, PHONECONTACT_ELM,      ElmPhoneScript2
 ; 90657
diff --git a/data/pokemon/unown_words.asm b/data/pokemon/unown_words.asm
new file mode 100644
index 000000000..4283d3708
--- /dev/null
+++ b/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
diff --git a/data/sprites/player_sprites.asm b/data/sprites/player_sprites.asm
new file mode 100644
index 000000000..89eb6e831
--- /dev/null
+++ b/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
diff --git a/data/unown_words.asm b/data/unown_words.asm
deleted file mode 100644
index ea8c4b2a8..000000000
--- a/data/unown_words.asm
+++ /dev/null
@@ -1,67 +0,0 @@
-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 forms
-	dw UnownWord1
-	dw UnownWord1
-	dw UnownWord2
-	dw UnownWord3
-	dw UnownWord4
-	dw UnownWord5
-	dw UnownWord6
-	dw UnownWord7
-	dw UnownWord8
-	dw UnownWord9
-	dw UnownWord10
-	dw UnownWord11
-	dw UnownWord12
-	dw UnownWord13
-	dw UnownWord14
-	dw UnownWord15
-	dw UnownWord16
-	dw UnownWord17
-	dw UnownWord18
-	dw UnownWord19
-	dw UnownWord20
-	dw UnownWord21
-	dw UnownWord22
-	dw UnownWord23
-	dw UnownWord24
-	dw UnownWord25
-	dw UnownWord26
-; fba90
-
-UnownWord1:  unownword "ANGRY"
-UnownWord2:  unownword "BEAR"
-UnownWord3:  unownword "CHASE"
-UnownWord4:  unownword "DIRECT"
-UnownWord5:  unownword "ENGAGE"
-UnownWord6:  unownword "FIND"
-UnownWord7:  unownword "GIVE"
-UnownWord8:  unownword "HELP"
-UnownWord9:  unownword "INCREASE"
-UnownWord10: unownword "JOIN"
-UnownWord11: unownword "KEEP"
-UnownWord12: unownword "LAUGH"
-UnownWord13: unownword "MAKE"
-UnownWord14: unownword "NUZZLE"
-UnownWord15: unownword "OBSERVE"
-UnownWord16: unownword "PERFORM"
-UnownWord17: unownword "QUICKEN"
-UnownWord18: unownword "REASSURE"
-UnownWord19: unownword "SEARCH"
-UnownWord20: unownword "TELL"
-UnownWord21: unownword "UNDO"
-UnownWord22: unownword "VANISH"
-UnownWord23: unownword "WANT"
-UnownWord24: unownword "XXXXX"
-UnownWord25: unownword "YIELD"
-UnownWord26: unownword "ZOOM"
-; fbb32