Merge pull request #38 from PikalaxALT/scrcmd

scrcmd

7 files changed, 226 insertions, 223 deletions

diff --git a/data/data_835B488.s b/data/data_835B488.s
index 8d2183672..71e98b2ba 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -657,29 +657,16 @@ gUnknown_83A720C:: @ 83A720C
 gUnknown_83A7240:: @ 83A7240
 	.asciz "0"
 
-	.align 2
-gNullScriptPtr:: @ 83A7244
-	.incbin "baserom.gba", 0x3A7244, 0x4
-
-gUnknown_83A7248:: @ 83A7248
-	.incbin "baserom.gba", 0x3A7248, 0x14
-
-gUnknown_83A725C:: @ 83A725C
-	.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/scrcmd.c"
-
-	.align 2
-gUnknown_83A7290:: @ 83A7290
-	.asciz "0"
-
-	.align 2
-gUnknown_83A7294:: @ 83A7294
-	.incbin "baserom.gba", 0x3A7294, 0xC
+    .section .rodata.83A72A0
 
 gUnknown_83A72A0:: @ 83A72A0
-	.incbin "baserom.gba", 0x3A72A0, 0x2
+	.string "S$"
 
 gUnknown_83A72A2:: @ 83A72A2
-	.incbin "baserom.gba", 0x3A72A2, 0x6
+	.string "IES$"
+
+gUnknown_83A72A6:: @ 83A72A6
+	.string "  "
 
 gUnknown_83A72A8:: @ 83A72A8
 	.incbin "baserom.gba", 0x3A72A8, 0x68
@@ -1560,7 +1547,7 @@ gUnknown_83DFC9C:: @ 83DFC9C
 gUnknown_83E04B0:: @ 83E04B0
 	.incbin "baserom.gba", 0x3E04B0, 0x208
 
-gUnknown_83E06B8:: @ 83E06B8
+gStdStringPtrs:: @ 83E06B8
 	.incbin "baserom.gba", 0x3E06B8, 0x74
 
 gUnknown_83E072C:: @ 83E072C
diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s
index 9c39a96d2..a96e9ff70 100644
--- a/data/data_83FECCC.s
+++ b/data/data_83FECCC.s
@@ -785,7 +785,7 @@ gUnknown_84162B9:: @ 84162B9
 	.incbin "baserom.gba", 0x4162B9, 0x4
 
 gUnknown_84162BD:: @ 84162BD
-	.incbin "baserom.gba", 0x4162BD, 0x7
+	.string " BERRY$"
 
 gText_Coins:: @ 84162C4
 	.incbin "baserom.gba", 0x4162C4, 0x24
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 9baa201e5..23f6ad5a9 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -40,7 +40,7 @@ gStdScripts:: @ 8160450
 	.4byte gStdScript_81A676C
 	.4byte gStdScript_81A8E58
 	.4byte gStdScript_81A4E66
-gStdScripts_End::
+gStdScriptsEnd::
 
 gUnknown_8160478:: @ 8160478
 	.incbin "baserom.gba", 0x160478, 0x886C
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 29850d685..2faa40381 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -1,8 +1,8 @@
     .align 2
 
 gScriptCmdTable:: @ 815F9B4
-	.4byte sub_8069ED0
-	.4byte sub_8069ED4
+	.4byte ScrCmd_nop
+	.4byte ScrCmd_nop1
 	.4byte ScrCmd_end
 	.4byte ScrCmd_return
 	.4byte ScrCmd_call
@@ -38,48 +38,48 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_compare_var_to_var
 	.4byte ScrCmd_callnative
 	.4byte ScrCmd_gotonative
-	.4byte sub_8069EFC
-	.4byte sub_8069F3C
-	.4byte sub_8069FA4
+	.4byte ScrCmd_special
+	.4byte ScrCmd_specialvar
+	.4byte ScrCmd_waitstate
 	.4byte ScrCmd_delay
 	.4byte ScrCmd_setflag
 	.4byte ScrCmd_clearflag
 	.4byte ScrCmd_checkflag
-	.4byte sub_806A9D4
-	.4byte sub_806A9D8
-	.4byte sub_806A9DC
+	.4byte ScrCmd_initclock
+	.4byte ScrCmd_dodailyevents
+	.4byte ScrCmd_gettime
 	.4byte ScrCmd_playse
-	.4byte sub_806B094
+	.4byte ScrCmd_waitse
 	.4byte ScrCmd_playfanfare
-	.4byte sub_806B0CC
-	.4byte sub_806B0E0
-	.4byte sub_806B120
-	.4byte sub_806B134
-	.4byte sub_806B154
-	.4byte sub_806B17C
-	.4byte sub_806B1C8
+	.4byte ScrCmd_waitfanfare
+	.4byte ScrCmd_playbgm
+	.4byte ScrCmd_savebgm
+	.4byte ScrCmd_fadedefaultbgm
+	.4byte ScrCmd_fadenewbgm
+	.4byte ScrCmd_fadeoutbgm
+	.4byte ScrCmd_fadeinbgm
 	.4byte ScrCmd_warp
 	.4byte ScrCmd_warpsilent
 	.4byte ScrCmd_warpdoor
 	.4byte ScrCmd_warphole
-	.4byte sub_806AC70
+	.4byte ScrCmd_warpteleport
 	.4byte ScrCmd_setwarp
 	.4byte ScrCmd_setdynamicwarp
-	.4byte sub_806AE90
-	.4byte sub_806AF10
+	.4byte ScrCmd_setdivewarp
+	.4byte ScrCmd_setholewarp
 	.4byte ScrCmd_getplayerxy
 	.4byte ScrCmd_getpartysize
-	.4byte sub_806A610
+	.4byte ScrCmd_giveitem
 	.4byte ScrCmd_takeitem
-	.4byte sub_806A6A0
-	.4byte sub_806A6E4
+	.4byte ScrCmd_checkitemspace
+	.4byte ScrCmd_checkitem
 	.4byte ScrCmd_checkitemtype
 	.4byte ScrCmd_givepcitem
 	.4byte ScrCmd_checkpcitem
-	.4byte sub_806A7DC
-	.4byte sub_806A7F0
-	.4byte sub_806A818
-	.4byte sub_806A804
+	.4byte ScrCmd_givedecoration
+	.4byte ScrCmd_takedecoration
+	.4byte ScrCmd_checkdecor
+	.4byte ScrCmd_checkdecorspace
 	.4byte ScrCmd_applymovement
 	.4byte ScrCmd_applymovement_at
 	.4byte ScrCmd_waitmovement
@@ -94,34 +94,34 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_faceplayer
 	.4byte ScrCmd_turnobject
 	.4byte ScrCmd_trainerbattle
-	.4byte sub_806C2D8
-	.4byte ScrCmd_ontrainerbattleend
-	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_dotrainerbattle
+	.4byte ScrCmd_gotopostbattlescript
+	.4byte ScrCmd_gotobeatenscript
 	.4byte ScrCmd_checktrainerflag
 	.4byte ScrCmd_settrainerflag
 	.4byte ScrCmd_cleartrainerflag
 	.4byte ScrCmd_setobjectxyperm
 	.4byte ScrCmd_moveobjectoffscreen
 	.4byte ScrCmd_setobjectmovementtype
