diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 | 
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-07-16 20:09:46 -0400 | 
| commit | 93f767e26de82d1d4133e719a758578ede98b306 (patch) | |
| tree | 0932ef3730d627bb9d9fc6c919cdcd5a6a358d7f /data | |
| parent | dd7e19107879f74d8f962a6a47d619470eaefbcd (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
resolve conflict
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 1804 | ||||
| -rw-r--r-- | data/field_tasks.s | 66 | ||||
| -rw-r--r-- | data/graphics/berries/graphics_table.inc | 45 | ||||
| -rw-r--r-- | data/item_menu.s | 289 | ||||
| -rw-r--r-- | data/pokeblock.s | 125 | ||||
| -rw-r--r-- | data/rotating_gate.s | 311 | ||||
| -rw-r--r-- | data/sound_check_menu.s | 121 | ||||
| -rw-r--r-- | data/text/song_names.inc | 1105 | ||||
| -rw-r--r-- | data/use_pokeblock.s | 73 | 
9 files changed, 0 insertions, 3939 deletions
| diff --git a/data/data2.s b/data/data2.s deleted file mode 100644 index 00ef5c26e..000000000 --- a/data/data2.s +++ /dev/null @@ -1,1804 +0,0 @@ -@ the second big chunk of data - -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -	.align 2 -gSpriteImageTable_81E7A10:: @ 81E7A10 -	obj_frame_tiles 0x2008000, 0x800 -	obj_frame_tiles 0x2008800, 0x800 -	obj_frame_tiles 0x2009000, 0x800 -	obj_frame_tiles 0x2009800, 0x800 - -	.align 2 -gSpriteImageTable_81E7A30:: @ 81E7A30 -	obj_frame_tiles 0x200A000, 0x800 -	obj_frame_tiles 0x200A800, 0x800 -	obj_frame_tiles 0x200B000, 0x800 -	obj_frame_tiles 0x200B800, 0x800 - -	.align 2 -gSpriteImageTable_81E7A50:: @ 81E7A50 -	obj_frame_tiles 0x200C000, 0x800 -	obj_frame_tiles 0x200C800, 0x800 -	obj_frame_tiles 0x200D000, 0x800 -	obj_frame_tiles 0x200D800, 0x800 - -	.align 2 -gSpriteImageTable_81E7A70:: @ 81E7A70 -	obj_frame_tiles 0x200E000, 0x800 -	obj_frame_tiles 0x200E800, 0x800 -	obj_frame_tiles 0x200F000, 0x800 -	obj_frame_tiles 0x200F800, 0x800 - -	.align 2 -gSpriteAnim_81E7A90:: @ 81E7A90 -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81E7A98:: @ 81E7A98 -	obj_image_anim_frame 3, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAffineAnim_81E7AA0:: @ 81E7AA0 -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7AB0:: @ 81E7AB0 -	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7AC0:: @ 81E7AC0 -	obj_rot_scal_anim_frame 0x28, 0x28, 0, 0 -	obj_rot_scal_anim_frame 0x12, 0x12, 0, 12 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7AD8:: @ 81E7AD8 -	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 18 -	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 15 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7AF0:: @ 81E7AF0 -	obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0x4, 0x0, 0, 8 -	obj_rot_scal_anim_frame 0xFFFC, 0x0, 0, 8 -	obj_rot_scal_anim_jump 1 - -	.align 2 -gSpriteAffineAnim_81E7B10:: @ 81E7B10 -	obj_rot_scal_anim_frame 0x2, 0x2, 0, 20 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7B20:: @ 81E7B20 -	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 0, 20 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7B30:: @ 81E7B30 -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 9 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7B48:: @ 81E7B48 -	obj_rot_scal_anim_frame 0x4, 0x4, 0, 63 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7B58:: @ 81E7B58 -	obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 -	obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_81E7B70:: @ 81E7B70 -	.4byte gSpriteAffineAnim_81E7AA0 -	.4byte gSpriteAffineAnim_81E7AC0 -	.4byte gSpriteAffineAnim_81E7AD8 -	.4byte gSpriteAffineAnim_81E7AF0 -	.4byte gSpriteAffineAnim_81E7B10 -	.4byte gSpriteAffineAnim_81E7B20 -	.4byte gSpriteAffineAnim_81E7B48 -	.4byte gSpriteAffineAnim_81E7B58 -	.4byte gSpriteAffineAnim_81E7B30 - -	.align 2 -gSpriteAffineAnim_81E7B94:: @ 81E7B94 -	obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 4, 63 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7BA4:: @ 81E7BA4 -	obj_rot_scal_anim_frame 0x0, 0x0, 3, 5 -	obj_rot_scal_anim_frame 0x0, 0x0, -3, 5 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7BBC:: @ 81E7BBC -	obj_rot_scal_anim_frame 0x0, 0x0, -5, 20 -	obj_rot_scal_anim_frame 0x0, 0x0, 0, 20 -	obj_rot_scal_anim_frame 0x0, 0x0, 5, 20 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81E7BDC:: @ 81E7BDC -	obj_rot_scal_anim_frame 0x0, 0x0, 9, 110 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_81E7BEC:: @ 81E7BEC -	.4byte gSpriteAffineAnim_81E7AA0 -	.4byte gSpriteAffineAnim_81E7AC0 -	.4byte gSpriteAffineAnim_81E7AD8 -	.4byte gSpriteAffineAnim_81E7AF0 -	.4byte gSpriteAffineAnim_81E7B10 -	.4byte gSpriteAffineAnim_81E7B20 -	.4byte gSpriteAffineAnim_81E7B94 -	.4byte gSpriteAffineAnim_81E7BA4 -	.4byte gSpriteAffineAnim_81E7BBC -	.4byte gSpriteAffineAnim_81E7B30 -	.4byte gSpriteAffineAnim_81E7BDC - -	.align 2 -gSpriteAffineAnimTable_81E7C18:: @ 81E7C18 -	.4byte gSpriteAffineAnim_81E7AB0 -	.4byte gSpriteAffineAnim_81E7AC0 -	.4byte gSpriteAffineAnim_81E7AD8 -	.4byte gSpriteAffineAnim_81E7AF0 -	.4byte gSpriteAffineAnim_81E7B10 -	.4byte gSpriteAffineAnim_81E7B20 -	.4byte gSpriteAffineAnim_81E7B94 -	.4byte gSpriteAffineAnim_81E7BA4 -	.4byte gSpriteAffineAnim_81E7BBC -	.4byte gSpriteAffineAnim_81E7B30 -	.4byte gSpriteAffineAnim_81E7BDC - -	.align 2 -gSpriteAnim_81E7C44:: @ 81E7C44 -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81E7C4C:: @ 81E7C4C -	obj_image_anim_frame 1, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81E7C54:: @ 81E7C54 -	obj_image_anim_frame 2, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81E7C5C:: @ 81E7C5C -	obj_image_anim_frame 3, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_81E7C64:: @ 81E7C64 -	.4byte gSpriteAnim_81E7C44 -	.4byte gSpriteAnim_81E7C4C -	.4byte gSpriteAnim_81E7C54 -	.4byte gSpriteAnim_81E7C5C - -@ 81E7C74 -	.include "data/graphics/pokemon/front_pic_coords.inc" - -@ 81E8354 -	.include "data/graphics/pokemon/front_pic_table.inc" - -@ 81E9114 -	.include "data/graphics/pokemon/back_pic_coords.inc" - -@ 81E97F4 -	.include "data/graphics/pokemon/back_pic_table.inc" - -@ 81EA5B4 -	.include "data/graphics/pokemon/palette_table.inc" - -@ 81EB374 -	.include "data/graphics/pokemon/shiny_palette_table.inc" - -	.align 2 -gSpriteAnim_81EC134:: @ 81EC134 -	obj_image_anim_frame 0, 7 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81EC13C:: @ 81EC13C -	obj_image_anim_frame 0, 2 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81EC144:: @ 81EC144 -	obj_image_anim_frame 0, 2 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_81EC14C:: @ 81EC14C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC150:: @ 81EC150 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC154:: @ 81EC154 -	.4byte gSpriteAnim_81E7A90 -	.4byte gSpriteAnim_81EC134 - -	.align 2 -gSpriteAnimTable_81EC15C:: @ 81EC15C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC160:: @ 81EC160 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC164:: @ 81EC164 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC168:: @ 81EC168 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC16C:: @ 81EC16C -	.4byte gSpriteAnim_81E7A90 -	.4byte gSpriteAnim_81EC13C - -	.align 2 -gSpriteAnimTable_81EC174:: @ 81EC174 -	.4byte gSpriteAnim_81E7A90 -	.4byte gSpriteAnim_81EC144 - -	.align 2 -gSpriteAnimTable_81EC17C:: @ 81EC17C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC180:: @ 81EC180 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC184:: @ 81EC184 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC188:: @ 81EC188 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC18C:: @ 81EC18C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC190:: @ 81EC190 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC194:: @ 81EC194 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC198:: @ 81EC198 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC19C:: @ 81EC19C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1A0:: @ 81EC1A0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1A4:: @ 81EC1A4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1A8:: @ 81EC1A8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1AC:: @ 81EC1AC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1B0:: @ 81EC1B0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1B4:: @ 81EC1B4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1B8:: @ 81EC1B8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1BC:: @ 81EC1BC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1C0:: @ 81EC1C0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1C4:: @ 81EC1C4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1C8:: @ 81EC1C8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1CC:: @ 81EC1CC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1D0:: @ 81EC1D0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1D4:: @ 81EC1D4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1D8:: @ 81EC1D8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1DC:: @ 81EC1DC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1E0:: @ 81EC1E0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1E4:: @ 81EC1E4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1E8:: @ 81EC1E8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1EC:: @ 81EC1EC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1F0:: @ 81EC1F0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1F4:: @ 81EC1F4 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1F8:: @ 81EC1F8 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC1FC:: @ 81EC1FC -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC200:: @ 81EC200 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC204:: @ 81EC204 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC208:: @ 81EC208 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC20C:: @ 81EC20C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC210:: @ 81EC210 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC214:: @ 81EC214 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC218:: @ 81EC218 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC21C:: @ 81EC21C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC220:: @ 81EC220 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC224:: @ 81EC224 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC228:: @ 81EC228 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC22C:: @ 81EC22C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC230:: @ 81EC230 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC234:: @ 81EC234 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC238:: @ 81EC238 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC23C:: @ 81EC23C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC240:: @ 81EC240 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC244:: @ 81EC244 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC248:: @ 81EC248 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC24C:: @ 81EC24C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC250:: @ 81EC250 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC254:: @ 81EC254 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC258:: @ 81EC258 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC25C:: @ 81EC25C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC260:: @ 81EC260 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC264:: @ 81EC264 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC268:: @ 81EC268 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC26C:: @ 81EC26C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC270:: @ 81EC270 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC274:: @ 81EC274 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC278:: @ 81EC278 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC27C:: @ 81EC27C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC280:: @ 81EC280 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC284:: @ 81EC284 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC288:: @ 81EC288 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC28C:: @ 81EC28C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC290:: @ 81EC290 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC294:: @ 81EC294 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC298:: @ 81EC298 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC29C:: @ 81EC29C -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gSpriteAnimTable_81EC2A0:: @ 81EC2A0 -	.4byte gSpriteAnim_81E7A90 - -	.align 2 -gUnknown_081EC2A4:: @ 81EC2A4 -	.4byte gSpriteAnimTable_81EC14C -	.4byte gSpriteAnimTable_81EC150 -	.4byte gSpriteAnimTable_81EC154 -	.4byte gSpriteAnimTable_81EC15C -	.4byte gSpriteAnimTable_81EC160 -	.4byte gSpriteAnimTable_81EC164 -	.4byte gSpriteAnimTable_81EC168 -	.4byte gSpriteAnimTable_81EC16C -	.4byte gSpriteAnimTable_81EC174 -	.4byte gSpriteAnimTable_81EC17C -	.4byte gSpriteAnimTable_81EC180 -	.4byte gSpriteAnimTable_81EC184 -	.4byte gSpriteAnimTable_81EC188 -	.4byte gSpriteAnimTable_81EC18C -	.4byte gSpriteAnimTable_81EC190 -	.4byte gSpriteAnimTable_81EC194 -	.4byte gSpriteAnimTable_81EC198 -	.4byte gSpriteAnimTable_81EC19C -	.4byte gSpriteAnimTable_81EC1A0 -	.4byte gSpriteAnimTable_81EC1A4 -	.4byte gSpriteAnimTable_81EC1A8 -	.4byte gSpriteAnimTable_81EC1AC -	.4byte gSpriteAnimTable_81EC1B0 -	.4byte gSpriteAnimTable_81EC1B4 -	.4byte gSpriteAnimTable_81EC1B8 -	.4byte gSpriteAnimTable_81EC1BC -	.4byte gSpriteAnimTable_81EC1C0 -	.4byte gSpriteAnimTable_81EC1C4 -	.4byte gSpriteAnimTable_81EC1C8 -	.4byte gSpriteAnimTable_81EC1CC -	.4byte gSpriteAnimTable_81EC1D0 -	.4byte gSpriteAnimTable_81EC1D4 -	.4byte gSpriteAnimTable_81EC1D8 -	.4byte gSpriteAnimTable_81EC1DC -	.4byte gSpriteAnimTable_81EC1E0 -	.4byte gSpriteAnimTable_81EC1E4 -	.4byte gSpriteAnimTable_81EC1E8 -	.4byte gSpriteAnimTable_81EC1EC -	.4byte gSpriteAnimTable_81EC1F0 -	.4byte gSpriteAnimTable_81EC1F4 -	.4byte gSpriteAnimTable_81EC1F8 -	.4byte gSpriteAnimTable_81EC1FC -	.4byte gSpriteAnimTable_81EC200 -	.4byte gSpriteAnimTable_81EC204 -	.4byte gSpriteAnimTable_81EC208 -	.4byte gSpriteAnimTable_81EC20C -	.4byte gSpriteAnimTable_81EC210 -	.4byte gSpriteAnimTable_81EC214 -	.4byte gSpriteAnimTable_81EC218 -	.4byte gSpriteAnimTable_81EC21C -	.4byte gSpriteAnimTable_81EC220 -	.4byte gSpriteAnimTable_81EC224 -	.4byte gSpriteAnimTable_81EC228 -	.4byte gSpriteAnimTable_81EC22C -	.4byte gSpriteAnimTable_81EC230 -	.4byte gSpriteAnimTable_81EC234 -	.4byte gSpriteAnimTable_81EC238 -	.4byte gSpriteAnimTable_81EC23C -	.4byte gSpriteAnimTable_81EC240 -	.4byte gSpriteAnimTable_81EC244 -	.4byte gSpriteAnimTable_81EC248 -	.4byte gSpriteAnimTable_81EC24C -	.4byte gSpriteAnimTable_81EC250 -	.4byte gSpriteAnimTable_81EC254 -	.4byte gSpriteAnimTable_81EC258 -	.4byte gSpriteAnimTable_81EC25C -	.4byte gSpriteAnimTable_81EC260 -	.4byte gSpriteAnimTable_81EC264 -	.4byte gSpriteAnimTable_81EC268 -	.4byte gSpriteAnimTable_81EC26C -	.4byte gSpriteAnimTable_81EC270 -	.4byte gSpriteAnimTable_81EC274 -	.4byte gSpriteAnimTable_81EC278 -	.4byte gSpriteAnimTable_81EC27C -	.4byte gSpriteAnimTable_81EC280 -	.4byte gSpriteAnimTable_81EC284 -	.4byte gSpriteAnimTable_81EC288 -	.4byte gSpriteAnimTable_81EC28C -	.4byte gSpriteAnimTable_81EC290 -	.4byte gSpriteAnimTable_81EC294 -	.4byte gSpriteAnimTable_81EC298 -	.4byte gSpriteAnimTable_81EC29C -	.4byte gSpriteAnimTable_81EC2A0 - -@ 81EC3F0 -	.include "data/graphics/trainers/front_pic_coords.inc" - -@ 81EC53C -	.include "data/graphics/trainers/front_pic_table.inc" - -@ 81EC7D4 -	.include "data/graphics/trainers/front_pic_palette_table.inc" - -	.align 2 -gSpriteAnim_81ECA6C:: @ 81ECA6C -	obj_image_anim_frame 0, 24 -	obj_image_anim_frame 1, 9 -	obj_image_anim_frame 2, 24 -	obj_image_anim_frame 0, 9 -	obj_image_anim_frame 3, 50 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81ECA84:: @ 81ECA84 -	obj_image_anim_frame 0, 24 -	obj_image_anim_frame 1, 9 -	obj_image_anim_frame 2, 24 -	obj_image_anim_frame 0, 9 -	obj_image_anim_frame 3, 50 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81ECA9C:: @ 81ECA9C -	obj_image_anim_frame 0, 24 -	obj_image_anim_frame 1, 9 -	obj_image_anim_frame 2, 24 -	obj_image_anim_frame 0, 9 -	obj_image_anim_frame 3, 50 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_81ECAB4:: @ 81ECAB4 -	.4byte gSpriteAnim_81E7A98 -	.4byte gSpriteAnim_81ECA6C - -	.align 2 -gSpriteAnimTable_81ECABC:: @ 81ECABC -	.4byte gSpriteAnim_81E7A98 -	.4byte gSpriteAnim_81ECA84 - -	.align 2 -gSpriteAnimTable_81ECAC4:: @ 81ECAC4 -	.4byte gSpriteAnim_81E7A98 -	.4byte gSpriteAnim_81ECA9C - -	.align 2 -gUnknown_081ECACC:: @ 81ECACC -	.4byte gSpriteAnimTable_81ECAB4 -	.4byte gSpriteAnimTable_81ECABC -	.4byte gSpriteAnimTable_81ECAC4 - -@ 81ECAD8 -	.include "data/graphics/trainers/back_pic_coords.inc" - -@ 81ECAE4 -	.include "data/graphics/trainers/back_pic_table.inc" - -@ 81ECAFC -	.include "data/graphics/trainers/back_pic_palette_table.inc" - -@ 81ECB14 -	.include "data/enemy_mon_elevation.inc" - -@ 81ECCB0 -	.include "data/trainer_parties.inc" - -@ 81F0208 -	.include "data/text/trainer_class_names.inc" - -@ 81F04FC -	.include "data/trainers.inc" - -@ 81F716C -	.include "data/text/species_names.inc" - -@ 81F8320 -	.include "data/text/move_names.inc" - -	.align 2 -@ 81F9528 -	.4byte 0x101 @ unknown data - -	.align 2 -gOamData_81F952C:: @ 81F952C -	.2byte 0x0300 -	.2byte 0xC000 -	.2byte 0x0000 - -	.align 2 -gOamData_81F9534:: @ 81F9534 -	.2byte 0x0300 -	.2byte 0xC000 -	.2byte 0x0040 - -	.align 2 -gSpriteAffineAnim_81F953C:: @ 81F953C -	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_81F954C:: @ 81F954C -	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0 -	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 -	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_81F956C:: @ 81F956C -	.4byte gSpriteAffineAnim_81F953C -	.4byte gSpriteAffineAnim_81F954C - -	.align 2 -gSpriteTemplate_81F9574:: @ 81F9574 -	spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 - -	.align 2 -gSpriteTemplate_81F958C:: @ 81F958C -	spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36 - -	.align 2 -gUnknown_081F95A4:: @ 81F95A4 -	obj_tiles gUnknown_08E5DC2C, 4096, 0x2710 - -	.align 2 -gBattleTerrainTable:: @ 81F95AC -	@ tall_grass -	.4byte gBattleTerrainTiles_TallGrass -	.4byte gBattleTerrainTilemap_TallGrass -	.4byte gBattleTerrainAnimTiles_TallGrass -	.4byte gBattleTerrainAnimTilemap_TallGrass -	.4byte gBattleTerrainPalette_TallGrass - -	@ long_grass -	.4byte gBattleTerrainTiles_LongGrass -	.4byte gBattleTerrainTilemap_LongGrass -	.4byte gBattleTerrainAnimTiles_LongGrass -	.4byte gBattleTerrainAnimTilemap_LongGrass -	.4byte gBattleTerrainPalette_LongGrass - -	@ sand -	.4byte gBattleTerrainTiles_Sand -	.4byte gBattleTerrainTilemap_Sand -	.4byte gBattleTerrainAnimTiles_Sand -	.4byte gBattleTerrainAnimTilemap_Sand -	.4byte gBattleTerrainPalette_Sand - -	@ underwater -	.4byte gBattleTerrainTiles_Underwater -	.4byte gBattleTerrainTilemap_Underwater -	.4byte gBattleTerrainAnimTiles_Underwater -	.4byte gBattleTerrainAnimTilemap_Underwater -	.4byte gBattleTerrainPalette_Underwater - -	@ water -	.4byte gBattleTerrainTiles_Water -	.4byte gBattleTerrainTilemap_Water -	.4byte gBattleTerrainAnimTiles_Water -	.4byte gBattleTerrainAnimTilemap_Water -	.4byte gBattleTerrainPalette_Water - -	@ pond_water -	.4byte gBattleTerrainTiles_PondWater -	.4byte gBattleTerrainTilemap_PondWater -	.4byte gBattleTerrainAnimTiles_PondWater -	.4byte gBattleTerrainAnimTilemap_PondWater -	.4byte gBattleTerrainPalette_PondWater - -	@ rock -	.4byte gBattleTerrainTiles_Rock -	.4byte gBattleTerrainTilemap_Rock -	.4byte gBattleTerrainAnimTiles_Rock -	.4byte gBattleTerrainAnimTilemap_Rock -	.4byte gBattleTerrainPalette_Rock - -	@ cave -	.4byte gBattleTerrainTiles_Cave -	.4byte gBattleTerrainTilemap_Cave -	.4byte gBattleTerrainAnimTiles_Cave -	.4byte gBattleTerrainAnimTilemap_Cave -	.4byte gBattleTerrainPalette_Cave - -	@ building -	.4byte gBattleTerrainTiles_Building -	.4byte gBattleTerrainTilemap_Building -	.4byte gBattleTerrainAnimTiles_Building -	.4byte gBattleTerrainAnimTilemap_Building -	.4byte gBattleTerrainPalette_Building - -	@ plain -	.4byte gBattleTerrainTiles_Building -	.4byte gBattleTerrainTilemap_Building -	.4byte gBattleTerrainAnimTiles_Building -	.4byte gBattleTerrainAnimTilemap_Building -	.4byte gBattleTerrainPalette_Plain - -	.align 2 -gUnknown_081F9674:: @ 81F9674 -	.4byte REG_BG3HOFS -	.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1 -	.4byte 1 - -	.align 2 -gUnknown_081F9680:: @ 81F9680 -	.4byte gUnknown_030041D0 -	.2byte 0x20 -	.byte 0x13 -	.byte 0x10 -	.4byte BG_VRAM + 0xE104 - -	.4byte gUnknown_03004250 -	.2byte 0x40 -	.byte 0x13 -	.byte 0x10 -	.4byte BG_VRAM + 0xF104 - -	.4byte gUnknown_030041D0 -	.2byte 0x60 -	.byte 0x13 -	.byte 0x30 -	.4byte BG_VRAM + 0xE204 - -	.4byte gUnknown_03004250 -	.2byte 0x80 -	.byte 0x13 -	.byte 0x30 -	.4byte BG_VRAM + 0xF204 - -	.4byte gUnknown_030041D0 -	.2byte 0x20 -	.byte 0x13 -	.byte 0x18 -	.4byte BG_VRAM + 0xE1C4 - -	.4byte gUnknown_03004250 -	.2byte 0x40 -	.byte 0x13 -	.byte 0x18 -	.4byte BG_VRAM + 0xF1C4 - -gUnknown_081F96C8:: @ 81F96C8 -	.string "ヌケニン$" @ "Nukenin" (Shedinja) - -	.align 2 -gSpriteTemplate_81F96D0:: @ 81F96D0 -	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_800F828 - -	.align 2 -gOamData_81F96E8:: @ 81F96E8 -	.2byte 0x0100 -	.2byte 0xC000 -	.2byte 0x0800 - -	.align 2 -gOamData_81F96F0:: @ 81F96F0 -	.2byte 0x0100 -	.2byte 0xC000 -	.2byte 0x2800 - -	.align 2 -gSpriteAnim_81F96F8:: @ 81F96F8 -	obj_image_anim_frame 0, 5 -	obj_image_anim_jump 0 - -	.align 2 -gSpriteAnimTable_81F9700:: @ 81F9700 -	.4byte gSpriteAnim_81F96F8 - -	.align 2 -gSpriteAffineAnim_81F9704:: @ 81F9704 -	obj_rot_scal_anim_frame 0xFFF0, 0x0, 0, 4 -	obj_rot_scal_anim_frame 0x0, 0x0, 0, 60 -	obj_rot_scal_anim_jump 1 - -	.align 2 -gSpriteAffineAnimTable_81F971C:: @ 81F971C -	.4byte gSpriteAffineAnim_81F9704 - -@ 81F9720 -	.include "data/type_effectiveness.inc" - -@ 81F9870 -	.include "data/text/type_names.inc" - -@ 81F98F0 -	.include "data/trainer_money.inc" - -@ 81F99CC -	.include "data/text/ability_descriptions.inc" - -@ 81FA248 -	.include "data/text/ability_names.inc" - -	.align 2 -gUnknown_081FA640:: @ 81FA640 -	.4byte sub_8013FE8 -	.4byte sub_80147A0 -	.4byte sub_80146F4 -	.4byte sub_8014BF4 -	.4byte sub_8014D50 -	.4byte sub_8014D98 -	.4byte sub_8014DF8 -	.4byte sub_8014EBC -	.4byte bs8_exit_by_flight -	.4byte sub_8014FBC -	.4byte sub_801B594 -	.4byte bsB_exit_by_move -	.4byte bsC_8016D70 -	.4byte sub_8015060 - -	.align 2 -gUnknown_081FA678:: @ 81FA678 -	.4byte bc_8013B1C -	.4byte sub_8013998 -	.4byte sub_8013B64 -	.4byte sub_8013B64 -	.4byte sub_8013BDC -	.4byte sub_8013C9C -	.4byte sub_8013C48 -	.4byte sub_8013C9C -	.4byte sub_8013C9C - -gStatusConditionString_PoisonJpn:: @ 81FA69C -	.string "どく$$$$$$" - -gStatusConditionString_SleepJpn:: @ 81FA6A4 -	.string "ねむり$$$$$" - -gStatusConditionString_ParalysisJpn:: @ 81FA6AC -	.string "まひ$$$$$$" - -gStatusConditionString_BurnJpn:: @ 81FA6B4 -	.string "やけど$$$$$" - -gStatusConditionString_IceJpn:: @ 81FA6BC -	.string "こおり$$$$$" - -gStatusConditionString_ConfusionJpn:: @ 81FA6C4 -	.string "こんらん$$$$" - -gStatusConditionString_LoveJpn:: @ 81FA6CC -	.string "メロメロ$$$$" - -	.align 2 -gUnknown_081FA6D4:: @ 81FA6D4 -	.4byte gStatusConditionString_PoisonJpn, BattleText_PoisonStatus -	.4byte gStatusConditionString_SleepJpn, BattleText_Sleep -	.4byte gStatusConditionString_ParalysisJpn, BattleText_Paralysis -	.4byte gStatusConditionString_BurnJpn, BattleText_Burn -	.4byte gStatusConditionString_IceJpn, BattleText_IceStatus -	.4byte gStatusConditionString_ConfusionJpn, BattleText_Confusion -	.4byte gStatusConditionString_LoveJpn, BattleText_Love - -gUnknown_081FA70C:: @ 81FA70C -	.byte 0, 0, 0 -	.byte 3, 5, 0 -	.byte 2, 3, 0 -	.byte 1, 2, 0 -	.byte 1, 1, 0 - -gUnknown_081FA71B:: @ 81FA71B -	.byte 4, 3, 2, 1 - -gUnknown_081FA71F:: @ 81FA71F -	.byte 4, 4, 4, 4 - -	.align 1 -gUnknown_081FA724:: @ 81FA724 -	.2byte   0x2D -	.2byte   0x2E -	.2byte   0x2F -	.2byte   0x30 -	.2byte   0x67 -	.2byte   0xAD -	.2byte   0xFD -	.2byte  0x13F -	.2byte  0x140 -	.2byte  0x130 -	.2byte 0xFFFF - -	.align 2 -gBattleScriptingCommandsTable:: @ 81FA73C -	.4byte atk00_attackcanceler -	.4byte atk01_accuracycheck -	.4byte atk02_attackstring -	.4byte atk03_ppreduce -	.4byte atk04_critcalc -	.4byte atk05_damagecalc1 -	.4byte atk06_typecalc -	.4byte atk07_dmg_adjustment -	.4byte atk08_dmg_adjustment2 -	.4byte atk09_attackanimation -	.4byte atk0A_waitanimation -	.4byte atk0B_healthbarupdate -	.4byte atk0C_datahpupdate -	.4byte atk0D_critmessage -	.4byte atk0E_effectiveness_sound -	.4byte atk0F_resultmessage -	.4byte atk10_printstring -	.4byte atk11_printstring_playeronly -	.4byte atk12_waitmessage -	.4byte atk13_printfromtable -	.4byte atk14_printfromtable_playeronly -	.4byte atk15_seteffectwithchancetarget -	.4byte atk16_seteffectprimary -	.4byte atk17_seteffectsecondary -	.4byte atk18_status_effect_clear -	.4byte atk19_faint_pokemon -	.4byte atk1A_faint_animation -	.4byte atk1B_faint_effects_clear -	.4byte atk1C_jumpifstatus -	.4byte atk1D_jumpifstatus2 -	.4byte atk1E_jumpifability -	.4byte atk1F_jumpifsideaffecting -	.4byte atk20_jumpifstat -	.4byte atk21_jumpifstatus3 -	.4byte atk22_jumpiftype -	.4byte atk23_getexp -	.4byte atk24 -	.4byte atk25_move_values_cleanup -	.4byte atk26_set_multihit -	.4byte atk27_decrement_multihit -	.4byte atk28_goto -	.4byte atk29_jumpifbyte -	.4byte atk2A_jumpifhalfword -	.4byte atk2B_jumpifword -	.4byte atk2C_jumpifarrayequal -	.4byte atk2D_jumpifarraynotequal -	.4byte atk2E_setbyte -	.4byte atk2F_addbyte -	.4byte atk30_subbyte -	.4byte atk31_copyarray -	.4byte atk32_copyarray_withindex -	.4byte atk33_orbyte -	.4byte atk34_orhalfword -	.4byte atk35_orword -	.4byte atk36_bicbyte -	.4byte atk37_bichalfword -	.4byte atk38_bicword -	.4byte atk39_pause -	.4byte atk3A_waitstate -	.4byte atk3B_healthbar_update -	.4byte atk3C_return -	.4byte atk3D_end -	.4byte atk3E_end2 -	.4byte atk3F_end3 -	.4byte atk40_jump_if_move_affected_by_protect -	.4byte atk41_call -	.4byte atk42_jumpiftype2 -	.4byte atk43_jumpifabilitypresent -	.4byte atk44 -	.4byte atk45_playanimation -	.4byte atk46_playanimation2 -	.4byte atk47_setgraphicalstatchangevalues_setgraphicalstatchangevalues_setgraphicalstatchangevalues -	.4byte atk48_playstatchangeanimation -	.4byte sub_80217F8 -	.4byte atk4A_damageflags -	.4byte atk4B_cmd4b -	.4byte atk4C_switch1 -	.4byte sub_80225F0 -	.4byte sub_8022784 -	.4byte sub_8022830 -	.4byte atk50_openpartyscreen -	.4byte sub_802331C -	.4byte sub_8023524 -	.4byte sub_80237CC -	.4byte atk54_802511C -	.4byte sub_8023848 -	.4byte atk56_8025194 -	.4byte atk57_80251C4_flee -	.4byte atk58_cmd58 -	.4byte atk59_8025230 -	.4byte sub_8023AF8 -	.4byte atk5B_80256E0 -	.4byte atk5C_cmd5c -	.4byte sub_8024014 -	.4byte atk5E_8025A70 -	.4byte atk5F_8025B24 -	.4byte atk60_cmd60 -	.4byte atk61_8025BA4 -	.4byte atk62_08025C6C -	.4byte atk63_jumptoattack -	.4byte atk64_statusanimation -	.4byte atk65_8025D90 -	.4byte atk66_8025E38 -	.4byte atk67_8025ECC -	.4byte sub_80246A0 -	.4byte atk69_8025FE0 -	.4byte atk6A_stash_item_for_side -	.4byte sub_80248C0 -	.4byte sub_80248FC -	.4byte sub_8024C4C -	.4byte atk6E_state0_side_becomes_attacker -	.4byte atk6F_8026810 -	.4byte atk70_record_ability_usage_of_side -	.4byte atk71_80268A0 -	.4byte atk72_flee -	.4byte atk73_cmd73 -	.4byte atk74_hp_tresholds_2 -	.4byte atk75_8026A58 -	.4byte sub_8024F40 -	.4byte atk77_setprotect -	.4byte atk78_faintifabilitynotdamp -	.4byte atk79_setuserhptozero -	.4byte sub_80253E8 -	.4byte sub_802548C -	.4byte sub_8025508 -	.4byte sub_80256D0 -	.4byte atk7E_setreflect -	.4byte sub_80257DC -	.4byte atk80_manipulatedamage -	.4byte atk81_setrest -	.4byte atk82_jumpifnotfirstturn -	.4byte sub_8025A34 -	.4byte sub_8025AE0 -	.4byte sub_8025B5C -	.4byte atk86_stockpiletobasedamage -	.4byte sub_8025D00 -	.4byte atk88_negativedamage -	.4byte atk89_statbuffchange -	.4byte atk8A_normalisebuffs -	.4byte atk8B_setbide -	.4byte atk8C_confuseifrepeatingattackends -	.4byte atk8D_setloopcounter -	.4byte sub_8026468 -	.4byte sub_8026590 -	.4byte sub_802688C -	.4byte atk91_givemoney -	.4byte atk92_setlightscreen -	.4byte sub_8026B78 -	.4byte atk94_gethalfcurrentenemyhp -	.4byte sub_8026E94 -	.4byte sub_8026EEC -	.4byte sub_8027064 -	.4byte sub_8027238 -	.4byte sub_8027348 -	.4byte atk9A_setincreasedcriticalchance -	.4byte atk9B_transformdataexecution -	.4byte sub_80275D8 -	.4byte atk9D_copyattack -	.4byte sub_80278B8 -	.4byte sub_8027960 -	.4byte atkA0_psywavedamageeffect -	.4byte atkA1_counterdamagecalculator -	.4byte atkA2_mirrorcoatdamagecalculator -	.4byte atkA3_disablelastusedattack -	.4byte atkA4_setencore -	.4byte sub_8027E4C -	.4byte sub_8027F44 -	.4byte atkA7_setalwayshitflag -	.4byte atkA8_copymovepermanently -	.4byte sub_8028420 -	.4byte sub_8028558 -	.4byte atkAB_802A458 -	.4byte atkAC_remaininghptopower -	.4byte sub_8028668 -	.4byte sub_8028858 -	.4byte sub_8028AD4 -	.4byte sub_8028B70 -	.4byte sub_8028BFC -	.4byte atkB2_setperishsong -	.4byte atkB3_rolloutdamagecalculation -	.4byte atkB4_jumpifconfusedandattackmaxed -	.4byte sub_8028EC8 -	.4byte atkB6_happinesstodamagecalculation -	.4byte atkB7_presentdamagecalculation -	.4byte sub_80290BC -	.4byte atkB9_magnitudedamagecalculation -	.4byte sub_8029270 -	.4byte sub_80293E8 -	.4byte atkBC_maxattackhalvehp -	.4byte atkBD_copyfoestats -	.4byte atkBE_breakfree -	.4byte sub_802964C -	.4byte atkC0_recoverbasedonsunlight -	.4byte sub_8029784 -	.4byte atkC2_selectnexttarget -	.4byte atkC3_setfutureattack -	.4byte atkC4_802B910 -	.4byte atkC5_hidepreattack -	.4byte atkC6_unhidepostattack -	.4byte atkC7_setminimize -	.4byte sub_8029DAC -	.4byte atkC9_jumpifattackandspecialattackcannotfall -	.4byte atkCA_setforcedtarget -	.4byte atkCB_setcharge -	.4byte atkCC_callterrainattack -	.4byte atkCD_cureifburnedparalysedorpoisoned -	.4byte atkCE_settorment -	.4byte atkCF_jumpifnodamage -	.4byte atkD0_settaunt -	.4byte sub_802A170 -	.4byte sub_802A218 -	.4byte sub_802A4B0 -	.4byte atkD4_802C408 -	.4byte sub_802A5FC -	.4byte atkD6_doubledamagedealtifdamaged -	.4byte sub_802A6BC -	.4byte atkD8_setdamagetohealthdifference -	.4byte atkD9_scaledamagebyhealthratio -	.4byte atkDA_abilityswap -	.4byte atkDB_imprisoneffect -	.4byte atkDC_setgrudge -	.4byte atkDD_weightdamagecalculation -	.4byte atkDE_asistattackselect -	.4byte atkDF_setmagiccoat -	.4byte atkE0_setstealstatchange -	.4byte atkE1_802CBE4 -	.4byte sub_802ADD8 -	.4byte atkE3_jumpiffainted -	.4byte sub_802AEB0 -	.4byte sub_802AF68 -	.4byte atkE6_castform_transform -	.4byte atkE7_castform_switch -	.4byte atkE8_settypebasedhalvers -	.4byte sub_802B1C0 -	.4byte atkEA_recycleitem -	.4byte atkEB_settypetoterrain -	.4byte sub_802B3E0 -	.4byte sub_802B4B4 -	.4byte sub_802B51C -	.4byte sub_802B5B8 -	.4byte sub_802B960 -	.4byte sub_802B9E0 -	.4byte sub_802BA90 -	.4byte atkF3_receive_new_pokemon_maybe -	.4byte sub_802BEF0 -	.4byte sub_802BF20 -	.4byte sub_802BF48 -	.4byte sub_802BF54 - -	.align 2 -gAccuracyStageRatios:: @ 81FAB1C -	.byte  33, 100, 0, 0 @ -6 -	.byte  36, 100, 0, 0 @ -5 -	.byte  43, 100, 0, 0 @ -4 -	.byte  50, 100, 0, 0 @ -3 -	.byte  60, 100, 0, 0 @ -2 -	.byte  75, 100, 0, 0 @ -1 -	.byte   1,   1, 0, 0 @  0 -	.byte 133, 100, 0, 0 @ +1 -	.byte 166, 100, 0, 0 @ +2 -	.byte   2,   1, 0, 0 @ +3 -	.byte 233, 100, 0, 0 @ +4 -	.byte 133,  50, 0, 0 @ +5 -	.byte   3,   1, 0, 0 @ +6 - -@ The chance is 1/N for each stage. -	.align 1 -gCriticalHitChance:: @ 81FAB50 -	.2byte 16 @ +0 -	.2byte  8 @ +1 -	.2byte  4 @ +2 -	.2byte  3 @ +3 -	.2byte  2 @ +4 - -	.align 2 -gStatusFlagsForMoveEffects:: @ 81FAB5C -	.4byte 0x00000000 -	.4byte 0x00000007 -	.4byte 0x00000008 -	.4byte 0x00000010 -	.4byte 0x00000020 -	.4byte 0x00000040 -	.4byte 0x00000080 -	.4byte 0x00000007 -	.4byte 0x00000008 -	.4byte 0x00000000 -	.4byte 0x00000070 -	.4byte 0x00000000 -	.4byte 0x00001000 -	.4byte 0x0000E000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00400000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x04000000 -	.4byte 0x08000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000C00 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 -	.4byte 0x00000000 - -	.align 2 -gMoveEffectBS_Ptrs:: @ 81FAC4C -	.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 - -@ unreferenced bit masks -	.byte 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F - -gLevelUpStatBoxStats:: @ 81FACEF -	.byte 0x3A @ HP -	.byte 0x3E @ Sp. Attack -	.byte 0x3B @ Attack -	.byte 0x3F @ Sp. Defense -	.byte 0x3C @ Defense -	.byte 0x3D @ Speed - -	.align 1 -gProtectSuccessRates:: @ 81FACF6 -	.2byte 0xFFFF, 0x7FFF, 0x3FFF, 0x1FFF - -	.align 1 -gUnknown_081FACFE:: @ 81FACFE -	.2byte MOVE_METRONOME -	.2byte MOVE_STRUGGLE -	.2byte MOVE_SKETCH -	.2byte MOVE_MIMIC -	.2byte 0xFFFE -	.2byte MOVE_COUNTER -	.2byte MOVE_MIRROR_COAT -	.2byte MOVE_PROTECT -	.2byte MOVE_DETECT -	.2byte MOVE_ENDURE -	.2byte MOVE_DESTINY_BOND -	.2byte MOVE_SLEEP_TALK -	.2byte MOVE_THIEF -	.2byte MOVE_FOLLOW_ME -	.2byte MOVE_SNATCH -	.2byte MOVE_HELPING_HAND -	.2byte MOVE_COVET -	.2byte MOVE_TRICK -	.2byte MOVE_FOCUS_PUNCH -	.2byte 0xFFFF - -gUnknown_081FAD26:: @ 81FAD26 -	.byte  1, 200 -	.byte  4, 150 -	.byte  9, 100 -	.byte 16,  80 -	.byte 32,  40 -	.byte 48,  20 - -	.align 1 -gNaturePowerMoves:: @ 81FAD32 -	.2byte MOVE_STUN_SPORE -	.2byte MOVE_RAZOR_LEAF -	.2byte MOVE_EARTHQUAKE -	.2byte MOVE_HYDRO_PUMP -	.2byte MOVE_SURF -	.2byte MOVE_BUBBLE_BEAM -	.2byte MOVE_ROCK_SLIDE -	.2byte MOVE_SHADOW_BALL -	.2byte MOVE_SWIFT -	.2byte MOVE_SWIFT - -@ weight-based damage table for Low Kick -@ format: min. weight (hectograms), base power - -	.align 1 -gWeightDamage:: @ 81FAD46 -	.2byte  100,  20 -	.2byte  250,  40 -	.2byte  500,  60 -	.2byte 1000,  80 -	.2byte 2000, 100 -	.2byte   -1,  -1 - -	.align 1 -gPickupItems:: @ 81FAD5E -	.2byte ITEM_SUPER_POTION, 30 -	.2byte ITEM_FULL_HEAL, 40 -	.2byte ITEM_ULTRA_BALL, 50 -	.2byte ITEM_RARE_CANDY, 60 -	.2byte ITEM_FULL_RESTORE, 70 -	.2byte ITEM_REVIVE, 80 -	.2byte ITEM_NUGGET, 90 -	.2byte ITEM_PROTEIN, 95 -	.2byte ITEM_PP_UP, 99 -	.2byte ITEM_KINGS_ROCK, 1 - -gTerrainToType:: @ 81FAD86 -	.byte TYPE_GRASS  @ tall grass -	.byte TYPE_GRASS  @ long grass -	.byte TYPE_GROUND @ sand -	.byte TYPE_WATER  @ underwater -	.byte TYPE_WATER  @ water -	.byte TYPE_WATER  @ pond water -	.byte TYPE_ROCK   @ rock -	.byte TYPE_ROCK   @ cave -	.byte TYPE_NORMAL @ building -	.byte TYPE_NORMAL @ plain - -gBallCatchBonuses:: @ 81FAD90 -	.byte 20 @ Ultra Ball -	.byte 15 @ Great Ball -	.byte 10 @ Poké Ball -	.byte 15 @ Safari Ball - -	.string "ターン$" @ "turn" - -	.align 2 -gPlayerBufferCommands:: @ 81FAD98 -	.4byte PlayerHandleGetAttributes -	.4byte sub_802ECF0 -	.4byte PlayerHandleSetAttributes -	.4byte sub_802F7CC -	.4byte PlayerHandleLoadPokeSprite -	.4byte PlayerHandleSendOutPoke -	.4byte PlayerHandleReturnPokeToBall -	.4byte PlayerHandleTrainerThrow -	.4byte PlayerHandleTrainerSlide -	.4byte PlayerHandleTrainerSlideBack -	.4byte sub_802FE7C -	.4byte sub_802FF60 -	.4byte sub_802FF80 -	.4byte PlayerHandleBallThrow -	.4byte PlayerHandlePuase -	.4byte PlayerHandleMoveAnimation -	.4byte PlayerHandlePrintString -	.4byte PlayerHandlePrintStringPlayerOnly -	.4byte sub_803037C -	.4byte nullsub_42 -	.4byte sub_8030468 -	.4byte PlayerHandleOpenBag -	.4byte sub_8030594 -	.4byte sub_8030674 -	.4byte PlayerHandleHealthBarUpdate -	.4byte PlayerHandleExpBarUpdate -	.4byte PlayerHandleStatusIconUpdate -	.4byte PlayerHandleStatusAnimation -	.4byte PlayerHandleStatusXor -	.4byte sub_803097C -	.4byte PlayerHandleDMATransfer -	.4byte sub_8030A3C -	.4byte sub_8030A6C -	.4byte sub_8030A78 -	.4byte sub_8030A8C -	.4byte sub_8030AA0 -	.4byte sub_8030AB4 -	.4byte sub_8030AC8 -	.4byte sub_8030AE4 -	.4byte sub_8030B1C -	.4byte sub_8030B34 -	.4byte PlayerHandleHitAnimation -	.4byte sub_8030BCC -	.4byte PlayerHandleEffectivenessSound -	.4byte sub_8030C1C -	.4byte PlayerHandleFaintingCry -	.4byte PlayerHandleIntroSlide -	.4byte PlayerHandleTrainerBallThrow -	.4byte sub_8030FAC -	.4byte sub_80310A4 -	.4byte sub_80310F0 -	.4byte PlayerHandleSpriteInvisibility -	.4byte PlayerHandleBattleAnimation -	.4byte PlayerHandleLinkStandbyMsg -	.4byte PlayerHandleResetActionMoveSelection -	.4byte sub_80312A0 -	.4byte nullsub_43 - -gUnknown_081FAE7C:: @ 81FAE7C -	.byte 0, 2, 3, 1 - -gUnknown_081FAE80:: @ 81FAE80 -	.string "{PALETTE 5}{COLOR_HIGHLIGHT_SHADOW WHITE LIGHT_BLUE WHITE2}$" - -gUnknown_081FAE89:: @ 81FAE89 -	.byte  8, 120 -	.byte 88, 120 -	.byte  8, 136 -	.byte 88, 136 - -gUnknown_081FAE91:: @ 81FAE91 -	.byte 144, 120 -	.byte 190, 120 -	.byte 144, 136 -	.byte 190, 136 -	.byte  72,  72 -	.byte  32,  90 -	.byte  80,  80 -	.byte  80,  88 - -	.align 2 -gUnknown_081FAEA4:: @ 81FAEA4 -	obj_tiles gSmokescreenImpactTiles, 0x180, 55019 - -	.align 2 -gUnknown_081FAEAC:: @ 81FAEAC -	obj_pal gSmokescreenImpactPalette, 55019 - -	.align 2 -gOamData_81FAEB4:: @ 81FAEB4 -	.2byte 0x0000 -	.2byte 0x4000 -	.2byte 0x0400 - -	.align 2 -gSpriteAnim_81FAEBC:: @ 81FAEBC -	obj_image_anim_frame 0, 4 -	obj_image_anim_frame 4, 4 -	obj_image_anim_frame 8, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81FAECC:: @ 81FAECC -	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81FAEDC:: @ 81FAEDC -	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP -	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP -	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP -	obj_image_anim_end - -	.align 2 -gSpriteAnim_81FAEEC:: @ 81FAEEC -	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_81FAEFC:: @ 81FAEFC -	.4byte gSpriteAnim_81FAEBC -	.4byte gSpriteAnim_81FAECC -	.4byte gSpriteAnim_81FAEDC -	.4byte gSpriteAnim_81FAEEC - -	.align 2 -gSpriteTemplate_81FAF0C:: @ 81FAF0C -	spr_template 55019, 55019, gOamData_81FAEB4, gSpriteAnimTable_81FAEFC, NULL, gDummySpriteAffineAnimTable, sub_80463CC - -	.align 2 -gUnknown_081FAF24:: @ 81FAF24 -	obj_tiles gEnemyMonShadow_Gfx, 128, 0xD759 - -	.align 2 -gOamData_81FAF2C:: @ 81FAF2C -	.2byte 0x4000 -	.2byte 0x4000 -	.2byte 0x0C00 - -	.align 2 -gSpriteTemplate_81FAF34:: @ 81FAF34 -	spr_template 55129, 55039, gOamData_81FAF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8032978 - -	.align 2 -gUnknown_081FAF4C:: @ 81FAF4C -	.4byte 0x02008000 -	.4byte 0x0200a000 -	.4byte 0x0200c000 -	.4byte 0x0200e000 - -	.align 2 -gOpponentBufferCommands:: @ 81FAF5C -	.4byte OpponentHandleGetAttributes -	.4byte dp01t_01_2_read_pokmon_data_slice -	.4byte OpponentHandleSetAttributes -	.4byte sub_8034744 -	.4byte OpponentHandleLoadPokeSprite -	.4byte OpponentHandleSendOutPoke -	.4byte OpponentHandleReturnPokeToBall -	.4byte OpponentHandleTrainerThrow -	.4byte OpponentHandleTrainerSlide -	.4byte OpponentHandleTrainerSlideBack -	.4byte sub_8035030 -	.4byte sub_80350D4 -	.4byte sub_80350E0 -	.4byte OpponentHandleBallThrow -	.4byte OpponentHandlePause -	.4byte OpponentHandleMoveAnimation -	.4byte OpponentHandlePrintString -	.4byte OpponentHandlePrintStringPlayerOnly -	.4byte sub_803540C -	.4byte sub_803541C -	.4byte sub_8035428 -	.4byte sub_8035590 -	.4byte sub_80355C0 -	.4byte sub_80356C0 -	.4byte OpponentHandleHealthBarUpdate -	.4byte OpponentHandleExpBarUpdate -	.4byte OpponentHandleStatusIconUpdate -	.4byte OpponentHandleStatusAnimation -	.4byte OpponentHandleStatusXor -	.4byte sub_80358B0 -	.4byte OpponentHandleDMATransfer -	.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 OpponentHandleHitAnimation -	.4byte sub_8035A14 -	.4byte OpponentHandleEffectivenessSound -	.4byte sub_8035A64 -	.4byte OpponentHandleFaintingCry -	.4byte dp01t_2E_7_battle_intro -	.4byte sub_8035B04 -	.4byte dp01t_30_7_0803D67C -	.4byte sub_8035E6C -	.4byte sub_8035EB8 -	.4byte OpponentHandleSpriteInvisibility -	.4byte OpponentHandleBattleAnimation -	.4byte OpponentHandleLinkStandbyMsg -	.4byte OpponentHandleResetActionMoveSelection -	.4byte sub_8035FA4 -	.4byte nullsub_46 - -@ unreferenced unknown values -	.byte 0xB0, 0xB0, 0xC8, 0x98, 0x28, 0x28, 0x28, 0x20 - -	.align 2 -gLinkOpponentBufferCommands:: @ 81FB048 -	.4byte LinkOpponentHandleGetAttributes -	.4byte sub_803889C -	.4byte sub_80388A8 -	.4byte sub_8039220 -	.4byte sub_8039294 -	.4byte sub_80393E4 -	.4byte sub_80395B4 -	.4byte sub_80396D0 -	.4byte sub_80398A4 -	.4byte sub_80398B0 -	.4byte sub_803995C -	.4byte sub_8039A00 -	.4byte sub_8039A0C -	.4byte sub_8039A18 -	.4byte sub_8039A24 -	.4byte sub_8039A30 -	.4byte sub_8039CC8 -	.4byte sub_8039D2C -	.4byte sub_8039D38 -	.4byte sub_8039D44 -	.4byte sub_8039D50 -	.4byte sub_8039D5C -	.4byte sub_8039D68 -	.4byte sub_8039D74 -	.4byte sub_8039D80 -	.4byte sub_8039E70 -	.4byte sub_8039E7C -	.4byte sub_8039EF0 -	.4byte sub_8039F58 -	.4byte sub_8039F64 -	.4byte sub_8039F70 -	.4byte sub_8039F7C -	.4byte sub_8039F88 -	.4byte sub_8039F94 -	.4byte sub_8039FA0 -	.4byte sub_8039FAC -	.4byte sub_8039FB8 -	.4byte sub_8039FC4 -	.4byte sub_8039FE0 -	.4byte sub_803A018 -	.4byte sub_803A030 -	.4byte dp01t_29_4_blink -	.4byte sub_803A0C8 -	.4byte sub_803A0D4 -	.4byte sub_803A118 -	.4byte sub_803A148 -	.4byte dp01t_2E_4_battle_intro -	.4byte sub_803A1B8 -	.4byte sub_803A3DC -	.4byte sub_803A520 -	.4byte sub_803A56C -	.4byte sub_803A578 -	.4byte bx_exec_buffer_A_ch0_tbl4 -	.4byte sub_803A640 -	.4byte sub_803A64C -	.4byte sub_803A658 -	.4byte nullsub_48 - -@ 81FB12C -	.include "data/battle_moves.inc" - -	.align 2 -gUnknown_081FC1D0:: @ 81FC1D0 -	.2byte 0x34, 0x10, 0x101 -	.space 2 - -	.2byte -1, -1, -1 -	.space 2 diff --git a/data/field_tasks.s b/data/field_tasks.s deleted file mode 100644 index 122e089e6..000000000 --- a/data/field_tasks.s +++ /dev/null @@ -1,66 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -	.align 2 -gUnknown_08376364:: @ 8376364 -	.4byte DummyPerStepCallback -	.4byte PerStepCallback_8069F64 -	.4byte PerStepCallback_8069AA0 -	.4byte PerStepCallback_8069864 -	.4byte PerStepCallback_8069DD4 -	.4byte EndTruckSequence -	.4byte sub_80BCF1C -	.4byte PerStepCallback_806A07C - -gUnknown_08376384:: @ 8376384 -	.byte   0,  0,0x59,  2,  0,  1,0x61,  2 -	.byte   0, -1,0x59,  2,  0,  0,0x61,  2 -	.byte   0,  0,0x52,  2,  1,  0,0x53,  2 -	.byte  -1,  0,0x52,  2,  0,  0,0x53,  2 - -gUnknown_083763A4:: @ 83763A4 -	.byte   0,  0,0x5A,  2,  0,  1,0x62,  2 -	.byte   0, -1,0x5A,  2,  0,  0,0x62,  2 -	.byte   0,  0,0x54,  2,  1,  0,0x55,  2 -	.byte  -1,  0,0x54,  2,  0,  0,0x55,  2 - -gUnknown_083763C4:: @ 83763C4 -	.byte   0,  0,0x58,  2,  0,  1,0x60,  2 -	.byte   0, -1,0x58,  2,  0,  0,0x60,  2 -	.byte   0,  0,0x50,  2,  1,  0,0x51,  2 -	.byte  -1,  0,0x50,  2,  0,  0,0x51,  2 - -	.align 1 -gUnknown_083763E4:: @ 83763E4 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte 0x4001 -	.2byte 0x4002 -	.2byte 0x4003 -	.2byte 0x4004 -	.2byte      0 -	.2byte      0 -	.2byte 0x4005 -	.2byte 0x4006 -	.2byte 0x4007 -	.2byte      0 -	.2byte      0 -	.2byte 0x4008 -	.2byte 0x4009 -	.2byte 0x400A -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 -	.2byte      0 - -	.align 1 -gUnknown_08376418:: @ 8376418 -	.2byte 0xE8, 0xEB, 0xEA, 0xE9 diff --git a/data/graphics/berries/graphics_table.inc b/data/graphics/berries/graphics_table.inc deleted file mode 100644 index 78af1c48b..000000000 --- a/data/graphics/berries/graphics_table.inc +++ /dev/null @@ -1,45 +0,0 @@ -	.align 2 -gBerryGraphicsTable:: @ 83C1E1C -	.4byte gBerryPic_Cheri,  gBerryPalette_Cheri -	.4byte gBerryPic_Chesto, gBerryPalette_Chesto -	.4byte gBerryPic_Pecha,  gBerryPalette_Pecha -	.4byte gBerryPic_Rawst,  gBerryPalette_Rawst -	.4byte gBerryPic_Aspear, gBerryPalette_Aspear -	.4byte gBerryPic_Leppa,  gBerryPalette_Leppa -	.4byte gBerryPic_Oran,   gBerryPalette_Oran -	.4byte gBerryPic_Persim, gBerryPalette_Persim -	.4byte gBerryPic_Lum,    gBerryPalette_Lum -	.4byte gBerryPic_Sitrus, gBerryPalette_Sitrus -	.4byte gBerryPic_Figy,   gBerryPalette_Figy -	.4byte gBerryPic_Wiki,   gBerryPalette_Wiki -	.4byte gBerryPic_Mago,   gBerryPalette_Mago -	.4byte gBerryPic_Aguav,  gBerryPalette_Aguav -	.4byte gBerryPic_Iapapa, gBerryPalette_Iapapa -	.4byte gBerryPic_Razz,   gBerryPalette_Razz -	.4byte gBerryPic_Bluk,   gBerryPalette_Bluk -	.4byte gBerryPic_Nanab,  gBerryPalette_Nanab -	.4byte gBerryPic_Wepear, gBerryPalette_Wepear -	.4byte gBerryPic_Pinap,  gBerryPalette_Pinap -	.4byte gBerryPic_Pomeg,  gBerryPalette_Pomeg -	.4byte gBerryPic_Kelpsy, gBerryPalette_Kelpsy -	.4byte gBerryPic_Qualot, gBerryPalette_Qualot -	.4byte gBerryPic_Hondew, gBerryPalette_Hondew -	.4byte gBerryPic_Grepa,  gBerryPalette_Grepa -	.4byte gBerryPic_Tamato, gBerryPalette_Tamato -	.4byte gBerryPic_Cornn,  gBerryPalette_Cornn -	.4byte gBerryPic_Magost, gBerryPalette_Magost -	.4byte gBerryPic_Rabuta, gBerryPalette_Rabuta -	.4byte gBerryPic_Nomel,  gBerryPalette_Nomel -	.4byte gBerryPic_Spelon, gBerryPalette_Spelon -	.4byte gBerryPic_Pamtre, gBerryPalette_Pamtre -	.4byte gBerryPic_Watmel, gBerryPalette_Watmel -	.4byte gBerryPic_Durin,  gBerryPalette_Durin -	.4byte gBerryPic_Belue,  gBerryPalette_Belue -	.4byte gBerryPic_Liechi, gBerryPalette_Liechi -	.4byte gBerryPic_Ganlon, gBerryPalette_Ganlon -	.4byte gBerryPic_Salac,  gBerryPalette_Salac -	.4byte gBerryPic_Petaya, gBerryPalette_Petaya -	.4byte gBerryPic_Apicot, gBerryPalette_Apicot -	.4byte gBerryPic_Lansat, gBerryPalette_Lansat -	.4byte gBerryPic_Starf,  gBerryPalette_Starf -	.4byte gBerryPic_Enigma, gBerryPalette_Enigma diff --git a/data/item_menu.s b/data/item_menu.s deleted file mode 100644 index f66961b46..000000000 --- a/data/item_menu.s +++ /dev/null @@ -1,289 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -@ pointer to items, capacity -	.align 2 -gBagPockets:: @ 83C1618 -	.4byte gSaveBlock1 + 0x560, 20 @ Items -	.4byte gSaveBlock1 + 0x600, 16 @ Poké Balls -	.4byte gSaveBlock1 + 0x640, 64 @ TMs & HMs -	.4byte gSaveBlock1 + 0x740, 46 @ Berries -	.4byte gSaveBlock1 + 0x5B0, 20 @ Key Items - -	.align 2 -gUnknown_083C1640:: @ 83C1640 -	.4byte OtherText_Use, sub_80A5B78 -	.4byte OtherText_Toss, sub_80A5F14 -	.4byte gOtherText_CancelNoTerminator, sub_80A5F80 -	.4byte OtherText_Register, sub_80A5FAC -	.4byte OtherText_Use, ItemMenu_UseInBattle -	.4byte gOtherText_CancelNoTerminator, sub_80A7124 -	.4byte OtherText_Give2, ItemMenu_Give -	.4byte OtherText_CheckTag, sub_80A6178 -	.4byte gOtherText_CancelWithTerminator, 0x0 -	.4byte OtherText_Confirm, sub_80A69E0 - -@ 6-byte entries; format of entry is unknown -gUnknown_083C1690:: @ 83C1690 -	.byte 0, 1, 6, 2, 0, 0 -	.byte 6, 1, 8, 2, 0, 0 -	.byte 0, 8, 6, 2, 0, 0 -	.byte 7, 0, 1, 8, 6, 2 -	.byte 0, 8, 3, 2, 0, 0 - -gUnknown_083C16AE:: @ 83C16AE -	.byte 6, 2 -	.byte 6, 2 -	.byte 6, 2 -	.byte 6, 2 -	.byte 2, 0 - -gUnknown_083C16B8:: @ 83C16B8 -	.byte 7, 9, 8, 2 - -	.align 2 -gUnknown_083C16BC:: @ 83C16BC -	.4byte sub_80A59D0 -	.4byte sub_80A599C -	.4byte sub_80A7024 -	.4byte sub_80A70D8 -	.4byte sub_80A6214 -	.4byte sub_80A61EC -	.4byte sub_80A6354 -	.4byte sub_80A631C -	.4byte sub_80A6918 -	.4byte sub_80A68F0 -	.4byte sub_80A59D0 -	.4byte sub_80A69B8 -	.4byte sub_80A6C6C -	.4byte sub_80A6A4C - -	.align 2 -gUnknown_083C16F4:: @ 83C16F4 -	.4byte sub_80A5E60 -	.4byte sub_80A5E90 - -	.align 2 -gUnknown_083C16FC:: @ 83C16FC -	.4byte sub_80A65AC -	.4byte sub_80A6618 - -	.align 1 -gUnknown_083C1704:: @ 83C1704 -	.2byte 0x41EE, 0x7FFF - -gUnknown_083C1708:: @ 83C1708 -	.byte 4, 5 - -gUnknown_083C170A:: @ 83C170A -	.byte 5, 0 - -	.align 2 -gPalette_83C170C:: @ 83C170C -	.incbin "graphics/unknown/83C170C.gbapal" - -	.align 2 -gSpriteImage_83C172C:: @ 83C172C -	.incbin "graphics/unknown_sprites/83C172C.4bpp" - -	.align 2 -	.incbin "graphics/unused/cherry.4bpp" - -	.align 2 -	.incbin "graphics/unused/cherry.gbapal" - -	.align 2 -gOamData_83C1C4C:: @ 83C1C4C -	.2byte 0x0000 -	.2byte 0xC000 -	.2byte 0x7800 - -	.align 2 -gSpriteAnim_83C1C54:: @ 83C1C54 -	obj_image_anim_frame 0, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83C1C5C:: @ 83C1C5C -	obj_image_anim_frame 64, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83C1C64:: @ 83C1C64 -	obj_image_anim_frame 128, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83C1C6C:: @ 83C1C6C -	obj_image_anim_frame 192, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83C1C74:: @ 83C1C74 -	obj_image_anim_frame 256, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83C1C7C:: @ 83C1C7C -	obj_image_anim_frame 320, 4 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_83C1C84:: @ 83C1C84 -	.4byte gSpriteAnim_83C1C54 -	.4byte gSpriteAnim_83C1C5C -	.4byte gSpriteAnim_83C1C6C -	.4byte gSpriteAnim_83C1C74 -	.4byte gSpriteAnim_83C1C7C -	.4byte gSpriteAnim_83C1C64 - -	.align 2 -gSpriteAffineAnim_83C1C9C:: @ 83C1C9C -	obj_rot_scal_anim_frame 0x0, 0x0, -2, 2 -	obj_rot_scal_anim_frame 0x0, 0x0, 2, 4 -	obj_rot_scal_anim_frame 0x0, 0x0, -2, 4 -	obj_rot_scal_anim_frame 0x0, 0x0, 2, 2 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_83C1CC4:: @ 83C1CC4 -	.4byte gSpriteAffineAnim_83C1C9C - -	.align 2 -gUnknown_083C1CC8:: @ 83C1CC8 -	obj_tiles gBagMaleTiles, 0x3000, 30000 - -	.align 2 -gUnknown_083C1CD0:: @ 83C1CD0 -	obj_tiles gBagFemaleTiles, 0x3000, 30000 - -	.align 2 -gUnknown_083C1CD8:: @ 83C1CD8 -	obj_pal gBagPalette, 30000 - -	.align 2 -gSpriteTemplate_83C1CE0:: @ 83C1CE0 -	spr_template 30000, 30000, gOamData_83C1C4C, gSpriteAnimTable_83C1C84, NULL, gSpriteAffineAnimTable_83C1CC4, sub_80A7998 - -	.align 2 -gOamData_83C1CF8:: @ 83C1CF8 -	.2byte 0x0000 -	.2byte 0x4800 -	.2byte 0x8800 - -	.align 2 -gSpriteAffineAnim_83C1D00:: @ 83C1D00 -	obj_rot_scal_anim_frame 0x0, 0x0, 8, 32 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83C1D10:: @ 83C1D10 -	obj_rot_scal_anim_frame 0x0, 0x0, -8, 32 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_83C1D20:: @ 83C1D20 -	.4byte gSpriteAffineAnim_83C1D00 -	.4byte gSpriteAffineAnim_83C1D10 - -	.align 2 -gSpriteImageTable_83C1D28:: @ 83C1D28 -	obj_frame_tiles gSpriteImage_83C172C, 0x80 - -	.align 2 -gUnknown_083C1D30:: @ 83C1D30 -	obj_pal gPalette_83C170C, 8 - -	.align 2 -gSpriteTemplate_83C1D38:: @ 83C1D38 -	spr_template 0xFFFF, 8, gOamData_83C1CF8, gSpriteAnimTable_83C1C84, gSpriteImageTable_83C1D28, gSpriteAffineAnimTable_83C1D20, sub_80A7B28 - -	.align 2 -gOamData_83C1D50:: @ 83C1D50 -	.2byte 0x0000 -	.2byte 0xC000 -	.2byte 0x7400 - -	.align 2 -gOamData_83C1D58:: @ 83C1D58 -	.2byte 0x0300 -	.2byte 0xC000 -	.2byte 0x7000 - -	.align 2 -gSpriteAnim_83C1D60:: @ 83C1D60 -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_83C1D68:: @ 83C1D68 -	.4byte gSpriteAnim_83C1D60 - -	.align 2 -gSpriteImageTable_83C1D6C:: @ 83C1D6C -	obj_frame_tiles 0x02000000, 0x800 - -	.align 2 -gSpriteTemplate_83C1D74:: @ 83C1D74 -	spr_template 0xFFFF, 30020, gOamData_83C1D50, gSpriteAnimTable_83C1D68, gSpriteImageTable_83C1D6C, gDummySpriteAffineAnimTable, sub_80A7DC4 - -	.align 2 -gSpriteAffineAnim_83C1D8C:: @ 83C1D8C -	obj_rot_scal_anim_frame 0xFFFF, 0xFFFF, -3, 96 -	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 -	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, -1, 64 -	obj_rot_scal_anim_frame 0xFFF8, 0x0, 0, 16 -	obj_rot_scal_anim_frame 0x0, 0xFFF8, 0, 16 -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnim_83C1DC4:: @ 83C1DC4 -	obj_rot_scal_anim_frame 0xFFFF, 0xFFFF, 3, 96 -	obj_rot_scal_anim_frame 0x0, 0x0, 0, 16 -	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, 1, 64 -	obj_rot_scal_anim_frame 0xFFF8, 0x0, 0, 16 -	obj_rot_scal_anim_frame 0x0, 0xFFF8, 0, 16 -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnimTable_83C1DFC:: @ 83C1DFC -	.4byte gSpriteAffineAnim_83C1D8C -	.4byte gSpriteAffineAnim_83C1DC4 - -	.align 2 -gSpriteTemplate_83C1E04:: @ 83C1E04 -	spr_template 0xFFFF, 30020, gOamData_83C1D58, gSpriteAnimTable_83C1D68, gSpriteImageTable_83C1D6C, gSpriteAffineAnimTable_83C1DFC, SpriteCallbackDummy - -@ 83C1E1C -	.include "data/graphics/berries/graphics_table.inc" - -	.align 2 -gUnknown_083C1F74:: @ 83C1F74 -	obj_tiles gBerryCheckCircle_Gfx, 2048, 0x2710 - -	.align 2 -gUnknown_083C1F7C:: @ 83C1F7C -	obj_pal gBerryCheck_Pal, 0x2710 - -	.align 2 -gOamData_83C1F84:: @ 83C1F84 -	.2byte 0x0000 -	.2byte 0x8000 -	.2byte 0x0400 - -	.align 2 -gSpriteAnim_83C1F8C:: @ 83C1F8C -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_83C1F94:: @ 83C1F94 -	.4byte gSpriteAnim_83C1F8C - -	.align 2 -gSpriteTemplate_83C1F98:: @ 83C1F98 -	spr_template 10000, 10000, gOamData_83C1F84, gSpriteAnimTable_83C1F94, NULL, gDummySpriteAffineAnimTable, sub_80A7DC4 diff --git a/data/pokeblock.s b/data/pokeblock.s deleted file mode 100644 index 6d0b1890d..000000000 --- a/data/pokeblock.s +++ /dev/null @@ -1,125 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -gUnknown_083F7E28:: @ 83F7E28 -	.byte  0,  0,  0,  0,  0 -	.byte  1,  0,  0,  0, -1 -	.byte  1,  0, -1,  0,  0 -	.byte  1, -1,  0,  0,  0 -	.byte  1,  0,  0, -1,  0 -	.byte -1,  0,  0,  0,  1 -	.byte  0,  0,  0,  0,  0 -	.byte  0,  0, -1,  0,  1 -	.byte  0, -1,  0,  0,  1 -	.byte  0,  0,  0, -1,  1 -	.byte -1,  0,  1,  0,  0 -	.byte  0,  0,  1,  0, -1 -	.byte  0,  0,  0,  0,  0 -	.byte  0, -1,  1,  0,  0 -	.byte  0,  0,  1, -1,  0 -	.byte -1,  1,  0,  0,  0 -	.byte  0,  1,  0,  0, -1 -	.byte  0,  1, -1,  0,  0 -	.byte  0,  0,  0,  0,  0 -	.byte  0,  1,  0, -1,  0 -	.byte -1,  0,  0,  1,  0 -	.byte  0,  0,  0,  1, -1 -	.byte  0,  0, -1,  1,  0 -	.byte  0, -1,  0,  1,  0 -	.byte  0,  0,  0,  0,  0 - -	.align 2 -gUnknown_083F7EA8:: @ 83F7EA8 -	.4byte sub_80A5B40, c2_exit_to_overworld_2_switch -	.4byte sub_802E424, c2_exit_to_overworld_2_switch - -	.align 2 -gPokeblockNames:: @ 83F7EB8 -	.4byte NULL -	.4byte ContestStatsText_RedPokeBlock -	.4byte ContestStatsText_BluePokeBlock -	.4byte ContestStatsText_PinkPokeBlock -	.4byte ContestStatsText_GreenPokeBlock -	.4byte ContestStatsText_YellowPokeBlock -	.4byte ContestStatsText_PurplePokeBlock -	.4byte ContestStatsText_IndigoPokeBlock -	.4byte ContestStatsText_BrownPokeBlock -	.4byte ContestStatsText_LiteBluePokeBlock -	.4byte ContestStatsText_OlivePokeBlock -	.4byte ContestStatsText_GrayPokeBlock -	.4byte ContestStatsText_BlackPokeBlock -	.4byte ContestStatsText_WhitePokeBlock -	.4byte ContestStatsText_GoldPokeBlock - -	.align 2 -gUnknown_083F7EF4:: @ 83F7EF4 -	.4byte OtherText_Use,     sub_810C508 -	.4byte OtherText_Toss,    sub_810C5C0 -	.4byte gOtherText_CancelNoTerminator, sub_810C748 -	.4byte OtherText_Use,     sub_810C788 -	.4byte OtherText_Use,     sub_810C854 - -gUnknown_083F7F1C:: @ 83F7F1C -	.byte 0, 1, 2 - -gUnknown_083F7F1F:: @ 83F7F1F -	.byte 3, 2 - -gUnknown_083F7F21:: @ 83F7F21 -	.byte 4, 2 - -	.align 2 -gUnknown_083F7F24:: @ 83F7F24 -	.4byte sub_810C610 -	.4byte sub_810C668 - -@ unreferenced -	.byte 0x16, 0x17, 0x18, 0x21, 0x2F - -	.align 2 -gOamData_83F7F34:: @ 83F7F34 -	.2byte 0x0000 -	.2byte 0xC000 -	.2byte 0x0800 - -	.align 2 -gSpriteAnim_83F7F3C:: @ 83F7F3C -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_83F7F44:: @ 83F7F44 -	.4byte gSpriteAnim_83F7F3C - -	.align 2 -gSpriteAffineAnim_83F7F48:: @ 83F7F48 -	obj_rot_scal_anim_frame 0x0, 0x0, -2, 2 -	obj_rot_scal_anim_frame 0x0, 0x0, 2, 4 -	obj_rot_scal_anim_frame 0x0, 0x0, -2, 4 -	obj_rot_scal_anim_frame 0x0, 0x0, 2, 2 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_83F7F70:: @ 83F7F70 -	.4byte gSpriteAffineAnim_83F7F48 - -	.align 2 -gUnknown_083F7F74:: @ 83F7F74 -	obj_tiles gMenuPokeblockDevice_Gfx, 2048, 0x39d0 - -	.align 2 -gUnknown_083F7F7C:: @ 83F7F7C -	obj_pal gMenuPokeblockDevice_Pal, 0x39d0 - -	.align 2 -gSpriteTemplate_83F7F84:: @ 83F7F84 -	spr_template 14800, 14800, gOamData_83F7F34, gSpriteAnimTable_83F7F44, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_083F7F9C:: @ 83F7F9C -	.byte  1, 20,  0,  0,  0,  0, 20,  0 -	.byte  2,  0, 20,  0,  0,  0, 20,  0 -	.byte  3,  0,  0, 20,  0,  0, 20,  0 -	.byte  4,  0,  0,  0, 20,  0, 20,  0 -	.byte  5,  0,  0,  0,  0, 20, 20,  0 diff --git a/data/rotating_gate.s b/data/rotating_gate.s deleted file mode 100644 index 06cc64e51..000000000 --- a/data/rotating_gate.s +++ /dev/null @@ -1,311 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -	.align 2 -gUnknown_083D2964:: @ 83D2964 -	.byte 12,  0,  5,  0,  3,  0,  0,  0 -	.byte 14,  0,  7,  0,  3,  3,  0,  0 -	.byte 16,  0,  4,  0,  5,  1,  0,  0 -	.byte 15,  0, 14,  0,  1,  0,  0,  0 -	.byte 18,  0, 13,  0,  4,  2,  0,  0 -	.byte  8,  0, 20,  0,  4,  2,  0,  0 -	.byte 16,  0, 20,  0,  7,  1,  0,  0 - -	.align 2 -gUnknown_083D299C:: @ 83D299C -	.byte 13,  0,  3,  0,  4,  3,  0,  0 -	.byte 12,  0,  6,  0,  4,  2,  0,  0 -	.byte  3,  0,  6,  0,  4,  2,  0,  0 -	.byte  3,  0,  9,  0,  5,  3,  0,  0 -	.byte  8,  0,  8,  0,  0,  1,  0,  0 -	.byte  2,  0, 12,  0,  6,  2,  0,  0 -	.byte  9,  0, 13,  0,  1,  0,  0,  0 -	.byte  3,  0, 14,  0,  2,  1,  0,  0 -	.byte  9,  0, 15,  0,  3,  2,  0,  0 -	.byte  3,  0, 18,  0,  5,  2,  0,  0 -	.byte  2,  0, 19,  0,  4,  0,  0,  0 -	.byte  5,  0, 21,  0,  0,  0,  0,  0 -	.byte  9,  0, 19,  0,  3,  3,  0,  0 -	.byte 12,  0, 20,  0,  4,  1,  0,  0 - -	.align 2 -RotatingGateTiles_1: @ 83D2A0C -	.incbin "graphics/rotating_gates/1.4bpp" - -	.align 2 -RotatingGateTiles_2: @ 83D320C -	.incbin "graphics/rotating_gates/2.4bpp" - -	.align 2 -RotatingGateTiles_3: @ 83D3A0C -	.incbin "graphics/rotating_gates/3.4bpp" - -	.align 2 -RotatingGateTiles_5: @ 83D420C -	.incbin "graphics/rotating_gates/5.4bpp" - -	.align 2 -RotatingGateTiles_6: @ 83D4A0C -	.incbin "graphics/rotating_gates/6.4bpp" - -	.align 2 -RotatingGateTiles_7: @ 83D520C -	.incbin "graphics/rotating_gates/7.4bpp" - -	.align 2 -RotatingGateTiles_0: @ 83D5A0C -	.incbin "graphics/rotating_gates/0.4bpp" - -	.align 2 -RotatingGateTiles_4: @ 83D5C0C -	.incbin "graphics/rotating_gates/4.4bpp" - -	.align 2 -gOamData_83D5E0C:: @ 83D5E0C -	.2byte 0x0100 -	.2byte 0xC000 -	.2byte 0x5800 - -	.align 2 -gOamData_83D5E14:: @ 83D5E14 -	.2byte 0x0100 -	.2byte 0x8000 -	.2byte 0x5800 - -	.align 2 -gRotatingGatesGraphicsTable:: @ 83D5E1C -	obj_tiles RotatingGateTiles_0, 0x200, 0x1300 -	obj_tiles RotatingGateTiles_1, 0x800, 0x1301 -	obj_tiles RotatingGateTiles_2, 0x800, 0x1302 -	obj_tiles RotatingGateTiles_3, 0x800, 0x1303 -	obj_tiles RotatingGateTiles_4, 0x200, 0x1304 -	obj_tiles RotatingGateTiles_5, 0x800, 0x1305 -	obj_tiles RotatingGateTiles_6, 0x800, 0x1306 -	obj_tiles RotatingGateTiles_7, 0x800, 0x1307 -	null_obj_tiles - -	.align 2 -gSpriteAnim_83D5E64:: @ 83D5E64 -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_83D5E6C:: @ 83D5E6C -	obj_image_anim_frame 0, 0 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_83D5E74:: @ 83D5E74 -	.4byte gSpriteAnim_83D5E64 - -	.align 2 -gSpriteAnimTable_83D5E78:: @ 83D5E78 -	.4byte gSpriteAnim_83D5E6C - -	.align 2 -gSpriteAffineAnim_83D5E7C:: @ 83D5E7C -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnim_83D5E8C:: @ 83D5E8C -	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnim_83D5E9C:: @ 83D5E9C -	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnim_83D5EAC:: @ 83D5EAC -	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0 -	obj_rot_scal_anim_jump 0 - -	.align 2 -gSpriteAffineAnim_83D5EBC:: @ 83D5EBC -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5ED4:: @ 83D5ED4 -	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5EEC:: @ 83D5EEC -	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F04:: @ 83D5F04 -	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F1C:: @ 83D5F1C -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F34:: @ 83D5F34 -	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F4C:: @ 83D5F4C -	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F64:: @ 83D5F64 -	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 4, 16 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F7C:: @ 83D5F7C -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5F94:: @ 83D5F94 -	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5FAC:: @ 83D5FAC -	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5FC4:: @ 83D5FC4 -	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, -8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5FDC:: @ 83D5FDC -	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D5FF4:: @ 83D5FF4 -	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D600C:: @ 83D600C -	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnim_83D6024:: @ 83D6024 -	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0 -	obj_rot_scal_anim_frame 0x0, 0x0, 8, 8 -	obj_rot_scal_anim_end - -	.align 2 -gSpriteAffineAnimTable_83D603C:: @ 83D603C -	.4byte gSpriteAffineAnim_83D5E7C -	.4byte gSpriteAffineAnim_83D5E8C -	.4byte gSpriteAffineAnim_83D5E9C -	.4byte gSpriteAffineAnim_83D5EAC -	.4byte gSpriteAffineAnim_83D5F1C -	.4byte gSpriteAffineAnim_83D5F64 -	.4byte gSpriteAffineAnim_83D5F4C -	.4byte gSpriteAffineAnim_83D5F34 -	.4byte gSpriteAffineAnim_83D5EBC -	.4byte gSpriteAffineAnim_83D5ED4 -	.4byte gSpriteAffineAnim_83D5EEC -	.4byte gSpriteAffineAnim_83D5F04 -	.4byte gSpriteAffineAnim_83D5FDC -	.4byte gSpriteAffineAnim_83D6024 -	.4byte gSpriteAffineAnim_83D600C -	.4byte gSpriteAffineAnim_83D5FF4 -	.4byte gSpriteAffineAnim_83D5F7C -	.4byte gSpriteAffineAnim_83D5F94 -	.4byte gSpriteAffineAnim_83D5FAC -	.4byte gSpriteAffineAnim_83D5FC4 - -	.align 2 -gSpriteTemplate_83D608C:: @ 83D608C -	spr_template 4864, 0xFFFF, gOamData_83D5E0C, gSpriteAnimTable_83D5E74, NULL, gSpriteAffineAnimTable_83D603C, sub_80C7C94 - -	.align 2 -gSpriteTemplate_83D60A4:: @ 83D60A4 -	spr_template 4864, 0xFFFF, gOamData_83D5E14, gSpriteAnimTable_83D5E78, NULL, gSpriteAffineAnimTable_83D603C, sub_80C7C94 - -gUnknown_083D60BC:: @ 83D60BC -	.byte 255, 255, 255, 255 -	.byte  39,  38,  18,  19 -	.byte 255, 255, 255, 255 -	.byte 255, 255, 255, 255 - -gUnknown_083D60CC:: @ 83D60CC -	.byte 255, 255, 255, 255 -	.byte 255, 255, 255, 255 -	.byte  23,  22,  34,  35 -	.byte 255, 255, 255, 255 - -gUnknown_083D60DC:: @ 83D60DC -	.byte 255,  17, 255, 255 -	.byte 255,  16, 255, 255 -	.byte 255,  36, 255, 255 -	.byte 255,  37, 255, 255 - -gUnknown_083D60EC:: @ 83D60EC -	.byte 255, 255,  33, 255 -	.byte 255, 255,  32, 255 -	.byte 255, 255,  20, 255 -	.byte 255, 255,  21, 255 - -gUnknown_083D60FC:: @ 83D60FC -	.byte  0, -1, 0, 0 -	.byte  1, -2, 0, 0 -	.byte  0,  0, 0, 0 -	.byte  1,  0, 0, 0 -	.byte -1,  0, 0, 0 -	.byte -1,  1, 0, 0 -	.byte -1, -1, 0, 0 -	.byte -2, -1, 0, 0 - -gUnknown_083D611C:: @ 83D611C -	.byte -1, -1, 0, 0 -	.byte -1, -2, 0, 0 -	.byte  0, -1, 0, 0 -	.byte  1, -1, 0, 0 -	.byte  0,  0, 0, 0 -	.byte  0,  1, 0, 0 -	.byte -1,  0, 0, 0 -	.byte -2,  0, 0, 0 - -	.align 2 -gUnknown_083D613C:: @ 83D613C -	.byte  1, 0, 1, 0, 0, 0, 0, 0 -	.byte  1, 1, 1, 0, 0, 0, 0, 0 -	.byte  1, 0, 1, 1, 0, 0, 0, 0 -	.byte  1, 1, 1, 1, 0, 0, 0, 0 -	.byte  1, 0, 1, 0, 1, 0, 0, 0 -	.byte  1, 1, 1, 0, 1, 0, 0, 0 -	.byte  1, 0, 1, 1, 1, 0, 0, 0 -	.byte  1, 0, 1, 0, 1, 1, 0, 0 -	.byte  1, 1, 1, 1, 1, 0, 0, 0 -	.byte  1, 1, 1, 0, 1, 1, 0, 0 -	.byte  1, 0, 1, 1, 1, 1, 0, 0 -	.byte  1, 1, 1, 1, 1, 1, 0, 0 diff --git a/data/sound_check_menu.s b/data/sound_check_menu.s deleted file mode 100644 index a91f55d04..000000000 --- a/data/sound_check_menu.s +++ /dev/null @@ -1,121 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -	.align 2 @ object file boundary? - -gDebugText_SoundCheckJap:: @ 83D02C8 -	.string "サウンドチェック$" @ Sound Check - -gDebugText_BGM:: @ 83D02D1 -	.string "BGM$" - -gDebugText_SE:: @ 83D02D5 -	.string "SE $" - -gUnknown_083D02D9:: @ 83D02D9 -	.string "A‥さいせい B‥おわり$" - -gDebugText_UpDown:: @ 83D02E6 -	.string "L‥UP R‥DOWN$" - -gDebugText_DriverTest:: @ 83D02F2 -	.string "R‥DRIVER-TEST$" - -gUnknown_083D0300:: @ 83D0300 -	.byte  1,  1 -	.byte  1,  3 -	.byte  1,  5 -	.byte  1,  7 -	.byte  1,  9 -	.byte  1, 11 -	.byte  1, 13 -	.byte  1, 15 -	.byte  1, 17 - -gUnknown_083D0312:: @ 83D0312 -	.string "Bぼたんで もどる$" - -gUnknown_083D031C:: @ 83D031C -	.string "Aぼたんで さいせい$" - -gDebugText_Voice:: @ 83D0327 -	.string "VOICE‥‥‥‥$" - -gDebugText_Volume:: @ 83D0331 -	.string "VOLUME‥‥‥$" - -gDebugText_Panpot:: @ 83D033B -	.string "PANPOT‥‥‥$" - -gDebugText_Pitch:: @ 83D0345 -	.string "PITCH‥‥‥‥$" - -gDebugText_Length:: @ 83D034F -	.string "LENGTH‥‥‥$" - -gDebugText_Release:: @ 83D0359 -	.string "RELEASE‥‥$" - -gDebugText_Progress:: @ 83D0363 -	.string "PROGRESS‥$" - -gDebugText_Chorus:: @ 83D036D -	.string "CHORUS‥‥‥$" - -gDebugText_Priority:: @ 83D0377 -	.string "PRIORITY‥$" - -gUnknown_083D0381:: @ 83D0381 -	.string "さいせいちゆう‥$" @ 再生中 (playing) - -gUnknown_083D038A:: @ 83D038A -	.string "はんてん‥‥‥‥$" @ 反転 (reverse) - -gUnknown_083D0393:: @ 83D0393 -	.string "すてれお‥‥‥‥$" @ stereo - -	.align 2 -gUnknown_083D039C:: @ 83D039C -	.4byte    0,   387 -	.4byte    0,   127 -	.4byte -127,   127 -	.4byte -128, 32639 -	.4byte    0, 65535 -	.4byte    0,   255 -	.4byte    0, 65535 -	.4byte  -64,    63 - -gUnknown_083D03DC:: @ 83D03DC -	.string "▶$" - -gUnknown_083D03DE:: @ 83D03DE -	.string " $" - -	.align 2 -gUnknown_083D03E0:: @ 83D03E0 -	.4byte      1 -	.4byte     10 -	.4byte    100 -	.4byte   1000 -	.4byte  10000 -	.4byte 100000 - -gUnknown_083D03F8:: @ 83D03F8 -	.byte 0x3F, 0x00, 0xC0, 0x7F, 0x80 @ stereo panning - -gOtherText_SE:: @ 83D03FD -	.string "SE$" - -gOtherText_Pan:: @ 83D0400 -	.string "PAN$" - -gOtherText_LR:: @ 83D0404 -	.string "  LR$" - -gOtherText_RL:: @ 83D0409 -	.string "  RL$" - -@ 83D040E -	.include "data/text/song_names.inc" diff --git a/data/text/song_names.inc b/data/text/song_names.inc deleted file mode 100644 index 29fad36e1..000000000 --- a/data/text/song_names.inc +++ /dev/null @@ -1,1105 +0,0 @@ -BGMName_STOP: -	.string "STOP$" -BGMName_TETSUJI: -	.string "TETSUJI$" -BGMName_FIELD13: -	.string "FIELD13$" -BGMName_KACHI22: -	.string "KACHI22$" -BGMName_KACHI2: -	.string "KACHI2$" -BGMName_KACHI3: -	.string "KACHI3$" -BGMName_KACHI5: -	.string "KACHI5$" -BGMName_PCC: -	.string "PCC$" -BGMName_NIBI: -	.string "NIBI$" -BGMName_SUIKUN: -	.string "SUIKUN$" -BGMName_DOORO1: -	.string "DOORO1$" -BGMName_DOORO_X1: -	.string "DOORO-X1$" -BGMName_DOORO_X3: -	.string "DOORO-X3$" -BGMName_MACHI_S2: -	.string "MACHI-S2$" -BGMName_MACHI_S4: -	.string "MACHI-S4$" -BGMName_GIM: -	.string "GIM$" -BGMName_NAMINORI: -	.string "NAMINORI$" -BGMName_DAN01: -	.string "DAN01$" -BGMName_FANFA1: -	.string "FANFA1$" -BGMName_ME_ASA: -	.string "ME-ASA$" -BGMName_ME_BACHI: -	.string "ME-BACHI$" -BGMName_FANFA4: -	.string "FANFA4$" -BGMName_FANFA5: -	.string "FANFA5$" -BGMName_ME_WAZA: -	.string "ME-WAZA$" -BGMName_BIJYUTU: -	.string "BIJYUTU$" -BGMName_DOORO_X4: -	.string "DOORO-X4$" -BGMName_FUNE_KAN: -	.string "FUNE-KAN$" -BGMName_ME_SHINKA: -	.string "ME-SHINKA$" -BGMName_SHINKA: -	.string "SHINKA$" -BGMName_ME_WASURE: -	.string "ME-WASURE$" -BGMName_SYOUJOEYE: -	.string "SYOUJOEYE$" -BGMName_BOYEYE: -	.string "BOYEYE$" -BGMName_DAN02: -	.string "DAN02$" -BGMName_MACHI_S3: -	.string "MACHI-S3$" -BGMName_ODAMAKI: -	.string "ODAMAKI$" -BGMName_B_TOWER: -	.string "B-TOWER$" -BGMName_SWIMEYE: -	.string "SWIMEYE$" -BGMName_DAN03: -	.string "DAN03$" -BGMName_ME_KINOMI: -	.string "ME-KINOMI$" -BGMName_ME_TAMA: -	.string "ME-TAMA$" -BGMName_ME_B_BIG: -	.string "ME-B-BIG$" -BGMName_ME_B_SMALL: -	.string "ME-B-SMALL$" -BGMName_ME_ZANNEN: -	.string "ME-ZANNEN$" -BGMName_BD_TIME: -	.string "BD-TIME$" -BGMName_TEST1: -	.string "TEST1$" -BGMName_TEST2: -	.string "TEST2$" -BGMName_TEST3: -	.string "TEST3$" -BGMName_TEST4: -	.string "TEST4$" -BGMName_TEST: -	.string "TEST$" -BGMName_GOMACHI0: -	.string "GOMACHI0$" -BGMName_GOTOWN: -	.string "GOTOWN$" -BGMName_POKECEN: -	.string "POKECEN$" -BGMName_NEXTROAD: -	.string "NEXTROAD$" -BGMName_GRANROAD: -	.string "GRANROAD$" -BGMName_CYCLING: -	.string "CYCLING$" -BGMName_FRIENDLY: -	.string "FRIENDLY$" -BGMName_MISHIRO: -	.string "MISHIRO$" -BGMName_TOZAN: -	.string "TOZAN$" -BGMName_GIRLEYE: -	.string "GIRLEYE$" -BGMName_MINAMO: -	.string "MINAMO$" -BGMName_ASHROAD: -	.string "ASHROAD$" -BGMName_EVENT0: -	.string "EVENT0$" -BGMName_DEEPDEEP: -	.string "DEEPDEEP$" -BGMName_KACHI1: -	.string "KACHI1$" -BGMName_TITLE3: -	.string "TITLE3$" -BGMName_DEMO1: -	.string "DEMO1$" -BGMName_GIRL_SUP: -	.string "GIRL-SUP$" -BGMName_HAGESHII: -	.string "HAGESHII$" -BGMName_KAKKOII: -	.string "KAKKOII$" -BGMName_KAZANBAI: -	.string "KAZANBAI$" -BGMName_AQA_0: -	.string "AQA-0$" -BGMName_TSURETEK: -	.string "TSURETEK$" -BGMName_BOY_SUP: -	.string "BOY-SUP$" -BGMName_RAINBOW: -	.string "RAINBOW$" -BGMName_AYASII: -	.string "AYASII$" -BGMName_KACHI4: -	.string "KACHI4$" -BGMName_ROPEWAY: -	.string "ROPEWAY$" -BGMName_CASINO: -	.string "CASINO$" -BGMName_HIGHTOWN: -	.string "HIGHTOWN$" -BGMName_SAFARI: -	.string "SAFARI$" -BGMName_C_ROAD: -	.string "C-ROAD$" -BGMName_AJITO: -	.string "AJITO$" -BGMName_M_BOAT: -	.string "M-BOAT$" -BGMName_M_DUNGON: -	.string "M-DUNGON$" -BGMName_FINECITY: -	.string "FINECITY$" -BGMName_MACHUPI: -	.string "MACHUPI$" -BGMName_P_SCHOOL: -	.string "P-SCHOOL$" -BGMName_DENDOU: -	.string "DENDOU$" -BGMName_TONEKUSA: -	.string "TONEKUSA$" -BGMName_MABOROSI: -	.string "MABOROSI$" -BGMName_CON_FAN: -	.string "CON-FAN$" -BGMName_CONTEST0: -	.string "CONTEST0$" -BGMName_MGM0: -	.string "MGM0$" -BGMName_T_BATTLE: -	.string "T-BATTLE$" -BGMName_OOAME: -	.string "OOAME$" -BGMName_HIDERI: -	.string "HIDERI$" -BGMName_RUNECITY: -	.string "RUNECITY$" -BGMName_CON_K: -	.string "CON-K$" -BGMName_EIKOU_R: -	.string "EIKOU-R$" -BGMName_KARAKURI: -	.string "KARAKURI$" -BGMName_HUTAGO: -	.string "HUTAGO$" -BGMName_SITENNOU: -	.string "SITENNOU$" -BGMName_YAMA_EYE: -	.string "YAMA-EYE$" -BGMName_CONLOBBY: -	.string "CONLOBBY$" -BGMName_INTER_V: -	.string "INTER-V$" -BGMName_DAIGO: -	.string "DAIGO$" -BGMName_THANKFOR: -	.string "THANKFOR$" -BGMName_END: -	.string "END$" -BGMName_BATTLE27: -	.string "BATTLE27$" -BGMName_BATTLE31: -	.string "BATTLE31$" -BGMName_BATTLE20: -	.string "BATTLE20$" -BGMName_BATTLE32: -	.string "BATTLE32$" -BGMName_BATTLE33: -	.string "BATTLE33$" -BGMName_BATTLE36: -	.string "BATTLE36$" -BGMName_BATTLE34: -	.string "BATTLE34$" -BGMName_BATTLE35: -	.string "BATTLE35$" -BGMName_BATTLE38: -	.string "BATTLE38$" -BGMName_BATTLE30: -	.string "BATTLE30$" - -	.align 2 -gBGMNames:: @ 83D07AC -	.word BGMName_STOP -	.word BGMName_TETSUJI -	.word BGMName_FIELD13 -	.word BGMName_KACHI22 -	.word BGMName_KACHI2 -	.word BGMName_KACHI3 -	.word BGMName_KACHI5 -	.word BGMName_PCC -	.word BGMName_NIBI -	.word BGMName_SUIKUN -	.word BGMName_DOORO1 -	.word BGMName_DOORO_X1 -	.word BGMName_DOORO_X3 -	.word BGMName_MACHI_S2 -	.word BGMName_MACHI_S4 -	.word BGMName_GIM -	.word BGMName_NAMINORI -	.word BGMName_DAN01 -	.word BGMName_FANFA1 -	.word BGMName_ME_ASA -	.word BGMName_ME_BACHI -	.word BGMName_FANFA4 -	.word BGMName_FANFA5 -	.word BGMName_ME_WAZA -	.word BGMName_BIJYUTU -	.word BGMName_DOORO_X4 -	.word BGMName_FUNE_KAN -	.word BGMName_ME_SHINKA -	.word BGMName_SHINKA -	.word BGMName_ME_WASURE -	.word BGMName_SYOUJOEYE -	.word BGMName_BOYEYE -	.word BGMName_DAN02 -	.word BGMName_MACHI_S3 -	.word BGMName_ODAMAKI -	.word BGMName_B_TOWER -	.word BGMName_SWIMEYE -	.word BGMName_DAN03 -	.word BGMName_ME_KINOMI -	.word BGMName_ME_TAMA -	.word BGMName_ME_B_BIG -	.word BGMName_ME_B_SMALL -	.word BGMName_ME_ZANNEN -	.word BGMName_BD_TIME -	.word BGMName_TEST1 -	.word BGMName_TEST2 -	.word BGMName_TEST3 -	.word BGMName_TEST4 -	.word BGMName_TEST -	.word BGMName_GOMACHI0 -	.word BGMName_GOTOWN -	.word BGMName_POKECEN -	.word BGMName_NEXTROAD -	.word BGMName_GRANROAD -	.word BGMName_CYCLING -	.word BGMName_FRIENDLY -	.word BGMName_MISHIRO -	.word BGMName_TOZAN -	.word BGMName_GIRLEYE -	.word BGMName_MINAMO -	.word BGMName_ASHROAD -	.word BGMName_EVENT0 -	.word BGMName_DEEPDEEP -	.word BGMName_KACHI1 -	.word BGMName_TITLE3 -	.word BGMName_DEMO1 -	.word BGMName_GIRL_SUP -	.word BGMName_HAGESHII -	.word BGMName_KAKKOII -	.word BGMName_KAZANBAI -	.word BGMName_AQA_0 -	.word BGMName_TSURETEK -	.word BGMName_BOY_SUP -	.word BGMName_RAINBOW -	.word BGMName_AYASII -	.word BGMName_KACHI4 -	.word BGMName_ROPEWAY -	.word BGMName_CASINO -	.word BGMName_HIGHTOWN -	.word BGMName_SAFARI -	.word BGMName_C_ROAD -	.word BGMName_AJITO -	.word BGMName_M_BOAT -	.word BGMName_M_DUNGON -	.word BGMName_FINECITY -	.word BGMName_MACHUPI -	.word BGMName_P_SCHOOL -	.word BGMName_DENDOU -	.word BGMName_TONEKUSA -	.word BGMName_MABOROSI -	.word BGMName_CON_FAN -	.word BGMName_CONTEST0 -	.word BGMName_MGM0 -	.word BGMName_T_BATTLE -	.word BGMName_OOAME -	.word BGMName_HIDERI -	.word BGMName_RUNECITY -	.word BGMName_CON_K -	.word BGMName_EIKOU_R -	.word BGMName_KARAKURI -	.word BGMName_HUTAGO -	.word BGMName_SITENNOU -	.word BGMName_YAMA_EYE -	.word BGMName_CONLOBBY -	.word BGMName_INTER_V -	.word BGMName_DAIGO -	.word BGMName_THANKFOR -	.word BGMName_END -	.word BGMName_BATTLE27 -	.word BGMName_BATTLE31 -	.word BGMName_BATTLE20 -	.word BGMName_BATTLE32 -	.word BGMName_BATTLE33 -	.word BGMName_BATTLE36 -	.word BGMName_BATTLE34 -	.word BGMName_BATTLE35 -	.word BGMName_BATTLE38 -	.word BGMName_BATTLE30 - -SEName_STOP: -	.string "STOP$" -SEName_KAIFUKU: -	.string "KAIFUKU$" -SEName_PC_LOGON: -	.string "PC-LOGON$" -SEName_PC_OFF: -	.string "PC-OFF$" -SEName_PC_ON: -	.string "PC-ON$" -SEName_SELECT: -	.string "SELECT$" -SEName_WIN_OPEN: -	.string "WIN-OPEN$" -SEName_WALL_HIT: -	.string "WALL-HIT$" -SEName_DOOR: -	.string "DOOR$" -SEName_KAIDAN: -	.string "KAIDAN$" -SEName_DANSA: -	.string "DANSA$" -SEName_JITENSYA: -	.string "JITENSYA$" -SEName_KOUKA_L: -	.string "KOUKA-L$" -SEName_KOUKA_M: -	.string "KOUKA-M$" -SEName_KOUKA_H: -	.string "KOUKA-H$" -SEName_BOWA2: -	.string "BOWA2$" -SEName_POKE_DEAD: -	.string "POKE-DEAD$" -SEName_NIGERU: -	.string "NIGERU$" -SEName_JIDO_DOA: -	.string "JIDO-DOA$" -SEName_NAMINORI: -	.string "NAMINORI$" -SEName_BAN: -	.string "BAN$" -SEName_PIN: -	.string "PIN$" -SEName_BOO: -	.string "BOO$" -SEName_BOWA: -	.string "BOWA$" -SEName_JYUNI: -	.string "JYUNI$" -SEName_A: -	.string "A$" -SEName_I: -	.string "I$" -SEName_U: -	.string "U$" -SEName_E: -	.string "E$" -SEName_O: -	.string "O$" -SEName_N: -	.string "N$" -SEName_SEIKAI: -	.string "SEIKAI$" -SEName_HAZURE: -	.string "HAZURE$" -SEName_EXP: -	.string "EXP$" -SEName_JITE_PYOKO: -	.string "JITE-PYOKO$" -SEName_MU_PACHI: -	.string "MU-PACHI$" -SEName_TK_KASYA: -	.string "TK-KASYA$" -SEName_FU_ZAKU: -	.string "FU-ZAKU$" -SEName_FU_ZAKU2: -	.string "FU-ZAKU2$" -SEName_FU_ZUZUZU: -	.string "FU-ZUZUZU$" -SEName_RU_GASHIN: -	.string "RU-GASHIN$" -SEName_RU_GASYAN: -	.string "RU-GASYAN$" -SEName_RU_BARI: -	.string "RU-BARI$" -SEName_RU_HYUU: -	.string "RU-HYUU$" -SEName_KI_GASYAN: -	.string "KI-GASYAN$" -SEName_TK_WARPIN: -	.string "TK-WARPIN$" -SEName_TK_WARPOUT: -	.string "TK-WARPOUT$" -SEName_TU_SAA: -	.string "TU-SAA$" -SEName_HI_TURUN: -	.string "HI-TURUN$" -SEName_TRACK_MOVE: -	.string "TRACK-MOVE$" -SEName_TRACK_STOP: -	.string "TRACK-STOP$" -SEName_TRACK_HAIK: -	.string "TRACK-HAIK$" -SEName_TRACK_DOOR: -	.string "TRACK-DOOR$" -SEName_MOTER: -	.string "MOTER$" -SEName_CARD: -	.string "CARD$" -SEName_SAVE: -	.string "SAVE$" -SEName_KON: -	.string "KON$" -SEName_KON2: -	.string "KON2$" -SEName_KON3: -	.string "KON3$" -SEName_KON4: -	.string "KON4$" -SEName_SUIKOMU: -	.string "SUIKOMU$" -SEName_NAGERU: -	.string "NAGERU$" -SEName_TOY_C: -	.string "TOY-C$" -SEName_TOY_D: -	.string "TOY-D$" -SEName_TOY_E: -	.string "TOY-E$" -SEName_TOY_F: -	.string "TOY-F$" -SEName_TOY_G: -	.string "TOY-G$" -SEName_TOY_A: -	.string "TOY-A$" -SEName_TOY_B: -	.string "TOY-B$" -SEName_TOY_C1: -	.string "TOY-C1$" -SEName_MIZU: -	.string "MIZU$" -SEName_HASHI: -	.string "HASHI$" -SEName_DAUGI: -	.string "DAUGI$" -SEName_PINPON: -	.string "PINPON$" -SEName_FUUSEN1: -	.string "FUUSEN1$" -SEName_FUUSEN2: -	.string "FUUSEN2$" -SEName_FUUSEN3: -	.string "FUUSEN3$" -SEName_TOY_KABE: -	.string "TOY-KABE$" -SEName_TOY_DANGO: -	.string "TOY-DANGO$" -SEName_DOKU: -	.string "DOKU$" -SEName_ESUKA: -	.string "ESUKA$" -SEName_T_AME: -	.string "T-AME$" -SEName_T_AME_E: -	.string "T-AME-E$" -SEName_T_OOAME: -	.string "T-OOAME$" -SEName_T_OOAME_E: -	.string "T-OOAME-E$" -SEName_T_KOAME: -	.string "T-KOAME$" -SEName_T_KOAME_E: -	.string "T-KOAME-E$" -SEName_T_KAMI: -	.string "T-KAMI$" -SEName_T_KAMI2: -	.string "T-KAMI2$" -SEName_ELEBETA: -	.string "ELEBETA$" -SEName_HINSI: -	.string "HINSI$" -SEName_EXPMAX: -	.string "EXPMAX$" -SEName_TAMAKORO: -	.string "TAMAKORO$" -SEName_TAMAKORO_E: -	.string "TAMAKORO-E$" -SEName_BASABASA: -	.string "BASABASA$" -SEName_REGI: -	.string "REGI$" -SEName_C_GAJI: -	.string "C-GAJI$" -SEName_C_MAKU_U: -	.string "C-MAKU-U$" -SEName_C_MAKU_D: -	.string "C-MAKU-D$" -SEName_C_PASI: -	.string "C-PASI$" -SEName_C_SYU: -	.string "C-SYU$" -SEName_C_PIKON: -	.string "C-PIKON$" -SEName_REAPOKE: -	.string "REAPOKE$" -SEName_OP_BASYU: -	.string "OP-BASYU$" -SEName_BT_START: -	.string "BT-START$" -SEName_DENDOU: -	.string "DENDOU$" -SEName_JIHANKI: -	.string "JIHANKI$" -SEName_TAMA: -	.string "TAMA$" -SEName_Z_SCROLL: -	.string "Z-SCROLL$" -SEName_Z_PAGE: -	.string "Z-PAGE$" -SEName_PN_ON: -	.string "PN-ON$" -SEName_PN_OFF: -	.string "PN-OFF$" -SEName_Z_SEARCH: -	.string "Z-SEARCH$" -SEName_TAMAGO: -	.string "TAMAGO$" -SEName_TB_START: -	.string "TB-START$" -SEName_TB_KON: -	.string "TB-KON$" -SEName_TB_KARA: -	.string "TB-KARA$" -SEName_BIDORO: -	.string "BIDORO$" -SEName_W085: -	.string "W085$" -SEName_W085B: -	.string "W085B$" -SEName_W231: -	.string "W231$" -SEName_W171: -	.string "W171$" -SEName_W233: -	.string "W233$" -SEName_W233B: -	.string "W233B$" -SEName_W145: -	.string "W145$" -SEName_W145B: -	.string "W145B$" -SEName_W145C: -	.string "W145C$" -SEName_W240: -	.string "W240$" -SEName_W015: -	.string "W015$" -SEName_W081: -	.string "W081$" -SEName_W081B: -	.string "W081B$" -SEName_W088: -	.string "W088$" -SEName_W016: -	.string "W016$" -SEName_W016B: -	.string "W016B$" -SEName_W003: -	.string "W003$" -SEName_W104: -	.string "W104$" -SEName_W013: -	.string "W013$" -SEName_W196: -	.string "W196$" -SEName_W086: -	.string "W086$" -SEName_W004: -	.string "W004$" -SEName_W025: -	.string "W025$" -SEName_W025B: -	.string "W025B$" -SEName_W152: -	.string "W152$" -SEName_W026: -	.string "W026$" -SEName_W172: -	.string "W172$" -SEName_W172B: -	.string "W172B$" -SEName_W053: -	.string "W053$" -SEName_W007: -	.string "W007$" -SEName_W092: -	.string "W092$" -SEName_W221: -	.string "W221$" -SEName_W221B: -	.string "W221B$" -SEName_W052: -	.string "W052$" -SEName_W036: -	.string "W036$" -SEName_W059: -	.string "W059$" -SEName_W059B: -	.string "W059B$" -SEName_W010: -	.string "W010$" -SEName_W011: -	.string "W011$" -SEName_W017: -	.string "W017$" -SEName_W019: -	.string "W019$" -SEName_W028: -	.string "W028$" -SEName_W013B: -	.string "W013B$" -SEName_W044: -	.string "W044$" -SEName_W029: -	.string "W029$" -SEName_W057: -	.string "W057$" -SEName_W056: -	.string "W056$" -SEName_W250: -	.string "W250$" -SEName_W030: -	.string "W030$" -SEName_W039: -	.string "W039$" -SEName_W054: -	.string "W054$" -SEName_W077: -	.string "W077$" -SEName_W020: -	.string "W020$" -SEName_W082: -	.string "W082$" -SEName_W047: -	.string "W047$" -SEName_W195: -	.string "W195$" -SEName_W006: -	.string "W006$" -SEName_W091: -	.string "W091$" -SEName_W146: -	.string "W146$" -SEName_W120: -	.string "W120$" -SEName_W153: -	.string "W153$" -SEName_W071B: -	.string "W071B$" -SEName_W071: -	.string "W071$" -SEName_W103: -	.string "W103$" -SEName_W062: -	.string "W062$" -SEName_W062B: -	.string "W062B$" -SEName_W048: -	.string "W048$" -SEName_W187: -	.string "W187$" -SEName_W118: -	.string "W118$" -SEName_W155: -	.string "W155$" -SEName_W122: -	.string "W122$" -SEName_W060: -	.string "W060$" -SEName_W185: -	.string "W185$" -SEName_W014: -	.string "W014$" -SEName_W043: -	.string "W043$" -SEName_W207: -	.string "W207$" -SEName_W207B: -	.string "W207B$" -SEName_W215: -	.string "W215$" -SEName_W109: -	.string "W109$" -SEName_W173: -	.string "W173$" -SEName_W280: -	.string "W280$" -SEName_W202: -	.string "W202$" -SEName_W060B: -	.string "W060B$" -SEName_W076: -	.string "W076$" -SEName_W080: -	.string "W080$" -SEName_W100: -	.string "W100$" -SEName_W107: -	.string "W107$" -SEName_W166: -	.string "W166$" -SEName_W129: -	.string "W129$" -SEName_W115: -	.string "W115$" -SEName_W112: -	.string "W112$" -SEName_W197: -	.string "W197$" -SEName_W199: -	.string "W199$" -SEName_W236: -	.string "W236$" -SEName_W204: -	.string "W204$" -SEName_W268: -	.string "W268$" -SEName_W070: -	.string "W070$" -SEName_W063: -	.string "W063$" -SEName_W127: -	.string "W127$" -SEName_W179: -	.string "W179$" -SEName_W151: -	.string "W151$" -SEName_W201: -	.string "W201$" -SEName_W161: -	.string "W161$" -SEName_W161B: -	.string "W161B$" -SEName_W227: -	.string "W227$" -SEName_W227B: -	.string "W227B$" -SEName_W226: -	.string "W226$" -SEName_W208: -	.string "W208$" -SEName_W213: -	.string "W213$" -SEName_W213B: -	.string "W213B$" -SEName_W234: -	.string "W234$" -SEName_W260: -	.string "W260$" -SEName_W328: -	.string "W328$" -SEName_W320: -	.string "W320$" -SEName_W255: -	.string "W255$" -SEName_W291: -	.string "W291$" -SEName_W089: -	.string "W089$" -SEName_W239: -	.string "W239$" -SEName_W230: -	.string "W230$" -SEName_W281: -	.string "W281$" -SEName_W327: -	.string "W327$" -SEName_W287: -	.string "W287$" -SEName_W257: -	.string "W257$" -SEName_W253: -	.string "W253$" -SEName_W258: -	.string "W258$" -SEName_W322: -	.string "W322$" -SEName_W298: -	.string "W298$" -SEName_W287B: -	.string "W287B$" -SEName_W114: -	.string "W114$" -SEName_W063B: -	.string "W063B$" - -	.align 2 -gSENames:: @ 83D0F78 -	.word SEName_STOP -	.word SEName_KAIFUKU -	.word SEName_PC_LOGON -	.word SEName_PC_OFF -	.word SEName_PC_ON -	.word SEName_SELECT -	.word SEName_WIN_OPEN -	.word SEName_WALL_HIT -	.word SEName_DOOR -	.word SEName_KAIDAN -	.word SEName_DANSA -	.word SEName_JITENSYA -	.word SEName_KOUKA_L -	.word SEName_KOUKA_M -	.word SEName_KOUKA_H -	.word SEName_BOWA2 -	.word SEName_POKE_DEAD -	.word SEName_NIGERU -	.word SEName_JIDO_DOA -	.word SEName_NAMINORI -	.word SEName_BAN -	.word SEName_PIN -	.word SEName_BOO -	.word SEName_BOWA -	.word SEName_JYUNI -	.word SEName_A -	.word SEName_I -	.word SEName_U -	.word SEName_E -	.word SEName_O -	.word SEName_N -	.word SEName_SEIKAI -	.word SEName_HAZURE -	.word SEName_EXP -	.word SEName_JITE_PYOKO -	.word SEName_MU_PACHI -	.word SEName_TK_KASYA -	.word SEName_FU_ZAKU -	.word SEName_FU_ZAKU2 -	.word SEName_FU_ZUZUZU -	.word SEName_RU_GASHIN -	.word SEName_RU_GASYAN -	.word SEName_RU_BARI -	.word SEName_RU_HYUU -	.word SEName_KI_GASYAN -	.word SEName_TK_WARPIN -	.word SEName_TK_WARPOUT -	.word SEName_TU_SAA -	.word SEName_HI_TURUN -	.word SEName_TRACK_MOVE -	.word SEName_TRACK_STOP -	.word SEName_TRACK_HAIK -	.word SEName_TRACK_DOOR -	.word SEName_MOTER -	.word SEName_CARD -	.word SEName_SAVE -	.word SEName_KON -	.word SEName_KON2 -	.word SEName_KON3 -	.word SEName_KON4 -	.word SEName_SUIKOMU -	.word SEName_NAGERU -	.word SEName_TOY_C -	.word SEName_TOY_D -	.word SEName_TOY_E -	.word SEName_TOY_F -	.word SEName_TOY_G -	.word SEName_TOY_A -	.word SEName_TOY_B -	.word SEName_TOY_C1 -	.word SEName_MIZU -	.word SEName_HASHI -	.word SEName_DAUGI -	.word SEName_PINPON -	.word SEName_FUUSEN1 -	.word SEName_FUUSEN2 -	.word SEName_FUUSEN3 -	.word SEName_TOY_KABE -	.word SEName_TOY_DANGO -	.word SEName_DOKU -	.word SEName_ESUKA -	.word SEName_T_AME -	.word SEName_T_AME_E -	.word SEName_T_OOAME -	.word SEName_T_OOAME_E -	.word SEName_T_KOAME -	.word SEName_T_KOAME_E -	.word SEName_T_KAMI -	.word SEName_T_KAMI2 -	.word SEName_ELEBETA -	.word SEName_HINSI -	.word SEName_EXPMAX -	.word SEName_TAMAKORO -	.word SEName_TAMAKORO_E -	.word SEName_BASABASA -	.word SEName_REGI -	.word SEName_C_GAJI -	.word SEName_C_MAKU_U -	.word SEName_C_MAKU_D -	.word SEName_C_PASI -	.word SEName_C_SYU -	.word SEName_C_PIKON -	.word SEName_REAPOKE -	.word SEName_OP_BASYU -	.word SEName_BT_START -	.word SEName_DENDOU -	.word SEName_JIHANKI -	.word SEName_TAMA -	.word SEName_Z_SCROLL -	.word SEName_Z_PAGE -	.word SEName_PN_ON -	.word SEName_PN_OFF -	.word SEName_Z_SEARCH -	.word SEName_TAMAGO -	.word SEName_TB_START -	.word SEName_TB_KON -	.word SEName_TB_KARA -	.word SEName_BIDORO -	.word SEName_W085 -	.word SEName_W085B -	.word SEName_W231 -	.word SEName_W171 -	.word SEName_W233 -	.word SEName_W233B -	.word SEName_W145 -	.word SEName_W145B -	.word SEName_W145C -	.word SEName_W240 -	.word SEName_W015 -	.word SEName_W081 -	.word SEName_W081B -	.word SEName_W088 -	.word SEName_W016 -	.word SEName_W016B -	.word SEName_W003 -	.word SEName_W104 -	.word SEName_W013 -	.word SEName_W196 -	.word SEName_W086 -	.word SEName_W004 -	.word SEName_W025 -	.word SEName_W025B -	.word SEName_W152 -	.word SEName_W026 -	.word SEName_W172 -	.word SEName_W172B -	.word SEName_W053 -	.word SEName_W007 -	.word SEName_W092 -	.word SEName_W221 -	.word SEName_W221B -	.word SEName_W052 -	.word SEName_W036 -	.word SEName_W059 -	.word SEName_W059B -	.word SEName_W010 -	.word SEName_W011 -	.word SEName_W017 -	.word SEName_W019 -	.word SEName_W028 -	.word SEName_W013B -	.word SEName_W044 -	.word SEName_W029 -	.word SEName_W057 -	.word SEName_W056 -	.word SEName_W250 -	.word SEName_W030 -	.word SEName_W039 -	.word SEName_W054 -	.word SEName_W077 -	.word SEName_W020 -	.word SEName_W082 -	.word SEName_W047 -	.word SEName_W195 -	.word SEName_W006 -	.word SEName_W091 -	.word SEName_W146 -	.word SEName_W120 -	.word SEName_W153 -	.word SEName_W071B -	.word SEName_W071 -	.word SEName_W103 -	.word SEName_W062 -	.word SEName_W062B -	.word SEName_W048 -	.word SEName_W187 -	.word SEName_W118 -	.word SEName_W155 -	.word SEName_W122 -	.word SEName_W060 -	.word SEName_W185 -	.word SEName_W014 -	.word SEName_W043 -	.word SEName_W207 -	.word SEName_W207B -	.word SEName_W215 -	.word SEName_W109 -	.word SEName_W173 -	.word SEName_W280 -	.word SEName_W202 -	.word SEName_W060B -	.word SEName_W076 -	.word SEName_W080 -	.word SEName_W100 -	.word SEName_W107 -	.word SEName_W166 -	.word SEName_W129 -	.word SEName_W115 -	.word SEName_W112 -	.word SEName_W197 -	.word SEName_W199 -	.word SEName_W236 -	.word SEName_W204 -	.word SEName_W268 -	.word SEName_W070 -	.word SEName_W063 -	.word SEName_W127 -	.word SEName_W179 -	.word SEName_W151 -	.word SEName_W201 -	.word SEName_W161 -	.word SEName_W161B -	.word SEName_W227 -	.word SEName_W227B -	.word SEName_W226 -	.word SEName_W208 -	.word SEName_W213 -	.word SEName_W213B -	.word SEName_W234 -	.word SEName_W260 -	.word SEName_W328 -	.word SEName_W320 -	.word SEName_W255 -	.word SEName_W291 -	.word SEName_W089 -	.word SEName_W239 -	.word SEName_W230 -	.word SEName_W281 -	.word SEName_W327 -	.word SEName_W287 -	.word SEName_W257 -	.word SEName_W253 -	.word SEName_W258 -	.word SEName_W322 -	.word SEName_W298 -	.word SEName_W287B -	.word SEName_W114 -	.word SEName_W063B diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s deleted file mode 100644 index 2eabe9ce3..000000000 --- a/data/use_pokeblock.s +++ /dev/null @@ -1,73 +0,0 @@ -	.include "asm/macros.inc" -	.include "constants/constants.inc" - -	.section .rodata - -.ifndef GERMAN -	.align 2 -ConditionUpDownPalette: -	.incbin "graphics/misc/condition_up_down.gbapal" - -	.align 2 -ConditionUpDownTiles: -	.incbin "graphics/misc/condition_up_down.4bpp" -.endif - -gUnknown_08406118:: @ 8406118 -	.4byte 22 @ MON_DATA_COOL -	.4byte 47 @ MON_DATA_TOUGH -	.4byte 33 @ MON_DATA_SMART -	.4byte 24 @ MON_DATA_CUTE -	.4byte 23 @ MON_DATA_BEAUTY - -	.align 2 -gUnknown_0840612C:: @ 840612C -	obj_pal 0x02030400, 0x0001 - -	.align 2 -gUnknown_08406134:: @ 8406134 -	.4byte OtherText_Coolness -	.4byte OtherText_Toughness -	.4byte OtherText_Smartness -	.4byte OtherText_Cuteness -	.4byte OtherText_Beauty - -	.align 2 -gSpriteSheet_ConditionUpDown:: @ 8406148 -	obj_tiles ConditionUpDownTiles, 0x200, 0 - -	.align 2 -gSpritePalette_ConditionUpDown:: @ 8406150 -	obj_pal ConditionUpDownPalette, 0 - -gUnknown_08406158:: @ 8406158 -	.2byte 156, 30 -	.2byte 117, 53 -	.2byte 117, 112 -	.2byte 197, 112 -	.2byte 197, 53 - -	.align 2 -gOamData_840616C:: @ 840616C -	.2byte 0x4000 -	.2byte 0x8000 -	.2byte 0x0400 - -	.align 2 -gSpriteAnim_8406174:: @ 8406174 -	obj_image_anim_frame 0, 5 -	obj_image_anim_end - -	.align 2 -gSpriteAnim_840617C:: @ 840617C -	obj_image_anim_frame 8, 5 -	obj_image_anim_end - -	.align 2 -gSpriteAnimTable_8406184:: @ 8406184 -	.4byte gSpriteAnim_8406174 -	.4byte gSpriteAnim_840617C - -	.align 2 -gSpriteTemplate_840618C:: @ 840618C -	spr_template 0, 0, gOamData_840616C, gSpriteAnimTable_8406184, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy | 
