From b3c788f2ca9e3d0ab6e43617ed7fedfe605bc249 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 19 Sep 2017 21:01:12 +0200 Subject: begin work on battle4, organize battle headers --- data/battle_scripts_1.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index ca599631c..b3dafed16 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -9,7 +9,7 @@ gUnknown_082D86A8:: @ 82D86A8 gUnknown_082D8A30:: @ 82D8A30 .incbin "baserom.gba", 0x2d8a30, 0x1e -gUnknown_082D8A4E:: @ 82D8A4E +BattleScript_MoveEnd:: @ 82D8A4E .incbin "baserom.gba", 0x2d8a4e, 0x12 gUnknown_082D8A60:: @ 82D8A60 @@ -198,7 +198,7 @@ BattleScript_NoMovesLeft:: @ 82DB072 gUnknown_082DB076:: @ 82DB076 .incbin "baserom.gba", 0x2db076, 0x4 -gUnknown_082DB07A:: @ 82DB07A +BattleScript_NoPPForMove:: @ 82DB07A .incbin "baserom.gba", 0x2db07a, 0xf gUnknown_082DB089:: @ 82DB089 @@ -240,10 +240,10 @@ gUnknown_082DB185:: @ 82DB185 gUnknown_082DB18D:: @ 82DB18D .incbin "baserom.gba", 0x2db18d, 0x7 -gUnknown_082DB194:: @ 82DB194 +BattleScript_MagicCoatBounce:: @ 82DB194 .incbin "baserom.gba", 0x2db194, 0x18 -gUnknown_082DB1AC:: @ 82DB1AC +BattleScript_SnatchedMove:: @ 82DB1AC .incbin "baserom.gba", 0x2db1ac, 0x1b gUnknown_082DB1C7:: @ 82DB1C7 @@ -360,7 +360,7 @@ gUnknown_082DB4C1:: @ 82DB4C1 BattleScript_DroughtActivates:: @ 82DB52A .incbin "baserom.gba", 0x2db52a, 0x14 -gUnknown_082DB53E:: @ 82DB53E +BattleScript_TookAttack:: @ 82DB53E .incbin "baserom.gba", 0x2db53e, 0x14 gUnknown_082DB552:: @ 82DB552 -- cgit v1.2.3 From b4875d82d50b0649c2289b9e470ca0a9ae23782d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Sep 2017 00:28:00 +0200 Subject: more battle 4 --- data/battle_scripts_1.s | 2 +- data/data2b.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index b3dafed16..aab0de4e3 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -90,7 +90,7 @@ gUnknown_082DAB11:: @ 82DAB11 gUnknown_082DAB15:: @ 82DAB15 .incbin "baserom.gba", 0x2dab15, 0xa4 -gUnknown_082DABB9:: @ 82DABB9 +BattleScript_Pausex20:: @ 82DABB9 .incbin "baserom.gba", 0x2dabb9, 0x4 gUnknown_082DABBD:: @ 82DABBD diff --git a/data/data2b.s b/data/data2b.s index 1499c51fe..5df0bdf54 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -202,7 +202,7 @@ gUnknown_0831ACA0:: @ 831ACA0 gUnknown_0831ACE0:: @ 831ACE0 .incbin "baserom.gba", 0x31ace0, 0x8 -gUnknown_0831ACE8:: @ 831ACE8 +gTypeEffectiveness:: @ 831ACE8 .incbin "baserom.gba", 0x31ace8, 0x150 @ 831AE38 -- cgit v1.2.3 From 28da80e19af3270b827e98c2e7c69c0199d14d05 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Sep 2017 12:56:45 +0200 Subject: battle 4 up to SetMoveEffect --- data/battle_message.s | 2 +- data/battle_scripts_1.s | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index 93a921b5e..df6380640 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -596,7 +596,7 @@ gUnknown_085CC23E:: @ 85CC23E gUnknown_085CC270:: @ 85CC270 .incbin "baserom.gba", 0x5cc270, 0x5c4 -gUnknown_085CC834:: @ 85CC834 +gMissStringIds:: @ 85CC834 .incbin "baserom.gba", 0x5cc834, 0x14e gUnknown_085CC982:: @ 85CC982 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index aab0de4e3..23ef731d1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -246,10 +246,10 @@ BattleScript_MagicCoatBounce:: @ 82DB194 BattleScript_SnatchedMove:: @ 82DB1AC .incbin "baserom.gba", 0x2db1ac, 0x1b -gUnknown_082DB1C7:: @ 82DB1C7 +BattleScript_EnduredMsg:: @ 82DB1C7 .incbin "baserom.gba", 0x2db1c7, 0x7 -gUnknown_082DB1CE:: @ 82DB1CE +BattleScript_OneHitKOMsg:: @ 82DB1CE .incbin "baserom.gba", 0x2db1ce, 0x7 gUnknown_082DB1D5:: @ 82DB1D5 @@ -450,7 +450,7 @@ gUnknown_082DB6D9:: @ 82DB6D9 gUnknown_082DB6F0:: @ 82DB6F0 .incbin "baserom.gba", 0x2db6f0, 0xb -gUnknown_082DB6FB:: @ 82DB6FB +BattleScript_SubstituteFade:: @ 82DB6FB .incbin "baserom.gba", 0x2db6fb, 0xb BattleScript_BerryCurePrlzEnd2:: @ 82DB706 @@ -516,7 +516,7 @@ BattleScript_ItemHealHP_Ret:: @ 82DB7F7 gUnknown_082DB812:: @ 82DB812 .incbin "baserom.gba", 0x2db812, 0x4 -gUnknown_082DB816:: @ 82DB816 +BattleScript_HangedOnMsg:: @ 82DB816 .incbin "baserom.gba", 0x2db816, 0xe BattleScript_BerryConfuseHealEnd2:: @ 82DB824 -- cgit v1.2.3 From 0c7555e237e44e0c0056946822e861ec022fcefe Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 20 Sep 2017 22:54:26 +0200 Subject: SetMoveEffect functionally equivalent and close --- data/battle_message.s | 2 +- data/battle_scripts_1.s | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'data') diff --git a/data/battle_message.s b/data/battle_message.s index df6380640..c48b40b73 100644 --- a/data/battle_message.s +++ b/data/battle_message.s @@ -599,7 +599,7 @@ gUnknown_085CC270:: @ 85CC270 gMissStringIds:: @ 85CC834 .incbin "baserom.gba", 0x5cc834, 0x14e -gUnknown_085CC982:: @ 85CC982 +gTrappingMoves:: @ 85CC982 .incbin "baserom.gba", 0x5cc982, 0xe gUnknown_085CC990:: @ 85CC990 diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 23ef731d1..7a013c51c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -15,10 +15,10 @@ BattleScript_MoveEnd:: @ 82D8A4E gUnknown_082D8A60:: @ 82D8A60 .incbin "baserom.gba", 0x2d8a60, 0x274 -gUnknown_082D8CD4:: @ 82D8CD4 +BattleScript_StatUp:: @ 82D8CD4 .incbin "baserom.gba", 0x2d8cd4, 0x91 -gUnknown_082D8D65:: @ 82D8D65 +BattleScript_StatDown:: @ 82D8D65 .incbin "baserom.gba", 0x2d8d65, 0x6fd BattleScript_MoveUsedMustRecharge:: @ 82D9462 @@ -174,10 +174,10 @@ gUnknown_082DAF05:: @ 82DAF05 gUnknown_082DAF20:: @ 82DAF20 .incbin "baserom.gba", 0x2daf20, 0x7 -gUnknown_082DAF27:: @ 82DAF27 +BattleScript_AllStatsUp:: @ 82DAF27 .incbin "baserom.gba", 0x2daf27, 0x9c -gUnknown_082DAFC3:: @ 82DAFC3 +BattleScript_RapidSpinAway:: @ 82DAFC3 .incbin "baserom.gba", 0x2dafc3, 0x2 gUnknown_082DAFC5:: @ 82DAFC5 @@ -222,10 +222,10 @@ BattleScript_WishComesTrue:: @ 82DB0B7 BattleScript_IngrainTurnHeal:: @ 82DB0EE .incbin "baserom.gba", 0x2db0ee, 0x29 -gUnknown_082DB117:: @ 82DB117 +BattleScript_AtkDefDown:: @ 82DB117 .incbin "baserom.gba", 0x2db117, 0x51 -gUnknown_082DB168:: @ 82DB168 +BattleScript_KnockedOff:: @ 82DB168 .incbin "baserom.gba", 0x2db168, 0xe BattleScript_MoveUsedIsImprisoned:: @ 82DB176 @@ -252,7 +252,7 @@ BattleScript_EnduredMsg:: @ 82DB1C7 BattleScript_OneHitKOMsg:: @ 82DB1CE .incbin "baserom.gba", 0x2db1ce, 0x7 -gUnknown_082DB1D5:: @ 82DB1D5 +BattleScript_SAtkDown2:: @ 82DB1D5 .incbin "baserom.gba", 0x2db1d5, 0x2a gUnknown_082DB1FF:: @ 82DB1FF @@ -321,13 +321,13 @@ BattleScript_NightmareTurnDmg:: @ 82DB33F BattleScript_CurseTurnDmg:: @ 82DB350 .incbin "baserom.gba", 0x2db350, 0x11 -gUnknown_082DB361:: @ 82DB361 +BattleScript_TargetPRLZHeal:: @ 82DB361 .incbin "baserom.gba", 0x2db361, 0x17 BattleScript_YawnMakesAsleep:: @ 82DB378 .incbin "baserom.gba", 0x2db378, 0xaa -gUnknown_082DB422:: @ 82DB422 +BattleScript_ItemSteal:: @ 82DB422 .incbin "baserom.gba", 0x2db422, 0xe BattleScript_DrizzleActivates:: @ 82DB430 @@ -390,19 +390,19 @@ BattleScript_FlashFireBoost:: @ 82DB5A8 gUnknown_082DB5C7:: @ 82DB5C7 .incbin "baserom.gba", 0x2db5c7, 0xa -gUnknown_082DB5D1:: @ 82DB5D1 +BattleScript_BRNPrevention:: @ 82DB5D1 .incbin "baserom.gba", 0x2db5d1, 0xc -gUnknown_082DB5DD:: @ 82DB5DD +BattleScript_PRLZPrevention:: @ 82DB5DD .incbin "baserom.gba", 0x2db5dd, 0xc -gUnknown_082DB5E9:: @ 82DB5E9 +BattleScript_PSNPrevention:: @ 82DB5E9 .incbin "baserom.gba", 0x2db5e9, 0xc gUnknown_082DB5F5:: @ 82DB5F5 .incbin "baserom.gba", 0x2db5f5, 0xe -gUnknown_082DB603:: @ 82DB603 +BattleScript_FlinchPrevention:: @ 82DB603 .incbin "baserom.gba", 0x2db603, 0x1c BattleScript_SoundproofProtected:: @ 82DB61F @@ -429,7 +429,7 @@ BattleScript_ApplySecondaryEffect:: @ 82DB67C BattleScript_SynchronizeActivates:: @ 82DB67F .incbin "baserom.gba", 0x2db67f, 0x3 -gUnknown_082DB682:: @ 82DB682 +BattleScript_NoItemSteal:: @ 82DB682 .incbin "baserom.gba", 0x2db682, 0xa gUnknown_082DB68C:: @ 82DB68C -- cgit v1.2.3 From d5afb0c6e9566a62ca6d597aeabc173b2c3e7fa5 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Fri, 22 Sep 2017 21:33:49 +0200 Subject: up to x48 and troubles --- data/battle_scripts_1.s | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 7a013c51c..0d94d31b0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -33,10 +33,10 @@ gUnknown_082D9EFB:: @ 82D9EFB gUnknown_082D9F1C:: @ 82D9F1C .incbin "baserom.gba", 0x2d9f1c, 0x88e -gUnknown_082DA7AA:: @ 82DA7AA +BattleScript_FaintAttacker:: @ 82DA7AA .incbin "baserom.gba", 0x2da7aa, 0xd -gUnknown_082DA7B7:: @ 82DA7B7 +BattleScript_FaintTarget:: @ 82DA7B7 .incbin "baserom.gba", 0x2da7b7, 0xd gUnknown_082DA7C4:: @ 82DA7C4 @@ -93,7 +93,7 @@ gUnknown_082DAB15:: @ 82DAB15 BattleScript_Pausex20:: @ 82DABB9 .incbin "baserom.gba", 0x2dabb9, 0x4 -gUnknown_082DABBD:: @ 82DABBD +BattleScript_LevelUp:: @ 82DABBD .incbin "baserom.gba", 0x2dabbd, 0x6f gUnknown_082DAC2C:: @ 82DAC2C @@ -156,7 +156,7 @@ gUnknown_082DAE2A:: @ 82DAE2A BattleScript_EncoredNoMore:: @ 82DAE37 .incbin "baserom.gba", 0x2dae37, 0x7 -gUnknown_082DAE3E:: @ 82DAE3E +BattleScript_DestinyBondTakesLife:: @ 82DAE3E .incbin "baserom.gba", 0x2dae3e, 0x1b gUnknown_082DAE59:: @ 82DAE59 @@ -237,7 +237,7 @@ gUnknown_082DB181:: @ 82DB181 gUnknown_082DB185:: @ 82DB185 .incbin "baserom.gba", 0x2db185, 0x8 -gUnknown_082DB18D:: @ 82DB18D +BattleScript_GrudgeTakesPp:: @ 82DB18D .incbin "baserom.gba", 0x2db18d, 0x7 BattleScript_MagicCoatBounce:: @ 82DB194 @@ -411,7 +411,7 @@ BattleScript_SoundproofProtected:: @ 82DB61F gUnknown_082DB62F:: @ 82DB62F .incbin "baserom.gba", 0x2db62f, 0x10 -gUnknown_082DB63F:: @ 82DB63F +BattleScript_StickyHoldOnKnockOff:: @ 82DB63F .incbin "baserom.gba", 0x2db63f, 0xe BattleScript_ColorChangeActivates:: @ 82DB64D -- cgit v1.2.3 From 601fc9e85b383792819768c31728e4855e854f32 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 23 Sep 2017 20:13:45 +0200 Subject: atk49 is matching baby WOHOHOHOHO --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 0d94d31b0..14305b7a2 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -3,7 +3,7 @@ .section script_data, "aw", %progbits -gUnknown_082D86A8:: @ 82D86A8 +gBattleScriptsForMoveEffects:: @ 82D86A8 .incbin "baserom.gba", 0x2d86a8, 0x388 gUnknown_082D8A30:: @ 82D8A30 @@ -138,7 +138,7 @@ gUnknown_082DADD8:: @ 82DADD8 gUnknown_082DAE03:: @ 82DAE03 .incbin "baserom.gba", 0x2dae03, 0xa -gUnknown_082DAE0D:: @ 82DAE0D +BattleScript_RageIsBuilding:: @ 82DAE0D .incbin "baserom.gba", 0x2dae0d, 0x7 BattleScript_MoveUsedIsDisabled:: @ 82DAE14 @@ -279,7 +279,7 @@ BattleScript_MoveUsedIsFrozen:: @ 82DB26A BattleScript_MoveUsedUnfroze:: @ 82DB277 .incbin "baserom.gba", 0x2db277, 0xb -gUnknown_082DB282:: @ 82DB282 +BattleScript_DefrostedViaFireMove:: @ 82DB282 .incbin "baserom.gba", 0x2db282, 0x9 BattleScript_MoveUsedIsParalyzed:: @ 82DB28B -- cgit v1.2.3 From 52a951276f8d4b79195a0d4889503e4a7f096024 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 25 Sep 2017 00:09:13 +0200 Subject: battle 4, up to x69 --- data/data2b.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data2b.s b/data/data2b.s index 5df0bdf54..fd72e835e 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -209,7 +209,7 @@ gTypeEffectiveness:: @ 831ACE8 .include "data/text/type_names.inc" .align 2 -gUnknown_0831AEB8:: @ 831AEB8 +gTrainerMoneyTable:: @ 831AEB8 .incbin "baserom.gba", 0x31aeb8, 0xe0 @ 831AF98 -- cgit v1.2.3 From d769ec137447c52062b48153851bd2824055b6df Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 26 Sep 2017 22:39:59 +0200 Subject: battle 4 up to a8 --- data/battle_4.s | 51 +++---------------------------------------------- data/battle_scripts_1.s | 38 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 67 deletions(-) (limited to 'data') diff --git a/data/battle_4.s b/data/battle_4.s index 3300b25ee..8f1872733 100644 --- a/data/battle_4.s +++ b/data/battle_4.s @@ -5,51 +5,6 @@ .section .rodata - -gMoveEffectBS_Ptrs:: @ 831C224 - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB386 - .4byte gUnknown_082DB395 - .4byte gUnknown_082DB3A4 - .4byte gUnknown_082DB3B3 - .4byte gUnknown_082DB3C9 - .4byte gUnknown_082DB3E6 - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB3C2 - .4byte gUnknown_082DB3D6 - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB3DD - .4byte gUnknown_082DB3F4 - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB36A - .4byte gUnknown_082DB3F4 - - .align 2 - window_template 0x00, 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x003f - .align 2 gUnknown_0831C2C8:: @ 831C2C8 .incbin "graphics/battle_interface/unk_battlebox.gbapal" @@ -66,21 +21,21 @@ gUnknown_0831C3B8:: @ 831C3B8 .byte 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00 .align 2 -gUnknown_0831C3C0:: @ 831C3C0 +SpriteTemplate_MonIconOnLvlUpBox:: @ 831C3C0 .2byte 0xd75a @ tileTag .2byte 0xd75a @ paletteTag .4byte gUnknown_0831C3B8 .4byte gDummySpriteAnimTable .4byte NULL .4byte gDummySpriteAffineAnimTable - .4byte sub_804F450 + .4byte SpriteCB_MonIconOnLvlUpBox .align 2 sProtectSuccessRates:: @ 831C3D8 .2byte 0xffff, 0x7fff, 0x3fff, 0x1fff .align 2 -gUnknown_0831C3E0:: @ 831C3E0 +gMovesForbiddenToCopy:: @ 831C3E0 .2byte MOVE_METRONOME, MOVE_STRUGGLE, MOVE_SKETCH, MOVE_MIMIC .2byte 0xfffe, MOVE_COUNTER, MOVE_MIRROR_COAT, MOVE_PROTECT .2byte MOVE_DETECT, MOVE_ENDURE, MOVE_DESTINY_BOND, MOVE_SLEEP_TALK diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 44d0e7ed5..1fb6b8189 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -30,7 +30,7 @@ gUnknown_082D9EE1:: @ 82D9EE1 gUnknown_082D9EFB:: @ 82D9EFB .incbin "baserom.gba", 0x2d9efb, 0x21 -gUnknown_082D9F1C:: @ 82D9F1C +BattleScript_ButItFailed:: @ 82D9F1C .incbin "baserom.gba", 0x2d9f1c, 0x88e BattleScript_FaintAttacker:: @ 82DA7AA @@ -135,7 +135,7 @@ BattleScript_BideNoEnergyToAttack:: @ 82DADC4 gUnknown_082DADD8:: @ 82DADD8 .incbin "baserom.gba", 0x2dadd8, 0x2b -gUnknown_082DAE03:: @ 82DAE03 +BattleScript_MistProtected:: @ 82DAE03 .incbin "baserom.gba", 0x2dae03, 0xa BattleScript_RageIsBuilding:: @ 82DAE0D @@ -300,7 +300,7 @@ BattleScript_MoveUsedIsConfused:: @ 82DB2BD BattleScript_MoveUsedIsConfusedNoMore:: @ 82DB300 .incbin "baserom.gba", 0x2db300, 0x7 -gUnknown_082DB307:: @ 82DB307 +BattleScript_PrintPayDayMoneyString:: @ 82DB307 .incbin "baserom.gba", 0x2db307, 0x7 BattleScript_WrapTurnDmg:: @ 82DB30E @@ -324,40 +324,40 @@ BattleScript_CurseTurnDmg:: @ 82DB350 BattleScript_TargetPRLZHeal:: @ 82DB361 .incbin "baserom.gba", 0x2db361, 0x9 -gUnknown_082DB36A:: @ 82DB36A +BattleScript_MoveEffectSleep:: @ 82DB36A .incbin "baserom.gba", 0x2db36A, 0xE BattleScript_YawnMakesAsleep:: @ 82DB378 .incbin "baserom.gba", 0x2db378, 0xE -gUnknown_082DB386:: @ 82DB386 +BattleScript_MoveEffectPoison:: @ 82DB386 .incbin "baserom.gba", 0x2db386, 0xF -gUnknown_082DB395:: @ 82DB395 +BattleScript_MoveEffectBurn:: @ 82DB395 .incbin "baserom.gba", 0x2db395, 0xF -gUnknown_082DB3A4:: @ 82DB3A4 +BattleScript_MoveEffectFreeze:: @ 82DB3A4 .incbin "baserom.gba", 0x2db3A4, 0xF -gUnknown_082DB3B3:: @ 82DB3B3 +BattleScript_MoveEffectParalysis:: @ 82DB3B3 .incbin "baserom.gba", 0x2db3B3, 0xF -gUnknown_082DB3C2:: @ 82DB3C2 +BattleScript_MoveEffectUproar:: @ 82DB3C2 .incbin "baserom.gba", 0x2db3C2, 0x7 -gUnknown_082DB3C9:: @ 82DB3C9 +BattleScript_MoveEffectToxic:: @ 82DB3C9 .incbin "baserom.gba", 0x2db3C9, 0xD -gUnknown_082DB3D6:: @ 82DB3D6 +BattleScript_MoveEffectPayDay:: @ 82DB3D6 .incbin "baserom.gba", 0x2db3D6, 0x7 -gUnknown_082DB3DD:: @ 82DB3DD +BattleScript_MoveEffectWrap:: @ 82DB3DD .incbin "baserom.gba", 0x2db3DD, 0x9 -gUnknown_082DB3E6:: @ 82DB3E6 +BattleScript_MoveEffectConfusion:: @ 82DB3E6 .incbin "baserom.gba", 0x2db3E6, 0xE -gUnknown_082DB3F4:: @ 82DB3F4 +BattleScript_MoveEffectRecoil33:: @ 82DB3F4 .incbin "baserom.gba", 0x2db3F4, 0x2e BattleScript_ItemSteal:: @ 82DB422 @@ -396,10 +396,10 @@ BattleScript_DroughtActivates:: @ 82DB52A BattleScript_TookAttack:: @ 82DB53E .incbin "baserom.gba", 0x2db53e, 0x14 -gUnknown_082DB552:: @ 82DB552 +BattleScript_SturdyPreventsOHKO:: @ 82DB552 .incbin "baserom.gba", 0x2db552, 0xe -gUnknown_082DB560:: @ 82DB560 +BattleScript_DampStopsExplosion:: @ 82DB560 .incbin "baserom.gba", 0x2db560, 0xe BattleScript_MoveHPDrain_PPLoss:: @ 82DB56E @@ -420,7 +420,7 @@ BattleScript_FlashFireBoost_PPLoss:: @ 82DB5A7 BattleScript_FlashFireBoost:: @ 82DB5A8 .incbin "baserom.gba", 0x2db5a8, 0x1f -gUnknown_082DB5C7:: @ 82DB5C7 +BattleScript_AbilityNoStatLoss:: @ 82DB5C7 .incbin "baserom.gba", 0x2db5c7, 0xa BattleScript_BRNPrevention:: @ 82DB5D1 @@ -432,7 +432,7 @@ BattleScript_PRLZPrevention:: @ 82DB5DD BattleScript_PSNPrevention:: @ 82DB5E9 .incbin "baserom.gba", 0x2db5e9, 0xc -gUnknown_082DB5F5:: @ 82DB5F5 +BattleScript_ObliviousPreventsAttraction:: @ 82DB5F5 .incbin "baserom.gba", 0x2db5f5, 0xe BattleScript_FlinchPrevention:: @ 82DB603 @@ -441,7 +441,7 @@ BattleScript_FlinchPrevention:: @ 82DB603 BattleScript_SoundproofProtected:: @ 82DB61F .incbin "baserom.gba", 0x2db61f, 0x10 -gUnknown_082DB62F:: @ 82DB62F +BattleScript_AbilityNoSpecificStatLoss:: @ 82DB62F .incbin "baserom.gba", 0x2db62f, 0x10 BattleScript_StickyHoldOnKnockOff:: @ 82DB63F -- cgit v1.2.3 From 69928d3904a610791d5e34e32364d9ee5f9392ee Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 27 Sep 2017 23:43:45 +0200 Subject: battle 4 up to 0xE5 --- data/battle_4.s | 6 +++--- data/battle_scripts_1.s | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'data') diff --git a/data/battle_4.s b/data/battle_4.s index 8f1872733..0b8bd6e7e 100644 --- a/data/battle_4.s +++ b/data/battle_4.s @@ -43,18 +43,18 @@ gMovesForbiddenToCopy:: @ 831C3E0 .2byte MOVE_COVET, MOVE_TRICK, MOVE_FOCUS_PUNCH, 0xffff .align 2 -gUnknown_0831C408:: @ 831C408 +sFlailHpScaleToPowerTable:: @ 831C408 .byte 0x01, 0xc8, 0x04, 0x96, 0x09, 0x64, 0x10, 0x50 .byte 0x20, 0x28, 0x30, 0x14 .align 2 -gUnknown_0831C414:: @ 831C414 +sNaturePowerMoves:: @ 831C414 .2byte 0x004e, 0x004b, 0x0059, 0x0038 .2byte 0x0039, 0x003d, 0x009d, 0x00f7 .2byte 0x0081, 0x0081 .align 2 -gUnknown_0831C428:: @ 831C428 +sWeightToDamageTable:: @ 831C428 .2byte 0x0064, 0x0014, 0x00fa, 0x0028 .2byte 0x01f4, 0x003c, 0x03e8, 0x0050 .2byte 0x07d0, 0x0064, 0xffff, 0xffff diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 1fb6b8189..206519f40 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6,13 +6,13 @@ gBattleScriptsForMoveEffects:: @ 82D86A8 .incbin "baserom.gba", 0x2d86a8, 0x388 -gUnknown_082D8A30:: @ 82D8A30 +BattleScript_PresentDamageTarget:: @ 82D8A30 .incbin "baserom.gba", 0x2d8a30, 0x1e BattleScript_MoveEnd:: @ 82D8A4E .incbin "baserom.gba", 0x2d8a4e, 0x12 -gUnknown_082D8A60:: @ 82D8A60 +BattleScript_PauseEffectivenessSoundResultMsgEndMove:: @ 82D8A60 .incbin "baserom.gba", 0x2d8a60, 0x274 BattleScript_StatUp:: @ 82D8CD4 @@ -24,10 +24,10 @@ BattleScript_StatDown:: @ 82D8D65 BattleScript_MoveUsedMustRecharge:: @ 82D9462 .incbin "baserom.gba", 0x2d9462, 0xa7f -gUnknown_082D9EE1:: @ 82D9EE1 +BattleScript_PresentHealTarget:: @ 82D9EE1 .incbin "baserom.gba", 0x2d9ee1, 0x1a -gUnknown_082D9EFB:: @ 82D9EFB +BattleScript_AlreadyAtFullHp:: @ 82D9EFB .incbin "baserom.gba", 0x2d9efb, 0x21 BattleScript_ButItFailed:: @ 82D9F1C @@ -180,13 +180,13 @@ BattleScript_AllStatsUp:: @ 82DAF27 BattleScript_RapidSpinAway:: @ 82DAFC3 .incbin "baserom.gba", 0x2dafc3, 0x2 -gUnknown_082DAFC5:: @ 82DAFC5 +BattleScript_WrapFree:: @ 82DAFC5 .incbin "baserom.gba", 0x2dafc5, 0x11 -gUnknown_082DAFD6:: @ 82DAFD6 +BattleScript_LeechSeedFree:: @ 82DAFD6 .incbin "baserom.gba", 0x2dafd6, 0x7 -gUnknown_082DAFDD:: @ 82DAFDD +BattleScript_SpikesFree:: @ 82DAFDD .incbin "baserom.gba", 0x2dafdd, 0x7 gUnknown_082DAFE4:: @ 82DAFE4 @@ -444,7 +444,7 @@ BattleScript_SoundproofProtected:: @ 82DB61F BattleScript_AbilityNoSpecificStatLoss:: @ 82DB62F .incbin "baserom.gba", 0x2db62f, 0x10 -BattleScript_StickyHoldOnKnockOff:: @ 82DB63F +BattleScript_StickyHoldActivates:: @ 82DB63F .incbin "baserom.gba", 0x2db63f, 0xe BattleScript_ColorChangeActivates:: @ 82DB64D -- cgit v1.2.3 From bc3b4b4d9ae6ab59c9ce3892b7d287ebd0ee13fa Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 28 Sep 2017 15:34:21 +0200 Subject: battle 4 commands are decompiled --- data/battle_scripts_2.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index e76bb397b..938531a57 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -16,14 +16,14 @@ gUnknown_082DBD54:: @ 82DBD54 gUnknown_082DBD58:: @ 82DBD58 .incbin "baserom.gba", 0x2dbd58, 0x2c -gUnknown_082DBD84:: @ 82DBD84 +BattleScript_SuccessBallThrow:: @ 82DBD84 .incbin "baserom.gba", 0x2dbd84, 0x46 -gUnknown_082DBDCA:: @ 82DBDCA +BattleScript_WallyBallThrow:: @ 82DBDCA .incbin "baserom.gba", 0x2dbdca, 0xa -gUnknown_082DBDD4:: @ 82DBDD4 +BattleScript_ShakeBallThrow:: @ 82DBDD4 .incbin "baserom.gba", 0x2dbdd4, 0x2e -gUnknown_082DBE02:: @ 82DBE02 +BattleScript_TrainerBallBlock:: @ 82DBE02 .incbin "baserom.gba", 0x2dbe02, 0xf6 -- cgit v1.2.3 From 7273b8f26277e3f9a1b562454e2e7f88e5523731 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Thu, 28 Sep 2017 16:51:24 +0200 Subject: battle 4 is all done --- data/battle_4.s | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 data/battle_4.s (limited to 'data') diff --git a/data/battle_4.s b/data/battle_4.s deleted file mode 100644 index 2831f212a..000000000 --- a/data/battle_4.s +++ /dev/null @@ -1,30 +0,0 @@ -@ the second big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - -gUnknown_0831C494:: @ 831C494 - .byte 0x3d, 0x44, 0x3d, 0x44, 0x14, 0x2d, 0x54, 0x5c - .byte 0x46, 0x55, 0x20, 0x5c, 0x26, 0x45, 0x46, 0x55 - .byte 0x14, 0x5a, 0x46, 0x5c, 0x1e, 0x32, 0x20, 0x5a - .byte 0x38, 0x4e, 0x38, 0x4e, 0x19, 0x28, 0x4b, 0x5a - .byte 0x45, 0x4b, 0x1c, 0x53, 0x23, 0x2d, 0x1d, 0x23 - .byte 0x3e, 0x48, 0x1e, 0x32, 0x3a, 0x5f, 0x58, 0x5e - .byte 0x22, 0x2d, 0x1d, 0x28, 0x23, 0x28, 0x23, 0x5f - .byte 0x38, 0x4e, 0x38, 0x4e, 0x23, 0x50, 0x22, 0x5e - .byte 0x2c, 0x5e, 0x22, 0x28, 0x38, 0x4e, 0x38, 0x4e - .byte 0x1e, 0x58, 0x1e, 0x58, 0x1e, 0x2b, 0x1b, 0x21 - .byte 0x28, 0x5a, 0x19, 0x57, 0x12, 0x58, 0x5a, 0x5f - .byte 0x58, 0x5e, 0x16, 0x2a, 0x2a, 0x5c, 0x2a, 0x2f - .byte 0x38, 0x4e, 0x38, 0x4e - - .align 2 -gUnknown_0831C4F8:: @ 831C4F8 - .byte 0x03, 0x00, 0x01, 0x00, 0x00, 0x01, 0x03, 0x00 - .byte 0x01, 0x02, 0x02, 0x00, 0x03, 0x01, 0x03, 0x01 - .byte 0x02, 0x03, 0x03, 0x02, 0x01, 0x00, 0x02, 0x02 - .byte 0x03, 0x00, 0x00, 0x00 - -- cgit v1.2.3