-	.4byte sub_806B878
-	.4byte sub_806B80C
-	.4byte sub_806B88C
+	.4byte ScrCmd_waitmessage
+	.4byte ScrCmd_message
+	.4byte ScrCmd_closemessage
 	.4byte ScrCmd_lockall
 	.4byte ScrCmd_lock
 	.4byte ScrCmd_releaseall
 	.4byte ScrCmd_release
-	.4byte sub_806BA3C
+	.4byte ScrCmd_waitbuttonpress
 	.4byte ScrCmd_yesnobox
 	.4byte ScrCmd_multichoice
 	.4byte ScrCmd_multichoicedefault
 	.4byte ScrCmd_multichoicegrid
-	.4byte sub_806BB38
-	.4byte sub_806BB8C
-	.4byte sub_806BB98
-	.4byte sub_806BB9C
-	.4byte sub_806BBD8
-	.4byte sub_806BBF8
-	.4byte sub_806BC04
+	.4byte ScrCmd_drawbox
+	.4byte ScrCmd_erasebox
+	.4byte ScrCmd_drawboxtext
+	.4byte ScrCmd_showmonpic
+	.4byte ScrCmd_hidemonpic
+	.4byte ScrCmd_showcontestwinner
+	.4byte ScrCmd_braillemessage
 	.4byte ScrCmd_givemon
 	.4byte ScrCmd_giveegg
 	.4byte ScrCmd_setmonmove
@@ -130,33 +130,33 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_bufferleadmonspeciesname
 	.4byte ScrCmd_bufferpartymonnick
 	.4byte ScrCmd_bufferitemname
-	.4byte sub_806BE34
+	.4byte ScrCmd_bufferdecorationname
 	.4byte ScrCmd_buffermovename
 	.4byte ScrCmd_buffernumberstring
 	.4byte ScrCmd_bufferstdstring
 	.4byte ScrCmd_bufferstring
-	.4byte sub_806C3AC
-	.4byte sub_806C3C0
-	.4byte sub_806C3D4
+	.4byte ScrCmd_pokemart
+	.4byte ScrCmd_pokemartdecoration
+	.4byte ScrCmd_pokemartdecoration2
 	.4byte ScrCmd_playslotmachine
-	.4byte sub_806C410
-	.4byte sub_806C418
-	.4byte sub_806C424
-	.4byte sub_806C428
-	.4byte sub_806C42C
+	.4byte ScrCmd_setberrytree
+	.4byte ScrCmd_choosecontestmon
+	.4byte ScrCmd_startcontest
+	.4byte ScrCmd_showcontestresults
+	.4byte ScrCmd_contestlinktransfer
 	.4byte ScrCmd_random
 	.4byte ScrCmd_givemoney
 	.4byte ScrCmd_takemoney
 	.4byte ScrCmd_checkmoney
-	.4byte sub_806C1CC
-	.4byte sub_806C21C
-	.4byte sub_806C228
-	.4byte sub_806C414
+	.4byte ScrCmd_showmoneybox
+	.4byte ScrCmd_hidemoneybox
+	.4byte ScrCmd_updatemoneybox
+	.4byte ScrCmd_getpricereduction
 	.4byte ScrCmd_fadescreen
 	.4byte ScrCmd_fadescreenspeed
 	.4byte ScrCmd_setflashradius
 	.4byte ScrCmd_animateflash
-	.4byte sub_806B85C
+	.4byte ScrCmd_messageautoscroll
 	.4byte ScrCmd_dofieldeffect
 	.4byte ScrCmd_setfieldeffectarg
 	.4byte ScrCmd_waitfieldeffect
@@ -175,16 +175,16 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_turnvobject
 	.4byte ScrCmd_opendoor
 	.4byte ScrCmd_closedoor
-	.4byte sub_806C688
+	.4byte ScrCmd_waitdooranim
 	.4byte ScrCmd_setdooropen
 	.4byte ScrCmd_setdoorclosed
-	.4byte sub_806C724
-	.4byte sub_806C728
+	.4byte ScrCmd_addelevmenuitem
+	.4byte ScrCmd_showelevmenu
 	.4byte ScrCmd_checkcoins
 	.4byte ScrCmd_givecoins
 	.4byte ScrCmd_takecoins
 	.4byte ScrCmd_setwildbattle
-	.4byte sub_806C39C
+	.4byte ScrCmd_dowildbattle
 	.4byte ScrCmd_setvaddress
 	.4byte ScrCmd_vgoto
 	.4byte ScrCmd_vcall
@@ -193,27 +193,27 @@ gScriptCmdTable:: @ 815F9B4
 	.4byte ScrCmd_vmessage
 	.4byte ScrCmd_vloadword
 	.4byte ScrCmd_vbufferstring
-	.4byte sub_806C258
+	.4byte ScrCmd_showcoinsbox
 	.4byte ScrCmd_hidecoinsbox
 	.4byte ScrCmd_updatecoinsbox
 	.4byte ScrCmd_incrementgamestat
 	.4byte ScrCmd_setescapewarp
-	.4byte sub_806C540
+	.4byte ScrCmd_waitmoncry
 	.4byte ScrCmd_bufferboxname
-	.4byte sub_806B7EC
-	.4byte sub_806B828
-	.4byte sub_806B850
-	.4byte sub_806C7BC
-	.4byte sub_806C7C8
-	.4byte sub_806A888
+	.4byte ScrCmd_cmdC7
+	.4byte ScrCmd_cmdC8
+	.4byte ScrCmd_cmdC9
+	.4byte ScrCmd_cmdCA
+	.4byte ScrCmd_cmdCB
+	.4byte ScrCmd_comparestattoword
 	.4byte ScrCmd_setmonobedient
 	.4byte ScrCmd_checkmonobedience
-	.4byte sub_806A28C
-	.4byte sub_806A8C0
-	.4byte sub_806ACF8
-	.4byte sub_806C844
-	.4byte sub_806BC40
-	.4byte sub_806BD90
+	.4byte ScrCmd_cmdCF
+	.4byte ScrCmd_cmdD0
+	.4byte ScrCmd_warpD1
+	.4byte ScrCmd_setmonmetlocation
+	.4byte ScrCmd_getbraillestringwidth
+	.4byte ScrCmd_bufferitemnameplural
 
 gScriptCmdTableEnd:: @ 815FD08
-	.4byte sub_8069ED0
+	.4byte ScrCmd_nop
diff --git a/data/specials.inc b/data/specials.inc
index 171a6fd8e..56b666207 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -327,8 +327,8 @@ gSpecials:: @ 815FD60
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_807B6C0
-	def_special sp13E_warp_to_last_warp
-	def_special sp13F_fall_to_last_warp
+	def_special DoDiveWarp
+	def_special DoFallWarp
 	def_special nullsub_75
 	def_special nullsub_75
 	def_special sub_80E5E70
