dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into battle

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-14 12:57:49 +08:00
parent 17b55f50db f6dfeba742
commit 1d3ae2fe78
188 changed files with 15683 additions and 8215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_effects_3.s
+122 -11
View File
@@ -7,13 +7,67 @@
.align 2
gUnknown_83FEDE4:: @ 83FEDE4
.incbin "baserom.gba", 0x3FEDE4, 0x29C
.incbin "baserom.gba", 0x3FEDE4, 0x1C
gUnknown_83FEE00::
.incbin "baserom.gba", 0x3FEE00, 0x18
gUnknown_83FEE18::
.incbin "baserom.gba", 0x3FEE18, 0x18
gUnknown_83FEE30::
.incbin "baserom.gba", 0x3FEE30, 0x2C
gUnknown_83FEE5C::
.incbin "baserom.gba", 0x3FEE5C, 0x18
gUnknown_83FEE74::
.incbin "baserom.gba", 0x3FEE74, 0x18
gUnknown_83FEE8C::
.incbin "baserom.gba", 0x3FEE8C, 0x58
gUnknown_83FEEE4::
.incbin "baserom.gba", 0x3FEEE4, 0x18
gUnknown_83FEEFC::
.incbin "baserom.gba", 0x3FEEFC, 0x34
gUnknown_83FEF30::
.incbin "baserom.gba", 0x3FEF30, 0x40
gUnknown_83FEF70::
.incbin "baserom.gba", 0x3FEF70, 0x4C
gUnknown_83FEFBC::
.incbin "baserom.gba", 0x3FEFBC, 0x50
gUnknown_83FF00C::
.incbin "baserom.gba", 0x3FF00C, 0x18
gUnknown_83FF024::
.incbin "baserom.gba", 0x3FF024, 0x18
gUnknown_83FF03C::
.incbin "baserom.gba", 0x3FF03C, 0x2C
gUnknown_83FF068::
.incbin "baserom.gba", 0x3FF068, 0x18
gUnknown_83FF080:: @ 83FF080
.incbin "baserom.gba", 0x3FF080, 0xB0
.incbin "baserom.gba", 0x3FF080, 0x58
gUnknown_83FF0D8::
.incbin "baserom.gba", 0x3FF0D8, 0x40
gUnknown_83FF118::
.incbin "baserom.gba", 0x3FF118, 0x18
gUnknown_83FF130:: @ 83FF130
.incbin "baserom.gba", 0x3FF130, 0x38
.incbin "baserom.gba", 0x3FF130, 0x20
gUnknown_83FF150::
.incbin "baserom.gba", 0x3FF150, 0x18
gUnknown_83FF168:: @ 83FF168
.incbin "baserom.gba", 0x3FF168, 0x18
@@ -25,7 +79,10 @@ gUnknown_83FF198:: @ 83FF198
.incbin "baserom.gba", 0x3FF198, 0x28
gUnknown_83FF1C0:: @ 83FF1C0
.incbin "baserom.gba", 0x3FF1C0, 0x50
.incbin "baserom.gba", 0x3FF1C0, 0x38
gUnknown_83FF1F8::
.incbin "baserom.gba", 0x3FF1F8, 0x18
gUnknown_83FF210:: @ 83FF210
.incbin "baserom.gba", 0x3FF210, 0x30
@@ -43,10 +100,34 @@ gUnknown_83FF288:: @ 83FF288
.incbin "baserom.gba", 0x3FF288, 0x8
gUnknown_83FF290:: @ 83FF290
.incbin "baserom.gba", 0x3FF290, 0x140
.incbin "baserom.gba", 0x3FF290, 0x20
gUnknown_83FF2B0::
.incbin "baserom.gba", 0x3FF2B0, 0x74
gUnknown_83FF324::
.incbin "baserom.gba", 0x3FF324, 0x4C
gUnknown_83FF370::
.incbin "baserom.gba", 0x3FF370, 0x18
gUnknown_83FF388::
.incbin "baserom.gba", 0x3FF388, 0x18
gUnknown_83FF3A0::
.incbin "baserom.gba", 0x3FF3A0, 0x18
gUnknown_83FF3B8::
.incbin "baserom.gba", 0x3FF3B8, 0x18
gUnknown_83FF3D0:: @ 83FF3D0
.incbin "baserom.gba", 0x3FF3D0, 0x15C
.incbin "baserom.gba", 0x3FF3D0, 0x9C
gUnknown_83FF46C::
.incbin "baserom.gba", 0x3FF46C, 0xA8
gUnknown_83FF514::
.incbin "baserom.gba", 0x3FF514, 0x18
gUnknown_83FF52C:: @ 83FF52C
.incbin "baserom.gba", 0x3FF52C, 0x20
@@ -55,16 +136,46 @@ gUnknown_83FF54C:: @ 83FF54C
.incbin "baserom.gba", 0x3FF54C, 0x18
gUnknown_83FF564:: @ 83FF564
.incbin "baserom.gba", 0x3FF564, 0x68
.incbin "baserom.gba", 0x3FF564, 0x50
gUnknown_83FF5B4::
.incbin "baserom.gba", 0x3FF5B4, 0x18
gUnknown_83FF5CC:: @ 83FF5CC
.incbin "baserom.gba", 0x3FF5CC, 0x60
.incbin "baserom.gba", 0x3FF5CC, 0x18
gUnknown_83FF5E4::
.incbin "baserom.gba", 0x3FF5E4, 0x48
gUnknown_83FF62C:: @ 83FF62C
.incbin "baserom.gba", 0x3FF62C, 0x30
.incbin "baserom.gba", 0x3FF62C, 0x18
gUnknown_83FF644::
.incbin "baserom.gba", 0x3FF644, 0x18
gUnknown_83FF65C:: @ 83FF65C
.incbin "baserom.gba", 0x3FF65C, 0x14C
.incbin "baserom.gba", 0x3FF65C, 0x18
gUnknown_83FF674::
.incbin "baserom.gba", 0x3FF674, 0x18
gUnknown_83FF68C::
.incbin "baserom.gba", 0x3FF68C, 0x18
gUnknown_83FF6A4::
.incbin "baserom.gba", 0x3FF6A4, 0x18
gUnknown_83FF6BC::
.incbin "baserom.gba", 0x3FF6BC, 0x30
gUnknown_83FF6EC::
.incbin "baserom.gba", 0x3FF6EC, 0x78
gUnknown_83FF764::
.incbin "baserom.gba", 0x3FF764, 0x2C
gUnknown_83FF790::
.incbin "baserom.gba", 0x3FF790, 0x18
gUnknown_83FF7A8:: @ 83FF7A8
.incbin "baserom.gba", 0x3FF7A8, 0x24C
.incbin "baserom.gba", 0x3FF7A8, 0x30
data/battle_anim_effects_misc.s
+400 -22
View File
@@ -7,7 +7,30 @@
.align 2
gUnknown_83E2964:: @ 83E2964
.incbin "baserom.gba", 0x3E2964, 0x74
.byte 0x02, 0x04, 0x01, 0x03
gUnknown_83E2968::
obj_image_anim_frame 0x0000, 5
obj_image_anim_frame 0x0002, 5
obj_image_anim_frame 0x0004, 5
obj_image_anim_frame 0x0006, 5
obj_image_anim_frame 0x0008, 5
obj_image_anim_frame 0x000a, 5
obj_image_anim_frame 0x000c, 5
obj_image_anim_frame 0x000e, 5
obj_image_anim_jump 0x0000
gUnknown_83E298C::
.4byte gUnknown_83E2968
gUnknown_83E2990::
spr_template 10067, 10067, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
gUnknown_83E29A8::
spr_template 10068, 10068, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
gUnknown_83E29C0::
spr_template 10065, 10065, gOamData_83ACA08, gUnknown_83E298C, NULL, gDummySpriteAffineAnimTable, sub_80A22E8
gAnimCmd_83E29D8::
obj_image_anim_frame 0, 1
@@ -76,46 +99,296 @@ gUnknown_83E2A70::
gUnknown_83E2A88:: @ 83E2A88
spr_template 10147, 10147, gOamData_83AC9C8, gSpriteAnimTable_83E2A3C, NULL, gDummySpriteAffineAnimTable, sub_80A2430
.incbin "baserom.gba", 0x3E2AA0, 0x4D8
gSpriteTemplate_83E2AA0::
.incbin "baserom.gba", 0x3E2AA0, 0x1C
gUnknown_83E2ABC::
.incbin "baserom.gba", 0x3E2ABC, 0x2C
gUnknown_83E2AE8::
.incbin "baserom.gba", 0x3E2AE8, 0x18
gUnknown_83E2B00::
.incbin "baserom.gba", 0x3E2B00, 0x34
gUnknown_83E2B34::
.incbin "baserom.gba", 0x3E2B34, 0x30
gUnknown_83E2B64::
.incbin "baserom.gba", 0x3E2B64, 0x30
gUnknown_83E2B94::
.incbin "baserom.gba", 0x3E2B94, 0x18
gUnknown_83E2BAC::
.incbin "baserom.gba", 0x3E2BAC, 0x5C
gUnknown_83E2C08::
.incbin "baserom.gba", 0x3E2C08, 0x18
gUnknown_83E2C20::
.incbin "baserom.gba", 0x3E2C20, 0x30
gUnknown_83E2C50::
.incbin "baserom.gba", 0x3E2C50, 0x2C
gUnknown_83E2C7C::
.incbin "baserom.gba", 0x3E2C7C, 0x90
gUnknown_83E2D0C::
.incbin "baserom.gba", 0x3E2D0C, 0x48
gUnknown_83E2D54::
.incbin "baserom.gba", 0x3E2D54, 0x70
gUnknown_83E2DC4::
.incbin "baserom.gba", 0x3E2DC4, 0x18
gUnknown_83E2DDC::
.incbin "baserom.gba", 0x3E2DDC, 0x28
gUnknown_83E2E04::
.incbin "baserom.gba", 0x3E2E04, 0x84
gUnknown_83E2E88::
.incbin "baserom.gba", 0x3E2E88, 0x18
gUnknown_83E2EA0::
.incbin "baserom.gba", 0x3E2EA0, 0x30
gUnknown_83E2ED0::
.incbin "baserom.gba", 0x3E2ED0, 0x18
gUnknown_83E2EE8::
.incbin "baserom.gba", 0x3E2EE8, 0x78
gUnknown_83E2F60::
.incbin "baserom.gba", 0x3E2F60, 0x18
gUnknown_83E2F78:: @ 83E2F78
.incbin "baserom.gba", 0x3E2F78, 0x78
gUnknown_83E2FF0:: @ 83E2FF0
.incbin "baserom.gba", 0x3E2FF0, 0x100
.incbin "baserom.gba", 0x3E2FF0, 0x34
gUnknown_83E3024::
.incbin "baserom.gba", 0x3E3024, 0x18
gUnknown_83E303C::
.incbin "baserom.gba", 0x3E303C, 0x6C
gUnknown_83E30A8::
.incbin "baserom.gba", 0x3E30A8, 0x18
gUnknown_83E30C0::
.incbin "baserom.gba", 0x3E30C0, 0x18
gUnknown_83E30D8::
.incbin "baserom.gba", 0x3E30D8, 0x18
gUnknown_83E30F0:: @ 83E30F0
.incbin "baserom.gba", 0x3E30F0, 0x458
.incbin "baserom.gba", 0x3E30F0, 0x10
gUnknown_83E3100::
.incbin "baserom.gba", 0x3E3100, 0x48
gUnknown_83E3148::
.incbin "baserom.gba", 0x3E3148, 0x18
gUnknown_83E3160::
.incbin "baserom.gba", 0x3E3160, 0x134
gUnknown_83E3294::
.incbin "baserom.gba", 0x3E3294, 0x18
gUnknown_83E32AC::
.incbin "baserom.gba", 0x3E32AC, 0xA8
gUnknown_83E3354::
.incbin "baserom.gba", 0x3E3354, 0x60
gUnknown_83E33B4::
.incbin "baserom.gba", 0x3E33B4, 0x40
gUnknown_83E33F4::
.incbin "baserom.gba", 0x3E33F4, 0x18
gUnknown_83E340C::
.incbin "baserom.gba", 0x3E340C, 0xF4
gUnknown_83E3500::
.incbin "baserom.gba", 0x3E3500, 0x18
gUnknown_83E3518::
.incbin "baserom.gba", 0x3E3518, 0x18
gUnknown_83E3530::
.incbin "baserom.gba", 0x3E3530, 0x18
gUnknown_83E3548:: @ 83E3548
.incbin "baserom.gba", 0x3E3548, 0x1EC
.incbin "baserom.gba", 0x3E3548, 0x8
gUnknown_83E3550::
.incbin "baserom.gba", 0x3E3550, 0x54
gUnknown_83E35A4::
.incbin "baserom.gba", 0x3E35A4, 0x18
gUnknown_83E35BC::
.incbin "baserom.gba", 0x3E35BC, 0x18
gUnknown_83E35D4::
.incbin "baserom.gba", 0x3E35D4, 0x30
gUnknown_83E3604::
.incbin "baserom.gba", 0x3E3604, 0x58
gUnknown_83E365C::
.incbin "baserom.gba", 0x3E365C, 0x18
gUnknown_83E3674::
.incbin "baserom.gba", 0x3E3674, 0x34
gUnknown_83E36A8::
.incbin "baserom.gba", 0x3E36A8, 0x44
gUnknown_83E36EC::
.incbin "baserom.gba", 0x3E36EC, 0x30
gUnknown_83E371C::
.incbin "baserom.gba", 0x3E371C, 0x18
gUnknown_83E3734:: @ 83E3734
.incbin "baserom.gba", 0x3E3734, 0x30
gUnknown_83E3764:: @ 83E3764
.incbin "baserom.gba", 0x3E3764, 0x134
.incbin "baserom.gba", 0x3E3764, 0x40
gUnknown_83E37A4::
.incbin "baserom.gba", 0x3E37A4, 0x18
gUnknown_83E37BC::
.incbin "baserom.gba", 0x3E37BC, 0x30
gUnknown_83E37EC::
.incbin "baserom.gba", 0x3E37EC, 0x94
gUnknown_83E3880::
.incbin "baserom.gba", 0x3E3880, 0x18
gUnknown_83E3898:: @ 83E3898
.incbin "baserom.gba", 0x3E3898, 0xF4
.incbin "baserom.gba", 0x3E3898, 0x30
gUnknown_83E38C8::
.incbin "baserom.gba", 0x3E38C8, 0x18
gUnknown_83E38E0::
.incbin "baserom.gba", 0x3E38E0, 0x34
gUnknown_83E3914::
.incbin "baserom.gba", 0x3E3914, 0x78
gUnknown_83E398C:: @ 83E398C
.incbin "baserom.gba", 0x3E398C, 0x29C
.incbin "baserom.gba", 0x3E398C, 0xA8
gUnknown_83E3A34::
.incbin "baserom.gba", 0x3E3A34, 0x18
gUnknown_83E3A4C::
.incbin "baserom.gba", 0x3E3A4C, 0x78
gUnknown_83E3AC4::
.incbin "baserom.gba", 0x3E3AC4, 0xF8
gUnknown_83E3BBC::
.incbin "baserom.gba", 0x3E3BBC, 0x3C
gUnknown_83E3BF8::
.incbin "baserom.gba", 0x3E3BF8, 0x18
gUnknown_83E3C10::
.incbin "baserom.gba", 0x3E3C10, 0x18
gUnknown_83E3C28:: @ 83E3C28
.incbin "baserom.gba", 0x3E3C28, 0xF0
.incbin "baserom.gba", 0x3E3C28, 0x78
gUnknown_83E3CA0::
.incbin "baserom.gba", 0x3E3CA0, 0x18
gUnknown_83E3CB8::
.incbin "baserom.gba", 0x3E3CB8, 0x18
gUnknown_83E3CD0::
.incbin "baserom.gba", 0x3E3CD0, 0x18
gUnknown_83E3CE8::
.incbin "baserom.gba", 0x3E3CE8, 0x18
gUnknown_83E3D00::
.incbin "baserom.gba", 0x3E3D00, 0x18
gUnknown_83E3D18:: @ 83E3D18
.incbin "baserom.gba", 0x3E3D18, 0x148
.incbin "baserom.gba", 0x3E3D18, 0x38
gUnknown_83E3D50::
.incbin "baserom.gba", 0x3E3D50, 0x18
gUnknown_83E3D68::
.incbin "baserom.gba", 0x3E3D68, 0x2C
gUnknown_83E3D94::
.incbin "baserom.gba", 0x3E3D94, 0x34
gUnknown_83E3DC8::
.incbin "baserom.gba", 0x3E3DC8, 0x40
gUnknown_83E3E08::
.incbin "baserom.gba", 0x3E3E08, 0x40
gUnknown_83E3E48::
.incbin "baserom.gba", 0x3E3E48, 0x18
gUnknown_83E3E60:: @ 83E3E60
.incbin "baserom.gba", 0x3E3E60, 0x20
gUnknown_83E3E80:: @ 83E3E80
.incbin "baserom.gba", 0x3E3E80, 0x9C
.incbin "baserom.gba", 0x3E3E80, 0x50
gUnknown_83E3ED0::
.incbin "baserom.gba", 0x3E3ED0, 0x34
gUnknown_83E3F04::
.incbin "baserom.gba", 0x3E3F04, 0x18
gUnknown_83E3F1C:: @ 83E3F1C
.incbin "baserom.gba", 0x3E3F1C, 0x20C
.incbin "baserom.gba", 0x3E3F1C, 0x30
gUnknown_83E3F4C::
.incbin "baserom.gba", 0x3E3F4C, 0x18
gUnknown_83E3F64::
.incbin "baserom.gba", 0x3E3F64, 0x30
gUnknown_83E3F94::
.incbin "baserom.gba", 0x3E3F94, 0x94
gUnknown_83E4028::
.incbin "baserom.gba", 0x3E4028, 0x6C
gUnknown_83E4094::
.incbin "baserom.gba", 0x3E4094, 0x34
gUnknown_83E40C8::
.incbin "baserom.gba", 0x3E40C8, 0x18
gUnknown_83E40E0::
.incbin "baserom.gba", 0x3E40E0, 0x18
gUnknown_83E40F8::
.incbin "baserom.gba", 0x3E40F8, 0x18
gUnknown_83E4110::
.incbin "baserom.gba", 0x3E4110, 0x18
gUnknown_83E4128:: @ 83E4128
.incbin "baserom.gba", 0x3E4128, 0x2C
@@ -124,28 +397,133 @@ gUnknown_83E4154:: @ 83E4154
.incbin "baserom.gba", 0x3E4154, 0x18
gUnknown_83E416C:: @ 83E416C
.incbin "baserom.gba", 0x3E416C, 0x5C
.incbin "baserom.gba", 0x3E416C, 0x44
gUnknown_83E41B0::
.incbin "baserom.gba", 0x3E41B0, 0x18
gUnknown_83E41C8:: @ 83E41C8
.incbin "baserom.gba", 0x3E41C8, 0x38
.incbin "baserom.gba", 0x3E41C8, 0x8
gUnknown_83E41D0::
.incbin "baserom.gba", 0x3E41D0, 0x18
gUnknown_83E41E8::
.incbin "baserom.gba", 0x3E41E8, 0x18
gUnknown_83E4200:: @ 83E4200
.incbin "baserom.gba", 0x3E4200, 0x210
.incbin "baserom.gba", 0x3E4200, 0x18
gUnknown_83E4218::
.incbin "baserom.gba", 0x3E4218, 0x18
gUnknown_83E4230::
.incbin "baserom.gba", 0x3E4230, 0x18
gUnknown_83E4248::
.incbin "baserom.gba", 0x3E4248, 0x34
gUnknown_83E427C::
.incbin "baserom.gba", 0x3E427C, 0x18
gUnknown_83E4294::
.incbin "baserom.gba", 0x3E4294, 0x34
gUnknown_83E42C8::
.incbin "baserom.gba", 0x3E42C8, 0x34
gUnknown_83E42FC::
.incbin "baserom.gba", 0x3E42FC, 0x24
gUnknown_83E4320::
.incbin "baserom.gba", 0x3E4320, 0x18
gUnknown_83E4338::
.incbin "baserom.gba", 0x3E4338, 0x30
gUnknown_83E4368::
.incbin "baserom.gba", 0x3E4368, 0x48
gUnknown_83E43B0::
.incbin "baserom.gba", 0x3E43B0, 0x48
gUnknown_83E43F8::
.incbin "baserom.gba", 0x3E43F8, 0x18
gUnknown_83E4410:: @ 83E4410
.incbin "baserom.gba", 0x3E4410, 0x1488
.incbin "baserom.gba", 0x3E4410, 0x20
gUnknown_83E4430::
.incbin "baserom.gba", 0x3E4430, 0x54
gUnknown_83E4484::
.incbin "baserom.gba", 0x3E4484, 0x18
gUnknown_83E449C::
.incbin "baserom.gba", 0x3E449C, 0x40
gUnknown_83E44DC::
.incbin "baserom.gba", 0x3E44DC, 0x13BC
gUnknown_83E5898:: @ 83E5898
.incbin "baserom.gba", 0x3E5898, 0xC0
.incbin "baserom.gba", 0x3E5898, 0x48
gUnknown_83E58E0::
.incbin "baserom.gba", 0x3E58E0, 0x4C
gUnknown_83E592C::
.incbin "baserom.gba", 0x3E592C, 0x2C
gUnknown_83E5958:: @ 83E5958
.incbin "baserom.gba", 0x3E5958, 0x120
.incbin "baserom.gba", 0x3E5958, 0x4
gUnknown_83E5A78:: @ 83E5A78
.incbin "baserom.gba", 0x3E5A78, 0x68
gUnknown_83E595C::
.incbin "baserom.gba", 0x3E595C, 0x18
gUnknown_83E5974::
.incbin "baserom.gba", 0x3E5974, 0x18
gUnknown_83E598C::
.incbin "baserom.gba", 0x3E598C, 0x18
gUnknown_83E59A4::
.incbin "baserom.gba", 0x3E59A4, 0x2C
gUnknown_83E59D0::
.incbin "baserom.gba", 0x3E59D0, 0x18
gUnknown_83E59E8::
.incbin "baserom.gba", 0x3E59E8, 0x50
gUnknown_83E5A38::
.incbin "baserom.gba", 0x3E5A38, 0x18
gUnknown_83E5A50::
.incbin "baserom.gba", 0x3E5A50, 0x28
gUnknown_83E5A78::
.incbin "baserom.gba", 0x3E5A78, 0x8
gUnknown_83E5A80::
.incbin "baserom.gba", 0x3E5A80, 0x18
gUnknown_83E5A98::
.incbin "baserom.gba", 0x3E5A98, 0x18
gUnknown_83E5AB0::
.incbin "baserom.gba", 0x3E5AB0, 0x18
gUnknown_83E5AC8::
.incbin "baserom.gba", 0x3E5AC8, 0x18
gUnknown_83E5AE0:: @ 83E5AE0
.incbin "baserom.gba", 0x3E5AE0, 0xA8
.incbin "baserom.gba", 0x3E5AE0, 0x90
gUnknown_83E5B70::
.incbin "baserom.gba", 0x3E5B70, 0x18
gUnknown_83E5B88:: @ 83E5B88
.incbin "baserom.gba", 0x3E5B88, 0x30
.incbin "baserom.gba", 0x3E5B88, 0x18
gUnknown_83E5BA0:: @ 83E5BA0
.incbin "baserom.gba", 0x3E5BA0, 0x18
data/battle_anim_scripts.s
+11091 -10
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_special.s
+7 -1
View File
@@ -28,4 +28,10 @@ gUnknown_840C104:: @ 840C104
.incbin "baserom.gba", 0x40C104, 0xC0
gUnknown_840C1C4:: @ 840C1C4
.incbin "baserom.gba", 0x40C1C4, 0x64
.incbin "baserom.gba", 0x40C1C4, 0x28
gUnknown_840C1EC::
.incbin "baserom.gba", 0x40C1EC, 0x24
gUnknown_840C210::
.incbin "baserom.gba", 0x40C210, 0x18
data/battle_anim_status_effects.s
+100 -4
View File
@@ -1,14 +1,110 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83BF3E0:: @ 83BF3DC
.incbin "baserom.gba", 0x3BF3E0, 0x174
obj_image_anim_frame 0, 3
obj_image_anim_frame 4, 3
obj_image_anim_frame 8, 3
obj_image_anim_frame 12, 3
obj_image_anim_jump 0
gSpriteAnimTable_83BF3F4:: @ 83BF3F4
.4byte gUnknown_83BF3E0
gSpriteTemplate_83BF3F8:: @ 83BF3F8
spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gSpriteTemplate_83BF410:: @ 83BF410
spr_template 10004, 10004, gOamData_83AC9D0, gSpriteAnimTable_83BF3F4, NULL, gDummySpriteAffineAnimTable, sub_8076ED8
gUnknown_83BF428:: @ 83BF428
obj_image_anim_frame 0x0000, 3
obj_image_anim_jump 0x0000
gSpriteAnimTable_83BF430:: @ 83BF430
.4byte gUnknown_83BF428
gSpriteTemplate_83BF434:: @ 83BF434
spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_807729C
gSpriteTemplate_83BF44C:: @ 83BF44C
spr_template 10283, 10283, gOamData_83AC9D8, gSpriteAnimTable_83BF430, NULL, gDummySpriteAffineAnimTable, sub_8077350
gUnknown_83BF464:: @ 83BF464
obj_image_anim_frame 0x0000, 3
obj_image_anim_frame 0x0010, 3
obj_image_anim_frame 0x0020, 3
obj_image_anim_frame 0x0030, 3
obj_image_anim_frame 0x0040, 3
obj_image_anim_end
gSpriteAnimTable_83BF47C:: @ 83BF47C
.4byte gUnknown_83BF464
gSpriteTemplate_83BF480:: @ 83BF480
spr_template 10071, 10071, gOamData_83AC9D8, gSpriteAnimTable_83BF47C, NULL, gDummySpriteAffineAnimTable, sub_8076FD0
gSpriteTemplate_83BF498:: @ 83BF498
spr_template 10051, 10051, gOamData_83AC9D8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gUnknown_83BF4B0:: @ 83BF4B0
obj_image_anim_frame 0x0000, 5
obj_image_anim_jump 0x0000
gUnknown_83BF4B8:: @ 83BF4B8
obj_image_anim_frame 0x0000, 5
obj_image_anim_jump 0x0000
gUnknown_83BF4C0:: @ 83BF4C0
obj_image_anim_frame 0x0000, 5
obj_image_anim_jump 0x0000
gSpriteAniimTable_83BF4C8:: @ 83BF4C8
.4byte gUnknown_83BF4B0
.4byte gUnknown_83BF4B8
.4byte gUnknown_83BF4C0
gSpriteTemplate_83BF4D4:: @ 83BF4D4
spr_template 10135, 10135, gOamData_83AC9D8, gSpriteAniimTable_83BF4C8, NULL, gDummySpriteAffineAnimTable, sub_8076F58
gUnknown_83BF4EC:: @ 83BF4EC
obj_image_anim_frame 0x0000, 15
obj_image_anim_jump 0x0000
gSpriteAnimTable_83BF4F4:: @ 83BF4F4
.4byte gUnknown_83BF4EC
gUnknown_83BF4F8:: @ 83BF4F8
obj_rot_scal_anim_frame 0x0060, 0x0060, 0x00, 0
obj_rot_scal_anim_frame 0x0002, 0x0002, 0x00, 1
obj_rot_scal_anim_jump 0x0001
gSpriteAffineAnimTable_83BF510:: @ 83BF510
.4byte gUnknown_83BF4F8
gSpriteTemplate_83BF514:: @ 83BF514
spr_template 10004, 10004, gOamData_83ACA90, gSpriteAnimTable_83BF4F4, NULL, gSpriteAffineAnimTable_83BF510, sub_8076ED8
gUnknown_83BF52C:: @ 83BF52C
.string "TASK OVER\n"
.string "タスクがオーバーしました$"
.align 2
gSubsprites_83BF544:: @ 83BF544
subsprite 240, 240, 2, 0x00, 64x64
subsprite 240, 48, 2, 0x40, 64x32
subsprite 48, 240, 2, 0x60, 32x64
subsprite 48, 48, 2, 0x80, 32x32
gUnknown_83BF554:: @ 83BF554
.incbin "baserom.gba", 0x3BF554, 0x8
.byte 4
.align 2
.4byte gSubsprites_83BF544
gUnknown_83BF55C:: @ 83BF55C
.incbin "baserom.gba", 0x3BF55C, 0x18
spr_template 10010, 10010, gOamData_83ACB00, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_83BF574:: @ 83BF574
.incbin "baserom.gba", 0x3BF574, 0x18
spr_template 10136, 10136, gOamData_83AC9C8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807834C
data/berry_crush.s
+120
View File
@@ -0,0 +1,120 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_846E2E0:: @ 846E2E0
.incbin "baserom.gba", 0x46E2E0, 0x8
gUnknown_846E2E8:: @ 846E2E8
.incbin "baserom.gba", 0x46E2E8, 0x8
gUnknown_846E2F0:: @ 846E2F0
.incbin "baserom.gba", 0x46E2F0, 0x24
gUnknown_846E314:: @ 846E314
.incbin "baserom.gba", 0x46E314, 0x14
gUnknown_846E328:: @ 846E328
.incbin "baserom.gba", 0x46E328, 0x24
gUnknown_846E34C:: @ 846E34C
.incbin "baserom.gba", 0x46E34C, 0x68
gUnknown_846E3B4:: @ 846E3B4
.incbin "baserom.gba", 0x46E3B4, 0x10
gUnknown_846E3C4:: @ 846E3C4
.incbin "baserom.gba", 0x46E3C4, 0x4
gUnknown_846E3C8:: @ 846E3C8
.incbin "baserom.gba", 0x46E3C8, 0x4
gUnknown_846E3CC:: @ 846E3CC
.incbin "baserom.gba", 0x46E3CC, 0x4
gUnknown_846E3D0:: @ 846E3D0
.incbin "baserom.gba", 0x46E3D0, 0xC
gUnknown_846E3DC:: @ 846E3DC
.incbin "baserom.gba", 0x46E3DC, 0x3
gUnknown_846E3DF:: @ 846E3DF
.incbin "baserom.gba", 0x46E3DF, 0x3
gUnknown_846E3E2:: @ 846E3E2
.incbin "baserom.gba", 0x46E3E2, 0x3
gUnknown_846E3E5:: @ 846E3E5
.incbin "baserom.gba", 0x46E3E5, 0x6
gUnknown_846E3EB:: @ 846E3EB
.incbin "baserom.gba", 0x46E3EB, 0x5
gUnknown_846E3F0:: @ 846E3F0
.incbin "baserom.gba", 0x46E3F0, 0x8
gUnknown_846E3F8:: @ 846E3F8
.incbin "baserom.gba", 0x46E3F8, 0x50
gUnknown_846E448:: @ 846E448
.incbin "baserom.gba", 0x46E448, 0x8
gUnknown_846E450:: @ 846E450
.incbin "baserom.gba", 0x46E450, 0x940
gUnknown_846ED90:: @ 846ED90
.incbin "baserom.gba", 0x46ED90, 0x130
gUnknown_846EEC0:: @ 846EEC0
.incbin "baserom.gba", 0x46EEC0, 0x198
gUnknown_846F058:: @ 846F058
.incbin "baserom.gba", 0x46F058, 0x228
gUnknown_846F280:: @ 846F280
.incbin "baserom.gba", 0x46F280, 0x14
gUnknown_846F294:: @ 846F294
.incbin "baserom.gba", 0x46F294, 0x3C
gUnknown_846F2D0:: @ 846F2D0
.incbin "baserom.gba", 0x46F2D0, 0x1
gUnknown_846F2D1:: @ 846F2D1
.incbin "baserom.gba", 0x46F2D1, 0x5
gUnknown_846F2D6:: @ 846F2D6
.incbin "baserom.gba", 0x46F2D6, 0x1
gUnknown_846F2D7:: @ 846F2D7
.incbin "baserom.gba", 0x46F2D7, 0x15
gUnknown_846F2EC:: @ 846F2EC
.incbin "baserom.gba", 0x46F2EC, 0xC
gUnknown_846F2F8:: @ 846F2F8
.incbin "baserom.gba", 0x46F2F8, 0x28
gUnknown_846F320:: @ 846F320
.incbin "baserom.gba", 0x46F320, 0xF0
gUnknown_846F410:: @ 846F410
.incbin "baserom.gba", 0x46F410, 0x18
gUnknown_846F428:: @ 846F428
.incbin "baserom.gba", 0x46F428, 0x18
gUnknown_846F440:: @ 846F440
.incbin "baserom.gba", 0x46F440, 0x18
gUnknown_846F458:: @ 846F458
.incbin "baserom.gba", 0x46F458, 0x18
gUnknown_846F470:: @ 846F470
.incbin "baserom.gba", 0x46F470, 0x18
gUnknown_846F488:: @ 846F488
.incbin "baserom.gba", 0x46F488, 0x30
gUnknown_846F4B8:: @ 846F4B8
.incbin "baserom.gba", 0x46F4B8, 0x18
data/box_party_pokemon_dropdown.s
+9 -1
View File
@@ -7,4 +7,12 @@
.align 2
gUnknown_841F4B4:: @ 841F4B4
.incbin "baserom.gba", 0x41f4b4, 0x20
.2byte 0x0100, 0x0100
.2byte 0x0200, 0x0100
.2byte 0x0100, 0x0200
.2byte 0x0200, 0x0200
.2byte 0x0080, 0x0080
.2byte 0x0100, 0x0100
.2byte 0x0200, 0x0200
.2byte 0x0400, 0x0400
data/clear_save_data_screen.s
+17 -3
View File
@@ -7,10 +7,24 @@
.align 2
gUnknown_841EE64:: @ 841EE64
.incbin "baserom.gba", 0x41EE64, 0x4
.4byte 0x000001f0
@ {
@ .bg = 0,
@ .charBaseIndex = 0,
@ .mapBaseIndex = 31,
@ .screenSize = 0,
@ .paletteMode = 0,
@ .priority = 0,
@ .baseTile = 0x0000
@ }
gUnknown_841EE68:: @ 841EE68
.incbin "baserom.gba", 0x41EE68, 0x18
.byte 0, 3, 5, 6, 4, 15
.2byte 0x000a
.byte 0, 3, 15, 23, 4, 15
.2byte 0x0022
.byte 255, 0, 0, 0, 0, 0
.2byte 0x0000
gUnknown_841EE80:: @ 841EE80
.incbin "baserom.gba", 0x41EE80, 0x44
.byte 0x01, 0x02, 0x03
data/data_8466FB8.s
-12
View File
@@ -1,12 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_84687A0::
.string "You have collected all STAMPs!\n"
.string "Want to input a CARD as a prize?$"
.include "data/mevent/script_ish.inc"
.include "data/mevent/script_common.inc"
data/evolution_graphics.s
+3
View File
@@ -6,6 +6,9 @@
.section .rodata
.align 2
gUnknown_841EE84:: @ 841EE84
.incbin "baserom.gba", 0x41EE84, 0x40
gUnknown_841EEC4:: @ 841EEC4
.incbin "baserom.gba", 0x41EEC4, 0x10
data/field_door.s
-17
View File
@@ -1,17 +0,0 @@
.section .rodata
.align 2
gUnknown_835B488:: @ 835B488
.incbin "baserom.gba", 0x35B488, 0x14
gUnknown_835B49C:: @ 835B49C
.incbin "baserom.gba", 0x35B49C, 0x14
gUnknown_835B4B0:: @ 835B4B0
.incbin "baserom.gba", 0x35B4B0, 0x14
gUnknown_835B4C4:: @ 835B4C4
.incbin "baserom.gba", 0x35B4C4, 0x114
gUnknown_835B5D8:: @ 835B5D8
.incbin "baserom.gba", 0x35B5D8, 0x18C
data/field_effect_helpers.s
+13 -7
View File
@@ -7,22 +7,28 @@
.align 2
gUnknown_83FECCC:: @ 83FECCC
.byte 0x0c, 0x00, 0x1c, 0x00, 0x2c, 0x00
.2byte 0x0c, 0x1c, 0x2c
gUnknown_83FECD2:: @ 83FECD2
.incbin "baserom.gba", 0x3FECD2, 0x4
.byte 0, 1, 2, 3
gUnknown_83FECD6:: @ 83FECD6
.incbin "baserom.gba", 0x3FECD6, 0xA
.2byte 0x0004, 0x0004, 0x0004, 0x0010
.align 2
gUnknown_83FECE0:: @ 83FECE0
.incbin "baserom.gba", 0x3FECE0, 0x8
.4byte sub_80DBB18
.4byte sub_80DBB3C
.align 2
gUnknown_83FECE8:: @ 83FECE8
.incbin "baserom.gba", 0x3FECE8, 0xC
.4byte sub_80DC318
.4byte sub_80DC348
.4byte sub_80DC3A8
gUnknown_83FECF4:: @ 83FECF4
.incbin "baserom.gba", 0x3FECF4, 0x6
.byte 0, 0, 1, 2, 3
.align 1
gUnknown_83FECFA:: @ 83FECFA
.incbin "baserom.gba", 0x3FECFA, 0x6
.2byte 0x0007, 0x000f
data/field_map_obj.s
+9 -1
View File
@@ -531,7 +531,15 @@ gUnknown_8398008:: @ 8398008
gUnknown_8398028:: @ 8398028
.incbin "graphics/map_objects/12.gbapal"
.incbin "baserom.gba", 0x398048, 0x1340
.incbin "baserom.gba", 0x398048, 0x600
gUnknown_8398648::
.incbin "graphics/map_objects/fldeff_cut.4bpp"
.incbin "graphics/map_objects/fldeff_cut.4bpp"
gUnknown_8398688::
.incbin "graphics/map_objects/fldeff_cut.gbapal"
.incbin "baserom.gba", 0x3986A8, 0xCE0
gUnknown_8399388:: @ 8399388
.incbin "baserom.gba", 0x399388, 0x908
data/field_tasks.s
+17 -2
View File
@@ -1,7 +1,22 @@
.section .rodata
.align 2
gUnknown_83A7310:: @ 83A7310
.incbin "baserom.gba", 0x3A7310, 0x20
.4byte nullsub_40
.4byte sub_806EB54
.4byte nullsub_40
.4byte nullsub_40
.4byte sub_806E9E0
.4byte nullsub_40
.4byte nullsub_40
.4byte sub_806EC40
gUnknown_83A7330:: @ 83A7330
.incbin "baserom.gba", 0x3A7330, 0x14
.byte 0x08, 0x03
.byte 0x0a, 0x05
.byte 0x0f, 0x05
.byte 0x08, 0x09
.byte 0x09, 0x09
.byte 0x10, 0x09
.byte 0x08, 0x0a
.byte 0x09, 0x0a
.byte 0x08, 0x0e
data/fldeff_cut.s
+27 -3
View File
@@ -7,10 +7,34 @@
.align 2
gUnknown_83D4100:: @ 83D4100
.incbin "baserom.gba", 0x3D4100, 0x44
.2byte 0x000d, 0x0001
.2byte 0x000a, 0x0013
.2byte 0x000b, 0x000e
.2byte 0x000c, 0x000f
.2byte 0x0352, 0x033e
.2byte 0x0300, 0x0310
.2byte 0x0301, 0x0311
.2byte 0x0302, 0x0312
.2byte 0x0284, 0x0281
.2byte 0xffff, 0xffff
.align 2
gOamData_83D4128::
.4byte 0x00000000, 0x00001401
gAnimCmd_83D4130::
obj_image_anim_frame 0, 30
obj_image_anim_jump 0
gSpriteAnimTable_83D4138::
.4byte gAnimCmd_83D4130
gUnknown_83D413C::
obj_frame_tiles gUnknown_8398648, 0x20
gUnknown_83D4144::
.incbin "baserom.gba", 0x3D4144, 0x8
obj_pal gUnknown_8398688, 4096
gUnknown_83D414C:: @ 83D414C
.incbin "baserom.gba", 0x3D414C, 0x18
spr_template 0xFFFF, 4096, gOamData_83D4128, gSpriteAnimTable_83D4138, gUnknown_83D413C, gDummySpriteAffineAnimTable, objc_8097BA8
data/item_use.s
-15
View File
@@ -1,15 +0,0 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.incbin "baserom.gba", 0x3E27B4, 0x1A0
gUnknown_83E2954:: @ 83E2954
.4byte sub_8124C8C
.4byte CB2_ReturnToField
.4byte NULL
.4byte NULL
data/learn_move.s
-28
View File
@@ -1,28 +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_83FF9F4:: @ 83FF9F4
.incbin "baserom.gba", 0x3FF9F4, 0x8
gUnknown_83FF9FC:: @ 83FF9FC
.incbin "baserom.gba", 0x3FF9FC, 0x28
gUnknown_83FFA24:: @ 83FFA24
.incbin "baserom.gba", 0x3FFA24, 0x18
gUnknown_83FFA3C:: @ 83FFA3C
.incbin "baserom.gba", 0x3FFA3C, 0x8
gUnknown_83FFA44:: @ 83FFA44
.incbin "baserom.gba", 0x3FFA44, 0x48
gUnknown_83FFA8C:: @ 83FFA8C
.incbin "baserom.gba", 0x3FFA8C, 0x8
gUnknown_83FFA94:: @ 83FFA94
.incbin "baserom.gba", 0x3FFA94, 0x30
data/map_name_popup.s
-10
View File
@@ -1,10 +0,0 @@
#include "constants/maps.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_83D4164:: @ 83D4164
.incbin "baserom.gba", 0x3D4164, 0x8
data/metatile_behavior.s
-6
View File
@@ -1,6 +0,0 @@
.section .rodata
.align 2
gUnknown_8353068:: @ 8353068
.incbin "baserom.gba", 0x353068, 0x8420
data/mevent/script_common.inc
-87
View File
@@ -1,87 +0,0 @@
gMEventSrvScript_UnableToSend::
.4byte 0x12, 0x10, gMEventClientScript_UnableToRecv @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x0a, NULL @ RETURN (can't send)
.4byte 0x12, 0x10, gMEventClientScript_CommError @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x0b, NULL @ RETURN (comm error)
.4byte 0x12, 0x10, gMEventClientScript_OtherTrainerCanceled @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x09, NULL @ RETURN (other trn canceled)
gMEventSrvScript_OtherTrnHasNews::
.4byte 0x12, 0x10, gMEventClientScript_AlreadyHadNews @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x07, NULL @ RETURN (other trn has news)
gMEventSrvScript_SentNewsSuccess::
.4byte 0x12, 0x28, gMEventClientScript_ReceiveNewsAndValidate @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x0e, 0x00, NULL @ SEND_NEWS
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x13, NULL @ RECV
.4byte 0x08, 0x00, NULL @ READWORD
.4byte 0x04, 0x01, gMEventSrvScript_OtherTrnHasNews @ BRANCH_EQ
.4byte 0x12, 0x10, gMEventClientScript_RecvNewsSuccess @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x03, NULL @ RETURN (news sent to)
gMEventSrvScript_SendCardSuccess::
.4byte 0x12, 0x30, gMEventClientScript_ReceiveCardAndReturnSuccess @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x0d, 0x00, NULL @ SEND_CARD
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x0f, 0x00, NULL @ BUFFER_SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x02, NULL @ RETURN (card sent to)
gMEventSrvScript_AskClientToOverwriteCard::
.4byte 0x12, 0x28, gMEventClientScript_AskWouldLikeToTossCard @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x13, NULL @ RECV
.4byte 0x08, 0x00, NULL @ READWORD
.4byte 0x04, 0x00, gMEventSrvScript_SendCardSuccess @ BRANCH_EQ
.4byte 0x03, 0x00, gMEventSrvScript_OtherTrainerCanceled @ BRANCH
gMEventSrvScript_OtherTrnHasCard::
.4byte 0x12, 0x10, gMEventClientScript_AlreadyHadCard @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x05, NULL @ RETURN (other trn has card)
.4byte 0x12, 0x10, gMEventClientScript_NothingSentOver @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x14, NULL @ RECV
.4byte 0x00, 0x00, NULL @ RETURN (nothing sent over)
gMEventSrvScript_SendNews:: @ 8468B6C
.4byte 0x1b, 0x00, NULL @ BUFFER_SAVED_NEWS
.4byte 0x12, 0x20, gMEventClientScript_Send1442CC @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x11, NULL @ RECV
.4byte 0x05, 0x00, NULL @ READ_1442CC
.4byte 0x06, 0x00, NULL @ VALID_1442CC
.4byte 0x04, 0x00, gMEventSrvScript_UnableToSend @ BRANCH_EQ
.4byte 0x03, 0x00, gMEventSrvScript_SentNewsSuccess @ BRANCH
gMEventSrvScript_SendCard:: @ 8468BCC
.4byte 0x1a, 0x00, NULL @ BUFFER_SAVED_CARD
.4byte 0x1c, 0x00, NULL @ RAM_SCRIPT_IF_VALID
.4byte 0x12, 0x20, gMEventClientScript_Send1442CC @ SEND
.4byte 0x01, 0x00, NULL @ WAIT SEND
.4byte 0x02, 0x11, NULL @ RECV
.4byte 0x05, 0x00, NULL @ READ_1442CC
.4byte 0x06, 0x00, NULL @ VALID_1442CC
.4byte 0x04, 0x00, gMEventSrvScript_UnableToSend @ BRANCH_EQ
.4byte 0x07, 0x00, NULL @ CHECK_1442CC_14
.4byte 0x04, 0x02, gMEventSrvScript_AskClientToOverwriteCard @ BRANCH_EQ
.4byte 0x04, 0x00, gMEventSrvScript_SendCardSuccess @ BRANCH_EQ
.4byte 0x03, 0x00, gMEventSrvScript_OtherTrnHasCard @ BRANCH
data/mevent/script_ish.inc
-65
View File
@@ -1,65 +0,0 @@
gMEventClientScript_InotialListen:: @ 84687E0
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
gMEventClientScript_Send1442CC::
.4byte 0x08, 0x00 @ SEND HEADER MAYBE
.4byte 0x03, 0x00 @ WAIT SEND
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
gMEventClientScript_UnableToRecv:: @ can't accept card or news
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x0a @ RETURN 0x0a
gMEventClientScript_CommError:: @ comm error
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x0b @ RETURN 0x0b
gMEventClientScript_NothingSentOver:: @ nothing sent
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x00 @ RETURN 0x00
gMEventClientScript_ReceiveCardAndReturnSuccess:: @ card success
.4byte 0x02, 0x16 @ RECEIVE ID(0x16)
.4byte 0x0a, 0x00 @ RECEIVE_TO_SAVE_FILE
.4byte 0x02, 0x19 @ RECEIVE ID(0x19)
.4byte 0x11, 0x00 @ RECEIVE_TO_RAM_SCRIPT
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x02 @ RETURN 0x02
gMEventClientScript_ReceiveNewsAndValidate::
.4byte 0x02, 0x17 @ RECEIVE ID(0x17)
.4byte 0x09, 0x00 @ VALIDATE NEWS
.4byte 0x03, 0x00 @ WAIT SEND
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
gMEventClientScript_AlreadyHadNews:: @ already had news
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x07 @ RETURN 0x07
gMEventClientScript_RecvNewsSuccess:: @ news success
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x03 @ RETURN 0x03
gMEventClientScript_AskWouldLikeToTossCard::
.4byte 0x0d, 0x00 @ REQUEST PARAMETER
.4byte 0x0e, 0x00 @ SEND PARAMETER
.4byte 0x03, 0x00 @ WAIT SEND
.4byte 0x02, 0x10 @ RECEIVE ID(0x10)
.4byte 0x04, 0x00 @ JUMP TO RECEIVE BUFFER
gMEventClientScript_OtherTrainerCanceled:: @ comm canceled
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x09 @ RETURN 0x09
gMEventClientScript_AlreadyHadCard:: @ already had card
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x05 @ RETURN 0x05
gMEventClientScript_SuccessFromBuffer:: @ success from buffer
.4byte 0x02, 0x15 @ RECEIVE ID(0x15)
.4byte 0x0c, 0x00 @ READ PACKET AND COMPUTE SOMETHING
.4byte 0x14, 0x00 @ SEND ALL
.4byte 0x01, 0x0d @ RETURN 0x0d
data/data_8468C98.s → data/pokemon_jump.s
-117
View File
@@ -179,120 +179,3 @@ gUnknown_846E2CC:: @ 846E2CC
gUnknown_846E2D4:: @ 846E2D4
.incbin "baserom.gba", 0x46E2D4, 0xC
gUnknown_846E2E0:: @ 846E2E0
.incbin "baserom.gba", 0x46E2E0, 0x8
gUnknown_846E2E8:: @ 846E2E8
.incbin "baserom.gba", 0x46E2E8, 0x8
gUnknown_846E2F0:: @ 846E2F0
.incbin "baserom.gba", 0x46E2F0, 0x24
gUnknown_846E314:: @ 846E314
.incbin "baserom.gba", 0x46E314, 0x14
gUnknown_846E328:: @ 846E328
.incbin "baserom.gba", 0x46E328, 0x24
gUnknown_846E34C:: @ 846E34C
.incbin "baserom.gba", 0x46E34C, 0x68
gUnknown_846E3B4:: @ 846E3B4
.incbin "baserom.gba", 0x46E3B4, 0x10
gUnknown_846E3C4:: @ 846E3C4
.incbin "baserom.gba", 0x46E3C4, 0x4
gUnknown_846E3C8:: @ 846E3C8
.incbin "baserom.gba", 0x46E3C8, 0x4
gUnknown_846E3CC:: @ 846E3CC
.incbin "baserom.gba", 0x46E3CC, 0x4
gUnknown_846E3D0:: @ 846E3D0
.incbin "baserom.gba", 0x46E3D0, 0xC
gUnknown_846E3DC:: @ 846E3DC
.incbin "baserom.gba", 0x46E3DC, 0x3
gUnknown_846E3DF:: @ 846E3DF
.incbin "baserom.gba", 0x46E3DF, 0x3
gUnknown_846E3E2:: @ 846E3E2
.incbin "baserom.gba", 0x46E3E2, 0x3
gUnknown_846E3E5:: @ 846E3E5
.incbin "baserom.gba", 0x46E3E5, 0x6
gUnknown_846E3EB:: @ 846E3EB
.incbin "baserom.gba", 0x46E3EB, 0x5
gUnknown_846E3F0:: @ 846E3F0
.incbin "baserom.gba", 0x46E3F0, 0x8
gUnknown_846E3F8:: @ 846E3F8
.incbin "baserom.gba", 0x46E3F8, 0x50
gUnknown_846E448:: @ 846E448
.incbin "baserom.gba", 0x46E448, 0x8
gUnknown_846E450:: @ 846E450
.incbin "baserom.gba", 0x46E450, 0x940
gUnknown_846ED90:: @ 846ED90
.incbin "baserom.gba", 0x46ED90, 0x130
gUnknown_846EEC0:: @ 846EEC0
.incbin "baserom.gba", 0x46EEC0, 0x198
gUnknown_846F058:: @ 846F058
.incbin "baserom.gba", 0x46F058, 0x228
gUnknown_846F280:: @ 846F280
.incbin "baserom.gba", 0x46F280, 0x14
gUnknown_846F294:: @ 846F294
.incbin "baserom.gba", 0x46F294, 0x3C
gUnknown_846F2D0:: @ 846F2D0
.incbin "baserom.gba", 0x46F2D0, 0x1
gUnknown_846F2D1:: @ 846F2D1
.incbin "baserom.gba", 0x46F2D1, 0x5
gUnknown_846F2D6:: @ 846F2D6
.incbin "baserom.gba", 0x46F2D6, 0x1
gUnknown_846F2D7:: @ 846F2D7
.incbin "baserom.gba", 0x46F2D7, 0x15
gUnknown_846F2EC:: @ 846F2EC
.incbin "baserom.gba", 0x46F2EC, 0xC
gUnknown_846F2F8:: @ 846F2F8
.incbin "baserom.gba", 0x46F2F8, 0x28
gUnknown_846F320:: @ 846F320
.incbin "baserom.gba", 0x46F320, 0xF0
gUnknown_846F410:: @ 846F410
.incbin "baserom.gba", 0x46F410, 0x18
gUnknown_846F428:: @ 846F428
.incbin "baserom.gba", 0x46F428, 0x18
gUnknown_846F440:: @ 846F440
.incbin "baserom.gba", 0x46F440, 0x18
gUnknown_846F458:: @ 846F458
.incbin "baserom.gba", 0x46F458, 0x18
gUnknown_846F470:: @ 846F470
.incbin "baserom.gba", 0x46F470, 0x18
gUnknown_846F488:: @ 846F488
.incbin "baserom.gba", 0x46F488, 0x30
gUnknown_846F4B8:: @ 846F4B8
.incbin "baserom.gba", 0x46F4B8, 0x18
data/save_failed_screen.s
+1 -1
View File
@@ -7,4 +7,4 @@
.align 2
gUnknown_841EE44:: @ 841EE44
.incbin "baserom.gba", 0x41EE44, 0x20
.incbin "graphics/interface/save_failed_screen.gbapal"
data/specials.inc
+1 -1
View File
@@ -239,7 +239,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special Special_GetLeadMonFriendship
def_special sub_80E5970
def_special ScrSpecial_BattleTowerMapScript2
def_special ChooseNextBattleTowerTrainer
def_special CheckPartyBattleTowerBanlist
def_special PrintBattleTowerTrainerGreeting
data/strings.s
+9 -9
View File
@@ -4535,17 +4535,17 @@ gDaycareText_PlayOther:: @ 841E3A8
.string "The two prefer to play with other\n"
.string "POKéMON than each other.$"
gUnknown_841E3E3:: @ 841E3E3
gText_TeachWhichMoveToMon:: @ 841E3E3
.string "Teach which move to {STR_VAR_1}?$"
gUnknown_841E3FB:: @ 841E3FB
gText_TeachMoveQues:: @ 841E3FB
.string "Teach {STR_VAR_2}?$"
gUnknown_841E405:: @ 841E405
gText_MonLearnedMove:: @ 841E405
.string "{STR_VAR_1} learned\n"
.string "{STR_VAR_2}.$"
gUnknown_841E414:: @ 841E414
gText_MonIsTryingToLearnMove:: @ 841E414
.string "{STR_VAR_1} is trying to learn\n"
.string "{STR_VAR_2}.\p"
.string "But {STR_VAR_1} can't learn more\n"
@@ -4553,24 +4553,24 @@ gUnknown_841E414:: @ 841E414
.string "Delete an older move to make\n"
.string "room for {STR_VAR_2}?$"
gUnknown_841E481:: @ 841E481
gText_StopLearningMove:: @ 841E481
.string "Stop learning {STR_VAR_2}?$"
gUnknown_841E493:: @ 841E493
gText_1_2_and_Poof:: @ 841E493
.string "{PAUSE 0x20}1, {PAUSE 0x0F}2, and {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}‥ {PAUSE 0x0F}{PLAY_SE SE_KON}Poof!\p"
.string "$"
gUnknown_841E4C0:: @ 841E4C0
gText_MonForgotOldMoveAndMonLearnedNewMove:: @ 841E4C0
.string "{STR_VAR_1} forgot {STR_VAR_3}.\p"
.string "And‥\p"
.string "{STR_VAR_1}\n"
.string "learned {STR_VAR_2}.$"
gUnknown_841E4E2:: @ 841E4E2
gText_GiveUpTryingToTeachNewMove:: @ 841E4E2
.string "Give up trying to teach a new\n"
.string "move to {STR_VAR_1}?$"
gUnknown_841E50C:: @ 841E50C
gText_WhichMoveShouldBeForgotten:: @ 841E50C
.string "Which move should be forgotten?\p"
.string "$"
data/unknown_serial_data.s
+1 -1
View File
@@ -1,5 +1,5 @@
.section .rodata
gUnknownSerialData_Start:: @ 86FC50C
.incbin "baserom.gba", 0x6FC50C, 0x3760
.incbin "data/unknown_serial_data.bin"
gUnknownSerialData_End::