From 7485560810130fe8bb6a78e4352f3613fdc09653 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 10 Nov 2017 23:40:12 -0500 Subject: eliminate remaining RAM pointers in data/ --- data/battle_scripts_2.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/battle_scripts_2.s') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b10b7f96f..0833b7bf2 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -102,7 +102,7 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 atkf6 BattleScript_1D9F45: @ 81D9F45 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 end @@ -118,7 +118,7 @@ BattleScript_1D9F4F: @ 81D9F4F printstring BATTLE_TEXT_RestoredHealth waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -131,7 +131,7 @@ BattleScript_1D9F7B: @ 81D9F7B printfromtable BattleTextList_401620 waitmessage 64 atk98 1 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -143,7 +143,7 @@ BattleScript_1D9F9C: @ 81D9F9C atk75 printfromtable BattleTextList_401570 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 @@ -155,7 +155,7 @@ BattleScript_1D9FBB: @ 81D9FBB atk75 printfromtable BattleTextList_4015A0 waitmessage 64 - setbyte 0x201600c, 15 + setbyte gSharedMem + 0x1600C, 15 atk49 1, 0 atkf6 -- cgit v1.2.3 From 3e77fcdd38e9dfab732e8ce72ac1496cec652c0e Mon Sep 17 00:00:00 2001 From: sceptillion <33798691+sceptillion@users.noreply.github.com> Date: Sun, 19 Nov 2017 18:04:08 -0800 Subject: label battle anims --- data/battle_scripts_2.s | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/battle_scripts_2.s') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 0833b7bf2..22ecc7769 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,7 +5,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_081D9E48:: @ 81D9E48 +gBattlescriptsForBallThrow:: @ 81D9E48 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 @@ -28,10 +28,10 @@ gUnknown_081D9E7C:: @ 81D9E7C .4byte BattleScript_1D9F9C .4byte BattleScript_1D9FBB -gUnknown_081D9E94:: @ 81D9E94 +gBattlescriptsForRunningByItem:: @ 81D9E94 .4byte BattleScript_1D9FDA -gUnknown_081D9E98:: @ 81D9E98 +gBattlescriptsForSafariActions:: @ 81D9E98 .4byte BattleScript_1D9FE4 .4byte BattleScript_1D9FEB .4byte BattleScript_1D9FF4 @@ -177,7 +177,7 @@ BattleScript_1D9FEB: @ 81D9FEB BattleScript_1D9FF4: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 - playanimation USER, 4, 0x0 + playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 printfromtable BattleTextList_40161A waitmessage 64 end2 -- cgit v1.2.3 From 4767f21f2e72ae89ab542d61a86d5fbbe85df1a2 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 27 Dec 2017 15:43:22 -0600 Subject: Port updated battle_script macros from pokeemerald --- data/battle_scripts_2.s | 85 +++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 42 deletions(-) (limited to 'data/battle_scripts_2.s') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 22ecc7769..c6112fdd3 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,6 +1,7 @@ .include "asm/macros.inc" - .include "constants/constants.inc" .include "asm/macros/battle_script.inc" + .include "constants/constants.inc" + .include "constants/battle_script_constants.inc" .section script_data, "aw", %progbits @@ -40,46 +41,46 @@ gBattlescriptsForSafariActions:: @ 81D9E98 BattleScript_1D9EA8: @ 81D9EA8 jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 printstring BATTLE_TEXT_Used1 - pokemoncatchfunction + handleballthrow BattleScript_1D9EB8: @ 81D9EB8 printstring BATTLE_TEXT_TutorialUsed - pokemoncatchfunction + handleballthrow BattleScript_1D9EBC: @ 81D9EBC printstring BATTLE_TEXT_Used1 - atk98 1 - pokemoncatchfunction + updatestatusicon 1 + handleballthrow BattleScript_SuccessBallThrow:: @ 81D9EC2 jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 - atk60 11 + incrementgamestat 11 BattleScript_1D9ED0: @ 81D9ED0 printstring BATTLE_TEXT_BallCaught1 - capturesomethingf1 BattleScript_1D9EE3 + trysetcaughtmondexflags BattleScript_1D9EE3 printstring BATTLE_TEXT_AddedToDex - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf2 + displaydexinfo BattleScript_1D9EE3: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname - waitstateatk + waitstate setbyte gBattleCommunication, 0 - capturesomethingf3 BattleScript_1D9EF8 + trygivecaughtmonnick BattleScript_1D9EF8 printstring BATTLE_TEXT_SentToPC waitmessage 64 BattleScript_1D9EF8: @ 81D9EF8 - catchpoke + givecaughtmon setbyte gBattleOutcome, 7 - activesidesomething + finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 setbyte gBattleOutcome, 7 - activesidesomething + finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A printfromtable BattleTextList_4015E6 @@ -91,7 +92,7 @@ BattleScript_ShakeBallThrow:: @ 81D9F0A setbyte gBattleOutcome, 8 BattleScript_1D9F34: @ 81D9F34 - atkf6 + finishaction BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 @@ -99,70 +100,70 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 printstring BATTLE_TEXT_DontBeAThief waitmessage 64 - atkf6 + finishaction BattleScript_1D9F45: @ 81D9F45 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 + moveend 1, 0 end BattleScript_1D9F4F: @ 81D9F4F pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent orword gHitMarker, 0x100 - graphicalhpupdate USER + healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - atk98 1 + updatestatusicon 1 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9F7B: @ 81D9F7B pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_401620 waitmessage 64 - atk98 1 + updatestatusicon 1 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9F9C: @ 81D9F9C pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_401570 waitmessage 64 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9FBB: @ 81D9FBB pause 48 - atk54 1 + playse 1 printstring BATTLE_TEXT_Used2 waitmessage 64 - atk75 + useitemonopponent printfromtable BattleTextList_4015A0 waitmessage 64 setbyte gSharedMem + 0x1600C, 15 - atk49 1, 0 - atkf6 + moveend 1, 0 + finishaction BattleScript_1D9FDA: @ 81D9FDA - atk54 17 + playse 17 setbyte gBattleOutcome, 4 - activesidesomething + finishturn BattleScript_1D9FE4: @ 81D9FE4 printstring BATTLE_TEXT_WatchingCarefully @@ -185,10 +186,10 @@ BattleScript_1D9FF4: @ 81D9FF4 BattleScript_1DA00A: @ 81DA00A printstring 2 waitmessage 64 - atk4b - waitstateatk - atk53 0 - waitstateatk + returnatktoball + waitstate + trainerslidein 0 + waitstate printstring BATTLE_TEXT_WallyBall waitmessage 64 end2 -- cgit v1.2.3 From cd2b75a677bf15756734222a9a57f0f9153fc918 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 30 Dec 2017 11:03:18 -0600 Subject: Sync battle_script changes with pokeemerald --- data/battle_scripts_2.s | 145 ++++++++++++++++++++++++------------------------ 1 file changed, 74 insertions(+), 71 deletions(-) (limited to 'data/battle_scripts_2.s') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index c6112fdd3..26f28726d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -1,3 +1,6 @@ +#include "constants/battle_constants.h" +#include "constants/items.h" +#include "constants/songs.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" .include "constants/constants.inc" @@ -7,91 +10,91 @@ .align 2 gBattlescriptsForBallThrow:: @ 81D9E48 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EBC - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - .4byte BattleScript_1D9EA8 - -gUnknown_081D9E7C:: @ 81D9E7C - .4byte BattleScript_1D9F45 - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F4F - .4byte BattleScript_1D9F7B - .4byte BattleScript_1D9F9C - .4byte BattleScript_1D9FBB + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_SafariBallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + +gBattlescriptsForUsingItem:: @ 81D9E7C + .4byte BattleScript_PlayerUsesItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesHealItem + .4byte BattleScript_OpponentUsesStatusCureItem + .4byte BattleScript_OpponentUsesXItem + .4byte BattleScript_OpponentUsesGuardSpecs gBattlescriptsForRunningByItem:: @ 81D9E94 - .4byte BattleScript_1D9FDA + .4byte BattleScript_RunByUsingItem gBattlescriptsForSafariActions:: @ 81D9E98 - .4byte BattleScript_1D9FE4 - .4byte BattleScript_1D9FEB - .4byte BattleScript_1D9FF4 + .4byte BattleScript_ActionWatchesCarefully + .4byte BattleScript_ActionGetNear + .4byte BattleScript_ActionThrowPokeblock .4byte BattleScript_1DA00A -BattleScript_1D9EA8: @ 81D9EA8 - jumpifhalfword 4, gBattleTypeFlags, 512, BattleScript_1D9EB8 +BattleScript_BallThrow: @ 81D9EA8 + jumpifhalfword COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally printstring BATTLE_TEXT_Used1 handleballthrow -BattleScript_1D9EB8: @ 81D9EB8 +BattleScript_BallThrowByWally: @ 81D9EB8 printstring BATTLE_TEXT_TutorialUsed handleballthrow -BattleScript_1D9EBC: @ 81D9EBC +BattleScript_SafariBallThrow: @ 81D9EBC printstring BATTLE_TEXT_Used1 - updatestatusicon 1 + updatestatusicon USER handleballthrow BattleScript_SuccessBallThrow:: @ 81D9EC2 - jumpifhalfword 0, gLastUsedItem, 5, BattleScript_1D9ED0 + jumpifhalfword EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo incrementgamestat 11 -BattleScript_1D9ED0: @ 81D9ED0 +BattleScript_PrintCaughtMonInfo: @ 81D9ED0 printstring BATTLE_TEXT_BallCaught1 - trysetcaughtmondexflags BattleScript_1D9EE3 + trysetcaughtmondexflags BattleScript_TryNicknameCaughtMon printstring BATTLE_TEXT_AddedToDex waitstate setbyte gBattleCommunication, 0 displaydexinfo -BattleScript_1D9EE3: @ 81D9EE3 +BattleScript_TryNicknameCaughtMon: @ 81D9EE3 printstring BATTLE_TEXT_GiveNickname waitstate setbyte gBattleCommunication, 0 - trygivecaughtmonnick BattleScript_1D9EF8 + trygivecaughtmonnick BattleScript_GiveCaughtMonEnd printstring BATTLE_TEXT_SentToPC waitmessage 64 -BattleScript_1D9EF8: @ 81D9EF8 +BattleScript_GiveCaughtMonEnd: @ 81D9EF8 givecaughtmon - setbyte gBattleOutcome, 7 + setbyte gBattleOutcome, BATTLE_CAUGHT finishturn BattleScript_WallyBallThrow:: @ 81D9F00 printstring BATTLE_TEXT_BallCaught2 - setbyte gBattleOutcome, 7 + setbyte gBattleOutcome, BATTLE_CAUGHT finishturn BattleScript_ShakeBallThrow:: @ 81D9F0A - printfromtable BattleTextList_4015E6 + printfromtable gBallEscapeStringIds waitmessage 64 - jumpifbyte 5, gBattleTypeFlags, 128, BattleScript_1D9F34 - jumpifbyte 1, gNumSafariBalls, 0, BattleScript_1D9F34 + jumpifbyte NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd + jumpifbyte NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd printstring BATTLE_TEXT_SafariOver waitmessage 64 - setbyte gBattleOutcome, 8 + setbyte gBattleOutcome, BATTLE_OUT_OF_BALLS -BattleScript_1D9F34: @ 81D9F34 +BattleScript_ShakeBallThrowEnd: @ 81D9F34 finishaction BattleScript_TrainerBallBlock:: @ 81D9F35 @@ -102,84 +105,84 @@ BattleScript_TrainerBallBlock:: @ 81D9F35 waitmessage 64 finishaction -BattleScript_1D9F45: @ 81D9F45 - setbyte gSharedMem + 0x1600C, 15 +BattleScript_PlayerUsesItem: @ 81D9F45 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 end -BattleScript_1D9F4F: @ 81D9F4F +BattleScript_OpponentUsesHealItem: @ 81D9F4F pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - orword gHitMarker, 0x100 + orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE healthbarupdate USER datahpupdate USER printstring BATTLE_TEXT_RestoredHealth waitmessage 64 - updatestatusicon 1 - setbyte gSharedMem + 0x1600C, 15 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9F7B: @ 81D9F7B +BattleScript_OpponentUsesStatusCureItem: @ 81D9F7B pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_401620 + printfromtable gTrainerItemCuredStatusStringIds waitmessage 64 - updatestatusicon 1 - setbyte gSharedMem + 0x1600C, 15 + updatestatusicon USER + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9F9C: @ 81D9F9C +BattleScript_OpponentUsesXItem: @ 81D9F9C pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_401570 + printfromtable gStatUpStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9FBB: @ 81D9FBB +BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB pause 48 - playse 1 + playse SE_KAIFUKU printstring BATTLE_TEXT_Used2 waitmessage 64 useitemonopponent - printfromtable BattleTextList_4015A0 + printfromtable gMistUsedStringIds waitmessage 64 - setbyte gSharedMem + 0x1600C, 15 + setbyte sMOVEEND_STATE, 15 moveend 1, 0 finishaction -BattleScript_1D9FDA: @ 81D9FDA +BattleScript_RunByUsingItem: @ 81D9FDA playse 17 - setbyte gBattleOutcome, 4 + setbyte gBattleOutcome, BATTLE_RAN finishturn -BattleScript_1D9FE4: @ 81D9FE4 +BattleScript_ActionWatchesCarefully: @ 81D9FE4 printstring BATTLE_TEXT_WatchingCarefully waitmessage 64 end2 -BattleScript_1D9FEB: @ 81D9FEB - printfromtable BattleTextList_401616 +BattleScript_ActionGetNear: @ 81D9FEB + printfromtable gSafariGetNearStringIds waitmessage 64 end2 -BattleScript_1D9FF4: @ 81D9FF4 +BattleScript_ActionThrowPokeblock: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 - printfromtable BattleTextList_40161A + printfromtable gSafariPokeblockResultStringIds waitmessage 64 end2 @@ -188,7 +191,7 @@ BattleScript_1DA00A: @ 81DA00A waitmessage 64 returnatktoball waitstate - trainerslidein 0 + trainerslidein TARGET waitstate printstring BATTLE_TEXT_WallyBall waitmessage 64 -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/battle_scripts_2.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/battle_scripts_2.s') diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 26f28726d..e113513d6 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -164,7 +164,7 @@ BattleScript_OpponentUsesGuardSpecs: @ 81D9FBB finishaction BattleScript_RunByUsingItem: @ 81D9FDA - playse 17 + playse SE_NIGERU setbyte gBattleOutcome, BATTLE_RAN finishturn -- cgit v1.2.3