diff --git a/data/trainer_tower.s b/data/trainer_tower.s
index f90d1dd2b..6065500b5 100644
--- a/data/trainer_tower.s
+++ b/data/trainer_tower.s
@@ -1,5 +1,7 @@
+#include "constants/items.h"
 	.include "asm/macros.inc"
-	.include "constants/constants.inc"
+    .include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
 
 	.section .rodata
 
@@ -562,7 +564,21 @@ gUnknown_847A284:: @ 847A284
 	.2byte 0x0131, 0x0175, 0x017d
 
 gUnknown_847A2B4:: @ 847A2B4
-	.2byte 0x3f, 0x40, 0x41, 0x42, 0x43, 0x46, 0xb3, 0xb4, 0xb9, 0xba, 0xbb, 0xc6, 0xc7, 0xc9, 0xda
+	.2byte ITEM_HP_UP
+    .2byte ITEM_PROTEIN
+    .2byte ITEM_IRON
+    .2byte ITEM_CARBOS
+    .2byte ITEM_CALCIUM
+    .2byte ITEM_ZINC
+    .2byte ITEM_BRIGHT_POWDER
+    .2byte ITEM_WHITE_HERB
+    .2byte ITEM_MENTAL_HERB
+    .2byte ITEM_CHOICE_BAND
+    .2byte ITEM_KINGS_ROCK
+    .2byte ITEM_SCOPE_LENS
+    .2byte ITEM_METAL_COAT
+    .2byte ITEM_DRAGON_SCALE
+    .2byte ITEM_UP_GRADE
 
 gUnknown_847A2D2:: @ 847A2D2
 	.2byte 0x011d
diff --git a/data/trainer_tower/trainers.inc b/data/trainer_tower/trainers.inc
index e2f7dd121..d304a799d 100644
--- a/data/trainer_tower/trainers.inc
+++ b/data/trainer_tower/trainers.inc
@@ -22,8 +22,8 @@
 
 	.macro dummy_tower_team
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -41,8 +41,8 @@
 gUnknown_847ABAC::
 	.byte 0x01, 0x08, 0x00, 0x07
 	.string "COLE$", 11
-	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNGSTER_2, 0x01
+	.align 1
 	.2byte EC_WORD_AHAHA, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_GOING, EC_WORD_ANYWHERE, EC_WORD_EXCL
 	.2byte EC_WORD_ALL_RIGHT, EC_WORD_EXCL, EC_WORD_BYE_BYE, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HIYAH, EC_WORD_EXCL_EXCL, EC_WORD_DONE, EC_WORD_IN, EC_WORD_TOTALLY, EC_WORD_EXCL_EXCL
@@ -128,8 +128,8 @@ gUnknown_847ABAC::
 gUnknown_847AF8C::
 	.byte 0x02, 0x08, 0x00, 0x0d
 	.string "JAC$", 11
-	.byte FACILITY_CLASS_BURGLAR, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BURGLAR, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A, EC_MOVE2(THIEF), EC_WORD_EXCL, EC_WORD_GIVE_ME, EC_WORD_SOMETHING
 	.2byte EC_WORD_YOU_VE, EC_WORD_GOT, EC_WORD_NOTHING, EC_WORD_THAT, EC_WORD_I, EC_WORD_WANT
 	.2byte EC_WORD_EEK, EC_WORD_EXCL_EXCL, EC_WORD_I_AM, EC_WORD_SORRY, EC_WORD_I, EC_WORD_SURRENDER
@@ -215,8 +215,8 @@ gUnknown_847AF8C::
 gUnknown_847B36C::
 	.byte 0x03, 0x08, 0x00, 0x02
 	.string "MILY$", 11
-	.byte FACILITY_CLASS_PSYCHIC_4, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PSYCHIC_4, 0x01
+	.align 1
 	.2byte EC_WORD_LOOK, EC_WORD_AT, EC_WORD_MY, EC_WORD_POKEMON, EC_MOVE2(SUPERPOWER), EC_WORD_EXCL
 	.2byte EC_WORD_ISN_T, EC_WORD_IT, EC_WORD_INCREDIBLE, EC_WORD_QUES, EC_WORD_POKEMON, EC_WORD_POWER
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_AN, EC_WORD_AWFUL, EC_MOVE(NIGHTMARE), EC_WORD_ELLIPSIS_EXCL
@@ -302,8 +302,8 @@ gUnknown_847B36C::
 gUnknown_847B74C::
 	.byte 0x04, 0x08, 0x01, 0x09
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_LOSE, EC_WORD_TO, EC_WORD_YOU, EC_WORD_HERE
 	.2byte EC_WORD_VERY, EC_WORD_WELL, EC_WORD_DONE, EC_WORD_EXCL, EC_WORD_GOOD, EC_WORD_BATTLE
 	.2byte EC_WORD_UNBELIEVABLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -382,8 +382,8 @@ gUnknown_847B74C::
 	.byte 255 @ friendship
 
 	.string "JOS & ANNE$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_EXCL_EXCL, EC_WORD_GET, EC_WORD_READY, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_PERFECT, EC_WORD_EXCL, EC_WORD_WE, EC_WORD_GET, EC_WORD_THE, EC_WORD_WIN
 	.2byte EC_WORD_LOST, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_MUST_BE, EC_WORD_JOKING, EC_WORD_EXCL
@@ -468,8 +468,8 @@ gUnknown_847B74C::
 gUnknown_847BB2C::
 	.byte 0x05, 0x08, 0x01, 0x04
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_SO, EC_WORD_LOST, EC_WORD_IN, EC_WORD_LOVEY_DOVEY, EC_WORD_HAPPINESS
 	.2byte EC_WORD_OH, EC_WORD_OH, EC_WORD_HE, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_AIYEEH, EC_WORD_EXCL_EXCL, EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_SERIOUS, EC_WORD_QUES
@@ -548,8 +548,8 @@ gUnknown_847BB2C::
 	.byte 255 @ friendship
 
 	.string "EMY & ALEK$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GIDDY, EC_WORD_WITH, EC_WORD_LOVEY_DOVEY, EC_WORD_JOY, EC_WORD_EXCL_EXCL
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_MY, EC_WORD_GIRL, EC_WORD_IS, EC_WORD_CUTE
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_CAN_T, EC_WORD_BE, EC_WORD_SERIOUS
@@ -634,8 +634,8 @@ gUnknown_847BB2C::
 gUnknown_847BF0C::
 	.byte 0x06, 0x08, 0x01, 0x00
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_WE_RE, EC_WORD_USING, EC_WORD_THAT, EC_WORD_STRATEGY, EC_WORD_OKAY, EC_WORD_QUES
 	.2byte EC_WORD_YAY, EC_WORD_WE, EC_WORD_WON, EC_WORD_EXCL, EC_WORD_SORRY, EC_WORD_EXCL
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_THAT_WAS, EC_WORD_REALLY, EC_WORD_TERRIBLE, EC_WORD_EXCL
@@ -714,8 +714,8 @@ gUnknown_847BF0C::
 	.byte 255 @ friendship
 
 	.string "JO & HALEY$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_YOU, EC_WORD_YOU, EC_WORD_YOU, EC_WORD_BETTER, EC_WORD_NOT, EC_WORD_WIN
 	.2byte EC_WORD_YOU_RE, EC_WORD_NOT, EC_WORD_JOKING, EC_WORD_QUES, EC_WORD_WE, EC_WORD_WON
 	.2byte EC_WORD_WIMPY, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_WERE, EC_WORD_WEAK, EC_WORD_ELLIPSIS
