diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | data/ai_scripts.s | 10 | ||||
| -rw-r--r-- | data/battle_scripts_1.s (renamed from data/data1.s) | 218 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 194 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 5 | ||||
| -rw-r--r-- | data/script_funcs.s | 22 | ||||
| -rw-r--r-- | ld_script.txt | 6 |
7 files changed, 240 insertions, 221 deletions
@@ -39,8 +39,10 @@ C_OBJS := $(C_SRCS:%.c=%.o) ASM_OBJS := asm/crt0.o asm/rom3.o asm/rom_8040EB4.o asm/rom4.o asm/rom_8074BAC.o asm/rom5.o \ asm/libgcnmultiboot.o asm/m4a_1.o asm/m4a_3.o asm/libagbsyscall.o -DATA_ASM_OBJS := data/data1.o data/data2.o data/graphics.o data/sound_data.o \ -data/event_scripts.o data/battle_anim_scripts.o +DATA_ASM_OBJS := data/data2.o data/graphics.o data/sound_data.o \ +data/event_scripts.o data/battle_anim_scripts.o data/ai_scripts.o \ +data/battle_scripts_1.o data/battle_scripts_2.o data/field_effect_scripts.o \ +data/script_funcs.o OBJS := $(C_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) pokeruby_OBJS := $(OBJS:.o=_ruby.o) diff --git a/data/ai_scripts.s b/data/ai_scripts.s new file mode 100644 index 000000000..ab90e8dcb --- /dev/null +++ b/data/ai_scripts.s @@ -0,0 +1,10 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + +gUnknown_081DA01C:: @ 81DA01C + .incbin "baserom.gba", 0x001da01c, 0x20fc + +gUnknown_081DC118:: @ 81DC118 + .incbin "baserom.gba", 0x001dc118, 0x9dc diff --git a/data/data1.s b/data/battle_scripts_1.s index a9531ccc3..0a472467e 100644 --- a/data/data1.s +++ b/data/battle_scripts_1.s @@ -4473,221 +4473,3 @@ gUnknown_081D9B29:: @ 81D9B29 gUnknown_081D9B2D:: @ 81D9B2D printstring BATTLE_TEXT_Terminator2 return - -@ 81D9B31 - .include "data/field_effect_scripts.s" - - .align 2 -gUnknown_081D9E48:: @ 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 - -gUnknown_081D9E94:: @ 81D9E94 - .4byte BattleScript_1D9FDA - -gUnknown_081D9E98:: @ 81D9E98 - .4byte BattleScript_1D9FE4 - .4byte BattleScript_1D9FEB - .4byte BattleScript_1D9FF4 - .4byte BattleScript_1DA00A - -BattleScript_1D9EA8: @ 81D9EA8 - jumpifhalfword 4, 0x20239f8, 512, BattleScript_1D9EB8 - printstring BATTLE_TEXT_Used1 - pokemoncatchfunction - -BattleScript_1D9EB8: @ 81D9EB8 - printstring BATTLE_TEXT_TutorialUsed - pokemoncatchfunction - -BattleScript_1D9EBC: @ 81D9EBC - printstring BATTLE_TEXT_Used1 - atk98 1 - pokemoncatchfunction - -gUnknown_081D9EC2:: @ 81D9EC2 - jumpifhalfword 0, 0x2024c04, 5, BattleScript_1D9ED0 - atk60 11 - -BattleScript_1D9ED0: @ 81D9ED0 - printstring BATTLE_TEXT_BallCaught1 - capturesomethingf1 BattleScript_1D9EE3 - printstring BATTLE_TEXT_AddedToDex - waitstateatk - setbyte 0x2024d1e, 0 - capturesomethingf2 - -BattleScript_1D9EE3: @ 81D9EE3 - printstring BATTLE_TEXT_GiveNickname - waitstateatk - setbyte 0x2024d1e, 0 - capturesomethingf3 BattleScript_1D9EF8 - printstring BATTLE_TEXT_SentToPC - waitmessage 64 - -BattleScript_1D9EF8: @ 81D9EF8 - catchpoke - setbyte 0x2024d26, 7 - activesidesomething - -gUnknown_081D9F00:: @ 81D9F00 - printstring BATTLE_TEXT_BallCaught2 - setbyte 0x2024d26, 7 - activesidesomething - -gUnknown_081D9F0A:: @ 81D9F0A - printfromtable BattleTextList_4015E6 - waitmessage 64 - jumpifbyte 5, 0x20239f8, 128, BattleScript_1D9F34 - jumpifbyte 1, 0x2038808, 0, BattleScript_1D9F34 - printstring BATTLE_TEXT_SafariOver - waitmessage 64 - setbyte 0x2024d26, 8 - -BattleScript_1D9F34: @ 81D9F34 - atkf6 - -gUnknown_081D9F35:: @ 81D9F35 - waitmessage 64 - printstring BATTLE_TEXT_BlockBall - waitmessage 64 - printstring BATTLE_TEXT_DontBeAThief - waitmessage 64 - atkf6 - -BattleScript_1D9F45: @ 81D9F45 - setbyte 0x201600c, 15 - atk49 1, 0 - end - -BattleScript_1D9F4F: @ 81D9F4F - pause 48 - atk54 1 - printstring BATTLE_TEXT_Used2 - waitmessage 64 - atk75 - orword 0x2024c6c, 0x100 - graphicalhpupdate USER - datahpupdate USER - printstring BATTLE_TEXT_RestoredHealth - waitmessage 64 - atk98 1 - setbyte 0x201600c, 15 - atk49 1, 0 - atkf6 - -BattleScript_1D9F7B: @ 81D9F7B - pause 48 - atk54 1 - printstring BATTLE_TEXT_Used2 - waitmessage 64 - atk75 - printfromtable BattleTextList_401620 - waitmessage 64 - atk98 1 - setbyte 0x201600c, 15 - atk49 1, 0 - atkf6 - -BattleScript_1D9F9C: @ 81D9F9C - pause 48 - atk54 1 - printstring BATTLE_TEXT_Used2 - waitmessage 64 - atk75 - printfromtable BattleTextList_401570 - waitmessage 64 - setbyte 0x201600c, 15 - atk49 1, 0 - atkf6 - -BattleScript_1D9FBB: @ 81D9FBB - pause 48 - atk54 1 - printstring BATTLE_TEXT_Used2 - waitmessage 64 - atk75 - printfromtable BattleTextList_4015A0 - waitmessage 64 - setbyte 0x201600c, 15 - atk49 1, 0 - atkf6 - -BattleScript_1D9FDA: @ 81D9FDA - atk54 17 - setbyte 0x2024d26, 4 - activesidesomething - -BattleScript_1D9FE4: @ 81D9FE4 - printstring BATTLE_TEXT_WatchingCarefully - waitmessage 64 - end2 - -BattleScript_1D9FEB: @ 81D9FEB - printfromtable BattleTextList_401616 - waitmessage 64 - end2 - -BattleScript_1D9FF4: @ 81D9FF4 - printstring BATTLE_TEXT_ThrewBlock - waitmessage 64 - playanimation USER, 4, 0x0 - printfromtable BattleTextList_40161A - waitmessage 64 - end2 - -BattleScript_1DA00A: @ 81DA00A - printstring 2 - waitmessage 64 - atk4b - waitstateatk - atk53 0 - waitstateatk - printstring BATTLE_TEXT_WallyBall - waitmessage 64 - end2 - -gUnknown_081DA01C:: @ 81DA01C - .incbin "baserom.gba", 0x001da01c, 0x20fc - -gUnknown_081DC118:: @ 81DC118 - .incbin "baserom.gba", 0x001dc118, 0x9dc - -gScriptFuncs:: @ 81DCAF4 - .4byte sub_81263D0 - .4byte sub_8126380 - .4byte script_status_stop_and_ret_1 - .4byte sub_81263E4 - .4byte sub_81263D4 - .4byte sub_812641C - .4byte sub_8126524 - .4byte sub_8126438 - .4byte sub_81264F0 - .4byte sub_812658C - .4byte sub_81265B0 - .4byte sub_81265DC - .4byte sub_8126608 - .4byte sub_8126714 - .4byte sub_8126754 - .4byte sub_8126778 - .4byte sub_81267C0 -gScriptFuncs_End:: diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s new file mode 100644 index 000000000..248baf978 --- /dev/null +++ b/data/battle_scripts_2.s @@ -0,0 +1,194 @@ + .include "asm/macros.s" + .include "constants/constants.s" + .include "asm/macros/battle_script.s" + + .section script_data, "aw", %progbits + + .align 2 +gUnknown_081D9E48:: @ 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 + +gUnknown_081D9E94:: @ 81D9E94 + .4byte BattleScript_1D9FDA + +gUnknown_081D9E98:: @ 81D9E98 + .4byte BattleScript_1D9FE4 + .4byte BattleScript_1D9FEB + .4byte BattleScript_1D9FF4 + .4byte BattleScript_1DA00A + +BattleScript_1D9EA8: @ 81D9EA8 + jumpifhalfword 4, 0x20239f8, 512, BattleScript_1D9EB8 + printstring BATTLE_TEXT_Used1 + pokemoncatchfunction + +BattleScript_1D9EB8: @ 81D9EB8 + printstring BATTLE_TEXT_TutorialUsed + pokemoncatchfunction + +BattleScript_1D9EBC: @ 81D9EBC + printstring BATTLE_TEXT_Used1 + atk98 1 + pokemoncatchfunction + +gUnknown_081D9EC2:: @ 81D9EC2 + jumpifhalfword 0, 0x2024c04, 5, BattleScript_1D9ED0 + atk60 11 + +BattleScript_1D9ED0: @ 81D9ED0 + printstring BATTLE_TEXT_BallCaught1 + capturesomethingf1 BattleScript_1D9EE3 + printstring BATTLE_TEXT_AddedToDex + waitstateatk + setbyte 0x2024d1e, 0 + capturesomethingf2 + +BattleScript_1D9EE3: @ 81D9EE3 + printstring BATTLE_TEXT_GiveNickname + waitstateatk + setbyte 0x2024d1e, 0 + capturesomethingf3 BattleScript_1D9EF8 + printstring BATTLE_TEXT_SentToPC + waitmessage 64 + +BattleScript_1D9EF8: @ 81D9EF8 + catchpoke + setbyte 0x2024d26, 7 + activesidesomething + +gUnknown_081D9F00:: @ 81D9F00 + printstring BATTLE_TEXT_BallCaught2 + setbyte 0x2024d26, 7 + activesidesomething + +gUnknown_081D9F0A:: @ 81D9F0A + printfromtable BattleTextList_4015E6 + waitmessage 64 + jumpifbyte 5, 0x20239f8, 128, BattleScript_1D9F34 + jumpifbyte 1, 0x2038808, 0, BattleScript_1D9F34 + printstring BATTLE_TEXT_SafariOver + waitmessage 64 + setbyte 0x2024d26, 8 + +BattleScript_1D9F34: @ 81D9F34 + atkf6 + +gUnknown_081D9F35:: @ 81D9F35 + waitmessage 64 + printstring BATTLE_TEXT_BlockBall + waitmessage 64 + printstring BATTLE_TEXT_DontBeAThief + waitmessage 64 + atkf6 + +BattleScript_1D9F45: @ 81D9F45 + setbyte 0x201600c, 15 + atk49 1, 0 + end + +BattleScript_1D9F4F: @ 81D9F4F + pause 48 + atk54 1 + printstring BATTLE_TEXT_Used2 + waitmessage 64 + atk75 + orword 0x2024c6c, 0x100 + graphicalhpupdate USER + datahpupdate USER + printstring BATTLE_TEXT_RestoredHealth + waitmessage 64 + atk98 1 + setbyte 0x201600c, 15 + atk49 1, 0 + atkf6 + +BattleScript_1D9F7B: @ 81D9F7B + pause 48 + atk54 1 + printstring BATTLE_TEXT_Used2 + waitmessage 64 + atk75 + printfromtable BattleTextList_401620 + waitmessage 64 + atk98 1 + setbyte 0x201600c, 15 + atk49 1, 0 + atkf6 + +BattleScript_1D9F9C: @ 81D9F9C + pause 48 + atk54 1 + printstring BATTLE_TEXT_Used2 + waitmessage 64 + atk75 + printfromtable BattleTextList_401570 + waitmessage 64 + setbyte 0x201600c, 15 + atk49 1, 0 + atkf6 + +BattleScript_1D9FBB: @ 81D9FBB + pause 48 + atk54 1 + printstring BATTLE_TEXT_Used2 + waitmessage 64 + atk75 + printfromtable BattleTextList_4015A0 + waitmessage 64 + setbyte 0x201600c, 15 + atk49 1, 0 + atkf6 + +BattleScript_1D9FDA: @ 81D9FDA + atk54 17 + setbyte 0x2024d26, 4 + activesidesomething + +BattleScript_1D9FE4: @ 81D9FE4 + printstring BATTLE_TEXT_WatchingCarefully + waitmessage 64 + end2 + +BattleScript_1D9FEB: @ 81D9FEB + printfromtable BattleTextList_401616 + waitmessage 64 + end2 + +BattleScript_1D9FF4: @ 81D9FF4 + printstring BATTLE_TEXT_ThrewBlock + waitmessage 64 + playanimation USER, 4, 0x0 + printfromtable BattleTextList_40161A + waitmessage 64 + end2 + +BattleScript_1DA00A: @ 81DA00A + printstring 2 + waitmessage 64 + atk4b + waitstateatk + atk53 0 + waitstateatk + printstring BATTLE_TEXT_WallyBall + waitmessage 64 + end2 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 61d2f2a8a..0590d82fa 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,3 +1,8 @@ + .include "asm/macros.s" + .include "constants/constants.s" + + .section script_data, "aw", %progbits + .align 2 gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_ExclamationMarkIcon1 diff --git a/data/script_funcs.s b/data/script_funcs.s new file mode 100644 index 000000000..23d7a76f5 --- /dev/null +++ b/data/script_funcs.s @@ -0,0 +1,22 @@ + .section script_data, "aw", %progbits + + .align 2 +gScriptFuncs:: @ 81DCAF4 + .4byte sub_81263D0 + .4byte sub_8126380 + .4byte script_status_stop_and_ret_1 + .4byte sub_81263E4 + .4byte sub_81263D4 + .4byte sub_812641C + .4byte sub_8126524 + .4byte sub_8126438 + .4byte sub_81264F0 + .4byte sub_812658C + .4byte sub_81265B0 + .4byte sub_81265DC + .4byte sub_8126608 + .4byte sub_8126714 + .4byte sub_8126754 + .4byte sub_8126778 + .4byte sub_81267C0 +gScriptFuncs_End:: diff --git a/ld_script.txt b/ld_script.txt index 313f02207..ddcac2d5a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -82,7 +82,11 @@ SECTIONS { { data/event_scripts.o(script_data); data/battle_anim_scripts.o(script_data); - data/data1.o(script_data); + data/battle_scripts_1.o(script_data); + data/field_effect_scripts.o(script_data); + data/battle_scripts_2.o(script_data); + data/ai_scripts.o(script_data); + data/script_funcs.o(script_data); } =0 lib_text : |