summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rw-r--r--asm/macros/battle_script.s1231
-rw-r--r--asm/rom3.s28
-rw-r--r--asm/rom4.s10
-rw-r--r--asm/rom5.s8
-rw-r--r--constants/battle.s13
-rw-r--r--constants/battle_text.s352
-rw-r--r--constants/constants.s2
-rw-r--r--constants/move_effects.s215
-rw-r--r--data/battle_ai_scripts.s7
-rw-r--r--data/battle_scripts_1.s4475
-rw-r--r--data/battle_scripts_2.s194
-rw-r--r--data/contest_ai_scripts.s7
-rw-r--r--data/contest_opponents.s1322
-rw-r--r--data/data1.s605
-rw-r--r--data/data2.s1252
-rw-r--r--data/field_effect_scripts.s5
-rw-r--r--data/graphics.s183
-rwxr-xr-xdata/maps/UnknownMap_082CF564/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082CF564/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082D05D8/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082D05D8/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082D05FC/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082D05FC/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E55C8/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E55C8/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E55EC/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E55EC/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5610/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5610/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5634/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5634/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5658/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5658/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E567C/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E567C/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E56A0/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E56A0/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E56C4/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E56C4/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E56E8/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E56E8/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E570C/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E570C/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5730/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5730/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5754/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5754/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E5778/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E5778/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082E579C/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082E579C/map.binbin0 -> 4 bytes
-rwxr-xr-xdata/maps/UnknownMap_082EDF30/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082EDF30/map.bin3
-rwxr-xr-xdata/maps/UnknownMap_082FF894/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_082FF894/map.binbin0 -> 724 bytes
-rwxr-xr-xdata/maps/UnknownMap_08302970/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_08302970/map.bin1
-rwxr-xr-xdata/maps/UnknownMap_083041B4/border.bin1
-rwxr-xr-xdata/maps/UnknownMap_083041B4/map.bin1
-rwxr-xr-xdata/maps/UnreferencedMap/border.bin1
-rwxr-xr-xdata/maps/UnreferencedMap/map.bin1
-rw-r--r--data/maps/_assets.s319
-rw-r--r--data/script_cmd_table.s2
-rw-r--r--data/script_funcs.s22
-rw-r--r--data/scripts/maps/Route110.s2
-rw-r--r--data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s6
-rw-r--r--data/text/battle_strings.s431
-rw-r--r--data/tilesets/metatiles.s314
-rwxr-xr-xgraphics/battle_transitions/vs.pal99
-rwxr-xr-xgraphics/battle_transitions/vs.pngbin0 -> 533 bytes
-rwxr-xr-xgraphics/interface/battle_window.pal19
-rwxr-xr-xgraphics/interface/battle_window.pngbin0 -> 360 bytes
-rwxr-xr-xgraphics/interface/battle_window2.pngbin0 -> 318 bytes
-rwxr-xr-xgraphics/interface/battle_window3.pngbin0 -> 314 bytes
-rwxr-xr-xgraphics/interface/battle_window4.pngbin0 -> 306 bytes
-rwxr-xr-xgraphics/interface/battle_window5.pngbin0 -> 297 bytes
-rwxr-xr-xgraphics/interface/blank.pal19
-rwxr-xr-xgraphics/interface/hold_icons.pal19
-rwxr-xr-xgraphics/interface/hold_icons.pngbin0 -> 177 bytes
-rwxr-xr-xgraphics/interface/money.pal19
-rwxr-xr-xgraphics/interface/money.pngbin0 -> 201 bytes
-rwxr-xr-xgraphics/interface/pokeblock_device.pal19
-rwxr-xr-xgraphics/interface/pokeblock_device.pngbin0 -> 530 bytes
-rwxr-xr-xgraphics/interface/status_icons.pal19
-rwxr-xr-xgraphics/interface/status_icons.pngbin0 -> 449 bytes
-rwxr-xr-xgraphics/interface/summary_frames.pal19
-rwxr-xr-xgraphics/interface/summary_frames.pngbin0 -> 273 bytes
-rwxr-xr-xgraphics/interface/wordgroup.pal19
-rwxr-xr-xgraphics/interface/wordgroup.pngbin0 -> 558 bytes
-rwxr-xr-xgraphics/misc/applause.pngbin0 -> 287 bytes
-rwxr-xr-xgraphics/misc/confetti.pal19
-rwxr-xr-xgraphics/misc/confetti.pngbin0 -> 355 bytes
-rwxr-xr-xgraphics/misc/judge.pal19
-rwxr-xr-xgraphics/misc/judge.pngbin0 -> 593 bytes
-rwxr-xr-xgraphics/misc/judge_symbols.pal19
-rwxr-xr-xgraphics/misc/judge_symbols.pngbin0 -> 401 bytes
-rwxr-xr-xgraphics/misc/nextturn.pal19
-rwxr-xr-xgraphics/misc/nextturn.pngbin0 -> 199 bytes
-rwxr-xr-xgraphics/misc/pokeblock.pngbin0 -> 147 bytes
-rwxr-xr-xgraphics/pokedex/arrows.pal19
-rwxr-xr-xgraphics/pokedex/arrows.pngbin0 -> 243 bytes
-rwxr-xr-xgraphics/roulette/center.pal19
-rwxr-xr-xgraphics/roulette/center.pngbin0 -> 589 bytes
-rwxr-xr-xgraphics/unknown/ball.pal19
-rwxr-xr-xgraphics/unknown/ball.pngbin0 -> 150 bytes
-rwxr-xr-xgraphics/unused/numbers.pal19
-rwxr-xr-xgraphics/unused/numbers.pngbin0 -> 302 bytes
-rw-r--r--include/text.h2
-rw-r--r--ld_script.txt7
-rwxr-xr-xmisc.mk6
-rw-r--r--src/text.c6
112 files changed, 9323 insertions, 2140 deletions
diff --git a/Makefile b/Makefile
index 37b4e7ffc..e190356c9 100644
--- a/Makefile
+++ b/Makefile
@@ -39,8 +39,10 @@ C_OBJS := $(C_SRCS:%.c=%.o)
ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o \
asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o
-DATA_ASM_OBJS := data/data1.o data/data2.o data/graphics.o data/sound_data.o \
-data/event_scripts.o data/battle_anim_scripts.o
+DATA_ASM_OBJS := data/data2.o data/graphics.o data/sound_data.o \
+data/event_scripts.o data/battle_anim_scripts.o \
+data/battle_scripts_1.o data/battle_scripts_2.o data/field_effect_scripts.o \
+data/battle_ai_scripts.o data/contest_ai_scripts.o data/script_funcs.o
OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS)
pokeruby_OBJS := $(OBJS:.o=_ruby.o)
diff --git a/asm/macros/battle_script.s b/asm/macros/battle_script.s
new file mode 100644
index 000000000..261efd8eb
--- /dev/null
+++ b/asm/macros/battle_script.s
@@ -0,0 +1,1231 @@
+@ 0 ==
+@ 1 !=
+@ 2 <
+@ 3 >
+@ 4 &=
+
+.equiv TARGET, 0
+.equiv USER, 1
+
+ .macro calculatedamage
+ critical
+ atk5
+ atk6
+ atk7
+ .endm
+
+
+ .macro attackcanceler
+ .byte 0x00
+ .endm
+
+ .macro accuracycheck address, param1
+ .byte 0x01
+ .4byte \address
+ .2byte \param1
+ .endm
+
+ .macro attackstring
+ .byte 0x02
+ .endm
+
+ .macro ppreduce
+ .byte 0x03
+ .endm
+
+ .macro critcalc
+ .byte 0x04
+ .endm
+
+ .macro atk5
+ .byte 0x05
+ .endm
+
+ .macro atk6
+ .byte 0x06
+ .endm
+
+ .macro atk7
+ .byte 0x07
+ .endm
+
+ .macro atk8
+ .byte 0x08
+ .endm
+
+ .macro attackanimation
+ .byte 0x09
+ .endm
+
+ .macro waitanimation
+ .byte 0x0a
+ .endm
+
+ .macro graphicalhpupdate bank
+ .byte 0x0b
+ .byte \bank
+ .endm
+
+ .macro datahpupdate bank
+ .byte 0x0c
+ .byte \bank
+ .endm
+
+ .macro critmessage
+ .byte 0x0d
+ .endm
+
+ .macro missmessage
+ .byte 0x0e
+ .endm
+
+ .macro resultmessage
+ .byte 0x0f
+ .endm
+
+ .macro printstring string
+ .byte 0x10
+ .2byte \string
+ .endm
+
+ .macro printstring2 string
+ .byte 0x11
+ .2byte \string
+ .endm
+
+ .macro waitmessage delay
+ .byte 0x12
+ .2byte \delay
+ .endm
+
+ .macro printfromtable table
+ .byte 0x13
+ .4byte \table
+ .endm
+
+ .macro printfromtable2 table
+ .byte 0x14
+ .4byte \table
+ .endm
+
+ .macro seteffectwithchancetarget
+ .byte 0x15
+ .endm
+
+ .macro seteffecttarget
+ .byte 0x16
+ .endm
+
+ .macro seteffectuser
+ .byte 0x17
+ .endm
+
+ .macro clearstatus bank
+ .byte 0x18
+ .byte \bank
+ .endm
+
+ .macro faintpokemon bank, param2, param3
+ .byte 0x19
+ .byte \bank
+ .byte \param2
+ .4byte \param3
+ .endm
+
+ .macro atk1a param1
+ .byte 0x1a
+ .byte \param1
+ .endm
+
+ .macro atk1b bank
+ .byte 0x1b
+ .byte \bank
+ .endm
+
+ .macro jumpifstatus bank, status, address
+ .byte 0x1c
+ .byte \bank
+ .4byte \status
+ .4byte \address
+ .endm
+
+ .macro jumpifsecondarytstatus bank, status, address
+ .byte 0x1d
+ .byte \bank
+ .4byte \status
+ .4byte \address
+ .endm
+
+ .macro jumpifability bank, ability, address
+ .byte 0x1e
+ .byte \bank
+ .byte \ability
+ .4byte \address
+ .endm
+
+ .macro jumpifhalverset bank, status, address
+ .byte 0x1f
+ .byte \bank
+ .2byte \status
+ .4byte \address
+ .endm
+
+ .macro jumpifstat bank, flag, quantity, statid, address
+ .byte 0x20
+ .byte \bank
+ .byte \flag
+ .byte \quantity
+ .byte \statid
+ .4byte \address
+ .endm
+
+ .macro jumpifspecialstatusflag bank, mask, status, address
+ .byte 0x21
+ .byte \bank
+ .4byte \mask
+ .byte \status
+ .4byte \address
+ .endm
+
+ .macro jumpiftype bank, type, address
+ .byte 0x22
+ .byte \bank
+ .byte \type
+ .4byte \address
+ .endm
+
+ .macro atk23 bank
+ .byte 0x23
+ .byte \bank
+ .endm
+
+ .macro atk24 address
+ .byte 0x24
+ .4byte \address
+ .endm
+
+ .macro atk25
+ .byte 0x25
+ .endm
+
+ .macro atk26 param1
+ .byte 0x26
+ .byte \param1
+ .endm
+
+ .macro atk27 address
+ .byte 0x27
+ .4byte \address
+ .endm
+
+ .macro jump address
+ .byte 0x28
+ .4byte \address
+ .endm
+
+ .macro jumpifbyte ifflag, checkaddr, compare, address
+ .byte 0x29
+ .byte \ifflag
+ .4byte \checkaddr
+ .byte \compare
+ .4byte \address
+ .endm
+
+ .macro jumpifhalfword ifflag, checkaddr, compare, address
+ .byte 0x2a
+ .byte \ifflag
+ .4byte \checkaddr
+ .2byte \compare
+ .4byte \address
+ .endm
+
+ .macro jumpifword ifflag, checkaddr, compare, address
+ .byte 0x2b
+ .byte \ifflag
+ .4byte \checkaddr
+ .4byte \compare
+ .4byte \address
+ .endm
+
+ .macro jumpifarrayequal mem1, mem2, size, address
+ .byte 0x2c
+ .4byte \mem1
+ .4byte \mem2
+ .byte \size
+ .4byte \address
+ .endm
+
+ .macro jumpifarraynotequal mem1, mem2, size, address
+ .byte 0x2d
+ .4byte \mem1
+ .4byte \mem2
+ .byte \size
+ .4byte \address
+ .endm
+
+ .macro setbyte pointer, value
+ .byte 0x2e
+ .4byte \pointer
+ .byte \value
+ .endm
+
+ .macro addbyte pointer, value
+ .byte 0x2f
+ .4byte \pointer
+ .byte \value
+ .endm
+
+ .macro subtractbyte pointer, value
+ .byte 0x30
+ .4byte \pointer
+ .byte \value
+ .endm
+
+ .macro copyarray destination, source, size
+ .byte 0x31
+ .4byte \destination
+ .4byte \source
+ .byte \size
+ .endm
+
+ .macro atk32 param1, param2, param3, byte
+ .byte 0x32
+ .4byte \param1
+ .4byte \param2
+ .4byte \param3
+ .byte \byte
+ .endm
+
+ .macro orbyte pointer, value
+ .byte 0x33
+ .4byte \pointer
+ .byte \value
+ .endm
+
+ .macro orhalfword pointer, value
+ .byte 0x34
+ .4byte \pointer
+ .2byte \value
+ .endm
+
+ .macro orword pointer, value
+ .byte 0x35
+ .4byte \pointer
+ .4byte \value
+ .endm
+
+ .macro bicbyte pointer, value
+ .byte 0x36
+ .4byte \pointer
+ .byte \value
+ .endm
+
+ .macro bichalfword pointer, value
+ .byte 0x37
+ .4byte \pointer
+ .2byte \value
+ .endm
+
+ .macro bicword pointer, value
+ .byte 0x38
+ .4byte \pointer
+ .4byte \value
+ .endm
+
+ .macro pause pause_duration
+ .byte 0x39
+ .2byte \pause_duration
+ .endm
+
+ .macro waitstateatk
+ .byte 0x3a
+ .endm
+
+ .macro somethinghealatk3b bank
+ .byte 0x3b
+ .byte \bank
+ .endm
+
+ .macro return
+ .byte 0x3c
+ .endm
+
+ .macro end
+ .byte 0x3d
+ .endm
+
+ .macro end2
+ .byte 0x3e
+ .endm
+
+ .macro end3
+ .byte 0x3f
+ .endm
+
+ .macro atk40 address
+ .byte 0x40
+ .4byte \address
+ .endm
+
+ .macro callatk address
+ .byte 0x41
+ .4byte \address
+ .endm
+
+ .macro jumpiftype2 bank, type, address
+ .byte 0x42
+ .byte \bank
+ .byte \type
+ .4byte \address
+ .endm
+
+ .macro jumpifabilitypresent ability, address
+ .byte 0x43
+ .byte \ability
+ .4byte \address
+ .endm
+
+ .macro atk44
+ .byte 0x44
+ .endm
+
+ .macro playanimation bank, animation, var_address
+ .byte 0x45
+ .byte \bank
+ .byte \animation
+ .4byte \var_address
+ .endm
+
+ .macro atk46 bank, address, int
+ .byte 0x46
+ .byte \bank
+ .4byte \address
+ .4byte \int
+ .endm
+
+ .macro atk47
+ .byte 0x47
+ .endm
+
+ .macro playstatchangeanimation bank, color, byte
+ .byte 0x48
+ .byte \bank
+ .byte \color
+ .byte \byte
+ .endm
+
+ .macro atk49 byte1, byte2
+ .byte 0x49
+ .byte \byte1
+ .byte \byte2
+ .endm
+
+ .macro damagecalc2
+ .byte 0x4a
+ .endm
+
+ .macro atk4b
+ .byte 0x4b
+ .endm
+
+ .macro switch1 bank
+ .byte 0x4c
+ .byte \bank
+ .endm
+
+ .macro switch2 bank
+ .byte 0x4d
+ .byte \bank
+ .endm
+
+ .macro switch3 bank, byte
+ .byte 0x4e
+ .byte \bank
+ .byte \byte
+ .endm
+
+ .macro jumpifcannotswitch bank, address
+ .byte 0x4f
+ .byte \bank
+ .4byte \address
+ .endm
+
+ .macro openpartyscreen bank, address
+ .byte 0x50
+ .byte \bank
+ .4byte \address
+ .endm
+
+ .macro atk51 bank, param2
+ .byte 0x51
+ .byte \bank
+ .byte \param2
+ .endm
+
+ .macro atk52 bank
+ .byte 0x52
+ .byte \bank
+ .endm
+
+ .macro atk53 bank
+ .byte 0x53
+ .byte \bank
+ .endm
+
+ .macro atk54 word
+ .byte 0x54
+ .2byte \word
+ .endm
+
+ .macro atk55 int
+ .byte 0x55
+ .4byte \int
+ .endm
+
+ .macro atk56 bank_or_side
+ .byte 0x56
+ .byte \bank_or_side
+ .endm
+
+ .macro atk57
+ .byte 0x57
+ .endm
+
+ .macro atk58 bank
+ .byte 0x58
+ .byte \bank
+ .endm
+
+ .macro checkiflearnmoveinbattle param1, param2, bank_maybe
+ .byte 0x59
+ .4byte \param1
+ .4byte \param2
+ .byte \bank_maybe
+ .endm
+
+ .macro atk5a address
+ .byte 0x5a
+ .4byte \address
+ .endm
+
+ .macro atk5b address
+ .byte 0x5b
+ .4byte \address
+ .endm
+
+ .macro atk5c bank
+ .byte 0x5c
+ .byte \bank
+ .endm
+
+ .macro atk5d
+ .byte 0x5d
+ .endm
+
+ .macro atk5e bank
+ .byte 0x5e
+ .byte \bank
+ .endm
+
+ .macro atk5f
+ .byte 0x5f
+ .endm
+
+ .macro atk60 byte
+ .byte 0x60
+ .byte \byte
+ .endm
+
+ .macro atk61 bank_or_side
+ .byte 0x61
+ .byte \bank_or_side
+ .endm
+
+ .macro atk62 bank_or_side
+ .byte 0x62
+ .byte \bank_or_side
+ .endm
+
+ .macro jumptoattack bank
+ .byte 0x63
+ .byte \bank
+ .endm
+
+ .macro statusanimation bank
+ .byte 0x64
+ .byte \bank
+ .endm
+
+ .macro atk65 bank_or_side, address
+ .byte 0x65
+ .byte \bank_or_side
+ .4byte \address
+ .endm
+
+ .macro atk66 bank_or_side, bank_or_side2, address
+ .byte 0x66
+ .byte \bank_or_side
+ .byte \bank_or_side2
+ .4byte \address
+ .endm
+
+ .macro atk67
+ .byte 0x67
+ .endm
+
+ .macro atk68
+ .byte 0x68
+ .endm
+
+ .macro atk69
+ .byte 0x69
+ .endm
+
+ .macro removeitem bank
+ .byte 0x6a
+ .byte \bank
+ .endm
+
+ .macro atk6b
+ .byte 0x6b
+ .endm
+
+ .macro atk6c
+ .byte 0x6c
+ .endm
+
+ .macro atk6d
+ .byte 0x6d
+ .endm
+
+ .macro atk6e
+ .byte 0x6e
+ .endm
+
+ .macro atk6f bank
+ .byte 0x6f
+ .byte \bank
+ .endm
+
+ .macro atk70 bank
+ .byte 0x70
+ .byte \bank
+ .endm
+
+ .macro atk71
+ .byte 0x71
+ .endm
+
+ .macro atk72 address
+ .byte 0x72
+ .4byte \address
+ .endm
+
+ .macro atk73 bank
+ .byte 0x73
+ .byte \bank
+ .endm
+
+ .macro atk74 bank
+ .byte 0x74
+ .byte \bank
+ .endm
+
+ .macro atk75
+ .byte 0x75
+ .endm
+
+ .macro atk76 bank, byte
+ .byte 0x76
+ .byte \bank
+ .byte \byte
+ .endm
+
+ .macro setprotect
+ .byte 0x77
+ .endm
+
+ .macro faintifabilitynotdamp
+ .byte 0x78
+ .endm
+
+ .macro setuserhptozero
+ .byte 0x79
+ .endm
+
+ .macro jumpwhiletargetvalid address
+ .byte 0x7a
+ .4byte \address
+ .endm
+
+ .macro setdamageasrestorehalfmaxhp address, byte
+ .byte 0x7b
+ .4byte \address
+ .byte \byte
+ .endm
+
+ .macro jumptolastusedattack
+ .byte 0x7c
+ .endm
+
+ .macro setrain
+ .byte 0x7d
+ .endm
+
+ .macro setreflect
+ .byte 0x7e
+ .endm
+
+ .macro setleechseed
+ .byte 0x7f
+ .endm
+
+ .macro manipulatedamage id
+ .byte 0x80
+ .byte \id
+ .endm
+
+ .macro setrest address
+ .byte 0x81
+ .4byte \address
+ .endm
+
+ .macro jumpifnotfirstturn address
+ .byte 0x82
+ .4byte \address
+ .endm
+
+ .macro nop3
+ .byte 0x83
+ .endm
+
+ .macro jumpifcannotsleep address
+ .byte 0x84
+ .4byte \address
+ .endm
+
+ .macro stockpile
+ .byte 0x85
+ .endm
+
+ .macro stockpiletobasedamage address
+ .byte 0x86
+ .4byte \address
+ .endm
+
+ .macro stockpiletohprecovery address
+ .byte 0x87
+ .4byte \address
+ .endm
+
+ .macro negativedamage
+ .byte 0x88
+ .endm
+
+ .macro statbuffchange target, address
+ .byte 0x89
+ .byte \target
+ .4byte \address
+ .endm
+
+ .macro normalisebuffs
+ .byte 0x8a
+ .endm
+
+ .macro setbide
+ .byte 0x8b
+ .endm
+
+ .macro confuseifrepeatingattackends
+ .byte 0x8c
+ .endm
+
+ .macro setloopcounter count
+ .byte 0x8d
+ .byte \count
+ .endm
+
+ .macro atk8e
+ .byte 0x8e
+ .endm
+
+ .macro forcerandomswitch address
+ .byte 0x8f
+ .4byte \address
+ .endm
+
+ .macro changetypestoenemyattacktype address
+ .byte 0x90
+ .4byte \address
+ .endm
+
+ .macro givemoney
+ .byte 0x91
+ .endm
+
+ .macro setlightscreen
+ .byte 0x92
+ .endm
+
+ .macro koplussomethings address
+ .byte 0x93
+ .4byte \address
+ .endm
+
+ .macro gethalfcurrentenemyhp
+ .byte 0x94
+ .endm
+
+ .macro setsandstorm
+ .byte 0x95
+ .endm
+
+ .macro weatherdamage
+ .byte 0x96
+ .endm
+
+ .macro tryinfatuatetarget address
+ .byte 0x97
+ .4byte \address
+ .endm
+
+ .macro atk98 byte
+ .byte 0x98
+ .byte \byte
+ .endm
+
+ .macro setmisteffect
+ .byte 0x99
+ .endm
+
+ .macro setincreasedcriticalchance
+ .byte 0x9a
+ .endm
+
+ .macro transformdataexecution
+ .byte 0x9b
+ .endm
+
+ .macro setsubstituteeffect
+ .byte 0x9c
+ .endm
+
+ .macro copyattack address
+ .byte 0x9d
+ .4byte \address
+ .endm
+
+ .macro metronomeeffect
+ .byte 0x9e
+ .endm
+
+ .macro nightshadedamageeffect
+ .byte 0x9f
+ .endm
+
+ .macro psywavedamageeffect
+ .byte 0xa0
+ .endm
+
+ .macro counterdamagecalculator address
+ .byte 0xa1
+ .4byte \address
+ .endm
+
+ .macro mirrorcoatdamagecalculator address
+ .byte 0xa2
+ .4byte \address
+ .endm
+
+ .macro disablelastusedattack address
+ .byte 0xa3
+ .4byte \address
+ .endm
+
+ .macro setencore address
+ .byte 0xa4
+ .4byte \address
+ .endm
+
+ .macro painsplitdamagecalculator address
+ .byte 0xa5
+ .4byte \address
+ .endm
+
+ .macro settypetorandomresistance address
+ .byte 0xa6
+ .4byte \address
+ .endm
+
+ .macro setalwayshitflag
+ .byte 0xa7
+ .endm
+
+ .macro copymovepermanently address
+ .byte 0xa8
+ .4byte \address
+ .endm
+
+ .macro selectrandommovefromusermoves address
+ .byte 0xa9
+ .4byte \address
+ .endm
+
+ .macro destinybondeffect
+ .byte 0xaa
+ .endm
+
+ .macro atkab
+ .byte 0xab
+ .endm
+
+ .macro remaininghptopower
+ .byte 0xac
+ .endm
+
+ .macro reducepprandom address
+ .byte 0xad
+ .4byte \address
+ .endm
+
+ .macro clearstatusifnotsoundproofed
+ .byte 0xae
+ .endm
+
+ .macro cursetarget address
+ .byte 0xaf
+ .4byte \address
+ .endm
+
+ .macro setspikes address
+ .byte 0xb0
+ .4byte \address
+ .endm
+
+ .macro setforesight
+ .byte 0xb1
+ .endm
+
+ .macro setperishsong address
+ .byte 0xb2
+ .4byte \address
+ .endm
+
+ .macro rolloutdamagecalculation
+ .byte 0xb3
+ .endm
+
+ .macro jumpifconfusedandattackmaxed bank, address
+ .byte 0xb4
+ .byte \bank
+ .4byte \address
+ .endm
+
+ .macro furycutterdamagecalculation
+ .byte 0xb5
+ .endm
+
+ .macro happinesstodamagecalculation
+ .byte 0xb6
+ .endm
+
+ .macro presentdamagecalculation
+ .byte 0xb7
+ .endm
+
+ .macro setsafeguard
+ .byte 0xb8
+ .endm
+
+ .macro magnitudedamagecalculation
+ .byte 0xb9
+ .endm
+
+ .macro atkba address
+ .byte 0xba
+ .4byte \address
+ .endm
+
+ .macro setsunny
+ .byte 0xbb
+ .endm
+
+ .macro maxattackhalvehp address
+ .byte 0xbc
+ .4byte \address
+ .endm
+
+ .macro copyfoestats address
+ .byte 0xbd
+ .4byte \address
+ .endm
+
+ .macro breakfree
+ .byte 0xbe
+ .endm
+
+ .macro setcurled
+ .byte 0xbf
+ .endm
+
+ .macro recoverbasedonsunlight address
+ .byte 0xc0
+ .4byte \address
+ .endm
+
+ .macro hiddenpowerdamagecalculation
+ .byte 0xc1
+ .endm
+
+ .macro selectnexttarget
+ .byte 0xc2
+ .endm
+
+ .macro setfutureattack address
+ .byte 0xc3
+ .4byte \address
+ .endm
+
+ .macro beatupcalculation address1, address2
+ .byte 0xc4
+ .4byte \address1
+ .4byte \address2
+ .endm
+
+ .macro hidepreattack
+ .byte 0xc5
+ .endm
+
+ .macro unhidepostattack
+ .byte 0xc6
+ .endm
+
+ .macro setminimize
+ .byte 0xc7
+ .endm
+
+ .macro sethail
+ .byte 0xc8
+ .endm
+
+ .macro jumpifattackandspecialattackcannotfall address
+ .byte 0xc9
+ .4byte \address
+ .endm
+
+ .macro setforcedtarget
+ .byte 0xca
+ .endm
+
+ .macro setcharge
+ .byte 0xcb
+ .endm
+
+ .macro callterrainattack
+ .byte 0xcc
+ .endm
+
+ .macro cureifburnedparalysedorpoisoned address
+ .byte 0xcd
+ .4byte \address
+ .endm
+
+ .macro settorment address
+ .byte 0xce
+ .4byte \address
+ .endm
+
+ .macro jumpifnodamage address
+ .byte 0xcf
+ .4byte \address
+ .endm
+
+ .macro settaunt address
+ .byte 0xd0
+ .4byte \address
+ .endm
+
+ .macro sethelpinghand address
+ .byte 0xd1
+ .4byte \address
+ .endm
+
+ .macro itemswap address
+ .byte 0xd2
+ .4byte \address
+ .endm
+
+ .macro copyability address
+ .byte 0xd3
+ .4byte \address
+ .endm
+
+ .macro atkd4 byte, address
+ .byte 0xd4
+ .byte \byte
+ .4byte \address
+ .endm
+
+ .macro setroots address
+ .byte 0xd5
+ .4byte \address
+ .endm
+
+ .macro doubledamagedealtifdamaged
+ .byte 0xd6
+ .endm
+
+ .macro setyawn address
+ .byte 0xd7
+ .4byte \address
+ .endm
+
+ .macro setdamagetohealthdifference address
+ .byte 0xd8
+ .4byte \address
+ .endm
+
+ .macro scaledamagebyhealthratio
+ .byte 0xd9
+ .endm
+
+ .macro abilityswap address
+ .byte 0xda
+ .4byte \address
+ .endm
+
+ .macro imprisoneffect address
+ .byte 0xdb
+ .4byte \address
+ .endm
+
+ .macro setgrudge address
+ .byte 0xdc
+ .4byte \address
+ .endm
+
+ .macro weightdamagecalculation
+ .byte 0xdd
+ .endm
+
+ .macro assistattackselect address
+ .byte 0xde
+ .4byte \address
+ .endm
+
+ .macro setmagiccoat address
+ .byte 0xdf
+ .4byte \address
+ .endm
+
+ .macro setstealstatchange address
+ .byte 0xe0
+ .4byte \address
+ .endm
+
+ .macro atke1 address
+ .byte 0xe1
+ .4byte \address
+ .endm
+
+ .macro atke2 bank
+ .byte 0xe2
+ .byte \bank
+ .endm
+
+ .macro jumpiffainted bank, address
+ .byte 0xe3
+ .byte \bank
+ .4byte \address
+ .endm
+
+ .macro naturepowereffect
+ .byte 0xe4
+ .endm
+
+ .macro pickupitemcalculation
+ .byte 0xe5
+ .endm
+
+ .macro actualcastformswitch
+ .byte 0xe6
+ .endm
+
+ .macro castformswitch
+ .byte 0xe7
+ .endm
+
+ .macro settypebasedhalvers address
+ .byte 0xe8
+ .4byte \address
+ .endm
+
+ .macro seteffectbyweather
+ .byte 0xe9
+ .endm
+
+ .macro recycleitem address
+ .byte 0xea
+ .4byte \address
+ .endm
+
+ .macro settypetoterrain address
+ .byte 0xeb
+ .4byte \address
+ .endm
+
+ .macro pursuitwhenswitched address
+ .byte 0xec
+ .4byte \address
+ .endm
+
+ .macro snatchmove
+ .byte 0xed
+ .endm
+
+ .macro removereflectlightscreen
+ .byte 0xee
+ .endm
+
+ .macro pokemoncatchfunction
+ .byte 0xef
+ .endm
+
+ .macro catchpoke
+ .byte 0xf0
+ .endm
+
+ .macro capturesomethingf1 address
+ .byte 0xf1
+ .4byte \address
+ .endm
+
+ .macro capturesomethingf2
+ .byte 0xf2
+ .endm
+
+ .macro capturesomethingf3 address
+ .byte 0xf3
+ .4byte \address
+ .endm
+
+ .macro removehp
+ .byte 0xf4
+ .endm
+
+ .macro curestatusfirstword
+ .byte 0xf5
+ .endm
+
+ .macro atkf6
+ .byte 0xf6
+ .endm
+
+ .macro activesidesomething
+ .byte 0xf7
+ .endm
+
+ .macro atkf8 bank
+ .byte 0xf8
+ .byte \bank
+ .endm
diff --git a/asm/rom3.s b/asm/rom3.s
index 6f12aeb9a..0b329b8f7 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -13808,7 +13808,7 @@ _08010426:
_0801042C: .4byte gMonFrontPicCoords
_08010430:
ldr r0, _08010448
- cmp r4, r0 @ Check is pokemon species is Castform
+ cmp r4, r0 @ Check if pokemon species is Castform
bne _08010454
ldr r0, _0801044C
ldr r1, _08010450
@@ -36164,7 +36164,7 @@ _0801BCA4: .4byte 0x02024a80
_0801BCA8: .4byte 0x02024c07
_0801BCAC: .4byte 0x02024c6c
_0801BCB0: .4byte 0x02024c10
-_0801BCB4: .4byte gUnknown_081D6F62
+_0801BCB4: .4byte BattleScript_1D6F62
_0801BCB8:
bl sub_8017718
lsls r0, 24
@@ -41426,7 +41426,7 @@ _0801E676:
.align 2, 0
_0801E678: .4byte 0x02024c06
_0801E67C: .4byte 0x02024c10
-_0801E680: .4byte gUnknown_081D98BD
+_0801E680: .4byte BattleScript_1D98BD
_0801E684: .4byte 0x02024c6c
_0801E688:
mov r1, r8
@@ -41538,7 +41538,7 @@ _0801E72E:
.align 2, 0
_0801E74C: .4byte 0x02024c06
_0801E750: .4byte 0x02024c10
-_0801E754: .4byte gUnknown_081D98A5
+_0801E754: .4byte BattleScript_1D98A5
_0801E758:
mov r0, r8
ldrb r1, [r0]
@@ -41578,7 +41578,7 @@ _0801E78E:
.align 2, 0
_0801E79C: .4byte 0x02024c6c
_0801E7A0: .4byte 0x02024c10
-_0801E7A4: .4byte gUnknown_081D98A5
+_0801E7A4: .4byte BattleScript_1D98A5
_0801E7A8:
mov r3, r8
ldrb r0, [r3]
@@ -41729,7 +41729,7 @@ _0801E8A6:
.align 2, 0
_0801E8C4: .4byte 0x02024c06
_0801E8C8: .4byte 0x02024c10
-_0801E8CC: .4byte gUnknown_081D98B1
+_0801E8CC: .4byte BattleScript_1D98B1
_0801E8D0:
mov r0, r9
adds r0, 0x4C
@@ -41786,7 +41786,7 @@ _0801E928:
.align 2, 0
_0801E938: .4byte 0x02024c06
_0801E93C: .4byte 0x02024c10
-_0801E940: .4byte gUnknown_081D98BD
+_0801E940: .4byte BattleScript_1D98BD
_0801E944: .4byte 0x02024c6c
_0801E948: .4byte 0xffffdfff
_0801E94C:
@@ -41838,7 +41838,7 @@ _0801E998:
.align 2, 0
_0801E9A4: .4byte 0x02024c6c
_0801E9A8: .4byte 0x02024c10
-_0801E9AC: .4byte gUnknown_081D98BD
+_0801E9AC: .4byte BattleScript_1D98BD
_0801E9B0: .4byte 0x02024d1e
_0801E9B4:
mov r3, r8
@@ -56389,7 +56389,7 @@ _08025F74:
.align 2, 0
_08025F78: .4byte 0x02024be6
_08025F7C: .4byte 0x02024c10
-_08025F80: .4byte gUnknown_081D83D6
+_08025F80: .4byte BattleScript_1D83D6
_08025F84:
ldr r2, _08025FCC
ldr r1, _08025FD0
@@ -62115,7 +62115,7 @@ atkB3_rolloutdamagecalculation: @ 8028CE4
_08028D08: .4byte 0x02024c68
_08028D0C: .4byte 0x02024c07
_08028D10: .4byte 0x02024c10
-_08028D14: .4byte gUnknown_081D6F74
+_08028D14: .4byte BattleScript_1D6F74
_08028D18:
ldr r2, _08028E3C
ldr r1, _08028E40
@@ -62363,7 +62363,7 @@ _08028EF0: .4byte 0x02024c68
_08028EF4: .4byte 0x02024ca8
_08028EF8: .4byte 0x02024c07
_08028EFC: .4byte 0x02024c10
-_08028F00: .4byte gUnknown_081D6F74
+_08028F00: .4byte BattleScript_1D6F74
_08028F04:
ldr r5, _08028F64
ldr r4, _08028F68
@@ -62549,7 +62549,7 @@ _08029068: .4byte 0x02024bec
_0802906C: .4byte 0x02024a80
_08029070: .4byte 0x02024c08
_08029074: .4byte 0x02024c10
-_08029078: .4byte gUnknown_081D6F44
+_08029078: .4byte BattleScript_1D6F44
_0802907C:
ldr r2, _08029098
ldr r0, _0802909C
@@ -62568,7 +62568,7 @@ _0802907C:
_08029098: .4byte 0x02024a80
_0802909C: .4byte 0x02024c08
_080290A0: .4byte 0x02024c10
-_080290A4: .4byte gUnknown_081D83B5
+_080290A4: .4byte BattleScript_1D83B5
_080290A8:
ldr r1, _080290B4
ldr r0, _080290B8
@@ -62579,7 +62579,7 @@ _080290AC:
bx r0
.align 2, 0
_080290B4: .4byte 0x02024c10
-_080290B8: .4byte gUnknown_081D839B
+_080290B8: .4byte BattleScript_1D839B
thumb_func_end atkB7_presentdamagecalculation
thumb_func_start sub_80290BC
diff --git a/asm/rom4.s b/asm/rom4.s
index e0218c3b7..14fe79e77 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -45541,8 +45541,8 @@ _080672E2:
bx r1
thumb_func_end s76_close_picture_box
- thumb_func_start sub_80672E8
-sub_80672E8: @ 80672E8
+ thumb_func_start s77_showcontestwinner
+s77_showcontestwinner: @ 80672E8
push {lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -45558,7 +45558,7 @@ _080672FC:
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80672E8
+ thumb_func_end s77_showcontestwinner
thumb_func_start sub_806730C
sub_806730C: @ 806730C
@@ -58712,9 +58712,9 @@ _0806D7DC: .4byte gUnknown_08E71894
_0806D7E0: .4byte 0x06006000
_0806D7E4: .4byte gUnknown_08E71934
_0806D7E8: .4byte 0x06006180
-_0806D7EC: .4byte gUnknown_08E72860
+_0806D7EC: .4byte gStatusGfx_Icons
_0806D7F0: .4byte 0x06007180
-_0806D7F4: .4byte gUnknown_08E72A50
+_0806D7F4: .4byte gStatusPal_Icons
thumb_func_end sub_806D718
thumb_func_start sub_806D7F8
diff --git a/asm/rom5.s b/asm/rom5.s
index 6d03baaa2..b641e83fe 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -100232,7 +100232,7 @@ _080ABE20:
_080ABE74: .4byte gContestMoves
_080ABE78: .4byte gUnknown_083CC3A7
_080ABE7C: .4byte gMoveNames
-_080ABE80: .4byte gUnknown_083CA341
+_080ABE80: .4byte gUnknown_083CA340 + 0x1
_080ABE84: .4byte 0x0000ffff
_080ABE88: .4byte 0x00002d9f
_080ABE8C: .4byte 0x02019204
@@ -105410,7 +105410,7 @@ sub_80AE858: @ 80AE858
bx r1
.align 2, 0
_080AE8A0: .4byte gUnknown_083CA4BC
-_080AE8A4: .4byte gUnknown_08D1CA1C
+_080AE8A4: .4byte gContest2Pal
_080AE8A8: .4byte gSpriteTemplate_83CA4A4
_080AE8AC: .4byte 0x02020004
_080AE8B0: .4byte SpriteCallbackDummy
@@ -115017,7 +115017,7 @@ _080B3214: .4byte gUnknown_08E77804
_080B3218: .4byte 0x06007c00
_080B321C: .4byte gUnknown_08E77928
_080B3220: .4byte 0x02018000
-_080B3224: .4byte gUnknown_08E77900
+_080B3224: .4byte gMenuMoneyPal
_080B3228: .4byte gWindowConfig_81E6DFC
_080B322C: .4byte 0x03000708
_080B3230: .4byte 0x02025734
@@ -282472,7 +282472,7 @@ _081042B0:
movs r3, 0x1
b _081042C6
.align 2, 0
-_081042BC: .4byte gUnknown_083ECBC6
+_081042BC: .4byte gUnknown_083ECBC4 + 0x2
_081042C0:
cmp r0, 0xF
bne _081042C6
diff --git a/constants/battle.s b/constants/battle.s
new file mode 100644
index 000000000..26df01cf3
--- /dev/null
+++ b/constants/battle.s
@@ -0,0 +1,13 @@
+.equiv SLP, 0x07
+.equiv PSN, 0x08
+.equiv BRN, 0x10
+.equiv FRZ, 0x20
+.equiv PAR, 0x40
+.equiv TOX, 0x80
+
+.equiv S_CONFUSED, 0x07
+.equiv S_CONTINUE, 0x1000
+.equiv S_FOCUS_ENERGY, 0x100000
+.equiv S_SUBSTITUTE, 0x1000000
+.equiv S_MEAN_LOOK, 0x4000000
+.equiv S_NIGHTMARE, 0x8000000
diff --git a/constants/battle_text.s b/constants/battle_text.s
new file mode 100644
index 000000000..f7025f68f
--- /dev/null
+++ b/constants/battle_text.s
@@ -0,0 +1,352 @@
+ enum_start 12
+ enum BATTLE_TEXT_UnknownString
+ enum BATTLE_TEXT_GainExpPoints
+ enum BATTLE_TEXT_GrewLevel
+ enum BATTLE_TEXT_LearnedMove
+ enum BATTLE_TEXT_TryingToLearnMove
+ enum BATTLE_TEXT_CantLearnMore
+ enum BATTLE_TEXT_DeleteMove
+ enum BATTLE_TEXT_DeletedMove
+ enum BATTLE_TEXT_StopLearning
+ enum BATTLE_TEXT_DidNotLearn
+ enum BATTLE_TEXT_LearnedMove2
+ enum BATTLE_TEXT_AttackMissed
+ enum BATTLE_TEXT_ProtectedItself
+ enum BATTLE_TEXT_StatNoHigher
+ enum BATTLE_TEXT_AvoidedDamage
+ enum BATTLE_TEXT_DoesntAffect
+ enum BATTLE_TEXT_AttackingFainted
+ enum BATTLE_TEXT_DefendingFainted
+ enum BATTLE_TEXT_WinningPrize
+ enum BATTLE_TEXT_OutOfUsablePoke
+ enum BATTLE_TEXT_WhitedOut
+ enum BATTLE_TEXT_PreventEscape
+ enum BATTLE_TEXT_HitMulti
+ enum BATTLE_TEXT_FellAsleep
+ enum BATTLE_TEXT_MadeAsleep
+ enum BATTLE_TEXT_DefendingAsleep
+ enum BATTLE_TEXT_AttackingAsleep
+ enum BATTLE_TEXT_WasntAffected
+ enum BATTLE_TEXT_Poisoned
+ enum BATTLE_TEXT_Poisoned2
+ enum BATTLE_TEXT_PoisonHurt
+ enum BATTLE_TEXT_AlreadyPoisoned
+ enum BATTLE_TEXT_BadlyPoisoned
+ enum BATTLE_TEXT_EnergyDrained
+ enum BATTLE_TEXT_Burned
+ enum BATTLE_TEXT_Burned2
+ enum BATTLE_TEXT_BurnHurt
+ enum BATTLE_TEXT_Frozen
+ enum BATTLE_TEXT_Frozen2
+ enum BATTLE_TEXT_FrozenSolid
+ enum BATTLE_TEXT_DefendingDefrosted
+ enum BATTLE_TEXT_AttackingDefrosted
+ enum BATTLE_TEXT_Defrosted
+ enum BATTLE_TEXT_Paralyzed
+ enum BATTLE_TEXT_Paralyzed2
+ enum BATTLE_TEXT_Paralyzed3
+ enum BATTLE_TEXT_AlreadyParalyzed
+ enum BATTLE_TEXT_ParalysisHealed
+ enum BATTLE_TEXT_DreamEaten
+ enum BATTLE_TEXT_AttackingStatNoHigher
+ enum BATTLE_TEXT_DefendingStatNoHigher
+ enum BATTLE_TEXT_StoppedWorking
+ enum BATTLE_TEXT_StoppedWorking2
+ enum BATTLE_TEXT_Confused
+ enum BATTLE_TEXT_ConfusionSnapOut
+ enum BATTLE_TEXT_BecameConfused
+ enum BATTLE_TEXT_AlreadyConfused
+ enum BATTLE_TEXT_FellLove
+ enum BATTLE_TEXT_InLoveWith
+ enum BATTLE_TEXT_ImmobilizedBy
+ enum BATTLE_TEXT_BlownAway
+ enum BATTLE_TEXT_TypeTransform
+ enum BATTLE_TEXT_Flinched
+ enum BATTLE_TEXT_RegainedHealth
+ enum BATTLE_TEXT_HPFull
+ enum BATTLE_TEXT_RaisedSpDef
+ enum BATTLE_TEXT_RaisedDefense
+ enum BATTLE_TEXT_CoveredVeil
+ enum BATTLE_TEXT_SafeguardActive
+ enum BATTLE_TEXT_SafeguardFaded
+ enum BATTLE_TEXT_WentToSleep
+ enum BATTLE_TEXT_SpeltHealthy
+ enum BATTLE_TEXT_WhipWhirlwind
+ enum BATTLE_TEXT_TookSunlight
+ enum BATTLE_TEXT_LoweredHead
+ enum BATTLE_TEXT_IsGlowing
+ enum BATTLE_TEXT_FlewHigh
+ enum BATTLE_TEXT_DugHole
+ enum BATTLE_TEXT_SqueezedBind
+ enum BATTLE_TEXT_TrappedVortex
+ enum BATTLE_TEXT_Wrapped
+ enum BATTLE_TEXT_Clamped
+ enum BATTLE_TEXT_HurtBy
+ enum BATTLE_TEXT_FreedFrom
+ enum BATTLE_TEXT_KeptGoingCrash
+ enum BATTLE_TEXT_MistShroud
+ enum BATTLE_TEXT_MistProtect
+ enum BATTLE_TEXT_GetPumped
+ enum BATTLE_TEXT_HitRecoil
+ enum BATTLE_TEXT_ProtectedItself2
+ enum BATTLE_TEXT_SandBuffeted
+ enum BATTLE_TEXT_HailStricken
+ enum BATTLE_TEXT_WasSeeded
+ enum BATTLE_TEXT_EvadedAttack
+ enum BATTLE_TEXT_HealthSapped
+ enum BATTLE_TEXT_FastAsleep
+ enum BATTLE_TEXT_WokeUp
+ enum BATTLE_TEXT_UproarAwake
+ enum BATTLE_TEXT_UproarWoke
+ enum BATTLE_TEXT_UproarCaused
+ enum BATTLE_TEXT_UproarMaking
+ enum BATTLE_TEXT_CalmedDown
+ enum BATTLE_TEXT_UproarCantSleep
+ enum BATTLE_TEXT_Stockpiled
+ enum BATTLE_TEXT_StockpiledCant
+ enum BATTLE_TEXT_UproarCantSleep2
+ enum BATTLE_TEXT_UproarKeptAwake
+ enum BATTLE_TEXT_StayedAwake
+ enum BATTLE_TEXT_StoringEnergy
+ enum BATTLE_TEXT_UnleashedEnergy
+ enum BATTLE_TEXT_FatigueConfuse
+ enum BATTLE_TEXT_PickedUpYen
+ enum BATTLE_TEXT_Unaffected
+ enum BATTLE_TEXT_Transformed
+ enum BATTLE_TEXT_SubMade
+ enum BATTLE_TEXT_SubAlready
+ enum BATTLE_TEXT_SubTookDamage
+ enum BATTLE_TEXT_SubFaded
+ enum BATTLE_TEXT_MustRecharge
+ enum BATTLE_TEXT_RageBuilding
+ enum BATTLE_TEXT_MoveWasDisabled
+ enum BATTLE_TEXT_MoveIsDisabled
+ enum BATTLE_TEXT_DisabledNoMore
+ enum BATTLE_TEXT_EncoreGot
+ enum BATTLE_TEXT_EncoreEnded
+ enum BATTLE_TEXT_TookAim
+ enum BATTLE_TEXT_SketchedMove
+ enum BATTLE_TEXT_DestinyBondTake
+ enum BATTLE_TEXT_DestinyBondTaken
+ enum BATTLE_TEXT_ReducedBy
+ enum BATTLE_TEXT_StoleSomething
+ enum BATTLE_TEXT_CantEscapeNow
+ enum BATTLE_TEXT_NightmareStart
+ enum BATTLE_TEXT_NightmareLock
+ enum BATTLE_TEXT_CurseLay
+ enum BATTLE_TEXT_CurseAfflict
+ enum BATTLE_TEXT_SpikesScattered
+ enum BATTLE_TEXT_SpikesHurt
+ enum BATTLE_TEXT_IdentifiedPoke
+ enum BATTLE_TEXT_PerishSongFell
+ enum BATTLE_TEXT_BracedItself
+ enum BATTLE_TEXT_EnduredHit
+ enum BATTLE_TEXT_MagnitudeCount
+ enum BATTLE_TEXT_CutHPMaxATK
+ enum BATTLE_TEXT_CopyStatChanges
+ enum BATTLE_TEXT_GotFreeFrom
+ enum BATTLE_TEXT_LeechShed
+ enum BATTLE_TEXT_SpikesBlownAway
+ enum BATTLE_TEXT_FledBattle
+ enum BATTLE_TEXT_ForesawAttack
+ enum BATTLE_TEXT_TookAttack
+ enum BATTLE_TEXT_PokeAttack
+ enum BATTLE_TEXT_CenterAttention
+ enum BATTLE_TEXT_ChargingPower
+ enum BATTLE_TEXT_NaturePower
+ enum BATTLE_TEXT_StatusNormal
+ enum BATTLE_TEXT_NoMovesLeft
+ enum BATTLE_TEXT_TormentSubject
+ enum BATTLE_TEXT_TormentNoUse
+ enum BATTLE_TEXT_TightenFocus
+ enum BATTLE_TEXT_TauntFell
+ enum BATTLE_TEXT_TauntNoUse
+ enum BATTLE_TEXT_ReadyToHelp
+ enum BATTLE_TEXT_SwitchedItems
+ enum BATTLE_TEXT_CopiedObject
+ enum BATTLE_TEXT_WishMade
+ enum BATTLE_TEXT_WishTrue
+ enum BATTLE_TEXT_PlantedRoots
+ enum BATTLE_TEXT_AbsorbNutrients
+ enum BATTLE_TEXT_AnchoredItself
+ enum BATTLE_TEXT_DrowsyMade
+ enum BATTLE_TEXT_KnockedOffItem
+ enum BATTLE_TEXT_AbilitySwap
+ enum BATTLE_TEXT_SealedMove
+ enum BATTLE_TEXT_SealedNoUse
+ enum BATTLE_TEXT_GrudgeBear
+ enum BATTLE_TEXT_GrudgeLosePP
+ enum BATTLE_TEXT_ShroudedItself
+ enum BATTLE_TEXT_MagicCoatBounce
+ enum BATTLE_TEXT_AwaitMove
+ enum BATTLE_TEXT_SnatchedMove
+ enum BATTLE_TEXT_RainMade
+ enum BATTLE_TEXT_SpeedRisen
+ enum BATTLE_TEXT_ProtectedBy
+ enum BATTLE_TEXT_PreventedBy
+ enum BATTLE_TEXT_HPRestoredUsing
+ enum BATTLE_TEXT_MadeType
+ enum BATTLE_TEXT_PreventedPara
+ enum BATTLE_TEXT_PreventedRomance
+ enum BATTLE_TEXT_PreventedPoison
+ enum BATTLE_TEXT_PreventedConfusion
+ enum BATTLE_TEXT_RaisedFirePower
+ enum BATTLE_TEXT_AnchorsItself
+ enum BATTLE_TEXT_CutsAttack
+ enum BATTLE_TEXT_PreventedStatLoss
+ enum BATTLE_TEXT_HurtOther
+ enum BATTLE_TEXT_Traced
+ enum BATTLE_TEXT_Sharply
+ enum BATTLE_TEXT_Rose
+ enum BATTLE_TEXT_Harshly
+ enum BATTLE_TEXT_Fell
+ enum BATTLE_TEXT_UnknownString7
+ enum BATTLE_TEXT_UnknownString3
+ enum BATTLE_TEXT_UnknownString5
+ enum BATTLE_TEXT_UnknownString6
+ enum BATTLE_TEXT_Critical
+ enum BATTLE_TEXT_GrandSlam
+ enum BATTLE_TEXT_MoveForget123
+ enum BATTLE_TEXT_MoveForgetAnd
+ enum BATTLE_TEXT_NotEffective
+ enum BATTLE_TEXT_SuperEffective
+ enum BATTLE_TEXT_GotAwaySafely
+ enum BATTLE_TEXT_FledWild
+ enum BATTLE_TEXT_NoRunning
+ enum BATTLE_TEXT_CantEscape2
+ enum BATTLE_TEXT_BirchDontLeaveMe
+ enum BATTLE_TEXT_Nothing
+ enum BATTLE_TEXT_Failed
+ enum BATTLE_TEXT_HurtItself
+ enum BATTLE_TEXT_MirrorFail
+ enum BATTLE_TEXT_RainStart
+ enum BATTLE_TEXT_PourStart
+ enum BATTLE_TEXT_RainCont1
+ enum BATTLE_TEXT_PourCont
+ enum BATTLE_TEXT_RainStop
+ enum BATTLE_TEXT_SandBrewed
+ enum BATTLE_TEXT_SandRages
+ enum BATTLE_TEXT_SandSubsided
+ enum BATTLE_TEXT_SunBright
+ enum BATTLE_TEXT_SunStrong
+ enum BATTLE_TEXT_SunFaded
+ enum BATTLE_TEXT_HailStart
+ enum BATTLE_TEXT_HailCont
+ enum BATTLE_TEXT_HailStop
+ enum BATTLE_TEXT_SpitUpFail
+ enum BATTLE_TEXT_SwallowFail
+ enum BATTLE_TEXT_WindHeatWave
+ enum BATTLE_TEXT_StatElim
+ enum BATTLE_TEXT_CoinScatter
+ enum BATTLE_TEXT_SubWeak
+ enum BATTLE_TEXT_PainSplit
+ enum BATTLE_TEXT_BellChime
+ enum BATTLE_TEXT_PerishSong
+ enum BATTLE_TEXT_NoPP1
+ enum BATTLE_TEXT_NoPP2
+ enum BATTLE_TEXT_Used1
+ enum BATTLE_TEXT_TutorialUsed
+ enum BATTLE_TEXT_BlockBall
+ enum BATTLE_TEXT_DontBeAThief
+ enum BATTLE_TEXT_DodgeBall
+ enum BATTLE_TEXT_MissPoke
+ enum BATTLE_TEXT_BallBrokeOhNo
+ enum BATTLE_TEXT_BallBrokeAppeared
+ enum BATTLE_TEXT_BallBrokeAlmost
+ enum BATTLE_TEXT_BallBrokeSoClose
+ enum BATTLE_TEXT_BallCaught1
+ enum BATTLE_TEXT_BallCaught2
+ enum BATTLE_TEXT_GiveNickname
+ enum BATTLE_TEXT_SentToPC
+ enum BATTLE_TEXT_AddedToDex
+ enum BATTLE_TEXT_Raining
+ enum BATTLE_TEXT_Sandstorm
+ enum BATTLE_TEXT_CantEscape
+ enum BATTLE_TEXT_IgnoredOrdersSLP
+ enum BATTLE_TEXT_IgnoredOrders
+ enum BATTLE_TEXT_BeganNap
+ enum BATTLE_TEXT_LoafingAround
+ enum BATTLE_TEXT_WontObey
+ enum BATTLE_TEXT_TurnedAway
+ enum BATTLE_TEXT_NotNotice
+ enum BATTLE_TEXT_WillSwitch
+ enum BATTLE_TEXT_CreptCloser
+ enum BATTLE_TEXT_CantGetCloser
+ enum BATTLE_TEXT_WatchingCarefully
+ enum BATTLE_TEXT_CuriousAbout
+ enum BATTLE_TEXT_EnthralledBy
+ enum BATTLE_TEXT_IgnoredThing
+ enum BATTLE_TEXT_ThrewBlock
+ enum BATTLE_TEXT_SafariOver
+ enum BATTLE_TEXT_CuredParalysis
+ enum BATTLE_TEXT_CuredPoison
+ enum BATTLE_TEXT_CuredBurn
+ enum BATTLE_TEXT_CuredFreeze
+ enum BATTLE_TEXT_CuredSleep
+ enum BATTLE_TEXT_CuredConfusion
+ enum BATTLE_TEXT_CuredStatus
+ enum BATTLE_TEXT_RestoredHealth
+ enum BATTLE_TEXT_RestoredPP
+ enum BATTLE_TEXT_RestoredStatus
+ enum BATTLE_TEXT_RestoredHPLittle
+ enum BATTLE_TEXT_ChoiceBand
+ enum BATTLE_TEXT_FocusSash
+ enum BATTLE_TEXT_Terminator2 @ terminator?
+ enum BATTLE_TEXT_PreventedBurn
+ enum BATTLE_TEXT_BlocksOther
+ enum BATTLE_TEXT_RestoredHPByItem
+ enum BATTLE_TEXT_WhipSandstorm
+ enum BATTLE_TEXT_PreventedLoss
+ enum BATTLE_TEXT_InfatuatedPoke
+ enum BATTLE_TEXT_MadeIneffective
+ enum BATTLE_TEXT_CuredProblem
+ enum BATTLE_TEXT_OozeSuckup
+ enum BATTLE_TEXT_Transformed2
+ enum BATTLE_TEXT_ElecWeakened
+ enum BATTLE_TEXT_FireWeakened
+ enum BATTLE_TEXT_HidUnderwater
+ enum BATTLE_TEXT_SprangUp
+ enum BATTLE_TEXT_CantForgetHM
+ enum BATTLE_TEXT_FoundOne
+ enum BATTLE_TEXT_PlayerDefeatedTrainer2
+ enum BATTLE_TEXT_SoothingAroma
+ enum BATTLE_TEXT_CantUseItems
+ enum BATTLE_TEXT_UnknownString2
+ enum BATTLE_TEXT_UnknownString4
+ enum BATTLE_TEXT_HustleUse
+ enum BATTLE_TEXT_MadeUseless
+ enum BATTLE_TEXT_SandTombTrapped @ sand tomb
+ enum BATTLE_TEXT_Terminator
+ enum BATTLE_TEXT_BoostedExp
+ enum BATTLE_TEXT_SunIntensified
+ enum BATTLE_TEXT_GroundMoveNegate
+ enum BATTLE_TEXT_WallyBall
+ enum BATTLE_TEXT_TookAttack2
+ enum BATTLE_TEXT_ChoseDestiny
+ enum BATTLE_TEXT_LostFocus
+ enum BATTLE_TEXT_UseNext
+ enum BATTLE_TEXT_FledUsingItem
+ enum BATTLE_TEXT_FledUsingOther
+ enum BATTLE_TEXT_DraggedOut
+ enum BATTLE_TEXT_PreventedOther
+ enum BATTLE_TEXT_NormalizedStatus
+ enum BATTLE_TEXT_Used2
+ enum BATTLE_TEXT_BoxFull
+ enum BATTLE_TEXT_AvoidedAttack
+ enum BATTLE_TEXT_MadeIneffective2
+ enum BATTLE_TEXT_PreventedFlinching
+ enum BATTLE_TEXT_AlreadyBurned
+ enum BATTLE_TEXT_StatNoLower
+ enum BATTLE_TEXT_BlocksOther2
+ enum BATTLE_TEXT_WoreOff
+ enum BATTLE_TEXT_RaisedDefenseLittle
+ enum BATTLE_TEXT_RaisedSpDefLittle
+ enum BATTLE_TEXT_BrokeWall
+ enum BATTLE_TEXT_PreventedOther2
+ enum BATTLE_TEXT_CuredOfProblem
+ enum BATTLE_TEXT_AttackingCantEscape
+ enum BATTLE_TEXT_Obtained1
+ enum BATTLE_TEXT_Obtained2
+ enum BATTLE_TEXT_Obtained3
+ enum BATTLE_TEXT_NoEffect
+ enum BATTLE_TEXT_NoEffectOn
diff --git a/constants/constants.s b/constants/constants.s
index 02c219341..9cb7d4371 100644
--- a/constants/constants.s
+++ b/constants/constants.s
@@ -22,3 +22,5 @@
.include "constants/version.s"
.include "constants/region_map_sections.s"
.include "constants/hold_effects.s"
+ .include "constants/battle.s"
+ .include "constants/battle_text.s"
diff --git a/constants/move_effects.s b/constants/move_effects.s
new file mode 100644
index 000000000..bd801083b
--- /dev/null
+++ b/constants/move_effects.s
@@ -0,0 +1,215 @@
+ enum_start
+ enum EFFECT_HIT
+ enum EFFECT_SLEEP
+ enum EFFECT_POISON_HIT
+ enum EFFECT_ABSORB
+ enum EFFECT_BURN_HIT
+ enum EFFECT_FREEZE_HIT
+ enum EFFECT_PARALYZE_HIT
+ enum EFFECT_EXPLOSION
+ enum EFFECT_DREAM_EATER
+ enum EFFECT_MIRROR_MOVE
+ enum EFFECT_ATTACK_UP
+ enum EFFECT_DEFENSE_UP
+ enum EFFECT_SPEED_UP
+ enum EFFECT_SPECIAL_ATTACK_UP
+ enum EFFECT_SPECIAL_DEFENSE_UP
+ enum EFFECT_ACCURACY_UP
+ enum EFFECT_EVASION_UP
+ enum EFFECT_ALWAYS_HIT
+ enum EFFECT_ATTACK_DOWN
+ enum EFFECT_DEFENSE_DOWN
+ enum EFFECT_SPEED_DOWN
+ enum EFFECT_SPECIAL_ATTACK_DOWN @ unused
+ enum EFFECT_SPECIAL_DEFENSE_DOWN @ unused
+ enum EFFECT_ACCURACY_DOWN
+ enum EFFECT_EVASION_DOWN
+ enum EFFECT_HAZE
+ enum EFFECT_BIDE
+ enum EFFECT_RAMPAGE
+ enum EFFECT_ROAR
+ enum EFFECT_MULTI_HIT
+ enum EFFECT_CONVERSION
+ enum EFFECT_FLINCH_HIT
+ enum EFFECT_RESTORE_HP
+ enum EFFECT_TOXIC
+ enum EFFECT_PAY_DAY
+ enum EFFECT_LIGHT_SCREEN
+ enum EFFECT_TRI_ATTACK
+ enum EFFECT_REST
+ enum EFFECT_OHKO
+ enum EFFECT_RAZOR_WIND
+ enum EFFECT_SUPER_FANG
+ enum EFFECT_DRAGON_RAGE
+ enum EFFECT_TRAP
+ enum EFFECT_HIGH_CRITICAL
+ enum EFFECT_DOUBLE_HIT
+ enum EFFECT_RECOIL_IF_MISS
+ enum EFFECT_MIST
+ enum EFFECT_FOCUS_ENERGY
+ enum EFFECT_RECOIL
+ enum EFFECT_CONFUSE
+ enum EFFECT_ATTACK_UP_2
+ enum EFFECT_DEFENSE_UP_2
+ enum EFFECT_SPEED_UP_2
+ enum EFFECT_SPECIAL_ATTACK_UP_2
+ enum EFFECT_SPECIAL_DEFENSE_UP_2
+ enum EFFECT_ACCURACY_UP_2
+ enum EFFECT_EVASION_UP_2
+ enum EFFECT_TRANSFORM
+ enum EFFECT_ATTACK_DOWN_2
+ enum EFFECT_DEFENSE_DOWN_2
+ enum EFFECT_SPEED_DOWN_2
+ enum EFFECT_SPECIAL_ATTACK_DOWN_2
+ enum EFFECT_SPECIAL_DEFENSE_DOWN_2
+ enum EFFECT_ACCURACY_DOWN_2
+ enum EFFECT_EVASION_DOWN_2
+ enum EFFECT_REFLECT
+ enum EFFECT_POISON
+ enum EFFECT_PARALYZE
+ enum EFFECT_ATTACK_DOWN_HIT
+ enum EFFECT_DEFENSE_DOWN_HIT
+ enum EFFECT_SPEED_DOWN_HIT
+ enum EFFECT_SPECIAL_ATTACK_DOWN_HIT
+ enum EFFECT_SPECIAL_DEFENSE_DOWN_HIT
+ enum EFFECT_ACCURACY_DOWN_HIT
+ enum EFFECT_EVASION_DOWN_HIT
+ enum EFFECT_SKY_ATTACK
+ enum EFFECT_CONFUSE_HIT
+ enum EFFECT_TWINEEDLE
+ enum EFFECT_VITAL_THROW
+ enum EFFECT_SUBSTITUTE
+ enum EFFECT_RECHARGE
+ enum EFFECT_RAGE
+ enum EFFECT_MIMIC
+ enum EFFECT_METRONOME
+ enum EFFECT_LEECH_SEED
+ enum EFFECT_SPLASH
+ enum EFFECT_DISABLE
+ enum EFFECT_LEVEL_DAMAGE
+ enum EFFECT_PSYWAVE
+ enum EFFECT_COUNTER
+ enum EFFECT_ENCORE
+ enum EFFECT_PAIN_SPLIT
+ enum EFFECT_SNORE
+ enum EFFECT_CONVERSION_2
+ enum EFFECT_LOCK_ON
+ enum EFFECT_SKETCH
+ enum EFFECT_UNUSED_60 @ thaw
+ enum EFFECT_SLEEP_TALK
+ enum EFFECT_DESTINY_BOND
+ enum EFFECT_FLAIL
+ enum EFFECT_SPITE
+ enum EFFECT_FALSE_SWIPE
+ enum EFFECT_HEAL_BELL
+ enum EFFECT_QUICK_ATTACK
+ enum EFFECT_TRIPLE_KICK
+ enum EFFECT_THIEF
+ enum EFFECT_MEAN_LOOK
+ enum EFFECT_NIGHTMARE
+ enum EFFECT_MINIMIZE
+ enum EFFECT_CURSE
+ enum EFFECT_UNUSED_6E
+ enum EFFECT_PROTECT
+ enum EFFECT_SPIKES
+ enum EFFECT_FORESIGHT
+ enum EFFECT_PERISH_SONG
+ enum EFFECT_SANDSTORM
+ enum EFFECT_ENDURE
+ enum EFFECT_ROLLOUT
+ enum EFFECT_SWAGGER
+ enum EFFECT_FURY_CUTTER
+ enum EFFECT_ATTRACT
+ enum EFFECT_RETURN
+ enum EFFECT_PRESENT
+ enum EFFECT_FRUSTRATION
+ enum EFFECT_SAFEGUARD
+ enum EFFECT_THAW_HIT
+ enum EFFECT_MAGNITUDE
+ enum EFFECT_BATON_PASS
+ enum EFFECT_PURSUIT
+ enum EFFECT_RAPID_SPIN
+ enum EFFECT_SONICBOOM
+ enum EFFECT_UNUSED_83
+ enum EFFECT_MORNING_SUN
+ enum EFFECT_SYNTHESIS
+ enum EFFECT_MOONLIGHT
+ enum EFFECT_HIDDEN_POWER
+ enum EFFECT_RAIN_DANCE
+ enum EFFECT_SUNNY_DAY
+ enum EFFECT_DEFENSE_UP_HIT
+ enum EFFECT_ATTACK_UP_HIT
+ enum EFFECT_ALL_STATS_UP_HIT
+ enum EFFECT_UNUSED_8D @ incomplete fake out in gen 2
+ enum EFFECT_BELLY_DRUM
+ enum EFFECT_PSYCH_UP
+ enum EFFECT_MIRROR_COAT
+ enum EFFECT_SKULL_BASH
+ enum EFFECT_TWISTER
+ enum EFFECT_EARTHQUAKE
+ enum EFFECT_FUTURE_SIGHT
+ enum EFFECT_GUST
+ enum EFFECT_FLINCH_HIT_2 @ STOMP ASTONISH EXTRASENSORY NEEDLE_ARM
+ enum EFFECT_SOLARBEAM
+ enum EFFECT_THUNDER
+ enum EFFECT_TELEPORT
+ enum EFFECT_BEAT_UP
+ enum EFFECT_FLY
+ enum EFFECT_DEFENSE_CURL
+ enum EFFECT_SOFTBOILED
+ enum EFFECT_FAKE_OUT
+ enum EFFECT_UPROAR
+ enum EFFECT_STOCKPILE
+ enum EFFECT_SPIT_UP
+ enum EFFECT_SWALLOW
+ enum EFFECT_UNUSED_A3
+ enum EFFECT_HAIL
+ enum EFFECT_TORMENT
+ enum EFFECT_FLATTER
+ enum EFFECT_WILL_O_WISP
+ enum EFFECT_MEMENTO
+ enum EFFECT_FACADE
+ enum EFFECT_FOCUS_PUNCH
+ enum EFFECT_SMELLINGSALT
+ enum EFFECT_FOLLOW_ME
+ enum EFFECT_NATURE_POWER
+ enum EFFECT_CHARGE
+ enum EFFECT_TAUNT
+ enum EFFECT_HELPING_HAND
+ enum EFFECT_TRICK
+ enum EFFECT_ROLE_PLAY
+ enum EFFECT_WISH
+ enum EFFECT_ASSIST
+ enum EFFECT_INGRAIN
+ enum EFFECT_SUPERPOWER
+ enum EFFECT_MAGIC_COAT
+ enum EFFECT_RECYCLE
+ enum EFFECT_REVENGE
+ enum EFFECT_BRICK_BREAK
+ enum EFFECT_YAWN
+ enum EFFECT_KNOCK_OFF
+ enum EFFECT_ENDEAVOR
+ enum EFFECT_ERUPTION
+ enum EFFECT_SKILL_SWAP
+ enum EFFECT_IMPRISON
+ enum EFFECT_REFRESH
+ enum EFFECT_GRUDGE
+ enum EFFECT_SNATCH
+ enum EFFECT_LOW_KICK
+ enum EFFECT_SECRET_POWER
+ enum EFFECT_DOUBLE_EDGE
+ enum EFFECT_TEETER_DANCE
+ enum EFFECT_BLAZE_KICK
+ enum EFFECT_MUD_SPORT
+ enum EFFECT_POISON_FANG
+ enum EFFECT_WEATHER_BALL
+ enum EFFECT_OVERHEAT
+ enum EFFECT_TICKLE
+ enum EFFECT_COSMIC_POWER
+ enum EFFECT_SKY_UPPERCUT
+ enum EFFECT_BULK_UP
+ enum EFFECT_POISON_TAIL
+ enum EFFECT_WATER_SPORT
+ enum EFFECT_CALM_MIND
+ enum EFFECT_DRAGON_DANCE
+ enum EFFECT_CAMOUFLAGE
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
new file mode 100644
index 000000000..aa60e9821
--- /dev/null
+++ b/data/battle_ai_scripts.s
@@ -0,0 +1,7 @@
+ .include "asm/macros.s"
+ .include "constants/constants.s"
+
+ .section script_data, "aw", %progbits
+
+gUnknown_081DA01C:: @ 81DA01C
+ .incbin "baserom.gba", 0x001da01c, 0x20fc
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
new file mode 100644
index 000000000..0a472467e
--- /dev/null
+++ b/data/battle_scripts_1.s
@@ -0,0 +1,4475 @@
+ .include "asm/macros.s"
+ .include "constants/constants.s"
+ .include "asm/macros/battle_script.s"
+
+ .section script_data, "aw", %progbits
+
+gUnknown_081D6BBC:: @ 81D6BBC
+ .4byte MoveEffect_Hit
+ .4byte MoveEffect_Sleep
+ .4byte MoveEffect_PoisonHit
+ .4byte MoveEffect_Absorb
+ .4byte MoveEffect_BurnHit
+ .4byte MoveEffect_FreezeHit
+ .4byte MoveEffect_ParalyzeHit
+ .4byte MoveEffect_Explosion
+ .4byte MoveEffect_DreamEater
+ .4byte MoveEffect_MirrorMove
+ .4byte MoveEffect_AttackUp
+ .4byte MoveEffect_DefenseUp
+ .4byte MoveEffect_SpeedUp
+ .4byte MoveEffect_SpecialAttackUp
+ .4byte MoveEffect_SpecialDefenseUp
+ .4byte MoveEffect_AccuracyUp
+ .4byte MoveEffect_EvasionUp
+ .4byte MoveEffect_AlwaysHit
+ .4byte MoveEffect_AttackDown
+ .4byte MoveEffect_DefenseDown
+ .4byte MoveEffect_SpeedDown
+ .4byte MoveEffect_SpecialAttackDown
+ .4byte MoveEffect_SpecialDefenseDown
+ .4byte MoveEffect_AccuracyDown
+ .4byte MoveEffect_EvasionDown
+ .4byte MoveEffect_Haze
+ .4byte MoveEffect_Bide
+ .4byte MoveEffect_Rampage
+ .4byte MoveEffect_Roar
+ .4byte MoveEffect_MultiHit
+ .4byte MoveEffect_Conversion
+ .4byte MoveEffect_FlinchHit
+ .4byte MoveEffect_RestoreHp
+ .4byte MoveEffect_Toxic
+ .4byte MoveEffect_PayDay
+ .4byte MoveEffect_LightScreen
+ .4byte MoveEffect_TriAttack
+ .4byte MoveEffect_Rest
+ .4byte MoveEffect_Ohko
+ .4byte MoveEffect_RazorWind
+ .4byte MoveEffect_SuperFang
+ .4byte MoveEffect_DragonRage
+ .4byte MoveEffect_Trap
+ .4byte MoveEffect_HighCritical
+ .4byte MoveEffect_DoubleHit
+ .4byte MoveEffect_RecoilIfMiss
+ .4byte MoveEffect_Mist
+ .4byte MoveEffect_FocusEnergy
+ .4byte MoveEffect_Recoil
+ .4byte MoveEffect_Confuse
+ .4byte MoveEffect_AttackUp2
+ .4byte MoveEffect_DefenseUp2
+ .4byte MoveEffect_SpeedUp2
+ .4byte MoveEffect_SpecialAttackUp2
+ .4byte MoveEffect_SpecialDefenseUp2
+ .4byte MoveEffect_AccuracyUp2
+ .4byte MoveEffect_EvasionUp2
+ .4byte MoveEffect_Transform
+ .4byte MoveEffect_AttackDown2
+ .4byte MoveEffect_DefenseDown2
+ .4byte MoveEffect_SpeedDown2
+ .4byte MoveEffect_SpecialAttackDown2
+ .4byte MoveEffect_SpecialDefenseDown2
+ .4byte MoveEffect_AccuracyDown2
+ .4byte MoveEffect_EvasionDown2
+ .4byte MoveEffect_Reflect
+ .4byte MoveEffect_Poison
+ .4byte MoveEffect_Paralyze
+ .4byte MoveEffect_AttackDownHit
+ .4byte MoveEffect_DefenseDownHit
+ .4byte MoveEffect_SpeedDownHit
+ .4byte MoveEffect_SpecialAttackDownHit
+ .4byte MoveEffect_SpecialDefenseDownHit
+ .4byte MoveEffect_AccuracyDownHit
+ .4byte MoveEffect_EvasionDownHit
+ .4byte MoveEffect_SkyAttack
+ .4byte MoveEffect_ConfuseHit
+ .4byte MoveEffect_Twineedle
+ .4byte MoveEffect_VitalThrow
+ .4byte MoveEffect_Substitute
+ .4byte MoveEffect_Recharge
+ .4byte MoveEffect_Rage
+ .4byte MoveEffect_Mimic
+ .4byte MoveEffect_Metronome
+ .4byte MoveEffect_LeechSeed
+ .4byte MoveEffect_Splash
+ .4byte MoveEffect_Disable
+ .4byte MoveEffect_LevelDamage
+ .4byte MoveEffect_Psywave
+ .4byte MoveEffect_Counter
+ .4byte MoveEffect_Encore
+ .4byte MoveEffect_PainSplit
+ .4byte MoveEffect_Snore
+ .4byte MoveEffect_Conversion2
+ .4byte MoveEffect_LockOn
+ .4byte MoveEffect_Sketch
+ .4byte MoveEffect_Unused60
+ .4byte MoveEffect_SleepTalk
+ .4byte MoveEffect_DestinyBond
+ .4byte MoveEffect_Flail
+ .4byte MoveEffect_Spite
+ .4byte MoveEffect_FalseSwipe
+ .4byte MoveEffect_HealBell
+ .4byte MoveEffect_QuickAttack
+ .4byte MoveEffect_TripleKick
+ .4byte MoveEffect_Thief
+ .4byte MoveEffect_MeanLook
+ .4byte MoveEffect_Nightmare
+ .4byte MoveEffect_Minimize
+ .4byte MoveEffect_Curse
+ .4byte MoveEffect_Unused6E
+ .4byte MoveEffect_Protect
+ .4byte MoveEffect_Spikes
+ .4byte MoveEffect_Foresight
+ .4byte MoveEffect_PerishSong
+ .4byte MoveEffect_Sandstorm
+ .4byte MoveEffect_Endure
+ .4byte MoveEffect_Rollout
+ .4byte MoveEffect_Swagger
+ .4byte MoveEffect_FuryCutter
+ .4byte MoveEffect_Attract
+ .4byte MoveEffect_Return
+ .4byte MoveEffect_Present
+ .4byte MoveEffect_Frustration
+ .4byte MoveEffect_Safeguard
+ .4byte MoveEffect_ThawHit
+ .4byte MoveEffect_Magnitude
+ .4byte MoveEffect_BatonPass
+ .4byte MoveEffect_Pursuit
+ .4byte MoveEffect_RapidSpin
+ .4byte MoveEffect_Sonicboom
+ .4byte MoveEffect_Unused83
+ .4byte MoveEffect_MorningSun
+ .4byte MoveEffect_Synthesis
+ .4byte MoveEffect_Moonlight
+ .4byte MoveEffect_HiddenPower
+ .4byte MoveEffect_RainDance
+ .4byte MoveEffect_SunnyDay
+ .4byte MoveEffect_DefenseUpHit
+ .4byte MoveEffect_AttackUpHit
+ .4byte MoveEffect_AllStatsUpHit
+ .4byte MoveEffect_Unused8D
+ .4byte MoveEffect_BellyDrum
+ .4byte MoveEffect_PsychUp
+ .4byte MoveEffect_MirrorCoat
+ .4byte MoveEffect_SkullBash
+ .4byte MoveEffect_Twister
+ .4byte MoveEffect_Earthquake
+ .4byte MoveEffect_FutureSight
+ .4byte MoveEffect_Gust
+ .4byte MoveEffect_FlinchHit2
+ .4byte MoveEffect_Solarbeam
+ .4byte MoveEffect_Thunder
+ .4byte MoveEffect_Teleport
+ .4byte MoveEffect_BeatUp
+ .4byte MoveEffect_Fly
+ .4byte MoveEffect_DefenseCurl
+ .4byte MoveEffect_Softboiled
+ .4byte MoveEffect_FakeOut
+ .4byte MoveEffect_Uproar
+ .4byte MoveEffect_Stockpile
+ .4byte MoveEffect_SpitUp
+ .4byte MoveEffect_Swallow
+ .4byte MoveEffect_UnusedA3
+ .4byte MoveEffect_Hail
+ .4byte MoveEffect_Torment
+ .4byte MoveEffect_Flatter
+ .4byte MoveEffect_WillOWisp
+ .4byte MoveEffect_Memento
+ .4byte MoveEffect_Facade
+ .4byte MoveEffect_FocusPunch
+ .4byte MoveEffect_Smellingsalt
+ .4byte MoveEffect_FollowMe
+ .4byte MoveEffect_NaturePower
+ .4byte MoveEffect_Charge
+ .4byte MoveEffect_Taunt
+ .4byte MoveEffect_HelpingHand
+ .4byte MoveEffect_Trick
+ .4byte MoveEffect_RolePlay
+ .4byte MoveEffect_Wish
+ .4byte MoveEffect_Assist
+ .4byte MoveEffect_Ingrain
+ .4byte MoveEffect_Superpower
+ .4byte MoveEffect_MagicCoat
+ .4byte MoveEffect_Recycle
+ .4byte MoveEffect_Revenge
+ .4byte MoveEffect_BrickBreak
+ .4byte MoveEffect_Yawn
+ .4byte MoveEffect_KnockOff
+ .4byte MoveEffect_Endeavor
+ .4byte MoveEffect_Eruption
+ .4byte MoveEffect_SkillSwap
+ .4byte MoveEffect_Imprison
+ .4byte MoveEffect_Refresh
+ .4byte MoveEffect_Grudge
+ .4byte MoveEffect_Snatch
+ .4byte MoveEffect_LowKick
+ .4byte MoveEffect_SecretPower
+ .4byte MoveEffect_DoubleEdge
+ .4byte MoveEffect_TeeterDance
+ .4byte MoveEffect_BlazeKick
+ .4byte MoveEffect_MudSport
+ .4byte MoveEffect_PoisonFang
+ .4byte MoveEffect_WeatherBall
+ .4byte MoveEffect_Overheat
+ .4byte MoveEffect_Tickle
+ .4byte MoveEffect_CosmicPower
+ .4byte MoveEffect_SkyUppercut
+ .4byte MoveEffect_BulkUp
+ .4byte MoveEffect_PoisonTail
+ .4byte MoveEffect_WaterSport
+ .4byte MoveEffect_CalmMind
+ .4byte MoveEffect_DragonDance
+ .4byte MoveEffect_Camouflage
+
+BattleScript_1D6F14: @ 81D6F14
+MoveEffect_AccuracyDown2: @ 81D6F14
+MoveEffect_AccuracyUp2: @ 81D6F14
+MoveEffect_AccuracyUp: @ 81D6F14
+MoveEffect_AlwaysHit: @ 81D6F14
+MoveEffect_EvasionDown2: @ 81D6F14
+MoveEffect_EvasionDownHit: @ 81D6F14
+MoveEffect_EvasionUp2: @ 81D6F14
+MoveEffect_FalseSwipe: @ 81D6F14
+MoveEffect_HighCritical: @ 81D6F14
+MoveEffect_Hit: @ 81D6F14
+MoveEffect_Pursuit: @ 81D6F14
+MoveEffect_QuickAttack: @ 81D6F14
+MoveEffect_SpecialAttackDown2: @ 81D6F14
+MoveEffect_SpecialAttackDown: @ 81D6F14
+MoveEffect_SpecialDefenseDown: @ 81D6F14
+MoveEffect_SpecialDefenseUp: @ 81D6F14
+MoveEffect_SpeedUp: @ 81D6F14
+MoveEffect_Unused60: @ 81D6F14
+MoveEffect_Unused6E: @ 81D6F14
+MoveEffect_Unused83: @ 81D6F14
+MoveEffect_Unused8D: @ 81D6F14
+MoveEffect_UnusedA3: @ 81D6F14
+MoveEffect_VitalThrow: @ 81D6F14
+ jumpifhalfword 1, 0x2024be6, 57, BattleScript_1D6F3A
+ jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D6F3A
+ orword 0x2024c6c, 0x40000
+ setbyte 0x201601f, 2
+
+BattleScript_1D6F3A: @ 81D6F3A
+ attackcanceler
+
+BattleScript_1D6F3B: @ 81D6F3B
+ accuracycheck BattleScript_1D6F72, 0
+
+BattleScript_1D6F42: @ 81D6F42
+ attackstring
+ ppreduce
+
+BattleScript_1D6F44:: @ 81D6F44
+ critcalc
+ atk5
+ atk6
+ atk7
+
+BattleScript_1D6F48: @ 81D6F48
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ seteffectwithchancetarget
+ faintpokemon TARGET, 0, 0x0
+
+BattleScript_1D6F62:: @ 81D6F62
+ setbyte 0x201600c, 0
+ atk49 0, 0
+ end
+
+BattleScript_1D6F6C: @ 81D6F6C
+ orbyte 0x2024c68, 1
+
+BattleScript_1D6F72: @ 81D6F72
+ attackstring
+ ppreduce
+
+BattleScript_1D6F74:: @ 81D6F74
+ pause 32
+
+BattleScript_1D6F77: @ 81D6F77
+ missmessage
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Sleep: @ 81D6F81
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifstatus TARGET, SLP, BattleScript_1D6FC4
+ jumpifcannotsleep BattleScript_1D6FE0
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 1
+ seteffecttarget
+ jump BattleScript_1D6F62
+
+BattleScript_1D6FC4: @ 81D6FC4
+ pause 32
+ printstring BATTLE_TEXT_DefendingAsleep
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D6FD2: @ 81D6FD2
+ pause 32
+ printstring BATTLE_TEXT_WasntAffected
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D6FE0: @ 81D6FE0
+ pause 32
+ printfromtable BattleTextList_40156A
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_PoisonHit: @ 81D6FF0
+MoveEffect_PoisonTail: @ 81D6FF0
+ setbyte 0x2024d21, 2
+ jump BattleScript_1D6F14
+
+MoveEffect_Absorb: @ 81D6FFB
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ critcalc
+ atk5
+ atk6
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ negativedamage
+ orword 0x2024c6c, 0x100
+ jumpifability TARGET, ABILITY_LIQUID_OOZE, BattleScript_1D7037
+ setbyte 0x2024d23, 0
+ jump BattleScript_1D703F
+
+BattleScript_1D7037: @ 81D7037
+ manipulatedamage 0
+ setbyte 0x2024d23, 1
+
+BattleScript_1D703F: @ 81D703F
+ graphicalhpupdate USER
+ datahpupdate USER
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7056
+ printfromtable BattleTextList_4015D0
+ waitmessage 64
+
+BattleScript_1D7056: @ 81D7056
+ faintpokemon USER, 0, 0x0
+ faintpokemon TARGET, 0, 0x0
+ jump BattleScript_1D6F62
+
+MoveEffect_BlazeKick: @ 81D7069
+MoveEffect_BurnHit: @ 81D7069
+ setbyte 0x2024d21, 3
+ jump BattleScript_1D6F14
+
+MoveEffect_FreezeHit: @ 81D7074
+ setbyte 0x2024d21, 4
+ jump BattleScript_1D6F14
+
+MoveEffect_ParalyzeHit: @ 81D707F
+ setbyte 0x2024d21, 5
+ jump BattleScript_1D6F14
+
+MoveEffect_Explosion: @ 81D708A
+ attackcanceler
+ attackstring
+ ppreduce
+ faintifabilitynotdamp
+ setuserhptozero
+ waitstateatk
+ jumpifbyte 5, 0x2024c68, 1, BattleScript_1D70A5
+ callatk BattleScript_1D70FB
+ jump BattleScript_1D70A7
+
+BattleScript_1D70A5: @ 81D70A5
+ attackanimation
+ waitanimation
+
+BattleScript_1D70A7: @ 81D70A7
+ atk25
+ critcalc
+ atk5
+ atk6
+ atk7
+ accuracycheck BattleScript_1D70E0, 0
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpwhiletargetvalid BattleScript_1D70A7
+ faintpokemon USER, 0, 0x0
+ end
+
+BattleScript_1D70E0: @ 81D70E0
+ missmessage
+ resultmessage
+ waitmessage 64
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpwhiletargetvalid BattleScript_1D70A7
+ faintpokemon USER, 0, 0x0
+ end
+
+BattleScript_1D70FB: @ 81D70FB
+ bicbyte 0x2024c68, 1
+ attackanimation
+ waitanimation
+ orbyte 0x2024c68, 1
+ return
+
+MoveEffect_DreamEater: @ 81D710A
+ attackcanceler
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D711F
+ jumpifstatus TARGET, SLP, BattleScript_1D7129
+
+BattleScript_1D711F: @ 81D711F
+ attackstring
+ ppreduce
+ waitmessage 64
+ jump BattleScript_1D6FD2
+
+BattleScript_1D7129: @ 81D7129
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ critcalc
+ atk5
+ atk6
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ negativedamage
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7167
+ printstring BATTLE_TEXT_DreamEaten
+ waitmessage 64
+
+BattleScript_1D7167: @ 81D7167
+ faintpokemon TARGET, 0, 0x0
+ jump BattleScript_1D6F62
+
+MoveEffect_MirrorMove: @ 81D7173
+ attackcanceler
+ attackstring
+ pause 64
+ jumptolastusedattack
+ ppreduce
+ orbyte 0x2024c68, 32
+ printstring BATTLE_TEXT_MirrorFail
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_AttackUp: @ 81D718B
+ setbyte 0x201601e, 17
+ jump BattleScript_1D71B2
+
+MoveEffect_DefenseUp: @ 81D7196
+ setbyte 0x201601e, 18
+ jump BattleScript_1D71B2
+
+MoveEffect_SpecialAttackUp: @ 81D71A1
+ setbyte 0x201601e, 20
+ jump BattleScript_1D71B2
+
+MoveEffect_EvasionUp: @ 81D71AC
+ setbyte 0x201601e, 23
+
+BattleScript_1D71B2: @ 81D71B2
+ attackcanceler
+
+BattleScript_1D71B3: @ 81D71B3
+ attackstring
+ ppreduce
+ statbuffchange 65, BattleScript_1D71E0
+ jumpifbyte 1, 0x2024d23, 2, BattleScript_1D71CE
+ pause 32
+ jump BattleScript_1D71D8
+
+BattleScript_1D71CE: @ 81D71CE
+ attackanimation
+ waitanimation
+
+BattleScript_1D71D0: @ 81D71D0
+ atk47
+ playanimation USER, 1, 0x20160a4
+
+BattleScript_1D71D8: @ 81D71D8
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D71E0: @ 81D71E0
+ jump BattleScript_1D6F62
+
+gUnknown_081D71E5:: @ 81D71E5
+ playanimation 2, 1, 0x20160a4
+ printfromtable BattleTextList_401570
+ waitmessage 64
+ return
+
+MoveEffect_AttackDown: @ 81D71F5
+ setbyte 0x201601e, 145
+ jump BattleScript_1D7227
+
+MoveEffect_DefenseDown: @ 81D7200
+ setbyte 0x201601e, 146
+ jump BattleScript_1D7227
+
+MoveEffect_SpeedDown: @ 81D720B
+ setbyte 0x201601e, 147
+ jump BattleScript_1D7227
+
+MoveEffect_AccuracyDown: @ 81D7216
+ setbyte 0x201601e, 150
+ jump BattleScript_1D7227
+
+MoveEffect_EvasionDown: @ 81D7221
+ setbyte 0x201601e, 151
+
+BattleScript_1D7227: @ 81D7227
+ attackcanceler
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D4
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ statbuffchange 1, BattleScript_1D7271
+ jumpifbyte 3, 0x2024d23, 2, BattleScript_1D725F
+ jumpifbyte 0, 0x2024d23, 3, BattleScript_1D7271
+ pause 32
+ jump BattleScript_1D7269
+
+BattleScript_1D725F: @ 81D725F
+ attackanimation
+ waitanimation
+ atk47
+ playanimation TARGET, 1, 0x20160a4
+
+BattleScript_1D7269: @ 81D7269
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D7271: @ 81D7271
+ jump BattleScript_1D6F62
+
+gUnknown_081D7276:: @ 81D7276
+ playanimation 2, 1, 0x20160a4
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+ return
+
+MoveEffect_Haze: @ 81D7286
+ attackcanceler
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ normalisebuffs
+ printstring BATTLE_TEXT_StatElim
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Bide: @ 81D7297
+ attackcanceler
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ orword 0x2024c6c, 0x8000000
+ setbide
+ jump BattleScript_1D6F62
+
+MoveEffect_Rampage: @ 81D72AB
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D72BF
+ ppreduce
+
+BattleScript_1D72BF: @ 81D72BF
+ confuseifrepeatingattackends
+ jump BattleScript_1D6F44
+
+MoveEffect_Roar: @ 81D72C5
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_SUCTION_CUPS, BattleScript_1D988D
+ jumpifspecialstatusflag TARGET, 0x400, 0, BattleScript_1D93EC
+ accuracycheck BattleScript_1D83D6, 65535
+ accuracycheck BattleScript_1D6F77, 0
+ forcerandomswitch BattleScript_1D83D6
+
+MoveEffect_MultiHit: @ 81D72ED
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ setloopcounter 0
+ atk8e
+ setbyte 0x2016112, 0
+
+BattleScript_1D7300: @ 81D7300
+ jumpiffainted USER, BattleScript_1D7396
+ jumpiffainted TARGET, BattleScript_1D7377
+ jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7322
+ jumpifstatus USER, SLP, BattleScript_1D7377
+
+BattleScript_1D7322: @ 81D7322
+ atk25
+ copyarray 0x2024d21, 0x2016112, 1
+ critcalc
+ atk5
+ atk6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7374
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ printstring BATTLE_TEXT_Terminator2
+ waitmessage 1
+ addbyte 0x20160e4, 1
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7377
+ atk27 BattleScript_1D7300
+ jump BattleScript_1D7377
+
+BattleScript_1D7374: @ 81D7374
+ pause 32
+
+BattleScript_1D7377: @ 81D7377
+ resultmessage
+ waitmessage 64
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7396
+ copyarray 0x30041c0, 0x20160e0, 6
+ printstring BATTLE_TEXT_HitMulti
+ waitmessage 64
+
+BattleScript_1D7396: @ 81D7396
+ seteffectwithchancetarget
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 2
+ atk49 1, 0
+ setbyte 0x201600c, 4
+ atk49 0, 0
+ end
+
+MoveEffect_Conversion: @ 81D73B1
+ attackcanceler
+ attackstring
+ ppreduce
+ changetypestoenemyattacktype BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TypeTransform
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_FlinchHit: @ 81D73C6
+ setbyte 0x2024d21, 8
+ jump BattleScript_1D6F14
+
+MoveEffect_RestoreHp: @ 81D73D1
+ attackcanceler
+ attackstring
+ ppreduce
+ setdamageasrestorehalfmaxhp BattleScript_1D83B5, 1
+ attackanimation
+ waitanimation
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_RegainedHealth
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Toxic: @ 81D73F4
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifstatus TARGET, PSN, BattleScript_1D7455
+ jumpifstatus TARGET, TOX, BattleScript_1D7455
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8
+ jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 6
+ seteffecttarget
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D7455: @ 81D7455
+ pause 64
+ printstring BATTLE_TEXT_AlreadyPoisoned
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D7463: @ 81D7463
+ copyarray 0x2024c0a, 0x2024c08, 1
+ setbyte 0x2024d23, 0
+ callatk BattleScript_1D98BD
+ jump BattleScript_1D6F62
+
+MoveEffect_PayDay: @ 81D747D
+ setbyte 0x2024d21, 11
+ jump BattleScript_1D6F14
+
+MoveEffect_LightScreen: @ 81D7488
+ attackcanceler
+ attackstring
+ ppreduce
+ setlightscreen
+ jump BattleScript_1D7786
+
+MoveEffect_TriAttack: @ 81D7491
+ setbyte 0x2024d21, 9
+ jump BattleScript_1D6F14
+
+MoveEffect_Rest: @ 81D749C
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstatus USER, SLP, BattleScript_1D74D6
+ jumpifcannotsleep BattleScript_1D74C6
+ setrest BattleScript_1D83B5
+ pause 32
+ printfromtable BattleTextList_401556
+ waitmessage 64
+ atk98 1
+ waitstateatk
+ jump BattleScript_1D839B
+
+BattleScript_1D74C6: @ 81D74C6
+ pause 64
+ printfromtable BattleTextList_40156A
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D74D6: @ 81D74D6
+ pause 32
+ printstring BATTLE_TEXT_AttackingAsleep
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Ohko: @ 81D74E4
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 65535
+ atk6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48
+ koplussomethings BattleScript_1D7505
+ atkab
+ jump BattleScript_1D6F48
+
+BattleScript_1D7505: @ 81D7505
+ pause 64
+ printfromtable BattleTextList_4015C8
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_RazorWind: @ 81D7515
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D
+ jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
+ setbyte 0x2016055, 0
+ callatk BattleScript_1D756C
+ jump BattleScript_1D6F62
+
+BattleScript_1D753D: @ 81D753D
+ attackcanceler
+ setbyte 0x2024d21, 12
+ setbyte 0x2016002, 1
+ clearstatus USER
+ orword 0x2024c6c, 0x800
+ jumpifhalfword 1, 0x2024be6, 143, BattleScript_1D6F3B
+ setbyte 0x2024d21, 8
+ jump BattleScript_1D6F3B
+
+BattleScript_1D756C: @ 81D756C
+ attackcanceler
+ printstring BATTLE_TEXT_Terminator2
+ ppreduce
+ attackanimation
+ waitanimation
+ orword 0x2024c6c, 0x8000000
+ setbyte 0x2024d21, 76
+ seteffecttarget
+ copyarray 0x2024d23, 0x2016055, 1
+ printfromtable BattleTextList_401584
+ waitmessage 64
+ return
+
+MoveEffect_SuperFang: @ 81D7596
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ bicbyte 0x2024c68, 6
+ gethalfcurrentenemyhp
+ jump BattleScript_1D6F48
+
+MoveEffect_DragonRage: @ 81D75AD
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ bicbyte 0x2024c68, 6
+ setbyte 0x2024bec, 40
+ setbyte 0x2024bed, 0
+ setbyte 0x2024bee, 0
+ setbyte 0x2024bef, 0
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Trap: @ 81D75DC
+ jumpifhalfword 1, 0x2024be6, 250, BattleScript_1D7602
+ jumpifspecialstatusflag TARGET, 0x40000, 1, BattleScript_1D7602
+ orword 0x2024c6c, 0x40000
+ setbyte 0x201601f, 2
+
+BattleScript_1D7602: @ 81D7602
+ setbyte 0x2024d21, 13
+ jump BattleScript_1D6F14
+
+MoveEffect_DoubleHit: @ 81D760D
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ setloopcounter 2
+ atk8e
+ setbyte 0x2016112, 0
+ jump BattleScript_1D7300
+
+MoveEffect_RecoilIfMiss: @ 81D7625
+ attackcanceler
+ accuracycheck BattleScript_1D7632, 0
+ jump BattleScript_1D6F42
+
+BattleScript_1D7632: @ 81D7632
+ attackstring
+ ppreduce
+ pause 64
+ resultmessage
+ waitmessage 64
+ jumpifbyte 4, 0x2024c68, 8, BattleScript_1D6F62
+ printstring BATTLE_TEXT_KeptGoingCrash
+ waitmessage 64
+ atk5
+ atk6
+ atk7
+ manipulatedamage 1
+ bicbyte 0x2024c68, 1
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ orbyte 0x2024c68, 1
+ jump BattleScript_1D6F62
+
+MoveEffect_Mist: @ 81D7676
+ attackcanceler
+ attackstring
+ ppreduce
+ setmisteffect
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015A0
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_FocusEnergy: @ 81D7689
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus USER, S_FOCUS_ENERGY, BattleScript_1D83D6
+ setincreasedcriticalchance
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015A4
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Recoil: @ 81D76A6
+ setbyte 0x2024d21, 206
+ jumpifhalfword 1, 0x2024be6, 165, BattleScript_1D6F14
+ atk60 27
+ jump BattleScript_1D6F14
+
+MoveEffect_Confuse: @ 81D76BF
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D76FE
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 7
+ seteffecttarget
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D76FE: @ 81D76FE
+ pause 32
+ printstring BATTLE_TEXT_AlreadyConfused
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_AttackUp2: @ 81D770C
+ setbyte 0x201601e, 33
+ jump BattleScript_1D71B2
+
+MoveEffect_DefenseUp2: @ 81D7717
+ setbyte 0x201601e, 34
+ jump BattleScript_1D71B2
+
+MoveEffect_SpeedUp2: @ 81D7722
+ setbyte 0x201601e, 35
+ jump BattleScript_1D71B2
+
+MoveEffect_SpecialAttackUp2: @ 81D772D
+ setbyte 0x201601e, 36
+ jump BattleScript_1D71B2
+
+MoveEffect_SpecialDefenseUp2: @ 81D7738
+ setbyte 0x201601e, 37
+ jump BattleScript_1D71B2
+
+MoveEffect_Transform: @ 81D7743
+ attackcanceler
+ attackstring
+ ppreduce
+ transformdataexecution
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015A8
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_AttackDown2: @ 81D7756
+ setbyte 0x201601e, 161
+ jump BattleScript_1D7227
+
+MoveEffect_DefenseDown2: @ 81D7761
+ setbyte 0x201601e, 162
+ jump BattleScript_1D7227
+
+MoveEffect_SpeedDown2: @ 81D776C
+ setbyte 0x201601e, 163
+ jump BattleScript_1D7227
+
+MoveEffect_SpecialDefenseDown2: @ 81D7777
+ setbyte 0x201601e, 165
+ jump BattleScript_1D7227
+
+MoveEffect_Reflect: @ 81D7782
+ attackcanceler
+ attackstring
+ ppreduce
+ setreflect
+
+BattleScript_1D7786: @ 81D7786
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_401540
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Poison: @ 81D7795
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_IMMUNITY, BattleScript_1D7463
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifstatus TARGET, PSN, BattleScript_1D7455
+ jumpifstatus TARGET, TOX, BattleScript_1D7455
+ jumpiftype TARGET, TYPE_POISON, BattleScript_1D83E8
+ jumpiftype TARGET, TYPE_STEEL, BattleScript_1D83E8
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 2
+ seteffecttarget
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Paralyze: @ 81D77F6
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_LIMBER, BattleScript_1D7859
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ atk6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D83D6
+ jumpifstatus TARGET, PAR, BattleScript_1D784B
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 5
+ seteffecttarget
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D784B: @ 81D784B
+ pause 32
+ printstring BATTLE_TEXT_AlreadyParalyzed
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D7859: @ 81D7859
+ copyarray 0x2024c0a, 0x2024c08, 1
+ setbyte 0x2024d23, 0
+ callatk BattleScript_1D98B1
+ jump BattleScript_1D6F62
+
+MoveEffect_AttackDownHit: @ 81D7873
+ setbyte 0x2024d21, 22
+ jump BattleScript_1D6F14
+
+MoveEffect_DefenseDownHit: @ 81D787E
+ setbyte 0x2024d21, 23
+ jump BattleScript_1D6F14
+
+MoveEffect_SpeedDownHit: @ 81D7889
+ setbyte 0x2024d21, 24
+ jump BattleScript_1D6F14
+
+MoveEffect_SpecialAttackDownHit: @ 81D7894
+ setbyte 0x2024d21, 25
+ jump BattleScript_1D6F14
+
+MoveEffect_SpecialDefenseDownHit: @ 81D789F
+ setbyte 0x2024d21, 26
+ jump BattleScript_1D6F14
+
+MoveEffect_AccuracyDownHit: @ 81D78AA
+ setbyte 0x2024d21, 27
+ jump BattleScript_1D6F14
+
+MoveEffect_SkyAttack: @ 81D78B5
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D
+ jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
+ setbyte 0x2016055, 3
+ callatk BattleScript_1D756C
+ jump BattleScript_1D6F62
+
+MoveEffect_ConfuseHit: @ 81D78DD
+ setbyte 0x2024d21, 7
+ jump BattleScript_1D6F14
+
+MoveEffect_Twineedle: @ 81D78E8
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ setbyte 0x2016112, 2
+ attackstring
+ ppreduce
+ setloopcounter 2
+ atk8e
+ jump BattleScript_1D7300
+
+MoveEffect_Substitute: @ 81D7900
+ attackcanceler
+ ppreduce
+ attackstring
+ waitstateatk
+ jumpifsecondarytstatus USER, S_SUBSTITUTE, BattleScript_1D7935
+ setsubstituteeffect
+ jumpifbyte 1, 0x2024d23, 1, BattleScript_1D7922
+ pause 32
+ jump BattleScript_1D7928
+
+BattleScript_1D7922: @ 81D7922
+ attackanimation
+ waitanimation
+ graphicalhpupdate USER
+ datahpupdate USER
+
+BattleScript_1D7928: @ 81D7928
+ printfromtable BattleTextList_4015AC
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D7935: @ 81D7935
+ pause 32
+ printstring BATTLE_TEXT_SubAlready
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Recharge: @ 81D7943
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ setbyte 0x2024d21, 221
+ jump BattleScript_1D6F42
+
+gUnknown_081D7956:: @ 81D7956
+ printstring BATTLE_TEXT_MustRecharge
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Rage: @ 81D7961
+ attackcanceler
+ accuracycheck BattleScript_1D797B, 0
+ setbyte 0x2024d21, 30
+ seteffecttarget
+ setbyte 0x2024d21, 0
+ jump BattleScript_1D6F42
+
+BattleScript_1D797B: @ 81D797B
+ setbyte 0x2024d21, 30
+ clearstatus USER
+ jump BattleScript_1D6F72
+
+MoveEffect_Mimic: @ 81D7988
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 65535
+ copyattack BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_LearnedMove2
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Metronome: @ 81D79AE
+ attackcanceler
+ attackstring
+ pause 32
+ attackanimation
+ waitanimation
+ setbyte 0x2016002, 0
+ setbyte 0x20160a1, 0
+ metronomeeffect
+
+MoveEffect_LeechSeed: @ 81D79C2
+ attackcanceler
+ attackstring
+ pause 32
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ accuracycheck BattleScript_1D79D9, 0
+
+BattleScript_1D79D9: @ 81D79D9
+ setleechseed
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_40154C
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Splash: @ 81D79E9
+ attackcanceler
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ atk60 26
+ printstring BATTLE_TEXT_Nothing
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Disable: @ 81D79FB
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 0
+ disablelastusedattack BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_MoveWasDisabled
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_LevelDamage: @ 81D7A17
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ bicbyte 0x2024c68, 6
+ nightshadedamageeffect
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Psywave: @ 81D7A2F
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ bicbyte 0x2024c68, 6
+ psywavedamageeffect
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Counter: @ 81D7A47
+ attackcanceler
+ counterdamagecalculator BattleScript_1D83D4
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ damagecalc2
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Encore: @ 81D7A5D
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ setencore BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_EncoreGot
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_PainSplit: @ 81D7A79
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 65535
+ painsplitdamagecalculator BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ copyarray 0x2024bec, 0x2016014, 4
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ printstring BATTLE_TEXT_PainSplit
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Snore: @ 81D7AB0
+ attackcanceler
+ jumpifstatus USER, SLP, BattleScript_1D7AC2
+ attackstring
+ ppreduce
+ jump BattleScript_1D83D6
+
+BattleScript_1D7AC2: @ 81D7AC2
+ jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7AD6
+ printstring BATTLE_TEXT_FastAsleep
+ waitmessage 64
+ statusanimation USER
+
+BattleScript_1D7AD6: @ 81D7AD6
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D6F77, 0
+ setbyte 0x2024d21, 8
+ jump BattleScript_1D6F44
+
+MoveEffect_Conversion2: @ 81D7AEA
+ attackcanceler
+ attackstring
+ ppreduce
+ settypetorandomresistance BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TypeTransform
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_LockOn: @ 81D7AFF
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ setalwayshitflag
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TookAim
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Sketch: @ 81D7B21
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ copymovepermanently BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_SketchedMove
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_SleepTalk: @ 81D7B40
+ attackcanceler
+ jumpifstatus USER, SLP, BattleScript_1D7B52
+ attackstring
+ ppreduce
+ jump BattleScript_1D83D6
+
+BattleScript_1D7B52: @ 81D7B52
+ printstring BATTLE_TEXT_FastAsleep
+ waitmessage 64
+ statusanimation USER
+ attackstring
+ ppreduce
+ orword 0x2024c6c, 0x800
+ selectrandommovefromusermoves BattleScript_1D7B72
+ pause 64
+ jump BattleScript_1D83D6
+
+BattleScript_1D7B72: @ 81D7B72
+ attackanimation
+ waitanimation
+ setbyte 0x2016002, 0
+ setbyte 0x20160a1, 0
+ jumptoattack USER
+
+MoveEffect_DestinyBond: @ 81D7B82
+ attackcanceler
+ attackstring
+ ppreduce
+ destinybondeffect
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_DestinyBondTake
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Flail: @ 81D7B93
+ remaininghptopower
+ jump BattleScript_1D6F14
+
+MoveEffect_Spite: @ 81D7B99
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 0
+ reducepprandom BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_ReducedBy
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_HealBell: @ 81D7BB5
+ attackcanceler
+ attackstring
+ ppreduce
+ clearstatusifnotsoundproofed
+ waitstateatk
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015D8
+ waitmessage 64
+ jumpifhalfword 1, 0x2024be6, 215, BattleScript_1D7BF2
+ jumpifbyte 5, 0x2024d23, 1, BattleScript_1D7BE1
+ printstring BATTLE_TEXT_BlocksOther
+ waitmessage 64
+
+BattleScript_1D7BE1: @ 81D7BE1
+ jumpifbyte 5, 0x2024d23, 2, BattleScript_1D7BF2
+ printstring BATTLE_TEXT_BlocksOther2
+ waitmessage 64
+
+BattleScript_1D7BF2: @ 81D7BF2
+ atk98 4
+ waitstateatk
+ jump BattleScript_1D6F62
+
+MoveEffect_TripleKick: @ 81D7BFA
+ attackcanceler
+ attackstring
+ ppreduce
+ setbyte 0x20160de, 0
+ setbyte 0x20160df, 0
+ atk8e
+ atk26 3
+
+BattleScript_1D7C0C: @ 81D7C0C
+ jumpiffainted USER, BattleScript_1D7CAF
+ jumpiffainted TARGET, BattleScript_1D7C8D
+ jumpifhalfword 0, 0x2024be8, 214, BattleScript_1D7C2E
+ jumpifstatus USER, SLP, BattleScript_1D7C8D
+
+BattleScript_1D7C2E: @ 81D7C2E
+ atk25
+ accuracycheck BattleScript_1D7C8D, 0
+ addbyte 0x20160de, 10
+ addbyte 0x20160e4, 1
+ copyarray 0x2024dec, 0x20160de, 2
+ critcalc
+ atk5
+ atk6
+ atk7
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7C8D
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ printstring BATTLE_TEXT_Terminator2
+ waitmessage 1
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpifbyte 4, 0x2024c68, 64, BattleScript_1D7C90
+ atk27 BattleScript_1D7C0C
+ jump BattleScript_1D7C90
+
+BattleScript_1D7C8D: @ 81D7C8D
+ pause 32
+
+BattleScript_1D7C90: @ 81D7C90
+ resultmessage
+ waitmessage 64
+ jumpifbyte 0, 0x20160e4, 0, BattleScript_1D7CAF
+ copyarray 0x30041c0, 0x20160e0, 6
+ printstring BATTLE_TEXT_HitMulti
+ waitmessage 64
+
+BattleScript_1D7CAF: @ 81D7CAF
+ seteffectwithchancetarget
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 14
+ atk49 0, 0
+ end
+
+MoveEffect_Thief: @ 81D7CC1
+ setbyte 0x2024d21, 31
+ jump BattleScript_1D6F14
+
+MoveEffect_MeanLook: @ 81D7CCC
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 65534
+ jumpifsecondarytstatus TARGET, S_MEAN_LOOK, BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 32
+ seteffecttarget
+ printstring BATTLE_TEXT_CantEscapeNow
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Nightmare: @ 81D7CF4
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifsecondarytstatus TARGET, S_NIGHTMARE, BattleScript_1D83D6
+ jumpifstatus TARGET, SLP, BattleScript_1D7D1A
+ jump BattleScript_1D83D6
+
+BattleScript_1D7D1A: @ 81D7D1A
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 33
+ seteffecttarget
+ printstring BATTLE_TEXT_NightmareStart
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Minimize: @ 81D7D2E
+ attackcanceler
+ setminimize
+ setbyte 0x201601e, 23
+ jump BattleScript_1D71B3
+
+MoveEffect_Curse: @ 81D7D3B
+ jumpiftype2 USER, TYPE_GHOST, BattleScript_1D7DB3
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat USER, 2, 3, 0, BattleScript_1D7D60
+ jumpifstat USER, 1, 1, 12, BattleScript_1D7D60
+ jumpifstat USER, 0, 2, 12, BattleScript_1D83D6
+
+BattleScript_1D7D60: @ 81D7D60
+ copyarray 0x2024c08, 0x2024c07, 1
+ setbyte 0x2016002, 1
+ attackanimation
+ waitanimation
+ setbyte 0x201601e, 147
+ statbuffchange 65, BattleScript_1D7D86
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D7D86: @ 81D7D86
+ setbyte 0x201601e, 17
+ statbuffchange 65, BattleScript_1D7D9A
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D7D9A: @ 81D7D9A
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D7DAE
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D7DAE: @ 81D7DAE
+ jump BattleScript_1D6F62
+
+BattleScript_1D7DB3: @ 81D7DB3
+ jumpifarraynotequal 0x2024c07, 0x2024c08, 1, BattleScript_1D7DC4
+ atk76 USER, 3
+
+BattleScript_1D7DC4: @ 81D7DC4
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ cursetarget BattleScript_1D83D6
+ orword 0x2024c6c, 0x100
+ setbyte 0x2016002, 0
+ attackanimation
+ waitanimation
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_CurseLay
+ waitmessage 64
+ faintpokemon USER, 0, 0x0
+ jump BattleScript_1D6F62
+
+MoveEffect_Endure: @ 81D7DFD
+MoveEffect_Protect: @ 81D7DFD
+ attackcanceler
+ attackstring
+ ppreduce
+ setprotect
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_40153A
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Spikes: @ 81D7E10
+ attackcanceler
+ setspikes BattleScript_1D83D4
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_SpikesScattered
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Foresight: @ 81D7E25
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ setforesight
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_IdentifiedPoke
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_PerishSong: @ 81D7E3D
+ attackcanceler
+ attackstring
+ ppreduce
+ setperishsong BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_PerishSong
+ waitmessage 64
+ setbyte 0x2016003, 0
+
+BattleScript_1D7E53: @ 81D7E53
+ jumpifability 10, ABILITY_SOUNDPROOF, BattleScript_1D7E73
+
+BattleScript_1D7E5A: @ 81D7E5A
+ addbyte 0x2016003, 1
+ jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D7E53
+ jump BattleScript_1D6F62
+
+BattleScript_1D7E73: @ 81D7E73
+ printstring BATTLE_TEXT_BlocksOther2
+ waitmessage 64
+ jump BattleScript_1D7E5A
+
+MoveEffect_Sandstorm: @ 81D7E7E
+ attackcanceler
+ attackstring
+ ppreduce
+ setsandstorm
+ jump BattleScript_1D7FFA
+
+MoveEffect_Rollout: @ 81D7E87
+ attackcanceler
+ attackstring
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D7E94
+ ppreduce
+
+BattleScript_1D7E94: @ 81D7E94
+ accuracycheck BattleScript_1D7E9B, 0
+
+BattleScript_1D7E9B: @ 81D7E9B
+ damagecalc2
+ rolloutdamagecalculation
+ jump BattleScript_1D6F44
+
+MoveEffect_Swagger: @ 81D7EA2
+ attackcanceler
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ jumpifconfusedandattackmaxed 1, BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ setbyte 0x201601e, 33
+ statbuffchange 1, BattleScript_1D7EE5
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D7EE5
+ atk47
+ playanimation TARGET, 1, 0x20160a4
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D7EE5: @ 81D7EE5
+ jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ setbyte 0x2024d21, 7
+ seteffecttarget
+ jump BattleScript_1D6F62
+
+MoveEffect_FuryCutter: @ 81D7F00
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D7F0A, 0
+
+BattleScript_1D7F0A: @ 81D7F0A
+ furycutterdamagecalculation
+ critcalc
+ atk5
+ atk6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D7F0A
+ atk7
+ jump BattleScript_1D6F48
+
+MoveEffect_Attract: @ 81D7F1F
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 0
+ tryinfatuatetarget BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_FellLove
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Frustration: @ 81D7F3B
+MoveEffect_Return: @ 81D7F3B
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ happinesstodamagecalculation
+ jump BattleScript_1D6F42
+
+MoveEffect_Present: @ 81D7F49
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ presentdamagecalculation
+
+MoveEffect_Safeguard: @ 81D7F55
+ attackcanceler
+ attackstring
+ ppreduce
+ setsafeguard
+ jump BattleScript_1D7786
+
+MoveEffect_ThawHit: @ 81D7F5E
+ setbyte 0x2024d21, 3
+ jump BattleScript_1D6F14
+
+MoveEffect_Magnitude: @ 81D7F69
+ attackcanceler
+ attackstring
+ ppreduce
+ selectnexttarget
+ magnitudedamagecalculation
+ pause 32
+ printstring BATTLE_TEXT_MagnitudeCount
+ waitmessage 64
+ jump BattleScript_1D80FD
+
+MoveEffect_BatonPass: @ 81D7F7C
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifcannotswitch 129, BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ openpartyscreen USER, BattleScript_1D83D6
+ atke2 USER
+ waitstateatk
+ atk51 USER, 2
+ atk58 USER
+ switch1 USER
+ switch2 USER
+ atk73 USER
+ printstring 3
+ switch3 USER, 1
+ waitstateatk
+ atk52 USER
+ jump BattleScript_1D6F62
+
+MoveEffect_RapidSpin: @ 81D7FA9
+ setbyte 0x2024d21, 163
+ jump BattleScript_1D6F14
+
+MoveEffect_Sonicboom: @ 81D7FB4
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ atk6
+ bicbyte 0x2024c68, 6
+ setbyte 0x2024bec, 20
+ setbyte 0x2024bed, 0
+ setbyte 0x2024bee, 0
+ setbyte 0x2024bef, 0
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Moonlight: @ 81D7FE3
+MoveEffect_MorningSun: @ 81D7FE3
+MoveEffect_Synthesis: @ 81D7FE3
+ attackcanceler
+ attackstring
+ ppreduce
+ recoverbasedonsunlight BattleScript_1D83B5
+ jump BattleScript_1D839B
+
+MoveEffect_HiddenPower: @ 81D7FF0
+ hiddenpowerdamagecalculation
+ jump BattleScript_1D6F14
+
+MoveEffect_RainDance: @ 81D7FF6
+ attackcanceler
+ attackstring
+ ppreduce
+ setrain
+
+BattleScript_1D7FFA: @ 81D7FFA
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_40151C
+ waitmessage 64
+ callatk BattleScript_1D9761
+ jump BattleScript_1D6F62
+
+MoveEffect_SunnyDay: @ 81D800E
+ attackcanceler
+ attackstring
+ ppreduce
+ setsunny
+ jump BattleScript_1D7FFA
+
+MoveEffect_DefenseUpHit: @ 81D8017
+ setbyte 0x2024d21, 80
+ jump BattleScript_1D6F14
+
+MoveEffect_AttackUpHit: @ 81D8022
+ setbyte 0x2024d21, 79
+ jump BattleScript_1D6F14
+
+MoveEffect_AllStatsUpHit: @ 81D802D
+ setbyte 0x2024d21, 98
+ jump BattleScript_1D6F14
+
+MoveEffect_BellyDrum: @ 81D8038
+ attackcanceler
+ attackstring
+ ppreduce
+ maxattackhalvehp BattleScript_1D83D6
+ orword 0x2024c6c, 0x100
+ attackanimation
+ waitanimation
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_CutHPMaxATK
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_PsychUp: @ 81D805A
+ attackcanceler
+ attackstring
+ ppreduce
+ copyfoestats BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_CopyStatChanges
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_MirrorCoat: @ 81D806F
+ attackcanceler
+ mirrorcoatdamagecalculator BattleScript_1D83D4
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ damagecalc2
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_SkullBash: @ 81D8085
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D
+ jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
+ setbyte 0x2016055, 2
+ callatk BattleScript_1D756C
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D80CF
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D80CF
+ atk47
+ playanimation USER, 1, 0x20160a4
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D80CF: @ 81D80CF
+ jump BattleScript_1D6F62
+
+MoveEffect_Twister: @ 81D80D4
+ jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D80EE
+ orword 0x2024c6c, 0x10000
+ setbyte 0x201601f, 2
+
+BattleScript_1D80EE: @ 81D80EE
+ setbyte 0x2024d21, 8
+ jump BattleScript_1D6F14
+
+MoveEffect_Earthquake: @ 81D80F9
+ attackcanceler
+ attackstring
+ ppreduce
+ selectnexttarget
+
+BattleScript_1D80FD: @ 81D80FD
+ atk25
+ jumpifspecialstatusflag TARGET, 0x80, 1, BattleScript_1D811D
+ orword 0x2024c6c, 0x20000
+ setbyte 0x201601f, 2
+ jump BattleScript_1D812C
+
+BattleScript_1D811D: @ 81D811D
+ bicword 0x2024c6c, 0x20000
+ setbyte 0x201601f, 1
+
+BattleScript_1D812C: @ 81D812C
+ accuracycheck BattleScript_1D8165, 0
+ critcalc
+ atk5
+ atk6
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ printstring BATTLE_TEXT_Terminator2
+ waitmessage 1
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpwhiletargetvalid BattleScript_1D80FD
+ end
+
+BattleScript_1D8165: @ 81D8165
+ pause 32
+ atk6
+ missmessage
+ resultmessage
+ waitmessage 64
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jumpwhiletargetvalid BattleScript_1D80FD
+ end
+
+MoveEffect_FutureSight: @ 81D817D
+ attackcanceler
+ attackstring
+ ppreduce
+ setfutureattack BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015E2
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Gust: @ 81D8194
+ jumpifspecialstatusflag TARGET, 0x40, 1, BattleScript_1D6F14
+ orword 0x2024c6c, 0x10000
+ setbyte 0x201601f, 2
+ jump BattleScript_1D6F14
+
+MoveEffect_FlinchHit2: @ 81D81B3
+ jumpifspecialstatusflag TARGET, 0x100, 1, BattleScript_1D80EE
+ setbyte 0x201601f, 2
+ jump BattleScript_1D80EE
+
+MoveEffect_Solarbeam: @ 81D81C9
+ jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_1D81E1
+ jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_1D81E1
+ jumpifhalfword 4, 0x2024db8, 96, BattleScript_1D8209
+
+BattleScript_1D81E1: @ 81D81E1
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D753D
+ jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D753D
+ setbyte 0x2016055, 1
+ callatk BattleScript_1D756C
+ jump BattleScript_1D6F62
+
+BattleScript_1D8209: @ 81D8209
+ orword 0x2024c6c, 0x8000000
+ setbyte 0x2024d21, 76
+ seteffecttarget
+ ppreduce
+ jump BattleScript_1D753D
+
+MoveEffect_Thunder: @ 81D821F
+ setbyte 0x2024d21, 5
+ orword 0x2024c6c, 0x10000
+ jump BattleScript_1D6F14
+
+MoveEffect_Teleport: @ 81D8233
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D83D6
+ atk76 USER, 2
+ jumpifbyte 0, 0x2024d1e, 1, BattleScript_1D83D6
+ jumpifbyte 0, 0x2024d1e, 2, BattleScript_1D8839
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_FledBattle
+ waitmessage 64
+ setbyte 0x2024d26, 5
+ jump BattleScript_1D6F62
+
+MoveEffect_BeatUp: @ 81D826E
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ pause 32
+ ppreduce
+ setbyte 0x2024d1e, 0
+
+BattleScript_1D8281: @ 81D8281
+ atk25
+ beatupcalculation BattleScript_1D82C4, BattleScript_1D83D6
+ printstring BATTLE_TEXT_PokeAttack
+ critcalc
+ jumpifbyte 1, 0x2024c0d, 2, BattleScript_1D829C
+ manipulatedamage 2
+
+BattleScript_1D829C: @ 81D829C
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ jump BattleScript_1D8281
+
+BattleScript_1D82C4: @ 81D82C4
+ end
+
+MoveEffect_Fly: @ 81D82C5
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8333
+ jumpifword 4, 0x2024c6c, 0x200, BattleScript_1D8333
+ jumpifhalfword 0, 0x2024be6, 19, BattleScript_1D8322
+ jumpifhalfword 0, 0x2024be6, 291, BattleScript_1D8317
+ jumpifhalfword 0, 0x2024be6, 340, BattleScript_1D830C
+ setbyte 0x2016055, 5
+ jump BattleScript_1D8328
+
+BattleScript_1D830C: @ 81D830C
+ setbyte 0x2016055, 7
+ jump BattleScript_1D8328
+
+BattleScript_1D8317: @ 81D8317
+ setbyte 0x2016055, 6
+ jump BattleScript_1D8328
+
+BattleScript_1D8322: @ 81D8322
+ setbyte 0x2016055, 4
+
+BattleScript_1D8328: @ 81D8328
+ callatk BattleScript_1D756C
+ hidepreattack
+ jump BattleScript_1D6F62
+
+BattleScript_1D8333: @ 81D8333
+ attackcanceler
+ setbyte 0x2024d21, 12
+ setbyte 0x2016002, 1
+ clearstatus USER
+ orword 0x2024c6c, 0x800
+ jumpifhalfword 1, 0x2024be6, 340, BattleScript_1D835D
+ setbyte 0x2024d21, 5
+
+BattleScript_1D835D: @ 81D835D
+ accuracycheck BattleScript_1D836A, 0
+ unhidepostattack
+ jump BattleScript_1D6F42
+
+BattleScript_1D836A: @ 81D836A
+ unhidepostattack
+ jump BattleScript_1D6F72
+
+MoveEffect_DefenseCurl: @ 81D8370
+ attackcanceler
+ attackstring
+ ppreduce
+ setcurled
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D838D
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D71D8
+ attackanimation
+ waitanimation
+
+BattleScript_1D838D: @ 81D838D
+ jump BattleScript_1D71D0
+
+MoveEffect_Softboiled: @ 81D8392
+ attackcanceler
+ attackstring
+ ppreduce
+ setdamageasrestorehalfmaxhp BattleScript_1D83B5, 0
+
+BattleScript_1D839B:: @ 81D839B
+ attackanimation
+ waitanimation
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ printstring BATTLE_TEXT_RegainedHealth
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D83B5:: @ 81D83B5
+ pause 32
+ printstring BATTLE_TEXT_HPFull
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_FakeOut: @ 81D83C3
+ attackcanceler
+ jumpifnotfirstturn BattleScript_1D83D4
+ setbyte 0x2024d21, 136
+ jump BattleScript_1D6F14
+
+BattleScript_1D83D4: @ 81D83D4
+ attackstring
+
+BattleScript_1D83D5: @ 81D83D5
+ ppreduce
+
+BattleScript_1D83D6:: @ 81D83D6
+ pause 32
+ orbyte 0x2024c68, 32
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D83E8: @ 81D83E8
+ pause 32
+ orbyte 0x2024c68, 8
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Uproar: @ 81D83FA
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ setbyte 0x2024d21, 74
+ attackstring
+ jumpifsecondarytstatus USER, S_CONTINUE, BattleScript_1D8414
+ ppreduce
+
+BattleScript_1D8414: @ 81D8414
+ nop3
+ jump BattleScript_1D6F44
+
+MoveEffect_Stockpile: @ 81D841A
+ attackcanceler
+ attackstring
+ ppreduce
+ stockpile
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_40155E
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_SpitUp: @ 81D842D
+ attackcanceler
+ jumpifbyte 0, 0x2024d24, 1, BattleScript_1D845C
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D6F72, 0
+ stockpiletobasedamage BattleScript_1D844E
+ atk6
+ atk69
+ jump BattleScript_1D6F48
+
+BattleScript_1D844E: @ 81D844E
+ pause 32
+ printstring BATTLE_TEXT_SpitUpFail
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D845C: @ 81D845C
+ attackstring
+ ppreduce
+ pause 64
+ stockpiletobasedamage BattleScript_1D844E
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Swallow: @ 81D846F
+ attackcanceler
+ attackstring
+ ppreduce
+ stockpiletohprecovery BattleScript_1D847C
+ jump BattleScript_1D839B
+
+BattleScript_1D847C: @ 81D847C
+ pause 32
+ printfromtable BattleTextList_401566
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Hail: @ 81D848C
+ attackcanceler
+ attackstring
+ ppreduce
+ sethail
+ jump BattleScript_1D7FFA
+
+MoveEffect_Torment: @ 81D8495
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 0
+ settorment BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TormentSubject
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Flatter: @ 81D84B1
+ attackcanceler
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F6C
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ jumpifconfusedandattackmaxed 4, BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ setbyte 0x201601e, 20
+ statbuffchange 1, BattleScript_1D84F4
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D84F4
+ atk47
+ playanimation TARGET, 1, 0x20160a4
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D84F4: @ 81D84F4
+ jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D98E5
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ setbyte 0x2024d21, 7
+ seteffecttarget
+ jump BattleScript_1D6F62
+
+MoveEffect_WillOWisp: @ 81D850F
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifstatus TARGET, BRN, BattleScript_1D8575
+ jumpiftype TARGET, TYPE_FIRE, BattleScript_1D83E8
+ jumpifability TARGET, ABILITY_WATER_VEIL, BattleScript_1D855B
+ jumpifstatus TARGET, SLP | PSN | BRN | FRZ | PAR | TOX, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ attackanimation
+ waitanimation
+ setbyte 0x2024d21, 3
+ seteffecttarget
+ jump BattleScript_1D6F62
+
+BattleScript_1D855B: @ 81D855B
+ copyarray 0x2024c0a, 0x2024c08, 1
+ setbyte 0x2024d23, 0
+ callatk BattleScript_1D98A5
+ jump BattleScript_1D6F62
+
+BattleScript_1D8575: @ 81D8575
+ pause 32
+ printstring BATTLE_TEXT_AlreadyBurned
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Memento: @ 81D8583
+ attackcanceler
+ jumpifbyte 0, 0x2024d24, 1, BattleScript_1D860A
+ attackstring
+ ppreduce
+ jumpifattackandspecialattackcannotfall BattleScript_1D83D6
+ setuserhptozero
+ attackanimation
+ waitanimation
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D85FF
+ setbyte 0x20160dc, 0
+ playstatchangeanimation TARGET, 18, 7
+ playstatchangeanimation TARGET, 2, 3
+ setbyte 0x201601e, 161
+ statbuffchange 1, BattleScript_1D85D0
+ jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85D0
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D85D0: @ 81D85D0
+ playstatchangeanimation TARGET, 16, 3
+ setbyte 0x201601e, 164
+ statbuffchange 1, BattleScript_1D85F3
+ jumpifbyte 2, 0x2024d23, 1, BattleScript_1D85F3
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D85F3: @ 81D85F3
+ faintpokemon USER, 0, 0x0
+ jump BattleScript_1D6F62
+
+BattleScript_1D85FF: @ 81D85FF
+ printstring BATTLE_TEXT_NoEffect
+ waitmessage 64
+ jump BattleScript_1D85F3
+
+BattleScript_1D860A: @ 81D860A
+ attackstring
+ ppreduce
+ jumpifattackandspecialattackcannotfall BattleScript_1D8611
+
+BattleScript_1D8611: @ 81D8611
+ setuserhptozero
+ pause 64
+ missmessage
+ resultmessage
+ waitmessage 64
+ faintpokemon USER, 0, 0x0
+ jump BattleScript_1D6F62
+
+MoveEffect_Facade: @ 81D8626
+ jumpifstatus USER, PSN | BRN | PAR | TOX, BattleScript_1D8635
+ jump BattleScript_1D6F14
+
+BattleScript_1D8635: @ 81D8635
+ setbyte 0x201601f, 2
+ jump BattleScript_1D6F14
+
+MoveEffect_FocusPunch: @ 81D8640
+ attackcanceler
+ jumpifnodamage BattleScript_1D6F3B
+ ppreduce
+ printstring BATTLE_TEXT_LostFocus
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Smellingsalt: @ 81D8652
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D6F14
+ setbyte 0x2024d21, 164
+ jumpifstatus TARGET, PAR, BattleScript_1D8671
+ jump BattleScript_1D6F14
+
+BattleScript_1D8671: @ 81D8671
+ setbyte 0x201601f, 2
+ jump BattleScript_1D6F14
+
+MoveEffect_FollowMe: @ 81D867C
+ attackcanceler
+ attackstring
+ ppreduce
+ setforcedtarget
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_CenterAttention
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_NaturePower: @ 81D868D
+ attackcanceler
+ attackstring
+ pause 32
+ callterrainattack
+ printstring BATTLE_TEXT_NaturePower
+ waitmessage 64
+ return
+
+MoveEffect_Charge: @ 81D869A
+ attackcanceler
+ attackstring
+ ppreduce
+ setcharge
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_ChargingPower
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Taunt: @ 81D86AB
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 0
+ settaunt BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TauntFell
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_HelpingHand: @ 81D86C7
+ attackcanceler
+ attackstring
+ ppreduce
+ sethelpinghand BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_ReadyToHelp
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Trick: @ 81D86DC
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ accuracycheck BattleScript_1D83D6, 0
+ itemswap BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_SwitchedItems
+ waitmessage 64
+ printfromtable BattleTextList_401642
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_RolePlay: @ 81D870A
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 65535
+ copyability BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_CopiedObject
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Wish: @ 81D8726
+ attackcanceler
+ attackstring
+ ppreduce
+ atkd4 0, BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ jump BattleScript_1D6F62
+
+MoveEffect_Assist: @ 81D8736
+ attackcanceler
+ attackstring
+ assistattackselect BattleScript_1D83D5
+ attackanimation
+ waitanimation
+ setbyte 0x2016002, 0
+ setbyte 0x20160a1, 0
+ jumptoattack USER
+
+MoveEffect_Ingrain: @ 81D874D
+ attackcanceler
+ attackstring
+ ppreduce
+ setroots BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_PlantedRoots
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Superpower: @ 81D8762
+ setbyte 0x2024d21, 229
+ jump BattleScript_1D6F14
+
+MoveEffect_MagicCoat: @ 81D876D
+ attackcanceler
+ setmagiccoat BattleScript_1D83D4
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_ShroudedItself
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Recycle: @ 81D8782
+ attackcanceler
+ attackstring
+ ppreduce
+ recycleitem BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_FoundOne
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Revenge: @ 81D8797
+ doubledamagedealtifdamaged
+ jump BattleScript_1D6F14
+
+MoveEffect_BrickBreak: @ 81D879D
+ attackcanceler
+ accuracycheck BattleScript_1D6F72, 0
+ attackstring
+ ppreduce
+ removereflectlightscreen
+ critcalc
+ atk5
+ atk6
+ atk7
+ jumpifbyte 0, 0x2016002, 0, BattleScript_1D87BD
+ bicbyte 0x2024c68, 9
+
+BattleScript_1D87BD: @ 81D87BD
+ attackanimation
+ waitanimation
+ jumpifbyte 3, 0x2016002, 2, BattleScript_1D87D0
+ printstring BATTLE_TEXT_BrokeWall
+ waitmessage 64
+
+BattleScript_1D87D0: @ 81D87D0
+ damagecalc2
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ seteffectwithchancetarget
+ faintpokemon TARGET, 0, 0x0
+ jump BattleScript_1D6F62
+
+MoveEffect_Yawn: @ 81D87EE
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifability TARGET, ABILITY_VITAL_SPIRIT, BattleScript_1D882F
+ jumpifability TARGET, ABILITY_INSOMNIA, BattleScript_1D882F
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D83D6
+ jumpifhalverset TARGET, 32, BattleScript_1D9037
+ accuracycheck BattleScript_1D83D6, 65535
+ jumpifcannotsleep BattleScript_1D83D6
+ setyawn BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_DrowsyMade
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D882F: @ 81D882F
+ copyarray 0x2016003, 0x20160f8, 1
+
+BattleScript_1D8839: @ 81D8839
+ pause 32
+ printstring BATTLE_TEXT_MadeIneffective2
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_KnockOff: @ 81D8847
+ setbyte 0x2024d21, 54
+ jump BattleScript_1D6F14
+
+MoveEffect_Endeavor: @ 81D8852
+ attackcanceler
+ attackstring
+ ppreduce
+ setdamagetohealthdifference BattleScript_1D83D6
+ copyarray 0x2024bf0, 0x2024bec, 4
+ accuracycheck BattleScript_1D6F77, 0
+ atk6
+ jumpifbyte 4, 0x2024c68, 41, BattleScript_1D6F48
+ bicbyte 0x2024c68, 6
+ copyarray 0x2024bec, 0x2024bf0, 4
+ atk69
+ jump BattleScript_1D6F48
+
+MoveEffect_Eruption: @ 81D888D
+ scaledamagebyhealthratio
+ jump BattleScript_1D6F14
+
+MoveEffect_SkillSwap: @ 81D8893
+ attackcanceler
+ attackstring
+ ppreduce
+ accuracycheck BattleScript_1D83D6, 65535
+ abilityswap BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_AbilitySwap
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Imprison: @ 81D88AF
+ attackcanceler
+ attackstring
+ ppreduce
+ imprisoneffect BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_SealedMove
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Refresh: @ 81D88C4
+ attackcanceler
+ attackstring
+ ppreduce
+ cureifburnedparalysedorpoisoned BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_StatusNormal
+ waitmessage 64
+ atk98 1
+ jump BattleScript_1D6F62
+
+MoveEffect_Grudge: @ 81D88DB
+ attackcanceler
+ attackstring
+ ppreduce
+ setgrudge BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_GrudgeBear
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_Snatch: @ 81D88F0
+ attackcanceler
+ setstealstatchange BattleScript_1D83D4
+ attackstring
+ ppreduce
+ attackanimation
+ waitanimation
+ pause 32
+ printstring BATTLE_TEXT_AwaitMove
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_LowKick: @ 81D8908
+ attackcanceler
+ attackstring
+ ppreduce
+ weightdamagecalculation
+ accuracycheck BattleScript_1D6F77, 0
+ jump BattleScript_1D6F44
+
+MoveEffect_SecretPower: @ 81D8918
+ naturepowereffect
+ jump BattleScript_1D6F14
+
+MoveEffect_DoubleEdge: @ 81D891E
+ setbyte 0x2024d21, 230
+ jump BattleScript_1D6F14
+
+MoveEffect_TeeterDance: @ 81D8929
+ attackcanceler
+ attackstring
+ ppreduce
+ setbyte 0x2024c08, 0
+
+BattleScript_1D8932: @ 81D8932
+ atk25
+ setbyte 0x2024d21, 7
+ jumpifarrayequal 0x2024c07, 0x2024c08, 1, BattleScript_1D8978
+ jumpifability TARGET, ABILITY_OWN_TEMPO, BattleScript_1D8996
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D89B2
+ jumpifsecondarytstatus TARGET, S_CONFUSED, BattleScript_1D89C0
+ accuracycheck BattleScript_1D89CE, 0
+ jumpifhalverset TARGET, 32, BattleScript_1D89A4
+ attackanimation
+ waitanimation
+ seteffecttarget
+ resultmessage
+ waitmessage 64
+
+BattleScript_1D8978: @ 81D8978
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ addbyte 0x2024c08, 1
+ jumpifarraynotequal 0x2024c08, 0x2024a68, 1, BattleScript_1D8932
+ end
+
+BattleScript_1D8996: @ 81D8996
+ pause 32
+ printstring BATTLE_TEXT_PreventedConfusion
+ waitmessage 64
+ jump BattleScript_1D8978
+
+BattleScript_1D89A4: @ 81D89A4
+ pause 32
+ printstring BATTLE_TEXT_SafeguardActive
+ waitmessage 64
+ jump BattleScript_1D8978
+
+BattleScript_1D89B2: @ 81D89B2
+ pause 32
+ printstring BATTLE_TEXT_Failed
+ waitmessage 64
+ jump BattleScript_1D8978
+
+BattleScript_1D89C0: @ 81D89C0
+ pause 32
+ printstring BATTLE_TEXT_AlreadyConfused
+ waitmessage 64
+ jump BattleScript_1D8978
+
+BattleScript_1D89CE: @ 81D89CE
+ resultmessage
+ waitmessage 64
+ jump BattleScript_1D8978
+
+MoveEffect_MudSport: @ 81D89D7
+MoveEffect_WaterSport: @ 81D89D7
+ attackcanceler
+ attackstring
+ ppreduce
+ settypebasedhalvers BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printfromtable BattleTextList_4015D4
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_PoisonFang: @ 81D89EE
+ setbyte 0x2024d21, 6
+ jump BattleScript_1D6F14
+
+MoveEffect_WeatherBall: @ 81D89F9
+ seteffectbyweather
+ jump BattleScript_1D6F14
+
+MoveEffect_Overheat: @ 81D89FF
+ setbyte 0x2024d21, 251
+ jump BattleScript_1D6F14
+
+MoveEffect_Tickle: @ 81D8A0A
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat TARGET, 2, 1, 0, BattleScript_1D8A1F
+ jumpifstat TARGET, 0, 2, 0, BattleScript_1D8A7D
+
+BattleScript_1D8A1F: @ 81D8A1F
+ accuracycheck BattleScript_1D83D6, 0
+ attackanimation
+ waitanimation
+ setbyte 0x20160dc, 0
+ playstatchangeanimation TARGET, 6, 5
+ playstatchangeanimation TARGET, 2, 1
+ setbyte 0x201601e, 145
+ statbuffchange 1, BattleScript_1D8A55
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A55
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D8A55: @ 81D8A55
+ playstatchangeanimation TARGET, 4, 1
+ setbyte 0x201601e, 146
+ statbuffchange 1, BattleScript_1D8A78
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8A78
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D8A78: @ 81D8A78
+ jump BattleScript_1D6F62
+
+BattleScript_1D8A7D: @ 81D8A7D
+ pause 32
+ orbyte 0x2024c68, 32
+ printstring BATTLE_TEXT_StatNoLower
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_CosmicPower: @ 81D8A91
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat USER, 3, 2, 12, BattleScript_1D8AA6
+ jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB
+
+BattleScript_1D8AA6: @ 81D8AA6
+ attackanimation
+ waitanimation
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 36, 0
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D8AD1
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AD1
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8AD1: @ 81D8AD1
+ setbyte 0x201601e, 21
+ statbuffchange 65, BattleScript_1D8AF0
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8AF0
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8AF0: @ 81D8AF0
+ jump BattleScript_1D6F62
+
+MoveEffect_SkyUppercut: @ 81D8AF5
+ orword 0x2024c6c, 0x10000
+ jump BattleScript_1D6F14
+
+MoveEffect_BulkUp: @ 81D8B03
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat USER, 3, 1, 12, BattleScript_1D8B18
+ jumpifstat USER, 0, 2, 12, BattleScript_1D8BCB
+
+BattleScript_1D8B18: @ 81D8B18
+ attackanimation
+ waitanimation
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 6, 0
+ setbyte 0x201601e, 17
+ statbuffchange 65, BattleScript_1D8B43
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B43
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8B43: @ 81D8B43
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D8B62
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8B62
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8B62: @ 81D8B62
+ jump BattleScript_1D6F62
+
+MoveEffect_CalmMind: @ 81D8B67
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat USER, 3, 4, 12, BattleScript_1D8B7C
+ jumpifstat USER, 0, 5, 12, BattleScript_1D8BCB
+
+BattleScript_1D8B7C: @ 81D8B7C
+ attackanimation
+ waitanimation
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 48, 0
+ setbyte 0x201601e, 20
+ statbuffchange 65, BattleScript_1D8BA7
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BA7
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8BA7: @ 81D8BA7
+ setbyte 0x201601e, 21
+ statbuffchange 65, BattleScript_1D8BC6
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8BC6
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8BC6: @ 81D8BC6
+ jump BattleScript_1D6F62
+
+BattleScript_1D8BCB: @ 81D8BCB
+ pause 32
+ orbyte 0x2024c68, 32
+ printstring BATTLE_TEXT_StatNoHigher
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+MoveEffect_DragonDance: @ 81D8BDF
+ attackcanceler
+ attackstring
+ ppreduce
+ jumpifstat USER, 3, 1, 12, BattleScript_1D8BF4
+ jumpifstat USER, 0, 3, 12, BattleScript_1D8BCB
+
+BattleScript_1D8BF4: @ 81D8BF4
+ attackanimation
+ waitanimation
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 10, 0
+ setbyte 0x201601e, 17
+ statbuffchange 65, BattleScript_1D8C1F
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C1F
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8C1F: @ 81D8C1F
+ setbyte 0x201601e, 19
+ statbuffchange 65, BattleScript_1D8C3E
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8C3E
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D8C3E: @ 81D8C3E
+ jump BattleScript_1D6F62
+
+MoveEffect_Camouflage: @ 81D8C43
+ attackcanceler
+ attackstring
+ ppreduce
+ settypetoterrain BattleScript_1D83D6
+ attackanimation
+ waitanimation
+ printstring BATTLE_TEXT_TypeTransform
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D8C58:: @ 81D8C58
+ atk56 1
+ pause 64
+ atk1a 1
+ atk1b 1
+ printstring BATTLE_TEXT_AttackingFainted
+ return
+
+gUnknown_081D8C65:: @ 81D8C65
+ atk56 0
+ pause 64
+ atk1a 0
+ atk1b 0
+ printstring BATTLE_TEXT_DefendingFainted
+ return
+
+gUnknown_081D8C72:: @ 81D8C72
+ setbyte 0x201600f, 0
+ atk23 0
+ end2
+
+gUnknown_081D8C7B:: @ 81D8C7B
+ atk24 BattleScript_1D8D87
+ jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8D86
+ jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D8CC2
+ jumpifword 5, 0x2024c6c, 0x400000, BattleScript_1D8CC2
+ printstring BATTLE_TEXT_UseNext
+ setbyte 0x2024d1e, 0
+ atk67
+ jumpifbyte 0, 0x2024d1f, 0, BattleScript_1D8CC2
+ atk72 BattleScript_1D8D86
+ printstring BATTLE_TEXT_CantEscape
+
+BattleScript_1D8CC2: @ 81D8CC2
+ openpartyscreen 3, BattleScript_1D8D86
+ atk51 3, 2
+ jumpifhalfword 5, 0x20239f8, 8, BattleScript_1D8D66
+ jumpifhalfword 4, 0x20239f8, 2, BattleScript_1D8D66
+ jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8D66
+ jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D66
+ jumpifword 4, 0x2024c6c, 0x400000, BattleScript_1D8D66
+ jumpifbyte 0, 0x2016084, 1, BattleScript_1D8D66
+ jumpifcannotswitch USER, BattleScript_1D8D66
+ printstring BATTLE_TEXT_WillSwitch
+ setbyte 0x2024d1e, 0
+ atk67
+ jumpifbyte 0, 0x2024d1f, 1, BattleScript_1D8D66
+ atk6e
+ openpartyscreen 129, BattleScript_1D8D66
+ atk51 USER, 2
+ jumpifbyte 0, 0x2024d1e, 6, BattleScript_1D8D66
+ atk6b
+ atk76 USER, 5
+ atk74 1
+ printstring 2
+ atke2 USER
+ waitstateatk
+ atk4b
+ waitstateatk
+ atk61 1
+ switch1 USER
+ switch2 USER
+ atk73 USER
+ printstring 3
+ atk62 1
+ switch3 USER, 0
+ waitstateatk
+ atk52 USER
+ atk6d
+
+BattleScript_1D8D66: @ 81D8D66
+ atk61 3
+ switch1 3
+ switch2 3
+ atk73 3
+ printstring 3
+ atk62 3
+ switch3 3, 0
+ waitstateatk
+ atk52 3
+ jumpifhalfword 4, 0x20239f8, 1, BattleScript_1D8D86
+ atk68
+
+BattleScript_1D8D86: @ 81D8D86
+ end2
+
+BattleScript_1D8D87: @ 81D8D87
+ openpartyscreen 5, BattleScript_1D8D8D
+
+BattleScript_1D8D8D: @ 81D8D8D
+ atk51 3, 0
+ openpartyscreen 6, BattleScript_1D8DBD
+ atk51 3, 0
+
+BattleScript_1D8D99: @ 81D8D99
+ atk51 3, 2
+ atk61 3
+ switch1 3
+ switch2 3
+ atk73 3
+ printstring 3
+ atk62 3
+ switch3 3, 0
+ waitstateatk
+ atk52 5
+ jumpifarraynotequal 0x2024c09, 0x2024a68, 1, BattleScript_1D8D99
+
+BattleScript_1D8DBD: @ 81D8DBD
+ end2
+
+gUnknown_081D8DBE:: @ 81D8DBE
+ printstring BATTLE_TEXT_PlayerDefeatedTrainer2
+ atk53 1
+ waitstateatk
+ printstring BATTLE_TEXT_UnknownString
+ atk5d
+ printstring BATTLE_TEXT_WinningPrize
+ waitmessage 64
+
+gUnknown_081D8DCE:: @ 81D8DCE
+ givemoney
+ pickupitemcalculation
+ end2
+
+gUnknown_081D8DD1:: @ 81D8DD1
+ jumpifhalfword 4, 0x20239f8, 256, BattleScript_1D8E01
+ jumpifhalfword 4, 0x20239f8, 2048, BattleScript_1D8E01
+ jumpifhalfword 0, 0x202ff5e, 1024, BattleScript_1D8E01
+ printstring BATTLE_TEXT_OutOfUsablePoke
+ waitmessage 64
+ printstring BATTLE_TEXT_WhitedOut
+ waitmessage 64
+
+BattleScript_1D8E01: @ 81D8E01
+ end2
+
+gUnknown_081D8E02:: @ 81D8E02
+ printstring 5
+ waitmessage 64
+ atk57
+ waitmessage 64
+ end2
+
+gUnknown_081D8E0D:: @ 81D8E0D
+ printstring BATTLE_TEXT_PlayerDefeatedTrainer2
+ atk53 1
+ waitstateatk
+ end2
+
+gUnknown_081D8E14:: @ 81D8E14
+ playanimation USER, 8, 0x0
+ printstring BATTLE_TEXT_FledUsingItem
+ waitmessage 64
+ end2
+
+gUnknown_081D8E22:: @ 81D8E22
+ printstring BATTLE_TEXT_FledUsingOther
+ waitmessage 64
+ end2
+
+gUnknown_081D8E29:: @ 81D8E29
+ printstring BATTLE_TEXT_GotAwaySafely
+ waitmessage 64
+ end2
+
+gUnknown_081D8E30:: @ 81D8E30
+ printstring BATTLE_TEXT_FledWild
+ waitmessage 64
+ end2
+
+gUnknown_081D8E37:: @ 81D8E37
+ printstring BATTLE_TEXT_NoRunning
+ end2
+
+gUnknown_081D8E3B:: @ 81D8E3B
+ printfromtable BattleTextList_401512
+ waitmessage 64
+ end2
+
+gUnknown_081D8E44:: @ 81D8E44
+ printfromtable2 BattleTextList_401512
+ atk44
+
+gUnknown_081D8E4A:: @ 81D8E4A
+ printstring2 BATTLE_TEXT_BoxFull
+ atk44
+
+gUnknown_081D8E4E:: @ 81D8E4E
+ atk74 1
+ printstring 2
+ setbyte 0x201601f, 2
+ jumpifbyte 4, 0x20239f8, 1, BattleScript_1D8E6B
+ atk26 1
+ jump BattleScript_1D8E6D
+
+BattleScript_1D8E6B: @ 81D8E6B
+ atk26 2
+
+BattleScript_1D8E6D: @ 81D8E6D
+ atkba BattleScript_1D8E7A
+ atk5f
+ atkab
+ callatk BattleScript_1D8EAD
+ atk5f
+
+BattleScript_1D8E7A: @ 81D8E7A
+ atk27 BattleScript_1D8E6D
+ atke2 USER
+ waitstateatk
+ atk4b
+ waitstateatk
+ atk61 1
+ atk51 USER, 1
+ switch1 USER
+ switch2 USER
+ atk73 USER
+ printstring 3
+ atk62 1
+ switch3 USER, 0
+ waitstateatk
+ atk52 USER
+ setbyte 0x201600c, 4
+ atk49 1, 0
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ end2
+
+BattleScript_1D8EAD: @ 81D8EAD
+ pause 32
+ attackstring
+ ppreduce
+ critcalc
+ atk5
+ atk6
+ atk7
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ critmessage
+ waitmessage 64
+ resultmessage
+ waitmessage 64
+ faintpokemon TARGET, 0, 0x0
+ setbyte 0x201600c, 3
+ atk49 2, 6
+ atk76 TARGET, 4
+ jumpifbyte 0, 0x2024d1e, 0, BattleScript_1D8EEE
+ setbyte 0x201600f, 0
+ atk23 0
+
+BattleScript_1D8EEE: @ 81D8EEE
+ return
+
+gUnknown_081D8EEF:: @ 81D8EEF
+ pause 32
+ return
+
+gUnknown_081D8EF3:: @ 81D8EF3
+ atk55 0xe10016f
+ attackcanceler
+ setbyte 0x201609c, 0
+ atk6c
+ checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 1
+ jump BattleScript_1D8F19
+
+BattleScript_1D8F0F: @ 81D8F0F
+ checkiflearnmoveinbattle BattleScript_1D8F4F, BattleScript_1D8F61, 0
+
+BattleScript_1D8F19: @ 81D8F19
+ atk71
+ printstring BATTLE_TEXT_TryingToLearnMove
+ printstring BATTLE_TEXT_CantLearnMore
+ printstring BATTLE_TEXT_DeleteMove
+ waitstateatk
+ setbyte 0x201601a, 0
+ atk5a BattleScript_1D8F46
+ printstring BATTLE_TEXT_StopLearning
+ waitstateatk
+ setbyte 0x201601a, 0
+ atk5b BattleScript_1D8F19
+ printstring BATTLE_TEXT_DidNotLearn
+ jump BattleScript_1D8F0F
+
+BattleScript_1D8F46: @ 81D8F46
+ printstring BATTLE_TEXT_MoveForget123
+ printstring BATTLE_TEXT_DeletedMove
+ printstring BATTLE_TEXT_MoveForgetAnd
+
+BattleScript_1D8F4F: @ 81D8F4F
+ atk71
+ atk55 0xf10016f
+ attackcanceler
+ waitmessage 64
+ atk76 USER, 6
+ jump BattleScript_1D8F0F
+
+BattleScript_1D8F61: @ 81D8F61
+ return
+
+gUnknown_081D8F62:: @ 81D8F62
+ printfromtable BattleTextList_401534
+ waitmessage 64
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D8F7C
+ playanimation USER, 10, 0x0
+
+BattleScript_1D8F7C: @ 81D8F7C
+ end2
+
+gUnknown_081D8F7D:: @ 81D8F7D
+ printfromtable BattleTextList_401528
+ waitmessage 64
+ atk46 1, 0x20160a4, 0x0
+ setbyte 0x2024d1e, 0
+
+BattleScript_1D8F95: @ 81D8F95
+ atk32 0x2024c07, 0x2024a7a, 0x2024d1e, 1
+ weatherdamage
+ jumpifword 0, 0x2024bec, 0x0, BattleScript_1D8FD6
+ printfromtable BattleTextList_40152C
+ waitmessage 64
+ orword 0x2024c6c, 0x1100120
+ missmessage
+ atk5c USER
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ atk24 BattleScript_1D8FD6
+
+BattleScript_1D8FD6: @ 81D8FD6
+ jumpifbyte 1, 0x2024d26, 0, BattleScript_1D8FF5
+ addbyte 0x2024d1e, 1
+ jumpifarraynotequal 0x2024d1e, 0x2024a68, 1, BattleScript_1D8F95
+
+BattleScript_1D8FF5: @ 81D8FF5
+ bicword 0x2024c6c, 0x1100120
+ end2
+
+gUnknown_081D8FFF:: @ 81D8FFF
+ printfromtable BattleTextList_401530
+ waitmessage 64
+ end2
+
+gUnknown_081D9008:: @ 81D9008
+ printstring BATTLE_TEXT_SunStrong
+ waitmessage 64
+ playanimation USER, 11, 0x0
+ end2
+
+gUnknown_081D9016:: @ 81D9016
+ printstring BATTLE_TEXT_SunFaded
+ waitmessage 64
+ end2
+
+gUnknown_081D901D:: @ 81D901D
+ printfromtable BattleTextList_4015EE
+ waitmessage 64
+ atk46 1, 0x20160a4, 0x0
+ end3
+
+gUnknown_081D9030:: @ 81D9030
+ printstring BATTLE_TEXT_WoreOff
+ waitmessage 64
+ end2
+
+BattleScript_1D9037: @ 81D9037
+ pause 32
+ printstring BATTLE_TEXT_SafeguardActive
+ waitmessage 64
+ end2
+
+gUnknown_081D9041:: @ 81D9041
+ pause 32
+ printstring BATTLE_TEXT_SafeguardFaded
+ waitmessage 64
+ end2
+
+gUnknown_081D904B:: @ 81D904B
+ playanimation USER, 14, 0x20160a4
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ copyarray 0x2024bec, 0x2024bf0, 4
+ jumpifability USER, ABILITY_LIQUID_OOZE, BattleScript_1D907D
+ manipulatedamage 0
+ setbyte 0x2024d23, 3
+ jump BattleScript_1D9083
+
+BattleScript_1D907D: @ 81D907D
+ setbyte 0x2024d23, 4
+
+BattleScript_1D9083: @ 81D9083
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ printfromtable BattleTextList_40154C
+ waitmessage 64
+ faintpokemon USER, 0, 0x0
+ faintpokemon TARGET, 0, 0x0
+ end2
+
+gUnknown_081D90A7:: @ 81D90A7
+ printstring BATTLE_TEXT_StoringEnergy
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D90B2:: @ 81D90B2
+ printstring BATTLE_TEXT_UnleashedEnergy
+ waitmessage 64
+ accuracycheck BattleScript_1D6F77, 0
+ atk6
+ bicbyte 0x2024c68, 6
+ copyarray 0x2024bec, 0x2016090, 4
+ atk69
+ setbyte 0x2016002, 1
+ attackanimation
+ waitanimation
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ resultmessage
+ waitmessage 64
+ faintpokemon TARGET, 0, 0x0
+ jump BattleScript_1D6F62
+
+gUnknown_081D90F1:: @ 81D90F1
+ printstring BATTLE_TEXT_UnleashedEnergy
+ waitmessage 64
+ jump BattleScript_1D83D6
+
+gUnknown_081D90FC:: @ 81D90FC
+ attackanimation
+ waitanimation
+ atke2 TARGET
+ atk58 TARGET
+ waitstateatk
+ jumpifhalfword 4, 0x20239f8, 8, BattleScript_1D9116
+ setbyte 0x2024d26, 5
+ atkf6
+
+BattleScript_1D9116: @ 81D9116
+ switch1 TARGET
+ switch2 TARGET
+ switch3 TARGET, 0
+ waitstateatk
+ printstring BATTLE_TEXT_DraggedOut
+ atk52 TARGET
+ jump BattleScript_1D6F62
+
+gUnknown_081D9128:: @ 81D9128
+ pause 32
+ printstring BATTLE_TEXT_MistProtect
+ waitmessage 64
+ return
+
+gUnknown_081D9132:: @ 81D9132
+ printstring BATTLE_TEXT_RageBuilding
+ waitmessage 64
+ return
+
+gUnknown_081D9139:: @ 81D9139
+ printstring BATTLE_TEXT_MoveIsDisabled
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9144:: @ 81D9144
+ printstring2 BATTLE_TEXT_MoveIsDisabled
+ atk44
+
+gUnknown_081D9148:: @ 81D9148
+ printstring BATTLE_TEXT_DisabledNoMore
+ waitmessage 64
+ end2
+
+gUnknown_081D914F:: @ 81D914F
+ printstring BATTLE_TEXT_EncoreEnded
+ waitmessage 64
+ end2
+
+gUnknown_081D9156:: @ 81D9156
+ printstring BATTLE_TEXT_DestinyBondTaken
+ waitmessage 64
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ return
+
+gUnknown_081D9171:: @ 81D9171
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ callatk BattleScript_1D91FB
+ faintpokemon USER, 0, 0x0
+ faintpokemon USER, 1, BattleScript_1D9192
+ return
+
+BattleScript_1D9192: @ 81D9192
+ setbyte 0x201600f, 0
+ atk23 1
+ jump gUnknown_081D8C7B
+
+gUnknown_081D919F:: @ 81D919F
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ callatk BattleScript_1D91FB
+ faintpokemon TARGET, 0, 0x0
+ faintpokemon TARGET, 1, BattleScript_1D91C0
+ return
+
+BattleScript_1D91C0: @ 81D91C0
+ setbyte 0x201600f, 0
+ atk23 0
+ jump gUnknown_081D8C7B
+
+gUnknown_081D91CD:: @ 81D91CD
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate 3
+ datahpupdate 3
+ callatk BattleScript_1D91FB
+ faintpokemon 3, 0, 0x0
+ faintpokemon 3, 1, BattleScript_1D91EE
+ return
+
+BattleScript_1D91EE: @ 81D91EE
+ setbyte 0x201600f, 0
+ atk23 3
+ jump gUnknown_081D8C7B
+
+BattleScript_1D91FB: @ 81D91FB
+ printstring BATTLE_TEXT_SpikesHurt
+ waitmessage 64
+ return
+
+gUnknown_081D9202:: @ 81D9202
+ printstring BATTLE_TEXT_PerishSongFell
+ waitmessage 64
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ end2
+
+gUnknown_081D921D:: @ 81D921D
+ printstring BATTLE_TEXT_PerishSongFell
+ waitmessage 64
+ end2
+
+gUnknown_081D9224:: @ 81D9224
+ jumpifstat USER, 3, 1, 12, BattleScript_1D9251
+ jumpifstat USER, 3, 2, 12, BattleScript_1D9251
+ jumpifstat USER, 3, 3, 12, BattleScript_1D9251
+ jumpifstat USER, 3, 4, 12, BattleScript_1D9251
+ jumpifstat USER, 0, 5, 12, BattleScript_1D92BF
+
+BattleScript_1D9251: @ 81D9251
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 62, 0
+ setbyte 0x201601e, 17
+ statbuffchange 65, BattleScript_1D926F
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D926F: @ 81D926F
+ setbyte 0x201601e, 18
+ statbuffchange 65, BattleScript_1D9283
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D9283: @ 81D9283
+ setbyte 0x201601e, 19
+ statbuffchange 65, BattleScript_1D9297
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D9297: @ 81D9297
+ setbyte 0x201601e, 20
+ statbuffchange 65, BattleScript_1D92AB
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D92AB: @ 81D92AB
+ setbyte 0x201601e, 21
+ statbuffchange 65, BattleScript_1D92BF
+ printfromtable BattleTextList_401570
+ waitmessage 64
+
+BattleScript_1D92BF: @ 81D92BF
+ return
+
+gUnknown_081D92C0:: @ 81D92C0
+ breakfree
+ return
+
+gUnknown_081D92C2:: @ 81D92C2
+ printstring BATTLE_TEXT_GotFreeFrom
+ waitmessage 64
+ return
+
+gUnknown_081D92C9:: @ 81D92C9
+ printstring BATTLE_TEXT_LeechShed
+ waitmessage 64
+ return
+
+gUnknown_081D92D0:: @ 81D92D0
+ printstring BATTLE_TEXT_SpikesBlownAway
+ waitmessage 64
+ return
+
+gUnknown_081D92D7:: @ 81D92D7
+ printstring BATTLE_TEXT_TookAttack
+ waitmessage 64
+ jumpifbyte 1, 0x2024d23, 0, BattleScript_1D92F4
+ accuracycheck BattleScript_1D934B, 248
+ jump BattleScript_1D92FB
+
+BattleScript_1D92F4: @ 81D92F4
+ accuracycheck BattleScript_1D934B, 353
+
+BattleScript_1D92FB: @ 81D92FB
+ atk8
+ jumpifbyte 1, 0x2024d23, 0, BattleScript_1D9313
+ playanimation USER, 18, 0x0
+ jump BattleScript_1D931A
+
+BattleScript_1D9313: @ 81D9313
+ playanimation USER, 19, 0x0
+
+BattleScript_1D931A: @ 81D931A
+ missmessage
+ atk5c TARGET
+ waitstateatk
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ resultmessage
+ waitmessage 64
+ faintpokemon TARGET, 0, 0x0
+ atk24 BattleScript_1D9332
+
+BattleScript_1D9332: @ 81D9332
+ setbyte 0x201600c, 0
+ atk49 1, 0
+ setbyte 0x201600c, 8
+ atk49 2, 14
+ setbyte 0x2024c68, 0
+ end2
+
+BattleScript_1D934B: @ 81D934B
+ pause 32
+ setbyte 0x2024c68, 0
+ orbyte 0x2024c68, 32
+ resultmessage
+ waitmessage 64
+ setbyte 0x2024c68, 0
+ end2
+
+gUnknown_081D9365:: @ 81D9365
+ printstring2 BATTLE_TEXT_NoMovesLeft
+ atk44
+
+gUnknown_081D9369:: @ 81D9369
+ printstring2 BATTLE_TEXT_NoPP1
+ atk44
+
+gUnknown_081D936D:: @ 81D936D
+ attackstring
+ pause 32
+ printstring BATTLE_TEXT_NoPP2
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D937C:: @ 81D937C
+ printstring2 BATTLE_TEXT_TormentNoUse
+ atk44
+ printstring BATTLE_TEXT_TormentNoUse
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D938B:: @ 81D938B
+ printstring2 BATTLE_TEXT_TauntNoUse
+ atk44
+
+gUnknown_081D938F:: @ 81D938F
+ printstring BATTLE_TEXT_TauntNoUse
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D939A:: @ 81D939A
+ atkd4 1, BattleScript_1D93C1
+ playanimation TARGET, 22, 0x0
+ printstring BATTLE_TEXT_WishTrue
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ printstring BATTLE_TEXT_RegainedHealth
+ waitmessage 64
+ end2
+
+BattleScript_1D93C1: @ 81D93C1
+ printstring BATTLE_TEXT_WishTrue
+ waitmessage 64
+ pause 32
+ printstring BATTLE_TEXT_HPFull
+ waitmessage 64
+ end2
+
+gUnknown_081D93D1:: @ 81D93D1
+ playanimation USER, 21, 0x0
+ printstring BATTLE_TEXT_AbsorbNutrients
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ end2
+
+BattleScript_1D93EC: @ 81D93EC
+ pause 32
+ printstring BATTLE_TEXT_AnchoredItself
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D93FA:: @ 81D93FA
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 6, 13
+ playstatchangeanimation USER, 2, 9
+ setbyte 0x201601e, 145
+ statbuffchange 193, BattleScript_1D9427
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D9427
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D9427: @ 81D9427
+ playstatchangeanimation USER, 4, 9
+ setbyte 0x201601e, 146
+ statbuffchange 193, BattleScript_1D944A
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D944A
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D944A: @ 81D944A
+ return
+
+gUnknown_081D944B:: @ 81D944B
+ playanimation TARGET, 5, 0x0
+ printstring BATTLE_TEXT_KnockedOffItem
+ waitmessage 64
+ return
+
+gUnknown_081D9459:: @ 81D9459
+ printstring BATTLE_TEXT_SealedNoUse
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9464:: @ 81D9464
+ printstring2 BATTLE_TEXT_SealedNoUse
+ atk44
+
+gUnknown_081D9468:: @ 81D9468
+ printstring BATTLE_TEXT_GrudgeLosePP
+ waitmessage 64
+ return
+
+gUnknown_081D946F:: @ 81D946F
+ attackstring
+ ppreduce
+ pause 32
+ printstring BATTLE_TEXT_MagicCoatBounce
+ waitmessage 64
+ orword 0x2024c6c, 0x800c00
+ atk76 USER, 1
+ return
+
+gUnknown_081D9487:: @ 81D9487
+ attackstring
+ ppreduce
+ snatchmove
+ playanimation TARGET, 17, 0x0
+ printstring BATTLE_TEXT_SnatchedMove
+ waitmessage 64
+ orword 0x2024c6c, 0x800c00
+ atk5f
+ return
+
+gUnknown_081D94A2:: @ 81D94A2
+ printstring BATTLE_TEXT_EnduredHit
+ waitmessage 64
+ return
+
+gUnknown_081D94A9:: @ 81D94A9
+ printstring BATTLE_TEXT_GrandSlam
+ waitmessage 64
+ return
+
+gUnknown_081D94B0:: @ 81D94B0
+ setbyte 0x20160dc, 0
+ playstatchangeanimation USER, 16, 11
+ setbyte 0x201601e, 164
+ statbuffchange 193, BattleScript_1D94D9
+ jumpifbyte 0, 0x2024d23, 2, BattleScript_1D94D9
+ printfromtable BattleTextList_40157C
+ waitmessage 64
+
+BattleScript_1D94D9: @ 81D94D9
+ return
+
+gUnknown_081D94DA:: @ 81D94DA
+ printstring BATTLE_TEXT_Terminator2
+ waitmessage 1
+ playanimation USER, 20, 0x0
+ printstring BATTLE_TEXT_TightenFocus
+ waitmessage 64
+ end2
+
+gUnknown_081D94EE:: @ 81D94EE
+ printstring BATTLE_TEXT_FastAsleep
+ waitmessage 64
+ statusanimation USER
+ jump BattleScript_1D6F62
+
+gUnknown_081D94FB:: @ 81D94FB
+ bicword 0x2024c6c, 0x10
+ printfromtable BattleTextList_401562
+ waitmessage 64
+ atk98 1
+ return
+
+gUnknown_081D950F:: @ 81D950F
+ printstring BATTLE_TEXT_UproarWoke
+ waitmessage 64
+ atk98 1
+ end2
+
+gUnknown_081D9518:: @ 81D9518
+ printstring BATTLE_TEXT_PoisonHurt
+ waitmessage 64
+
+BattleScript_1D951E: @ 81D951E
+ statusanimation USER
+
+BattleScript_1D9520: @ 81D9520
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ atk24 BattleScript_1D9539
+
+BattleScript_1D9539: @ 81D9539
+ end2
+
+gUnknown_081D953A:: @ 81D953A
+ printstring BATTLE_TEXT_BurnHurt
+ waitmessage 64
+ jump BattleScript_1D951E
+
+gUnknown_081D9545:: @ 81D9545
+ printstring BATTLE_TEXT_FrozenSolid
+ waitmessage 64
+ statusanimation USER
+ jump BattleScript_1D6F62
+
+gUnknown_081D9552:: @ 81D9552
+ printfromtable BattleTextList_4015C4
+ waitmessage 64
+ atk98 1
+ return
+
+gUnknown_081D955D:: @ 81D955D
+ printstring BATTLE_TEXT_DefendingDefrosted
+ waitmessage 64
+ atk98 0
+ return
+
+gUnknown_081D9566:: @ 81D9566
+ printstring BATTLE_TEXT_Paralyzed3
+ waitmessage 64
+ statusanimation USER
+ jump BattleScript_1D6F62
+
+gUnknown_081D9573:: @ 81D9573
+ printstring BATTLE_TEXT_Flinched
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D957E:: @ 81D957E
+ printfromtable BattleTextList_40155A
+ waitmessage 64
+ end2
+
+gUnknown_081D9587:: @ 81D9587
+ atk66 1, 1, S_CONFUSED
+ printstring BATTLE_TEXT_FatigueConfuse
+ waitmessage 64
+ end2
+
+gUnknown_081D9595:: @ 81D9595
+ printstring BATTLE_TEXT_Confused
+ waitmessage 64
+ atk65 1, 0x7
+ jumpifbyte 0, 0x2024d23, 0, BattleScript_1D95D3
+
+BattleScript_1D95AC: @ 81D95AC
+ atk76 USER, 0
+ atk8
+ printstring BATTLE_TEXT_HurtItself
+ waitmessage 64
+ missmessage
+ atk5c USER
+ waitstateatk
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ faintpokemon USER, 0, 0x0
+ jump BattleScript_1D6F62
+
+BattleScript_1D95D3: @ 81D95D3
+ return
+
+gUnknown_081D95D4:: @ 81D95D4
+ printstring BATTLE_TEXT_ConfusionSnapOut
+ waitmessage 64
+ return
+
+gUnknown_081D95DB:: @ 81D95DB
+ printstring BATTLE_TEXT_PickedUpYen
+ waitmessage 64
+ return
+
+gUnknown_081D95E2:: @ 81D95E2
+ playanimation USER, 6, 0x20160a4
+ printstring BATTLE_TEXT_HurtBy
+ waitmessage 64
+ jump BattleScript_1D9520
+
+gUnknown_081D95F4:: @ 81D95F4
+ printstring BATTLE_TEXT_FreedFrom
+ waitmessage 64
+ end2
+
+gUnknown_081D95FB:: @ 81D95FB
+ printstring BATTLE_TEXT_InLoveWith
+ waitmessage 64
+ atk65 1, 0xf0000
+ return
+
+gUnknown_081D9608:: @ 81D9608
+ printstring BATTLE_TEXT_ImmobilizedBy
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9613:: @ 81D9613
+ printstring BATTLE_TEXT_NightmareLock
+ waitmessage 64
+ atk65 1, Start
+ jump BattleScript_1D9520
+
+gUnknown_081D9624:: @ 81D9624
+ printstring BATTLE_TEXT_CurseAfflict
+ waitmessage 64
+ atk65 1, 0x10000000
+ jump BattleScript_1D9520
+
+gUnknown_081D9635:: @ 81D9635
+ printstring BATTLE_TEXT_ParalysisHealed
+ waitmessage 64
+ atk98 0
+ return
+
+BattleScript_1D963E:: @ 81D963E
+ statusanimation 2
+ printfromtable BattleTextList_4015B8
+ waitmessage 64
+
+BattleScript_1D9648: @ 81D9648
+ atk98 2
+ waitstateatk
+ return
+
+gUnknown_081D964C:: @ 81D964C
+ statusanimation 2
+ printstring BATTLE_TEXT_FellAsleep
+ waitmessage 64
+ atk98 2
+ waitstateatk
+ atk6f 2
+ end2
+
+BattleScript_1D965A:: @ 81D965A
+ statusanimation 2
+ printfromtable BattleTextList_4015B0
+ waitmessage 64
+ jump BattleScript_1D9648
+
+BattleScript_1D9669:: @ 81D9669
+ statusanimation 2
+ printfromtable BattleTextList_4015BC
+ waitmessage 64
+ jump BattleScript_1D9648
+
+BattleScript_1D9678:: @ 81D9678
+ statusanimation 2
+ printfromtable BattleTextList_4015C0
+ waitmessage 64
+ jump BattleScript_1D9648
+
+BattleScript_1D9687:: @ 81D9687
+ statusanimation 2
+ printfromtable BattleTextList_4015B4
+ waitmessage 64
+ jump BattleScript_1D9648
+
+BattleScript_1D9696:: @ 81D9696
+ printstring BATTLE_TEXT_UproarCaused
+ waitmessage 64
+ return
+
+BattleScript_1D969D:: @ 81D969D
+ statusanimation 2
+ printstring BATTLE_TEXT_BadlyPoisoned
+ waitmessage 64
+ jump BattleScript_1D9648
+
+BattleScript_1D96AA:: @ 81D96AA
+ printstring BATTLE_TEXT_CoinScatter
+ waitmessage 64
+ return
+
+BattleScript_1D96B1:: @ 81D96B1
+ printfromtable BattleTextList_401594
+ waitmessage 64
+ return
+
+BattleScript_1D96BA:: @ 81D96BA
+ atk66 2, 1, S_CONFUSED
+ printstring BATTLE_TEXT_BecameConfused
+ waitmessage 64
+ return
+
+BattleScript_1D96C8:: @ 81D96C8
+ jumpifhalfword 0, 0x2024be6, 165, BattleScript_1D96DB
+ jumpifability USER, ABILITY_ROCK_HEAD, BattleScript_1D96F5
+
+BattleScript_1D96DB: @ 81D96DB
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_HitRecoil
+ waitmessage 64
+ faintpokemon USER, 0, 0x0
+
+BattleScript_1D96F5: @ 81D96F5
+ return
+
+gUnknown_081D96F6:: @ 81D96F6
+ playanimation TARGET, 16, 0x0
+ printstring BATTLE_TEXT_StoleSomething
+ waitmessage 64
+ return
+
+gUnknown_081D9704:: @ 81D9704
+ pause 32
+ printstring BATTLE_TEXT_RainMade
+ waitstateatk
+ playanimation 7, 10, 0x0
+ callatk BattleScript_1D9761
+ end3
+
+gUnknown_081D9718:: @ 81D9718
+ playanimation USER, 1, 0x20160a4
+ printstring BATTLE_TEXT_SpeedRisen
+ waitmessage 64
+ end3
+
+gUnknown_081D9726:: @ 81D9726
+ pause 32
+ printstring BATTLE_TEXT_Traced
+ waitmessage 64
+ end3
+
+gUnknown_081D9730:: @ 81D9730
+ printstring BATTLE_TEXT_RestoredHPByItem
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ end3
+
+gUnknown_081D9744:: @ 81D9744
+ pause 32
+ printstring BATTLE_TEXT_WhipSandstorm
+ waitstateatk
+ playanimation 7, 12, 0x0
+ callatk BattleScript_1D9761
+ end3
+
+gUnknown_081D9758:: @ 81D9758
+ printstring BATTLE_TEXT_CuredProblem
+ waitmessage 64
+ atk98 1
+ end3
+
+BattleScript_1D9761: @ 81D9761
+ setbyte 0x2016003, 0
+
+BattleScript_1D9767: @ 81D9767
+ castformswitch
+ addbyte 0x2016003, 1
+ jumpifarraynotequal 0x2016003, 0x2024a68, 1, BattleScript_1D9767
+ return
+
+gUnknown_081D977D:: @ 81D977D
+ callatk BattleScript_1D9783
+ end3
+
+BattleScript_1D9783: @ 81D9783
+ actualcastformswitch
+ waitstateatk
+ printstring BATTLE_TEXT_Transformed2
+ waitmessage 64
+ return
+
+gUnknown_081D978C:: @ 81D978C
+ callatk BattleScript_1D9792
+ end3
+
+BattleScript_1D9792: @ 81D9792
+ pause 32
+
+gUnknown_081D9795:: @ 81D9795
+ setbyte 0x2024c08, 0
+ setbyte 0x201601e, 145
+
+BattleScript_1D97A1: @ 81D97A1
+ atke1 BattleScript_1D97EF
+ jumpifsecondarytstatus TARGET, S_SUBSTITUTE, BattleScript_1D97E4
+ jumpifability TARGET, ABILITY_CLEAR_BODY, BattleScript_1D97F0
+ jumpifability TARGET, ABILITY_HYPER_CUTTER, BattleScript_1D97F0
+ jumpifability TARGET, ABILITY_WHITE_SMOKE, BattleScript_1D97F0
+ statbuffchange 33, BattleScript_1D97E4
+ jumpifbyte 2, 0x2024d23, 1, BattleScript_1D97E4
+ atk47
+ playanimation TARGET, 1, 0x20160a4
+ printstring BATTLE_TEXT_CutsAttack
+ waitmessage 64
+
+BattleScript_1D97E4: @ 81D97E4
+ addbyte 0x2024c08, 1
+ jump BattleScript_1D97A1
+
+BattleScript_1D97EF: @ 81D97EF
+ return
+
+BattleScript_1D97F0: @ 81D97F0
+ pause 32
+ printstring BATTLE_TEXT_PreventedOther
+ waitmessage 64
+ jump BattleScript_1D97E4
+
+gUnknown_081D97FE:: @ 81D97FE
+ pause 32
+ printstring BATTLE_TEXT_SunIntensified
+ waitstateatk
+ playanimation 7, 11, 0x0
+ callatk BattleScript_1D9761
+ end3
+
+gUnknown_081D9812:: @ 81D9812
+ attackstring
+ pause 32
+ printstring BATTLE_TEXT_TookAttack2
+ waitmessage 64
+ orword 0x2024c6c, 0x400
+ return
+
+gUnknown_081D9826:: @ 81D9826
+ pause 32
+ printstring BATTLE_TEXT_ProtectedBy
+ pause 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9834:: @ 81D9834
+ pause 32
+ printstring BATTLE_TEXT_PreventedBy
+ pause 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9842:: @ 81D9842
+ ppreduce
+
+gUnknown_081D9843:: @ 81D9843
+ attackstring
+ pause 32
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate TARGET
+ datahpupdate TARGET
+ printstring BATTLE_TEXT_HPRestoredUsing
+ waitmessage 64
+ orbyte 0x2024c68, 8
+ jump BattleScript_1D6F62
+
+gUnknown_081D9865:: @ 81D9865
+ ppreduce
+
+gUnknown_081D9866:: @ 81D9866
+ attackstring
+ pause 32
+ printstring BATTLE_TEXT_MadeUseless
+ waitmessage 64
+ orbyte 0x2024c68, 8
+ jump BattleScript_1D6F62
+
+gUnknown_081D987B:: @ 81D987B
+ ppreduce
+
+gUnknown_081D987C:: @ 81D987C
+ attackstring
+ pause 32
+ printfromtable BattleTextList_401648
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D988D: @ 81D988D
+ pause 32
+ printstring BATTLE_TEXT_AnchorsItself
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D989B:: @ 81D989B
+ pause 32
+ printstring BATTLE_TEXT_PreventedStatLoss
+ waitmessage 64
+ return
+
+BattleScript_1D98A5:: @ 81D98A5
+ pause 32
+ printfromtable BattleTextList_401630
+ waitmessage 64
+ return
+
+BattleScript_1D98B1:: @ 81D98B1
+ pause 32
+ printfromtable BattleTextList_401636
+ waitmessage 64
+ return
+
+BattleScript_1D98BD:: @ 81D98BD
+ pause 32
+ printfromtable BattleTextList_40163C
+ waitmessage 64
+ return
+
+gUnknown_081D98C9:: @ 81D98C9
+ pause 32
+ printstring BATTLE_TEXT_PreventedRomance
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D98D7:: @ 81D98D7
+ pause 32
+ printstring BATTLE_TEXT_PreventedFlinching
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+BattleScript_1D98E5: @ 81D98E5
+ pause 32
+ printstring BATTLE_TEXT_PreventedConfusion
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D98F3:: @ 81D98F3
+ attackstring
+ ppreduce
+ pause 32
+ printstring BATTLE_TEXT_BlocksOther
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9903:: @ 81D9903
+ pause 32
+ printstring BATTLE_TEXT_PreventedLoss
+ waitmessage 64
+ setbyte 0x2024d23, 3
+ return
+
+gUnknown_081D9913:: @ 81D9913
+ pause 32
+ printstring BATTLE_TEXT_MadeIneffective
+ waitmessage 64
+ jump BattleScript_1D6F62
+
+gUnknown_081D9921:: @ 81D9921
+ printstring BATTLE_TEXT_MadeType
+ waitmessage 64
+ return
+
+gUnknown_081D9928:: @ 81D9928
+ orword 0x2024c6c, 0x100100
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_HurtOther
+ waitmessage 64
+ faintpokemon USER, 0, 0x0
+ return
+
+gUnknown_081D9943:: @ 81D9943
+ atk65 1, 0xf0000
+ printstring BATTLE_TEXT_InfatuatedPoke
+ waitmessage 64
+ return
+
+gUnknown_081D9950:: @ 81D9950
+ waitstateatk
+ seteffectuser
+ return
+
+gUnknown_081D9953:: @ 81D9953
+ waitstateatk
+ seteffecttarget
+ return
+
+gUnknown_081D9956:: @ 81D9956
+ printstring BATTLE_TEXT_CuredOfProblem
+ waitmessage 64
+ atk98 10
+ return
+
+gUnknown_081D995F:: @ 81D995F
+ printstring BATTLE_TEXT_IgnoredOrdersSLP
+ waitmessage 64
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ end
+
+gUnknown_081D996F:: @ 81D996F
+ printstring BATTLE_TEXT_IgnoredOrders
+ waitmessage 64
+ jumptoattack TARGET
+
+gUnknown_081D9977:: @ 81D9977
+ printfromtable BattleTextList_40160E
+ waitmessage 64
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ end
+
+gUnknown_081D9989:: @ 81D9989
+ printstring BATTLE_TEXT_BeganNap
+ waitmessage 64
+ setbyte 0x2024d21, 65
+ seteffecttarget
+ setbyte 0x201600c, 0
+ atk49 2, 16
+ end
+
+gUnknown_081D99A0:: @ 81D99A0
+ printstring BATTLE_TEXT_WontObey
+ waitmessage 64
+ jump BattleScript_1D95AC
+
+gUnknown_081D99AB:: @ 81D99AB
+ playanimation TARGET, 2, 0x0
+ printstring BATTLE_TEXT_SubFaded
+ return
+
+gUnknown_081D99B6:: @ 81D99B6
+ callatk gUnknown_081D99BC
+ end2
+
+gUnknown_081D99BC:: @ 81D99BC
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredParalysis
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D99CE:: @ 81D99CE
+ callatk gUnknown_081D99D4
+ end2
+
+gUnknown_081D99D4:: @ 81D99D4
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredPoison
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D99E6:: @ 81D99E6
+ callatk gUnknown_081D99EC
+ end2
+
+gUnknown_081D99EC:: @ 81D99EC
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredBurn
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D99FE:: @ 81D99FE
+ callatk gUnknown_081D9A04
+ end2
+
+gUnknown_081D9A04:: @ 81D9A04
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredFreeze
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D9A16:: @ 81D9A16
+ callatk gUnknown_081D9A1C
+ end2
+
+gUnknown_081D9A1C:: @ 81D9A1C
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredSleep
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D9A2E:: @ 81D9A2E
+ callatk gUnknown_081D9A34
+ end2
+
+gUnknown_081D9A34:: @ 81D9A34
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_CuredConfusion
+ waitmessage 64
+ removeitem 10
+ return
+
+gUnknown_081D9A44:: @ 81D9A44
+ callatk gUnknown_081D9A4A
+ end2
+
+gUnknown_081D9A4A:: @ 81D9A4A
+ playanimation 10, 7, 0x0
+ printfromtable BattleTextList_40162C
+ waitmessage 64
+ atk98 10
+ removeitem 10
+ return
+
+gUnknown_081D9A5E:: @ 81D9A5E
+ callatk gUnknown_081D9A64
+ end2
+
+gUnknown_081D9A64:: @ 81D9A64
+ playanimation 10, 7, 0x0
+ printstring BATTLE_TEXT_RestoredStatus
+ waitmessage 64
+ removeitem 10
+ return
+
+gUnknown_081D9A74:: @ 81D9A74
+ playanimation USER, 7, 0x0
+ printstring BATTLE_TEXT_RestoredHealth
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ removeitem USER
+ end2
+
+gUnknown_081D9A91:: @ 81D9A91
+ playanimation USER, 7, 0x0
+ printstring BATTLE_TEXT_RestoredPP
+ waitmessage 64
+ removeitem USER
+ end2
+
+gUnknown_081D9AA1:: @ 81D9AA1
+ callatk gUnknown_081D9AA7
+ end2
+
+gUnknown_081D9AA7:: @ 81D9AA7
+ playanimation USER, 7, 0x0
+ printstring BATTLE_TEXT_RestoredHPLittle
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ return
+
+gUnknown_081D9AC2:: @ 81D9AC2
+ printstring2 BATTLE_TEXT_ChoiceBand
+ atk44
+
+gUnknown_081D9AC6:: @ 81D9AC6
+ playanimation TARGET, 9, 0x0
+ printstring BATTLE_TEXT_FocusSash
+ waitmessage 64
+ return
+
+gUnknown_081D9AD4:: @ 81D9AD4
+ playanimation USER, 7, 0x0
+ printstring BATTLE_TEXT_RestoredHealth
+ waitmessage 64
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_UnknownString2
+ waitmessage 64
+ setbyte 0x2024d21, 71
+ seteffecttarget
+ removeitem USER
+ end2
+
+gUnknown_081D9AFE:: @ 81D9AFE
+ playanimation USER, 7, 0x0
+ statbuffchange 65, BattleScript_1D9B0B
+
+BattleScript_1D9B0B: @ 81D9B0B
+ setbyte 0x2024d23, 4
+ callatk gUnknown_081D71E5
+ removeitem USER
+ end2
+
+gUnknown_081D9B19:: @ 81D9B19
+ playanimation USER, 7, 0x0
+ printstring BATTLE_TEXT_HustleUse
+ waitmessage 64
+ removeitem USER
+ end2
+
+gUnknown_081D9B29:: @ 81D9B29
+ printstring2 BATTLE_TEXT_CantUseItems
+ atk44
+
+gUnknown_081D9B2D:: @ 81D9B2D
+ printstring BATTLE_TEXT_Terminator2
+ return
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
new file mode 100644
index 000000000..248baf978
--- /dev/null
+++ b/data/battle_scripts_2.s
@@ -0,0 +1,194 @@
+ .include "asm/macros.s"
+ .include "constants/constants.s"
+ .include "asm/macros/battle_script.s"
+
+ .section script_data, "aw", %progbits
+
+ .align 2
+gUnknown_081D9E48:: @ 81D9E48
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EBC
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+ .4byte BattleScript_1D9EA8
+
+gUnknown_081D9E7C:: @ 81D9E7C
+ .4byte BattleScript_1D9F45
+ .4byte BattleScript_1D9F4F
+ .4byte BattleScript_1D9F4F
+ .4byte BattleScript_1D9F7B
+ .4byte BattleScript_1D9F9C
+ .4byte BattleScript_1D9FBB
+
+gUnknown_081D9E94:: @ 81D9E94
+ .4byte BattleScript_1D9FDA
+
+gUnknown_081D9E98:: @ 81D9E98
+ .4byte BattleScript_1D9FE4
+ .4byte BattleScript_1D9FEB
+ .4byte BattleScript_1D9FF4
+ .4byte BattleScript_1DA00A
+
+BattleScript_1D9EA8: @ 81D9EA8
+ jumpifhalfword 4, 0x20239f8, 512, BattleScript_1D9EB8
+ printstring BATTLE_TEXT_Used1
+ pokemoncatchfunction
+
+BattleScript_1D9EB8: @ 81D9EB8
+ printstring BATTLE_TEXT_TutorialUsed
+ pokemoncatchfunction
+
+BattleScript_1D9EBC: @ 81D9EBC
+ printstring BATTLE_TEXT_Used1
+ atk98 1
+ pokemoncatchfunction
+
+gUnknown_081D9EC2:: @ 81D9EC2
+ jumpifhalfword 0, 0x2024c04, 5, BattleScript_1D9ED0
+ atk60 11
+
+BattleScript_1D9ED0: @ 81D9ED0
+ printstring BATTLE_TEXT_BallCaught1
+ capturesomethingf1 BattleScript_1D9EE3
+ printstring BATTLE_TEXT_AddedToDex
+ waitstateatk
+ setbyte 0x2024d1e, 0
+ capturesomethingf2
+
+BattleScript_1D9EE3: @ 81D9EE3
+ printstring BATTLE_TEXT_GiveNickname
+ waitstateatk
+ setbyte 0x2024d1e, 0
+ capturesomethingf3 BattleScript_1D9EF8
+ printstring BATTLE_TEXT_SentToPC
+ waitmessage 64
+
+BattleScript_1D9EF8: @ 81D9EF8
+ catchpoke
+ setbyte 0x2024d26, 7
+ activesidesomething
+
+gUnknown_081D9F00:: @ 81D9F00
+ printstring BATTLE_TEXT_BallCaught2
+ setbyte 0x2024d26, 7
+ activesidesomething
+
+gUnknown_081D9F0A:: @ 81D9F0A
+ printfromtable BattleTextList_4015E6
+ waitmessage 64
+ jumpifbyte 5, 0x20239f8, 128, BattleScript_1D9F34
+ jumpifbyte 1, 0x2038808, 0, BattleScript_1D9F34
+ printstring BATTLE_TEXT_SafariOver
+ waitmessage 64
+ setbyte 0x2024d26, 8
+
+BattleScript_1D9F34: @ 81D9F34
+ atkf6
+
+gUnknown_081D9F35:: @ 81D9F35
+ waitmessage 64
+ printstring BATTLE_TEXT_BlockBall
+ waitmessage 64
+ printstring BATTLE_TEXT_DontBeAThief
+ waitmessage 64
+ atkf6
+
+BattleScript_1D9F45: @ 81D9F45
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ end
+
+BattleScript_1D9F4F: @ 81D9F4F
+ pause 48
+ atk54 1
+ printstring BATTLE_TEXT_Used2
+ waitmessage 64
+ atk75
+ orword 0x2024c6c, 0x100
+ graphicalhpupdate USER
+ datahpupdate USER
+ printstring BATTLE_TEXT_RestoredHealth
+ waitmessage 64
+ atk98 1
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ atkf6
+
+BattleScript_1D9F7B: @ 81D9F7B
+ pause 48
+ atk54 1
+ printstring BATTLE_TEXT_Used2
+ waitmessage 64
+ atk75
+ printfromtable BattleTextList_401620
+ waitmessage 64
+ atk98 1
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ atkf6
+
+BattleScript_1D9F9C: @ 81D9F9C
+ pause 48
+ atk54 1
+ printstring BATTLE_TEXT_Used2
+ waitmessage 64
+ atk75
+ printfromtable BattleTextList_401570
+ waitmessage 64
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ atkf6
+
+BattleScript_1D9FBB: @ 81D9FBB
+ pause 48
+ atk54 1
+ printstring BATTLE_TEXT_Used2
+ waitmessage 64
+ atk75
+ printfromtable BattleTextList_4015A0
+ waitmessage 64
+ setbyte 0x201600c, 15
+ atk49 1, 0
+ atkf6
+
+BattleScript_1D9FDA: @ 81D9FDA
+ atk54 17
+ setbyte 0x2024d26, 4
+ activesidesomething
+
+BattleScript_1D9FE4: @ 81D9FE4
+ printstring BATTLE_TEXT_WatchingCarefully
+ waitmessage 64
+ end2
+
+BattleScript_1D9FEB: @ 81D9FEB
+ printfromtable BattleTextList_401616
+ waitmessage 64
+ end2
+
+BattleScript_1D9FF4: @ 81D9FF4
+ printstring BATTLE_TEXT_ThrewBlock
+ waitmessage 64
+ playanimation USER, 4, 0x0
+ printfromtable BattleTextList_40161A
+ waitmessage 64
+ end2
+
+BattleScript_1DA00A: @ 81DA00A
+ printstring 2
+ waitmessage 64
+ atk4b
+ waitstateatk
+ atk53 0
+ waitstateatk
+ printstring BATTLE_TEXT_WallyBall
+ waitmessage 64
+ end2
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
new file mode 100644
index 000000000..cb73a2e9c
--- /dev/null
+++ b/data/contest_ai_scripts.s
@@ -0,0 +1,7 @@
+ .include "asm/macros.s"
+ .include "constants/constants.s"
+
+ .section script_data, "aw", %progbits
+
+gUnknown_081DC118:: @ 81DC118
+ .incbin "baserom.gba", 0x001dc118, 0x9dc
diff --git a/data/contest_opponents.s b/data/contest_opponents.s
index 912dabde3..2c502285e 100644
--- a/data/contest_opponents.s
+++ b/data/contest_opponents.s
@@ -1,663 +1,663 @@
-@ contest opponents
-
-.2byte 286 @ SPECIES_ID
-.string "POOCHY$", 11 @ POKE_NICKNAME
-.string "JIMMY$", 8 @ TRAINER_NAME
-.byte 7 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x0c000fff @ FLAGS
-.2byte 68 @ RANK
-.2byte MOVE_ROAR, MOVE_BITE, MOVE_TAKE_DOWN, MOVE_HOWL
-.byte 10, 4, 10, 3, 4, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 288 @ SPECIES_ID
-.string "ZIGOON$", 11 @ POKE_NICKNAME
-.string "EDITH$", 8 @ TRAINER_NAME
-.byte 8 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x82000fff @ FLAGS
-.2byte 16 @ RANK
-.2byte MOVE_REST, MOVE_TAIL_WHIP, MOVE_TACKLE, MOVE_COVET
-.byte 10, 10, 6, 1, 2, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 294 @ SPECIES_ID
-.string "DUSTER$", 11 @ POKE_NICKNAME
-.string "EVAN$", 8 @ TRAINER_NAME
-.byte 11 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x21000fff @ FLAGS
-.2byte 8 @ RANK
-.2byte MOVE_SILVER_WIND, MOVE_MOONLIGHT, MOVE_LIGHT_SCREEN, MOVE_GUST
-.byte 2, 10, 10, 12, 4, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 298 @ SPECIES_ID
-.string "DOTS$", 11 @ POKE_NICKNAME
-.string "KELSEY$", 8 @ TRAINER_NAME
-.byte 16 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x20800fff @ FLAGS
-.2byte 96 @ RANK
-.2byte MOVE_BIDE, MOVE_SYNTHESIS, MOVE_BULLET_SEED, MOVE_GROWTH
-.byte 3, 3, 5, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 304 @ SPECIES_ID
-.string "TATAY$", 11 @ POKE_NICKNAME
-.string "MADISON$", 8 @ TRAINER_NAME
-.byte 18 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80400fff @ FLAGS
-.2byte 4 @ RANK
-.2byte MOVE_WING_ATTACK, MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_GROWL
-.byte 1, 3, 3, 5, 4, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 301 @ SPECIES_ID
-.string "NINDA$", 11 @ POKE_NICKNAME
-.string "RAYMOND$", 8 @ TRAINER_NAME
-.byte 44 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x10200fff @ FLAGS
-.2byte 32 @ RANK
-.2byte MOVE_LEECH_LIFE, MOVE_FALSE_SWIPE, MOVE_FURY_SWIPES, MOVE_MIND_READER
-.byte 5, 2, 10, 7, 8, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 306 @ SPECIES_ID
-.string "SMISH$", 11 @ POKE_NICKNAME
-.string "GRANT$", 8 @ TRAINER_NAME
-.byte 35 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x20100fff @ FLAGS
-.2byte 32 @ RANK
-.2byte MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_ATTRACT
-.byte 3, 3, 10, 2, 2, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 309 @ SPECIES_ID
-.string "GULWEE$", 11 @ POKE_NICKNAME
-.string "PAIGE$", 8 @ TRAINER_NAME
-.byte 26 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08080fff @ FLAGS
-.2byte 24 @ RANK
-.2byte MOVE_MIST, MOVE_WATER_GUN, MOVE_GROWL, MOVE_PURSUIT
-.byte 3, 5, 1, 10, 10, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 364 @ SPECIES_ID
-.string "SLOKTH$", 11 @ POKE_NICKNAME
-.string "ALEC$", 8 @ TRAINER_NAME
-.byte 31 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x40040fff @ FLAGS
-.2byte 88 @ RANK
-.2byte MOVE_STRENGTH, MOVE_COUNTER, MOVE_YAWN, MOVE_ENCORE
-.byte 10, 4, 4, 5, 18, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 370 @ SPECIES_ID
-.string "WHIRIS$", 11 @ POKE_NICKNAME
-.string "SYDNEY$", 8 @ TRAINER_NAME
-.byte 47 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80020fff @ FLAGS
-.2byte 36 @ RANK
-.2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_HYPER_VOICE
-.byte 2, 2, 7, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 335 @ SPECIES_ID
-.string "MAHITA$", 11 @ POKE_NICKNAME
-.string "MORRIS$", 8 @ TRAINER_NAME
-.byte 38 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08010fff @ FLAGS
-.2byte 68 @ RANK
-.2byte MOVE_SEISMIC_TOSS, MOVE_VITAL_THROW, MOVE_TACKLE, MOVE_REVERSAL
-.byte 9, 1, 1, 8, 1, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 382 @ SPECIES_ID
-.string "RONAR$", 11 @ POKE_NICKNAME
-.string "MARIAH$", 8 @ TRAINER_NAME
-.byte 10 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08008fff @ FLAGS
-.2byte 68 @ RANK
-.2byte MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_HEADBUTT, MOVE_TAKE_DOWN
-.byte 5, 10, 2, 10, 2, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 41 @ SPECIES_ID
-.string "ZUTZU$", 11 @ POKE_NICKNAME
-.string "RUSSELL$", 8 @ TRAINER_NAME
-.byte 33 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x90004fff @ FLAGS
-.2byte 56 @ RANK
-.2byte MOVE_HAZE, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY, MOVE_LEECH_LIFE
-.byte 4, 2, 2, 2, 10, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 367 @ SPECIES_ID
-.string "GULIN$", 11 @ POKE_NICKNAME
-.string "MELANIE$", 8 @ TRAINER_NAME
-.byte 6 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x40002fff @ FLAGS
-.2byte 16 @ RANK
-.2byte MOVE_SLUDGE, MOVE_AMNESIA, MOVE_TOXIC, MOVE_YAWN
-.byte 1, 10, 1, 10, 5, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 337 @ SPECIES_ID
-.string "RIKELEC$", 11 @ POKE_NICKNAME
-.string "CHANCE$", 8 @ TRAINER_NAME
-.byte 15 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80001fff @ FLAGS
-.2byte 12 @ RANK
-.2byte MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_ROAR
-.byte 20, 10, 1, 1, 1, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 363 @ SPECIES_ID
-.string "RELIA$", 11 @ POKE_NICKNAME
-.string "KARINA$", 8 @ TRAINER_NAME
-.byte 32 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x24000fff @ FLAGS
-.2byte 41 @ RANK
-.2byte MOVE_PETAL_DANCE, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_INGRAIN
-.byte 50, 15, 75, 10, 20, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 84 @ SPECIES_ID
-.string "DUODO$", 11 @ POKE_NICKNAME
-.string "BOBBY$", 8 @ TRAINER_NAME
-.byte 51 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x82000fff @ FLAGS
-.2byte 125 @ RANK
-.2byte MOVE_PECK, MOVE_FURY_ATTACK, MOVE_RETURN, MOVE_GROWL
-.byte 15, 21, 15, 85, 35, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 332 @ SPECIES_ID
-.string "PINCHIN$", 11 @ POKE_NICKNAME
-.string "CLAIRE$", 8 @ TRAINER_NAME
-.byte 8 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x81000fff @ FLAGS
-.2byte 113 @ RANK
-.2byte MOVE_BITE, MOVE_SAND_ATTACK, MOVE_DIG, MOVE_FAINT_ATTACK
-.byte 75, 25, 25, 10, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 344 @ SPECIES_ID
-.string "NACAC$", 11 @ POKE_NICKNAME
-.string "WILLIE$", 8 @ TRAINER_NAME
-.byte 11 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80800fff @ FLAGS
-.2byte 37 @ RANK
-.2byte MOVE_SPIKES, MOVE_LEER, MOVE_POISON_STING, MOVE_SAND_ATTACK
-.byte 10, 30, 25, 65, 25, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 27 @ SPECIES_ID
-.string "SHRAND$", 11 @ POKE_NICKNAME
-.string "CASSIDY$", 8 @ TRAINER_NAME
-.byte 18 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x10400fff @ FLAGS
-.2byte 69 @ RANK
-.2byte MOVE_SLASH, MOVE_DEFENSE_CURL, MOVE_SWIFT, MOVE_FURY_SWIPES
-.byte 30, 90, 30, 10, 100, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 318 @ SPECIES_ID
-.string "TOYBAL$", 11 @ POKE_NICKNAME
-.string "MORGAN$", 8 @ TRAINER_NAME
-.byte 44 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08200fff @ FLAGS
-.2byte 41 @ RANK
-.2byte MOVE_SELF_DESTRUCT, MOVE_ROCK_TOMB, MOVE_PSYBEAM, MOVE_CONFUSION
-.byte 50, 40, 10, 35, 35, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 339 @ SPECIES_ID
-.string "LENUM$", 11 @ POKE_NICKNAME
-.string "SUMMER$", 8 @ TRAINER_NAME
-.byte 26 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x10100fff @ FLAGS
-.2byte 77 @ RANK
-.2byte MOVE_MAGNITUDE, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY, MOVE_FLAMETHROWER
-.byte 40, 5, 40, 40, 40, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 308 @ SPECIES_ID
-.string "SPININ$", 11 @ POKE_NICKNAME
-.string "MILES$", 8 @ TRAINER_NAME
-.byte 31 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80080fff @ FLAGS
-.2byte 49 @ RANK
-.2byte MOVE_TEETER_DANCE, MOVE_PSYCH_UP, MOVE_HYPNOSIS, MOVE_UPROAR
-.byte 25, 75, 25, 10, 25, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 358 @ SPECIES_ID
-.string "SWABY$", 11 @ POKE_NICKNAME
-.string "AUDREY$", 8 @ TRAINER_NAME
-.byte 47 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0xa0040fff @ FLAGS
-.2byte 41 @ RANK
-.2byte MOVE_MIRROR_MOVE, MOVE_PERISH_SONG, MOVE_SAFEGUARD, MOVE_MIST
-.byte 30, 30, 40, 30, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 289 @ SPECIES_ID
-.string "NOONE$", 11 @ POKE_NICKNAME
-.string "AVERY$", 8 @ TRAINER_NAME
-.byte 38 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80020fff @ FLAGS
-.2byte 25 @ RANK
-.2byte MOVE_GROWL, MOVE_COVET, MOVE_SAND_ATTACK, MOVE_REST
-.byte 40, 40, 30, 10, 30, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 317 @ SPECIES_ID
-.string "KECON$", 11 @ POKE_NICKNAME
-.string "ARIANA$", 8 @ TRAINER_NAME
-.byte 10 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80010fff @ FLAGS
-.2byte 97 @ RANK
-.2byte MOVE_THIEF, MOVE_SCREECH, MOVE_ANCIENT_POWER, MOVE_BIND
-.byte 10, 10, 40, 75, 35, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 118 @ SPECIES_ID
-.string "GOLDEN$", 11 @ POKE_NICKNAME
-.string "ASHTON$", 8 @ TRAINER_NAME
-.byte 33 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80008fff @ FLAGS
-.2byte 13 @ RANK
-.2byte MOVE_HORN_ATTACK, MOVE_FURY_ATTACK, MOVE_HORN_DRILL, MOVE_TAIL_WHIP
-.byte 70, 30, 5, 30, 25, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 323 @ SPECIES_ID
-.string "BOBOACH$", 11 @ POKE_NICKNAME
-.string "SANDRA$", 8 @ TRAINER_NAME
-.byte 6 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80004fff @ FLAGS
-.2byte 113 @ RANK
-.2byte MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_EARTHQUAKE, MOVE_FUTURE_SIGHT
-.byte 45, 45, 60, 25, 15, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 227 @ SPECIES_ID
-.string "CORPY$", 11 @ POKE_NICKNAME
-.string "CARSON$", 8 @ TRAINER_NAME
-.byte 35 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08002fff @ FLAGS
-.2byte 77 @ RANK
-.2byte MOVE_SWIFT, MOVE_DOUBLE_TEAM, MOVE_AGILITY, MOVE_CUT
-.byte 40, 30, 25, 60, 20, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 295 @ SPECIES_ID
-.string "TADO$", 11 @ POKE_NICKNAME
-.string "KATRINA$", 8 @ TRAINER_NAME
-.byte 16 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x08001fff @ FLAGS
-.2byte 57 @ RANK
-.2byte MOVE_ASTONISH, MOVE_GROWL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
-.byte 15, 15, 30, 15, 75, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 383 @ SPECIES_ID
-.string "LAIRN$", 11 @ POKE_NICKNAME
-.string "RONNIE$", 8 @ TRAINER_NAME
-.byte 55 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x84000fff @ FLAGS
-.2byte 98 @ RANK
-.2byte MOVE_METAL_SOUND, MOVE_METAL_CLAW, MOVE_HARDEN, MOVE_TAKE_DOWN
-.byte 30, 50, 35, 100, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 299 @ SPECIES_ID
-.string "NUZLE$", 11 @ POKE_NICKNAME
-.string "CLAUDIA$", 8 @ TRAINER_NAME
-.byte 8 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x82000fff @ FLAGS
-.2byte 14 @ RANK
-.2byte MOVE_GROWTH, MOVE_RAZOR_WIND, MOVE_EXPLOSION, MOVE_EXTRASENSORY
-.byte 75, 75, 65, 35, 70, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 302 @ SPECIES_ID
-.string "NINAS$", 11 @ POKE_NICKNAME
-.string "ELIAS$", 8 @ TRAINER_NAME
-.byte 11 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x81000fff @ FLAGS
-.2byte 114 @ RANK
-.2byte MOVE_SCREECH, MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS
-.byte 30, 50, 95, 70, 70, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 305 @ SPECIES_ID
-.string "WELOW$", 11 @ POKE_NICKNAME
-.string "JADE$", 8 @ TRAINER_NAME
-.byte 18 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80800fff @ FLAGS
-.2byte 14 @ RANK
-.2byte MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_WING_ATTACK, MOVE_FLY
-.byte 65, 85, 35, 75, 40, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 287 @ SPECIES_ID
-.string "YENA$", 11 @ POKE_NICKNAME
-.string "FRANCIS$", 8 @ TRAINER_NAME
-.byte 44 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80400fff @ FLAGS
-.2byte 98 @ RANK
-.2byte MOVE_TAUNT, MOVE_THIEF, MOVE_ODOR_SLEUTH, MOVE_TAKE_DOWN
-.byte 40, 80, 35, 70, 70, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 292 @ SPECIES_ID
-.string "TIFLY$", 11 @ POKE_NICKNAME
-.string "ALISHA$", 8 @ TRAINER_NAME
-.byte 26 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80200fff @ FLAGS
-.2byte 42 @ RANK
-.2byte MOVE_MORNING_SUN, MOVE_SILVER_WIND, MOVE_STUN_SPORE, MOVE_SECRET_POWER
-.byte 40, 70, 25, 80, 100, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 119 @ SPECIES_ID
-.string "KINGSEA$", 11 @ POKE_NICKNAME
-.string "SAUL$", 8 @ TRAINER_NAME
-.byte 31 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80100fff @ FLAGS
-.2byte 118 @ RANK
-.2byte MOVE_FLAIL, MOVE_SUPERSONIC, MOVE_HORN_ATTACK, MOVE_FURY_ATTACK
-.byte 80, 60, 30, 70, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 340 @ SPECIES_ID
-.string "ERUPAM$", 11 @ POKE_NICKNAME
-.string "FELICIA$", 8 @ TRAINER_NAME
-.byte 47 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80080fff @ FLAGS
-.2byte 78 @ RANK
-.2byte MOVE_EARTHQUAKE, MOVE_FISSURE, MOVE_OVERHEAT, MOVE_HYPER_BEAM
-.byte 100, 80, 20, 50, 65, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 66 @ SPECIES_ID
-.string "CHOPAM$", 11 @ POKE_NICKNAME
-.string "EMILIO$", 8 @ TRAINER_NAME
-.byte 38 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80040fff @ FLAGS
-.2byte 66 @ RANK
-.2byte MOVE_SEISMIC_TOSS, MOVE_FOCUS_ENERGY, MOVE_KARATE_CHOP, MOVE_SCARY_FACE
-.byte 70, 85, 25, 60, 50, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 296 @ SPECIES_ID
-.string "LOMBE$", 11 @ POKE_NICKNAME
-.string "KARLA$", 8 @ TRAINER_NAME
-.byte 10 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80020fff @ FLAGS
-.2byte 58 @ RANK
-.2byte MOVE_ATTRACT, MOVE_FLASH, MOVE_UPROAR, MOVE_GROWL
-.byte 40, 60, 90, 45, 70, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 379 @ SPECIES_ID
-.string "VIPES$", 11 @ POKE_NICKNAME
-.string "DARRYL$", 8 @ TRAINER_NAME
-.byte 33 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80010fff @ FLAGS
-.2byte 98 @ RANK
-.2byte MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP, MOVE_SCREECH
-.byte 35, 50, 90, 40, 100, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 313 @ SPECIES_ID
-.string "MERAIL$", 11 @ POKE_NICKNAME
-.string "SELENA$", 8 @ TRAINER_NAME
-.byte 22 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80008fff @ FLAGS
-.2byte 26 @ RANK
-.2byte MOVE_WATER_PULSE, MOVE_REST, MOVE_WATER_SPOUT, MOVE_SPLASH
-.byte 30, 100, 100, 50, 30, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 129 @ SPECIES_ID
-.string "KARPAG$", 11 @ POKE_NICKNAME
-.string "NOEL$", 8 @ TRAINER_NAME
-.byte 35 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80004fff @ FLAGS
-.2byte 82 @ RANK
-.2byte MOVE_TACKLE, MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE
-.byte 30, 30, 160, 50, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 348 @ SPECIES_ID
-.string "LUNONE$", 11 @ POKE_NICKNAME
-.string "LACEY$", 8 @ TRAINER_NAME
-.byte 16 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80002fff @ FLAGS
-.2byte 42 @ RANK
-.2byte MOVE_EXPLOSION, MOVE_FUTURE_SIGHT, MOVE_PSYCHIC, MOVE_CONFUSION
-.byte 50, 70, 60, 70, 50, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 310 @ SPECIES_ID
-.string "PELIPE$", 11 @ POKE_NICKNAME
-.string "CORBIN$", 8 @ TRAINER_NAME
-.byte 39 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80001fff @ FLAGS
-.2byte 14 @ RANK
-.2byte MOVE_MIST, MOVE_HAIL, MOVE_HYPER_BEAM, MOVE_WING_ATTACK
-.byte 95, 80, 85, 35, 35, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 130 @ SPECIES_ID
-.string "RADOS$", 11 @ POKE_NICKNAME
-.string "JUSTINA$", 8 @ TRAINER_NAME
-.byte 32 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x84000fff @ FLAGS
-.2byte 79 @ RANK
-.2byte MOVE_HYPER_BEAM, MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE
-.byte 160, 200, 20, 40, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 371 @ SPECIES_ID
-.string "LOUDERD$", 11 @ POKE_NICKNAME
-.string "RALPH$", 8 @ TRAINER_NAME
-.byte 21 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x82000fff @ FLAGS
-.2byte 71 @ RANK
-.2byte MOVE_HYPER_VOICE, MOVE_STOMP, MOVE_ROAR, MOVE_HOWL
-.byte 170, 50, 55, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 316 @ SPECIES_ID
-.string "CATTED$", 11 @ POKE_NICKNAME
-.string "ROSA$", 8 @ TRAINER_NAME
-.byte 8 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x81000fff @ FLAGS
-.2byte 59 @ RANK
-.2byte MOVE_ATTRACT, MOVE_ASSIST, MOVE_FAINT_ATTACK, MOVE_TAIL_WHIP
-.byte 40, 200, 150, 185, 60, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 366 @ SPECIES_ID
-.string "SLING$", 11 @ POKE_NICKNAME
-.string "KEATON$", 8 @ TRAINER_NAME
-.byte 11 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80800fff @ FLAGS
-.2byte 115 @ RANK
-.2byte MOVE_COVET, MOVE_COUNTER, MOVE_ENCORE, MOVE_SLACK_OFF
-.byte 85, 85, 170, 110, 150, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 359 @ SPECIES_ID
-.string "TARIA$", 11 @ POKE_NICKNAME
-.string "MAYRA$", 8 @ TRAINER_NAME
-.byte 18 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80400fff @ FLAGS
-.2byte 15 @ RANK
-.2byte MOVE_DRAGON_DANCE, MOVE_HYPER_BEAM, MOVE_PERISH_SONG, MOVE_SAFEGUARD
-.byte 170, 150, 30, 30, 90, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 393 @ SPECIES_ID
-.string "SHEDJA$", 11 @ POKE_NICKNAME
-.string "LAMAR$", 8 @ TRAINER_NAME
-.byte 15 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80200fff @ FLAGS
-.2byte 39 @ RANK
-.2byte MOVE_SHOCK_WAVE, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP, MOVE_RETURN
-.byte 230, 60, 60, 230, 80, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 45 @ SPECIES_ID
-.string "PLUMILE$", 11 @ POKE_NICKNAME
-.string "AUBREY$", 8 @ TRAINER_NAME
-.byte 26 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80100fff @ FLAGS
-.2byte 59 @ RANK
-.2byte MOVE_PETAL_DANCE, MOVE_SWEET_SCENT, MOVE_STUN_SPORE, MOVE_FLASH
-.byte 35, 200, 150, 130, 40, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 361 @ SPECIES_ID
-.string "KULLUSK$", 11 @ POKE_NICKNAME
-.string "NIGEL$", 8 @ TRAINER_NAME
-.byte 31 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80080fff @ FLAGS
-.2byte 115 @ RANK
-.2byte MOVE_DISABLE, MOVE_FUTURE_SIGHT, MOVE_NIGHT_SHADE, MOVE_PURSUIT
-.byte 25, 35, 230, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 178 @ SPECIES_ID
-.string "UTAN$", 11 @ POKE_NICKNAME
-.string "CAMILLE$", 8 @ TRAINER_NAME
-.byte 47 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80040fff @ FLAGS
-.2byte 115 @ RANK
-.2byte MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_PSYCHIC
-.byte 35, 35, 150, 130, 170, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 331 @ SPECIES_ID
-.string "PEDOS$", 11 @ POKE_NICKNAME
-.string "DEON$", 8 @ TRAINER_NAME
-.byte 38 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80020fff @ FLAGS
-.2byte 87 @ RANK
-.2byte MOVE_AGILITY, MOVE_SWAGGER, MOVE_TAUNT, MOVE_TAKE_DOWN
-.byte 140, 70, 140, 75, 100, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 325 @ SPECIES_ID
-.string "LUVIS$", 11 @ POKE_NICKNAME
-.string "JANELLE$", 8 @ TRAINER_NAME
-.byte 10 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80010fff @ FLAGS
-.2byte 83 @ RANK
-.2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_TAKE_DOWN, MOVE_CHARM
-.byte 50, 100, 220, 40, 190, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 214 @ SPECIES_ID
-.string "HEROSS$", 11 @ POKE_NICKNAME
-.string "HEATH$", 8 @ TRAINER_NAME
-.byte 33 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80008fff @ FLAGS
-.2byte 71 @ RANK
-.2byte MOVE_STRENGTH, MOVE_ENDURE, MOVE_REVERSAL, MOVE_ROCK_TOMB
-.byte 170, 70, 110, 240, 140, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 101 @ SPECIES_ID
-.string "RODLECT$", 11 @ POKE_NICKNAME
-.string "SASHA$", 8 @ TRAINER_NAME
-.byte 6 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80004fff @ FLAGS
-.2byte 15 @ RANK
-.2byte MOVE_EXPLOSION, MOVE_LIGHT_SCREEN, MOVE_SWIFT, MOVE_FLASH
-.byte 200, 200, 30, 35, 50, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 172 @ SPECIES_ID
-.string "CHUPY$", 11 @ POKE_NICKNAME
-.string "FRANKIE$", 8 @ TRAINER_NAME
-.byte 35 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80002fff @ FLAGS
-.2byte 59 @ RANK
-.2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_REST, MOVE_TAIL_WHIP
-.byte 25, 150, 180, 115, 120, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
-
-.2byte 202 @ SPECIES_ID
-.string "WOBET$", 11 @ POKE_NICKNAME
-.string "HELEN$", 8 @ TRAINER_NAME
-.byte 16 @ TRAINER_SPRITE
-.2byte 0x0000 @padding
-.4byte 0x80001fff @ FLAGS
-.2byte 111 @ RANK
-.2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND
-.byte 60, 230, 50, 220, 210, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
-.4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+ .align 2
+gUnknown_083C9408:: @ 83C9408
+ .2byte 286 @ SPECIES_ID
+ .string "POOCHY$", 11 @ POKE_NICKNAME
+ .string "JIMMY$", 8 @ TRAINER_NAME
+ .byte 7 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x0c000fff @ FLAGS
+ .2byte 68 @ RANK
+ .2byte MOVE_ROAR, MOVE_BITE, MOVE_TAKE_DOWN, MOVE_HOWL
+ .byte 10, 4, 10, 3, 4, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 288 @ SPECIES_ID
+ .string "ZIGOON$", 11 @ POKE_NICKNAME
+ .string "EDITH$", 8 @ TRAINER_NAME
+ .byte 8 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x82000fff @ FLAGS
+ .2byte 16 @ RANK
+ .2byte MOVE_REST, MOVE_TAIL_WHIP, MOVE_TACKLE, MOVE_COVET
+ .byte 10, 10, 6, 1, 2, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 294 @ SPECIES_ID
+ .string "DUSTER$", 11 @ POKE_NICKNAME
+ .string "EVAN$", 8 @ TRAINER_NAME
+ .byte 11 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x21000fff @ FLAGS
+ .2byte 8 @ RANK
+ .2byte MOVE_SILVER_WIND, MOVE_MOONLIGHT, MOVE_LIGHT_SCREEN, MOVE_GUST
+ .byte 2, 10, 10, 12, 4, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 298 @ SPECIES_ID
+ .string "DOTS$", 11 @ POKE_NICKNAME
+ .string "KELSEY$", 8 @ TRAINER_NAME
+ .byte 16 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x20800fff @ FLAGS
+ .2byte 96 @ RANK
+ .2byte MOVE_BIDE, MOVE_SYNTHESIS, MOVE_BULLET_SEED, MOVE_GROWTH
+ .byte 3, 3, 5, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 304 @ SPECIES_ID
+ .string "TATAY$", 11 @ POKE_NICKNAME
+ .string "MADISON$", 8 @ TRAINER_NAME
+ .byte 18 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80400fff @ FLAGS
+ .2byte 4 @ RANK
+ .2byte MOVE_WING_ATTACK, MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_GROWL
+ .byte 1, 3, 3, 5, 4, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 301 @ SPECIES_ID
+ .string "NINDA$", 11 @ POKE_NICKNAME
+ .string "RAYMOND$", 8 @ TRAINER_NAME
+ .byte 44 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x10200fff @ FLAGS
+ .2byte 32 @ RANK
+ .2byte MOVE_LEECH_LIFE, MOVE_FALSE_SWIPE, MOVE_FURY_SWIPES, MOVE_MIND_READER
+ .byte 5, 2, 10, 7, 8, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 306 @ SPECIES_ID
+ .string "SMISH$", 11 @ POKE_NICKNAME
+ .string "GRANT$", 8 @ TRAINER_NAME
+ .byte 35 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x20100fff @ FLAGS
+ .2byte 32 @ RANK
+ .2byte MOVE_STUN_SPORE, MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_ATTRACT
+ .byte 3, 3, 10, 2, 2, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 309 @ SPECIES_ID
+ .string "GULWEE$", 11 @ POKE_NICKNAME
+ .string "PAIGE$", 8 @ TRAINER_NAME
+ .byte 26 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08080fff @ FLAGS
+ .2byte 24 @ RANK
+ .2byte MOVE_MIST, MOVE_WATER_GUN, MOVE_GROWL, MOVE_PURSUIT
+ .byte 3, 5, 1, 10, 10, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 364 @ SPECIES_ID
+ .string "SLOKTH$", 11 @ POKE_NICKNAME
+ .string "ALEC$", 8 @ TRAINER_NAME
+ .byte 31 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x40040fff @ FLAGS
+ .2byte 88 @ RANK
+ .2byte MOVE_STRENGTH, MOVE_COUNTER, MOVE_YAWN, MOVE_ENCORE
+ .byte 10, 4, 4, 5, 18, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 370 @ SPECIES_ID
+ .string "WHIRIS$", 11 @ POKE_NICKNAME
+ .string "SYDNEY$", 8 @ TRAINER_NAME
+ .byte 47 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80020fff @ FLAGS
+ .2byte 36 @ RANK
+ .2byte MOVE_ASTONISH, MOVE_SCREECH, MOVE_UPROAR, MOVE_HYPER_VOICE
+ .byte 2, 2, 7, 2, 7, 80 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 335 @ SPECIES_ID
+ .string "MAHITA$", 11 @ POKE_NICKNAME
+ .string "MORRIS$", 8 @ TRAINER_NAME
+ .byte 38 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08010fff @ FLAGS
+ .2byte 68 @ RANK
+ .2byte MOVE_SEISMIC_TOSS, MOVE_VITAL_THROW, MOVE_TACKLE, MOVE_REVERSAL
+ .byte 9, 1, 1, 8, 1, 90 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 382 @ SPECIES_ID
+ .string "RONAR$", 11 @ POKE_NICKNAME
+ .string "MARIAH$", 8 @ TRAINER_NAME
+ .byte 10 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08008fff @ FLAGS
+ .2byte 68 @ RANK
+ .2byte MOVE_METAL_CLAW, MOVE_IRON_DEFENSE, MOVE_HEADBUTT, MOVE_TAKE_DOWN
+ .byte 5, 10, 2, 10, 2, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 41 @ SPECIES_ID
+ .string "ZUTZU$", 11 @ POKE_NICKNAME
+ .string "RUSSELL$", 8 @ TRAINER_NAME
+ .byte 33 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x90004fff @ FLAGS
+ .2byte 56 @ RANK
+ .2byte MOVE_HAZE, MOVE_MEAN_LOOK, MOVE_CONFUSE_RAY, MOVE_LEECH_LIFE
+ .byte 4, 2, 2, 2, 10, 50 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 367 @ SPECIES_ID
+ .string "GULIN$", 11 @ POKE_NICKNAME
+ .string "MELANIE$", 8 @ TRAINER_NAME
+ .byte 6 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x40002fff @ FLAGS
+ .2byte 16 @ RANK
+ .2byte MOVE_SLUDGE, MOVE_AMNESIA, MOVE_TOXIC, MOVE_YAWN
+ .byte 1, 10, 1, 10, 5, 60 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 337 @ SPECIES_ID
+ .string "RIKELEC$", 11 @ POKE_NICKNAME
+ .string "CHANCE$", 8 @ TRAINER_NAME
+ .byte 15 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80001fff @ FLAGS
+ .2byte 12 @ RANK
+ .2byte MOVE_SPARK, MOVE_THUNDER_WAVE, MOVE_THUNDER, MOVE_ROAR
+ .byte 20, 10, 1, 1, 1, 70 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 363 @ SPECIES_ID
+ .string "RELIA$", 11 @ POKE_NICKNAME
+ .string "KARINA$", 8 @ TRAINER_NAME
+ .byte 32 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x24000fff @ FLAGS
+ .2byte 41 @ RANK
+ .2byte MOVE_PETAL_DANCE, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_INGRAIN
+ .byte 50, 15, 75, 10, 20, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 84 @ SPECIES_ID
+ .string "DUODO$", 11 @ POKE_NICKNAME
+ .string "BOBBY$", 8 @ TRAINER_NAME
+ .byte 51 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x82000fff @ FLAGS
+ .2byte 125 @ RANK
+ .2byte MOVE_PECK, MOVE_FURY_ATTACK, MOVE_RETURN, MOVE_GROWL
+ .byte 15, 21, 15, 85, 35, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 332 @ SPECIES_ID
+ .string "PINCHIN$", 11 @ POKE_NICKNAME
+ .string "CLAIRE$", 8 @ TRAINER_NAME
+ .byte 8 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x81000fff @ FLAGS
+ .2byte 113 @ RANK
+ .2byte MOVE_BITE, MOVE_SAND_ATTACK, MOVE_DIG, MOVE_FAINT_ATTACK
+ .byte 75, 25, 25, 10, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 344 @ SPECIES_ID
+ .string "NACAC$", 11 @ POKE_NICKNAME
+ .string "WILLIE$", 8 @ TRAINER_NAME
+ .byte 11 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80800fff @ FLAGS
+ .2byte 37 @ RANK
+ .2byte MOVE_SPIKES, MOVE_LEER, MOVE_POISON_STING, MOVE_SAND_ATTACK
+ .byte 10, 30, 25, 65, 25, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 27 @ SPECIES_ID
+ .string "SHRAND$", 11 @ POKE_NICKNAME
+ .string "CASSIDY$", 8 @ TRAINER_NAME
+ .byte 18 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x10400fff @ FLAGS
+ .2byte 69 @ RANK
+ .2byte MOVE_SLASH, MOVE_DEFENSE_CURL, MOVE_SWIFT, MOVE_FURY_SWIPES
+ .byte 30, 90, 30, 10, 100, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 318 @ SPECIES_ID
+ .string "TOYBAL$", 11 @ POKE_NICKNAME
+ .string "MORGAN$", 8 @ TRAINER_NAME
+ .byte 44 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08200fff @ FLAGS
+ .2byte 41 @ RANK
+ .2byte MOVE_SELF_DESTRUCT, MOVE_ROCK_TOMB, MOVE_PSYBEAM, MOVE_CONFUSION
+ .byte 50, 40, 10, 35, 35, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 339 @ SPECIES_ID
+ .string "LENUM$", 11 @ POKE_NICKNAME
+ .string "SUMMER$", 8 @ TRAINER_NAME
+ .byte 26 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x10100fff @ FLAGS
+ .2byte 77 @ RANK
+ .2byte MOVE_MAGNITUDE, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY, MOVE_FLAMETHROWER
+ .byte 40, 5, 40, 40, 40, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 308 @ SPECIES_ID
+ .string "SPININ$", 11 @ POKE_NICKNAME
+ .string "MILES$", 8 @ TRAINER_NAME
+ .byte 31 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80080fff @ FLAGS
+ .2byte 49 @ RANK
+ .2byte MOVE_TEETER_DANCE, MOVE_PSYCH_UP, MOVE_HYPNOSIS, MOVE_UPROAR
+ .byte 25, 75, 25, 10, 25, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 358 @ SPECIES_ID
+ .string "SWABY$", 11 @ POKE_NICKNAME
+ .string "AUDREY$", 8 @ TRAINER_NAME
+ .byte 47 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0xa0040fff @ FLAGS
+ .2byte 41 @ RANK
+ .2byte MOVE_MIRROR_MOVE, MOVE_PERISH_SONG, MOVE_SAFEGUARD, MOVE_MIST
+ .byte 30, 30, 40, 30, 25, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 289 @ SPECIES_ID
+ .string "NOONE$", 11 @ POKE_NICKNAME
+ .string "AVERY$", 8 @ TRAINER_NAME
+ .byte 38 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80020fff @ FLAGS
+ .2byte 25 @ RANK
+ .2byte MOVE_GROWL, MOVE_COVET, MOVE_SAND_ATTACK, MOVE_REST
+ .byte 40, 40, 30, 10, 30, 130 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 317 @ SPECIES_ID
+ .string "KECON$", 11 @ POKE_NICKNAME
+ .string "ARIANA$", 8 @ TRAINER_NAME
+ .byte 10 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80010fff @ FLAGS
+ .2byte 97 @ RANK
+ .2byte MOVE_THIEF, MOVE_SCREECH, MOVE_ANCIENT_POWER, MOVE_BIND
+ .byte 10, 10, 40, 75, 35, 140 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 118 @ SPECIES_ID
+ .string "GOLDEN$", 11 @ POKE_NICKNAME
+ .string "ASHTON$", 8 @ TRAINER_NAME
+ .byte 33 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80008fff @ FLAGS
+ .2byte 13 @ RANK
+ .2byte MOVE_HORN_ATTACK, MOVE_FURY_ATTACK, MOVE_HORN_DRILL, MOVE_TAIL_WHIP
+ .byte 70, 30, 5, 30, 25, 150 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 323 @ SPECIES_ID
+ .string "BOBOACH$", 11 @ POKE_NICKNAME
+ .string "SANDRA$", 8 @ TRAINER_NAME
+ .byte 6 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80004fff @ FLAGS
+ .2byte 113 @ RANK
+ .2byte MOVE_MUD_SPORT, MOVE_WATER_SPORT, MOVE_EARTHQUAKE, MOVE_FUTURE_SIGHT
+ .byte 45, 45, 60, 25, 15, 100 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 227 @ SPECIES_ID
+ .string "CORPY$", 11 @ POKE_NICKNAME
+ .string "CARSON$", 8 @ TRAINER_NAME
+ .byte 35 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08002fff @ FLAGS
+ .2byte 77 @ RANK
+ .2byte MOVE_SWIFT, MOVE_DOUBLE_TEAM, MOVE_AGILITY, MOVE_CUT
+ .byte 40, 30, 25, 60, 20, 110 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 295 @ SPECIES_ID
+ .string "TADO$", 11 @ POKE_NICKNAME
+ .string "KATRINA$", 8 @ TRAINER_NAME
+ .byte 16 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x08001fff @ FLAGS
+ .2byte 57 @ RANK
+ .2byte MOVE_ASTONISH, MOVE_GROWL, MOVE_RAIN_DANCE, MOVE_WATER_PULSE
+ .byte 15, 15, 30, 15, 75, 120 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 383 @ SPECIES_ID
+ .string "LAIRN$", 11 @ POKE_NICKNAME
+ .string "RONNIE$", 8 @ TRAINER_NAME
+ .byte 55 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x84000fff @ FLAGS
+ .2byte 98 @ RANK
+ .2byte MOVE_METAL_SOUND, MOVE_METAL_CLAW, MOVE_HARDEN, MOVE_TAKE_DOWN
+ .byte 30, 50, 35, 100, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 299 @ SPECIES_ID
+ .string "NUZLE$", 11 @ POKE_NICKNAME
+ .string "CLAUDIA$", 8 @ TRAINER_NAME
+ .byte 8 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x82000fff @ FLAGS
+ .2byte 14 @ RANK
+ .2byte MOVE_GROWTH, MOVE_RAZOR_WIND, MOVE_EXPLOSION, MOVE_EXTRASENSORY
+ .byte 75, 75, 65, 35, 70, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 302 @ SPECIES_ID
+ .string "NINAS$", 11 @ POKE_NICKNAME
+ .string "ELIAS$", 8 @ TRAINER_NAME
+ .byte 11 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x81000fff @ FLAGS
+ .2byte 114 @ RANK
+ .2byte MOVE_SCREECH, MOVE_FURY_SWIPES, MOVE_SAND_ATTACK, MOVE_BATON_PASS
+ .byte 30, 50, 95, 70, 70, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 305 @ SPECIES_ID
+ .string "WELOW$", 11 @ POKE_NICKNAME
+ .string "JADE$", 8 @ TRAINER_NAME
+ .byte 18 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80800fff @ FLAGS
+ .2byte 14 @ RANK
+ .2byte MOVE_AGILITY, MOVE_AERIAL_ACE, MOVE_WING_ATTACK, MOVE_FLY
+ .byte 65, 85, 35, 75, 40, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 287 @ SPECIES_ID
+ .string "YENA$", 11 @ POKE_NICKNAME
+ .string "FRANCIS$", 8 @ TRAINER_NAME
+ .byte 44 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80400fff @ FLAGS
+ .2byte 98 @ RANK
+ .2byte MOVE_TAUNT, MOVE_THIEF, MOVE_ODOR_SLEUTH, MOVE_TAKE_DOWN
+ .byte 40, 80, 35, 70, 70, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 292 @ SPECIES_ID
+ .string "TIFLY$", 11 @ POKE_NICKNAME
+ .string "ALISHA$", 8 @ TRAINER_NAME
+ .byte 26 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80200fff @ FLAGS
+ .2byte 42 @ RANK
+ .2byte MOVE_MORNING_SUN, MOVE_SILVER_WIND, MOVE_STUN_SPORE, MOVE_SECRET_POWER
+ .byte 40, 70, 25, 80, 100, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 119 @ SPECIES_ID
+ .string "KINGSEA$", 11 @ POKE_NICKNAME
+ .string "SAUL$", 8 @ TRAINER_NAME
+ .byte 31 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80100fff @ FLAGS
+ .2byte 118 @ RANK
+ .2byte MOVE_FLAIL, MOVE_SUPERSONIC, MOVE_HORN_ATTACK, MOVE_FURY_ATTACK
+ .byte 80, 60, 30, 70, 90, 200 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 340 @ SPECIES_ID
+ .string "ERUPAM$", 11 @ POKE_NICKNAME
+ .string "FELICIA$", 8 @ TRAINER_NAME
+ .byte 47 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80080fff @ FLAGS
+ .2byte 78 @ RANK
+ .2byte MOVE_EARTHQUAKE, MOVE_FISSURE, MOVE_OVERHEAT, MOVE_HYPER_BEAM
+ .byte 100, 80, 20, 50, 65, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 66 @ SPECIES_ID
+ .string "CHOPAM$", 11 @ POKE_NICKNAME
+ .string "EMILIO$", 8 @ TRAINER_NAME
+ .byte 38 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80040fff @ FLAGS
+ .2byte 66 @ RANK
+ .2byte MOVE_SEISMIC_TOSS, MOVE_FOCUS_ENERGY, MOVE_KARATE_CHOP, MOVE_SCARY_FACE
+ .byte 70, 85, 25, 60, 50, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 296 @ SPECIES_ID
+ .string "LOMBE$", 11 @ POKE_NICKNAME
+ .string "KARLA$", 8 @ TRAINER_NAME
+ .byte 10 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80020fff @ FLAGS
+ .2byte 58 @ RANK
+ .2byte MOVE_ATTRACT, MOVE_FLASH, MOVE_UPROAR, MOVE_GROWL
+ .byte 40, 60, 90, 45, 70, 230 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 379 @ SPECIES_ID
+ .string "VIPES$", 11 @ POKE_NICKNAME
+ .string "DARRYL$", 8 @ TRAINER_NAME
+ .byte 33 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80010fff @ FLAGS
+ .2byte 98 @ RANK
+ .2byte MOVE_POISON_FANG, MOVE_GLARE, MOVE_WRAP, MOVE_SCREECH
+ .byte 35, 50, 90, 40, 100, 240 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 313 @ SPECIES_ID
+ .string "MERAIL$", 11 @ POKE_NICKNAME
+ .string "SELENA$", 8 @ TRAINER_NAME
+ .byte 22 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80008fff @ FLAGS
+ .2byte 26 @ RANK
+ .2byte MOVE_WATER_PULSE, MOVE_REST, MOVE_WATER_SPOUT, MOVE_SPLASH
+ .byte 30, 100, 100, 50, 30, 250 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 129 @ SPECIES_ID
+ .string "KARPAG$", 11 @ POKE_NICKNAME
+ .string "NOEL$", 8 @ TRAINER_NAME
+ .byte 35 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80004fff @ FLAGS
+ .2byte 82 @ RANK
+ .2byte MOVE_TACKLE, MOVE_SPLASH, MOVE_FLAIL, MOVE_TACKLE
+ .byte 30, 30, 160, 50, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 348 @ SPECIES_ID
+ .string "LUNONE$", 11 @ POKE_NICKNAME
+ .string "LACEY$", 8 @ TRAINER_NAME
+ .byte 16 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80002fff @ FLAGS
+ .2byte 42 @ RANK
+ .2byte MOVE_EXPLOSION, MOVE_FUTURE_SIGHT, MOVE_PSYCHIC, MOVE_CONFUSION
+ .byte 50, 70, 60, 70, 50, 210 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 310 @ SPECIES_ID
+ .string "PELIPE$", 11 @ POKE_NICKNAME
+ .string "CORBIN$", 8 @ TRAINER_NAME
+ .byte 39 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80001fff @ FLAGS
+ .2byte 14 @ RANK
+ .2byte MOVE_MIST, MOVE_HAIL, MOVE_HYPER_BEAM, MOVE_WING_ATTACK
+ .byte 95, 80, 85, 35, 35, 220 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 130 @ SPECIES_ID
+ .string "RADOS$", 11 @ POKE_NICKNAME
+ .string "JUSTINA$", 8 @ TRAINER_NAME
+ .byte 32 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x84000fff @ FLAGS
+ .2byte 79 @ RANK
+ .2byte MOVE_HYPER_BEAM, MOVE_HYDRO_PUMP, MOVE_RAIN_DANCE, MOVE_BITE
+ .byte 160, 200, 20, 40, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 371 @ SPECIES_ID
+ .string "LOUDERD$", 11 @ POKE_NICKNAME
+ .string "RALPH$", 8 @ TRAINER_NAME
+ .byte 21 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x82000fff @ FLAGS
+ .2byte 71 @ RANK
+ .2byte MOVE_HYPER_VOICE, MOVE_STOMP, MOVE_ROAR, MOVE_HOWL
+ .byte 170, 50, 55, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 316 @ SPECIES_ID
+ .string "CATTED$", 11 @ POKE_NICKNAME
+ .string "ROSA$", 8 @ TRAINER_NAME
+ .byte 8 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x81000fff @ FLAGS
+ .2byte 59 @ RANK
+ .2byte MOVE_ATTRACT, MOVE_ASSIST, MOVE_FAINT_ATTACK, MOVE_TAIL_WHIP
+ .byte 40, 200, 150, 185, 60, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 366 @ SPECIES_ID
+ .string "SLING$", 11 @ POKE_NICKNAME
+ .string "KEATON$", 8 @ TRAINER_NAME
+ .byte 11 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80800fff @ FLAGS
+ .2byte 115 @ RANK
+ .2byte MOVE_COVET, MOVE_COUNTER, MOVE_ENCORE, MOVE_SLACK_OFF
+ .byte 85, 85, 170, 110, 150, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 359 @ SPECIES_ID
+ .string "TARIA$", 11 @ POKE_NICKNAME
+ .string "MAYRA$", 8 @ TRAINER_NAME
+ .byte 18 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80400fff @ FLAGS
+ .2byte 15 @ RANK
+ .2byte MOVE_DRAGON_DANCE, MOVE_HYPER_BEAM, MOVE_PERISH_SONG, MOVE_SAFEGUARD
+ .byte 170, 150, 30, 30, 90, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 393 @ SPECIES_ID
+ .string "SHEDJA$", 11 @ POKE_NICKNAME
+ .string "LAMAR$", 8 @ TRAINER_NAME
+ .byte 15 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80200fff @ FLAGS
+ .2byte 39 @ RANK
+ .2byte MOVE_SHOCK_WAVE, MOVE_SHADOW_BALL, MOVE_SKILL_SWAP, MOVE_RETURN
+ .byte 230, 60, 60, 230, 80, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 45 @ SPECIES_ID
+ .string "PLUMILE$", 11 @ POKE_NICKNAME
+ .string "AUBREY$", 8 @ TRAINER_NAME
+ .byte 26 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80100fff @ FLAGS
+ .2byte 59 @ RANK
+ .2byte MOVE_PETAL_DANCE, MOVE_SWEET_SCENT, MOVE_STUN_SPORE, MOVE_FLASH
+ .byte 35, 200, 150, 130, 40, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 361 @ SPECIES_ID
+ .string "KULLUSK$", 11 @ POKE_NICKNAME
+ .string "NIGEL$", 8 @ TRAINER_NAME
+ .byte 31 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80080fff @ FLAGS
+ .2byte 115 @ RANK
+ .2byte MOVE_DISABLE, MOVE_FUTURE_SIGHT, MOVE_NIGHT_SHADE, MOVE_PURSUIT
+ .byte 25, 35, 230, 150, 160, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 178 @ SPECIES_ID
+ .string "UTAN$", 11 @ POKE_NICKNAME
+ .string "CAMILLE$", 8 @ TRAINER_NAME
+ .byte 47 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80040fff @ FLAGS
+ .2byte 115 @ RANK
+ .2byte MOVE_NIGHT_SHADE, MOVE_FUTURE_SIGHT, MOVE_CONFUSE_RAY, MOVE_PSYCHIC
+ .byte 35, 35, 150, 130, 170, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 331 @ SPECIES_ID
+ .string "PEDOS$", 11 @ POKE_NICKNAME
+ .string "DEON$", 8 @ TRAINER_NAME
+ .byte 38 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80020fff @ FLAGS
+ .2byte 87 @ RANK
+ .2byte MOVE_AGILITY, MOVE_SWAGGER, MOVE_TAUNT, MOVE_TAKE_DOWN
+ .byte 140, 70, 140, 75, 100, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 325 @ SPECIES_ID
+ .string "LUVIS$", 11 @ POKE_NICKNAME
+ .string "JANELLE$", 8 @ TRAINER_NAME
+ .byte 10 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80010fff @ FLAGS
+ .2byte 83 @ RANK
+ .2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_TAKE_DOWN, MOVE_CHARM
+ .byte 50, 100, 220, 40, 190, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 214 @ SPECIES_ID
+ .string "HEROSS$", 11 @ POKE_NICKNAME
+ .string "HEATH$", 8 @ TRAINER_NAME
+ .byte 33 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80008fff @ FLAGS
+ .2byte 71 @ RANK
+ .2byte MOVE_STRENGTH, MOVE_ENDURE, MOVE_REVERSAL, MOVE_ROCK_TOMB
+ .byte 170, 70, 110, 240, 140, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 101 @ SPECIES_ID
+ .string "RODLECT$", 11 @ POKE_NICKNAME
+ .string "SASHA$", 8 @ TRAINER_NAME
+ .byte 6 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80004fff @ FLAGS
+ .2byte 15 @ RANK
+ .2byte MOVE_EXPLOSION, MOVE_LIGHT_SCREEN, MOVE_SWIFT, MOVE_FLASH
+ .byte 200, 200, 30, 35, 50, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 172 @ SPECIES_ID
+ .string "CHUPY$", 11 @ POKE_NICKNAME
+ .string "FRANKIE$", 8 @ TRAINER_NAME
+ .byte 35 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80002fff @ FLAGS
+ .2byte 59 @ RANK
+ .2byte MOVE_SWEET_KISS, MOVE_ATTRACT, MOVE_REST, MOVE_TAIL_WHIP
+ .byte 25, 150, 180, 115, 120, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
+
+ .2byte 202 @ SPECIES_ID
+ .string "WOBET$", 11 @ POKE_NICKNAME
+ .string "HELEN$", 8 @ TRAINER_NAME
+ .byte 16 @ TRAINER_SPRITE
+ .2byte 0x0000 @padding
+ .4byte 0x80001fff @ FLAGS
+ .2byte 111 @ RANK
+ .2byte MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_SAFEGUARD, MOVE_DESTINY_BOND
+ .byte 60, 230, 50, 220, 210, 255 @ STAT_COOL, STAT_BEAUTY, STAT_CUTE, STAT_SMART, STAT_TOUGH, STAT_SHEEN
+ .4byte 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000ffff @ RESERVED
@ credit to Valkyrie for helping me properly dump these structs
diff --git a/data/data1.s b/data/data1.s
deleted file mode 100644
index 2abcce8f9..000000000
--- a/data/data1.s
+++ /dev/null
@@ -1,605 +0,0 @@
- .include "asm/macros.s"
- .include "constants/constants.s"
-
- .section script_data, "aw", %progbits
-
-gUnknown_081D6BBC:: @ 81D6BBC
- .incbin "baserom.gba", 0x001d6bbc, 0x388
-
-gUnknown_081D6F44:: @ 81D6F44
- .incbin "baserom.gba", 0x001d6f44, 0x1e
-
-gUnknown_081D6F62:: @ 81D6F62
- .incbin "baserom.gba", 0x001d6f62, 0x12
-
-gUnknown_081D6F74:: @ 81D6F74
- .incbin "baserom.gba", 0x001d6f74, 0x271
-
-gUnknown_081D71E5:: @ 81D71E5
- .incbin "baserom.gba", 0x001d71e5, 0x91
-
-gUnknown_081D7276:: @ 81D7276
- .incbin "baserom.gba", 0x001d7276, 0x6e0
-
-gUnknown_081D7956:: @ 81D7956
- .incbin "baserom.gba", 0x001d7956, 0xa45
-
-gUnknown_081D839B:: @ 81D839B
- .incbin "baserom.gba", 0x001d839b, 0x1a
-
-gUnknown_081D83B5:: @ 81D83B5
- .incbin "baserom.gba", 0x001d83b5, 0x21
-
-gUnknown_081D83D6:: @ 81D83D6
- .incbin "baserom.gba", 0x001d83d6, 0x882
-
-gUnknown_081D8C58:: @ 81D8C58
- .incbin "baserom.gba", 0x001d8c58, 0xd
-
-gUnknown_081D8C65:: @ 81D8C65
- .incbin "baserom.gba", 0x001d8c65, 0xd
-
-gUnknown_081D8C72:: @ 81D8C72
- .incbin "baserom.gba", 0x001d8c72, 0x9
-
-gUnknown_081D8C7B:: @ 81D8C7B
- .incbin "baserom.gba", 0x001d8c7b, 0x143
-
-gUnknown_081D8DBE:: @ 81D8DBE
- .incbin "baserom.gba", 0x001d8dbe, 0x10
-
-gUnknown_081D8DCE:: @ 81D8DCE
- .incbin "baserom.gba", 0x001d8dce, 0x3
-
-gUnknown_081D8DD1:: @ 81D8DD1
- .incbin "baserom.gba", 0x001d8dd1, 0x31
-
-gUnknown_081D8E02:: @ 81D8E02
- .incbin "baserom.gba", 0x001d8e02, 0xb
-
-gUnknown_081D8E0D:: @ 81D8E0D
- .incbin "baserom.gba", 0x001d8e0d, 0x7
-
-gUnknown_081D8E14:: @ 81D8E14
- .incbin "baserom.gba", 0x001d8e14, 0xe
-
-gUnknown_081D8E22:: @ 81D8E22
- .incbin "baserom.gba", 0x001d8e22, 0x7
-
-gUnknown_081D8E29:: @ 81D8E29
- .incbin "baserom.gba", 0x001d8e29, 0x7
-
-gUnknown_081D8E30:: @ 81D8E30
- .incbin "baserom.gba", 0x001d8e30, 0x7
-
-gUnknown_081D8E37:: @ 81D8E37
- .incbin "baserom.gba", 0x001d8e37, 0x4
-
-gUnknown_081D8E3B:: @ 81D8E3B
- .incbin "baserom.gba", 0x001d8e3b, 0x9
-
-gUnknown_081D8E44:: @ 81D8E44
- .incbin "baserom.gba", 0x001d8e44, 0x6
-
-gUnknown_081D8E4A:: @ 81D8E4A
- .incbin "baserom.gba", 0x001d8e4a, 0x4
-
-gUnknown_081D8E4E:: @ 81D8E4E
- .incbin "baserom.gba", 0x001d8e4e, 0xa1
-
-gUnknown_081D8EEF:: @ 81D8EEF
- .incbin "baserom.gba", 0x001d8eef, 0x4
-
-gUnknown_081D8EF3:: @ 81D8EF3
- .incbin "baserom.gba", 0x001d8ef3, 0x6f
-
-gUnknown_081D8F62:: @ 81D8F62
- .incbin "baserom.gba", 0x001d8f62, 0x1b
-
-gUnknown_081D8F7D:: @ 81D8F7D
- .incbin "baserom.gba", 0x001d8f7d, 0x82
-
-gUnknown_081D8FFF:: @ 81D8FFF
- .incbin "baserom.gba", 0x001d8fff, 0x9
-
-gUnknown_081D9008:: @ 81D9008
- .incbin "baserom.gba", 0x001d9008, 0xe
-
-gUnknown_081D9016:: @ 81D9016
- .incbin "baserom.gba", 0x001d9016, 0x7
-
-gUnknown_081D901D:: @ 81D901D
- .incbin "baserom.gba", 0x001d901d, 0x13
-
-gUnknown_081D9030:: @ 81D9030
- .incbin "baserom.gba", 0x001d9030, 0x11
-
-gUnknown_081D9041:: @ 81D9041
- .incbin "baserom.gba", 0x001d9041, 0xa
-
-gUnknown_081D904B:: @ 81D904B
- .incbin "baserom.gba", 0x001d904b, 0x5c
-
-gUnknown_081D90A7:: @ 81D90A7
- .incbin "baserom.gba", 0x001d90a7, 0xb
-
-gUnknown_081D90B2:: @ 81D90B2
- .incbin "baserom.gba", 0x001d90b2, 0x3f
-
-gUnknown_081D90F1:: @ 81D90F1
- .incbin "baserom.gba", 0x001d90f1, 0xb
-
-gUnknown_081D90FC:: @ 81D90FC
- .incbin "baserom.gba", 0x001d90fc, 0x2c
-
-gUnknown_081D9128:: @ 81D9128
- .incbin "baserom.gba", 0x001d9128, 0xa
-
-gUnknown_081D9132:: @ 81D9132
- .incbin "baserom.gba", 0x001d9132, 0x7
-
-gUnknown_081D9139:: @ 81D9139
- .incbin "baserom.gba", 0x001d9139, 0xb
-
-gUnknown_081D9144:: @ 81D9144
- .incbin "baserom.gba", 0x001d9144, 0x4
-
-gUnknown_081D9148:: @ 81D9148
- .incbin "baserom.gba", 0x001d9148, 0x7
-
-gUnknown_081D914F:: @ 81D914F
- .incbin "baserom.gba", 0x001d914f, 0x7
-
-gUnknown_081D9156:: @ 81D9156
- .incbin "baserom.gba", 0x001d9156, 0x1b
-
-gUnknown_081D9171:: @ 81D9171
- .incbin "baserom.gba", 0x001d9171, 0x2e
-
-gUnknown_081D919F:: @ 81D919F
- .incbin "baserom.gba", 0x001d919f, 0x2e
-
-gUnknown_081D91CD:: @ 81D91CD
- .incbin "baserom.gba", 0x001d91cd, 0x35
-
-gUnknown_081D9202:: @ 81D9202
- .incbin "baserom.gba", 0x001d9202, 0x1b
-
-gUnknown_081D921D:: @ 81D921D
- .incbin "baserom.gba", 0x001d921d, 0x7
-
-gUnknown_081D9224:: @ 81D9224
- .incbin "baserom.gba", 0x001d9224, 0x9c
-
-gUnknown_081D92C0:: @ 81D92C0
- .incbin "baserom.gba", 0x001d92c0, 0x2
-
-gUnknown_081D92C2:: @ 81D92C2
- .incbin "baserom.gba", 0x001d92c2, 0x7
-
-gUnknown_081D92C9:: @ 81D92C9
- .incbin "baserom.gba", 0x001d92c9, 0x7
-
-gUnknown_081D92D0:: @ 81D92D0
- .incbin "baserom.gba", 0x001d92d0, 0x7
-
-gUnknown_081D92D7:: @ 81D92D7
- .incbin "baserom.gba", 0x001d92d7, 0x8e
-
-gUnknown_081D9365:: @ 81D9365
- .incbin "baserom.gba", 0x001d9365, 0x4
-
-gUnknown_081D9369:: @ 81D9369
- .incbin "baserom.gba", 0x001d9369, 0x4
-
-gUnknown_081D936D:: @ 81D936D
- .incbin "baserom.gba", 0x001d936d, 0xf
-
-gUnknown_081D937C:: @ 81D937C
- .incbin "baserom.gba", 0x001d937c, 0xf
-
-gUnknown_081D938B:: @ 81D938B
- .incbin "baserom.gba", 0x001d938b, 0x4
-
-gUnknown_081D938F:: @ 81D938F
- .incbin "baserom.gba", 0x001d938f, 0xb
-
-gUnknown_081D939A:: @ 81D939A
- .incbin "baserom.gba", 0x001d939a, 0x37
-
-gUnknown_081D93D1:: @ 81D93D1
- .incbin "baserom.gba", 0x001d93d1, 0x29
-
-gUnknown_081D93FA:: @ 81D93FA
- .incbin "baserom.gba", 0x001d93fa, 0x51
-
-gUnknown_081D944B:: @ 81D944B
- .incbin "baserom.gba", 0x001d944b, 0xe
-
-gUnknown_081D9459:: @ 81D9459
- .incbin "baserom.gba", 0x001d9459, 0xb
-
-gUnknown_081D9464:: @ 81D9464
- .incbin "baserom.gba", 0x001d9464, 0x4
-
-gUnknown_081D9468:: @ 81D9468
- .incbin "baserom.gba", 0x001d9468, 0x7
-
-gUnknown_081D946F:: @ 81D946F
- .incbin "baserom.gba", 0x001d946f, 0x18
-
-gUnknown_081D9487:: @ 81D9487
- .incbin "baserom.gba", 0x001d9487, 0x1b
-
-gUnknown_081D94A2:: @ 81D94A2
- .incbin "baserom.gba", 0x001d94a2, 0x7
-
-gUnknown_081D94A9:: @ 81D94A9
- .incbin "baserom.gba", 0x001d94a9, 0x7
-
-gUnknown_081D94B0:: @ 81D94B0
- .incbin "baserom.gba", 0x001d94b0, 0x2a
-
-gUnknown_081D94DA:: @ 81D94DA
- .incbin "baserom.gba", 0x001d94da, 0x14
-
-gUnknown_081D94EE:: @ 81D94EE
- .incbin "baserom.gba", 0x001d94ee, 0xd
-
-gUnknown_081D94FB:: @ 81D94FB
- .incbin "baserom.gba", 0x001d94fb, 0x14
-
-gUnknown_081D950F:: @ 81D950F
- .incbin "baserom.gba", 0x001d950f, 0x9
-
-gUnknown_081D9518:: @ 81D9518
- .incbin "baserom.gba", 0x001d9518, 0x22
-
-gUnknown_081D953A:: @ 81D953A
- .incbin "baserom.gba", 0x001d953a, 0xb
-
-gUnknown_081D9545:: @ 81D9545
- .incbin "baserom.gba", 0x001d9545, 0xd
-
-gUnknown_081D9552:: @ 81D9552
- .incbin "baserom.gba", 0x001d9552, 0xb
-
-gUnknown_081D955D:: @ 81D955D
- .incbin "baserom.gba", 0x001d955d, 0x9
-
-gUnknown_081D9566:: @ 81D9566
- .incbin "baserom.gba", 0x001d9566, 0xd
-
-gUnknown_081D9573:: @ 81D9573
- .incbin "baserom.gba", 0x001d9573, 0xb
-
-gUnknown_081D957E:: @ 81D957E
- .incbin "baserom.gba", 0x001d957e, 0x9
-
-gUnknown_081D9587:: @ 81D9587
- .incbin "baserom.gba", 0x001d9587, 0xe
-
-gUnknown_081D9595:: @ 81D9595
- .incbin "baserom.gba", 0x001d9595, 0x3f
-
-gUnknown_081D95D4:: @ 81D95D4
- .incbin "baserom.gba", 0x001d95d4, 0x7
-
-gUnknown_081D95DB:: @ 81D95DB
- .incbin "baserom.gba", 0x001d95db, 0x7
-
-gUnknown_081D95E2:: @ 81D95E2
- .incbin "baserom.gba", 0x001d95e2, 0x12
-
-gUnknown_081D95F4:: @ 81D95F4
- .incbin "baserom.gba", 0x001d95f4, 0x7
-
-gUnknown_081D95FB:: @ 81D95FB
- .incbin "baserom.gba", 0x001d95fb, 0xd
-
-gUnknown_081D9608:: @ 81D9608
- .incbin "baserom.gba", 0x001d9608, 0xb
-
-gUnknown_081D9613:: @ 81D9613
- .incbin "baserom.gba", 0x001d9613, 0x11
-
-gUnknown_081D9624:: @ 81D9624
- .incbin "baserom.gba", 0x001d9624, 0x11
-
-gUnknown_081D9635:: @ 81D9635
- .incbin "baserom.gba", 0x001d9635, 0x9
-
-gUnknown_081D963E:: @ 81D963E
- .incbin "baserom.gba", 0x001d963e, 0xe
-
-gUnknown_081D964C:: @ 81D964C
- .incbin "baserom.gba", 0x001d964c, 0xe
-
-gUnknown_081D965A:: @ 81D965A
- .incbin "baserom.gba", 0x001d965a, 0xf
-
-gUnknown_081D9669:: @ 81D9669
- .incbin "baserom.gba", 0x001d9669, 0xf
-
-gUnknown_081D9678:: @ 81D9678
- .incbin "baserom.gba", 0x001d9678, 0xf
-
-gUnknown_081D9687:: @ 81D9687
- .incbin "baserom.gba", 0x001d9687, 0xf
-
-gUnknown_081D9696:: @ 81D9696
- .incbin "baserom.gba", 0x001d9696, 0x7
-
-gUnknown_081D969D:: @ 81D969D
- .incbin "baserom.gba", 0x001d969d, 0xd
-
-gUnknown_081D96AA:: @ 81D96AA
- .incbin "baserom.gba", 0x001d96aa, 0x7
-
-gUnknown_081D96B1:: @ 81D96B1
- .incbin "baserom.gba", 0x001d96b1, 0x9
-
-gUnknown_081D96BA:: @ 81D96BA
- .incbin "baserom.gba", 0x001d96ba, 0xe
-
-gUnknown_081D96C8:: @ 81D96C8
- .incbin "baserom.gba", 0x001d96c8, 0x2e
-
-gUnknown_081D96F6:: @ 81D96F6
- .incbin "baserom.gba", 0x001d96f6, 0xe
-
-gUnknown_081D9704:: @ 81D9704
- .incbin "baserom.gba", 0x001d9704, 0x14
-
-gUnknown_081D9718:: @ 81D9718
- .incbin "baserom.gba", 0x001d9718, 0xe
-
-gUnknown_081D9726:: @ 81D9726
- .incbin "baserom.gba", 0x001d9726, 0xa
-
-gUnknown_081D9730:: @ 81D9730
- .incbin "baserom.gba", 0x001d9730, 0x14
-
-gUnknown_081D9744:: @ 81D9744
- .incbin "baserom.gba", 0x001d9744, 0x14
-
-gUnknown_081D9758:: @ 81D9758
- .incbin "baserom.gba", 0x001d9758, 0x25
-
-gUnknown_081D977D:: @ 81D977D
- .incbin "baserom.gba", 0x001d977d, 0xf
-
-gUnknown_081D978C:: @ 81D978C
- .incbin "baserom.gba", 0x001d978c, 0x9
-
-gUnknown_081D9795:: @ 81D9795
- .incbin "baserom.gba", 0x001d9795, 0x69
-
-gUnknown_081D97FE:: @ 81D97FE
- .incbin "baserom.gba", 0x001d97fe, 0x14
-
-gUnknown_081D9812:: @ 81D9812
- .incbin "baserom.gba", 0x001d9812, 0x14
-
-gUnknown_081D9826:: @ 81D9826
- .incbin "baserom.gba", 0x001d9826, 0xe
-
-gUnknown_081D9834:: @ 81D9834
- .incbin "baserom.gba", 0x001d9834, 0xe
-
-gUnknown_081D9842:: @ 81D9842
- .incbin "baserom.gba", 0x001d9842, 0x1
-
-gUnknown_081D9843:: @ 81D9843
- .incbin "baserom.gba", 0x001d9843, 0x22
-
-gUnknown_081D9865:: @ 81D9865
- .incbin "baserom.gba", 0x001d9865, 0x1
-
-gUnknown_081D9866:: @ 81D9866
- .incbin "baserom.gba", 0x001d9866, 0x15
-
-gUnknown_081D987B:: @ 81D987B
- .incbin "baserom.gba", 0x001d987b, 0x1
-
-gUnknown_081D987C:: @ 81D987C
- .incbin "baserom.gba", 0x001d987c, 0x1f
-
-gUnknown_081D989B:: @ 81D989B
- .incbin "baserom.gba", 0x001d989b, 0xa
-
-gUnknown_081D98A5:: @ 81D98A5
- .incbin "baserom.gba", 0x001d98a5, 0xc
-
-gUnknown_081D98B1:: @ 81D98B1
- .incbin "baserom.gba", 0x001d98b1, 0xc
-
-gUnknown_081D98BD:: @ 81D98BD
- .incbin "baserom.gba", 0x001d98bd, 0xc
-
-gUnknown_081D98C9:: @ 81D98C9
- .incbin "baserom.gba", 0x001d98c9, 0xe
-
-gUnknown_081D98D7:: @ 81D98D7
- .incbin "baserom.gba", 0x001d98d7, 0x1c
-
-gUnknown_081D98F3:: @ 81D98F3
- .incbin "baserom.gba", 0x001d98f3, 0x10
-
-gUnknown_081D9903:: @ 81D9903
- .incbin "baserom.gba", 0x001d9903, 0x10
-
-gUnknown_081D9913:: @ 81D9913
- .incbin "baserom.gba", 0x001d9913, 0xe
-
-gUnknown_081D9921:: @ 81D9921
- .incbin "baserom.gba", 0x001d9921, 0x7
-
-gUnknown_081D9928:: @ 81D9928
- .incbin "baserom.gba", 0x001d9928, 0x1b
-
-gUnknown_081D9943:: @ 81D9943
- .incbin "baserom.gba", 0x001d9943, 0xd
-
-gUnknown_081D9950:: @ 81D9950
- .incbin "baserom.gba", 0x001d9950, 0x3
-
-gUnknown_081D9953:: @ 81D9953
- .incbin "baserom.gba", 0x001d9953, 0x3
-
-gUnknown_081D9956:: @ 81D9956
- .incbin "baserom.gba", 0x001d9956, 0x9
-
-gUnknown_081D995F:: @ 81D995F
- .incbin "baserom.gba", 0x001d995f, 0x10
-
-gUnknown_081D996F:: @ 81D996F
- .incbin "baserom.gba", 0x001d996f, 0x8
-
-gUnknown_081D9977:: @ 81D9977
- .incbin "baserom.gba", 0x001d9977, 0x12
-
-gUnknown_081D9989:: @ 81D9989
- .incbin "baserom.gba", 0x001d9989, 0x17
-
-gUnknown_081D99A0:: @ 81D99A0
- .incbin "baserom.gba", 0x001d99a0, 0xb
-
-gUnknown_081D99AB:: @ 81D99AB
- .incbin "baserom.gba", 0x001d99ab, 0xb
-
-gUnknown_081D99B6:: @ 81D99B6
- .incbin "baserom.gba", 0x001d99b6, 0x6
-
-gUnknown_081D99BC:: @ 81D99BC
- .incbin "baserom.gba", 0x001d99bc, 0x12
-
-gUnknown_081D99CE:: @ 81D99CE
- .incbin "baserom.gba", 0x001d99ce, 0x6
-
-gUnknown_081D99D4:: @ 81D99D4
- .incbin "baserom.gba", 0x001d99d4, 0x12
-
-gUnknown_081D99E6:: @ 81D99E6
- .incbin "baserom.gba", 0x001d99e6, 0x6
-
-gUnknown_081D99EC:: @ 81D99EC
- .incbin "baserom.gba", 0x001d99ec, 0x12
-
-gUnknown_081D99FE:: @ 81D99FE
- .incbin "baserom.gba", 0x001d99fe, 0x6
-
-gUnknown_081D9A04:: @ 81D9A04
- .incbin "baserom.gba", 0x001d9a04, 0x12
-
-gUnknown_081D9A16:: @ 81D9A16
- .incbin "baserom.gba", 0x001d9a16, 0x6
-
-gUnknown_081D9A1C:: @ 81D9A1C
- .incbin "baserom.gba", 0x001d9a1c, 0x12
-
-gUnknown_081D9A2E:: @ 81D9A2E
- .incbin "baserom.gba", 0x001d9a2e, 0x6
-
-gUnknown_081D9A34:: @ 81D9A34
- .incbin "baserom.gba", 0x001d9a34, 0x10
-
-gUnknown_081D9A44:: @ 81D9A44
- .incbin "baserom.gba", 0x001d9a44, 0x6
-
-gUnknown_081D9A4A:: @ 81D9A4A
- .incbin "baserom.gba", 0x001d9a4a, 0x14
-
-gUnknown_081D9A5E:: @ 81D9A5E
- .incbin "baserom.gba", 0x001d9a5e, 0x6
-
-gUnknown_081D9A64:: @ 81D9A64
- .incbin "baserom.gba", 0x001d9a64, 0x10
-
-gUnknown_081D9A74:: @ 81D9A74
- .incbin "baserom.gba", 0x001d9a74, 0x1d
-
-gUnknown_081D9A91:: @ 81D9A91
- .incbin "baserom.gba", 0x001d9a91, 0x10
-
-gUnknown_081D9AA1:: @ 81D9AA1
- .incbin "baserom.gba", 0x001d9aa1, 0x6
-
-gUnknown_081D9AA7:: @ 81D9AA7
- .incbin "baserom.gba", 0x001d9aa7, 0x1b
-
-gUnknown_081D9AC2:: @ 81D9AC2
- .incbin "baserom.gba", 0x001d9ac2, 0x4
-
-gUnknown_081D9AC6:: @ 81D9AC6
- .incbin "baserom.gba", 0x001d9ac6, 0xe
-
-gUnknown_081D9AD4:: @ 81D9AD4
- .incbin "baserom.gba", 0x001d9ad4, 0x2a
-
-gUnknown_081D9AFE:: @ 81D9AFE
- .incbin "baserom.gba", 0x001d9afe, 0x1b
-
-gUnknown_081D9B19:: @ 81D9B19
- .incbin "baserom.gba", 0x001d9b19, 0x10
-
-gUnknown_081D9B29:: @ 81D9B29
- .incbin "baserom.gba", 0x001d9b29, 0x4
-
-gUnknown_081D9B2D:: @ 81D9B2D
- .incbin "baserom.gba", 0x001d9b2d, 0x7
-
-@ 81D9B34
- .include "data/field_effect_scripts.s"
-
- .align 2
-
-gUnknown_081D9E48:: @ 81D9E48
- .incbin "baserom.gba", 0x001d9e48, 0x34
-
-gUnknown_081D9E7C:: @ 81D9E7C
- .incbin "baserom.gba", 0x001d9e7c, 0x18
-
-gUnknown_081D9E94:: @ 81D9E94
- .incbin "baserom.gba", 0x001d9e94, 0x4
-
-gUnknown_081D9E98:: @ 81D9E98
- .incbin "baserom.gba", 0x001d9e98, 0x2a
-
-gUnknown_081D9EC2:: @ 81D9EC2
- .incbin "baserom.gba", 0x001d9ec2, 0x3e
-
-gUnknown_081D9F00:: @ 81D9F00
- .incbin "baserom.gba", 0x001d9f00, 0xa
-
-gUnknown_081D9F0A:: @ 81D9F0A
- .incbin "baserom.gba", 0x001d9f0a, 0x2b
-
-gUnknown_081D9F35:: @ 81D9F35
- .incbin "baserom.gba", 0x001d9f35, 0xe7
-
-gUnknown_081DA01C:: @ 81DA01C
- .incbin "baserom.gba", 0x001da01c, 0x20fc
-
-gUnknown_081DC118:: @ 81DC118
- .incbin "baserom.gba", 0x001dc118, 0x9dc
-
-gScriptFuncs:: @ 81DCAF4
- .4byte sub_81263D0
- .4byte sub_8126380
- .4byte script_status_stop_and_ret_1
- .4byte sub_81263E4
- .4byte sub_81263D4
- .4byte sub_812641C
- .4byte sub_8126524
- .4byte sub_8126438
- .4byte sub_81264F0
- .4byte sub_812658C
- .4byte sub_81265B0
- .4byte sub_81265DC
- .4byte sub_8126608
- .4byte sub_8126714
- .4byte sub_8126754
- .4byte sub_8126778
- .4byte sub_81267C0
-gScriptFuncs_End::
diff --git a/data/data2.s b/data/data2.s
index 7b1a19f05..ec9fc597c 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -825,7 +825,7 @@ gSpriteTemplate_81F958C:: @ 81F958C
.align 2
gUnknown_081F95A4:: @ 81F95A4
- obj_tiles 0x08e5dc2c, 4096, 0x2710
+ obj_tiles gUnknown_08E5DC2C, 4096, 0x2710
.align 2
gBattleTerrainTable:: @ 81F95AC
@@ -929,7 +929,7 @@ gOamData_81F96F0:: @ 81F96F0
.2byte 0x2800
.align 2
- .incbin "baserom.gba", 0x1f96f8, 0x28
+ .incbin "baserom.gba", 0x001f96f8, 0x28
@ 81F9720
.include "data/type_effectiveness.s"
@@ -1281,45 +1281,45 @@ gUnknown_081FAB5C:: @ 81FAB5C
.align 2
gUnknown_081FAC4C:: @ 81FAC4C
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D965A
- .4byte gUnknown_081D9669
- .4byte gUnknown_081D9678
- .4byte gUnknown_081D9687
- .4byte gUnknown_081D969D
- .4byte gUnknown_081D96BA
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D9696
- .4byte gUnknown_081D96AA
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D96B1
- .4byte gUnknown_081D96C8
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D963E
- .4byte gUnknown_081D96C8
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D965A
+ .4byte BattleScript_1D9669
+ .4byte BattleScript_1D9678
+ .4byte BattleScript_1D9687
+ .4byte BattleScript_1D969D
+ .4byte BattleScript_1D96BA
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D9696
+ .4byte BattleScript_1D96AA
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D96B1
+ .4byte BattleScript_1D96C8
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D963E
+ .4byte BattleScript_1D96C8
.incbin "baserom.gba", 0x001face8, 0x7
@@ -1541,7 +1541,7 @@ gSpriteTemplate_81FAF0C:: @ 81FAF0C
.align 2
gUnknown_081FAF24:: @ 81FAF24
- obj_tiles 0x08E6A728, 128, 0xD759
+ obj_tiles gUnknown_08E6A728, 128, 0xD759
.align 2
gOamData_81FAF2C:: @ 81FAF2C
@@ -1560,8 +1560,67 @@ gUnknown_081FAF4C:: @ 81FAF4C
.4byte 0x0200c000
.4byte 0x0200e000
+ .align 2
gUnknown_081FAF5C:: @ 81FAF5C
- .incbin "baserom.gba", 0x001faf5c, 0xec
+ .4byte dp01t_00_7_getattr
+ .4byte dp01t_01_2_read_pokmon_data_slice
+ .4byte dp01t_02_7_setattr
+ .4byte sub_8034744
+ .4byte sub_80347B8
+ .4byte sub_8034910
+ .4byte sub_8034AE0
+ .4byte c2_8123744
+ .4byte sub_8034DC0
+ .4byte sub_8034F84
+ .4byte sub_8035030
+ .4byte sub_80350D4
+ .4byte sub_80350E0
+ .4byte sub_80350EC
+ .4byte sub_80350F8
+ .4byte sub_8035104
+ .4byte sub_803539C
+ .4byte sub_8035400
+ .4byte sub_803540C
+ .4byte sub_803541C
+ .4byte sub_8035428
+ .4byte sub_8035590
+ .4byte sub_80355C0
+ .4byte sub_80356C0
+ .4byte sub_80356CC
+ .4byte sub_80357BC
+ .4byte sub_80357C8
+ .4byte sub_803583C
+ .4byte sub_80358A4
+ .4byte sub_80358B0
+ .4byte sub_80358BC
+ .4byte sub_80358C8
+ .4byte sub_80358D4
+ .4byte sub_80358E0
+ .4byte sub_80358EC
+ .4byte sub_80358F8
+ .4byte sub_8035904
+ .4byte sub_8035910
+ .4byte sub_803592C
+ .4byte sub_8035964
+ .4byte sub_803597C
+ .4byte dp01t_29_7_blink
+ .4byte sub_8035A14
+ .4byte sub_8035A20
+ .4byte sub_8035A64
+ .4byte sub_8035A94
+ .4byte dp01t_2E_7_battle_intro
+ .4byte sub_8035B04
+ .4byte dp01t_30_7_0803D67C
+ .4byte sub_8035E6C
+ .4byte sub_8035EB8
+ .4byte sub_8035EC4
+ .4byte dp01t_34_7_move_anim_start_t3
+ .4byte sub_8035F8C
+ .4byte sub_8035F98
+ .4byte sub_8035FA4
+ .4byte nullsub_46
+
+ .incbin "baserom.gba", 0x001fb040, 0x8
.align 2
gUnknown_081FB048:: @ 81FB048
@@ -1815,7 +1874,9 @@ gUnknown_082087C4:: @ 82087C4
@ 82087DC
.include "data/crc16_table.s"
- .incbin "baserom.gba", 0x002089dc, 0x800
+ .align 2
+gMiscBlank_Gfx:: @ 82089DC
+ .incbin "graphics/interface/blank.4bpp"
@ 82091DC
.include "data/egg_moves.s"
@@ -1930,43 +1991,43 @@ gUnknown_0820A430:: @ 820A430
.align 2
gUnknown_0820A47C:: @ 820A47C
- obj_tiles 0x08d1f52c, 4096, 0xd6ff
+ obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff
.align 2
gUnknown_0820A484:: @ 820A484
- obj_tiles 0x08d1f7e0, 4096, 0xd701
+ obj_tiles gBattleWindowSmallGfx, 4096, 0xd701
.align 2
gUnknown_0820A48C:: @ 820A48C
- obj_tiles 0x08d1f96c, 2048, 0xd6ff
+ obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff
.align 2
gUnknown_0820A494:: @ 820A494
- obj_tiles 0x08d1f96c, 2048, 0xd700
+ obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700
.align 2
gUnknown_0820A49C:: @ 820A49C
- obj_tiles 0x08d1fb04, 2048, 0xd701
+ obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701
.align 2
gUnknown_0820A4A4:: @ 820A4A4
- obj_tiles 0x08d1fb04, 2048, 0xd702
+ obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702
.align 2
gUnknown_0820A4AC:: @ 820A4AC
- obj_tiles 0x08d1fc94, 4096, 0xd70b
+ obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b
.align 2
gUnknown_0820A4B4:: @ 820A4B4
- obj_tiles 0x08d0314c, 256, 0xd704
- obj_tiles 0x08d0314c, 288, 0xd705
- obj_tiles 0x08d0314c, 256, 0xd706
- obj_tiles 0x08d0314c, 288, 0xd707
+ obj_tiles gBlankGfxCompressed, 256, 0xd704
+ obj_tiles gBlankGfxCompressed, 288, 0xd705
+ obj_tiles gBlankGfxCompressed, 256, 0xd706
+ obj_tiles gBlankGfxCompressed, 288, 0xd707
.align 2
gUnknown_0820A4D4:: @ 820A4D4
- obj_pal 0x08D1212C, 0xD6FF
- obj_pal 0x08D1214C, 0xD704
+ obj_pal gUnknown_08D1212C, 0xD6FF
+ obj_pal gUnknown_08D1214C, 0xD704
.align 2
gOamData_820A4E4:: @ 820A4E4
@@ -2017,7 +2078,7 @@ gSpriteTemplate_820A5B4:: @ 820A5B4
spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
.align 2
- .incbin "baserom.gba", 0x20a5cc, 0xb8
+ .incbin "baserom.gba", 0x0020a5cc, 0xb8
gUnknown_0820A684:: @ 820A684
.incbin "baserom.gba", 0x0020a684, 0x60
@@ -2030,18 +2091,18 @@ gUnknown_0820A6EC:: @ 820A6EC
.align 2
gUnknown_0820A754:: @ 820A754
- obj_tiles 0x08e6a758, 512, 0xd70c
- obj_tiles 0x08e6a758, 512, 0xd70d
+ obj_tiles gUnknown_08E6A758, 512, 0xd70c
+ obj_tiles gUnknown_08E6A758, 512, 0xd70d
.align 2
gUnknown_0820A764:: @ 820A764
- obj_pal 0x08d1212c, 0xd710
- obj_pal 0x08d1212c, 0xd711
+ obj_pal gUnknown_08D1212C, 0xd710
+ obj_pal gUnknown_08D1212C, 0xd711
.align 2
gUnknown_0820A774:: @ 820A774
- obj_pal 0x08d1214c, 0xd712
- obj_pal 0x08d1214c, 0xd713
+ obj_pal gUnknown_08D1214C, 0xd712
+ obj_pal gUnknown_08D1214C, 0xd713
gUnknown_0820A784:: @ 820A784
.incbin "baserom.gba", 0x0020a784, 0x18
@@ -2153,7 +2214,7 @@ gOamData_820A9EC:: @ 820A9EC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x20a9f4, 0x20
+ .incbin "baserom.gba", 0x0020a9f4, 0x20
.align 2
gSpriteAnim_820AA14:: @ 820AA14
@@ -2179,7 +2240,7 @@ gSpriteAnimTable_820AA34:: @ 820AA34
.4byte gSpriteAnim_820AA28
.align 2
- .incbin "baserom.gba", 0x20aa40, 0x10
+ .incbin "baserom.gba", 0x0020aa40, 0x10
.align 2
gSpriteAffineAnim_820AA50:: @ 820AA50
@@ -2230,7 +2291,7 @@ gSpriteTemplate_820AAB4:: @ 820AAB4
spr_template 55011, 55011, gOamData_820A9EC, gSpriteAnimTable_820AA34, NULL, gSpriteAffineAnimTable_820AAA0, objc_0804ABD4
.align 2
- .incbin "baserom.gba", 0x20abd4, 0x1c
+ .incbin "baserom.gba", 0x0020abd4, 0x1c
gUnknown_0820ABF0:: @ 820ABF0
.incbin "baserom.gba", 0x0020abf0, 0x1fe
@@ -2292,7 +2353,8 @@ gSpriteAnimTable_820C024:: @ 820C024
.4byte gSpriteAnim_820C01C
.align 2
- .incbin "baserom.gba", 0x20c03c, 0x40
+gUnknownPal_0820C03C::
+ .incbin "baserom.gba", 0x0020c03c, 0x40
.align 2
gUnknown_0820C07C:: @ 820C07C
@@ -2312,7 +2374,7 @@ gUnknown_0820C07C:: @ 820C07C
.align 2
gUnknown_0820C0E4:: @ 820C0E4
- obj_pal 0x0820c03c, 0x133d
+ obj_pal gUnknownPal_0820C03C, 0x133d
.align 2
gSpriteTemplate_820C0EC:: @ 820C0EC
@@ -3288,7 +3350,7 @@ gUnknown_08304F18:: @ 8304F18
.4byte FallarborTown_ContestLobby_MapAttributes
.4byte FallarborTown_ContestHall_MapAttributes
.4byte LilycoveCity_House2_MapAttributes
- .4byte 0x082cf564
+ .4byte UnknownMapAttributes_082CF564
.4byte VerdanturfTown_WandasHouse_MapAttributes
.4byte PacifidlogTown_House1_MapAttributes
.4byte PacifidlogTown_House2_MapAttributes
@@ -3296,8 +3358,8 @@ gUnknown_08304F18:: @ 8304F18
.4byte MossdeepCity_House4_MapAttributes
.4byte SlateportCity_SternsShipyard_1F_MapAttributes
.4byte SlateportCity_SternsShipyard_2F_MapAttributes
- .4byte 0x082d05d8
- .4byte 0x082d05fc
+ .4byte UnknownMapAttributes_082D05D8
+ .4byte UnknownMapAttributes_082D05FC
.4byte SlateportCity_PokemonFanClub_MapAttributes
.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
@@ -3384,20 +3446,20 @@ gUnknown_08304F18:: @ 8304F18
.4byte ShoalCave_LowTideLowerRoom_MapAttributes
.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
.4byte ShoalCave_HighTideInnerRoom_MapAttributes
- .4byte 0x082e55c8 @ unused maps
- .4byte 0x082e55ec
- .4byte 0x082e5610
- .4byte 0x082e5634
- .4byte 0x082e5658
- .4byte 0x082e567c
- .4byte 0x082e56a0
- .4byte 0x082e56c4
- .4byte 0x082e56e8
- .4byte 0x082e570c
- .4byte 0x082e5730
- .4byte 0x082e5754
- .4byte 0x082e5778
- .4byte 0x082e579c
+ .4byte UnknownMapAttributes_082E55C8 @ unused maps
+ .4byte UnknownMapAttributes_082E55EC
+ .4byte UnknownMapAttributes_082E5610
+ .4byte UnknownMapAttributes_082E5634
+ .4byte UnknownMapAttributes_082E5658
+ .4byte UnknownMapAttributes_082E567C
+ .4byte UnknownMapAttributes_082E56A0
+ .4byte UnknownMapAttributes_082E56C4
+ .4byte UnknownMapAttributes_082E56E8
+ .4byte UnknownMapAttributes_082E570C
+ .4byte UnknownMapAttributes_082E5730
+ .4byte UnknownMapAttributes_082E5754
+ .4byte UnknownMapAttributes_082E5778
+ .4byte UnknownMapAttributes_082E579C
.4byte NewMauville_Entrance_MapAttributes
.4byte NewMauville_Inside_MapAttributes
.4byte AbandonedShip_Deck_MapAttributes
@@ -3456,7 +3518,7 @@ gUnknown_08304F18:: @ 8304F18
.4byte SafariZone_Northeast_MapAttributes
.4byte SafariZone_Southwest_MapAttributes
.4byte SafariZone_Southeast_MapAttributes
- .4byte 0x082edf30
+ .4byte UnknownMapAttributes_082EDF30
.4byte Route109_SeashoreHouse_MapAttributes
.4byte Route110_TrickHouseEntrance_MapAttributes
.4byte Route110_TrickHouseEnd_MapAttributes
@@ -3526,21 +3588,21 @@ gUnknown_08304F18:: @ 8304F18
.4byte SootopolisCity_House3_MapAttributes
.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
.4byte ScorchedSlab_MapAttributes
- .4byte 0x082ff894
+ .4byte UnknownMapAttributes_082FF894
.4byte RustboroCity_Flat1_1F_MapAttributes
.4byte RustboroCity_Flat1_2F_MapAttributes
.4byte EverGrandeCity_Corridor4_MapAttributes
.4byte MagmaHideout_1F_MapAttributes
.4byte MagmaHideout_B1F_MapAttributes
.4byte MagmaHideout_B2F_MapAttributes
- .4byte 0x08302970
+ .4byte UnknownMapAttributes_08302970
.4byte SkyPillar_Entrance_MapAttributes
.4byte SkyPillar_Outside_MapAttributes
.4byte SkyPillar_1F_MapAttributes
.4byte SkyPillar_2F_MapAttributes
.4byte SkyPillar_3F_MapAttributes
.4byte SkyPillar_4F_MapAttributes
- .4byte 0x083041b4
+ .4byte UnknownMapAttributes_083041B4
.4byte MossdeepCity_StevensHouse_MapAttributes
.4byte ShoalCave_LowTideIceRoom_MapAttributes
.4byte SafariZone_RestHouse_MapAttributes
@@ -6981,13 +7043,14 @@ Unknown_8375FFC:
.4byte sub_8063450
.4byte sub_8063474
+ .align 2
gUnknown_08376008:: @ 8376008
.4byte 0x00000020
.4byte 0x00000010
- .align 2
@ Functions used to determine which category of tile the player is landing
@ on after jumping over a ledge.
+ .align 2
gJumpLanding_MetatileFunctionPointers:: @ 8376010
.4byte MetatileBehavior_IsTallGrass
.4byte MetatileBehavior_IsLongGrass
@@ -6998,6 +7061,7 @@ gJumpLanding_MetatileFunctionPointers:: @ 8376010
@ This table contains bitmasks used for determining the animation that happens when the player lands on
@ the ground after jumping over a ledge. Each entry corresponds to the gJumpLanding_MetatileFunctionPointers table.
+ .align 2
gJumpLanding_Bitmasks:: @ 8376028
.4byte 0x00001000 @ Landing in tall grass
.4byte 0x00002000 @ Landing in long grass
@@ -7016,7 +7080,6 @@ gUnknown_08376040:: @ 8376040
gUnknown_08376050:: @ 8376050
.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
- .align 2
@ Each byte corresponds to a sprite priority for a field object.
@ This is directly the inverse of gFieldObjectPriorities_08376070.
gFieldObjectPriorities_08376060:: @ 8376060
@@ -7137,7 +7200,6 @@ gUnknown_08376180:: @ 8376180
.align 1
gUnknown_08376194:: @ 8376194
.2byte 16, 8, 6, 4, 2
-
Unknown_837619E:
.byte -4, -6, -8, -10, -11, -12, -12, -12, -11, -10, -9, -8, -6, -4, 0, 0
Unknown_83761AE:
@@ -7219,9 +7281,9 @@ gUnknown_083762DC:: @ 83762DC
.align 2
gUnknown_083762F0:: @ 83762F0
- .4byte 0x020231cc
- .4byte 0x020232cc
- .4byte 0x020233cc
+ .4byte gStringVar1
+ .4byte gStringVar2
+ .4byte gStringVar3
gUnknown_083762FC:: @ 83762FC
.incbin "baserom.gba", 0x003762fc, 0x68
@@ -7270,7 +7332,7 @@ gSpriteImage_8376484:: @ 8376484
.incbin "graphics/unknown_sprites/83764AC/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3764a4, 0x8
+ .incbin "baserom.gba", 0x003764a4, 0x8
.align 2
gSpriteImageTable_83764AC:: @ 83764AC
@@ -7308,15 +7370,80 @@ gSpriteTemplate_83764E8:: @ 83764E8
gUnknown_08376500:: @ 8376500
.incbin "baserom.gba", 0x00376500, 0x4
+ .align 1
gUnknown_08376504:: @ 8376504
- .incbin "baserom.gba", 0x00376504, 0xd8
+ .2byte MOVE_FOCUS_PUNCH
+ .2byte MOVE_DRAGON_CLAW
+ .2byte MOVE_WATER_PULSE
+ .2byte MOVE_CALM_MIND
+ .2byte MOVE_ROAR
+ .2byte MOVE_TOXIC
+ .2byte MOVE_HAIL
+ .2byte MOVE_BULK_UP
+ .2byte MOVE_BULLET_SEED
+ .2byte MOVE_HIDDEN_POWER
+ .2byte MOVE_SUNNY_DAY
+ .2byte MOVE_TAUNT
+ .2byte MOVE_ICE_BEAM
+ .2byte MOVE_BLIZZARD
+ .2byte MOVE_HYPER_BEAM
+ .2byte MOVE_LIGHT_SCREEN
+ .2byte MOVE_PROTECT
+ .2byte MOVE_RAIN_DANCE
+ .2byte MOVE_GIGA_DRAIN
+ .2byte MOVE_SAFEGUARD
+ .2byte MOVE_FRUSTRATION
+ .2byte MOVE_SOLAR_BEAM
+ .2byte MOVE_IRON_TAIL
+ .2byte MOVE_THUNDERBOLT
+ .2byte MOVE_THUNDER
+ .2byte MOVE_EARTHQUAKE
+ .2byte MOVE_RETURN
+ .2byte MOVE_DIG
+ .2byte MOVE_PSYCHIC
+ .2byte MOVE_SHADOW_BALL
+ .2byte MOVE_BRICK_BREAK
+ .2byte MOVE_DOUBLE_TEAM
+ .2byte MOVE_REFLECT
+ .2byte MOVE_SHOCK_WAVE
+ .2byte MOVE_FLAMETHROWER
+ .2byte MOVE_SLUDGE_BOMB
+ .2byte MOVE_SANDSTORM
+ .2byte MOVE_FIRE_BLAST
+ .2byte MOVE_ROCK_TOMB
+ .2byte MOVE_AERIAL_ACE
+ .2byte MOVE_TORMENT
+ .2byte MOVE_FACADE
+ .2byte MOVE_SECRET_POWER
+ .2byte MOVE_REST
+ .2byte MOVE_ATTRACT
+ .2byte MOVE_THIEF
+ .2byte MOVE_STEEL_WING
+ .2byte MOVE_SKILL_SWAP
+ .2byte MOVE_SNATCH
+ .2byte MOVE_OVERHEAT
+ .2byte MOVE_CUT
+ .2byte MOVE_FLY
+ .2byte MOVE_SURF
+ .2byte MOVE_STRENGTH
+ .2byte MOVE_FLASH
+ .2byte MOVE_ROCK_SMASH
+ .2byte MOVE_WATERFALL
+ .2byte MOVE_DIVE
+
+ .4byte gTileBuffer @ unreferenced?
+MenuGfx_HoldIcons:
+ .incbin "graphics/interface/hold_icons.4bpp"
+MenuPal_HoldIcons:
+ .incbin "graphics/interface/hold_icons.gbapal"
.align 2
gUnknown_083765DC:: @ 83765DC
- obj_tiles 0x0837657c, 64, 0xd750
+ obj_tiles MenuGfx_HoldIcons, 64, 0xd750
+ .align 2
gUnknown_083765E4:: @ 83765E4
- .incbin "baserom.gba", 0x003765e4, 0x8
+ obj_pal MenuPal_HoldIcons, 0xd750
.align 2
gOamData_83765EC:: @ 83765EC
@@ -7368,7 +7495,7 @@ gUnknown_08376624:: @ 8376624
.4byte OtherText_TeachWhichPoke
gUnknown_08376678:: @ 8376678
- .incbin "baserom.gba", 0x00376678, 0xc0
+ .incbin "baserom.gba", 0x00376678, 0xc0 @ 4 byte array?
gUnknown_08376738:: @ 8376738
.incbin "baserom.gba", 0x00376738, 0x120
@@ -7401,16 +7528,54 @@ gUnknown_08376A25:: @ 8376A25
.incbin "baserom.gba", 0x00376a25, 0x39
gUnknown_08376A5E:: @ 8376A5E
- .incbin "baserom.gba", 0x00376a5e, 0xf6
+ .incbin "baserom.gba", 0x00376a5e, 0xf3
+ .align 2
gUnknown_08376B54:: @ 8376B54
- .incbin "baserom.gba", 0x00376b54, 0x60
+ .4byte ether_effect_related_2
+ .4byte sub_80704F0
+Unknown_08376B5C:
+ .incbin "baserom.gba", 0x00376b5c, 0x2c
+Unknown_08376B88:
+ .incbin "baserom.gba", 0x00376b88, 0x2c
+ .align 2
gUnknown_08376BB4:: @ 8376BB4
- .incbin "baserom.gba", 0x00376bb4, 0xc0
+ .4byte 0x401, Unknown_08376B5C
+ .4byte 0x10C, Unknown_08376B88
+ .4byte 0x40C, Unknown_08376B88
+ .4byte 0x70C, Unknown_08376B88
+ .4byte 0xA0C, Unknown_08376B88
+ .4byte 0xD0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x10C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xD0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x20C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xC0C, Unknown_08376B88
+ .4byte 0x201, Unknown_08376B5C
+ .4byte 0x20C, Unknown_08376B88
+ .4byte 0x50C, Unknown_08376B88
+ .4byte 0x901, Unknown_08376B5C
+ .4byte 0x90C, Unknown_08376B88
+ .4byte 0xC0C, Unknown_08376B88
+ .align 2
gUnknown_08376C74:: @ 8376C74
- .incbin "baserom.gba", 0x00376c74, 0x60
+ .4byte sub_8089CD4, sub_806AFD0, 0
+ .4byte sub_8095118, sub_8094E58, 0
+ .4byte sub_80F9C6C, sub_80F9ACC, 0
+ .4byte sub_80F9C6C, sub_806AFD0, 0
+ .4byte sub_81222B0, sub_8121E78, 0
+ .4byte sub_8122A48, sub_8122854, 0xFF
+ .4byte sub_8122E0C, sub_806AFD0, 0x0F
+ .4byte sub_80F9E64, sub_80F9CE8, 0
gUnknown_08376CD4:: @ 8376CD4
.incbin "baserom.gba", 0x00376cd4, 0x18
@@ -8113,7 +8278,16 @@ gOamData_837DF3C:: @ 837DF3C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37df44, 0x10
+gOamData_837DF44:: @ 837DF44
+ .2byte 0x4000
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DF4C:: @ 837DF4C
+ .2byte 0x4000
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837DF54:: @ 837DF54
@@ -8134,7 +8308,10 @@ gOamData_837DF64:: @ 837DF64
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37df6c, 0x8
+gOamData_837DF6C:: @ 837DF6C
+ .2byte 0x8000
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837DF74:: @ 837DF74
@@ -8173,7 +8350,22 @@ gOamData_837DF9C:: @ 837DF9C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37dfa4, 0x18
+gOamData_837DFA4:: @ 837DFA4
+ .2byte 0x4100
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFAC:: @ 837DFAC
+ .2byte 0x4100
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFB4:: @ 837DFB4
+ .2byte 0x4100
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837DFBC:: @ 837DFBC
@@ -8182,7 +8374,22 @@ gOamData_837DFBC:: @ 837DFBC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37dfc4, 0x18
+gOamData_837DFC4:: @ 837DFC4
+ .2byte 0x8100
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFCC:: @ 837DFCC
+ .2byte 0x8100
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837DFD4:: @ 837DFD4
+ .2byte 0x8100
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837DFDC:: @ 837DFDC
@@ -8215,7 +8422,16 @@ gOamData_837DFFC:: @ 837DFFC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e004, 0x10
+gOamData_837D004:: @ 837D004
+ .2byte 0x4300
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837D00C:: @ 837D00C
+ .2byte 0x4300
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E014:: @ 837E014
@@ -8224,7 +8440,10 @@ gOamData_837E014:: @ 837E014
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e01c, 0x8
+gOamData_837E01C:: @ 837E01C
+ .2byte 0x4300
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E024:: @ 837E024
@@ -8233,7 +8452,10 @@ gOamData_837E024:: @ 837E024
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e02c, 0x8
+gOamData_837E02C:: @ 837E02C
+ .2byte 0x8300
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E034:: @ 837E034
@@ -8272,7 +8494,16 @@ gOamData_837E05C:: @ 837E05C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e064, 0x10
+gOamData_837E064:: @ 837E064
+ .2byte 0x4400
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E06C:: @ 837E06C
+ .2byte 0x4400
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E074:: @ 837E074
@@ -8293,7 +8524,10 @@ gOamData_837E084:: @ 837E084
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e08c, 0x8
+gOamData_837E08C:: @ 837E08C
+ .2byte 0x8400
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E094:: @ 837E094
@@ -8302,7 +8536,10 @@ gOamData_837E094:: @ 837E094
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e09c, 0x8
+gOamData_837E09C:: @ 837E09C
+ .2byte 0x8400
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E0A4:: @ 837E0A4
@@ -8329,7 +8566,28 @@ gOamData_837E0BC:: @ 837E0BC
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e0c4, 0x20
+gOamData_837E0C4:: @ 837E0C4
+ .2byte 0x4500
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0CC:: @ 837E0CC
+ .2byte 0x4500
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0D4:: @ 837E0D4
+ .2byte 0x4500
+ .2byte 0x8000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0DC:: @ 837E0DC
+ .2byte 0x4500
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gOamData_837E0E4:: @ 837E0E4
@@ -8338,7 +8596,16 @@ gOamData_837E0E4:: @ 837E0E4
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e0ec, 0x10
+gOamData_837E0EC:: @ 837E0EC
+ .2byte 0x8500
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E0F4:: @ 837E0F4
+ .2byte 0x8500
+ .2byte 0x8000
+ .2byte 0x0800
.align 2
gOamData_837E0FC:: @ 837E0FC
@@ -8371,7 +8638,16 @@ gOamData_837E11C:: @ 837E11C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e124, 0x10
+gOamData_837E124:: @ 837E124
+ .2byte 0x4700
+ .2byte 0x0000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E12C:: @ 837E12C
+ .2byte 0x4700
+ .2byte 0x4000
+ .2byte 0x0800
.align 2
gOamData_837E134:: @ 837E134
@@ -8392,7 +8668,22 @@ gOamData_837E144:: @ 837E144
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x37e14c, 0x18
+gOamData_837E14C:: @ 837E14C
+ .2byte 0x8700
+ .2byte 0x4000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E154:: @ 837E154
+ .2byte 0x8700
+ .2byte 0x8000
+ .2byte 0x0800
+
+ .align 2
+gOamData_837E15C:: @ 837E15C
+ .2byte 0x8700
+ .2byte 0xC000
+ .2byte 0x0800
.align 2
gBattleAnimPicTable:: @ 837E164
@@ -9065,6 +9356,7 @@ gUnknown_0837F578:: @ 837F578
@ One entry for each of the four Castform forms.
@ Coords are probably front pic coords or back pic coords, but this data does not seem to be
@ used during battle, party summary, or pokedex screens.
+ .align 2
gUnknownCastformCoords_0837F598:: @ 837F598
.byte 68, 17, 0, 0
.byte 102, 9, 0, 0
@@ -9088,8 +9380,8 @@ gSpriteTemplate_837F5C8:: @ 837F5C8
.align 2
gUnknown_0837F5E0:: @ 837F5E0
- obj_tiles 0x082089dc, 2048, 0xd755
- obj_tiles 0x082089dc, 2048, 0xd756
+ obj_tiles gMiscBlank_Gfx, 2048, 0xd755
+ obj_tiles gMiscBlank_Gfx, 2048, 0xd756
.include "data/maps/events/PetalburgCity.s"
.include "data/maps/events/SlateportCity.s"
@@ -9604,10 +9896,12 @@ gSpriteTemplate_8393188:: @ 8393188
spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
.align 2
- .incbin "baserom.gba", 0x3931a0, 0x38
+ .incbin "baserom.gba", 0x003931a0, 0x18
+Unknown_083931B8:
+ .incbin "baserom.gba", 0x003931b8, 0x20
gUnknown_083931D8:: @ 83931D8
- .incbin "baserom.gba", 0x003931d8, 0x8
+ .4byte 4, Unknown_083931B8
.align 2
gSpriteTemplate_83931E0:: @ 83931E0
@@ -9823,7 +10117,7 @@ gUnknown_08396FA8:: @ 8396FA8
.4byte DroughtPaletteData_4
.4byte DroughtPaletteData_5
- .incbin "baserom.gba", 0x00396fc0, 0x4
+ .incbin "baserom.gba", 0x00396fc0, 0x4 @ pointer to unk_2000000?
.align 2
gUnknown_08396FC4:: @ 8396FC4
@@ -10082,7 +10376,7 @@ gSpriteTemplate_839AB04:: @ 839AB04
spr_template 0xFFFF, 4608, gOamData_839AAD4, gSpriteAnimTable_839AAFC, gSpriteImageTable_839AADC, gDummySpriteAffineAnimTable, sub_807ED48
.align 2
- .incbin "baserom.gba", 0x39ab1c, 0x10
+ .incbin "baserom.gba", 0x0039ab1c, 0x10
.align 2
gOamData_839AB2C:: @ 839AB2C
@@ -10372,8 +10666,12 @@ gUnknown_0839B498:: @ 839B498
.4byte sub_8084654
.4byte sub_80846C8
+ .align 2
gUnknown_0839B4C8:: @ 839B4C8
- .incbin "baserom.gba", 0x0039b4c8, 0x10
+ .4byte sub_80845C8
+ .4byte sub_80845FC
+ .4byte sub_8084654
+ .4byte sub_80846C8
.align 2
gOamData_839B4D8:: @ 839B4D8
@@ -10416,6 +10714,7 @@ gSpriteTemplate_839B528:: @ 839B528
@ 839B540
.include "data/wild_mons.s"
+ .align 2
gWildFeebasRoute119Data:: @ 839DBFC
.byte 20, 25 @ Min/Max level
.2byte SPECIES_FEEBAS
@@ -10559,7 +10858,7 @@ gSpriteImageTable_839F178:: @ 839F178
obj_frame_tiles gSpriteImage_839E7F4, 0x200
.align 2
- .incbin "baserom.gba", 0x39f180, 0x20
+ .incbin "baserom.gba", 0x0039f180, 0x20
gUnknown_0839F1A0:: @ 839F1A0
.incbin "baserom.gba", 0x0039f1a0, 0x28
@@ -10769,7 +11068,6 @@ gUnknown_0839F3E4:: @ 839F3E4
.align 2
gUnknown_0839F3F8:: @ 839F3F8
-Unknown_839F3F8:
.4byte sub_8088CA0
.4byte sub_8088CF8
.4byte sub_8088D3C
@@ -11076,18 +11374,23 @@ gSpriteTemplate_83A059C:: @ 83A059C
gSpriteTemplate_83A05B4:: @ 83A05B4
spr_template 4096, 4096, gOamData_83A042C, gSpriteAnimTable_83A0520, NULL, gDummySpriteAffineAnimTable, sub_808F168
+ .align 2
gUnknown_083A05CC:: @ 83A05CC
- .incbin "baserom.gba", 0x003a05cc, 0x10
+ obj_tiles gUnknown_08E874C8, 0x1F00, 0x1000
+ null_obj_tiles
+ .align 2
gUnknown_083A05DC:: @ 83A05DC
- .incbin "baserom.gba", 0x003a05dc, 0x10
+ obj_pal gUnknown_08E87AF4, 0x1000
+ null_obj_pal
gUnknown_083A05EC:: @ 83A05EC
- .incbin "baserom.gba", 0x003a05ec, 0x5
+ .byte 2, 4, 8, 16, 32
gUnknown_083A05F1:: @ 83A05F1
- .incbin "baserom.gba", 0x003a05f1, 0x7
+ .byte 16, 8, 4, 2, 1
+ .align 2
gUnknown_083A05F8:: @ 83A05F8
.string "$"
@@ -11272,14 +11575,10 @@ gUnknown_083B5FF4:: @ 83B5FF4
.align 2
gUnknown_083B600C:: @ 83B600C
- .4byte PCText_WithdrawPoke
- .4byte PCText_MovePokeToParty
- .4byte PCText_DepositPoke
- .4byte PCText_StorePokeInBox
- .4byte PCText_MovePoke
- .4byte PCText_OrganizeBoxesParty
- .4byte PCText_SeeYa
- .4byte PCText_ReturnToPrevMenu
+ .4byte PCText_WithdrawPoke, PCText_MovePokeToParty
+ .4byte PCText_DepositPoke, PCText_StorePokeInBox
+ .4byte PCText_MovePoke, PCText_OrganizeBoxesParty
+ .4byte PCText_SeeYa, PCText_ReturnToPrevMenu
.align 2
gSpriteAnim_83B602C:: @ 83B602C
@@ -11365,7 +11664,7 @@ gUnknown_083B6DB4:: @ 83B6DB4
.align 2
gUnknown_083B6DB8:: @ 83B6DB8
- .4byte 0x02039360
+ .4byte gTileBuffer
.align 2
gWaveformSpritePalette:: @ 83B6DBC
@@ -11472,11 +11771,11 @@ gOamData_83B6F2C:: @ 83B6F2C
.align 2
Unknown_83B6F34: @ 83B6F34
- .incbin "baserom.gba", 0x3b6f34, 0x10
+ .incbin "baserom.gba", 0x003b6f34, 0x10
.align 2
Unknown_83B6F44: @ 83B6F44
- .incbin "baserom.gba", 0x3b6f44, 0x18
+ .incbin "baserom.gba", 0x003b6f44, 0x18
.align 2
gUnknown_083B6F5C:: @ 83B6F5C
@@ -11812,15 +12111,18 @@ gWallpaperTable:: @ 83BB0E8
.4byte gWallpaperTilemap_Plain
.4byte gWallpaperPalettes_Plain
+PCPal_Arrow:
.incbin "graphics/pokemon_storage/arrow.gbapal"
+PCGfx_Arrow:
.incbin "graphics/pokemon_storage/arrow.4bpp"
.align 2
gUnknown_083BB288:: @ 83BB288
- obj_tiles 0x083bb208, 128, 0x0006
+ obj_tiles PCGfx_Arrow, 128, 0x0006
+ .align 2
gUnknown_083BB290:: @ 83BB290
- .incbin "baserom.gba", 0x003bb290, 0x8
+ obj_pal PCPal_Arrow, 0xDACF
.align 2
gOamData_83BB298:: @ 83BB298
@@ -12007,21 +12309,20 @@ gUnknown_083BBCA0:: @ 83BBCA0
.include "data/graphics/pokemon/icon_palette_table.s"
gUnknown_083BC5E8:: @ 83BC5E8
- .incbin "baserom.gba", 0x3BC5E8, 0x8
+ .incbin "baserom.gba", 0x003BC5E8, 0x8
Unknown_83BC5F0:
- .incbin "baserom.gba", 0x3BC5F0, 0xC
+ .incbin "baserom.gba", 0x003BC5F0, 0xC
Unknown_83BC5FC:
- .incbin "baserom.gba", 0x3BC5FC, 0xC
+ .incbin "baserom.gba", 0x003BC5FC, 0xC
Unknown_83BC608:
- .incbin "baserom.gba", 0x3BC608, 0xC
+ .incbin "baserom.gba", 0x003BC608, 0xC
Unknown_83BC614:
- .incbin "baserom.gba", 0x3BC614, 0xC
+ .incbin "baserom.gba", 0x003BC614, 0xC
Unknown_83BC620:
- .incbin "baserom.gba", 0x3BC620, 0xC
+ .incbin "baserom.gba", 0x003BC620, 0xC
.align 2
gUnknown_083BC62C:: @ 83BC62C
-Unknown_83BC62C:
.4byte Unknown_83BC5F0
.4byte Unknown_83BC5FC
.4byte Unknown_83BC608
@@ -12198,7 +12499,7 @@ gSpriteAnimTable_83C115C:: @ 83C115C
.align 2
gUnknown_083C11B8:: @ 83C11B8
- obj_tiles 0x08e71d10, 5888, 0x7532
+ obj_tiles gUnknown_08E71D10, 5888, 0x7532
.align 2
gSpriteTemplate_83C11C0:: @ 83C11C0
@@ -12278,11 +12579,11 @@ gSpriteAnimTable_83C1248:: @ 83C1248
.align 2
gUnknown_083C1270:: @ 83C1270
- obj_tiles 0x08e7274c, 1024, 0x7530
+ obj_tiles gMenuSummaryGfx, 1024, 0x7530
.align 2
gUnknown_083C1278:: @ 83C1278
- obj_pal 0x08e72848, 0x7530
+ obj_pal gMenuSummaryPal, 0x7530
.align 2
gSpriteTemplate_83C1280:: @ 83C1280
@@ -12341,11 +12642,11 @@ gSpriteAnimTable_83C12D8:: @ 83C12D8
.align 2
gUnknown_083C12F4:: @ 83C12F4
- obj_tiles 0x08e72860, 896, 0x7531
+ obj_tiles gStatusGfx_Icons, 896, 0x7531
.align 2
gUnknown_083C12FC:: @ 83C12FC
- obj_pal 0x08e72a50, 0x7531
+ obj_pal gStatusPal_Icons, 0x7531
.align 2
gSpriteTemplate_83C1304:: @ 83C1304
@@ -12541,7 +12842,7 @@ gSpriteAnimTable_83C1C84:: @ 83C1C84
.4byte gSpriteAnim_83C1C7C
.align 2
- .incbin "baserom.gba", 0x3c1c98, 0x4
+ .incbin "baserom.gba", 0x003c1c98, 0x4
.align 2
gSpriteAffineAnim_83C1C9C:: @ 83C1C9C
@@ -12626,7 +12927,7 @@ gSpriteAnimTable_83C1D68:: @ 83C1D68
.4byte gSpriteAnim_83C1D60
.align 2
- .incbin "baserom.gba", 0x3c1d6c, 0x8
+ .incbin "baserom.gba", 0x003c1d6c, 0x8
.align 2
gSpriteTemplate_83C1D74:: @ 83C1D74
@@ -12666,10 +12967,11 @@ gSpriteTemplate_83C1E04:: @ 83C1E04
.align 2
gUnknown_083C1F74:: @ 83C1F74
- obj_tiles 0x08e78bb4, 2048, 0x2710
+ obj_tiles gUnknown_08E78BB4, 2048, 0x2710
+ .align 2
gUnknown_083C1F7C:: @ 83C1F7C
- .incbin "baserom.gba", 0x003c1f7c, 0x8
+ obj_pal gUnknown_08E7883C, 0x2710
.align 2
gOamData_83C1F84:: @ 83C1F84
@@ -12755,7 +13057,13 @@ gUnknown_083C91F0:: @ 83C91F0
.4byte Unknown_83C91D6, sub_80AB02C
gUnknown_083C9228:: @ 83C9228
- .incbin "baserom.gba", 0x003c9228, 0x46
+ .incbin "baserom.gba", 0x003c9228, 0x5
+Unknown_083C922D:
+ .incbin "graphics/unknown/ball.4bpp"
+
+ .align 1
+Unknown_083C924E:
+ .incbin "graphics/unknown/ball.gbapal"
gUnknown_083C926E:: @ 83C926E
.incbin "baserom.gba", 0x003c926e, 0x8
@@ -12777,10 +13085,11 @@ gUnknown_083C92A8:: @ 83C92A8
.align 2
gUnknown_083C92B4:: @ 83C92B4
- obj_tiles 0x083c922d, 32, 0x04b0
+ obj_tiles Unknown_083C922D, 32, 0x04b0
+ .align 2
gUnknown_083C92BC:: @ 83C92BC
- .incbin "baserom.gba", 0x003c92bc, 0x8
+ obj_pal Unknown_083C924E, 0x04B0
.align 2
gOamData_83C92C4:: @ 83C92C4
@@ -12814,43 +13123,65 @@ gUnknown_083C92E4:: @ 83C92E4
.4byte sub_80AAD44
gUnknown_083C932C:: @ 83C932C
- .incbin "baserom.gba", 0x003c932c, 0xb
+ .string "{COLOR CYAN}{HIGHLIGHT RED}$"
+
+ .string "かいし$" @ Start
gUnknown_083C9337:: @ 83C9337
- .incbin "baserom.gba", 0x003c9337, 0x4
+ .string "もどる$" @ Go Back
gUnknown_083C933B:: @ 83C933B
- .incbin "baserom.gba", 0x003c933b, 0x29
+ .string "{COLOR MAGENTA}BP.$"
+
+Unknown_83C9342:
+ .string "かっこよさ$" @ coolness
+Unknown_83C9348:
+ .string "かわいさ$" @ cuteness
+Unknown_83C934D:
+ .string "うつくしさ$" @ beauty
+Unknown_83C9353:
+ .string "かしこさ$" @ smartness
+Unknown_83C9358:
+ .string "たくましさ$" @ toughness
+Unknown_83C935E:
+ .string "けづや$" @ sheen
+ .align 2
gUnknown_083C9364:: @ 83C9364
- .incbin "baserom.gba", 0x3C9364, 0x18
+ .4byte Unknown_83C9342
+ .4byte Unknown_83C9348
+ .4byte Unknown_83C934D
+ .4byte Unknown_83C9353
+ .4byte Unknown_83C9358
+ .4byte Unknown_83C935E
+
Unknown_83C937C:
- .incbin "baserom.gba", 0x3C937C, 0xB
+ .string "かっこよさコンテスト$" @ Cool Contest
Unknown_83C9387:
- .incbin "baserom.gba", 0x3C9387, 0xB
+ .string "うつくしさコンテスト$" @ Beauty Contest
Unknown_83C9392:
- .incbin "baserom.gba", 0x3C9392, 0xB
+ .string "かわいさコンテスト $" @ Cute Contest
Unknown_83C939D:
- .incbin "baserom.gba", 0x3C939D, 0xB
+ .string "かしこさコンテスト $" @ Smart Contest
Unknown_83C93A8:
- .incbin "baserom.gba", 0x3C93A8, 0xC
+ .string "たくましさコンテスト$" @ Tough Contest
.align 2
gUnknown_083C93B4:: @ 83C93B4
-Unknown_83C93B4:
.4byte Unknown_83C937C
.4byte Unknown_83C9387
.4byte Unknown_83C9392
.4byte Unknown_83C939D
.4byte Unknown_83C93A8
+
Unknown_83C93C8:
- .incbin "baserom.gba", 0x003c93c8, 0xA
+ .string "ハジツゲ/ノーマル$" @ Fallarbor / Normal
Unknown_83C93D2:
- .incbin "baserom.gba", 0x003c93d2, 0xA
+ .string "シダケ/スーパー $" @ Verdanturf / Super
Unknown_83C93DC:
- .incbin "baserom.gba", 0x003c93dc, 0xA
+ .string "カイナ/ハイパー $" @ Slateport / Hyper
Unknown_83C93E6:
- .incbin "baserom.gba", 0x003c93e6, 0xA
+ .string "ミナモ/マスター $" @ Lilycove / Master
.align 2
gUnknown_083C93F0:: @ 83C93F0
@@ -12862,36 +13193,56 @@ gUnknown_083C93F0:: @ 83C93F0
gUnknown_083C9400:: @ 83C9400
.incbin "baserom.gba", 0x003c9400, 0x8
-gUnknown_083C9408:: @ 83C9408
-
+@ 83C9408
.include "data/contest_opponents.s"
gUnknown_083CA308:: @ 83CA308
- .incbin "baserom.gba", 0x003ca308, 0x8
+ .byte 19, 0
+ .byte 19, 5
+ .byte 19, 10
+ .byte 19, 15
gUnknown_083CA310:: @ 83CA310
- .incbin "baserom.gba", 0x003ca310, 0x8
+ .byte 25, 0
+ .byte 25, 5
+ .byte 25, 10
+ .byte 25, 15
gUnknown_083CA318:: @ 83CA318
- .incbin "baserom.gba", 0x003ca318, 0x18
+ .byte 20, 2
+ .byte 20, 7
+ .byte 20, 12
+ .byte 20, 17
+ .byte 24, 2
+ .byte 24, 7
+ .byte 24, 12
+ .byte 24, 17
+ .byte 220, 24
+ .byte 220, 64
+ .byte 220, 104
+ .byte 220, 144
gUnknown_083CA330:: @ 83CA330
- .incbin "baserom.gba", 0x003ca330, 0x8
+ .byte 224, 24
+ .byte 224, 64
+ .byte 224, 104
+ .byte 224, 144
gUnknown_083CA338:: @ 83CA338
- .incbin "baserom.gba", 0x003ca338, 0x4
+ .byte 36, 76, 116, 156
gUnknown_083CA33C:: @ 83CA33C
- .incbin "baserom.gba", 0x003ca33c, 0x4
+ .byte 36, 76, 116, 156
gUnknown_083CA340:: @ 83CA340
- .space 1
-
-gUnknown_083CA341:: @ 83CA341
- .incbin "baserom.gba", 0x003ca341, 0xf
+ .byte 0, 31, 9, 39
+ .byte 0, 33, 9, 39
+ .byte 0, 35, 9, 39
+ .byte 0, 37, 9, 39
+ .align 2
gUnknown_083CA350:: @ 83CA350
- .incbin "baserom.gba", 0x003ca350, 0x8
+ obj_tiles gTiles_8D1975C, 0x20, 20004
.align 2
gOamData_83CA358:: @ 83CA358
@@ -12928,13 +13279,14 @@ gSpriteTemplate_83CA3AC:: @ 83CA3AC
.align 2
gUnknown_083CA3C4:: @ 83CA3C4
- obj_tiles 0x08e69404, 256, 0x4e26
- obj_tiles 0x08e69404, 256, 0x4e27
- obj_tiles 0x08e69404, 256, 0x4e28
- obj_tiles 0x08e69404, 256, 0x4e29
+ obj_tiles gContestNextTurnGfx, 256, 0x4e26
+ obj_tiles gContestNextTurnGfx, 256, 0x4e27
+ obj_tiles gContestNextTurnGfx, 256, 0x4e28
+ obj_tiles gContestNextTurnGfx, 256, 0x4e29
+ .align 2
gUnknown_083CA3E4:: @ 83CA3E4
- .incbin "baserom.gba", 0x003ca3e4, 0x8
+ obj_pal gContestPal, 0x4E26
.align 2
gOamData_83CA3EC:: @ 83CA3EC
@@ -12959,17 +13311,18 @@ gSpriteTemplate_83CA43C:: @ 83CA43C
spr_template 20009, 20006, gOamData_83CA3EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
- .incbin "baserom.gba", 0x3ca454, 0x10
+ .incbin "baserom.gba", 0x003ca454, 0x10
gUnknown_083CA464:: @ 83CA464
.incbin "baserom.gba", 0x003ca464, 0x8
.align 2
gUnknown_083CA46C:: @ 83CA46C
- obj_tiles 0x08e69648, 1024, 0xabe2
+ obj_tiles gContestApplauseGfx, 1024, 0xabe2
+ .align 2
gUnknown_083CA474:: @ 83CA474
- .incbin "baserom.gba", 0x003ca474, 0x8
+ obj_pal gContestPal, 0xABE2
.align 2
gOamData_83CA47C:: @ 83CA47C
@@ -12993,15 +13346,15 @@ gSpriteTemplate_83CA4A4:: @ 83CA4A4
.align 2
gUnknown_083CA4BC:: @ 83CA4BC
- obj_tiles 0x08d1c748, 2048, 0x4e25
+ obj_tiles gContestJudgeGfx, 2048, 0x4e25
.align 2
gUnknown_083CA4C4:: @ 83CA4C4
- obj_tiles 0x08d19590, 896, 0xabe0
+ obj_tiles gContestJudgeSymbolsGfx, 896, 0xabe0
.align 2
gUnknown_083CA4CC:: @ 83CA4CC
- obj_pal 0x08d19734, 0xabe0
+ obj_pal gContest3Pal, 0xabe0
.include "data/text/contest_strings.s"
@@ -13028,10 +13381,14 @@ UnknownText_UnknownFormatting3:
.align 2
gUnknown_083CC3AC:: @ 83CC3AC
- obj_tiles 0x08d16024, 512, 0x4e20
+ obj_tiles gContestNumbers_UnusedGfx, 512, 0x4e20
+ .align 2
gUnknown_083CC3B4:: @ 83CC3B4
- .incbin "baserom.gba", 0x003cc3b4, 0x20
+ obj_pal gContestNumbers_UnusedPal, 0x4E20
+ obj_pal gContestNumbers_UnusedPal, 0x4E21
+ obj_pal gContestNumbers_UnusedPal, 0x4E22
+ obj_pal gContestNumbers_UnusedPal, 0x4E23
.align 2
gSpriteAnim_83CC3D4:: @ 83CC3D4
@@ -13083,7 +13440,7 @@ gSpriteAffineAnimTable_83CC43C:: @ 83CC43C
.4byte gSpriteAffineAnim_83CC424
.align 2
- .incbin "baserom.gba", 0x3cc448, 0x4
+ .incbin "baserom.gba", 0x003cc448, 0x4
.align 2
gOamData_83CC44C:: @ 83CC44C
@@ -13109,10 +13466,10 @@ gSpriteTemplate_83CC49C:: @ 83CC49C
.align 2
gUnknown_083CC4B4:: @ 83CC4B4
- obj_tiles 0x08d0314c, 4096, 0x80e8
- obj_tiles 0x08d0314c, 4096, 0x80e9
- obj_tiles 0x08d0314c, 4096, 0x80ea
- obj_tiles 0x08d0314c, 4096, 0x80eb
+ obj_tiles gBlankGfxCompressed, 4096, 0x80e8
+ obj_tiles gBlankGfxCompressed, 4096, 0x80e9
+ obj_tiles gBlankGfxCompressed, 4096, 0x80ea
+ obj_tiles gBlankGfxCompressed, 4096, 0x80eb
gUnknown_083CC4D4:: @ 83CC4D4
.incbin "baserom.gba", 0x003cc4d4, 0x20
@@ -13238,7 +13595,7 @@ gSpriteImage_83CE154:: @ 83CE154
.incbin "graphics/unknown_sprites/83CE588/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3ce214, 0x4
+ .incbin "baserom.gba", 0x003ce214, 0x4
.align 2
gUnknown_083CE218:: @ 83CE218
@@ -13564,11 +13921,11 @@ gSpriteTemplate_83CF56C:: @ 83CF56C
.align 2
gUnknown_083CF584:: @ 83CF584
- obj_tiles 0x08e77a5c, 256, 0x2722
+ obj_tiles gMenuMoneyGfx, 256, 0x2722
.align 2
gUnknown_083CF58C:: @ 83CF58C
- obj_pal 0x08e77900, 0x2722
+ obj_pal gMenuMoneyPal, 0x2722
@ 83CF594
.include "data/contest_moves.s"
@@ -13774,9 +14131,9 @@ gUnknown_083D1454:: @ 83D1454
.align 2
gUnknown_083D1464:: @ 83D1464
- .4byte 0x020231cc
- .4byte 0x020232cc
- .4byte 0x020233cc
+ .4byte gStringVar1
+ .4byte gStringVar2
+ .4byte gStringVar3
.align 2
gUnknown_083D1470:: @ 83D1470
@@ -13926,6 +14283,7 @@ gUnknown_083D1600:: @ 83D1600
.4byte UnknownString_81ACF49
.4byte UnknownString_81AD00A
+ .align 2
gUnknown_083D1624:: @ 83D1624
.incbin "baserom.gba", 0x003d1624, 0x20
@@ -13933,7 +14291,11 @@ gUnknown_083D1644:: @ 83D1644
.incbin "baserom.gba", 0x003d1644, 0xa0
gUnknown_083D16E4:: @ 83D16E4
- .incbin "baserom.gba", 0x003d16e4, 0x60
+ .incbin "baserom.gba", 0x003d16e4, 0x40
+
+ .align 2
+gMiscBlank_Pal::
+ .incbin "graphics/interface/blank.gbapal"
.align 2
gOamData_83D1744:: @ 83D1744
@@ -13947,17 +14309,18 @@ gSpriteTemplate_83D174C:: @ 83D174C
.align 2
gUnknown_083D1764:: @ 83D1764
- obj_tiles 0x082089dc, 1024, 0x0bc1
- obj_tiles 0x082089dc, 1024, 0x0bc2
- obj_tiles 0x082089dc, 1024, 0x0bc3
- obj_tiles 0x082089dc, 1024, 0x0bc4
- obj_tiles 0x082089dc, 1024, 0x0bc5
- obj_tiles 0x082089dc, 1024, 0x0bc6
- obj_tiles 0x082089dc, 1024, 0x0bc7
- obj_tiles 0x082089dc, 1024, 0x0bc8
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc1
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc2
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc3
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc4
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc5
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc6
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc7
+ obj_tiles gMiscBlank_Gfx, 1024, 0x0bc8
+ .align 2
gUnknown_083D17A4:: @ 83D17A4
- .incbin "baserom.gba", 0x003d17a4, 0x8
+ obj_pal gMiscBlank_Pal, 0x0BC1
.align 2
gOamData_83D17AC:: @ 83D17AC
@@ -13971,11 +14334,11 @@ gSpriteTemplate_83D17B4:: @ 83D17B4
.align 2
gUnknown_083D17CC:: @ 83D17CC
- obj_tiles 0x08d2d7d4, 544, 0x0bc9
+ obj_tiles gContestConfetti_Gfx, 544, 0x0bc9
.align 2
gUnknown_083D17D4:: @ 83D17D4
- obj_pal 0x08d2d8f4, 0x0bc9
+ obj_pal gContestConfetti_Pal, 0x0bc9
gUnknown_083D17DC:: @ 83D17DC
.incbin "baserom.gba", 0x003d17dc, 0x4
@@ -13997,11 +14360,11 @@ gUnknown_083D188E:: @ 83D188E
.align 2
gUnknown_083D1898:: @ 83D1898
- obj_pal 0x083d190c, 0x0080
+ obj_pal gUnknownPal_083D190C, 0x0080
.align 2
gUnknown_083D18A0:: @ 83D18A0
- obj_pal 0x083d18ec, 0x0000
+ obj_pal gUnknownPal_083D18EC, 0x0000
.align 2
gSpriteTemplate_83D18A8:: @ 83D18A8
@@ -14027,7 +14390,14 @@ gSpriteAnimTable_83D18E8:: @ 83D18E8
.4byte gSpriteAnim_83D18E0
.align 2
- .incbin "baserom.gba", 0x3d18ec, 0xa0
+gUnknownPal_083D18EC::
+ .incbin "baserom.gba", 0x003d18ec, 0x20
+
+ .align 2
+gUnknownPal_083D190C::
+ .incbin "baserom.gba", 0x003d190c, 0x20
+
+ .incbin "baserom.gba", 0x003d192c, 0x60
.align 2
gSpriteImage_83D198C:: @ 83D198C
@@ -14050,7 +14420,7 @@ gSpriteImage_83D1B8C:: @ 83D1B8C
.incbin "graphics/unknown_sprites/83D259C/4.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d1c0c, 0x20
+ .incbin "baserom.gba", 0x003d1c0c, 0x20
.align 2
gFieldEffectObjectPalette7: @ 83D1C2C
@@ -14097,7 +14467,7 @@ gSpriteImage_83D20CC:: @ 83D20CC
.incbin "graphics/unknown_sprites/83D25C4/4.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d214c, 0x80
+ .incbin "baserom.gba", 0x003d214c, 0x80
.align 2
gFieldEffectObjectPalette8: @ 83D21CC
@@ -14279,7 +14649,7 @@ gSpriteImage_83D27C0:: @ 83D27C0
.incbin "graphics/unknown_sprites/83D2860/2.4bpp"
.align 2
- .incbin "baserom.gba", 0x3d2840, 0x20
+ .incbin "baserom.gba", 0x003d2840, 0x20
.align 2
gSpriteImageTable_83D2860:: @ 83D2860
@@ -14423,7 +14793,7 @@ gSpriteAffineAnim_83D5EAC:: @ 83D5EAC
obj_rot_scal_anim_jump 0
.align 2
- .incbin "baserom.gba", 0x3d5ebc, 0x60
+ .incbin "baserom.gba", 0x003d5ebc, 0x60
.align 2
gSpriteAffineAnim_83D5F1C:: @ 83D5F1C
@@ -14432,7 +14802,7 @@ gSpriteAffineAnim_83D5F1C:: @ 83D5F1C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d5f34, 0x30
+ .incbin "baserom.gba", 0x003d5f34, 0x30
.align 2
gSpriteAffineAnim_83D5F64:: @ 83D5F64
@@ -14441,7 +14811,7 @@ gSpriteAffineAnim_83D5F64:: @ 83D5F64
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d5f7c, 0xc0
+ .incbin "baserom.gba", 0x003d5f7c, 0xc0
.align 2
gSpriteAffineAnimTable_83D603C:: @ 83D603C
@@ -14453,7 +14823,7 @@ gSpriteAffineAnimTable_83D603C:: @ 83D603C
.4byte gSpriteAffineAnim_83D5F64
.align 2
- .incbin "baserom.gba", 0x3d6054, 0x38
+ .incbin "baserom.gba", 0x003d6054, 0x38
.align 2
gSpriteTemplate_83D608C:: @ 83D608C
@@ -15401,7 +15771,7 @@ gSpriteAffineAnim_83D6D2C:: @ 83D6D2C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d6d44, 0x18
+ .incbin "baserom.gba", 0x003d6d44, 0x18
.align 2
gSpriteAffineAnim_83D6D5C:: @ 83D6D5C
@@ -15410,7 +15780,7 @@ gSpriteAffineAnim_83D6D5C:: @ 83D6D5C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d6d74, 0x18
+ .incbin "baserom.gba", 0x003d6d74, 0x18
.align 2
gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C
@@ -15784,7 +16154,7 @@ gSpriteAffineAnim_83D7250:: @ 83D7250
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3d7278, 0x48
+ .incbin "baserom.gba", 0x003d7278, 0x48
.align 2
gSpriteAffineAnimTable_83D72C0:: @ 83D72C0
@@ -15847,7 +16217,7 @@ gSpriteTemplate_83D7370:: @ 83D7370
spr_template 10064, 10064, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF280
.align 2
- .incbin "baserom.gba", 0x3d7388, 0xc
+ .incbin "baserom.gba", 0x003d7388, 0xc
.align 2
gSpriteTemplate_83D7394:: @ 83D7394
@@ -16914,7 +17284,7 @@ gSpriteAnimTable_83D9650:: @ 83D9650
.4byte gSpriteAnim_83D9644
.align 2
- .incbin "baserom.gba", 0x3d9654, 0x28
+ .incbin "baserom.gba", 0x003d9654, 0x28
.align 2
gBattleAnimSpriteTemplate_83D967C:: @ 83D967C
@@ -17247,14 +17617,14 @@ gSpriteTemplate_83D9B40:: @ 83D9B40
spr_template 10001, 10001, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D755C
.align 2
- .incbin "baserom.gba", 0x3d9b58, 0x10
+ .incbin "baserom.gba", 0x003d9b58, 0x10
.align 2
gSpriteTemplate_83D9B68:: @ 83D9B68
spr_template 10141, 10141, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D7704
.align 2
- .incbin "baserom.gba", 0x3d9b80, 0x8
+ .incbin "baserom.gba", 0x003d9b80, 0x8
.align 2
gSpriteAnim_83D9B88:: @ 83D9B88
@@ -17283,7 +17653,7 @@ gSpriteAnim_83D9BA8:: @ 83D9BA8
obj_image_anim_jump 0
.align 2
- .incbin "baserom.gba", 0x3d9bb4, 0x4
+ .incbin "baserom.gba", 0x003d9bb4, 0x4
.align 2
gSpriteAnimTable_83D9BB8:: @ 83D9BB8
@@ -17932,7 +18302,7 @@ gBattleAnimSpriteTemplate_83DA498:: @ 83DA498
spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8
.align 2
- .incbin "baserom.gba", 0x3da4b0, 0x20
+ .incbin "baserom.gba", 0x003da4b0, 0x20
.align 2
gSpriteTemplate_83DA4D0:: @ 83DA4D0
@@ -18006,7 +18376,7 @@ gBattleAnimSpriteTemplate_83DA5D8:: @ 83DA5D8
spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA5D4, sub_80DB288
.align 2
- .incbin "baserom.gba", 0x3da5f0, 0x24
+ .incbin "baserom.gba", 0x003da5f0, 0x24
.align 2
gBattleAnimSpriteTemplate_83DA614:: @ 83DA614
@@ -18158,7 +18528,7 @@ gSpriteAnimTable_83DA85C:: @ 83DA85C
.4byte gSpriteAnim_83DA83C
.align 2
- .incbin "baserom.gba", 0x3da860, 0x28
+ .incbin "baserom.gba", 0x003da860, 0x28
gUnknown_083DA888:: @ 83DA888
.incbin "baserom.gba", 0x003da888, 0x4
@@ -18424,7 +18794,7 @@ gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8
spr_template 10261, 10261, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD3AC
.align 2
- .incbin "baserom.gba", 0x3dad00, 0x10
+ .incbin "baserom.gba", 0x003dad00, 0x10
gUnknown_083DAD10:: @ 83DAD10
.incbin "baserom.gba", 0x003dad10, 0x8
@@ -18570,7 +18940,7 @@ gBattleAnimSpriteTemplate_83DAEDC:: @ 83DAEDC
spr_template 10177, 10177, gOamData_837DF74, gSpriteAnimTable_83DAED8, NULL, gDummySpriteAffineAnimTable, sub_80DE0FC
.align 2
- .incbin "baserom.gba", 0x3daef4, 0x14
+ .incbin "baserom.gba", 0x003daef4, 0x14
.align 2
gSpriteTemplate_83DAF08:: @ 83DAF08
@@ -19104,8 +19474,15 @@ gUnknown_083DB7EC:: @ 83DB7EC
gUnknown_083DB7F4:: @ 83DB7F4
.incbin "baserom.gba", 0x003db7f4, 0x24C
+
+ .align 2
+gMenuInterviewFrame_Pal::
.incbin "graphics/misc/interview_frame.gbapal"
+
+ .align 2
+gMenuInterviewFrame_Gfx::
.incbin "graphics/misc/interview_frame.4bpp.lz"
+
.incbin "baserom.gba", 0x003dbb94, 0x20
gUnknown_083DBBB4:: @ 83DBBB4
@@ -19217,7 +19594,7 @@ gSpriteTemplate_83DBCAC:: @ 83DBCAC
.align 2
gUnknown_083DBCC4:: @ 83DBCC4
- .incbin "baserom.gba", 0x3dbcc4, 0x1c
+ .incbin "baserom.gba", 0x003dbcc4, 0x1c
.align 2
gOamData_83DBCE0:: @ 83DBCE0
@@ -19255,10 +19632,11 @@ gSpriteTemplate_83DBD18:: @ 83DBD18
.align 2
gUnknown_083DBD30:: @ 83DBD30
- obj_tiles 0x083dba60, 2048, 0x0006
+ obj_tiles gMenuInterviewFrame_Gfx, 2048, 0x0006
+ .align 2
gUnknown_083DBD38:: @ 83DBD38
- .incbin "baserom.gba", 0x003dbd38, 0x8
+ obj_pal gMenuInterviewFrame_Pal, 0x0004
.align 2
gOamData_83DBD40:: @ 83DBD40
@@ -19272,10 +19650,11 @@ gSpriteTemplate_83DBD48:: @ 83DBD48
.align 2
gUnknown_083DBD60:: @ 83DBD60
- obj_tiles 0x08e8ea98, 4096, 0x0007
+ obj_tiles gMenuWordGroup_Gfx, 4096, 0x0007
+ .align 2
gUnknown_083DBD68:: @ 83DBD68
- .incbin "baserom.gba", 0x003dbd68, 0x8
+ obj_pal gMenuWordGroup_Pal, 0x0005
.align 2
gOamData_83DBD70:: @ 83DBD70
@@ -19599,8 +19978,15 @@ gUnknown_083E329C:: @ 83E329C
.incbin "graphics/pokenav/icon.4bpp.lz"
.incbin "graphics/pokenav/contest_pokeball.4bpp"
.incbin "baserom.gba", 0x003E3780, 0x20
+
+ .align 2
+gContestSparkle_Pal::
.incbin "graphics/pokenav/contest_sparkle.gbapal"
+
+ .align 2
+gContestSparkle_Gfx::
.incbin "graphics/pokenav/contest_sparkle.4bpp"
+
.incbin "graphics/pokenav/contest_arrows.4bpp"
.incbin "baserom.gba", 0x003E3BC0, 0x20
.incbin "graphics/unknown/unknown_3E3BE0.4bpp"
@@ -19612,10 +19998,18 @@ gUnknown_083E3C60:: @ 83E3C60
.incbin "graphics/misc/ribbons_smart.gbapal"
.incbin "graphics/misc/ribbons_tough.gbapal"
+ .align 2
gUnknown_083E3D00:: @ 83E3D00
.incbin "graphics/misc/ribbons_full.4bpp.lz"
+
+ .align 2
+gUnknownPal_083E41D8::
.incbin "graphics/unknown/unknown_3E41D8.gbapal"
+
+ .align 2
+gUnknownGfx_083E41D8::
.incbin "graphics/unknown/unknown_3E41D8.4bpp"
+
.incbin "baserom.gba", 0x003e42D8, 0x20
gUnknown_083E42F8:: @ 83E42F8
@@ -19786,10 +20180,11 @@ gSpriteTemplate_83E4454:: @ 83E4454
.align 2
gUnknown_083E446C:: @ 83E446C
- obj_tiles 0x083e41d8, 256, 0x0019
+ obj_tiles gUnknownGfx_083E41D8, 256, 0x0019
+ .align 2
gUnknown_083E4474:: @ 83E4474
- .incbin "baserom.gba", 0x003e4474, 0x8
+ obj_pal gUnknownPal_083E41D8, 0x0011
.align 2
gOamData_83E447C:: @ 83E447C
@@ -19998,11 +20393,11 @@ gSpriteTemplate_83E476C:: @ 83E476C
.align 2
gUnknown_083E4784:: @ 83E4784
- obj_tiles 0x083e37c0, 896, 0x0017
+ obj_tiles gContestSparkle_Gfx, 896, 0x0017
.align 2
gUnknown_083E478C:: @ 83E478C
- obj_pal 0x083e37a0, 0x000f
+ obj_pal gContestSparkle_Pal, 0x000f
gUnknown_083E4794:: @ 83E4794
.incbin "baserom.gba", 0x003e4794, 0x28
@@ -20032,7 +20427,7 @@ gSpriteAnimTable_83E47E4:: @ 83E47E4
.4byte gSpriteAnim_83E47C4 + 0x18
.align 2
- .incbin "baserom.gba", 0x3e47f4, 0xc
+ .incbin "baserom.gba", 0x003e47f4, 0xc
.align 2
gSpriteTemplate_83E4800:: @ 83E4800
@@ -20040,7 +20435,7 @@ gSpriteTemplate_83E4800:: @ 83E4800
.align 2
gUnknown_083E4818:: @ 83E4818
- .incbin "baserom.gba", 0x3e4818, 0x8
+ .incbin "baserom.gba", 0x003e4818, 0x8
.align 2
gSpriteAnim_83E4820:: @ 83E4820
@@ -20187,7 +20582,7 @@ gSpriteAnimTable_83E52AC:: @ 83E52AC
.4byte gSpriteAnim_83E52A4
gUnknown_083E52B4:: @ 83E52B4
- .incbin "baserom.gba", 0x3E52B4, 0x8
+ .incbin "baserom.gba", 0x003E52B4, 0x8
.align 2
gSpriteAnim_83E52BC:: @ 83E52BC
@@ -20459,7 +20854,7 @@ gSpriteImage_83E5928:: @ 83E5928
.incbin "graphics/unknown_sprites/83E59C0/1.4bpp"
.align 2
- .incbin "baserom.gba", 0x3e5948, 0x20
+ .incbin "baserom.gba", 0x003e5948, 0x20
gUnknown_083E5968:: @ 83E5968
.incbin "baserom.gba", 0x003e5968, 0x8
@@ -20532,6 +20927,9 @@ gUnknown_083E5A1C:: @ 83E5A1C
gUnknown_083E5A20:: @ 83E5A20
.incbin "baserom.gba", 0x003E5A20, 0xB0
+
+ .align 2
+gPokenavCursor_Pal::
.incbin "graphics/pokenav/cursor.gbapal"
gUnknown_083E5AF0:: @ 83E5AF0
@@ -20600,7 +20998,7 @@ gSpriteAnimTable_83E76E0:: @ 83E76E0
.align 2
gUnknown_083E76E8:: @ 83E76E8
- obj_pal 0x083e5ad0, 0x0000
+ obj_pal gPokenavCursor_Pal, 0x0000
.align 2
gSpriteTemplate_83E76F0:: @ 83E76F0
@@ -20623,6 +21021,9 @@ gUnknown_083E773C:: @ 83E773C
gUnknown_083E7774:: @ 83E7774
.incbin "baserom.gba", 0x003e7774, 0xb8
+
+ .align 2
+gPokenavMapMisc_Pal::
.incbin "graphics/pokenav/map_misc.gbapal"
gUnknown_083E784C:: @ 83E784C
@@ -20636,7 +21037,7 @@ gUnknown_083E79C0:: @ 83E79C0
.align 2
gUnknown_083E79CC:: @ 83E79CC
- obj_pal 0x083e782c, 0x0002
+ obj_pal gPokenavMapMisc_Pal, 0x0002
gUnknown_083E79D4:: @ 83E79D4
.incbin "baserom.gba", 0x003e79d4, 0x8
@@ -20778,7 +21179,13 @@ gUnknown_083EC97C:: @ 83EC97C
.incbin "baserom.gba", 0x003ec97c, 0x8
gUnknown_083EC984:: @ 83EC984
- .incbin "baserom.gba", 0x003ec984, 0x48
+ .incbin "baserom.gba", 0x003ec984, 0x8
+
+ .align 2
+gUnknown_083EC98C::
+ .incbin "baserom.gba", 0x003ec98c, 0x20
+
+ .incbin "baserom.gba", 0x003ec9ac, 0x20
.align 2
gUnknown_083EC9CC:: @ 83EC9CC
@@ -20796,7 +21203,7 @@ gSpriteImage_83EC9DC:: @ 83EC9DC
.align 2
gUnknown_083ECA5C:: @ 83ECA5C
- obj_pal 0x083ec98c, 0x0008
+ obj_pal gUnknown_083EC98C, 0x0008
gUnknown_083ECA64:: @ 83ECA64
.incbin "baserom.gba", 0x003eca64, 0x8
@@ -20938,11 +21345,9 @@ gUnknown_083ECBB4:: @ 83ECBB4
.4byte sub_8104144
.4byte sub_81041AC
+ .align 1
gUnknown_083ECBC4:: @ 83ECBC4
- .incbin "baserom.gba", 0x003ecbc4, 0x2
-
-gUnknown_083ECBC6:: @ 83ECBC6
- .incbin "baserom.gba", 0x003ecbc6, 0xa
+ .2byte 0x9E, 0x6E, 0x9F, 0x6F, 0xAF, 0x7F
.align 2
gUnknown_083ECBD0:: @ 83ECBD0
@@ -20992,10 +21397,11 @@ gUnknown_083ECC54:: @ 83ECC54
.4byte nullsub_69
gUnknown_083ECC58:: @ 83ECC58
- .incbin "baserom.gba", 0x003ecc58, 0x2
+ .byte 16, 0
+ .align 1
gUnknown_083ECC5A:: @ 83ECC5A
- .incbin "baserom.gba", 0x003ecc5a, 0x8
+ .2byte 0x0, 0x40, 0x80, 0xC0
gUnknown_083ECC62:: @ 83ECC62
.incbin "baserom.gba", 0x003ecc62, 0x8
@@ -21070,21 +21476,21 @@ gUnknown_083ECE7E:: @ 83ECE7E
.incbin "baserom.gba", 0x003ece7e, 0x8e
gUnknown_083ECF0C:: @ 83ECF0C
- .incbin "baserom.gba", 0x3ECF0C, 0x8C
+ .incbin "baserom.gba", 0x003ECF0C, 0x8C
Unknown_83ECF98:
- .incbin "baserom.gba", 0x3ECF98, 0x10
+ .incbin "baserom.gba", 0x003ECF98, 0x10
Unknown_83ECFA8:
- .incbin "baserom.gba", 0x3ECFA8, 0x1C
+ .incbin "baserom.gba", 0x003ECFA8, 0x1C
Unknown_83ECFC4:
- .incbin "baserom.gba", 0x3ECFC4, 0xC
+ .incbin "baserom.gba", 0x003ECFC4, 0xC
Unknown_83ECFD0:
- .incbin "baserom.gba", 0x3ECFD0, 0x18
+ .incbin "baserom.gba", 0x003ECFD0, 0x18
Unknown_83ECFE8:
- .incbin "baserom.gba", 0x3ECFE8, 0x10
+ .incbin "baserom.gba", 0x003ECFE8, 0x10
Unknown_83ECFF8:
- .incbin "baserom.gba", 0x3ECFF8, 0x28
+ .incbin "baserom.gba", 0x003ECFF8, 0x28
Unknown_83ED020:
- .incbin "baserom.gba", 0x3ED020, 0x28
+ .incbin "baserom.gba", 0x003ED020, 0x28
.align 2
gUnknown_083ED048:: @ 83ED048
@@ -21097,7 +21503,13 @@ gUnknown_083ED048:: @ 83ED048
.4byte Unknown_83ECFF8
gUnknown_083ED064:: @ 83ED064
- .incbin "baserom.gba", 0x003ed064, 0x1C
+ .4byte sub_810639C
+ .4byte sub_8106364
+ .4byte sub_8106370
+ .4byte nullsub_70
+ .4byte nullsub_70
+ .4byte sub_8106370
+ .4byte sub_8106370
.align 2
gOamData_83ED080:: @ 83ED080
@@ -21148,7 +21560,7 @@ gOamData_83ED0B8:: @ 83ED0B8
.2byte 0x0000
.align 2
- .incbin "baserom.gba", 0x3ed0c0, 0x40
+ .incbin "baserom.gba", 0x003ed0c0, 0x40
.align 2
gSpriteImageTable_83ED100:: @ 83ED100
@@ -21190,7 +21602,7 @@ gSpriteImageTable_83ED170:: @ 83ED170
obj_frame_tiles gSpriteImage_8E98868, 0x80
.align 2
- .incbin "baserom.gba", 0x3ed178, 0xb0
+ .incbin "baserom.gba", 0x003ed178, 0xb0
.align 2
gSpriteImageTable_83ED228:: @ 83ED228
@@ -21543,25 +21955,131 @@ gSpriteTemplate_83ED6CC:: @ 83ED6CC
spr_template 0xFFFF, 4, gOamData_83ED080, gSpriteAnimTable_83ED32C, gSpriteImageTable_83ED228, gSpriteAffineAnimTable_83ED410, sub_8105B70
.align 2
- .incbin "baserom.gba", 0x3ed6e4, 0x20
+Unknown_083ED6E4:
+ .incbin "baserom.gba", 0x003ed6e4, 0x20
gUnknown_083ED704:: @ 83ED704
- .incbin "baserom.gba", 0x003ed704, 0x38
+ .4byte 4, Unknown_083ED6E4
+Unknown_083ED70C:
+ .incbin "baserom.gba", 0x003ed70c, 0x30
gUnknown_083ED73C:: @ 83ED73C
- .incbin "baserom.gba", 0x003ed73c, 0x20
+ .4byte 6, Unknown_083ED70C
+Unknown_083ED744:
+ .incbin "baserom.gba", 0x003ed744, 0x18
gUnknown_083ED75C:: @ 83ED75C
- .incbin "baserom.gba", 0x003ed75c, 0x30
+ .4byte 3, Unknown_083ED744
+Unknown_083ED764:
+ .incbin "baserom.gba", 0x003ed764, 0x28
gUnknown_083ED78C:: @ 83ED78C
- .incbin "baserom.gba", 0x003ed78c, 0x28
+ .4byte 5, Unknown_083ED764
+Unknown_083ED794:
+ .incbin "baserom.gba", 0x003ed794, 0x20
gUnknown_083ED7B4:: @ 83ED7B4
- .incbin "baserom.gba", 0x003ed7b4, 0x20
+ .4byte 4, Unknown_083ED794
+Unknown_083ED7BC:
+ .incbin "baserom.gba", 0x003ed7bc, 0x18
gUnknown_083ED7D4:: @ 83ED7D4
- .incbin "baserom.gba", 0x003ed7d4, 0x388
+ .4byte 3, Unknown_083ED7BC
+Unknown_083ED7DC:
+ .incbin "baserom.gba", 0x003ed7dc, 0x28
+Unknown_083ED804:
+ .4byte 5, Unknown_083ED7DC
+Unknown_083ED80C:
+ .incbin "baserom.gba", 0x003ed80c, 0x20
+Unknown_083ED82C:
+ .4byte 4, Unknown_083ED80C
+Unknown_083ED834:
+ .incbin "baserom.gba", 0x003ed834, 0x20
+Unknown_083ED854:
+ .4byte 4, Unknown_083ED834
+Unknown_083ED85C:
+ .incbin "baserom.gba", 0x003ed85c, 0x20
+Unknown_083ED87C:
+ .4byte 4, Unknown_083ED85C
+Unknown_083ED884:
+ .incbin "baserom.gba", 0x003ed884, 0x30
+Unknown_083ED8B4:
+ .4byte 6, Unknown_083ED884
+Unknown_083ED8BC:
+ .incbin "baserom.gba", 0x003ed8bc, 0x8
+Unknown_083ED8C4:
+ .incbin "baserom.gba", 0x003ed8c4, 0x8
+Unknown_083ED8CC:
+ .4byte 1, Unknown_083ED8BC
+ .4byte 1, Unknown_083ED8C4
+Unknown_083ED8DC:
+ .incbin "baserom.gba", 0x003ed8dc, 0x60
+Unknown_083ED93C:
+ .4byte 12, Unknown_083ED8DC
+Unknown_083ED944:
+ .incbin "baserom.gba", 0x003ed944, 0x18
+Unknown_083ED95C:
+ .4byte 3, Unknown_083ED944
+Unknown_083ED964:
+ .incbin "baserom.gba", 0x003ed964, 0x10
+Unknown_083ED974:
+ .4byte 2, Unknown_083ED964
+Unknown_083ED97C:
+ .incbin "baserom.gba", 0x003ed97c, 0x10
+Unknown_083ED98C:
+ .4byte 2, Unknown_083ED97C
+Unknown_083ED994:
+ .incbin "baserom.gba", 0x003ed994, 0x10
+Unknown_083ED9A4:
+ .4byte 2, Unknown_083ED994
+Unknown_083ED9AC:
+ .incbin "baserom.gba", 0x003ed9ac, 0x10
+Unknown_083ED9BC:
+ .4byte 2, Unknown_083ED9AC
+Unknown_083ED9C4:
+ .incbin "baserom.gba", 0x003ed9c4, 0x10
+Unknown_083ED9D4:
+ .4byte 2, Unknown_083ED9C4
+Unknown_083ED9DC:
+ .incbin "baserom.gba", 0x003ed9dc, 0x10
+Unknown_083ED9EC:
+ .4byte 2, Unknown_083ED9DC
+Unknown_083ED9F4:
+ .incbin "baserom.gba", 0x003ed9f4, 0x10
+Unknown_083EDA04:
+ .4byte 2, Unknown_083ED9F4
+Unknown_083EDA0C:
+ .incbin "baserom.gba", 0x003eda0C, 0x10
+Unknown_083EDA1C:
+ .4byte 2, Unknown_083EDA0C
+Unknown_083EDA24:
+ .incbin "baserom.gba", 0x003eda24, 0x10
+Unknown_083EDA34:
+ .4byte 2, Unknown_083EDA24
+Unknown_083EDA3C:
+ .incbin "baserom.gba", 0x003eda3c, 0x30
+Unknown_083EDA6C:
+ .4byte 6, Unknown_083EDA3C
+Unknown_083EDA74:
+ .incbin "baserom.gba", 0x003eda74, 0x18
+Unknown_083EDA8C:
+ .4byte 3, Unknown_083EDA74
+Unknown_083EDA94:
+ .incbin "baserom.gba", 0x003eda94, 0x30
+Unknown_083EDAC4:
+ .4byte 6, Unknown_083EDA94
+Unknown_083EDACC:
+ .incbin "baserom.gba", 0x003edacc, 0x30
+Unknown_083EDAFC:
+ .4byte 6, Unknown_083EDACC
+Unknown_083EDB04:
+ .incbin "baserom.gba", 0x003edb04, 0x18
+Unknown_083EDB1C:
+ .4byte 3, Unknown_083EDB04
+Unknown_083EDB24:
+ .incbin "baserom.gba", 0x003edb24, 0x30
+Unknown_083EDB54:
+ .4byte 6, Unknown_083EDB24
.align 2
gUnknown_083EDB5C:: @ 83EDB5C
@@ -21592,8 +22110,34 @@ gUnknown_083EDB5C:: @ 83EDB5C
.4byte gSpriteTemplate_83ED63C
.4byte gDummySpriteTemplate
+ .align 2
gUnknown_083EDBC4:: @ 83EDBC4
- .incbin "baserom.gba", 0x003edbc4, 0x68
+ .4byte Unknown_083ED804
+ .4byte Unknown_083ED82C
+ .4byte Unknown_083ED854
+ .4byte Unknown_083ED8B4
+ .4byte 0 @ dummied out
+ .4byte 0 @ dummied out
+ .4byte Unknown_083ED8CC
+ .4byte 0 @ dummied out
+ .4byte Unknown_083ED93C
+ .4byte Unknown_083ED95C
+ .4byte Unknown_083ED974
+ .4byte Unknown_083ED98C
+ .4byte Unknown_083ED9A4
+ .4byte Unknown_083ED9BC
+ .4byte Unknown_083ED9D4
+ .4byte Unknown_083ED9EC
+ .4byte Unknown_083EDA04
+ .4byte Unknown_083EDA1C
+ .4byte Unknown_083EDA34
+ .4byte Unknown_083EDA6C
+ .4byte Unknown_083EDA8C
+ .4byte Unknown_083EDAC4
+ .4byte Unknown_083EDAFC
+ .4byte Unknown_083EDB1C
+ .4byte Unknown_083EDB54
+ .4byte 0 @ dummied out
gUnknown_083EDC2C:: @ 83EDC2C
.incbin "baserom.gba", 0x003edc2c, 0xb0
@@ -21636,14 +22180,13 @@ gUnknown_083EDD35:: @ 83EDD35
.incbin "baserom.gba", 0x003edd35, 0x6
gUnknown_083EDD3B:: @ 83EDD3B
-Unknown_83EDD3B:
.incbin "baserom.gba", 0x003edd3b, 0x3
Unknown_83EDD3E:
.incbin "baserom.gba", 0x003edd3e, 0x20
Unknown_83EDD5E:
.incbin "baserom.gba", 0x003edd5e, 0x20
Unknown_83EDD7E:
- .incbin "baserom.gba", 0x003edd7e, 0x22
+ .incbin "baserom.gba", 0x003edd7e, 0x20
.align 2
gUnknown_083EDDA0:: @ 83EDDA0
@@ -21916,7 +22459,13 @@ gUnknown_083F62E8:: @ 83F62E8
gUnknown_083F62EC:: @ 83F62EC
.incbin "graphics/misc/birch_bag.gbapal"
.incbin "graphics/misc/birch_grass.gbapal"
+
+ .align 2
+gBirchBallarrow_Pal::
.incbin "graphics/misc/birch_ballarrow.gbapal"
+
+ .align 2
+gBirchCircle_Pal::
.incbin "graphics/misc/birch_circle.gbapal"
gUnknown_083F636C:: @ 83F636C
@@ -21927,7 +22476,13 @@ gUnknown_083F64F8:: @ 83F64F8
gUnknown_083F66F0:: @ 83F66F0
.incbin "graphics/misc/birch_help.4bpp.lz"
+
+ .align 2
+gBirchBallarrow_Gfx::
.incbin "graphics/misc/birch_ballarrow.4bpp.lz"
+
+ .align 2
+gBirchCircle_Gfx::
.incbin "graphics/misc/birch_circle.4bpp.lz"
gUnknown_083F76B8:: @ 83F76B8
@@ -22028,13 +22583,17 @@ gSpriteAffineAnimTable_83F7790:: @ 83F7790
.4byte gSpriteAffineAnim_83F7774
gUnknown_083F7794:: @ 83F7794
- .incbin "baserom.gba", 0x003f7794, 0x10
+ obj_tiles gBirchBallarrow_Gfx, 0x0800, 0x1000
+ .space 8
gUnknown_083F77A4:: @ 83F77A4
- .incbin "baserom.gba", 0x003f77a4, 0x10
+ obj_tiles gBirchCircle_Gfx, 0x0800, 0x1001
+ .space 8
gUnknown_083F77B4:: @ 83F77B4
- .incbin "baserom.gba", 0x003f77b4, 0x18
+ obj_pal gBirchBallarrow_Pal, 0x1000
+ obj_pal gBirchCircle_Pal, 0x1001
+ .space 8
.align 2
gSpriteTemplate_83F77CC:: @ 83F77CC
@@ -22049,13 +22608,17 @@ gSpriteTemplate_83F77FC:: @ 83F77FC
spr_template 4097, 4097, gOamData_83F76DC, gSpriteAnimTable_83F7758, NULL, gSpriteAffineAnimTable_83F7790, sub_810A6C4
@ 83F7814
+ClockGfx_Misc:
.incbin "graphics/misc/clock_misc.4bpp.lz"
gUnknown_083F7A90:: @ 83F7A90
- .incbin "baserom.gba", 0x003f7a90, 0x10
+ obj_tiles ClockGfx_Misc, 0x2000, 0x1000
+ .space 8
gUnknown_083F7AA0:: @ 83F7AA0
- .incbin "baserom.gba", 0x003f7aa0, 0x18
+ obj_pal gUnknown_08E8F804, 0x1000
+ obj_pal gUnknown_08E8F824, 0x1001
+ .space 8
.align 2
gOamData_83F7AB8:: @ 83F7AB8
@@ -22129,10 +22692,8 @@ gUnknown_083F7E28:: @ 83F7E28
.align 2
gUnknown_083F7EA8:: @ 83F7EA8
- .4byte sub_80A5B40
- .4byte c2_exit_to_overworld_2_switch
- .4byte sub_802E424
- .4byte c2_exit_to_overworld_2_switch
+ .4byte sub_80A5B40, c2_exit_to_overworld_2_switch
+ .4byte sub_802E424, c2_exit_to_overworld_2_switch
.align 2
gUnknown_083F7EB8:: @ 83F7EB8
@@ -22195,16 +22756,17 @@ gSpriteAnimTable_83F7F44:: @ 83F7F44
Unknown_83F7F48:
.incbin "baserom.gba", 0x003f7f48, 0x28
+ .align 2
gUnknown_083F7F70:: @ 83F7F70
.4byte Unknown_83F7F48
.align 2
gUnknown_083F7F74:: @ 83F7F74
- obj_tiles 0x08e77d90, 2048, 0x39d0
+ obj_tiles gMenuPokeblockDevice_Gfx, 2048, 0x39d0
.align 2
gUnknown_083F7F7C:: @ 83F7F7C
- obj_pal 0x08e78050, 0x39d0
+ obj_pal gMenuPokeblockDevice_Pal, 0x39d0
.align 2
gSpriteTemplate_83F7F84:: @ 83F7F84
@@ -22363,7 +22925,13 @@ gUnknown_083F868C:: @ 83F868C
.incbin "baserom.gba", 0x003f868c, 0x30
gUnknown_083F86BC:: @ 83F86BC
- .incbin "baserom.gba", 0x003f86bc, 0x200
+ .incbin "baserom.gba", 0x003f86bc, 0x40
+
+ .align 2
+gRouletteCenter_Pal::
+ .incbin "graphics/roulette/center.gbapal"
+
+ .incbin "baserom.gba", 0x003f871c, 0x1A0
gUnknown_083F88BC:: @ 83F88BC
.incbin "baserom.gba", 0x003f88bc, 0x1a4
@@ -22908,7 +23476,7 @@ gOamData_83FA328:: @ 83FA328
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa330, 0x20
+ .incbin "baserom.gba", 0x003fa330, 0x20
.align 2
gSpriteAnim_83FA350:: @ 83FA350
@@ -22943,7 +23511,12 @@ gSpriteAnim_83FA38C:: @ 83FA38C
obj_image_anim_end
.align 2
- .incbin "baserom.gba", 0x3fa3a0, 0x34
+Unknown_083FA3A0:
+ .incbin "baserom.gba", 0x003fa3a0, 0x18
+Unknown_083FA3B8:
+ .incbin "baserom.gba", 0x003fa3b8, 0x14
+Unknown_083FA3CC:
+ .incbin "baserom.gba", 0x003fa3cc, 0x8
.align 2
gSpriteAnim_83FA3D4:: @ 83FA3D4
@@ -22962,7 +23535,10 @@ gSpriteAnimTable_83FA3E8:: @ 83FA3E8
.4byte gSpriteAnim_83FA3D4
.align 2
- .incbin "baserom.gba", 0x3fa3fc, 0x10
+ .4byte Unknown_083FA3A0
+ .4byte Unknown_083FA3B8
+ .4byte Unknown_083FA3B8
+ .4byte Unknown_083FA3CC
.align 2
gSpriteTemplate_83FA40C:: @ 83FA40C
@@ -22976,7 +23552,7 @@ gOamData_83FA424:: @ 83FA424
.align 2
gUnknown_083FA42C:: @ 83FA42C
- obj_tiles 0x08e82140, 2048, 0x0006
+ obj_tiles gRouletteCenter_Gfx, 2048, 0x0006
.align 2
gSpriteTemplate_83FA434:: @ 83FA434
@@ -22995,7 +23571,7 @@ gOamData_83FA454:: @ 83FA454
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa45c, 0x38
+ .incbin "baserom.gba", 0x003fa45c, 0x38
.align 2
gSpriteAnim_83FA494:: @ 83FA494
@@ -23081,7 +23657,9 @@ gOamData_83FA54C:: @ 83FA54C
.2byte 0x0800
.align 2
- .incbin "baserom.gba", 0x3fa554, 0x28
+ .incbin "baserom.gba", 0x003fa554, 0x10
+Unknown_083FA564:
+ .incbin "baserom.gba", 0x003fa564, 0x18
.align 2
gSpriteAffineAnim_83FA57C:: @ 83FA57C
@@ -23092,14 +23670,14 @@ gSpriteAffineAnim_83FA57C:: @ 83FA57C
obj_rot_scal_anim_end
.align 2
- .incbin "baserom.gba", 0x3fa5a4, 0x4
+ .4byte Unknown_083FA564
.align 2
gSpriteAffineAnimTable_83FA5A8:: @ 83FA5A8
.4byte gSpriteAffineAnim_83FA57C
.align 2
- .incbin "baserom.gba", 0x3fa5ac, 0x14
+ .incbin "baserom.gba", 0x003fa5ac, 0x14
.align 2
gSpriteTemplate_83FA5C0:: @ 83FA5C0
@@ -23116,8 +23694,10 @@ gSpriteTemplate_83FA5F0:: @ 83FA5F0
gUnknown_083FA608:: @ 83FA608
.incbin "baserom.gba", 0x003fa608, 0x6
+ .align 1
gUnknown_083FA60E:: @ 83FA60E
- .incbin "baserom.gba", 0x003fa60e, 0x8
+ .2byte 0x74, 0x2C
+ .2byte 0x74, 0x70
gUnknown_083FA616:: @ 83FA616
.incbin "baserom.gba", 0x003fa616, 0x8
@@ -23659,7 +24239,7 @@ gUnknown_08401D8E:: @ 8401D8E
.incbin "baserom.gba", 0x00401d8e, 0x8
gUnknown_08401D96:: @ 8401D96
- .incbin "baserom.gba", 0x00401d96, 0x6
+ .incbin "baserom.gba", 0x00401d96, 0x4
.align 2
gUnknown_08401D9C:: @ 8401D9C
@@ -24196,7 +24776,7 @@ gBattleAnimSpriteTemplate_84026A4:: @ 84026A4
spr_template 10238, 10238, gOamData_837DF24, gSpriteAnimTable_8402698, NULL, gDummySpriteAffineAnimTable, sub_812E7A0
.align 2
- .incbin "baserom.gba", 0x4026bc, 0x20
+ .incbin "baserom.gba", 0x004026bc, 0x20
.align 2
gSpriteAnim_84026DC:: @ 84026DC
@@ -24441,7 +25021,17 @@ gBattleAnimSpriteTemplate_8402B10:: @ 8402B10
.align 2
gUnknown_08402B28:: @ 8402B28
- .incbin "baserom.gba", 0x00402b28, 0x1d0
+ .incbin "baserom.gba", 0x00402b28, 0x30
+
+ .align 2
+gDexArrows_Pal::
+ .incbin "graphics/pokedex/arrows.gbapal"
+
+ .align 2
+gDexArrows_Gfx::
+ .incbin "graphics/pokedex/arrows.4bpp"
+
+ .incbin "baserom.gba", 0x00402c78, 0x80
gUnknown_08402CF8:: @ 8402CF8
.incbin "baserom.gba", 0x00402cf8, 0x10
@@ -24484,11 +25074,11 @@ gSpriteAnimTable_8402D78:: @ 8402D78
.align 2
gUnknown_08402D80:: @ 8402D80
- obj_tiles 0x08402b78, 384, 0x1595
+ obj_tiles gDexArrows_Gfx, 384, 0x1595
.align 2
gUnknown_08402D88:: @ 8402D88
- obj_pal 0x08402b58, 0x1596
+ obj_pal gDexArrows_Pal, 0x1596
.align 2
gSpriteTemplate_8402D90:: @ 8402D90
@@ -24545,7 +25135,7 @@ gSpriteTemplate_8402E08:: @ 8402E08
spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
.align 2
- .incbin "baserom.gba", 0x402e20, 0x4
+ .incbin "baserom.gba", 0x00402e20, 0x4
gUnknown_08402E24:: @ 8402E24
.incbin "baserom.gba", 0x00402e24, 0x15
@@ -24593,7 +25183,17 @@ gUnknown_08405EDA:: @ 8405EDA
.incbin "baserom.gba", 0x00405eda, 0xc
gUnknown_08405EE6:: @ 8405EE6
- .incbin "baserom.gba", 0x00405ee6, 0x232
+ .incbin "baserom.gba", 0x00405ee6, 0x12
+
+ .align 2
+gUnknownPal_08405EF8::
+ .incbin "baserom.gba", 0x00405ef8, 0x20
+
+ .align 2
+gUnknownPal_08405F18::
+ .incbin "baserom.gba", 0x00405f18, 0x20
+
+ .incbin "baserom.gba", 0x00405f38, 0x1E0
gUnknown_08406118:: @ 8406118
.incbin "baserom.gba", 0x00406118, 0x14
@@ -24612,11 +25212,11 @@ gUnknown_08406134:: @ 8406134
.align 2
gUnknown_08406148:: @ 8406148
- obj_pal 0x08405f18, 0x0200
+ obj_pal gUnknownPal_08405F18, 0x0200
.align 2
gUnknown_08406150:: @ 8406150
- obj_pal 0x08405ef8, 0x0000
+ obj_pal gUnknownPal_08405EF8, 0x0000
gUnknown_08406158:: @ 8406158
.incbin "baserom.gba", 0x00406158, 0x14
@@ -24873,7 +25473,7 @@ gSpriteTemplate_840AE20:: @ 840AE20
spr_template 2000, 2000, gOamData_840ADE8, gSpriteAnimTable_840AE10, NULL, gDummySpriteAffineAnimTable, sub_813D208
.align 2
- .incbin "baserom.gba", 0x40ae38, 0x48
+ .incbin "baserom.gba", 0x0040ae38, 0x48
gUnknown_0840AE80:: @ 840AE80
.incbin "baserom.gba", 0x0040ae80, 0x10
@@ -28192,7 +28792,7 @@ gSpriteAffineAnimTable_84121D8:: @ 84121D8
.align 2
gUnknown_084121DC:: @ 84121DC
- obj_tiles 0x08e781c8, 0x20, 14818
+ obj_tiles gPokeblock_Gfx, 0x20, 14818
.align 2
gSpriteTemplate_84121E4:: @ 84121E4
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 61d2f2a8a..0590d82fa 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -1,3 +1,8 @@
+ .include "asm/macros.s"
+ .include "constants/constants.s"
+
+ .section script_data, "aw", %progbits
+
.align 2
gFieldEffectScriptPointers:: @ 81D9B34
.4byte gFieldEffectScript_ExclamationMarkIcon1
diff --git a/data/graphics.s b/data/graphics.s
index 378a5483c..acf4617ca 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -104,6 +104,9 @@ gInterfacePal_PremierBall::
gUnknown_08D030D0:: @ 8D030D0
.incbin "graphics/interface/ball_open.4bpp.lz"
+
+ .align 2
+gBlankGfxCompressed::
.incbin "graphics/interface/blank.4bpp.lz"
.align 2
@@ -885,8 +888,12 @@ gBattleAnimSpritePalette_114:: @ 8D1106C
gBattleAnimSpriteSheet_115:: @ 8D11B74
.incbin "graphics/battle_anims/sprites/115.4bpp.lz"
- .incbin "baserom.gba", 0xd11ca4, 0x4C8
+ .incbin "baserom.gba", 0xd11ca4, 0x488
+gUnknown_08D1212C::
+ .incbin "graphics/interface/battle_window.gbapal"
+gUnknown_08D1214C::
+ .incbin "baserom.gba", 0xd1214c, 0x20
gUnknown_08D1216C:: @ 8D1216C
.incbin "baserom.gba", 0x00d1216c, 0xec0
@@ -1038,7 +1045,17 @@ gBattleAnimSpritePalette_076:: @ 8D150CC
gBattleAnimSpriteSheet_077:: @ 8D150F4
.incbin "graphics/battle_anims/sprites/077.4bpp.lz"
- .incbin "baserom.gba", 0xd151c8, 0x1F7C
+ .incbin "baserom.gba", 0x00d151c8, 0xE5C
+
+ .align 2
+gContestNumbers_UnusedGfx::
+ .incbin "graphics/unused/numbers.4bpp.lz"
+
+ .align 2
+gContestNumbers_UnusedPal::
+ .incbin "graphics/unused/numbers.gbapal.lz"
+
+ .incbin "baserom.gba", 0x00d16134, 0x1010
gUnknown_08D17144:: @ 8D17144
.incbin "baserom.gba", 0x00d17144, 0x118
@@ -1056,7 +1073,19 @@ gUnknown_08D17D6C:: @ 8D17D6C
.incbin "baserom.gba", 0x00d17d6c, 0xaac
gUnknown_08D18818:: @ 8D18818
- .incbin "baserom.gba", 0x00d18818, 0xf64
+ .incbin "baserom.gba", 0x00d18818, 0xd78
+
+ .align 2
+gContestJudgeSymbolsGfx:: @ 8D19590
+ .incbin "graphics/misc/judge_symbols.4bpp.lz"
+
+ .align 2
+gContest3Pal::
+ .incbin "graphics/misc/judge_symbols.gbapal.lz"
+
+ .align 2
+gTiles_8D1975C:: @ 8D1975C
+ .incbin "baserom.gba", 0x00d1975c, 0x20
gUnknown_08D1977C:: @ 8D1977C
.incbin "baserom.gba", 0x00d1977c, 0xad4
@@ -1317,10 +1346,13 @@ gBattleAnimSpritePalette_171:: @ 8D1C700
gBattleAnimSpritePalette_172:: @ 8D1C728
.incbin "graphics/battle_anims/sprites/172.gbapal.lz"
- .incbin "baserom.gba", 0xd1c748, 0x2d4
+ .align 2
+gContestJudgeGfx::
+ .incbin "graphics/misc/judge.4bpp.lz"
-gUnknown_08D1CA1C:: @ 8D1CA1C
- .incbin "baserom.gba", 0x00d1ca1c, 0x28
+ .align 2
+gContest2Pal:: @ 8D1CA1C
+ .incbin "graphics/misc/judge.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_001:: @ 8D1CA44
@@ -1471,7 +1503,27 @@ gBattleAnimSpriteSheet_186:: @ 8D1F13C
gBattleAnimSpritePalette_186:: @ 8D1F508
.incbin "graphics/battle_anims/sprites/186.gbapal.lz"
- .incbin "baserom.gba", 0xd1f52c, 0xa54
+ .align 2
+gBattleWindowLargeGfx::
+ .incbin "graphics/interface/battle_window.4bpp.lz"
+
+ .align 2
+gBattleWindowSmallGfx::
+ .incbin "graphics/interface/battle_window2.4bpp.lz"
+
+ .align 2
+gBattleWindowSmall2Gfx::
+ .incbin "graphics/interface/battle_window3.4bpp.lz"
+
+ .align 2
+gBattleWindowSmall3Gfx::
+ .incbin "graphics/interface/battle_window4.4bpp.lz"
+
+ .align 2
+gBattleWindowLarge2Gfx:: @ 8d1fc94
+ .incbin "graphics/interface/battle_window5.4bpp.lz"
+
+ .incbin "baserom.gba", 0xd1ff0C, 0x74
.align 2
gBattleAnimSpriteSheet_014:: @ 8D1FF80
@@ -2057,7 +2109,13 @@ gBattleAnimSpriteSheet_241:: @ 8D2D6F4
gBattleAnimSpritePalette_241:: @ 8D2D7B8
.incbin "graphics/battle_anims/sprites/241.gbapal.lz"
- .incbin "baserom.gba", 0xd2d7d4, 0x148
+ .align 2
+gContestConfetti_Gfx::
+ .incbin "graphics/misc/confetti.4bpp.lz"
+
+ .align 2
+gContestConfetti_Pal::
+ .incbin "graphics/misc/confetti.gbapal.lz"
.align 2
gBattleAnimSpriteSheet_242:: @ 8D2D91C
@@ -2258,8 +2316,9 @@ gUnknown_08E5DAF8:: @ 8E5DAF8
gUnknown_08E5DC04:: @ 8E5DC04
.incbin "baserom.gba", 0x00e5dc04, 0x28
+ .align 2
gUnknown_08E5DC2C:: @ 8E5DC2C
- .incbin "baserom.gba", 0x00e5dc2c, 0x210
+ .incbin "graphics/battle_transitions/vs.4bpp.lz"
.align 2
gBattleTerrainTiles_TallGrass:: @ 8E5DE3C
@@ -2530,7 +2589,9 @@ gBattleAnimSpriteSheet_262:: @ 8E69308
gBattleAnimSpritePalette_262:: @ 8E693DC
.incbin "graphics/battle_anims/sprites/262.gbapal.lz"
- .incbin "baserom.gba", 0xe69404, 0x74
+ .align 2
+gContestNextTurnGfx::
+ .incbin "graphics/misc/nextturn.4bpp.lz"
gUnknown_08E69478:: @ 8E69478
.incbin "baserom.gba", 0x00e69478, 0x100
@@ -2558,10 +2619,16 @@ gBattleAnimSpritePalette_067:: @ 8E69608
gBattleAnimSpritePalette_068:: @ 8E69628
.incbin "graphics/battle_anims/sprites/068.gbapal.lz"
- .incbin "baserom.gba", 0xe69648, 0x144
+ .align 2
+gContestApplauseGfx::
+ .incbin "graphics/misc/applause.4bpp.lz"
gUnknown_08E6978C:: @ 8E6978C
- .incbin "baserom.gba", 0x00e6978c, 0xA0
+ .incbin "baserom.gba", 0x00e6978c, 0x80
+
+ .align 2
+gContestPal::
+ .incbin "graphics/misc/nextturn.gbapal"
.align 2
gBattleAnimSpriteSheet_272:: @ 8E6982C
@@ -2620,7 +2687,13 @@ gBattleAnimSpritePalette_280:: @ 8E6A6E4
.incbin "graphics/battle_anims/sprites/280.gbapal.lz"
gUnknown_08E6A704:: @ 8E6A704
- .incbin "baserom.gba", 0x00e6a704, 0xD8
+ .incbin "baserom.gba", 0x00e6a704, 0x24
+
+gUnknown_08E6A728:: @ 8E6A728
+ .incbin "baserom.gba", 0x00e6a728, 0x30
+
+gUnknown_08E6A758:: @ 8E6A758
+ .incbin "baserom.gba", 0x00e6a758, 0x84
.align 2
gMonIcon_Egg:: @ 8E6A7DC
@@ -2816,16 +2889,27 @@ gUnknown_08E71894:: @ 8E71894
.incbin "baserom.gba", 0x00e71894, 0xa0
gUnknown_08E71934:: @ 8E71934
- .incbin "baserom.gba", 0x00e71934, 0xdb0
+ .incbin "baserom.gba", 0x00e71934, 0x3dc
+
+gUnknown_08E71D10:: @ 8E71D10
+ .incbin "baserom.gba", 0x00e71d10, 0x9d4
gUnknown_08E726E4:: @ 8E726E4
- .incbin "baserom.gba", 0x00e726e4, 0x17c
+ .incbin "baserom.gba", 0x00e726e4, 0x68
-gUnknown_08E72860:: @ 8E72860
- .incbin "baserom.gba", 0x00e72860, 0x1f0
+gMenuSummaryGfx:: @ 8E7274C
+ .incbin "graphics/interface/summary_frames.4bpp.lz" @ the arrows appear to be unused.
-gUnknown_08E72A50:: @ 8E72A50
- .incbin "baserom.gba", 0x00e72a50, 0x28
+gMenuSummaryPal:: @ 8E72848
+ .incbin "graphics/interface/summary_frames.gbapal.lz"
+
+ .align 2
+gStatusGfx_Icons:: @ 8E72860
+ .incbin "graphics/interface/status_icons.4bpp.lz"
+
+ .align 2
+gStatusPal_Icons:: @ 8E72A50
+ .incbin "graphics/interface/status_icons.gbapal.lz"
gUnknown_08E72A78:: @ 8E72A78
.incbin "baserom.gba", 0x00e72a78, 0x9f0
@@ -2876,20 +2960,37 @@ gUnknown_08E77004:: @ 8E77004
gUnknown_08E77804:: @ 8E77804
.incbin "baserom.gba", 0x00e77804, 0xfc
-gUnknown_08E77900:: @ 8E77900
- .incbin "baserom.gba", 0x00e77900, 0x28
+ .align 2
+gMenuMoneyPal:: @ 8E77900
+ .incbin "graphics/interface/money.gbapal.lz"
gUnknown_08E77928:: @ 8E77928
- .incbin "baserom.gba", 0x00e77928, 0x1bc
+ .incbin "baserom.gba", 0x00e77928, 0x134
+
+ .align 2
+gMenuMoneyGfx:: @ 8E77A5C
+ .incbin "graphics/interface/money.4bpp.lz"
gUnknown_08E77AE4:: @ 8E77AE4
.incbin "baserom.gba", 0x00e77ae4, 0x23c
gUnknown_08E77D20:: @ 8E77D20
- .incbin "baserom.gba", 0x00e77d20, 0x358
+ .incbin "baserom.gba", 0x00e77d20, 0x70
+
+ .align 2
+gMenuPokeblockDevice_Gfx:: @ 8E77D90
+ .incbin "graphics/interface/pokeblock_device.4bpp.lz"
+
+ .align 2
+gMenuPokeblockDevice_Pal:: @ 8E78050
+ .incbin "graphics/interface/pokeblock_device.gbapal.lz"
gUnknown_08E78078:: @ 8E78078
- .incbin "baserom.gba", 0x00e78078, 0x16c
+ .incbin "baserom.gba", 0x00e78078, 0x150
+
+ .align 2
+gPokeblock_Gfx::
+ .incbin "graphics/misc/pokeblock.4bpp.lz"
gUnknown_08E781E4::
.incbin "baserom.gba", 0x00e781e4, 0x14
@@ -2939,14 +3040,18 @@ gUnknown_08E782FC:: @ 8E782FC
gUnknown_08E783FC:: @ 8E783FC
.incbin "baserom.gba", 0x00e783fc, 0x440
+ .align 2
gUnknown_08E7883C:: @ 8E7883C
- .incbin "baserom.gba", 0x00e7883c, 0xa8
+ .incbin "graphics/battle_transitions/vs.gbapal.lz"
gUnknown_08E788E4:: @ 8E788E4
.incbin "baserom.gba", 0x00e788e4, 0x1a0
gUnknown_08E78A84:: @ 8E78A84
- .incbin "baserom.gba", 0x00e78a84, 0x27c
+ .incbin "baserom.gba", 0x00e78a84, 0x130
+
+gUnknown_08E78BB4:: @ 8E78BB4
+ .incbin "baserom.gba", 0x00e78bb4, 0x14C
@ 8E78D00
.include "data/graphics/berries/graphics.s"
@@ -2985,7 +3090,11 @@ gUnknown_08E8096C:: @ 8E8096C
.incbin "baserom.gba", 0x00e8096c, 0x72c
gUnknown_08E81098:: @ 8E81098
- .incbin "baserom.gba", 0x00e81098, 0x1424
+ .incbin "baserom.gba", 0x00e81098, 0x10A8
+
+ .align 2
+gRouletteCenter_Gfx::
+ .incbin "graphics/roulette/center.4bpp.lz"
.align 2
gRouletteHeadersTiles:: @ 8E824BC
@@ -3215,7 +3324,13 @@ gUnknown_08E86258:: @ 8E86258
.incbin "baserom.gba", 0x00e86258, 0x500
gUnknown_08E86758:: @ 8E86758
- .incbin "baserom.gba", 0x00e86758, 0x139e
+ .incbin "baserom.gba", 0x00e86758, 0xd70
+
+gUnknown_08E874C8::
+ .incbin "baserom.gba", 0x00e874c8, 0x62c
+
+gUnknown_08E87AF4::
+ .incbin "baserom.gba", 0x00e87af4, 0x2
gUnknown_08E87AF6:: @ 8E87AF6
.incbin "baserom.gba", 0x00e87af6, 0x60
@@ -3366,10 +3481,18 @@ gUnknown_08E8E8B0:: @ 8E8E8B0
.incbin "baserom.gba", 0x00e8e8b0, 0x1c8
gUnknown_08E8EA78:: @ 8E8EA78
- .incbin "baserom.gba", 0x00e8ea78, 0x3a0
+ .incbin "baserom.gba", 0x00e8ea78, 0x20
+
+ .align 2
+gMenuWordGroup_Gfx:: @ 8E8EA98
+ .incbin "graphics/interface/wordgroup.4bpp.lz"
gUnknown_08E8EE18:: @ 8E8EE18
- .incbin "baserom.gba", 0x00e8ee18, 0x360
+ .incbin "baserom.gba", 0x00e8ee18, 0x340
+
+ .align 2
+gMenuWordGroup_Pal:: @ 8E8F158
+ .incbin "graphics/interface/wordgroup.gbapal"
gUnknown_08E8F178:: @ 8E8F178
.incbin "baserom.gba", 0x00e8f178, 0x22
diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/maps/UnknownMap_082CF564/border.bin
new file mode 100755
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_082CF564/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/maps/UnknownMap_082CF564/map.bin
new file mode 100755
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_082CF564/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/maps/UnknownMap_082D05D8/border.bin
new file mode 100755
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_082D05D8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/maps/UnknownMap_082D05D8/map.bin
new file mode 100755
index 000000000..37f05b971
--- /dev/null
+++ b/data/maps/UnknownMap_082D05D8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/maps/UnknownMap_082D05FC/border.bin
new file mode 100755
index 000000000..19d906679
--- /dev/null
+++ b/data/maps/UnknownMap_082D05FC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/maps/UnknownMap_082D05FC/map.bin
new file mode 100755
index 000000000..ca93fa0e2
--- /dev/null
+++ b/data/maps/UnknownMap_082D05FC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/maps/UnknownMap_082E55C8/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E55C8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/maps/UnknownMap_082E55C8/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E55C8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/maps/UnknownMap_082E55EC/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E55EC/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/maps/UnknownMap_082E55EC/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E55EC/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/maps/UnknownMap_082E5610/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5610/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/maps/UnknownMap_082E5610/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5610/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/maps/UnknownMap_082E5634/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5634/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/maps/UnknownMap_082E5634/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5634/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/maps/UnknownMap_082E5658/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5658/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/maps/UnknownMap_082E5658/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5658/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/maps/UnknownMap_082E567C/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E567C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/maps/UnknownMap_082E567C/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E567C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/maps/UnknownMap_082E56A0/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E56A0/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/maps/UnknownMap_082E56A0/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E56A0/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/maps/UnknownMap_082E56C4/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E56C4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/maps/UnknownMap_082E56C4/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E56C4/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/maps/UnknownMap_082E56E8/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E56E8/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/maps/UnknownMap_082E56E8/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E56E8/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/maps/UnknownMap_082E570C/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E570C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/maps/UnknownMap_082E570C/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E570C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/maps/UnknownMap_082E5730/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5730/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/maps/UnknownMap_082E5730/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5730/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/maps/UnknownMap_082E5754/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5754/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/maps/UnknownMap_082E5754/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5754/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/maps/UnknownMap_082E5778/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E5778/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/maps/UnknownMap_082E5778/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E5778/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/maps/UnknownMap_082E579C/border.bin
new file mode 100755
index 000000000..b15c94f96
--- /dev/null
+++ b/data/maps/UnknownMap_082E579C/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/maps/UnknownMap_082E579C/map.bin
new file mode 100755
index 000000000..22a47d94e
--- /dev/null
+++ b/data/maps/UnknownMap_082E579C/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/maps/UnknownMap_082EDF30/border.bin
new file mode 100755
index 000000000..9e4b3fb7a
--- /dev/null
+++ b/data/maps/UnknownMap_082EDF30/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/maps/UnknownMap_082EDF30/map.bin
new file mode 100755
index 000000000..028da0526
--- /dev/null
+++ b/data/maps/UnknownMap_082EDF30/map.bin
@@ -0,0 +1,3 @@
+22222222222222222222222222222222222222222222222222222222222222222222222222662222222222222222222222222222222222222222222222226666 662222222222222222222222222 
+2266662BBBB2222222222222222222222222666666BBBB66BBBB222222266666622222g2g2g2g2g2g2g2g22222222222202GG2NdedeOKLQ2$%&'22222g2g2g2g2g2g2g2g222222222222822222:$!&'2 !"#:VcccWcSTa2222222g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2H2222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f222222222222:Vccccccca22222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222
+IIIIB^_______Y222222g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2g2222222282f2f2f2f2222BBBB222222222222222222222222222222222222222222222822CEED22()*G22 22222222222222222222222222228223522 %"#:2BBBB222222222222222222222222222282235222:2+,-222222222222222222222222222222822GG2222222:2$%&'222222222222222222222222222222822222r2222H2<<222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282222q2222p222222222222222222222222222222222222222222228222222222222222222222222222222222222222222222222222222282h2h2h2h2k2222s22CIIIIIID2222222222222222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2222k22222235222:22222222222222222222222282j2i22i2i22222235222:22222222222222222222222282222222222235222:22222222222222222222222282222222235222:222222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/maps/UnknownMap_082FF894/border.bin
new file mode 100755
index 000000000..f1629c020
--- /dev/null
+++ b/data/maps/UnknownMap_082FF894/border.bin
@@ -0,0 +1 @@
+3333 \ No newline at end of file
diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/maps/UnknownMap_082FF894/map.bin
new file mode 100755
index 000000000..fd294d9b6
--- /dev/null
+++ b/data/maps/UnknownMap_082FF894/map.bin
Binary files differ
diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/maps/UnknownMap_08302970/border.bin
new file mode 100755
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnknownMap_08302970/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/maps/UnknownMap_08302970/map.bin
new file mode 100755
index 000000000..dd82c58d3
--- /dev/null
+++ b/data/maps/UnknownMap_08302970/map.bin
@@ -0,0 +1 @@
+qqqqqqqqqqqt||}ut|}ppp{qs{$14$1$1$1$14$1$1uuqupppppppppppppqqqqqqqqt||}qqt}uppppp{{s$1$1$1$1$1$1$1$1t}ut}ppppppppppppp||||||||}qqqt|}t}pppppppppsqs{$1$1$14$1t|}quupppppppppppppqqqqqt|||}qt}pppppppppPesq{{4$1$1t}qt|}uppppppppppppppqqt||}qqqt|}ppppppppppXm{q{{|||}qt}t|}pppppppppppppp||}qt|||}ppuvpppppPQp{q{|}qupppppppppppppp|}uvpu{vp}~pppppXYpp{|0|}ppppppppppppppppZ[ppppp}~pzq|pppppppppPQpp$1$1$1$1$1Z[ppppPQpppppppppppXYppppuvppppypppppppuvXYppppp$1$1$1$1$1pXYu{{{vXYppppppppppppppu{vp}~ppuvPQppppppPQ}~ppppppppuvyq|ppuvppppppppppppzq|ppppp}~XYppuvppXYpu{vppppppppppppp}~ppyPQ}~ppppppppPQppyppuvPQpppPQ}~pPQppzq|uvppppppppppuvppppppXYpu{{vpppppXYpppppPQ}~XYpuvXYpPQXYppy}~ppuvpppppu|ppppppppuqqvpppppppppppXYppppp}~pppXYppppppppppp}~pppppzq|ppppppppyyyyPQppppppppppppppppppppuvpppppppppppppppppuvypppppppuvpppppXYu{pppppppppppppppppp}~u{vppppppppppppPQ}~pppppppppp}~pppppppzqppppppppppppppppppppzq{vppppuvppuvXYpppppppu{vpppppppppuvyppppppppppppppppppppyyypppp}~uv}~pppppppu{q|ppppppppp}~pppppppppppppppppppppppppuvpppppp}~pppppppppzqqq|pppppppppppPQppppppppppppppppppppppp}~pppppppppppppppppyyypppppppppppXYppppppppppppppppppppppppPQppuvpppppppu{vppppppppppppppppppppppppppppppppppppppppppppXYPQ}~ppppuvuq|ppppppppppppppppppppppppppppppppppppppppppppppXYppu{{v}~yyppppppppppppppppppppppppppppppppppppppppppppppppppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQppppppppppppppppppppppppppppppppppppppppppppuvppppppPQppppXYppppppppppppppppppppppppppppppppppPQuvpppppp}~pppuvpXYppppppppuvppppppppppppppppppppppppppppppXY}~ppppppu{PQp}~pppu{vpppppzvpuvpppppppppppppuvpppppppppuvppppppppppzqXYppppppzq|puvppv}~pppppppppppPQ}~pppppppuv}~ppppppppPQy{{{{tpppyp}~uvpypppppppu{{vppXYppuvppppp}~pppPQpuvppXYppqqqq{tppppuvp}~ppuvpppppppzqq{vpppp}~uvppu{{vppXYp}~puvpppllllmq{{{t}~pppuv}~ppu{{vpqqqvppppp}~puqq{{vu{{{v}~pppqqqqllmqq{tppp}~ppu{qq|uvyyyyppppppPQyyyqqqqtpppppqqqqqqqmqqqutppppppzqqqt}~ppppppppppppXYppppyqqqtppppPQqqqqqqqqllmuu{tppuvyyypppppppppppppppppppppppyyypppppXYqqqqqqqqqqqltp}~ppppppppppppppppppppppppppppppppppppppppqqqqqqqqqqqqqqqqutpppppppppppppppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/maps/UnknownMap_083041B4/border.bin
new file mode 100755
index 000000000..f0eabd248
--- /dev/null
+++ b/data/maps/UnknownMap_083041B4/border.bin
@@ -0,0 +1 @@
+ \ No newline at end of file
diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/maps/UnknownMap_083041B4/map.bin
new file mode 100755
index 000000000..ec344933f
--- /dev/null
+++ b/data/maps/UnknownMap_083041B4/map.bin
@@ -0,0 +1 @@
+222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222  222 222    2222222 2222222222 2222222    # 222    #2222 #  2222     2222 #    2222 efg  222 # esdrfg 222efsd_ddrfg222qdd_d__ddp222qd______dp22222es_d____d_p22222 qdd______dp22222222#2#2bdd_d_d_dp222222222#2b_d_d_`a3a3#222222222#2a3a3a3a3a3#22222222222222222222222 \ No newline at end of file
diff --git a/data/maps/UnreferencedMap/border.bin b/data/maps/UnreferencedMap/border.bin
new file mode 100755
index 000000000..c3fe51511
--- /dev/null
+++ b/data/maps/UnreferencedMap/border.bin
@@ -0,0 +1 @@
+pppp \ No newline at end of file
diff --git a/data/maps/UnreferencedMap/map.bin b/data/maps/UnreferencedMap/map.bin
new file mode 100755
index 000000000..17a14a8d5
--- /dev/null
+++ b/data/maps/UnreferencedMap/map.bin
@@ -0,0 +1 @@
+pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp00000000000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0000000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp0000000 0 0 0 0 0 0 0 0000ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppps00000 0 0 0 0 0 0 0 0 0 000rpppppppppppppppppppppppppppppppppppppppppppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 00000ppppppppppppppppppppppppppppppr{{{{{{vppppppppppppppp000000 0 0 0 0 0 0 0 0 0 0 0 00000ppppPQpppppppppppppppppppppprqkllmqvppppuvppppPQprs000000 0 0 0 0 0 0 0 0 0 0 01110utpPQXYpppppr{{{{{{{vpppppppuqkqquqq|uvpp}~pu{vXYrss0000000000 0 0 0 0 0 0 0 1 5 10uutXYpuvpu{{qklllmqvppppuvq{|||}qt}~pppppzq|}sss00000000004400 0 0 0 0 01110uuu~p}~pzqqqkklmmqvppp}~pyqqqtyppu{{vppyfsss00000000000444400 0 0 00000uuugppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|puvppfsss000000000004444440 000000uuuguv}~qq{qqqt}qtppXYpppuvppppppuvyyp}~ppfss{|||00000000444444400t|||}uug}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQppppfs{s000000000444444400ut}ugppppPQpyypp}~q|ppppppppppPQppppXYppuvf{ss000000000044444400uut}gppppXYppppppppuvppppyppppppppppXYpppppppp}~nss{|||0000004444t|||}uutopuvppppppppppp}~ppppppppppppppppppppppppuvpp1$1$1$1s{{||0000t||}t}ur$1$1$11p}~pppppuvppppppppppppuvpppppppppppppppp}~pp111$1{{{|22|}t}t}r$1$1$11pppppppp}~pppppppppppp}~u{vpppppppuvpppppppp111$1{{22}t}t$1$1$11ppppppppppppppppppppuvppztppppppp}~pppppppp111$1$1$1"10x{22}tz00 1$1$1$111pppppppppppppppppppp}~pppppppppppppppppppp111$1"10000x22z00000 1$1$111pppppppppppppppppppppppppppppppppppppppppppppp111$1$1100000000000000000001$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp111$1$1!11000000000000000011$1$1111ppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1!11100000000000111$1$1$1$1111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1$1"100000000011$1$1$1$1$1$11111pppppppppppppppppppppppppppppppppppppppppppppppp1111$1$1$1111111111$1$1$1$1$1$1$1$111pppppppppPQpppppppuvpppppppppppppppppppppppppppppp1111$1$1$1$1$1$1$1$1$1$1$1$1$1$111111111ppppppppPQpXYppr{{{v}~ppu{{vpppppppppppppppppppppppp11111$1$1$1$1$1$1$1$1$1$1$1$11111ppppppppXYpppr{qqqvpuvqq|ppppppppppppppppppppppppp11111111111111111111ppppppppppppppu{{qqqqqqv}~qqtpPQppppppppppppppppppppppppppppppppuvpppqqqqqqqqqvpyyuvXYPQu{vpuvpppppppPQppppppppppppppppppppppppppppppppppppp}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq{vp}~ppppppuvppppppppppppppXYp}~pqqvpppppppppXYupppppppppppp}~pXYu{v}~uvyyqqvpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{qkmvppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppqv}~pu{{klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp \ No newline at end of file
diff --git a/data/maps/_assets.s b/data/maps/_assets.s
index 9a3b742eb..a9cc15869 100644
--- a/data/maps/_assets.s
+++ b/data/maps/_assets.s
@@ -674,10 +674,10 @@ Route129_MapAttributes:: @ 82BD8C4
.4byte gTileset_Mossdeep
UnreferencedMap_MapBorder: @ 82BD8DC
- .incbin "baserom.gba", 0x2bd8dc, 8
+ .incbin "data/maps/UnreferencedMap/border.bin"
UnreferencedMap_MapBlockdata: @ 82BD8E4
- .incbin "baserom.gba", 0x2bd8e4, 0x1900
+ .incbin "data/maps/UnreferencedMap/map.bin"
.align 2
UnreferencedMap_MapAttributes:: @ 82BF1E4
@@ -1115,7 +1115,20 @@ LilycoveCity_House2_MapAttributes:: @ 82CF540
.4byte gTileset_Building
.4byte gTileset_GenericBuilding
- .incbin "baserom.gba", 0x2cf558, 0x24
+UnknownMapBorder_082CF564:
+ .incbin "data/maps/UnknownMap_082CF564/border.bin"
+
+UnknownMapBlockdata_082CF564:
+ .incbin "data/maps/UnknownMap_082CF564/map.bin"
+
+ .align 2
+UnknownMapAttributes_082CF564::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082CF564
+ .4byte UnknownMapBlockdata_082CF564
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
.incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
@@ -1227,7 +1240,35 @@ SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4
.4byte gTileset_General
.4byte gTileset_Facility
- .incbin "baserom.gba", 0x2d05cc, 0x48
+UnknownMapBorder_082D05D8::
+ .incbin "data/maps/UnknownMap_082D05D8/border.bin"
+
+UnknownMapBlockdata_082D05D8::
+ .incbin "data/maps/UnknownMap_082D05D8/map.bin"
+
+ .align 2
+UnknownMapAttributes_082D05D8::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082D05D8
+ .4byte UnknownMapBlockdata_082D05D8
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
+
+UnknownMapBorder_082D05FC::
+ .incbin "data/maps/UnknownMap_082D05FC/border.bin"
+
+UnknownMapBlockdata_082D05FC::
+ .incbin "data/maps/UnknownMap_082D05FC/map.bin"
+
+ .align 2
+UnknownMapAttributes_082D05FC::
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082D05FC
+ .4byte UnknownMapBlockdata_082D05FC
+ .4byte gTileset_Building
+ .4byte gTileset_Contest
SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
.incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
@@ -2528,8 +2569,216 @@ ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4
.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Cave
+
+UnknownMapBorder_082E55C8:
+ .incbin "data/maps/UnknownMap_082E55C8/border.bin"
+
+UnknownMapBlockdata_082E55C8:
+ .incbin "data/maps/UnknownMap_082E55C8/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E55C8:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E55C8
+ .4byte UnknownMapBlockdata_082E55C8
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E55EC:
+ .incbin "data/maps/UnknownMap_082E55EC/border.bin"
+
+UnknownMapBlockdata_082E55EC:
+ .incbin "data/maps/UnknownMap_082E55EC/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E55EC:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E55EC
+ .4byte UnknownMapBlockdata_082E55EC
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5610:
+ .incbin "data/maps/UnknownMap_082E5610/border.bin"
+
+UnknownMapBlockdata_082E5610:
+ .incbin "data/maps/UnknownMap_082E5610/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5610:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5610
+ .4byte UnknownMapBlockdata_082E5610
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5634:
+ .incbin "data/maps/UnknownMap_082E5634/border.bin"
+
+UnknownMapBlockdata_082E5634:
+ .incbin "data/maps/UnknownMap_082E5634/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5634:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5634
+ .4byte UnknownMapBlockdata_082E5634
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5658:
+ .incbin "data/maps/UnknownMap_082E5658/border.bin"
+
+UnknownMapBlockdata_082E5658:
+ .incbin "data/maps/UnknownMap_082E5658/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5658:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5658
+ .4byte UnknownMapBlockdata_082E5658
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E567C:
+ .incbin "data/maps/UnknownMap_082E567C/border.bin"
+
+UnknownMapBlockdata_082E567C:
+ .incbin "data/maps/UnknownMap_082E567C/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E567C:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E567C
+ .4byte UnknownMapBlockdata_082E567C
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E56A0:
+ .incbin "data/maps/UnknownMap_082E56A0/border.bin"
+
+UnknownMapBlockdata_082E56A0:
+ .incbin "data/maps/UnknownMap_082E56A0/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E56A0:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E56A0
+ .4byte UnknownMapBlockdata_082E56A0
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E56C4:
+ .incbin "data/maps/UnknownMap_082E56C4/border.bin"
+
+UnknownMapBlockdata_082E56C4:
+ .incbin "data/maps/UnknownMap_082E56C4/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E56C4:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E56C4
+ .4byte UnknownMapBlockdata_082E56C4
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E56E8:
+ .incbin "data/maps/UnknownMap_082E56E8/border.bin"
+
+UnknownMapBlockdata_082E56E8:
+ .incbin "data/maps/UnknownMap_082E56E8/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E56E8:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E56E8
+ .4byte UnknownMapBlockdata_082E56E8
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E570C:
+ .incbin "data/maps/UnknownMap_082E570C/border.bin"
+
+UnknownMapBlockdata_082E570C:
+ .incbin "data/maps/UnknownMap_082E570C/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E570C:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E570C
+ .4byte UnknownMapBlockdata_082E570C
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5730:
+ .incbin "data/maps/UnknownMap_082E5730/border.bin"
+
+UnknownMapBlockdata_082E5730:
+ .incbin "data/maps/UnknownMap_082E5730/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5730:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5730
+ .4byte UnknownMapBlockdata_082E5730
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5754:
+ .incbin "data/maps/UnknownMap_082E5754/border.bin"
+
+UnknownMapBlockdata_082E5754:
+ .incbin "data/maps/UnknownMap_082E5754/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5754:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5754
+ .4byte UnknownMapBlockdata_082E5754
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E5778:
+ .incbin "data/maps/UnknownMap_082E5778/border.bin"
+
+UnknownMapBlockdata_082E5778:
+ .incbin "data/maps/UnknownMap_082E5778/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E5778:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E5778
+ .4byte UnknownMapBlockdata_082E5778
+ .4byte gTileset_General
+ .4byte gTileset_Cave
+
+UnknownMapBorder_082E579C:
+ .incbin "data/maps/UnknownMap_082E579C/border.bin"
- .incbin "baserom.gba", 0x2e55bc, 0x1f8
+UnknownMapBlockdata_082E579C:
+ .incbin "data/maps/UnknownMap_082E579C/map.bin"
+
+ .align 2
+UnknownMapAttributes_082E579C:
+ .4byte 0x1
+ .4byte 0x1
+ .4byte UnknownMapBorder_082E579C
+ .4byte UnknownMapBlockdata_082E579C
+ .4byte gTileset_General
+ .4byte gTileset_Cave
NewMauville_Entrance_MapBorder:: @ 82E57B4
.incbin "data/maps/NewMauville_Entrance/border.bin"
@@ -3401,7 +3650,20 @@ SafariZone_Southeast_MapAttributes:: @ 82ED348
.4byte gTileset_General
.4byte gTileset_Lilycove
- .incbin "baserom.gba", 0x2ed360, 0xbe8
+UnknownMapBorder_082EDF30:
+ .incbin "data/maps/UnknownMap_082EDF30/border.bin"
+
+UnknownMapBlockdata_082EDF30:
+ .incbin "data/maps/UnknownMap_082EDF30/map.bin"
+
+ .align 2
+UnknownMapAttributes_082EDF30:
+ .4byte 0x3A
+ .4byte 0x1A
+ .4byte UnknownMapBorder_082EDF30
+ .4byte UnknownMapBlockdata_082EDF30
+ .4byte gTileset_General
+ .4byte 0
Route109_SeashoreHouse_MapBorder:: @ 82EDF48
.incbin "data/maps/Route109_SeashoreHouse/border.bin"
@@ -4443,7 +4705,20 @@ ScorchedSlab_MapAttributes:: @ 82FF5A0
.4byte gTileset_General
.4byte gTileset_Cave
- .incbin "baserom.gba", 0x2ff5b8, 0x2f4
+UnknownMapBorder_082FF894:
+ .incbin "data/maps/UnknownMap_082FF894/border.bin"
+
+UnknownMapBlockdata_082FF894:
+ .incbin "data/maps/UnknownMap_082FF894/map.bin"
+
+ .align 2
+UnknownMapAttributes_082FF894:
+ .4byte 0x13
+ .4byte 0x13
+ .4byte UnknownMapBorder_082FF894
+ .4byte UnknownMapBlockdata_082FF894
+ .4byte gTileset_General
+ .4byte gTileset_Cave
RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
.incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
@@ -4535,7 +4810,20 @@ MagmaHideout_B2F_MapAttributes:: @ 8301690
.4byte gTileset_General
.4byte gTileset_Facility
- .incbin "baserom.gba", 0x3016a8, 0x12e0
+UnknownMapBorder_08302970:
+ .incbin "data/maps/UnknownMap_08302970/border.bin"
+
+UnknownMapBlockdata_08302970:
+ .incbin "data/maps/UnknownMap_08302970/map.bin"
+
+ .align 2
+UnknownMapAttributes_08302970:
+ .4byte 0x3C
+ .4byte 0x28
+ .4byte UnknownMapBorder_08302970
+ .4byte UnknownMapBlockdata_08302970
+ .4byte gTileset_General
+ .4byte gTileset_Pacifidlog
SkyPillar_Entrance_MapBorder:: @ 8302988
.incbin "data/maps/SkyPillar_Entrance/border.bin"
@@ -4627,7 +4915,20 @@ SkyPillar_4F_MapAttributes:: @ 83037E0
.4byte gTileset_General
.4byte gTileset_Pacifidlog
- .incbin "baserom.gba", 0x3037f8, 0x9d4
+UnknownMapBorder_083041B4:
+ .incbin "data/maps/UnknownMap_083041B4/border.bin"
+
+UnknownMapBlockdata_083041B4:
+ .incbin "data/maps/UnknownMap_083041B4/map.bin"
+
+ .align 2
+UnknownMapAttributes_083041B4:
+ .4byte 0x1B
+ .4byte 0x2E
+ .4byte UnknownMapBorder_083041B4
+ .4byte UnknownMapBlockdata_083041B4
+ .4byte gTileset_General
+ .4byte gTileset_Cave
MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
.incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
diff --git a/data/script_cmd_table.s b/data/script_cmd_table.s
index 505b2fe84..696b20f40 100644
--- a/data/script_cmd_table.s
+++ b/data/script_cmd_table.s
@@ -119,7 +119,7 @@ gScriptCmdTable:: @ 814AE30
.4byte s6F_multichoice
.4byte sub_8067298
.4byte s76_close_picture_box
- .4byte sub_80672E8
+ .4byte s77_showcontestwinner
.4byte sub_806730C
.4byte s79_give_pokemon
.4byte s7A_create_egg
diff --git a/data/script_funcs.s b/data/script_funcs.s
new file mode 100644
index 000000000..23d7a76f5
--- /dev/null
+++ b/data/script_funcs.s
@@ -0,0 +1,22 @@
+ .section script_data, "aw", %progbits
+
+ .align 2
+gScriptFuncs:: @ 81DCAF4
+ .4byte sub_81263D0
+ .4byte sub_8126380
+ .4byte script_status_stop_and_ret_1
+ .4byte sub_81263E4
+ .4byte sub_81263D4
+ .4byte sub_812641C
+ .4byte sub_8126524
+ .4byte sub_8126438
+ .4byte sub_81264F0
+ .4byte sub_812658C
+ .4byte sub_81265B0
+ .4byte sub_81265DC
+ .4byte sub_8126608
+ .4byte sub_8126714
+ .4byte sub_8126754
+ .4byte sub_8126778
+ .4byte sub_81267C0
+gScriptFuncs_End::
diff --git a/data/scripts/maps/Route110.s b/data/scripts/maps/Route110.s
index 46e4633c8..41a14fa28 100644
--- a/data/scripts/maps/Route110.s
+++ b/data/scripts/maps/Route110.s
@@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914
end
Route110_EventScript_14F92F:: @ 814F92F
- playmusicbattle 403
+ playmusicbattle 403 @ Bicycle music
return
Route110_MapScript2_14F933:: @ 814F933
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
index 641c32d55..0dbd5dfc4 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.s
@@ -21,8 +21,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB
end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
+@ Coord event directly in front of the gatesman heading left to right
lockall
- specialval RESULT, 227
+ specialval RESULT, 227 @ player state?
compare RESULT, 2
callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
compare RESULT, 0
@@ -33,10 +34,12 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D
+@ You're on the Mach Bike!
setvar 0x40a9, 1
return
Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
+@ You don't have a bike!
msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4
closebutton
move 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
@@ -49,6 +52,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538
step_end
Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
+@ Coord event directly in front of the gatesman heading right to left
lockall
setvar 0x40a9, 0
clearflag 2091
diff --git a/data/text/battle_strings.s b/data/text/battle_strings.s
index 50768d80e..e8baa88ab 100644
--- a/data/text/battle_strings.s
+++ b/data/text/battle_strings.s
@@ -1,3 +1,4 @@
+ .align 2
gUnknown_083FE4F4:: @ 83FE4F4
.4byte dp01t_00_3_getattr
.4byte sub_811EC04
@@ -1230,6 +1231,7 @@ gUnknown_08400F58:: @ 8400F58
.4byte BattleStatText_Accuracy
.4byte BattleStatText_Evasion
+ .align 2
gUnknown_08400F78:: @ 8400F78
.4byte ContestStatText_TooSpicy
.4byte ContestStatText_TooDry
@@ -1237,6 +1239,7 @@ gUnknown_08400F78:: @ 8400F78
.4byte ContestStatText_TooBitter
.4byte ContestStatText_TooSour
+ .align 2
gUnknown_08400F8C:: @ 8400F8C
.4byte BattleText_UnknownString
.4byte BattleText_GainExpPoints
@@ -1590,176 +1593,277 @@ gUnknown_08400F8C:: @ 8400F8C
.4byte BattleText_NoEffect
.4byte BattleText_NoEffectOn
+ .align 1
gUnknown_08401508:: @ 8401508
@ Each entry refers to a text pointer in gUnknown_08400F8C, but the values are offset
@ by 0xc. For example, 0x0017 refers to BattleText_AttackMissed because it is the
@ 11th entry in the pointer table.
- .2byte 0x0017
- .2byte 0x0018
- .2byte 0x0159
- .2byte 0x001A
- .2byte 0x014C
- .2byte 0x00E2
- .2byte 0x00E3
- .2byte 0x0021
- .2byte 0x0112
- .2byte 0x0165
- .2byte 0x00E8
- .2byte 0x00E9
- .2byte 0x00E5
- .2byte 0x00ED
- .2byte 0x00F0
- .2byte 0x00F3
- .2byte 0x00EE
- .2byte 0x00F4
- .2byte 0x0066
- .2byte 0x0067
- .2byte 0x00EF
- .2byte 0x00F5
- .2byte 0x00EA
- .2byte 0x00EB
- .2byte 0x00EC
- .2byte 0x0065
- .2byte 0x0098
- .2byte 0x00E5
- .2byte 0x00E5
- .2byte 0x004E
- .2byte 0x0160
- .2byte 0x004D
- .2byte 0x0161
- .2byte 0x004F
- .2byte 0x0068
- .2byte 0x0069
- .2byte 0x001B
- .2byte 0x006A
- .2byte 0x0139
- .2byte 0x0052
- .2byte 0x0053
- .2byte 0x0070
- .2byte 0x0071
- .2byte 0x0073
- .2byte 0x0074
- .2byte 0x006C
- .2byte 0x006E
- .2byte 0x00F7
- .2byte 0x004C
- .2byte 0x0075
- .2byte 0x0076
- .2byte 0x0077
- .2byte 0x00D5
- .2byte 0x00D6
- .2byte 0x003D
- .2byte 0x0130
- .2byte 0x0145
- .2byte 0x0146
- .2byte 0x00D7
- .2byte 0x00D8
- .2byte 0x003E
- .2byte 0x0130
- .2byte 0x0054
- .2byte 0x0055
- .2byte 0x0056
- .2byte 0x0057
- .2byte 0x0058
- .2byte 0x0059
- .2byte 0x013D
- .2byte 0x013E
- .2byte 0x005A
- .2byte 0x005C
- .2byte 0x005B
- .2byte 0x005D
- .2byte 0x005B
- .2byte 0x0148
- .2byte 0x0061
- .2byte 0x00E5
- .2byte 0x0063
- .2byte 0x00E5
- .2byte 0x007D
- .2byte 0x00E5
- .2byte 0x007E
- .2byte 0x00FB
- .2byte 0x0028
- .2byte 0x0029
- .2byte 0x0037
- .2byte 0x0038
- .2byte 0x0023
- .2byte 0x0024
- .2byte 0x002E
- .2byte 0x002F
- .2byte 0x0031
- .2byte 0x0032
- .2byte 0x0035
- .2byte 0x0036
- .2byte 0x0017
- .2byte 0x007C
- .2byte 0x0045
- .2byte 0x0136
- .2byte 0x002D
- .2byte 0x0139
- .2byte 0x013B
- .2byte 0x013C
- .2byte 0x00FD
- .2byte 0x00FD
- .2byte 0x00FD
- .2byte 0x00FD
- .2byte 0x0142
- .2byte 0x00A1
- .2byte 0x014F
- .2byte 0x0107
- .2byte 0x0108
- .2byte 0x0109
- .2byte 0x010A
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0111
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x00F1
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0110
- .2byte 0x0116
- .2byte 0x0117
- .2byte 0x0118
- .2byte 0x0119
- .2byte 0x011B
- .2byte 0x011C
- .2byte 0x011E
- .2byte 0x011F
- .2byte 0x0120
- .2byte 0x0128
- .2byte 0x0123
- .2byte 0x0126
- .2byte 0x0125
- .2byte 0x0124
- .2byte 0x0127
- .2byte 0x0129
- .2byte 0x0156
- .2byte 0x0131
- .2byte 0x0163
- .2byte 0x016A
- .2byte 0x00C7
- .2byte 0x0163
- .2byte 0x016A
- .2byte 0x00C9
- .2byte 0x0163
- .2byte 0x016A
- .2byte 0x0166
- .2byte 0x0167
- .2byte 0x0168
- .2byte 0x00CB
- .2byte 0x0137
+ .2byte BATTLE_TEXT_AttackMissed
+ .2byte BATTLE_TEXT_ProtectedItself
+ .2byte BATTLE_TEXT_AvoidedAttack
+ .2byte BATTLE_TEXT_AvoidedDamage
+ .2byte BATTLE_TEXT_GroundMoveNegate
+
+BattleTextList_401512:: @ 8401512
+ .2byte BATTLE_TEXT_CantEscape2
+ .2byte BATTLE_TEXT_BirchDontLeaveMe
+ .2byte BATTLE_TEXT_PreventEscape
+ .2byte BATTLE_TEXT_CantEscape
+ .2byte BATTLE_TEXT_AttackingCantEscape
+
+BattleTextList_40151C:: @ 840151C
+ .2byte BATTLE_TEXT_RainStart
+ .2byte BATTLE_TEXT_PourStart
+ .2byte BATTLE_TEXT_Failed
+ .2byte BATTLE_TEXT_SandBrewed
+ .2byte BATTLE_TEXT_SunBright
+ .2byte BATTLE_TEXT_HailStart
+
+BattleTextList_401528:: @ 8401528
+ .2byte BATTLE_TEXT_SandRages
+ .2byte BATTLE_TEXT_HailCont
+
+BattleTextList_40152C:: @ 840152C
+ .2byte BATTLE_TEXT_SandBuffeted
+ .2byte BATTLE_TEXT_HailStricken
+
+BattleTextList_401530:: @ 8401530
+ .2byte BATTLE_TEXT_SandSubsided
+ .2byte BATTLE_TEXT_HailStop
+
+BattleTextList_401534:: @ 8401534
+ .2byte BATTLE_TEXT_RainCont1
+ .2byte BATTLE_TEXT_PourCont
+ .2byte BATTLE_TEXT_RainStop
+
+BattleTextList_40153A:: @ 840153A
+ .2byte BATTLE_TEXT_ProtectedItself2
+ .2byte BATTLE_TEXT_BracedItself
+ .2byte BATTLE_TEXT_Failed
+
+BattleTextList_401540:: @ 8401540
+ .2byte BATTLE_TEXT_Failed
+ .2byte BATTLE_TEXT_RaisedDefense
+ .2byte BATTLE_TEXT_RaisedDefenseLittle
+ .2byte BATTLE_TEXT_RaisedSpDef
+ .2byte BATTLE_TEXT_RaisedSpDefLittle
+ .2byte BATTLE_TEXT_CoveredVeil
+
+BattleTextList_40154C:: @ 840154C
+ .2byte BATTLE_TEXT_WasSeeded
+ .2byte BATTLE_TEXT_EvadedAttack
+ .2byte BATTLE_TEXT_DoesntAffect
+ .2byte BATTLE_TEXT_HealthSapped
+ .2byte BATTLE_TEXT_OozeSuckup
+
+BattleTextList_401556:: @ 8401556
+ .2byte BATTLE_TEXT_WentToSleep
+ .2byte BATTLE_TEXT_SpeltHealthy
+
+BattleTextList_40155A:: @ 840155A
+ .2byte BATTLE_TEXT_UproarMaking
+ .2byte BATTLE_TEXT_CalmedDown
+
+BattleTextList_40155E:: @ 840155E
+ .2byte BATTLE_TEXT_Stockpiled
+ .2byte BATTLE_TEXT_StockpiledCant
+
+BattleTextList_401562:: @ 8401562
+ .2byte BATTLE_TEXT_WokeUp
+ .2byte BATTLE_TEXT_UproarWoke
+
+BattleTextList_401566:: @ 8401566
+ .2byte BATTLE_TEXT_SwallowFail
+ .2byte BATTLE_TEXT_HPFull
+
+BattleTextList_40156A:: @ 840156A
+ .2byte BATTLE_TEXT_UproarCantSleep2
+ .2byte BATTLE_TEXT_UproarKeptAwake
+ .2byte BATTLE_TEXT_StayedAwake
+
+BattleTextList_401570:: @ 8401570
+ .2byte BATTLE_TEXT_UnknownString7
+ .2byte BATTLE_TEXT_UnknownString3
+ .2byte BATTLE_TEXT_AttackingStatNoHigher
+ .2byte BATTLE_TEXT_Terminator2
+ .2byte BATTLE_TEXT_UnknownString4
+ .2byte BATTLE_TEXT_HustleUse
+
+BattleTextList_40157C:: @ 840157C
+ .2byte BATTLE_TEXT_UnknownString5
+ .2byte BATTLE_TEXT_UnknownString6
+ .2byte BATTLE_TEXT_DefendingStatNoHigher
+ .2byte BATTLE_TEXT_Terminator2
+
+BattleTextList_401584:: @ 8401584
+ .2byte BATTLE_TEXT_WhipWhirlwind
+ .2byte BATTLE_TEXT_TookSunlight
+ .2byte BATTLE_TEXT_LoweredHead
+ .2byte BATTLE_TEXT_IsGlowing
+ .2byte BATTLE_TEXT_FlewHigh
+ .2byte BATTLE_TEXT_DugHole
+ .2byte BATTLE_TEXT_HidUnderwater
+ .2byte BATTLE_TEXT_SprangUp
+
+BattleTextList_401594:: @ 8401594
+ .2byte BATTLE_TEXT_SqueezedBind
+ .2byte BATTLE_TEXT_Wrapped
+ .2byte BATTLE_TEXT_TrappedVortex
+ .2byte BATTLE_TEXT_Clamped
+ .2byte BATTLE_TEXT_TrappedVortex
+ .2byte BATTLE_TEXT_SandTombTrapped
+
+BattleTextList_4015A0:: @ 84015A0
+ .2byte BATTLE_TEXT_MistShroud
+ .2byte BATTLE_TEXT_Failed
+
+BattleTextList_4015A4:: @ 84015A4
+ .2byte BATTLE_TEXT_GetPumped
+ .2byte BATTLE_TEXT_Failed
+
+BattleTextList_4015A8:: @ 84015A8
+ .2byte BATTLE_TEXT_Transformed
+ .2byte BATTLE_TEXT_Failed
+
+BattleTextList_4015AC:: @ 84015AC
+ .2byte BATTLE_TEXT_SubMade
+ .2byte BATTLE_TEXT_SubWeak
+
+BattleTextList_4015B0:: @ 84015B0
+ .2byte BATTLE_TEXT_Poisoned
+ .2byte BATTLE_TEXT_Poisoned2
+
+BattleTextList_4015B4:: @ 84015B4
+ .2byte BATTLE_TEXT_Paralyzed
+ .2byte BATTLE_TEXT_Paralyzed2
+
+BattleTextList_4015B8:: @ 84015B8
+ .2byte BATTLE_TEXT_FellAsleep
+ .2byte BATTLE_TEXT_MadeAsleep
+
+BattleTextList_4015BC:: @ 84015BC
+ .2byte BATTLE_TEXT_Burned
+ .2byte BATTLE_TEXT_Burned2
+
+BattleTextList_4015C0:: @ 84015C0
+ .2byte BATTLE_TEXT_Frozen
+ .2byte BATTLE_TEXT_Frozen2
+
+BattleTextList_4015C4:: @ 84015C4
+ .2byte BATTLE_TEXT_AttackingDefrosted
+ .2byte BATTLE_TEXT_Defrosted
+
+BattleTextList_4015C8:: @ 84015C8
+ .2byte BATTLE_TEXT_AttackMissed
+ .2byte BATTLE_TEXT_Unaffected
+ .2byte BATTLE_TEXT_FellLove
+ .2byte BATTLE_TEXT_InfatuatedPoke
+
+BattleTextList_4015D0:: @ 84015D0
+ .2byte BATTLE_TEXT_EnergyDrained
+ .2byte BATTLE_TEXT_OozeSuckup
+
+BattleTextList_4015D4:: @ 84015D4
+ .2byte BATTLE_TEXT_ElecWeakened
+ .2byte BATTLE_TEXT_FireWeakened
+
+BattleTextList_4015D8:: @ 84015D8
+ .2byte BATTLE_TEXT_BellChime
+ .2byte BATTLE_TEXT_BellChime
+ .2byte BATTLE_TEXT_BellChime
+ .2byte BATTLE_TEXT_BellChime
+ .2byte BATTLE_TEXT_SoothingAroma
+
+BattleTextList_4015E2:: @ 84015E2
+ .2byte BATTLE_TEXT_ForesawAttack
+ .2byte BATTLE_TEXT_ChoseDestiny
+
+BattleTextList_4015E6:: @ 84015E6
+ .2byte BATTLE_TEXT_BallBrokeOhNo
+ .2byte BATTLE_TEXT_BallBrokeAppeared
+ .2byte BATTLE_TEXT_BallBrokeAlmost
+ .2byte BATTLE_TEXT_BallBrokeSoClose
+
+BattleTextList_4015EE:: @ 84015EE
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Sandstorm
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_SunStrong
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+ .2byte BATTLE_TEXT_Raining
+
+BattleTextList_40160E:: @ 840160E
+ .2byte BATTLE_TEXT_LoafingAround
+ .2byte BATTLE_TEXT_WontObey
+ .2byte BATTLE_TEXT_TurnedAway
+ .2byte BATTLE_TEXT_NotNotice
+
+BattleTextList_401616:: @ 8401616
+ .2byte BATTLE_TEXT_CreptCloser
+ .2byte BATTLE_TEXT_CantGetCloser
+
+BattleTextList_40161A:: @ 840161A
+ .2byte BATTLE_TEXT_CuriousAbout
+ .2byte BATTLE_TEXT_EnthralledBy
+ .2byte BATTLE_TEXT_IgnoredThing
+
+BattleTextList_401620:: @ 8401620
+ .2byte BATTLE_TEXT_CuredConfusion
+ .2byte BATTLE_TEXT_CuredParalysis
+ .2byte BATTLE_TEXT_CuredFreeze
+ .2byte BATTLE_TEXT_CuredBurn
+ .2byte BATTLE_TEXT_CuredPoison
+ .2byte BATTLE_TEXT_CuredSleep
+
+BattleTextList_40162C:: @ 840162C
+ .2byte BATTLE_TEXT_CuredStatus
+ .2byte BATTLE_TEXT_NormalizedStatus
+
+BattleTextList_401630:: @ 8401630
+ .2byte BATTLE_TEXT_PreventedBurn
+ .2byte BATTLE_TEXT_PreventedOther2
+ .2byte BATTLE_TEXT_NoEffectOn
+
+BattleTextList_401636:: @ 8401636
+ .2byte BATTLE_TEXT_PreventedPara
+ .2byte BATTLE_TEXT_PreventedOther2
+ .2byte BATTLE_TEXT_NoEffectOn
+
+BattleTextList_40163C:: @ 840163C
+ .2byte BATTLE_TEXT_PreventedPoison
+ .2byte BATTLE_TEXT_PreventedOther2
+ .2byte BATTLE_TEXT_NoEffectOn
+
+BattleTextList_401642:: @ 8401642
+ .2byte BATTLE_TEXT_Obtained1
+ .2byte BATTLE_TEXT_Obtained2
+ .2byte BATTLE_TEXT_Obtained3
+
+BattleTextList_401648:: @ 8401648
+ .2byte BATTLE_TEXT_RaisedFirePower
+ .2byte BATTLE_TEXT_MadeIneffective
gUnknown_0840164C:: @ 840164C
- .incbin "baserom.gba", 0x0040164c, 0x10
+ .2byte BATTLE_TEXT_StopLearning
+ .2byte BATTLE_TEXT_FellAsleep
+ .2byte BATTLE_TEXT_SpeltHealthy
+ .2byte BATTLE_TEXT_SubTookDamage
+ .2byte BATTLE_TEXT_CoinScatter
+ .2byte BATTLE_TEXT_SandTombTrapped
+ .incbin "baserom.gba", 0x401658, 0x4
+
+ .align 2
gUnknown_0840165C:: @ 840165C
.4byte BattleText_HP
.4byte BattleText_SpAtk
@@ -1768,6 +1872,7 @@ gUnknown_0840165C:: @ 840165C
.4byte BattleText_Defense
.4byte BattleStatText_Speed
+ .align 2
gUnknown_08401674:: @ 8401674
.4byte BattleText_Normal
.4byte BattleText_Fighting
diff --git a/data/tilesets/metatiles.s b/data/tilesets/metatiles.s
index 15a5b7471..9a9559981 100644
--- a/data/tilesets/metatiles.s
+++ b/data/tilesets/metatiles.s
@@ -1,835 +1,529 @@
.align 1
-gMetatiles_General: @ 8259C1C
-
gMetatiles_General:: @ 8259C1C
-
.incbin "baserom.gba", 0x259c1c, 0x2000
.align 1
-gMetatileAttributes_General: @ 825BC1C
-
gMetatileAttributes_General:: @ 825BC1C
-
.incbin "baserom.gba", 0x25bc1c, 0x400
.align 1
-gMetatiles_Petalburg: @ 825C01C
-
gMetatiles_Petalburg:: @ 825C01C
-
.incbin "baserom.gba", 0x25c01c, 0x900
.align 1
-gMetatileAttributes_Petalburg: @ 825C91C
-
gMetatileAttributes_Petalburg:: @ 825C91C
-
.incbin "baserom.gba", 0x25c91c, 0x120
.align 1
-gMetatiles_Rustboro: @ 825CA3C
-
gMetatiles_Rustboro:: @ 825CA3C
-
.incbin "baserom.gba", 0x25ca3c, 0x15e0
.align 1
-gMetatileAttributes_Rustboro: @ 825E01C
-
gMetatileAttributes_Rustboro:: @ 825E01C
-
.incbin "baserom.gba", 0x25e01c, 0x2bc
.align 1
-gMetatiles_Dewford: @ 825E2D8
-
gMetatiles_Dewford:: @ 825E2D8
-
.incbin "baserom.gba", 0x25e2d8, 0x900
.align 1
-gMetatileAttributes_Dewford: @ 825EBD8
-
gMetatileAttributes_Dewford:: @ 825EBD8
-
.incbin "baserom.gba", 0x25ebd8, 0x120
.align 1
-gMetatiles_Slateport: @ 825ECF8
-
gMetatiles_Slateport:: @ 825ECF8
-
.incbin "baserom.gba", 0x25ecf8, 0x16c0
.align 1
-gMetatileAttributes_Slateport: @ 82603B8
-
gMetatileAttributes_Slateport:: @ 82603B8
-
.incbin "baserom.gba", 0x2603b8, 0x2d8
.align 1
-gMetatiles_Mauville: @ 8260690
-
gMetatiles_Mauville:: @ 8260690
-
.incbin "baserom.gba", 0x260690, 0x1b20
.align 1
-gMetatileAttributes_Mauville: @ 82621B0
-
gMetatileAttributes_Mauville:: @ 82621B0
-
.incbin "baserom.gba", 0x2621b0, 0x364
.align 1
-gMetatiles_Lavaridge: @ 8262514
-
gMetatiles_Lavaridge:: @ 8262514
-
.incbin "baserom.gba", 0x262514, 0x11e0
.align 1
-gMetatileAttributes_Lavaridge: @ 82636F4
-
gMetatileAttributes_Lavaridge:: @ 82636F4
-
.incbin "baserom.gba", 0x2636f4, 0x23c
.align 1
-gMetatiles_Fallarbor: @ 8263930
-
gMetatiles_Fallarbor:: @ 8263930
-
.incbin "baserom.gba", 0x263930, 0x1520
.align 1
-gMetatileAttributes_Fallarbor: @ 8264E50
-
gMetatileAttributes_Fallarbor:: @ 8264E50
-
.incbin "baserom.gba", 0x264e50, 0x2a4
.align 1
-gMetatiles_Fortree: @ 82650F4
-
gMetatiles_Fortree:: @ 82650F4
-
.incbin "baserom.gba", 0x2650f4, 0x10b0
.align 1
-gMetatileAttributes_Fortree: @ 82661A4
-
gMetatileAttributes_Fortree:: @ 82661A4
-
.incbin "baserom.gba", 0x2661a4, 0x216
.align 1
-gMetatiles_Lilycove: @ 82663BA
-
gMetatiles_Lilycove:: @ 82663BA
-
.incbin "baserom.gba", 0x2663ba, 0x15f0
.align 1
-gMetatileAttributes_Lilycove: @ 82679AA
-
gMetatileAttributes_Lilycove:: @ 82679AA
-
.incbin "baserom.gba", 0x2679aa, 0x2be
.align 1
-gMetatiles_Mossdeep: @ 8267C68
-
gMetatiles_Mossdeep:: @ 8267C68
-
.incbin "baserom.gba", 0x267c68, 0x16b0
.align 1
-gMetatileAttributes_Mossdeep: @ 8269318
-
gMetatileAttributes_Mossdeep:: @ 8269318
-
.incbin "baserom.gba", 0x269318, 0x2d6
.align 1
-gMetatiles_EverGrande: @ 82695EE
-
gMetatiles_EverGrande:: @ 82695EE
-
.incbin "baserom.gba", 0x2695ee, 0xa80
.align 1
-gMetatileAttributes_EverGrande: @ 826A06E
-
gMetatileAttributes_EverGrande:: @ 826A06E
-
.incbin "baserom.gba", 0x26a06e, 0x150
.align 1
-gMetatiles_Pacifidlog: @ 826A1BE
-
gMetatiles_Pacifidlog:: @ 826A1BE
-
.incbin "baserom.gba", 0x26a1be, 0xbf0
.align 1
-gMetatileAttributes_Pacifidlog: @ 826ADAE
-
gMetatileAttributes_Pacifidlog:: @ 826ADAE
-
.incbin "baserom.gba", 0x26adae, 0x17e
.align 1
-gMetatiles_Sootopolis: @ 826AF2C
-
gMetatiles_Sootopolis:: @ 826AF2C
-
.incbin "baserom.gba", 0x26af2c, 0xfe0
.align 1
-gMetatileAttributes_Sootopolis: @ 826BF0C
-
gMetatileAttributes_Sootopolis:: @ 826BF0C
-
.incbin "baserom.gba", 0x26bf0c, 0x1fc
.align 1
-gMetatiles_Building: @ 826C108
-
gMetatiles_Building:: @ 826C108
-
.incbin "baserom.gba", 0x26c108, 0x80
.align 1
-gMetatileAttributes_Building: @ 826C188
-
gMetatileAttributes_Building:: @ 826C188
-
.incbin "baserom.gba", 0x26c188, 0x10
.align 1
-gMetatiles_Shop: @ 826C198
-
gMetatiles_Shop:: @ 826C198
-
.incbin "baserom.gba", 0x26c198, 0x1180
.align 1
-gMetatileAttributes_Shop: @ 826D318
-
gMetatileAttributes_Shop:: @ 826D318
-
.incbin "baserom.gba", 0x26d318, 0x230
.align 1
-gMetatiles_PokemonCenter: @ 826D548
-
gMetatiles_PokemonCenter:: @ 826D548
-
.incbin "baserom.gba", 0x26d548, 0xc60
.align 1
-gMetatileAttributes_PokemonCenter: @ 826E1A8
-
gMetatileAttributes_PokemonCenter:: @ 826E1A8
-
.incbin "baserom.gba", 0x26e1a8, 0x18c
.align 1
-gMetatiles_Cave: @ 826E334
-
gMetatiles_Cave:: @ 826E334
-
.incbin "baserom.gba", 0x26e334, 0x19e0
.align 1
-gMetatileAttributes_Cave: @ 826FD14
-
gMetatileAttributes_Cave:: @ 826FD14
-
.incbin "baserom.gba", 0x26fd14, 0x33c
.align 1
-gMetatiles_PokemonSchool: @ 8270050
-
gMetatiles_PokemonSchool:: @ 8270050
-
.incbin "baserom.gba", 0x270050, 0x3a0
.align 1
-gMetatileAttributes_PokemonSchool: @ 82703F0
-
gMetatileAttributes_PokemonSchool:: @ 82703F0
-
.incbin "baserom.gba", 0x2703f0, 0x74
.align 1
-gMetatiles_PokemonFanClub: @ 8270464
-
gMetatiles_PokemonFanClub:: @ 8270464
-
.incbin "baserom.gba", 0x270464, 0x680
.align 1
-gMetatileAttributes_PokemonFanClub: @ 8270AE4
-
gMetatileAttributes_PokemonFanClub:: @ 8270AE4
-
.incbin "baserom.gba", 0x270ae4, 0xd0
.align 1
-gMetatiles_Unused1: @ 8270BB4
+gMetatiles_Unused1:: @ 8270BB4
.incbin "baserom.gba", 0x270bb4, 0x20
.align 1
-gMetatileAttributes_Unused1: @ 8270BD4
+gMetatileAttributes_Unused1:: @ 8270BD4
.incbin "baserom.gba", 0x270bd4, 0x4
.align 1
-gMetatiles_MeteorFalls: @ 8270BD8
-
gMetatiles_MeteorFalls:: @ 8270BD8
-
.incbin "baserom.gba", 0x270bd8, 0x9f0
.align 1
-gMetatileAttributes_MeteorFalls: @ 82715C8
-
gMetatileAttributes_MeteorFalls:: @ 82715C8
-
.incbin "baserom.gba", 0x2715c8, 0x13e
.align 1
-gMetatiles_OceanicMuseum: @ 8271706
-
gMetatiles_OceanicMuseum:: @ 8271706
-
.incbin "baserom.gba", 0x271706, 0x650
.align 1
-gMetatileAttributes_OceanicMuseum: @ 8271D56
-
gMetatileAttributes_OceanicMuseum:: @ 8271D56
-
.incbin "baserom.gba", 0x271d56, 0xca
.align 1
-gMetatiles_CableClub: @ 8271E20
-
gMetatiles_CableClub:: @ 8271E20
-
.incbin "baserom.gba", 0x271e20, 0x1000
.align 1
-gMetatileAttributes_CableClub: @ 8272E20
-
gMetatileAttributes_CableClub:: @ 8272E20
-
.incbin "baserom.gba", 0x272e20, 0x200
.align 1
-gMetatiles_SeashoreHouse: @ 8273020
-
gMetatiles_SeashoreHouse:: @ 8273020
-
.incbin "baserom.gba", 0x273020, 0x380
.align 1
-gMetatileAttributes_SeashoreHouse: @ 82733A0
-
gMetatileAttributes_SeashoreHouse:: @ 82733A0
-
.incbin "baserom.gba", 0x2733a0, 0x70
.align 1
-gMetatiles_PrettyPetalFlowerShop: @ 8273410
-
gMetatiles_PrettyPetalFlowerShop:: @ 8273410
-
.incbin "baserom.gba", 0x273410, 0x480
.align 1
-gMetatileAttributes_PrettyPetalFlowerShop: @ 8273890
-
gMetatileAttributes_PrettyPetalFlowerShop:: @ 8273890
-
.incbin "baserom.gba", 0x273890, 0x90
.align 1
-gMetatiles_PokemonDayCare: @ 8273920
-
gMetatiles_PokemonDayCare:: @ 8273920
-
.incbin "baserom.gba", 0x273920, 0x440
.align 1
-gMetatileAttributes_PokemonDayCare: @ 8273D60
-
gMetatileAttributes_PokemonDayCare:: @ 8273D60
-
.incbin "baserom.gba", 0x273d60, 0x88
.align 1
-gMetatiles_Facility: @ 8273DE8
-
gMetatiles_Facility:: @ 8273DE8
-
.incbin "baserom.gba", 0x273de8, 0x1fe0
.align 1
-gMetatileAttributes_Facility: @ 8275DC8
-
gMetatileAttributes_Facility:: @ 8275DC8
-
.incbin "baserom.gba", 0x275dc8, 0x3fc
.align 1
-gMetatiles_BikeShop: @ 82761C4
-
gMetatiles_BikeShop:: @ 82761C4
-
.incbin "baserom.gba", 0x2761c4, 0xf80
.align 1
-gMetatileAttributes_BikeShop: @ 8277144
-
gMetatileAttributes_BikeShop:: @ 8277144
-
.incbin "baserom.gba", 0x277144, 0x1f0
.align 1
-gMetatiles_RusturfTunnel: @ 8277334
-
gMetatiles_RusturfTunnel:: @ 8277334
-
.incbin "baserom.gba", 0x277334, 0x530
.align 1
-gMetatileAttributes_RusturfTunnel: @ 8277864
-
gMetatileAttributes_RusturfTunnel:: @ 8277864
-
.incbin "baserom.gba", 0x277864, 0xa6
.align 1
-gMetatiles_SecretBaseSecondary: @ 827790A
-
gMetatiles_SecretBaseSecondary:: @ 827790A
-
.incbin "baserom.gba", 0x27790a, 0x1440
.align 1
-gMetatileAttributes_SecretBaseSecondary: @ 8278D4A
-
gMetatileAttributes_SecretBaseSecondary:: @ 8278D4A
-
.incbin "baserom.gba", 0x278d4a, 0x288
.align 1
-gMetatiles_InsideOfTruck: @ 8278FD2
-
gMetatiles_InsideOfTruck:: @ 8278FD2
-
.incbin "baserom.gba", 0x278fd2, 0x260
.align 1
-gMetatileAttributes_InsideOfTruck: @ 8279232
-
gMetatileAttributes_InsideOfTruck:: @ 8279232
-
.incbin "baserom.gba", 0x279232, 0x4c
.align 1
-gMetatiles_Contest: @ 827927E
-
gMetatiles_Contest:: @ 827927E
-
.incbin "baserom.gba", 0x27927e, 0xe00
.align 1
-gMetatileAttributes_Contest: @ 827A07E
-
gMetatileAttributes_Contest:: @ 827A07E
-
.incbin "baserom.gba", 0x27a07e, 0x1c0
.align 1
-gMetatiles_LilycoveMuseum: @ 827A23E
-
gMetatiles_LilycoveMuseum:: @ 827A23E
-
.incbin "baserom.gba", 0x27a23e, 0x8f0
.align 1
-gMetatileAttributes_LilycoveMuseum: @ 827AB2E
-
gMetatileAttributes_LilycoveMuseum:: @ 827AB2E
-
.incbin "baserom.gba", 0x27ab2e, 0x11e
.align 1
-gMetatiles_BrendansMaysHouse: @ 827AC4C
-
gMetatiles_BrendansMaysHouse:: @ 827AC4C
-
.incbin "baserom.gba", 0x27ac4c, 0xab0
.align 1
-gMetatileAttributes_BrendansMaysHouse: @ 827B6FC
-
gMetatileAttributes_BrendansMaysHouse:: @ 827B6FC
-
.incbin "baserom.gba", 0x27b6fc, 0x156
.align 1
-gMetatiles_Lab: @ 827B852
-
gMetatiles_Lab:: @ 827B852
-
.incbin "baserom.gba", 0x27b852, 0x9a0
.align 1
-gMetatileAttributes_Lab: @ 827C1F2
-
gMetatileAttributes_Lab:: @ 827C1F2
-
.incbin "baserom.gba", 0x27c1f2, 0x134
.align 1
-gMetatiles_Underwater: @ 827C326
-
gMetatiles_Underwater:: @ 827C326
-
.incbin "baserom.gba", 0x27c326, 0xec0
.align 1
-gMetatileAttributes_Underwater: @ 827D1E6
-
gMetatileAttributes_Underwater:: @ 827D1E6
-
.incbin "baserom.gba", 0x27d1e6, 0x1d8
.align 1
-gMetatiles_GenericBuilding: @ 827D3BE
-
gMetatiles_GenericBuilding:: @ 827D3BE
-
.incbin "baserom.gba", 0x27d3be, 0x2000
.align 1
-gMetatileAttributes_GenericBuilding: @ 827F3BE
-
gMetatileAttributes_GenericBuilding:: @ 827F3BE
-
.incbin "baserom.gba", 0x27f3be, 0x400
.align 1
-gMetatiles_MauvilleGameCorner: @ 827F7BE
-
gMetatiles_MauvilleGameCorner:: @ 827F7BE
-
.incbin "baserom.gba", 0x27f7be, 0x600
.align 1
-gMetatileAttributes_MauvilleGameCorner: @ 827FDBE
-
gMetatileAttributes_MauvilleGameCorner:: @ 827FDBE
-
.incbin "baserom.gba", 0x27fdbe, 0xc0
.align 1
-gMetatiles_Unused2: @ 827FE7E
+gMetatiles_Unused2:: @ 827FE7E
.incbin "baserom.gba", 0x27fe7e, 0x3a0
.align 1
-gMetatileAttributes_Unused2: @ 828021E
+gMetatileAttributes_Unused2:: @ 828021E
.incbin "baserom.gba", 0x28021e, 0x74
.align 1
-gMetatiles_RustboroGym: @ 8280292
-
gMetatiles_RustboroGym:: @ 8280292
-
.incbin "baserom.gba", 0x280292, 0x380
.align 1
-gMetatileAttributes_RustboroGym: @ 8280612
-
gMetatileAttributes_RustboroGym:: @ 8280612
-
.incbin "baserom.gba", 0x280612, 0x70
.align 1
-gMetatiles_DewfordGym: @ 8280682
-
gMetatiles_DewfordGym:: @ 8280682
-
.incbin "baserom.gba", 0x280682, 0x3d0
.align 1
-gMetatileAttributes_DewfordGym: @ 8280A52
-
gMetatileAttributes_DewfordGym:: @ 8280A52
-
.incbin "baserom.gba", 0x280a52, 0x7a
.align 1
-gMetatiles_MauvilleGym: @ 8280ACC
-
gMetatiles_MauvilleGym:: @ 8280ACC
-
.incbin "baserom.gba", 0x280acc, 0x750
.align 1
-gMetatileAttributes_MauvilleGym: @ 828121C
-
gMetatileAttributes_MauvilleGym:: @ 828121C
-
.incbin "baserom.gba", 0x28121c, 0xea
.align 1
-gMetatiles_LavaridgeGym: @ 8281306
-
gMetatiles_LavaridgeGym:: @ 8281306
-
.incbin "baserom.gba", 0x281306, 0x2a0
.align 1
-gMetatileAttributes_LavaridgeGym: @ 82815A6
-
gMetatileAttributes_LavaridgeGym:: @ 82815A6
-
.incbin "baserom.gba", 0x2815a6, 0x54
.align 1
-gMetatiles_PetalburgGym: @ 82815FA
-
gMetatiles_PetalburgGym:: @ 82815FA
-
.incbin "baserom.gba", 0x2815fa, 0x8c0
.align 1
-gMetatileAttributes_PetalburgGym: @ 8281EBA
-
gMetatileAttributes_PetalburgGym:: @ 8281EBA
-
.incbin "baserom.gba", 0x281eba, 0x118
.align 1
-gMetatiles_FortreeGym: @ 8281FD2
-
gMetatiles_FortreeGym:: @ 8281FD2
-
.incbin "baserom.gba", 0x281fd2, 0x350
.align 1
-gMetatileAttributes_FortreeGym: @ 8282322
-
gMetatileAttributes_FortreeGym:: @ 8282322
-
.incbin "baserom.gba", 0x282322, 0x6a
.align 1
-gMetatiles_MossdeepGym: @ 828238C
-
gMetatiles_MossdeepGym:: @ 828238C
-
.incbin "baserom.gba", 0x28238c, 0x500
.align 1
-gMetatileAttributes_MossdeepGym: @ 828288C
-
gMetatileAttributes_MossdeepGym:: @ 828288C
-
.incbin "baserom.gba", 0x28288c, 0xa0
.align 1
-gMetatiles_SootopolisGym: @ 828292C
-
gMetatiles_SootopolisGym:: @ 828292C
-
.incbin "baserom.gba", 0x28292c, 0x630
.align 1
-gMetatileAttributes_SootopolisGym: @ 8282F5C
-
gMetatileAttributes_SootopolisGym:: @ 8282F5C
-
.incbin "baserom.gba", 0x282f5c, 0xc6
.align 1
-gMetatiles_TrickHousePuzzle: @ 8283022
-
gMetatiles_TrickHousePuzzle:: @ 8283022
-
.incbin "baserom.gba", 0x283022, 0x950
.align 1
-gMetatileAttributes_TrickHousePuzzle: @ 8283972
-
gMetatileAttributes_TrickHousePuzzle:: @ 8283972
-
.incbin "baserom.gba", 0x283972, 0x12a
.align 1
-gMetatiles_Ship: @ 8283A9C
-
gMetatiles_Ship:: @ 8283A9C
-
.incbin "baserom.gba", 0x283a9c, 0xfc0
.align 1
-gMetatileAttributes_Ship: @ 8284A5C
-
gMetatileAttributes_Ship:: @ 8284A5C
-
.incbin "baserom.gba", 0x284a5c, 0x1f8
.align 1
-gMetatiles_SecretBasePrimary: @ 8284C54
-
gMetatiles_SecretBasePrimary:: @ 8284C54
-
.incbin "baserom.gba", 0x284c54, 0x20
.align 1
-gMetatileAttributes_SecretBasePrimary: @ 8284C74
-
gMetatileAttributes_SecretBasePrimary:: @ 8284C74
-
.incbin "baserom.gba", 0x284c74, 0x4
.align 1
-gMetatiles_EliteFour: @ 8284C78
-
gMetatiles_EliteFour:: @ 8284C78
-
.incbin "baserom.gba", 0x284c78, 0x14b0
.align 1
-gMetatileAttributes_EliteFour: @ 8286128
-
gMetatileAttributes_EliteFour:: @ 8286128
-
.incbin "baserom.gba", 0x286128, 0x296
.align 1
-gMetatiles_BattleTower: @ 82863BE
-
gMetatiles_BattleTower:: @ 82863BE
-
.incbin "baserom.gba", 0x2863be, 0x830
.align 1
-gMetatileAttributes_BattleTower: @ 8286BEE
-
gMetatileAttributes_BattleTower:: @ 8286BEE
-
.incbin "baserom.gba", 0x286bee, 0x106
diff --git a/graphics/battle_transitions/vs.pal b/graphics/battle_transitions/vs.pal
new file mode 100755
index 000000000..f4f6cb4e3
--- /dev/null
+++ b/graphics/battle_transitions/vs.pal
@@ -0,0 +1,99 @@
+JASC-PAL
+0100
+96
+0 0 0
+255 255 255
+238 246 238
+222 238 230
+213 230 213
+197 230 205
+189 222 189
+172 213 180
+164 213 172
+148 156 123
+115 106 90
+90 57 65
+222 49 8
+213 106 74
+205 164 139
+213 213 213
+0 0 0
+255 255 255
+213 246 205
+172 246 156
+139 246 106
+106 213 74
+74 180 41
+41 148 8
+246 230 8
+222 197 8
+205 164 8
+189 131 8
+172 98 8
+90 82 106
+172 98 8
+0 0 172
+0 0 0
+246 246 222
+230 213 222
+222 180 222
+205 148 222
+197 123 222
+180 90 222
+172 57 222
+156 24 222
+148 0 222
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+246 246 255
+230 238 246
+213 230 246
+197 222 238
+180 213 238
+164 205 230
+148 197 230
+131 189 230
+0 0 0
+0 0 0
+0 0 0
+246 230 8
+222 197 8
+205 164 8
+189 131 8
+0 0 0
+189 131 65
+197 131 98
+222 189 131
+123 82 24
+0 0 0
+0 0 0
+180 123 123
+238 222 172
+189 131 65
+65 32 0
+255 0 0
+106 180 213
+41 123 164
+123 148 49
+246 246 246
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+230 123 139
+164 49 115
+0 0 0
+0 0 0
diff --git a/graphics/battle_transitions/vs.png b/graphics/battle_transitions/vs.png
new file mode 100755
index 000000000..a1badcb02
--- /dev/null
+++ b/graphics/battle_transitions/vs.png
Binary files differ
diff --git a/graphics/interface/battle_window.pal b/graphics/interface/battle_window.pal
new file mode 100755
index 000000000..bc8e8f2bc
--- /dev/null
+++ b/graphics/interface/battle_window.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+65 65 65
+255 255 222
+222 213 180
+197 189 115
+123 148 131
+82 106 98
+32 57 0
+57 82 65
+255 230 0
+255 156 148
+65 205 255
+0 0 255
+0 255 0
+255 0 0
+106 148 255
diff --git a/graphics/interface/battle_window.png b/graphics/interface/battle_window.png
new file mode 100755
index 000000000..2117967ec
--- /dev/null
+++ b/graphics/interface/battle_window.png
Binary files differ
diff --git a/graphics/interface/battle_window2.png b/graphics/interface/battle_window2.png
new file mode 100755
index 000000000..ac084b2e5
--- /dev/null
+++ b/graphics/interface/battle_window2.png
Binary files differ
diff --git a/graphics/interface/battle_window3.png b/graphics/interface/battle_window3.png
new file mode 100755
index 000000000..f45e2f714
--- /dev/null
+++ b/graphics/interface/battle_window3.png
Binary files differ
diff --git a/graphics/interface/battle_window4.png b/graphics/interface/battle_window4.png
new file mode 100755
index 000000000..a366186cf
--- /dev/null
+++ b/graphics/interface/battle_window4.png
Binary files differ
diff --git a/graphics/interface/battle_window5.png b/graphics/interface/battle_window5.png
new file mode 100755
index 000000000..e48f380a4
--- /dev/null
+++ b/graphics/interface/battle_window5.png
Binary files differ
diff --git a/graphics/interface/blank.pal b/graphics/interface/blank.pal
new file mode 100755
index 000000000..9757f2e57
--- /dev/null
+++ b/graphics/interface/blank.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+148 255 164
+139 246 115
+65 205 57
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+213 213 205
+74 74 74
diff --git a/graphics/interface/hold_icons.pal b/graphics/interface/hold_icons.pal
new file mode 100755
index 000000000..e31d717c9
--- /dev/null
+++ b/graphics/interface/hold_icons.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+57 205 106
+255 255 255
+213 213 255
+148 148 180
+255 246 156
+222 222 115
+246 82 41
+164 90 82
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+98 98 98
diff --git a/graphics/interface/hold_icons.png b/graphics/interface/hold_icons.png
new file mode 100755
index 000000000..53eeedde3
--- /dev/null
+++ b/graphics/interface/hold_icons.png
Binary files differ
diff --git a/graphics/interface/money.pal b/graphics/interface/money.pal
new file mode 100755
index 000000000..3fa8d8cff
--- /dev/null
+++ b/graphics/interface/money.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 255
+205 205 205
+164 164 164
+123 123 123
+115 98 98
+65 57 41
+57 106 139
+106 180 49
+255 230 164
+255 205 164
+230 180 123
+255 205 0
+205 180 0
+255 230 0
+0 0 0
diff --git a/graphics/interface/money.png b/graphics/interface/money.png
new file mode 100755
index 000000000..5ad533dbf
--- /dev/null
+++ b/graphics/interface/money.png
Binary files differ
diff --git a/graphics/interface/pokeblock_device.pal b/graphics/interface/pokeblock_device.pal
new file mode 100755
index 000000000..a491b61af
--- /dev/null
+++ b/graphics/interface/pokeblock_device.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 156 255
+82 90 106
+205 197 222
+90 123 148
+90 164 172
+98 189 222
+172 213 238
+197 148 98
+197 197 49
+98 197 98
+255 197 148
+49 148 246
+172 98 82
+246 123 90
+164 156 180
+246 246 246
diff --git a/graphics/interface/pokeblock_device.png b/graphics/interface/pokeblock_device.png
new file mode 100755
index 000000000..65b29a8b3
--- /dev/null
+++ b/graphics/interface/pokeblock_device.png
Binary files differ
diff --git a/graphics/interface/status_icons.pal b/graphics/interface/status_icons.pal
new file mode 100755
index 000000000..718f5bb77
--- /dev/null
+++ b/graphics/interface/status_icons.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+49 189 131
+57 57 57
+255 255 255
+222 222 222
+197 98 197
+205 131 205
+189 189 24
+205 205 131
+164 164 139
+180 180 148
+139 180 230
+156 197 246
+230 115 82
+255 139 106
+238 82 57
+255 123 98
diff --git a/graphics/interface/status_icons.png b/graphics/interface/status_icons.png
new file mode 100755
index 000000000..f319d5566
--- /dev/null
+++ b/graphics/interface/status_icons.png
Binary files differ
diff --git a/graphics/interface/summary_frames.pal b/graphics/interface/summary_frames.pal
new file mode 100755
index 000000000..d46aa6c8f
--- /dev/null
+++ b/graphics/interface/summary_frames.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 255 0
+148 148 0
+49 172 255
+49 98 148
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 82 49
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/interface/summary_frames.png b/graphics/interface/summary_frames.png
new file mode 100755
index 000000000..d3c9a2c08
--- /dev/null
+++ b/graphics/interface/summary_frames.png
Binary files differ
diff --git a/graphics/interface/wordgroup.pal b/graphics/interface/wordgroup.pal
new file mode 100755
index 000000000..0d067c9e2
--- /dev/null
+++ b/graphics/interface/wordgroup.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 148
+156 230 255
+98 197 246
+82 148 197
+172 246 213
+139 230 180
+90 164 123
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+41 49 49
+98 98 98
+180 189 180
+222 213 222
+255 255 255
diff --git a/graphics/interface/wordgroup.png b/graphics/interface/wordgroup.png
new file mode 100755
index 000000000..9cf90dbf1
--- /dev/null
+++ b/graphics/interface/wordgroup.png
Binary files differ
diff --git a/graphics/misc/applause.png b/graphics/misc/applause.png
new file mode 100755
index 000000000..32b1748a0
--- /dev/null
+++ b/graphics/misc/applause.png
Binary files differ
diff --git a/graphics/misc/confetti.pal b/graphics/misc/confetti.pal
new file mode 100755
index 000000000..f2494e508
--- /dev/null
+++ b/graphics/misc/confetti.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 57 57
+156 0 0
+164 222 255
+49 82 255
+255 255 115
+230 106 0
+255 255 255
+189 189 197
+139 246 115
+65 205 57
+255 123 180
+197 49 131
+65 74 106
+0 0 0
+0 0 0
diff --git a/graphics/misc/confetti.png b/graphics/misc/confetti.png
new file mode 100755
index 000000000..ef8b921d8
--- /dev/null
+++ b/graphics/misc/confetti.png
Binary files differ
diff --git a/graphics/misc/judge.pal b/graphics/misc/judge.pal
new file mode 100755
index 000000000..e62f2abd3
--- /dev/null
+++ b/graphics/misc/judge.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+156 197 164
+255 222 205
+222 180 148
+172 115 90
+238 238 238
+90 57 57
+57 49 65
+0 0 0
+82 90 8
+57 65 16
+222 82 82
+246 197 49
+246 230 139
+131 131 148
+164 164 180
+205 205 222
diff --git a/graphics/misc/judge.png b/graphics/misc/judge.png
new file mode 100755
index 000000000..c4dcf520b
--- /dev/null
+++ b/graphics/misc/judge.png
Binary files differ
diff --git a/graphics/misc/judge_symbols.pal b/graphics/misc/judge_symbols.pal
new file mode 100755
index 000000000..3eeaa1128
--- /dev/null
+++ b/graphics/misc/judge_symbols.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+205 148 115
+255 106 115
+255 57 57
+156 0 0
+164 222 255
+106 148 255
+49 82 255
+255 255 115
+246 222 65
+230 106 0
+255 255 255
+189 189 197
+131 131 139
+98 98 123
+65 74 106
+41 49 90
diff --git a/graphics/misc/judge_symbols.png b/graphics/misc/judge_symbols.png
new file mode 100755
index 000000000..7669fb88b
--- /dev/null
+++ b/graphics/misc/judge_symbols.png
Binary files differ
diff --git a/graphics/misc/nextturn.pal b/graphics/misc/nextturn.pal
new file mode 100755
index 000000000..05991c79e
--- /dev/null
+++ b/graphics/misc/nextturn.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+148 90 16
+246 189 115
+255 222 115
+255 255 156
+255 49 24
+213 16 0
+246 156 222
+255 0 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/misc/nextturn.png b/graphics/misc/nextturn.png
new file mode 100755
index 000000000..747c4b5a7
--- /dev/null
+++ b/graphics/misc/nextturn.png
Binary files differ
diff --git a/graphics/misc/pokeblock.png b/graphics/misc/pokeblock.png
new file mode 100755
index 000000000..fd24e0621
--- /dev/null
+++ b/graphics/misc/pokeblock.png
Binary files differ
diff --git a/graphics/pokedex/arrows.pal b/graphics/pokedex/arrows.pal
new file mode 100755
index 000000000..256cee631
--- /dev/null
+++ b/graphics/pokedex/arrows.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 255 0
+255 0 0
+230 0 0
+213 0 0
+197 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+197 197 197
+0 0 0
+255 255 255
diff --git a/graphics/pokedex/arrows.png b/graphics/pokedex/arrows.png
new file mode 100755
index 000000000..fe992db2f
--- /dev/null
+++ b/graphics/pokedex/arrows.png
Binary files differ
diff --git a/graphics/roulette/center.pal b/graphics/roulette/center.pal
new file mode 100755
index 000000000..5eb074037
--- /dev/null
+++ b/graphics/roulette/center.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+74 106 156
+41 41 41
+123 123 131
+172 180 197
+255 255 255
+238 238 156
+189 180 106
+131 90 32
+255 131 90
+189 106 98
+230 222 255
+74 189 156
+255 255 255
+123 180 172
+255 255 255
+255 255 255
diff --git a/graphics/roulette/center.png b/graphics/roulette/center.png
new file mode 100755
index 000000000..0653b0e97
--- /dev/null
+++ b/graphics/roulette/center.png
Binary files differ
diff --git a/graphics/unknown/ball.pal b/graphics/unknown/ball.pal
new file mode 100755
index 000000000..b4e7ac7ca
--- /dev/null
+++ b/graphics/unknown/ball.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+255 106 90
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
diff --git a/graphics/unknown/ball.png b/graphics/unknown/ball.png
new file mode 100755
index 000000000..9932b916d
--- /dev/null
+++ b/graphics/unknown/ball.png
Binary files differ
diff --git a/graphics/unused/numbers.pal b/graphics/unused/numbers.pal
new file mode 100755
index 000000000..3955aa77a
--- /dev/null
+++ b/graphics/unused/numbers.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+74 65 82
+255 255 255
+222 222 222
+172 172 197
+255 0 0
+0 0 255
+255 255 0
+0 197 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+255 164 131
diff --git a/graphics/unused/numbers.png b/graphics/unused/numbers.png
new file mode 100755
index 000000000..2c816c426
--- /dev/null
+++ b/graphics/unused/numbers.png
Binary files differ
diff --git a/include/text.h b/include/text.h
index 192190490..527a8939d 100644
--- a/include/text.h
+++ b/include/text.h
@@ -176,6 +176,6 @@ u8 GetStringWidthGivenWindowConfig(struct WindowConfig *winConfig, u8 *s);
void ConvertInternationalString(u8 *s, u8 language);
void SkipExtCtrlCodes(u8 *str);
s32 StringCompareWithoutExtCtrlCodes(u8 *str1, u8 *str2);
-u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 a7, u32 a8);
+u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8);
#endif // GUARD_TEXT_H
diff --git a/ld_script.txt b/ld_script.txt
index 313f02207..4e13bc0bf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -82,7 +82,12 @@ SECTIONS {
{
data/event_scripts.o(script_data);
data/battle_anim_scripts.o(script_data);
- data/data1.o(script_data);
+ data/battle_scripts_1.o(script_data);
+ data/field_effect_scripts.o(script_data);
+ data/battle_scripts_2.o(script_data);
+ data/battle_ai_scripts.o(script_data);
+ data/contest_ai_scripts.o(script_data);
+ data/script_funcs.o(script_data);
} =0
lib_text :
diff --git a/misc.mk b/misc.mk
index 0e11c7fe2..bfcb81118 100755
--- a/misc.mk
+++ b/misc.mk
@@ -11,15 +11,12 @@ BTLANMSPRGFXDIR := graphics/battle_anims/sprites
PICFRAMEGFXDIR := graphics/picture_frame
$(MENUGFXDIR)/menu.gbapal: $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal
-
@cat $(MENUGFXDIR)/menu_0.gbapal $(MENUGFXDIR)/menu_1.gbapal >$@
$(INTROGFXDIR)/intro.4bpp: $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp
-
@cat $(INTROGFXDIR)/intro1_waterdrops.4bpp $(INTROGFXDIR)/intro1_gamefreak.4bpp >$@
$(INTROGFXDIR)/introgfx.4bpp: $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp
-
@cat $(INTROGFXDIR)/intro1_bg.4bpp $(INTROGFXDIR)/intro1_leaves.4bpp >$@
$(PKNAVGFXDIR)/region_map.8bpp: $(PKNAVGFXDIR)/region_map.png
@@ -165,3 +162,6 @@ $(BTLANMSPRGFXDIR)/159.4bpp: $(BTLANMSPRGFXDIR)/159_0.4bpp $(BTLANMSPRGFXDIR)/15
$(PICFRAMEGFXDIR)/frame5.4bpp: $(PICFRAMEGFXDIR)/frame5.png
$(GFX) $< $@ -num_tiles 86
+
+$(MISCGFXDIR)/nextturn.4bpp: $(MISCGFXDIR)/nextturn.png
+ $(GFX) $< $@ -num_tiles 8
diff --git a/src/text.c b/src/text.c
index 624f2fd8e..372d3e7e2 100644
--- a/src/text.c
+++ b/src/text.c
@@ -3755,7 +3755,7 @@ s32 StringCompareWithoutExtCtrlCodes(u8 *str1, u8 *str2)
return retVal;
}
-u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 a7, u32 a8)
+u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u8 left, u16 top, u8 width, u32 a8)
{
u8 newlineCount = 0;
u8 extCtrlCodeLength;
@@ -3787,7 +3787,7 @@ u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u
case 0xFE:
dest[0] = 0xFC;
dest[1] = 19;
- dest[2] = a7;
+ dest[2] = width;
dest[3] = 0xFE;
dest += 4;
src++;
@@ -3799,7 +3799,7 @@ u8 sub_8004FD0(struct Window *win, u8 *dest, u8 *src, u16 tileDataStartOffset, u
dest[0] = 0xFC;
dest[1] = 19;
- dest[2] = a7;
+ dest[2] = width;
dest[3] = 0xFF;
if (endsWithoutNewline)