@@ -800,8 +800,8 @@ gUnknown_847BF0C::
 gUnknown_847C2EC::
 	.byte 0x07, 0x08, 0x02, 0x0c
 	.string "JORDY$", 11
-	.byte FACILITY_CLASS_BIKER, 0x03, 0x00
-
+	.byte FACILITY_CLASS_BIKER, 0x03
+	.align 1
 	.2byte EC_WORD_DON_T, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_GIGGLE, EC_WORD_YOU, EC_WORD_PUSHOVER
 	.2byte EC_WORD_WHAT, EC_WORD_A_LITTLE, EC_WORD_PUSHOVER, EC_WORD_YOU, EC_WORD_ARE, EC_WORD_EXCL
 	.2byte EC_WORD_YOU, EC_WORD_WERE, EC_WORD_READY, EC_WORD_TO, EC_WORD_ROCK, EC_WORD_EXCL
@@ -880,8 +880,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "ERNEST$", 11
-	.byte FACILITY_CLASS_BIKER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BIKER, 0x01
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_SLEEP, EC_WORD_TIME, EC_WORD_FOR, EC_WORD_CHILDREN, EC_WORD_EXCL
 	.2byte EC_WORD_NOT, EC_WORD_GUTSY, EC_WORD_ENOUGH, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WHY, EC_WORD_DID, EC_WORD_YOU, EC_WORD_CRUSH, EC_WORD_ME, EC_WORD_QUES
@@ -960,8 +960,8 @@ gUnknown_847C2EC::
 	.byte 0 @ friendship
 
 	.string "GABRIEL$", 11
-	.byte FACILITY_CLASS_CUE_BALL, 0x01, 0x00
-
+	.byte FACILITY_CLASS_CUE_BALL, 0x01
+	.align 1
 	.2byte EC_WORD_YAHOO, EC_WORD_EXCL, EC_WORD_HERE_I_COME, EC_WORD_TO, EC_WORD_SWARM, EC_WORD_YOU
 	.2byte EC_WORD_I_AM, EC_WORD_INVINCIBLE, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_THAT, EC_WORD_QUES
 	.2byte EC_WORD_WHAT, EC_WORD_WAS, EC_WORD_THAT, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -1045,8 +1045,8 @@ gUnknown_847C2EC::
 gUnknown_847C6CC::
 	.byte 0x08, 0x08, 0x02, 0x0e
 	.string "MIKE$", 11
-	.byte FACILITY_CLASS_HIKER_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_HIKER_2, 0x05
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_FULL, EC_WORD_OF, EC_WORD_POWER
 	.2byte EC_WORD_WHAT_S_UP_QUES, EC_WORD_WHERE, EC_WORD_IS, EC_WORD_YOUR, EC_WORD_POWER, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_GOT, EC_WORD_ME, EC_WORD_WITH, EC_WORD_YOUR, EC_MOVE2(FAKE_OUT)
@@ -1125,8 +1125,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "REBECCA$", 11
-	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_GIRL, 0x05
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WILL, EC_WORD_WIN, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_IT_S, EC_WORD_TOO, EC_WORD_BAD, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_OVERWHELMING
 	.2byte EC_WORD_ARRGH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1205,8 +1205,8 @@ gUnknown_847C6CC::
 	.byte 255 @ friendship
 
 	.string "NICOLAS$", 11
-	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_BLACK_BELT_2, 0x05
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_WHERE, EC_WORD_YOU, EC_WORD_STOP, EC_WORD_EXCL
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_EVER, EC_WORD_BEAT, EC_WORD_ME
 	.2byte EC_WORD_WHY, EC_WORD_COULDN_T, EC_WORD_I, EC_WORD_BEAT, EC_WORD_YOU, EC_WORD_QUES
@@ -1290,8 +1290,8 @@ gUnknown_847C6CC::
 gUnknown_847CAAC::
 	.byte 0x09, 0x08, 0x00, 0x00
 	.string "JOEY$", 11
-	.byte FACILITY_CLASS_CAMPER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_CAMPER_2, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_SCARY, EC_WORD_STRONG, EC_WORD_EXCL
 	.2byte EC_WORD_WERE, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_TOO, EC_WORD_MUCH, EC_WORD_QUES
 	.2byte EC_WORD_YOUR, EC_WORD_POKEMON, EC_WORD_ARE, EC_WORD_WAY, EC_WORD_TOO_STRONG, EC_WORD_EXCL
@@ -1377,8 +1377,8 @@ gUnknown_847CAAC::
 gUnknown_847CE8C::
 	.byte 0x0a, 0x08, 0x00, 0x0c
 	.string "LILY$", 11
-	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PKMN_BREEDER_3, 0x01
+	.align 1
 	.2byte EC_WORD_I, EC_WORD_WANT, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_BELIEVE, EC_WORD_IN, EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_SOMETHING, EC_WORD_IN, EC_MOVE(RETURN), EC_WORD_ELLIPSIS
@@ -1464,8 +1464,8 @@ gUnknown_847CE8C::
 gUnknown_847D26C::
 	.byte 0x0b, 0x08, 0x00, 0x0e
 	.string "BRANDON$", 11
-	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_BUG_CATCHER_2, 0x01
+	.align 1
 	.2byte EC_WORD_POISON, EC_WORD_IS, EC_WORD_JUST, EC_WORD_SO, EC_WORD_AWFUL, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_ISN_T, EC_WORD_POISON, EC_WORD_TERRIBLE, EC_WORD_QUES
 	.2byte EC_WORD_HUH_QUES, EC_WORD_OUR, EC_WORD_POISON, EC_WORD_DIDN_T, EC_WORD_WORK, EC_WORD_QUES
@@ -1551,8 +1551,8 @@ gUnknown_847D26C::
 gUnknown_847D64C::
 	.byte 0x0c, 0x08, 0x01, 0x02
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_REALLY, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_IS, EC_WORD_TOO, EC_WORD_AWESOME
 	.2byte EC_WORD_MY, EC_WORD_BIG, EC_WORD_BROTHER, EC_WORD_ISN_T, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1631,8 +1631,8 @@ gUnknown_847D64C::
 	.byte 255 @ friendship
 
 	.string "RIC & RENE$", 11
