diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/berry_crush.s | 371 | ||||
| -rw-r--r-- | data/berry_powder.s | 36 | ||||
| -rw-r--r-- | data/data_8479668.s | 12 | ||||
| -rw-r--r-- | data/event_object_movement.s | 52 | ||||
| -rw-r--r-- | data/field_effect_helpers.s | 34 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 8 | ||||
| -rw-r--r-- | data/maps/VermilionCity/scripts.inc | 16 | ||||
| -rw-r--r-- | data/mystery_event_msg.s | 4 | ||||
| -rw-r--r-- | data/strings.s | 48 |
9 files changed, 64 insertions, 517 deletions
diff --git a/data/berry_crush.s b/data/berry_crush.s deleted file mode 100644 index 417347801..000000000 --- a/data/berry_crush.s +++ /dev/null @@ -1,371 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 -gUnknown_846E2E0:: @ 846E2E0 - .byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 - -gUnknown_846E2E8:: @ 846E2E8 - .byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00 - -gUnknown_846E2F0:: @ 846E2F0 - .byte 0x04, 0x01, 0x00, 0xff - .byte 0x00, 0x00, 0x00, 0x04 - .byte 0x02, 0x00, 0xff, 0x00 - .byte 0x00, 0x00, 0x04, 0x02 - .byte 0x00, 0xfe, 0x00, 0x00 - .byte 0x00, 0x06, 0x03, 0x01 - .byte 0xff, 0xfd, 0xff, 0x00 - .byte 0x06, 0x04, 0x01, 0xfe - .byte 0xfc, 0xfe, 0x00, 0x00 - -gUnknown_846E314:: @ 846E314 - .byte 0x03, 0x02, 0x01, 0x00 - .byte 0x03, 0x03, 0x01, 0x00 - .byte 0x03, 0x03, 0x02, 0x00 - .byte 0x03, 0x04, 0x02, 0x00 - .byte 0x03, 0x05, 0x03, 0x00 - -gUnknown_846E328:: @ 846E328 - .4byte gUnknown_841CE3C - .4byte gUnknown_841CE78 - .4byte gUnknown_841CEA8 - .4byte gUnknown_841CF14 - .4byte gUnknown_841CF50 - .4byte gUnknown_841CF70 - .4byte gUnknown_841CFA0 - .4byte gUnknown_841CFD4 - .4byte gUnknown_841D008 - -gUnknown_846E34C:: @ 846E34C - .4byte NULL - .4byte sub_814BBB8 - .4byte sub_814BC10 - .4byte sub_814BC74 - .4byte sub_814BD7C - .4byte sub_814BD9C - .4byte sub_814BDBC - .4byte sub_814BE0C - .4byte sub_814BE64 - .4byte sub_814BE7C - .4byte sub_814BFD0 - .4byte sub_814C118 - .4byte sub_814C24C - .4byte sub_814C850 - .4byte sub_814C8F8 - .4byte sub_814C990 - .4byte sub_814CB20 - .4byte sub_814CC0C - .4byte sub_814CFA8 - .4byte sub_814D094 - .4byte sub_814D188 - .4byte sub_814D240 - .4byte sub_814D31C - .4byte sub_814D3A4 - .4byte sub_814D468 - .4byte sub_814D4C8 - -gUnknown_846E3B4:: @ 846E3B4 - .byte 0x02, 0x04, 0x06, 0x07 - .byte 0x03, 0x05, 0x08, 0x0b - .byte 0x03, 0x07, 0x0b, 0x0f - .byte 0x04, 0x08, 0x0c, 0x11 - -gUnknown_846E3C4:: @ 846E3C4 - .byte 0x05, 0x07, 0x09, 0x0c - -gUnknown_846E3C8:: @ 846E3C8 - .byte 0x03, 0x07, 0x0f, 0x1f - -gUnknown_846E3CC:: @ 846E3CC - .4byte 0x000000f8 - @ { - @ .bg = 0, - @ .charBaseIndex = 2, - @ .mapBaseIndex = 15, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 0, - @ .baseTile = 0x0000 - @ } - .4byte 0x000014d1 - @ { - @ .bg = 1, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 13, - @ .screenSize = 2, - @ .paletteMode = 0, - @ .priority = 1, - @ .baseTile = 0x0000 - @ } - .4byte 0x000020c2 - @ { - @ .bg = 2, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 12, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 2, - @ .baseTile = 0x0000 - @ } - .4byte 0x000030b3 - @ { - @ .bg = 3, - @ .charBaseIndex = 0, - @ .mapBaseIndex = 11, - @ .screenSize = 0, - @ .paletteMode = 0, - @ .priority = 3, - @ .baseTile = 0x0000 - @ } - -gUnknown_846E3DC:: @ 846E3DC - .byte 0x01, 0x02, 0x03 - -gUnknown_846E3DF:: @ 846E3DF - .byte 0x00, 0x01, 0x02 - -gUnknown_846E3E2:: @ 846E3E2 - .byte 0x00, 0x03, 0x04 - -gUnknown_846E3E5:: @ 846E3E5 - .byte 0x01, 0x08, 0x09 - .byte 0x01, 0x06, 0x07 - -gUnknown_846E3EB:: @ 846E3EB - .byte 0x01, 0x04, 0x05 - - .align 2 -gUnknown_846E3F0:: @ 846E3F0 - .byte 0, 3, 4, 24, 13, 15 - .2byte 0x0001 - -gUnknown_846E3F8:: @ 846E3F8 - .byte 0, 0, 0, 9, 2, 8 - .2byte 0x03ed - .byte 0, 0, 3, 9, 2, 8 - .2byte 0x03db - .byte 0, 0, 6, 9, 2, 8 - .2byte 0x03c9 - .byte 0, 21, 3, 9, 2, 8 - .2byte 0x03b7 - .byte 0, 21, 6, 9, 2, 8 - .2byte 0x03a5 - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - .byte 0, 4, 2, 22, 16, 15 - .2byte 0x0001 - .byte 0, 4, 2, 22, 16, 15 - .2byte 0x0001 - .byte 0, 3, 2, 24, 16, 15 - .2byte 0x0001 - .byte 255, 0, 0, 0, 0, 0 - .2byte 0x0000 - -gUnknown_846E448:: @ 846E448 - .byte 0x06, 0x08, 0x09, 0x0b - .byte 0x0c, 0x0e, 0x0f, 0x10 - -gUnknown_846E450:: @ 846E450 - .4byte 50000000, 25000000, 12500000, 6250000, 3125000, 1562500, 781250, 390625 - -gUnknown_846E470:: @ 846E470 gbapal - .incbin "graphics/link_games/unk_846E4D0.gbapal" - -gUnknown_846E490:: @ 846E490 gbapal - .incbin "graphics/link_games/unk_846E7FC.gbapal" - -gUnknown_846E4B0:: @ 846E4B0 gbapal - .incbin "graphics/link_games/unk_846ECC4.gbapal" - -gUnknown_846E4D0:: @ 846E4D0 4bpp.lz - .incbin "graphics/link_games/unk_846E4D0.4bpp.lz" - -gUnknown_846E7FC:: @ 846E7FC 4bpp.lz - .incbin "graphics/link_games/unk_846E7FC.4bpp.lz" - -gUnknown_846EB78:: @ 846EB78 4bpp.lz - .incbin "graphics/link_games/unk_846EB78.4bpp.lz" - -gUnknown_846ECC4:: @ 846ECC4 4bpp.lz - .incbin "graphics/link_games/unk_846ECC4.4bpp.lz" - -gUnknown_846ED90:: @ 846ED90 bin.lz - .incbin "graphics/link_games/unk_846ED90.bin.lz" - -gUnknown_846EEC0:: @ 846EEC0 bin.lz - .incbin "graphics/link_games/unk_846EEC0.bin.lz" - -gUnknown_846F058:: @ 846F058 bin.lz - .incbin "graphics/link_games/unk_846F058.bin.lz" - -gUnknown_846F280:: @ 846F280 - .byte 0x01, 0x03, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x03, 0x00, 0x00 - .byte 0x01, 0x03, 0x02, 0x04, 0x00 - .byte 0x00, 0x01, 0x03, 0x02, 0x04 - -gUnknown_846F294:: @ 846F294 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x03, 0x00, 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00 - .byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00, 0xf8, 0xff, 0x10, 0x00 - .byte 0x03, 0x14, 0x03, 0x00, 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff - .byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00, 0x10, 0x00, 0xf8, 0xff - -gUnknown_846F2D0:: @ 846F2D0 - .byte 0x00, 0x00 - .byte 0xff, 0x00 - .byte 0x01, 0x01 - -gUnknown_846F2D6:: @ 846F2D6 - .byte 0x00, 0x00 - .byte 0xf0, 0xfc - .byte 0x10, 0xfc - .byte 0xf8, 0xfe - .byte 0x08, 0xfe - .byte 0xe8, 0xf8 - .byte 0x18, 0xf8 - .byte 0xe0, 0xf4 - .byte 0x20, 0xf4 - .byte 0xd8, 0xf0 - .byte 0x28, 0xf0 - -gUnknown_846F2EC:: @ 846F2EC - .2byte 5, 6, 7, 8, 9 - - .align 2 -gUnknown_846F2F8:: @ 846F2F8 - obj_tiles gUnknown_846E4D0, 0x0800, 1 - obj_tiles gUnknown_846E7FC, 0x0e00, 2 - obj_tiles gUnknown_846EB78, 0x0700, 3 - obj_tiles gUnknown_846ECC4, 0x02c0, 4 - obj_tiles NULL, 0x0000, 0 - -gUnknown_846F320:: @ 846F320 - obj_pal gUnknown_846E470, 1 - obj_pal gUnknown_846E490, 2 - obj_pal gUnknown_846E4B0, 4 - obj_pal NULL, 0 - -gUnknown_846F340:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_846F348:: - obj_image_anim_frame 0x0000, 4 - obj_image_anim_frame 0x0010, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_end - -gUnknown_846F358:: - obj_image_anim_frame 0x0030, 2 - obj_image_anim_frame 0x0040, 2 - obj_image_anim_frame 0x0050, 2 - obj_image_anim_frame 0x0060, 2 - obj_image_anim_end - -gUnknown_846F36C:: - obj_image_anim_frame 0x0000, 2 - obj_image_anim_frame 0x0004, 2 - obj_image_anim_frame 0x0008, 2 - obj_image_anim_frame 0x000c, 2 - obj_image_anim_frame 0x0010, 2 - obj_image_anim_frame 0x0014, 2 - obj_image_anim_jump 0 - -gUnknown_846F388:: - obj_image_anim_frame 0x0018, 4 - obj_image_anim_frame 0x001c, 4 - obj_image_anim_frame 0x0020, 4 - obj_image_anim_frame 0x0024, 4 - obj_image_anim_frame 0x0028, 4 - obj_image_anim_frame 0x002c, 4 - obj_image_anim_frame 0x0030, 4 - obj_image_anim_frame 0x0034, 4 - obj_image_anim_jump 0 - -gUnknown_846F3AC:: - obj_image_anim_frame 0x0014, 0 - obj_image_anim_end - -gUnknown_846F3B4:: - obj_image_anim_frame 0x0000, 0 - obj_image_anim_end - -gUnknown_846F3BC:: - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 2, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_846F3D4:: - obj_rot_scal_anim_frame 256, 256, 0, 0 - obj_rot_scal_anim_frame 0, 0, 254, 1 - obj_rot_scal_anim_jump 1 - -gUnknown_846F3EC:: - .4byte gUnknown_846F340 - -gUnknown_846F3F0:: - .4byte gUnknown_846F348 - .4byte gUnknown_846F358 - -gUnknown_846F3F8:: - .4byte gUnknown_846F36C - .4byte gUnknown_846F388 - -gUnknown_846F400:: - .4byte gUnknown_846F3AC - -gUnknown_846F404:: - .4byte gUnknown_846F3B4 - -gUnknown_846F408:: - .4byte gUnknown_846F3BC - .4byte gUnknown_846F3D4 - -gUnknown_846F410:: @ 846F410 - spr_template 1, 1, gOamData_AffineOff_ObjNormal_64x64, gUnknown_846F3EC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F428:: @ 846F428 - spr_template 2, 2, gOamData_AffineOff_ObjNormal_32x32, gUnknown_846F3F0, NULL, gDummySpriteAffineAnimTable, sub_814EFD0 - -gUnknown_846F440:: @ 846F440 - spr_template 3, 2, gOamData_AffineOff_ObjNormal_16x16, gUnknown_846F3F8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F458:: @ 846F458 - spr_template 4, 4, gOamData_AffineOff_ObjNormal_8x16, gUnknown_846F400, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - -gUnknown_846F470:: @ 846F470 - spr_template 5, 5, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_846F404, NULL, gUnknown_846F408, SpriteCallbackDummy - -gUnknown_846F488:: @ 846F488 DigitObjUtilTemplate - @ strConvMode, shape, size, priority - .byte 1 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 9 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0x9c, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - @ strConvMode, shape, size, priority - .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0xb4, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - @ strConvMode, shape, size, priority - .byte 0 | (2 /*ST_OAM_V_RECTANGLE*/ << 2) | (0 << 4) | (0 << 6) @ 8 - .byte 2, 8 @ ndigits, width - .align 2 - .2byte 0xcc, 0x00 @ x, y - .4byte gUnknown_846F2F8 + 0x18 @ spriteSheet - .4byte gUnknown_846F320 + 0x10 @ spritePalette - -gUnknown_846F4B8:: @ 846F4B8 - .4byte gUnknown_841D034 - .4byte gUnknown_841D03C - .4byte gUnknown_841D044 - .4byte gUnknown_841D0D4 - .4byte gUnknown_841D0E8 - .4byte gUnknown_841D100 diff --git a/data/berry_powder.s b/data/berry_powder.s deleted file mode 100644 index 0f812d79d..000000000 --- a/data/berry_powder.s +++ /dev/null @@ -1,36 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - - .align 2 -gUnknown_847565C_UnrefDupe:: @ 8471F00 struct BgTemplate(???) - .4byte 0x000001e0 - .4byte 0x000012c9 - .4byte 0x000012ea - .4byte 0x000021ff - .4byte 0x000000ff - .4byte 0x00000000 - - .align 2 -gUnknown_8475674_UnrefDupe:: @ 8471F18 - window_template 0x00, 0x01, 0x01, 0x1c, 0x03, 0x0d, 0x0013 - window_template 0x00, 0x01, 0x06, 0x1c, 0x0d, 0x0d, 0x0067 - - .align 2 -gUnknown_8475684_UnrefDupe:: @ 8471F28 - window_template 0x00, 0x01, 0x06, 0x1c, 0x07, 0x0d, 0x0067 - - .align 2 -gUnknown_847568C_UnrefDupe:: @ 8471F30 - window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013 - window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c - - .align 2 -gUnknown_847569C_UnrefDupe:: @ 8471F40 - window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013 - - .align 2 -gUnknown_84756A4_UnrefDupe:: @ 8471F48 - window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013 diff --git a/data/data_8479668.s b/data/data_8479668.s index 6d8a22898..0ddecfe58 100644 --- a/data/data_8479668.s +++ b/data/data_8479668.s @@ -13,18 +13,6 @@ .section .rodata - .align 2 -gUnknown_8479668:: @ 8479668 - .incbin "graphics/misc/unk_8479688.gbapal" - -gUnknown_8479688:: - .incbin "graphics/misc/unk_8479688.4bpp.lz" - -gUnknown_8479748:: - .incbin "graphics/misc/unk_8479748.4bpp.lz" - - .section .rodata.after_trainer_tower - // berry_fix_program gUnknown_847A8D8:: diff --git a/data/event_object_movement.s b/data/event_object_movement.s index 5920835c4..88aa543b9 100644 --- a/data/event_object_movement.s +++ b/data/event_object_movement.s @@ -2,7 +2,7 @@ .include "constants/constants.inc" .section .rodata .align 2 -gUnknown_835B934:: @ 835B934 +gReflectionEffectPaletteMap:: @ 835B934 .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 gUnknown_835B944:: @ 835B944 @@ -6325,16 +6325,16 @@ gUnknown_83A5374:: @ 83A5374 obj_frame_tiles gUnknown_8398128, 0x400 gUnknown_83A537C:: @ 83A537C - spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_128x64, gUnknown_83A5358, gUnknown_83A535C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A5394:: @ 83A5394 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown1, gUnknown_83A5358, gUnknown_83A5364, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53AC:: @ 83A53AC - spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown2, gUnknown_83A5358, gUnknown_83A536C, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53C4:: @ 83A53C4 - spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, oamc_shadow + spr_template 65535, 65535, gObjectEventBaseOam_Unknown3, gUnknown_83A5358, gUnknown_83A5374, gDummySpriteAffineAnimTable, UpdateShadowFieldEffect gUnknown_83A53DC:: @ 83A53DC overworld_frame gUnknown_839A008, 2, 2, 0 @@ -6355,7 +6355,7 @@ gUnknown_83A541C:: @ 83A541C .4byte gUnknown_83A5404 gUnknown_83A5420:: @ 83A5420 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, unc_grass_normal + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A541C, gUnknown_83A53DC, gDummySpriteAffineAnimTable, UpdateTallGrassFieldEffect gUnknown_83A5438:: @ 83A5438 overworld_frame gUnknown_83986A8, 2, 2, 0 @@ -6379,7 +6379,7 @@ gUnknown_83A5484:: @ 83A5484 .4byte gUnknown_83A5460 gUnknown_83A5488:: @ 83A5488 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5484, gUnknown_83A5438, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A54A0:: @ 83A54A0 overworld_frame gUnknown_8398928, 2, 2, 0 @@ -6400,7 +6400,7 @@ gUnknown_83A54E0:: @ 83A54E0 .4byte gUnknown_83A54C8 gUnknown_83A54E4:: @ 83A54E4 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, sub_80DC2FC + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A54E0, gUnknown_83A54A0, gDummySpriteAffineAnimTable, UpdateAshFieldEffect gUnknown_83A54FC:: @ 83A54FC overworld_frame gUnknown_8396B08, 2, 8, 0 @@ -6437,7 +6437,7 @@ gUnknown_83A555C:: @ 83A555C .4byte gUnknown_83A5550 gUnknown_83A556C:: @ 83A556C - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, sub_80DC4F8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_32x32, gUnknown_83A555C, gUnknown_83A54FC, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect gUnknown_83A5584:: @ 83A5584 overworld_frame gUnknown_8398BA8, 2, 2, 0 @@ -6542,7 +6542,7 @@ gUnknown_83A56E0:: @ 83A56E0 .4byte gUnknown_83A56D8 gUnknown_83A56F4:: @ 83A56F4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A56E0, gUnknown_83A56B0, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A570C:: @ 83A570C overworld_frame gUnknown_839A488, 2, 2, 0 @@ -6572,7 +6572,7 @@ gUnknown_83A573C:: @ 83A573C .4byte gUnknown_83A5734 gUnknown_83A5750:: @ 83A5750 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A573C, gUnknown_83A570C, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A5768:: @ 83A5768 overworld_frame gUnknown_839A588, 2, 2, 0 @@ -6624,7 +6624,7 @@ gUnknown_83A57C8:: @ 83A57C8 .4byte gUnknown_83A57C0 gUnknown_83A57EC:: @ 83A57EC - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, sub_80DBAFC + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A57C8, gUnknown_83A5768, gDummySpriteAffineAnimTable, UpdateFootprintsTireTracksFieldEffect gUnknown_83A5804:: @ 83A5804 overworld_frame gUnknown_839AA48, 2, 2, 0 @@ -6670,7 +6670,7 @@ gUnknown_83A5894:: @ 83A5894 .4byte gUnknown_83A5870 gUnknown_83A589C:: @ 83A589C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, sub_80DBC2C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5894, gUnknown_83A5854, gDummySpriteAffineAnimTable, UpdateSplashFieldEffect gUnknown_83A58B4:: @ 83A58B4 overworld_frame gUnknown_839ACC8, 2, 1, 0 @@ -6709,7 +6709,7 @@ gUnknown_83A5938:: @ 83A5938 .4byte gUnknown_83A5918 gUnknown_83A593C:: @ 83A593C - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, unc_grass_tall + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5938, gUnknown_83A58F8, gDummySpriteAffineAnimTable, UpdateLongGrassFieldEffect gUnknown_83A5954:: @ 83A5954 overworld_frame gUnknown_8399488, 2, 2, 0 @@ -6761,7 +6761,7 @@ gUnknown_83A5A2C:: @ 83A5A2C .4byte gUnknown_83A5A04 gUnknown_83A5A30:: @ 83A5A30 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A2C, gUnknown_83A59BC, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5A48:: @ 83A5A48 overworld_frame gUnknown_8399C08, 2, 2, 0 @@ -6782,7 +6782,7 @@ gUnknown_83A5A84:: @ 83A5A84 .4byte gUnknown_83A5A68 gUnknown_83A5A88:: @ 83A5A88 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5A84, gUnknown_83A5A48, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5AA0:: @ 83A5AA0 overworld_frame gUnknown_839A788, 2, 2, 0 @@ -6801,7 +6801,7 @@ gUnknown_83A5AD4:: @ 83A5AD4 .4byte gUnknown_83A5AC0 gUnknown_83A5AD8:: @ 83A5AD8 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5AD4, gUnknown_83A5AA0, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5AF0:: @ 83A5AF0 overworld_frame gUnknown_839A988, 2, 1, 0 @@ -6818,7 +6818,7 @@ gUnknown_83A5B18:: @ 83A5B18 .4byte gUnknown_83A5B08 gUnknown_83A5B1C:: @ 83A5B1C - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, sub_80DC86C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_Unknown1, gUnknown_83A5B18, gUnknown_83A5AF0, gDummySpriteAffineAnimTable, UpdateSandPileFieldEffect gUnknown_83A5B34:: @ 83A5B34 overworld_frame gUnknown_839AD88, 2, 2, 0 @@ -6839,7 +6839,7 @@ gUnknown_83A5B70:: @ 83A5B70 .4byte gUnknown_83A5B54 gUnknown_83A5B74:: @ 83A5B74 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, sub_80DCD1C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x16, gUnknown_83A5B70, gUnknown_83A5B34, gDummySpriteAffineAnimTable, WaitFieldEffectSpriteAnim gUnknown_83A5B8C:: @ 83A5B8C obj_rot_scal_anim_frame -256, 256, 128, 0 @@ -6900,7 +6900,7 @@ gUnknown_83A5CAC:: @ 83A5CAC .4byte gUnknown_83A5C8C gUnknown_83A5CB4:: @ 83A5CB4 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5C4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5CCC:: @ 83A5CCC overworld_frame gUnknown_839B708, 2, 4, 0 @@ -6930,7 +6930,7 @@ gUnknown_83A5D2C:: @ 83A5D2C .4byte gUnknown_83A5D0C gUnknown_83A5D34:: @ 83A5D34 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5D2C, gUnknown_83A5CCC, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5D4C:: @ 83A5D4C overworld_frame gUnknown_839BE08, 2, 4, 0 @@ -6942,7 +6942,7 @@ gUnknown_83A5D4C:: @ 83A5D4C overworld_frame gUnknown_839BE08, 2, 4, 6 gUnknown_83A5D84:: @ 83A5D84 - spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, sub_80DCAC8 + spr_template 0xFFFF, 0xFFFF, gObjectEventBaseOam_16x32, gUnknown_83A5CAC, gUnknown_83A5D4C, gDummySpriteAffineAnimTable, UpdateDisguiseFieldEffect gUnknown_83A5D9C:: @ 83A5D9C overworld_frame gUnknown_839D3C8, 8, 8, 0 @@ -6994,7 +6994,7 @@ gUnknown_83A5E34:: @ 83A5E34 .4byte gUnknown_83A5E28 gUnknown_83A5E38:: @ 83A5E38 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, sub_80DB8AC + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E34, gUnknown_83A5E18, gDummySpriteAffineAnimTable, UpdateShortGrassFieldEffect gUnknown_83A5E50:: @ 83A5E50 overworld_frame gUnknown_839C508, 2, 2, 0 @@ -7007,7 +7007,7 @@ gUnknown_83A5E60:: @ 83A5E60 .4byte gUnknown_83A5E58 gUnknown_83A5E64:: @ 83A5E64 - spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, sub_80DBFF4 + spr_template 0xFFFF, 0x1005, gObjectEventBaseOam_16x16, gUnknown_83A5E60, gUnknown_83A5E50, gDummySpriteAffineAnimTable, UpdateHotSpringsWaterFieldEffect gUnknown_83A5E7C:: @ 83A5E7C overworld_frame gUnknown_839C5A8, 2, 2, 0 @@ -7079,7 +7079,7 @@ gUnknown_83A5FA0:: @ 83A5FA0 .4byte gUnknown_83A5F7C gUnknown_83A5FA4:: @ 83A5FA4 - spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, sub_80DC99C + spr_template 0xFFFF, 0x1004, gObjectEventBaseOam_16x32, gUnknown_83A5FA0, gUnknown_83A5F3C, gDummySpriteAffineAnimTable, UpdateBubblesFieldEffect gUnknown_83A5FBC:: @ 83A5FBC overworld_frame gUnknown_839D2A8, 2, 2, 0 @@ -7095,7 +7095,7 @@ gUnknown_83A5FDC:: @ 83A5FDC .4byte gUnknown_83A5FCC gUnknown_83A5FE0:: @ 83A5FE0 - spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, sub_80DCC90 + spr_template 0xFFFF, 0x100F, gObjectEventBaseOam_16x16, gUnknown_83A5FDC, gUnknown_83A5FBC, gDummySpriteAffineAnimTable, UpdateSparkleFieldEffect gUnknown_83A5FF8:: obj_pal gUnknown_839D3A8, 0x100F diff --git a/data/field_effect_helpers.s b/data/field_effect_helpers.s deleted file mode 100644 index 7ad7b168a..000000000 --- a/data/field_effect_helpers.s +++ /dev/null @@ -1,34 +0,0 @@ -#include "constants/region_map.h" -#include "constants/flags.h" -#include "constants/moves.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - -gUnknown_83FECCC:: @ 83FECCC - .2byte 0x0c, 0x1c, 0x2c - -gUnknown_83FECD2:: @ 83FECD2 - .byte 0, 1, 2, 3 - -gUnknown_83FECD6:: @ 83FECD6 - .2byte 0x0004, 0x0004, 0x0004, 0x0010 - - .align 2 -gUnknown_83FECE0:: @ 83FECE0 - .4byte sub_80DBB18 - .4byte sub_80DBB3C - - .align 2 -gUnknown_83FECE8:: @ 83FECE8 - .4byte sub_80DC318 - .4byte sub_80DC348 - .4byte sub_80DC3A8 - -gUnknown_83FECF4:: @ 83FECF4 - .byte 0, 0, 1, 2, 3 - - .align 1 -gUnknown_83FECFA:: @ 83FECFA - .2byte 0x0007, 0x000f diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 95d63568c..43698653d 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -86,15 +86,15 @@ gFldEffScript_UseCutOnTree:: @ 81D97D0 end gFldEffScript_Shadow:: @ 81D97D6 - callnative oei_shadow + callnative FldEff_Shadow end gFldEffScript_TallGrass:: @ 81D97DC - loadfadedpal_callnative gUnknown_83A5348, oei_grass_normal + loadfadedpal_callnative gUnknown_83A5348, FldEff_TallGrass end gFldEffScript_Ripple:: @ 81D97E6 - loadfadedpal_callnative gUnknown_83A5348, oei_ripples + loadfadedpal_callnative gUnknown_83A5348, FldEff_Ripple end gFldEffScript_FieldMoveShowMon:: @ 81D97F0 @@ -129,7 +129,7 @@ gFldEffScript_SandFootprints:: @ 81D9821 end gFldEffScript_JumpBigSplash:: @ 81D982B - loadfadedpal_callnative gUnknown_83A5340, oei_water_drop_tall + loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpBigSplash end gFldEffScript_Splash:: @ 81D9835 diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0442f3d02..0485cd89e 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -59,7 +59,7 @@ VermilionCity_EventScript_FerrySailor:: @ 8166941 end VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 - goto_if_unset FLAG_SYS_GOT_MYSTIC_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, EventScript_SetResultFalse checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -67,7 +67,7 @@ VermilionCity_EventScript_CheckHasMysticTicket:: @ 8166958 end VermilionCity_EventScript_CheckHasAuroraTicket:: @ 8166977 - goto_if_unset FLAG_SYS_GOT_AURORA_TICKET, EventScript_SetResultFalse + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, EventScript_SetResultFalse checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, FALSE goto_if_eq EventScript_SetResultFalse @@ -103,7 +103,7 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD call VermilionCity_EventScript_CheckHasAuroraTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticAndAuroraTickets - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 17, 6, MULTICHOICE_SEVII_NAVEL, FALSE @@ -115,12 +115,12 @@ VermilionCity_EventScript_HasMysticTicket:: @ 81669FD end VermilionCity_EventScript_ShowMysticTicket:: @ 8166A53 - setflag FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN + setflag FLAG_SHOWN_MYSTIC_TICKET msgbox VermilionCity_Text_OhMysticTicketTakeYouToNavelRock return VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 6, MULTICHOICE_SEVII_BIRTH, FALSE @@ -132,13 +132,13 @@ VermilionCity_EventScript_HasAuroraTicket:: @ 8166A5F end VermilionCity_EventScript_ShowAuroraTicket:: @ 8166AA5 - setflag FLAG_SHOWED_AURORATICKET_TO_CAPTAIN + setflag FLAG_SHOWN_AURORA_TICKET msgbox VermilionCity_Text_OhAuroraTicketTakeYouToBirthIsland return VermilionCity_EventScript_HasMysticAndAuroraTickets:: @ 8166AB1 - call_if_unset FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowMysticTicket - call_if_unset FLAG_SHOWED_AURORATICKET_TO_CAPTAIN, VermilionCity_EventScript_ShowAuroraTicket + call_if_unset FLAG_SHOWN_MYSTIC_TICKET, VermilionCity_EventScript_ShowMysticTicket + call_if_unset FLAG_SHOWN_AURORA_TICKET, VermilionCity_EventScript_ShowAuroraTicket message VermilionCity_Text_BoardSeagallopFerry waitmessage multichoice 13, 5, MULTICHOICE_SEVII_NAVEL_BIRTH, FALSE diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 419a7ec53..0e929220c 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -228,7 +228,7 @@ MysteryEventScript_AuroraTicket:: @ 84894B9 compare VAR_RESULT, FALSE vgoto_if_eq AuroraTicket_NoBagSpace giveitem ITEM_AURORA_TICKET - setflag FLAG_SYS_GOT_AURORA_TICKET + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND setflag FLAG_GOT_AURORA_TICKET vmessage sText_AuroraTicket2 waitmessage @@ -289,7 +289,7 @@ MysteryEventScript_MysticTicket:: @ 8489689 compare VAR_RESULT, FALSE vgoto_if_eq MysticTicket_NoBagSpace giveitem ITEM_MYSTIC_TICKET - setflag FLAG_SYS_GOT_MYSTIC_TICKET + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK setflag FLAG_GOT_MYSTIC_TICKET vmessage sText_MysticTicket1 waitmessage diff --git a/data/strings.s b/data/strings.s index 1d56d6be7..93a98960e 100644 --- a/data/strings.s +++ b/data/strings.s @@ -3448,90 +3448,90 @@ gUnknown_841D008:: @ 841D008 .string "Communication standby…$" .align 2 -gUnknown_841D020:: @ 841D020 +gText_1_ClrLtGryShdwBlk_Dynamic0:: @ 841D020 .string "1. {COLOR LIGHT_GRAY}{SHADOW BLACK}{DYNAMIC 0x00}$" -gUnknown_841D02C:: @ 841D02C +gText_1_Dynamic0:: @ 841D02C .string "1. {DYNAMIC 0x00}$" .align 2 -gUnknown_841D034:: @ 0x841D034 +gText_SpaceTimes:: @ 0x841D034 .string " times$" .align 2 -gUnknown_841D03C:: @ 0x841D03C +gText_XDotY:: @ 0x841D03C .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D044:: @ 0x841D044 +gText_StrVar1Berry:: @ 0x841D044 .string "{STR_VAR_1} BERRY$" .align 2 -gUnknown_841D050:: @ 841D050 +gText_TimeColon:: @ 841D050 .string "Time:$" .align 2 -gUnknown_841D058:: @ 841D058 +gText_PressingSpeed:: @ 841D058 .string "Pressing Speed:$" -gUnknown_841D068:: @ 841D068 +gText_Silkiness:: @ 841D068 .string "Silkiness:$" .align 2 -gUnknown_841D074:: @ 841D074 +gText_StrVar1:: @ 841D074 .string "{STR_VAR_1}$" .align 2 -gUnknown_841D078:: @ 841D078 +gText_SpaceMin:: @ 841D078 .string "min.$" .align 2 -gUnknown_841D080:: @ 841D080 +gText_XDotY2:: @ 841D080 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D088:: @ 841D088 +gText_SpaceSec:: @ 841D088 .string "sec.$" .align 2 -gUnknown_841D090:: @ 841D090 +gText_XDotY3:: @ 841D090 .string "{STR_VAR_1}.{STR_VAR_2}$" .align 2 -gUnknown_841D098:: @ 841D098 +gText_TimesPerSec:: @ 841D098 .string "Times/sec.$" .align 2 -gUnknown_841D0A4:: @ 841D0A4 - .string "{STR_VAR_1}サ$" +gText_Var1Percent:: @ 841D0A4 + .string "{STR_VAR_1}%$" .align 2 -gUnknown_841D0A8:: @ 841D0A8 +gText_PressesRankings:: @ 841D0A8 .string "No. of Presses Rankings$" .align 2 -gUnknown_841D0C0:: @ 841D0C0 +gText_CrushingResults:: @ 841D0C0 .string "Crushing Results$" .align 2 -gUnknown_841D0D4:: @ 0x841D0D4 +gText_NeatnessRankings:: @ 0x841D0D4 .string "Neatness Rankings$" .align 2 -gUnknown_841D0E8:: @ 0x841D0E8 +gText_CooperativeRankings:: @ 0x841D0E8 .string "Cooperative Rankings$" .align 2 -gUnknown_841D100:: @ 0x841D100 +gText_PressingPowerRankings:: @ 0x841D100 .string "Pressing-Power Rankings$" -gUnknown_841D118:: @ 841D118 +gText_BerryCrush2:: @ 841D118 .string "BERRY CRUSH$" -gUnknown_841D124:: @ 841D124 +gText_PressingSpeedRankings:: @ 841D124 .string "Pressing-Speed Rankings$" -gUnknown_841D13C:: @ 841D13C +gText_Var1Players:: @ 841D13C .string "{STR_VAR_1} PLAYERS$" .align 2 |