-	.byte FACILITY_CLASS_CRUSH_KIN, 0x05, 0x00
-
+	.byte FACILITY_CLASS_CRUSH_KIN, 0x05
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_TOO, EC_WORD_AWESOME, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_HUH_QUES, 0xFFFF, EC_WORD_I_AM, EC_WORD_NOT_VERY, EC_WORD_AWESOME, EC_WORD_QUES
@@ -1717,8 +1717,8 @@ gUnknown_847D64C::
 gUnknown_847DA2C::
 	.byte 0x0d, 0x08, 0x01, 0x0d
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x05
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL
 	.2byte EC_WORD_EHEHE, EC_WORD_YAY, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1797,8 +1797,8 @@ gUnknown_847DA2C::
 	.byte 255 @ friendship
 
 	.string "JEN & KIRA$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x03, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x03
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_TRY, EC_WORD_HARD, EC_WORD_EXCL, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -1883,8 +1883,8 @@ gUnknown_847DA2C::
 gUnknown_847DE0C::
 	.byte 0x0e, 0x08, 0x01, 0x08
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
+	.align 1
 	.2byte EC_WORD_OUR, EC_MOVE(EARTHQUAKE), EC_WORD_WILL, EC_WORD_MAKE, EC_WORD_YOU, EC_WORD_SHAKY
 	.2byte EC_WORD_FEELING, EC_WORD_SHAKY, EC_WORD_HUH_QUES, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_I_AM, EC_WORD_ALL, EC_WORD_SHAKY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF
@@ -1963,8 +1963,8 @@ gUnknown_847DE0C::
 	.byte 255 @ friendship
 
 	.string "ISAC & MAG$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x01, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_POKEMON, EC_WORD_DOESN_T, EC_WORD_GET, EC_WORD_ALL, EC_WORD_SHAKY
 	.2byte EC_WORD_SEE, EC_WORD_QUES, EC_WORD_I, EC_WORD_DIDN_T, EC_WORD_LIE, EC_WORD_EXCL
 	.2byte EC_WORD_HUH_QUES, EC_WORD_YOU, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_SHAKY
@@ -2049,8 +2049,8 @@ gUnknown_847DE0C::
 gUnknown_847E1EC::
 	.byte 0x0f, 0x08, 0x02, 0x06
 	.string "CHELSEA$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_PKMN_RANGER_4, 0x07
+	.align 1
 	.2byte EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, EC_WORD_IS, EC_WORD_IMPORTANT, EC_WORD_ISN_T_IT_QUES
 	.2byte EC_WORD_YOU, EC_WORD_TAKE, EC_WORD_THE, EC_WORD_LOSS, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_BE, EC_WORD_KIND, EC_WORD_TO, EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD
@@ -2129,8 +2129,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "TRENTON$", 11
-	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07, 0x00
-
+	.byte FACILITY_CLASS_PKMN_RANGER_3, 0x07
+	.align 1
 	.2byte EC_WORD_I, EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREAT, EC_WORD_GREEN, EC_WORD_WORLD
 	.2byte EC_WORD_TAKE_THAT, EC_WORD_EXCL, EC_WORD_THE, EC_WORD_LOSS, EC_WORD_IS, EC_WORD_YOURS
 	.2byte EC_MOVE2(PROTECT), EC_WORD_THE, EC_WORD_GREEN, EC_WORD_WORLD, 0xFFFF, 0xFFFF
@@ -2209,8 +2209,8 @@ gUnknown_847E1EC::
 	.byte 255 @ friendship
 
 	.string "ALBERT$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_3, 0x07
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_WORD_EXCITING, EC_WORD_TIME, EC_WORD_HERE
 	.2byte EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_TO, EC_WORD_MAKE, EC_WORD_THINGS, EC_WORD_EXCITING
 	.2byte EC_WORD_YOU_RE, EC_WORD_STRONG, EC_WORD_THAT_WAS, EC_WORD_WILD, EC_WORD_AND, EC_WORD_EXCITING
@@ -2294,8 +2294,8 @@ gUnknown_847E1EC::
 gUnknown_847E5CC::
 	.byte 0x10, 0x08, 0x02, 0x04
 	.string "CAMRYN$", 11
-	.byte FACILITY_CLASS_PICNICKER_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PICNICKER_2, 0x01
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_BATTLE, EC_WORD_I, EC_WORD_WON_T, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_SAID, EC_WORD_THAT, EC_WORD_I, EC_WORD_WOULD, EC_WORD_WIN
 	.2byte EC_WORD_OH_QUES, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS, EC_WORD_DID, EC_WORD_I, EC_WORD_LOSE, EC_WORD_QUES
@@ -2374,8 +2374,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "NATALIA$", 11
-	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AROMA_LADY_2, 0x01
+	.align 1
 	.2byte EC_WORD_THIS, EC_MOVE(SWEET_SCENT), EC_WORD_YOU, EC_WORD_LIKE, EC_WORD_IT, EC_WORD_QUES
 	.2byte EC_WORD_WASN_T, EC_WORD_THAT, EC_WORD_NICE, EC_WORD_QUES, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THAT, EC_WORD_WASN_T, EC_WORD_GOOD, EC_WORD_QUES, 0xFFFF, 0xFFFF
@@ -2454,8 +2454,8 @@ gUnknown_847E5CC::
 	.byte 255 @ friendship
 
 	.string "KATHLEEN$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
+	.align 1
 	.2byte EC_WORD_TOO, EC_WORD_BAD, EC_WORD_IT_S, EC_WORD_OVER, EC_WORD_FOR, EC_WORD_YOU
 	.2byte EC_WORD_SORRY, EC_WORD_ELLIPSIS, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_THIS, EC_WORD_IS, EC_WORD_HARD, EC_WORD_TO, EC_WORD_BELIEVE, EC_WORD_ELLIPSIS
@@ -2539,8 +2539,8 @@ gUnknown_847E5CC::
 gUnknown_847E9AC::
 	.byte 0x11, 0x08, 0x00, 0x03
 	.string "BRADEN$", 11
-	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SWIMMER_MALE_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PRETTY, EC_WORD_HAPPY, EC_WORD_WITH, EC_WORD_MY, EC_WORD_TOUGHNESS
 	.2byte EC_WORD_WROOOAAR_EXCL, 0xFFFF, EC_WORD_SERIOUSLY, EC_WORD_I, EC_WORD_WON, EC_WORD_QUES
 	.2byte EC_WORD_YOU, EC_WORD_SHOCKED, EC_WORD_ME, EC_WORD_OUT, EC_WORD_OF, EC_WORD_HAPPINESS
@@ -2626,8 +2626,8 @@ gUnknown_847E9AC::
 gUnknown_847ED8C::
 	.byte 0x12, 0x08, 0x00, 0x0a
 	.string "ALLYSON$", 11
-	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOLTRAINER_4, 0x07
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_ABOUT, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_TODAY
 	.2byte EC_WORD_YES, EC_WORD_EXCL_EXCL, EC_WORD_I, EC_WORD_ADORE, EC_WORD_MYSELF, EC_WORD_TODAY
 	.2byte EC_WORD_I_WAS, EC_WORD_CONFUSED, EC_WORD_ABOUT, EC_WORD_THINGS, EC_WORD_I, EC_WORD_THINK
@@ -2713,8 +2713,8 @@ gUnknown_847ED8C::
 gUnknown_847F16C::
 	.byte 0x13, 0x08, 0x00, 0x0e
 	.string "ALBERTO$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x05, 0x00
-
+	.byte FACILITY_CLASS_SAILOR_2, 0x05
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_GET, EC_WORD_WITH, EC_WORD_IT, EC_WORD_RIGHT, EC_WORD_AWAY
 	.2byte EC_WORD_YO, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_NOW, EC_WORD_EH_QUES
 	.2byte EC_WORD_IT_S, EC_WORD_ALL, EC_WORD_OVER, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SURRENDER
@@ -2800,8 +2800,8 @@ gUnknown_847F16C::
 gUnknown_847F54C::
 	.byte 0x14, 0x08, 0x01, 0x0c
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_GOING, EC_WORD_TO, EC_WORD_TRY, EC_WORD_MY, EC_WORD_BEST
 	.2byte EC_WORD_WAY, EC_WORD_TO, EC_WORD_GO, EC_WORD_MY, EC_WORD_AWESOME, EC_WORD_BROTHER
 	.2byte EC_WORD_SIGH, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_HOW, EC_WORD_IT, EC_WORD_GOES
@@ -2880,8 +2880,8 @@ gUnknown_847F54C::
 	.byte 255 @ friendship
 
 	.string "KAT & KIPP$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x04
+	.align 1
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE, EC_WORD_NEVER, EC_WORD_LOSE, EC_WORD_EXCL
 	.2byte EC_WORD_FUFUFU, EC_WORD_ELLIPSIS, EC_WORD_WE_RE, EC_WORD_TOO_STRONG, EC_WORD_TO, EC_WORD_LOSE
 	.2byte EC_WORD_WHAT, EC_WORD_HUH_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_JOKING, EC_WORD_QUES
@@ -2966,8 +2966,8 @@ gUnknown_847F54C::
 gUnknown_847F92C::
 	.byte 0x15, 0x08, 0x01, 0x08
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_OPPONENT, EC_WORD_QUES, EC_WORD_PUSHOVER, EC_WORD_HAHAHA
 	.2byte EC_WORD_HAHAHA, EC_WORD_SORRY, EC_WORD_MY, EC_WORD_FRIEND, EC_WORD_TOUGH, EC_WORD_LOSS
 	.2byte EC_WORD_YOU_RE, EC_WORD_SERIOUS, EC_WORD_AREN_T, EC_WORD_YOU, EC_WORD_FRIEND, EC_WORD_QUES
@@ -3046,8 +3046,8 @@ gUnknown_847F92C::
 	.byte 255 @ friendship
 
 	.string "GEB&MEGAN$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x07, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x07
+	.align 1
 	.2byte EC_WORD_YOU_RE, EC_WORD_OUR, EC_WORD_FOE, EC_WORD_QUES, EC_WORD_GIGGLE, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_GIGGLE, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SO, EC_WORD_SORRY, 0xFFFF
 	.2byte EC_WORD_MY, EC_WORD_WORD, EC_WORD_THIS, EC_WORD_IS, EC_WORD_JUST, EC_WORD_INCREDIBLE
@@ -3132,8 +3132,8 @@ gUnknown_847F92C::
 gUnknown_847FD0C::
 	.byte 0x16, 0x08, 0x01, 0x05
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x01
+	.align 1
 	.2byte EC_WORD_ABSOLUTELY, EC_WORD_WE_RE, EC_WORD_GOING, EC_WORD_TO, EC_WORD_WIN, EC_WORD_EXCL
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3212,8 +3212,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "LISA&LEAH$", 11
-	.byte FACILITY_CLASS_TWINS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TWINS_2, 0x01
+	.align 1
 	.2byte EC_WORD_CAN, EC_WORD_WE, EC_WORD_WIN, EC_WORD_QUES, EC_WORD_IT_S, EC_WORD_EXCITING
 	.2byte EC_WORD_YEAH_YEAH, EC_WORD_EXCL_EXCL, EC_WORD_YOU, EC_WORD_MAKE, EC_WORD_ME, EC_WORD_HAPPY
 	.2byte EC_WORD_AWW, EC_WORD_EXCL, EC_WORD_WAAAH, EC_WORD_EXCL_EXCL, 0xFFFF, 0xFFFF
@@ -3292,8 +3292,8 @@ gUnknown_847FD0C::
 	.byte 255 @ friendship
 
 	.string "$", 11
-	.byte FACILITY_CLASS_AQUA_LEADER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_AQUA_LEADER, 0x01
+	.align 1
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
 	.2byte 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF
@@ -3377,8 +3377,8 @@ gUnknown_847FD0C::
 gUnknown_84800EC::
 	.byte 0x17, 0x08, 0x02, 0x01
 	.string "PRISCILLA$", 11
-	.byte FACILITY_CLASS_TUBER_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_TUBER_3, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_A_LITTLE, EC_WORD_POKEMON, EC_WORD_GIRL, EC_WORD_HERE_I_COME, EC_WORD_EXCL
 	.2byte EC_WORD_WAAAH, EC_WORD_EXCL, EC_WORD_DID, EC_WORD_I, EC_WORD_WIN, EC_WORD_QUES
 	.2byte EC_WORD_OH_DEAR, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_COULDN_T, EC_WORD_WIN, EC_WORD_ELLIPSIS
@@ -3457,8 +3457,8 @@ gUnknown_84800EC::
 	.byte 0 @ friendship
 
 	.string "CHARLOTTE$", 11
-	.byte FACILITY_CLASS_LADY_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_LADY_2, 0x01
+	.align 1
 	.2byte EC_WORD_HELLO, EC_WORD_THERE, EC_WORD_I_AM, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
 	.2byte EC_WORD_OH, EC_WORD_MY, EC_WORD_MY, EC_WORD_ELLIPSIS, EC_WORD_I_AM, EC_WORD_SORRY
 	.2byte EC_WORD_YOU_RE, EC_WORD_BETTER, EC_WORD_THAN, EC_WORD_A, EC_WORD_POKEMON, EC_WORD_LADY
@@ -3537,8 +3537,8 @@ gUnknown_84800EC::
 	.byte 255 @ friendship
 
 	.string "SHANIA$", 11
-	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SWIMMER_FEMALE_2, 0x01
+	.align 1
 	.2byte EC_WORD_A, EC_WORD_POKEMON, EC_WORD_HEROINE, EC_WORD_THAT_S, EC_WORD_WHAT, EC_WORD_I_AM
 	.2byte EC_WORD_AHAHA, EC_WORD_NO, EC_WORD_WAY, EC_WORD_YOU_RE, EC_WORD_TOO_WEAK, EC_WORD_SERIOUSLY
 	.2byte EC_WORD_WHY, EC_WORD_QUES_EXCL, EC_WORD_YOU, EC_WORD_SHOULD, EC_WORD_NOT, EC_WORD_LIE
@@ -3622,8 +3622,8 @@ gUnknown_84800EC::
 gUnknown_84804CC::
 	.byte 0x18, 0x08, 0x02, 0x0d
 	.string "BRENNAN$", 11
-	.byte FACILITY_CLASS_SAILOR_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SAILOR_2, 0x01
+	.align 1
 	.2byte EC_WORD_TAKE, EC_WORD_THINGS, EC_WORD_EASY, EC_WORD_ELLIPSIS, EC_WORD_THAT_S, EC_WORD_IMPORTANT
 	.2byte EC_WORD_YOU, EC_WORD_LOSE, EC_WORD_IF, EC_WORD_YOU, EC_WORD_GIVE_UP, EC_WORD_EXCL
 	.2byte EC_WORD_OOPS, EC_WORD_YOU, EC_WORD_GOT, EC_WORD_AN, EC_WORD_EASY, EC_WORD_WIN
@@ -3702,8 +3702,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "KADEN$", 11
-	.byte FACILITY_CLASS_FISHERMAN_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_FISHERMAN_2, 0x01
+	.align 1
 	.2byte EC_WORD_MY, EC_WORD_FISHING, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_IS, EC_WORD_FANTASTIC
 	.2byte EC_WORD_MY, EC_WORD_FANTASTIC, EC_WORD_FASHION, EC_WORD_APPEAL, EC_WORD_WINS, EC_WORD_OUT
 	.2byte EC_WORD_UH_OH, EC_WORD_ELLIPSIS, EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_LOST
@@ -3782,8 +3782,8 @@ gUnknown_84804CC::
 	.byte 255 @ friendship
 
 	.string "EMANUEL$", 11
-	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_GENTLEMAN_2, 0x01
+	.align 1
 	.2byte EC_WORD_HMM, EC_WORD_QUES, EC_WORD_ARE, EC_WORD_YOU, EC_WORD_SKILLED, EC_WORD_QUES
 	.2byte EC_WORD_I, EC_WORD_SEE, EC_WORD_I, EC_WORD_WASN_T, EC_WORD_RIGHT, EC_WORD_ELLIPSIS
 	.2byte EC_WORD_YOU, EC_WORD_TRULY, EC_WORD_ARE, EC_WORD_A, EC_WORD_MASTER, EC_WORD_TRAINER
@@ -3867,8 +3867,8 @@ gUnknown_84804CC::
 gUnknown_84808AC::
 	.byte 0x19, 0x08, 0x00, 0x0c
 	.string "JARRETT$", 11
-	.byte FACILITY_CLASS_JUGGLER, 0x02, 0x00
-
+	.byte FACILITY_CLASS_JUGGLER, 0x02
+	.align 1
 	.2byte EC_WORD_LET_S, EC_WORD_HAVE, EC_WORD_AN, EC_MOVE2(EXPLOSION), EC_WORD_PARTY, EC_WORD_EXCL
 	.2byte EC_WORD_CONGRATS, EC_WORD_FOR, EC_WORD_YOUR, EC_WORD_LOSS, EC_WORD_PARTY, EC_WORD_KID
 	.2byte EC_WORD_NICE, EC_MOVE(SELF_DESTRUCT), EC_WORD_THERE, EC_WORD_EXCL, EC_WORD_YOU_RE, EC_WORD_PERFECT
@@ -3954,8 +3954,8 @@ gUnknown_84808AC::
 gUnknown_8480C8C::
 	.byte 0x1a, 0x08, 0x00, 0x0d
 	.string "OWEN$", 11
-	.byte FACILITY_CLASS_SUPER_NERD, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SUPER_NERD, 0x02
+	.align 1
 	.2byte EC_WORD_HERE_IT_IS, EC_MOVE2(THUNDER_WAVE), EC_WORD_DON_T, EC_MOVE2(WRAP), EC_WORD_ME, EC_WORD_EXCL
 	.2byte EC_WORD_ACCEPT, EC_WORD_MY, EC_MOVE2(PRESENT), EC_WORD_OF, EC_MOVE2(THUNDER_WAVE), EC_WORD_EXCL
 	.2byte EC_MOVE2(WRAP), EC_MOVE(BIND), EC_WORD_ELECTRIC, EC_MOVE2(WHIRLWIND), EC_WORD_SPIRALING, EC_WORD_AROUND
@@ -4041,8 +4041,8 @@ gUnknown_8480C8C::
 gUnknown_848106C::
 	.byte 0x1b, 0x08, 0x00, 0x01
 	.string "LORENZO$", 11
-	.byte FACILITY_CLASS_PSYCHIC_3, 0x01, 0x00
-
+	.byte FACILITY_CLASS_PSYCHIC_3, 0x01
+	.align 1
 	.2byte EC_WORD_THIS, EC_WORD_POWER, EC_WORD_IS, EC_WORD_NOW, EC_WORD_COMPLETE, EC_WORD_EXCL
 	.2byte EC_WORD_NO, EC_WORD_KEEN_EYE, EC_WORD_CAN, EC_WORD_STOP, EC_WORD_MY, EC_WORD_POWER
 	.2byte EC_WORD_HERE_IT_IS, EC_WORD_EXCL, EC_MOVE(KINESIS), EC_WORD_EXCL, EC_WORD_ELLIPSIS, EC_WORD_WHAT
@@ -4128,8 +4128,8 @@ gUnknown_848106C::
 gUnknown_848144C::
 	.byte 0x1c, 0x08, 0x01, 0x0b
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
+	.align 1
 	.2byte EC_WORD_HERE_GOES, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_ROMANTIC, EC_WORD_HERO, EC_WORD_STRATEGY
 	.2byte EC_WORD_THAT_S, EC_WORD_THE, EC_WORD_DIGITAL, EC_WORD_HYPER, EC_WORD_MODE, EC_WORD_POWER
 	.2byte EC_WORD_MY, EC_WORD_PERFECT, EC_WORD_STRATEGY, EC_WORD_WAS, EC_MOVE2(BEAT_UP), EC_WORD_QUES
@@ -4208,8 +4208,8 @@ gUnknown_848144C::
 	.byte 255 @ friendship
 
 	.string "NIA & CARL$", 11
-	.byte FACILITY_CLASS_COOL_COUPLE, 0x04, 0x00
-
+	.byte FACILITY_CLASS_COOL_COUPLE, 0x04
+	.align 1
 	.2byte EC_WORD_MASTER, EC_WORD_COMPLETE, EC_WORD_FASHION, EC_WORD_SYSTEM, EC_WORD_START, EC_WORD_EXCL
 	.2byte EC_WORD_THAT_S_IT_EXCL, EC_WORD_THE, EC_WORD_POWER, EC_WORD_OF, EC_WORD_OUR, EC_WORD_SYSTEM
 	.2byte EC_WORD_OKAY, EC_WORD_EXCL, EC_MOVE(THUNDERBOLT), EC_WORD_RUN_AWAY, EC_WORD_SYSTEM, EC_WORD_START
@@ -4294,8 +4294,8 @@ gUnknown_848144C::
 gUnknown_848182C::
 	.byte 0x1d, 0x08, 0x01, 0x03
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
+	.align 1
 	.2byte EC_WORD_IT_S, EC_WORD_GOING, EC_WORD_TO, EC_WORD_GET, EC_WORD_AWFULLY, EC_WORD_COLD
 	.2byte EC_WORD_THAT_S, EC_WORD_THAT, EC_WORD_MAN, EC_WORD_I_AM, EC_WORD_COLD, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T_WIN, EC_WORD_IN, EC_WORD_THIS, EC_MOVE(SHEER_COLD), EC_WORD_ELLIPSIS
@@ -4374,8 +4374,8 @@ gUnknown_848182C::
 	.byte 255 @ friendship
 
 	.string "AXE & REN$", 11
-	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_SIS_AND_BRO_2, 0x02
+	.align 1
 	.2byte EC_WORD_OUR, EC_WORD_SWIFT_SWIM, EC_WORD_LEFT, EC_WORD_ME, EC_WORD_FEELING, EC_WORD_COLD
 	.2byte EC_WORD_I, EC_WORD_WON, EC_WORD_BUT, EC_WORD_I_AM, EC_WORD_NOT, EC_WORD_HOT
 	.2byte EC_WORD_I_AM, EC_WORD_HUNGRY, EC_WORD_FOR, EC_WORD_ANY, EC_WORD_HOT, EC_WORD_EATS
@@ -4460,8 +4460,8 @@ gUnknown_848182C::
 gUnknown_8481C0C::
 	.byte 0x1e, 0x08, 0x01, 0x05
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
+	.align 1
 	.2byte EC_WORD_WELCOME, EC_WORD_TO, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_MOVE2(THUNDER_WAVE), EC_MOVE(SANDSTORM)
 	.2byte EC_WORD_LALALA, EC_WORD_LALALA, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LALALA, EC_WORD_LIFE
 	.2byte EC_WORD_I, EC_WORD_NEED, EC_WORD_TO, EC_WORD_LOSE, EC_WORD_MY, EC_MOVE2(FRUSTRATION)
@@ -4540,8 +4540,8 @@ gUnknown_8481C0C::
 	.byte 255 @ friendship
 
 	.string "KATI & GEB$", 11
-	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_YOUNG_COUPLE_2, 0x02
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_PLUS, EC_WORD_YOU_RE, EC_WORD_MINUS, EC_WORD_LOVEY_DOVEY, EC_WORD_MAGNET_PULL
 	.2byte EC_WORD_DON_T, EC_WORD_STOP, EC_WORD_OUR, EC_WORD_LOVEY_DOVEY, EC_WORD_LOCOMOTIVE, EC_WORD_EXCL
 	.2byte EC_WORD_HIS, EC_WORD_CRY, EC_WORD_HAS, EC_WORD_CUTE_CHARM, EC_WORD_TOO, EC_WORD_EXCL
@@ -4626,8 +4626,8 @@ gUnknown_8481C0C::
 gUnknown_8481FEC::
 	.byte 0x1f, 0x08, 0x02, 0x07
 	.string "BEN$", 11
-	.byte FACILITY_CLASS_ROCKER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_ROCKER, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_STATIC, EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YES, EC_WORD_IT, EC_WORD_IS
 	.2byte EC_WORD_ELECTRIC, EC_WORD_ABOUT, EC_WORD_MY, EC_WORD_DIGITAL, EC_WORD_TELEVISION, EC_WORD_I_AM
@@ -4706,8 +4706,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "CAMDEN$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x01, 0x00
-
+	.byte FACILITY_CLASS_ENGINEER, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_WORD_A, EC_MOVE(THUNDERBOLT), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_TOO, EC_WORD_EXCL
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_WORD_IT_S, EC_WORD_ABOUT, EC_WORD_WIRELESS, EC_WORD_LINK
@@ -4786,8 +4786,8 @@ gUnknown_8481FEC::
 	.byte 255 @ friendship
 
 	.string "ZACKERY$", 11
-	.byte FACILITY_CLASS_SCIENTIST, 0x01, 0x00
-
+	.byte FACILITY_CLASS_SCIENTIST, 0x01
+	.align 1
 	.2byte EC_WORD_LALALA, EC_WORD_LET_S, EC_MOVE(SING), EC_WORD_ABOUT, EC_WORD_ELECTRIC, EC_WORD_POWER
 	.2byte EC_MOVE2(THUNDER_SHOCK), EC_WORD_IS, EC_WORD_ELECTRIC, EC_WORD_YOU, EC_WORD_KNOW, EC_WORD_QUES
 	.2byte EC_WORD_ELECTRIC, EC_WORD_EXCL, EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_MOVE2(FLASH), EC_WORD_EXCL_EXCL
@@ -4871,8 +4871,8 @@ gUnknown_8481FEC::
 gUnknown_84823CC::
 	.byte 0x20, 0x08, 0x02, 0x0e
 	.string "MAURA$", 11
-	.byte FACILITY_CLASS_BEAUTY_2, 0x02, 0x00
-
+	.byte FACILITY_CLASS_BEAUTY_2, 0x02
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_WORD_GROUP, EC_WORD_LEADER, EC_WORD_EXCL, 0xFFFF
 	.2byte EC_WORD_WHAT, EC_WORD_AM, EC_WORD_I, EC_WORD_LEADER, EC_WORD_OF, EC_WORD_QUES
 	.2byte EC_WORD_I_AM, EC_WORD_NO, EC_WORD_LEADER, EC_WORD_IT_S, EC_WORD_A_LITTLE, EC_WORD_LIE
@@ -4951,8 +4951,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "MIKAELA$", 11
-	.byte FACILITY_CLASS_LASS_2, 0x01, 0x00
-
+	.byte FACILITY_CLASS_LASS_2, 0x01
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_REALLY, EC_WORD_THE, EC_WORD_NO_1, EC_WORD_TRAINER, EC_WORD_HERE
 	.2byte EC_WORD_NEVER, EC_WORD_SAID, EC_WORD_WHAT, EC_WORD_I_AM, EC_WORD_NO_1, EC_WORD_AT
 	.2byte EC_WORD_NEXT, EC_WORD_TIME, EC_WORD_I, EC_WORD_WILL, EC_WORD_BE, EC_WORD_OVERWHELMING
@@ -5031,8 +5031,8 @@ gUnknown_84823CC::
 	.byte 255 @ friendship
 
 	.string "FLINT$", 11
-	.byte FACILITY_CLASS_ENGINEER, 0x04, 0x00
-
+	.byte FACILITY_CLASS_ENGINEER, 0x04
+	.align 1
 	.2byte EC_WORD_I_AM, EC_WORD_THE, EC_MOVE2(MILK_DRINK), EC_WORD_WORLD, EC_WORD_LEADER, EC_WORD_EXCL
 	.2byte EC_WORD_I_VE, EC_WORD_WON, EC_WORD_THIS, EC_MOVE2(MILK_DRINK), EC_WORD_MATCH, EC_WORD_EXCL
 	.2byte EC_WORD_I, EC_WORD_CAN_T, EC_WORD_DRINK, EC_WORD_ANY, EC_WORD_MORE, EC_WORD_DRINKS