From 935f93a0752604f1375c79e6225baa6774b60280 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 29 Jul 2019 02:39:41 +0800 Subject: ported battle_gfx_sfx_util from pokeem --- data/battle_anim_scripts.s | 4 ++-- data/data.s | 37 ++++++------------------------------- data/graphics.s | 29 ++++++++++++++++------------- 3 files changed, 24 insertions(+), 46 deletions(-) (limited to 'data') diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 3d1de8ac5..4b45f3669 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10,8 +10,8 @@ gUnknown_81C68F4:: @ 81C68F4 gUnknown_81C6E84:: @ 81C6E84 .incbin "baserom.gba", 0x1C6E84, 0x24 -gUnknown_81C6EA8:: @ 81C6EA8 +gBattleAnims_General:: @ 81C6EA8 .incbin "baserom.gba", 0x1C6EA8, 0x70 -gUnknown_81C6F18:: @ 81C6F18 +gBattleAnims_Special:: @ 81C6F18 .incbin "baserom.gba", 0x1C6F18, 0xF690 diff --git a/data/data.s b/data/data.s index 0322670c0..943c71678 100644 --- a/data/data.s +++ b/data/data.s @@ -166,7 +166,7 @@ gTrainerBackPicTable:: @ 8239FA4 gUnknown_8239FD4:: @ 8239FD4 .incbin "baserom.gba", 0x239FD4, 0x30 -gUnknown_823A004:: @ 823A004 +gEnemyMonElevation:: @ 823A004 .incbin "baserom.gba", 0x23A004, 0x4554 gTrainerClassNames:: @ 823E558 @@ -344,10 +344,10 @@ gUnknown_8250994:: @ 8250994 gUnknown_82509F4:: @ 82509F4 .incbin "baserom.gba", 0x2509F4, 0x18 -gUnknown_8250A0C:: @ 8250A0C +gSpriteSheet_EnemyShadow:: @ 8250A0C .incbin "baserom.gba", 0x250A0C, 0x10 -gUnknown_8250A1C:: @ 8250A1C +gSpriteTemplate_EnemyShadow:: @ 8250A1C .incbin "baserom.gba", 0x250A1C, 0x18 gUnknown_8250A34:: @ 8250A34 @@ -356,35 +356,10 @@ gUnknown_8250A34:: @ 8250A34 gUnknown_8250B20:: @ 8250B20 .incbin "baserom.gba", 0x250B20, 0xE4 - .section .rodata.825EF0C + .section .rodata.8260270 - .align 2 -gUnknown_8260208:: @ 8260208 - .incbin "baserom.gba", 0x260208, 0x8 - -gUnknown_8260210:: @ 8260210 - .incbin "baserom.gba", 0x260210, 0x8 - -gUnknown_8260218:: @ 8260218 - .incbin "baserom.gba", 0x260218, 0x8 - -gUnknown_8260220:: @ 8260220 - .incbin "baserom.gba", 0x260220, 0x8 - -gUnknown_8260228:: @ 8260228 - .incbin "baserom.gba", 0x260228, 0x8 - -gUnknown_8260230:: @ 8260230 - .incbin "baserom.gba", 0x260230, 0x8 - -gUnknown_8260238:: @ 8260238 - .incbin "baserom.gba", 0x260238, 0x8 - -gUnknown_8260240:: @ 8260240 - .incbin "baserom.gba", 0x260240, 0x20 - -gUnknown_8260260:: @ 8260260 - .incbin "baserom.gba", 0x260260, 0x18 +gUnknown_8260270:: @ 8260270 + .incbin "baserom.gba", 0x260270, 0x8 gUnknown_8260278:: @ 8260278 .incbin "baserom.gba", 0x260278, 0x30 diff --git a/data/graphics.s b/data/graphics.s index 83d14001d..034db89da 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -146,7 +146,7 @@ gFile_graphics_interface_ball_Open_sheet:: @ 8D022E8 .incbin "graphics/interface/ball_open.4bpp.lz" .align 2 -gFile_graphics_interface_blank_sheet:: @ 8D02364 +gBlankGfxCompressed:: @ 8D02364 .incbin "graphics/interface/blank.4bpp.lz" .align 2 @@ -1062,8 +1062,11 @@ gFile_graphics_unused_basic_frame_tilemap:: @ 8D11A78 .incbin "graphics/unused/basic_frame.bin.lz" .align 2 -gUnknown_8D11B84:: @ 8D11B84 - .incbin "baserom.gba", 0xD11B84, 0x40 +gBattleInterface_BallStatusBarPal:: @ 8D11B84 + .incbin "baserom.gba", 0xD11B84, 0x20 + +gBattleInterface_BallDisplayPal:: @ 8D11BA4 + .incbin "baserom.gba", 0xD11BA4, 0x20 gUnknown_8D11BC4:: @ 8D11BC4 .incbin "baserom.gba", 0xD11BC4, 0xF00 @@ -1761,23 +1764,23 @@ gFile_graphics_battle_anims_sprites_186_palette:: @ 8D1F31C .incbin "graphics/battle_anims/sprites/186.gbapal.lz" .align 2 -gUnknown_8D1F340:: @ 8D1F340 +gHealthboxSinglesPlayerGfx:: @ 8D1F340 .incbin "baserom.gba", 0xD1F340, 0x2C4 .align 2 -gUnknown_8D1F604:: @ 8D1F604 +gHealthboxSinglesOpponentGfx:: @ 8D1F604 .incbin "baserom.gba", 0xD1F604, 0x190 .align 2 -gUnknown_8D1F794:: @ 8D1F794 +gHealthboxDoublesPlayerGfx:: @ 8D1F794 .incbin "baserom.gba", 0xD1F794, 0x194 .align 2 -gUnknown_8D1F928:: @ 8D1F928 +gHealthboxDoublesOpponentGfx:: @ 8D1F928 .incbin "baserom.gba", 0xD1F928, 0x194 .align 2 -gFile_graphics_battle_interface_healthbox_safari_sheet:: @ 8D1FABC +gHealthboxSafariGfx:: @ 8D1FABC .incbin "graphics/battle_interface/healthbox_safari.4bpp.lz" .align 2 @@ -2365,15 +2368,15 @@ gFile_graphics_battle_anims_sprites_240_palette:: @ 8D2D068 .incbin "graphics/battle_anims/sprites/240.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_palette:: @ 8D2D090 +gSubstituteDollPal:: @ 8D2D090 .incbin "graphics/battle_anims/sprites/substitute.gbapal.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_sheet:: @ 8D2D0B4 +gSubstituteDollGfx:: @ 8D2D0B4 .incbin "graphics/battle_anims/sprites/substitute.4bpp.lz" .align 2 -gFile_graphics_battle_anims_sprites_substitute_tilemap:: @ 8D2D2F4 +gSubstituteDollTilemap:: @ 8D2D2F4 .incbin "graphics/battle_anims/sprites/substitute.bin.lz" .align 2 @@ -15923,10 +15926,10 @@ gFile_graphics_battle_anims_sprites_271_sheet:: @ 8E93AB4 .incbin "graphics/battle_anims/sprites/271.4bpp.lz" .align 2 -gUnknown_8E93B14:: @ 8E93B14 +gGhostPalette:: @ 8E93B14 .incbin "baserom.gba", 0xE93B14, 0x24 -gUnknown_8E93B38:: @ 8E93B38 +gGhostFrontPic:: @ 8E93B38 .incbin "baserom.gba", 0xE93B38, 0x368 gUnknown_8E93EA0:: @ 8E93EA0 -- cgit v1.2.3 From a4263a6bd8fa3a31d2b1de1279414b403a58e28b Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 29 Jul 2019 06:47:34 +0800 Subject: ported battle_controller_safari from pokeem --- data/data.s | 2 +- data/data_83FECCC.s | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index 943c71678..41bbdfade 100644 --- a/data/data.s +++ b/data/data.s @@ -157,7 +157,7 @@ gTrainerFrontPicPaletteTable:: @ 8239A1C gTrainerBackAnimsPtrTable:: @ 8239F74 .incbin "baserom.gba", 0x239F74, 0x18 -gUnknown_8239F8C:: @ 8239F8C +gTrainerBackPicCoords:: @ 8239F8C .incbin "baserom.gba", 0x239F8C, 0x18 gTrainerBackPicTable:: @ 8239FA4 diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index 6aade55b6..196468ace 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -24,8 +24,10 @@ gUnknown_83FECF4:: @ 83FECF4 gUnknown_83FECFA:: @ 83FECFA .incbin "baserom.gba", 0x3FECFA, 0x6 -gUnknown_83FED00:: @ 83FED00 - .incbin "baserom.gba", 0x3FED00, 0x380 + .section .rodata.83FEDE4 + +gUnknown_83FEDE4:: @ 83FEDE4 + .incbin "baserom.gba", 0x3FEDE4, 0x29C gUnknown_83FF080:: @ 83FF080 .incbin "baserom.gba", 0x3FF080, 0xB0 -- cgit v1.2.3 From 035df4d7a4a2782cf7bc3789f56471a03ffbfca0 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 30 Jul 2019 12:10:40 +0800 Subject: ported documentation of battle_util.s --- data/battle_scripts_1.s | 204 ++++++++++++++++++++++++------------------------ data/data.s | 2 +- 2 files changed, 103 insertions(+), 103 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a3b44dc0d..c604211bc 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -18,7 +18,7 @@ gUnknown_81D6BD1:: @ 81D6BD1 gUnknown_81D6C62:: @ 81D6C62 .incbin "baserom.gba", 0x1D6C62, 0x6E0 -gUnknown_81D7342:: @ 81D7342 +BattleScript_MoveUsedMustRecharge:: @ 81D7342 .incbin "baserom.gba", 0x1D7342, 0xA75 gUnknown_81D7DB7:: @ 81D7DB7 @@ -36,10 +36,10 @@ gUnknown_81D8674:: @ 81D8674 gUnknown_81D8684:: @ 81D8684 .incbin "baserom.gba", 0x1D8684, 0x10 -gUnknown_81D8694:: @ 81D8694 +BattleScript_GiveExp:: @ 81D8694 .incbin "baserom.gba", 0x1D8694, 0x9 -gUnknown_81D869D:: @ 81D869D +BattleScript_HandleFaintedMon:: @ 81D869D .incbin "baserom.gba", 0x1D869D, 0x152 gUnknown_81D87EF:: @ 81D87EF @@ -90,40 +90,40 @@ gUnknown_81D89F1:: @ 81D89F1 gUnknown_81D89F5:: @ 81D89F5 .incbin "baserom.gba", 0x1D89F5, 0x6F -gUnknown_81D8A64:: @ 81D8A64 +BattleScript_RainContinuesOrEnds:: @ 81D8A64 .incbin "baserom.gba", 0x1D8A64, 0x1B -gUnknown_81D8A7F:: @ 81D8A7F +BattleScript_DamagingWeatherContinues:: @ 81D8A7F .incbin "baserom.gba", 0x1D8A7F, 0x82 -gUnknown_81D8B01:: @ 81D8B01 +BattleScript_SandStormHailEnds:: @ 81D8B01 .incbin "baserom.gba", 0x1D8B01, 0x9 -gUnknown_81D8B0A:: @ 81D8B0A +BattleScript_SunlightContinues:: @ 81D8B0A .incbin "baserom.gba", 0x1D8B0A, 0xE -gUnknown_81D8B18:: @ 81D8B18 +BattleScript_SunlightFaded:: @ 81D8B18 .incbin "baserom.gba", 0x1D8B18, 0x7 -gUnknown_81D8B1F:: @ 81D8B1F +BattleScript_OverworldWeatherStarts:: @ 81D8B1F .incbin "baserom.gba", 0x1D8B1F, 0x13 -gUnknown_81D8B32:: @ 81D8B32 +BattleScript_SideStatusWoreOff:: @ 81D8B32 .incbin "baserom.gba", 0x1D8B32, 0x11 -gUnknown_81D8B43:: @ 81D8B43 +BattleScript_SafeguardEnds:: @ 81D8B43 .incbin "baserom.gba", 0x1D8B43, 0xA -gUnknown_81D8B4D:: @ 81D8B4D +BattleScript_LeechSeedTurnDrain:: @ 81D8B4D .incbin "baserom.gba", 0x1D8B4D, 0x5C -gUnknown_81D8BA9:: @ 81D8BA9 +BattleScript_BideStoringEnergy:: @ 81D8BA9 .incbin "baserom.gba", 0x1D8BA9, 0xB -gUnknown_81D8BB4:: @ 81D8BB4 +BattleScript_BideAttack:: @ 81D8BB4 .incbin "baserom.gba", 0x1D8BB4, 0x48 -gUnknown_81D8BFC:: @ 81D8BFC +BattleScript_BideNoEnergyToAttack:: @ 81D8BFC .incbin "baserom.gba", 0x1D8BFC, 0x14 gUnknown_81D8C10:: @ 81D8C10 @@ -135,16 +135,16 @@ gUnknown_81D8C3E:: @ 81D8C3E gUnknown_81D8C48:: @ 81D8C48 .incbin "baserom.gba", 0x1D8C48, 0x7 -gUnknown_81D8C4F:: @ 81D8C4F +BattleScript_MoveUsedIsDisabled:: @ 81D8C4F .incbin "baserom.gba", 0x1D8C4F, 0xB -gUnknown_81D8C5A:: @ 81D8C5A +BattleScript_SelectingDisabledMove:: @ 81D8C5A .incbin "baserom.gba", 0x1D8C5A, 0x4 -gUnknown_81D8C5E:: @ 81D8C5E +BattleScript_DisabledNoMore:: @ 81D8C5E .incbin "baserom.gba", 0x1D8C5E, 0x7 -gUnknown_81D8C65:: @ 81D8C65 +BattleScript_EncoredNoMore:: @ 81D8C65 .incbin "baserom.gba", 0x1D8C65, 0x7 gUnknown_81D8C6C:: @ 81D8C6C @@ -159,10 +159,10 @@ gUnknown_81D8CBE:: @ 81D8CBE gUnknown_81D8CF5:: @ 81D8CF5 .incbin "baserom.gba", 0x1D8CF5, 0x3E -gUnknown_81D8D33:: @ 81D8D33 +BattleScript_PerishSongTakesLife:: @ 81D8D33 .incbin "baserom.gba", 0x1D8D33, 0x1B -gUnknown_81D8D4E:: @ 81D8D4E +BattleScript_PerishSongCountGoesDown:: @ 81D8D4E .incbin "baserom.gba", 0x1D8D4E, 0x7 gUnknown_81D8D55:: @ 81D8D55 @@ -180,31 +180,31 @@ gUnknown_81D8E04:: @ 81D8E04 gUnknown_81D8E0B:: @ 81D8E0B .incbin "baserom.gba", 0x1D8E0B, 0x7 -gUnknown_81D8E12:: @ 81D8E12 +BattleScript_MonTookFutureAttack:: @ 81D8E12 .incbin "baserom.gba", 0x1D8E12, 0x8E gUnknown_81D8EA0:: @ 81D8EA0 .incbin "baserom.gba", 0x1D8EA0, 0x4 -gUnknown_81D8EA4:: @ 81D8EA4 +BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 .incbin "baserom.gba", 0x1D8EA4, 0x4 gUnknown_81D8EA8:: @ 81D8EA8 .incbin "baserom.gba", 0x1D8EA8, 0xF -gUnknown_81D8EB7:: @ 81D8EB7 +BattleScript_SelectingTormentedMove:: @ 81D8EB7 .incbin "baserom.gba", 0x1D8EB7, 0xF -gUnknown_81D8EC6:: @ 81D8EC6 +BattleScript_SelectingNotAllowedMoveTaunt:: @ 81D8EC6 .incbin "baserom.gba", 0x1D8EC6, 0x4 -gUnknown_81D8ECA:: @ 81D8ECA +BattleScript_MoveUsedIsTaunted:: @ 81D8ECA .incbin "baserom.gba", 0x1D8ECA, 0xB -gUnknown_81D8ED5:: @ 81D8ED5 +BattleScript_WishComesTrue:: @ 81D8ED5 .incbin "baserom.gba", 0x1D8ED5, 0x37 -gUnknown_81D8F0C:: @ 81D8F0C +BattleScript_IngrainTurnHeal:: @ 81D8F0C .incbin "baserom.gba", 0x1D8F0C, 0x29 gUnknown_81D8F35:: @ 81D8F35 @@ -213,10 +213,10 @@ gUnknown_81D8F35:: @ 81D8F35 gUnknown_81D8F86:: @ 81D8F86 .incbin "baserom.gba", 0x1D8F86, 0xE -gUnknown_81D8F94:: @ 81D8F94 +BattleScript_MoveUsedIsImprisoned:: @ 81D8F94 .incbin "baserom.gba", 0x1D8F94, 0xB -gUnknown_81D8F9F:: @ 81D8F9F +BattleScript_SelectingImprisonedMove:: @ 81D8F9F .incbin "baserom.gba", 0x1D8F9F, 0x4 gUnknown_81D8FA3:: @ 81D8FA3 @@ -240,67 +240,67 @@ gUnknown_81D8FEB:: @ 81D8FEB gUnknown_81D9015:: @ 81D9015 .incbin "baserom.gba", 0x1D9015, 0x14 -gUnknown_81D9029:: @ 81D9029 +BattleScript_MoveUsedIsAsleep:: @ 81D9029 .incbin "baserom.gba", 0x1D9029, 0xD -gUnknown_81D9036:: @ 81D9036 +BattleScript_MoveUsedWokeUp:: @ 81D9036 .incbin "baserom.gba", 0x1D9036, 0x14 -gUnknown_81D904A:: @ 81D904A +BattleScript_MonWokeUpInUproar:: @ 81D904A .incbin "baserom.gba", 0x1D904A, 0x9 -gUnknown_81D9053:: @ 81D9053 +BattleScript_PoisonTurnDmg:: @ 81D9053 .incbin "baserom.gba", 0x1D9053, 0x22 -gUnknown_81D9075:: @ 81D9075 +BattleScript_BurnTurnDmg:: @ 81D9075 .incbin "baserom.gba", 0x1D9075, 0xB -gUnknown_81D9080:: @ 81D9080 +BattleScript_MoveUsedIsFrozen:: @ 81D9080 .incbin "baserom.gba", 0x1D9080, 0xD -gUnknown_81D908D:: @ 81D908D +BattleScript_MoveUsedUnfroze:: @ 81D908D .incbin "baserom.gba", 0x1D908D, 0xB gUnknown_81D9098:: @ 81D9098 .incbin "baserom.gba", 0x1D9098, 0x9 -gUnknown_81D90A1:: @ 81D90A1 +BattleScript_MoveUsedIsParalyzed:: @ 81D90A1 .incbin "baserom.gba", 0x1D90A1, 0x10 -gUnknown_81D90B1:: @ 81D90B1 +BattleScript_MoveUsedFlinched:: @ 81D90B1 .incbin "baserom.gba", 0x1D90B1, 0xB -gUnknown_81D90BC:: @ 81D90BC +BattleScript_PrintUproarOverTurns:: @ 81D90BC .incbin "baserom.gba", 0x1D90BC, 0x9 -gUnknown_81D90C5:: @ 81D90C5 +BattleScript_ThrashConfuses:: @ 81D90C5 .incbin "baserom.gba", 0x1D90C5, 0xE -gUnknown_81D90D3:: @ 81D90D3 +BattleScript_MoveUsedIsConfused:: @ 81D90D3 .incbin "baserom.gba", 0x1D90D3, 0x43 -gUnknown_81D9116:: @ 81D9116 +BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116 .incbin "baserom.gba", 0x1D9116, 0x7 gUnknown_81D911D:: @ 81D911D .incbin "baserom.gba", 0x1D911D, 0x7 -gUnknown_81D9124:: @ 81D9124 +BattleScript_WrapTurnDmg:: @ 81D9124 .incbin "baserom.gba", 0x1D9124, 0x12 -gUnknown_81D9136:: @ 81D9136 +BattleScript_WrapEnds:: @ 81D9136 .incbin "baserom.gba", 0x1D9136, 0x7 -gUnknown_81D913D:: @ 81D913D +BattleScript_MoveUsedIsInLove:: @ 81D913D .incbin "baserom.gba", 0x1D913D, 0xD -gUnknown_81D914A:: @ 81D914A +BattleScript_MoveUsedIsInLoveCantAttack:: @ 81D914A .incbin "baserom.gba", 0x1D914A, 0xB -gUnknown_81D9155:: @ 81D9155 +BattleScript_NightmareTurnDmg:: @ 81D9155 .incbin "baserom.gba", 0x1D9155, 0x11 -gUnknown_81D9166:: @ 81D9166 +BattleScript_CurseTurnDmg:: @ 81D9166 .incbin "baserom.gba", 0x1D9166, 0x11 gUnknown_81D9177:: @ 81D9177 @@ -315,40 +315,40 @@ gUnknown_81D9192:: @ 81D9192 gUnknown_81D91A1:: @ 81D91A1 .incbin "baserom.gba", 0x1D91A1, 0x26 -gUnknown_81D91C7:: @ 81D91C7 +BattleScript_YawnMakesAsleep:: @ 81D91C7 .incbin "baserom.gba", 0x1D91C7, 0xAA gUnknown_81D9271:: @ 81D9271 .incbin "baserom.gba", 0x1D9271, 0xE -gUnknown_81D927F:: @ 81D927F +BattleScript_DrizzleActivates:: @ 81D927F .incbin "baserom.gba", 0x1D927F, 0x14 -gUnknown_81D9293:: @ 81D9293 +BattleScript_SpeedBoostActivates:: @ 81D9293 .incbin "baserom.gba", 0x1D9293, 0xE -gUnknown_81D92A1:: @ 81D92A1 +BattleScript_TraceActivates:: @ 81D92A1 .incbin "baserom.gba", 0x1D92A1, 0xA -gUnknown_81D92AB:: @ 81D92AB +BattleScript_RainDishActivates:: @ 81D92AB .incbin "baserom.gba", 0x1D92AB, 0x14 -gUnknown_81D92BF:: @ 81D92BF +BattleScript_SandstreamActivates:: @ 81D92BF .incbin "baserom.gba", 0x1D92BF, 0x14 -gUnknown_81D92D3:: @ 81D92D3 +BattleScript_ShedSkinActivates:: @ 81D92D3 .incbin "baserom.gba", 0x1D92D3, 0x25 -gUnknown_81D92F8:: @ 81D92F8 +BattleScript_CastformChange:: @ 81D92F8 .incbin "baserom.gba", 0x1D92F8, 0xF -gUnknown_81D9307:: @ 81D9307 +BattleScript_IntimidateActivatesEnd3:: @ 81D9307 .incbin "baserom.gba", 0x1D9307, 0x9 -gUnknown_81D9310:: @ 81D9310 +BattleScript_IntimidateActivates:: @ 81D9310 .incbin "baserom.gba", 0x1D9310, 0x69 -gUnknown_81D9379:: @ 81D9379 +BattleScript_DroughtActivates:: @ 81D9379 .incbin "baserom.gba", 0x1D9379, 0x14 gUnknown_81D938D:: @ 81D938D @@ -360,22 +360,22 @@ gUnknown_81D93A1:: @ 81D93A1 gUnknown_81D93AF:: @ 81D93AF .incbin "baserom.gba", 0x1D93AF, 0xE -gUnknown_81D93BD:: @ 81D93BD +BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD .incbin "baserom.gba", 0x1D93BD, 0x1 -gUnknown_81D93BE:: @ 81D93BE +BattleScript_MoveHPDrain:: @ 81D93BE .incbin "baserom.gba", 0x1D93BE, 0x22 -gUnknown_81D93E0:: @ 81D93E0 +BattleScript_MonMadeMoveUseless_PPLoss:: @ 81D93E0 .incbin "baserom.gba", 0x1D93E0, 0x1 -gUnknown_81D93E1:: @ 81D93E1 +BattleScript_MonMadeMoveUseless:: @ 81D93E1 .incbin "baserom.gba", 0x1D93E1, 0x15 -gUnknown_81D93F6:: @ 81D93F6 +BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6 .incbin "baserom.gba", 0x1D93F6, 0x1 -gUnknown_81D93F7:: @ 81D93F7 +BattleScript_FlashFireBoost:: @ 81D93F7 .incbin "baserom.gba", 0x1D93F7, 0x1F gUnknown_81D9416:: @ 81D9416 @@ -396,7 +396,7 @@ gUnknown_81D9444:: @ 81D9444 gUnknown_81D9452:: @ 81D9452 .incbin "baserom.gba", 0x1D9452, 0x1C -gUnknown_81D946E:: @ 81D946E +BattleScript_SoundproofProtected:: @ 81D946E .incbin "baserom.gba", 0x1D946E, 0x10 gUnknown_81D947E:: @ 81D947E @@ -405,115 +405,115 @@ gUnknown_81D947E:: @ 81D947E gUnknown_81D948E:: @ 81D948E .incbin "baserom.gba", 0x1D948E, 0xE -gUnknown_81D949C:: @ 81D949C +BattleScript_ColorChangeActivates:: @ 81D949C .incbin "baserom.gba", 0x1D949C, 0x7 -gUnknown_81D94A3:: @ 81D94A3 +BattleScript_RoughSkinActivates:: @ 81D94A3 .incbin "baserom.gba", 0x1D94A3, 0x1B -gUnknown_81D94BE:: @ 81D94BE +BattleScript_CuteCharmActivates:: @ 81D94BE .incbin "baserom.gba", 0x1D94BE, 0xD -gUnknown_81D94CB:: @ 81D94CB +BattleScript_ApplySecondaryEffect:: @ 81D94CB .incbin "baserom.gba", 0x1D94CB, 0x3 -gUnknown_81D94CE:: @ 81D94CE +BattleScript_SynchronizeActivates:: @ 81D94CE .incbin "baserom.gba", 0x1D94CE, 0x3 -gUnknown_81D94D1:: @ 81D94D1 +BattleScript_AbilityCuredStatus:: @ 81D94D1 .incbin "baserom.gba", 0x1D94D1, 0x9 -gUnknown_81D94DA:: @ 81D94DA +BattleScript_IgnoresWhileAsleep:: @ 81D94DA .incbin "baserom.gba", 0x1D94DA, 0x10 -gUnknown_81D94EA:: @ 81D94EA +BattleScript_IgnoresAndUsesRandomMove:: @ 81D94EA .incbin "baserom.gba", 0x1D94EA, 0x8 -gUnknown_81D94F2:: @ 81D94F2 +BattleScript_MoveUsedLoafingAround:: @ 81D94F2 .incbin "baserom.gba", 0x1D94F2, 0x12 -gUnknown_81D9504:: @ 81D9504 +BattleScript_IgnoresAndFallsAsleep:: @ 81D9504 .incbin "baserom.gba", 0x1D9504, 0x17 -gUnknown_81D951B:: @ 81D951B +BattleScript_IgnoresAndHitsItself:: @ 81D951B .incbin "baserom.gba", 0x1D951B, 0xB gUnknown_81D9526:: @ 81D9526 .incbin "baserom.gba", 0x1D9526, 0xB -gUnknown_81D9531:: @ 81D9531 +BattleScript_BerryCurePrlzEnd2:: @ 81D9531 .incbin "baserom.gba", 0x1D9531, 0x6 -gUnknown_81D9537:: @ 81D9537 +BattleScript_BerryCureParRet:: @ 81D9537 .incbin "baserom.gba", 0x1D9537, 0x12 -gUnknown_81D9549:: @ 81D9549 +BattleScript_BerryCurePsnEnd2:: @ 81D9549 .incbin "baserom.gba", 0x1D9549, 0x6 -gUnknown_81D954F:: @ 81D954F +BattleScript_BerryCurePsnRet:: @ 81D954F .incbin "baserom.gba", 0x1D954F, 0x12 -gUnknown_81D9561:: @ 81D9561 +BattleScript_BerryCureBrnEnd2:: @ 81D9561 .incbin "baserom.gba", 0x1D9561, 0x6 -gUnknown_81D9567:: @ 81D9567 +BattleScript_BerryCureBrnRet:: @ 81D9567 .incbin "baserom.gba", 0x1D9567, 0x12 -gUnknown_81D9579:: @ 81D9579 +BattleScript_BerryCureFrzEnd2:: @ 81D9579 .incbin "baserom.gba", 0x1D9579, 0x6 -gUnknown_81D957F:: @ 81D957F +BattleScript_BerryCureFrzRet:: @ 81D957F .incbin "baserom.gba", 0x1D957F, 0x12 -gUnknown_81D9591:: @ 81D9591 +BattleScript_BerryCureSlpEnd2:: @ 81D9591 .incbin "baserom.gba", 0x1D9591, 0x6 -gUnknown_81D9597:: @ 81D9597 +BattleScript_BerryCureSlpRet:: @ 81D9597 .incbin "baserom.gba", 0x1D9597, 0x12 -gUnknown_81D95A9:: @ 81D95A9 +BattleScript_BerryCureConfusionEnd2:: @ 81D95A9 .incbin "baserom.gba", 0x1D95A9, 0x6 -gUnknown_81D95AF:: @ 81D95AF +BattleScript_BerryCureConfusionRet:: @ 81D95AF .incbin "baserom.gba", 0x1D95AF, 0x10 -gUnknown_81D95BF:: @ 81D95BF +BattleScript_BerryCureChosenStatusEnd2:: @ 81D95BF .incbin "baserom.gba", 0x1D95BF, 0x6 -gUnknown_81D95C5:: @ 81D95C5 +BattleScript_BerryCureChosenStatusRet:: @ 81D95C5 .incbin "baserom.gba", 0x1D95C5, 0x14 -gUnknown_81D95D9:: @ 81D95D9 +BattleScript_WhiteHerbEnd2:: @ 81D95D9 .incbin "baserom.gba", 0x1D95D9, 0x6 -gUnknown_81D95DF:: @ 81D95DF +BattleScript_WhiteHerbRet:: @ 81D95DF .incbin "baserom.gba", 0x1D95DF, 0x10 -gUnknown_81D95EF:: @ 81D95EF +BattleScript_ItemHealHP_RemoveItem:: @ 81D95EF .incbin "baserom.gba", 0x1D95EF, 0x1D -gUnknown_81D960C:: @ 81D960C +BattleScript_BerryPPHealEnd2:: @ 81D960C .incbin "baserom.gba", 0x1D960C, 0x10 -gUnknown_81D961C:: @ 81D961C +BattleScript_ItemHealHP_End2:: @ 81D961C .incbin "baserom.gba", 0x1D961C, 0x6 -gUnknown_81D9622:: @ 81D9622 +BattleScript_ItemHealHP_Ret:: @ 81D9622 .incbin "baserom.gba", 0x1D9622, 0x1B -gUnknown_81D963D:: @ 81D963D +BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D .incbin "baserom.gba", 0x1D963D, 0x4 gUnknown_81D9641:: @ 81D9641 .incbin "baserom.gba", 0x1D9641, 0xE -gUnknown_81D964F:: @ 81D964F +BattleScript_BerryConfuseHealEnd2:: @ 81D964F .incbin "baserom.gba", 0x1D964F, 0x2A -gUnknown_81D9679:: @ 81D9679 +BattleScript_BerryStatRaiseEnd2:: @ 81D9679 .incbin "baserom.gba", 0x1D9679, 0x1B -gUnknown_81D9694:: @ 81D9694 +BattleScript_BerryFocusEnergyEnd2:: @ 81D9694 .incbin "baserom.gba", 0x1D9694, 0x10 gUnknown_81D96A4:: @ 81D96A4 diff --git a/data/data.s b/data/data.s index 41bbdfade..05747376d 100644 --- a/data/data.s +++ b/data/data.s @@ -278,7 +278,7 @@ gUnknown_82500C4:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 -gUnknown_8250104:: @ 8250104 +sSoundMovesTable:: @ 8250104 .incbin "baserom.gba", 0x250104, 0x18 gUnknown_825011C:: @ 825011C -- cgit v1.2.3 From c88c9c6edfb7122524b319e4601c5d2b97bf06ca Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Wed, 31 Jul 2019 07:57:24 +0800 Subject: progress #1 on porting battle_util --- data/battle_scripts_1.s | 2 +- data/data.s | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index c604211bc..317a4991f 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -183,7 +183,7 @@ gUnknown_81D8E0B:: @ 81D8E0B BattleScript_MonTookFutureAttack:: @ 81D8E12 .incbin "baserom.gba", 0x1D8E12, 0x8E -gUnknown_81D8EA0:: @ 81D8EA0 +BattleScript_NoMovesLeft:: @ 81D8EA0 .incbin "baserom.gba", 0x1D8EA0, 0x4 BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 diff --git a/data/data.s b/data/data.s index 05747376d..e8ce97d9c 100644 --- a/data/data.s +++ b/data/data.s @@ -278,9 +278,9 @@ gUnknown_82500C4:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 -sSoundMovesTable:: @ 8250104 - .incbin "baserom.gba", 0x250104, 0x18 + .section .rodata.825011C + .balign 4 gUnknown_825011C:: @ 825011C .incbin "baserom.gba", 0x25011C, 0x3E0 -- cgit v1.2.3 From 3eb1f1bc783308dac445eaacc05c9f14e9b78822 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 1 Aug 2019 12:25:38 +0800 Subject: matched AbilityBattleEffects --- data/data.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index e8ce97d9c..65f48e4f3 100644 --- a/data/data.s +++ b/data/data.s @@ -254,25 +254,25 @@ gUnknown_8250038:: @ 8250038 gUnknown_8250070:: @ 8250070 .incbin "baserom.gba", 0x250070, 0x24 -gUnknown_8250094:: @ 8250094 +gStatusConditionString_PoisonJpn:: @ 8250094 .incbin "baserom.gba", 0x250094, 0x8 -gUnknown_825009C:: @ 825009C +gStatusConditionString_SleepJpn:: @ 825009C .incbin "baserom.gba", 0x25009C, 0x8 -gUnknown_82500A4:: @ 82500A4 +gStatusConditionString_ParalysisJpn:: @ 82500A4 .incbin "baserom.gba", 0x2500A4, 0x8 -gUnknown_82500AC:: @ 82500AC +gStatusConditionString_BurnJpn:: @ 82500AC .incbin "baserom.gba", 0x2500AC, 0x8 -gUnknown_82500B4:: @ 82500B4 +gStatusConditionString_IceJpn:: @ 82500B4 .incbin "baserom.gba", 0x2500B4, 0x8 -gUnknown_82500BC:: @ 82500BC +gStatusConditionString_ConfusionJpn:: @ 82500BC .incbin "baserom.gba", 0x2500BC, 0x8 -gUnknown_82500C4:: @ 82500C4 +gStatusConditionString_LoveJpn:: @ 82500C4 .incbin "baserom.gba", 0x2500C4, 0x8 gUnknown_82500CC:: @ 82500CC -- cgit v1.2.3 From c2964e818143757ca5586b1a811669a1c287e870 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 2 Aug 2019 05:05:35 +0800 Subject: ported battle_util from pokeem --- data/data.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index 65f48e4f3..8b3e66bdc 100644 --- a/data/data.s +++ b/data/data.s @@ -281,7 +281,7 @@ gUnknown_82500CC:: @ 82500CC .section .rodata.825011C .balign 4 -gUnknown_825011C:: @ 825011C +gBattleScriptingCommandsTable:: @ 825011C .incbin "baserom.gba", 0x25011C, 0x3E0 gUnknown_82504FC:: @ 82504FC -- cgit v1.2.3 From 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 06:55:42 +0800 Subject: ported battle_controller_opponent from pokeem and corrected lots of stuff --- data/data.s | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index 8b3e66bdc..0a2298a65 100644 --- a/data/data.s +++ b/data/data.s @@ -145,7 +145,7 @@ gMonShinyPaletteTable:: @ 82380CC gTrainerFrontAnimsPtrTable:: @ 82390DC .incbin "baserom.gba", 0x2390DC, 0x250 -gUnknown_823932C:: @ 823932C +gTrainerFrontPicCoords:: @ 823932C .incbin "baserom.gba", 0x23932C, 0x250 gTrainerFrontPicTable:: @ 823957C @@ -350,8 +350,7 @@ gSpriteSheet_EnemyShadow:: @ 8250A0C gSpriteTemplate_EnemyShadow:: @ 8250A1C .incbin "baserom.gba", 0x250A1C, 0x18 -gUnknown_8250A34:: @ 8250A34 - .incbin "baserom.gba", 0x250A34, 0xEC + .section .rodata.8250B20 gUnknown_8250B20:: @ 8250B20 .incbin "baserom.gba", 0x250B20, 0xE4 -- cgit v1.2.3 From 8fed9a5f205cec0d86149a908d64f73316cbb1f4 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 07:44:51 +0800 Subject: quick review on battle_ai_script_commands --- data/battle_ai_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 944275acc..09cc3cfb2 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -4,7 +4,7 @@ .section script_data, "aw", %progbits -BattleAIs:: @ 81D9BF4 +gBattleAI_ScriptsTable:: @ 81D9BF4 .4byte AI_CheckBadMove .4byte AI_TryToFaint .4byte AI_CheckViability -- cgit v1.2.3 From 5568895b043dc37e95be0e99787541d78a7c6fee Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 23:59:41 +0800 Subject: ported battle_ai_switch_items from pokeem --- data/data.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index 0a2298a65..83621f378 100644 --- a/data/data.s +++ b/data/data.s @@ -233,7 +233,7 @@ gUnknown_824F020:: @ 824F020 gUnknown_824F048:: @ 824F048 .incbin "baserom.gba", 0x24F048, 0x8 -gUnknown_824F050:: @ 824F050 +gTypeEffectiveness:: @ 824F050 .incbin "baserom.gba", 0x24F050, 0x150 gUnknown_824F1A0:: @ 824F1A0 -- cgit v1.2.3 From b9d547a02f615b991713158bb7068ce0d7169088 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 5 Aug 2019 08:15:58 +0800 Subject: ported battle_controller_player from pokeem and matched several new functions --- data/data.s | 10 +++------- data/data_83F5738.s | 10 +++++----- 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index 83621f378..cc024364c 100644 --- a/data/data.s +++ b/data/data.s @@ -163,7 +163,7 @@ gTrainerBackPicCoords:: @ 8239F8C gTrainerBackPicTable:: @ 8239FA4 .incbin "baserom.gba", 0x239FA4, 0x30 -gUnknown_8239FD4:: @ 8239FD4 +gTrainerBackPicPaletteTable:: @ 8239FD4 .incbin "baserom.gba", 0x239FD4, 0x30 gEnemyMonElevation:: @ 823A004 @@ -236,7 +236,7 @@ gUnknown_824F048:: @ 824F048 gTypeEffectiveness:: @ 824F050 .incbin "baserom.gba", 0x24F050, 0x150 -gUnknown_824F1A0:: @ 824F1A0 +gTypeNames:: @ 824F1A0 .incbin "baserom.gba", 0x24F1A0, 0x80 gUnknown_824F220:: @ 824F220 @@ -329,11 +329,7 @@ gUnknown_8250888:: @ 8250888 gUnknown_8250892:: @ 8250892 .incbin "baserom.gba", 0x250892, 0xA -gUnknown_825089C:: @ 825089C - .incbin "baserom.gba", 0x25089C, 0xE4 - -gUnknown_8250980:: @ 8250980 - .incbin "baserom.gba", 0x250980, 0xC + .section .rodata.825098C gUnknown_825098C:: @ 825098C .incbin "baserom.gba", 0x25098C, 0x8 diff --git a/data/data_83F5738.s b/data/data_83F5738.s index dc09b0532..2b5b1d1f9 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -387,7 +387,7 @@ gUnknown_83FE6B5:: @ 83FE6B5 gUnknown_83FE6D0:: @ 83FE6D0 .incbin "baserom.gba", 0x3FE6D0, 0x5 -gUnknown_83FE6D5:: @ 83FE6D5 +gText_WhatWillPkmnDo:: @ 83FE6D5 .incbin "baserom.gba", 0x3FE6D5, 0x11 gUnknown_83FE6E6:: @ 83FE6E6 @@ -396,7 +396,7 @@ gUnknown_83FE6E6:: @ 83FE6E6 gUnknown_83FE6FA:: @ 83FE6FA .incbin "baserom.gba", 0x3FE6FA, 0x1A -gUnknown_83FE714:: @ 83FE714 +gText_LinkStandby:: @ 83FE714 .incbin "baserom.gba", 0x3FE714, 0x11 gUnknown_83FE725:: @ 83FE725 @@ -405,10 +405,10 @@ gUnknown_83FE725:: @ 83FE725 gUnknown_83FE747:: @ 83FE747 .incbin "baserom.gba", 0x3FE747, 0x1F -gUnknown_83FE766:: @ 83FE766 +gText_MoveInterfacePP:: @ 83FE766 .incbin "baserom.gba", 0x3FE766, 0x4 -gUnknown_83FE76A:: @ 83FE76A +gText_MoveInterfaceType:: @ 83FE76A .incbin "baserom.gba", 0x3FE76A, 0x6 gUnknown_83FE770:: @ 83FE770 @@ -417,7 +417,7 @@ gUnknown_83FE770:: @ 83FE770 gUnknown_83FE791:: @ 83FE791 .incbin "baserom.gba", 0x3FE791, 0xF -gUnknown_83FE7A0:: @ 83FE7A0 +gText_BattleSwitchWhich:: @ 83FE7A0 .incbin "baserom.gba", 0x3FE7A0, 0x6C gUnknown_83FE80C:: @ 83FE80C -- cgit v1.2.3 From 5f6a55e4fda5d038b3864b23136eb7cd9a8bdbcf Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Thu, 22 Aug 2019 14:21:56 +0800 Subject: battle_controller_link_opponent --- data/data.s | 5 ----- 1 file changed, 5 deletions(-) (limited to 'data') diff --git a/data/data.s b/data/data.s index cc024364c..3ca955d94 100644 --- a/data/data.s +++ b/data/data.s @@ -346,11 +346,6 @@ gSpriteSheet_EnemyShadow:: @ 8250A0C gSpriteTemplate_EnemyShadow:: @ 8250A1C .incbin "baserom.gba", 0x250A1C, 0x18 - .section .rodata.8250B20 - -gUnknown_8250B20:: @ 8250B20 - .incbin "baserom.gba", 0x250B20, 0xE4 - .section .rodata.8260270 gUnknown_8260270:: @ 8260270 -- cgit v1.2.3 From 23b2a0cc9f673363d4a6dc3d0c9e26fe50cce0c1 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 23 Aug 2019 02:32:15 +0800 Subject: battle_controller_link_partner --- data/data_83F5738.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/data_83F5738.s b/data/data_83F5738.s index 2b5b1d1f9..20cbed093 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -133,10 +133,10 @@ gUnknown_83F846D:: @ 83F846D gUnknown_83F847D:: @ 83F847D .incbin "baserom.gba", 0x3F847D, 0x323 - .section .rodata.83FB134 + .section .rodata.83FB218 -gUnknown_83FB134:: @ 83FB134 - .incbin "baserom.gba", 0x3FB134, 0xA80 +gUnknown_83FB218:: @ 83FB218 + .incbin "baserom.gba", 0x3FB218, 0x99C BattleText_MistShroud:: @ 83FBBB4 .incbin "baserom.gba", 0x3FBBB4, 0x35 -- cgit v1.2.3 From 3459fbb9a39d267c4d566e80cbab9a1d334135ab Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Fri, 23 Aug 2019 15:54:19 +0800 Subject: battle_script_commands data decomp --- data/battle_scripts_1.s | 37 +++++++++++++++++++++++++++++++++-- data/data.s | 51 ------------------------------------------------- 2 files changed, 35 insertions(+), 53 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 317a4991f..e084bade7 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -313,10 +313,43 @@ gUnknown_81D9192:: @ 81D9192 .incbin "baserom.gba", 0x1D9192, 0xF gUnknown_81D91A1:: @ 81D91A1 - .incbin "baserom.gba", 0x1D91A1, 0x26 + .incbin "baserom.gba", 0x1D91A1, 0x18 + +BattleScript_MoveEffectSleep:: @ 81D91B9 + .incbin "baserom.gba", 0x1D91B9, 0xE BattleScript_YawnMakesAsleep:: @ 81D91C7 - .incbin "baserom.gba", 0x1D91C7, 0xAA + .incbin "baserom.gba", 0x1D91C7, 0xE + +BattleScript_MoveEffectPoison:: @ 81D91D5 + .incbin "baserom.gba", 0x1D91D5, 0xF + +BattleScript_MoveEffectBurn:: @ 81D91E4 + .incbin "baserom.gba", 0x1D91E4, 0xF + +BattleScript_MoveEffectFreeze:: @ 81D91F3 + .incbin "baserom.gba", 0x1D91F3, 0xF + +BattleScript_MoveEffectParalysis:: @ 81D9202 + .incbin "baserom.gba", 0x1D9202, 0xF + +BattleScript_MoveEffectUproar:: @ 81D9211 + .incbin "baserom.gba", 0x1D9211, 0x7 + +BattleScript_MoveEffectToxic:: @ 81D9218 + .incbin "baserom.gba", 0x1D9218, 0xD + +BattleScript_MoveEffectPayDay:: @ 81D9225 + .incbin "baserom.gba", 0x1D9225, 0x7 + +BattleScript_MoveEffectWrap:: @ 81D922C + .incbin "baserom.gba", 0x1D922C, 0x9 + +BattleScript_MoveEffectConfusion:: @ 81D9235 + .incbin "baserom.gba", 0x1D9235, 0xE + +BattleScript_MoveEffectRecoil:: @ 81D9243 + .incbin "baserom.gba", 0x1D9243, 0x2E gUnknown_81D9271:: @ 81D9271 .incbin "baserom.gba", 0x1D9271, 0xE diff --git a/data/data.s b/data/data.s index 3ca955d94..b150bfb4e 100644 --- a/data/data.s +++ b/data/data.s @@ -278,57 +278,6 @@ gStatusConditionString_LoveJpn:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 - .section .rodata.825011C - - .balign 4 -gBattleScriptingCommandsTable:: @ 825011C - .incbin "baserom.gba", 0x25011C, 0x3E0 - -gUnknown_82504FC:: @ 82504FC - .incbin "baserom.gba", 0x2504FC, 0x34 - -gUnknown_8250530:: @ 8250530 - .incbin "baserom.gba", 0x250530, 0xC - -gUnknown_825053C:: @ 825053C - .incbin "baserom.gba", 0x25053C, 0xF0 - -gUnknown_825062C:: @ 825062C - .incbin "baserom.gba", 0x25062C, 0xA4 - -gUnknown_82506D0:: @ 82506D0 - .incbin "baserom.gba", 0x2506D0, 0x20 - -gUnknown_82506F0:: @ 82506F0 - .incbin "baserom.gba", 0x2506F0, 0xD8 - -gUnknown_82507C8:: @ 82507C8 - .incbin "baserom.gba", 0x2507C8, 0x18 - -gUnknown_82507E0:: @ 82507E0 - .incbin "baserom.gba", 0x2507E0, 0x8 - -gUnknown_82507E8:: @ 82507E8 - .incbin "baserom.gba", 0x2507E8, 0x28 - -gUnknown_8250810:: @ 8250810 - .incbin "baserom.gba", 0x250810, 0xC - -gUnknown_825081C:: @ 825081C - .incbin "baserom.gba", 0x25081C, 0x14 - -gUnknown_8250830:: @ 8250830 - .incbin "baserom.gba", 0x250830, 0x18 - -gUnknown_8250848:: @ 8250848 - .incbin "baserom.gba", 0x250848, 0x40 - -gUnknown_8250888:: @ 8250888 - .incbin "baserom.gba", 0x250888, 0xA - -gUnknown_8250892:: @ 8250892 - .incbin "baserom.gba", 0x250892, 0xA - .section .rodata.825098C gUnknown_825098C:: @ 825098C -- cgit v1.2.3 From 29d7ae94dea8e35d098b60a786368f391324221e Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 24 Aug 2019 09:22:38 +0800 Subject: battle_script_commands symbol documentation --- data/battle_scripts_1.s | 104 ++++++++++++++++++++++++------------------------ data/battle_scripts_2.s | 8 ++-- data/data.s | 2 +- data/data_83F5738.s | 6 +-- 4 files changed, 60 insertions(+), 60 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index e084bade7..0fd65d2e0 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1,39 +1,39 @@ .section script_data, "aw", %progbits -gUnknown_81D65A8:: @ 81D65A8 +gBattleScriptsForMoveEffects:: @ 81D65A8 .incbin "baserom.gba", 0x1D65A8, 0x388 -gUnknown_81D6930:: @ 81D6930 +BattleScript_HitFromCritCalc:: @ 81D6930 .incbin "baserom.gba", 0x1D6930, 0x1E -gUnknown_81D694E:: @ 81D694E +BattleScript_MoveEnd:: @ 81D694E .incbin "baserom.gba", 0x1D694E, 0x12 -gUnknown_81D6960:: @ 81D6960 +BattleScript_MoveMissedPause:: @ 81D6960 .incbin "baserom.gba", 0x1D6960, 0x271 -gUnknown_81D6BD1:: @ 81D6BD1 +BattleScript_StatUp:: @ 81D6BD1 .incbin "baserom.gba", 0x1D6BD1, 0x91 -gUnknown_81D6C62:: @ 81D6C62 +BattleScript_StatDown:: @ 81D6C62 .incbin "baserom.gba", 0x1D6C62, 0x6E0 BattleScript_MoveUsedMustRecharge:: @ 81D7342 .incbin "baserom.gba", 0x1D7342, 0xA75 -gUnknown_81D7DB7:: @ 81D7DB7 +BattleScript_PresentHealTarget:: @ 81D7DB7 .incbin "baserom.gba", 0x1D7DB7, 0x1A -gUnknown_81D7DD1:: @ 81D7DD1 +BattleScript_AlreadyAtFullHp:: @ 81D7DD1 .incbin "baserom.gba", 0x1D7DD1, 0x21 -gUnknown_81D7DF2:: @ 81D7DF2 +BattleScript_ButItFailed:: @ 81D7DF2 .incbin "baserom.gba", 0x1D7DF2, 0x882 -gUnknown_81D8674:: @ 81D8674 +BattleScript_FaintAttacker:: @ 81D8674 .incbin "baserom.gba", 0x1D8674, 0x10 -gUnknown_81D8684:: @ 81D8684 +BattleScript_FaintTarget:: @ 81D8684 .incbin "baserom.gba", 0x1D8684, 0x10 BattleScript_GiveExp:: @ 81D8694 @@ -84,10 +84,10 @@ gUnknown_81D8949:: @ 81D8949 gUnknown_81D894D:: @ 81D894D .incbin "baserom.gba", 0x1D894D, 0xA4 -gUnknown_81D89F1:: @ 81D89F1 +BattleScript_Pausex20:: @ 81D89F1 .incbin "baserom.gba", 0x1D89F1, 0x4 -gUnknown_81D89F5:: @ 81D89F5 +BattleScript_LevelUp:: @ 81D89F5 .incbin "baserom.gba", 0x1D89F5, 0x6F BattleScript_RainContinuesOrEnds:: @ 81D8A64 @@ -126,13 +126,13 @@ BattleScript_BideAttack:: @ 81D8BB4 BattleScript_BideNoEnergyToAttack:: @ 81D8BFC .incbin "baserom.gba", 0x1D8BFC, 0x14 -gUnknown_81D8C10:: @ 81D8C10 +BattleScript_SuccessForceOut:: @ 81D8C10 .incbin "baserom.gba", 0x1D8C10, 0x2E -gUnknown_81D8C3E:: @ 81D8C3E +BattleScript_MistProtected:: @ 81D8C3E .incbin "baserom.gba", 0x1D8C3E, 0xA -gUnknown_81D8C48:: @ 81D8C48 +BattleScript_RageIsBuilding:: @ 81D8C48 .incbin "baserom.gba", 0x1D8C48, 0x7 BattleScript_MoveUsedIsDisabled:: @ 81D8C4F @@ -147,16 +147,16 @@ BattleScript_DisabledNoMore:: @ 81D8C5E BattleScript_EncoredNoMore:: @ 81D8C65 .incbin "baserom.gba", 0x1D8C65, 0x7 -gUnknown_81D8C6C:: @ 81D8C6C +BattleScript_DestinyBondTakesLife:: @ 81D8C6C .incbin "baserom.gba", 0x1D8C6C, 0x1B -gUnknown_81D8C87:: @ 81D8C87 +BattleScript_SpikesOnAttacker:: @ 81D8C87 .incbin "baserom.gba", 0x1D8C87, 0x37 -gUnknown_81D8CBE:: @ 81D8CBE +BattleScript_SpikesOnTarget:: @ 81D8CBE .incbin "baserom.gba", 0x1D8CBE, 0x37 -gUnknown_81D8CF5:: @ 81D8CF5 +BattleScript_SpikesOnFaintedBattler:: @ 81D8CF5 .incbin "baserom.gba", 0x1D8CF5, 0x3E BattleScript_PerishSongTakesLife:: @ 81D8D33 @@ -165,19 +165,19 @@ BattleScript_PerishSongTakesLife:: @ 81D8D33 BattleScript_PerishSongCountGoesDown:: @ 81D8D4E .incbin "baserom.gba", 0x1D8D4E, 0x7 -gUnknown_81D8D55:: @ 81D8D55 +BattleScript_AllStatsUp:: @ 81D8D55 .incbin "baserom.gba", 0x1D8D55, 0x9C -gUnknown_81D8DF1:: @ 81D8DF1 +BattleScript_RapidSpinAway:: @ 81D8DF1 .incbin "baserom.gba", 0x1D8DF1, 0x2 -gUnknown_81D8DF3:: @ 81D8DF3 +BattleScript_WrapFree:: @ 81D8DF3 .incbin "baserom.gba", 0x1D8DF3, 0x11 -gUnknown_81D8E04:: @ 81D8E04 +BattleScript_LeechSeedFree:: @ 81D8E04 .incbin "baserom.gba", 0x1D8E04, 0x7 -gUnknown_81D8E0B:: @ 81D8E0B +BattleScript_SpikesFree:: @ 81D8E0B .incbin "baserom.gba", 0x1D8E0B, 0x7 BattleScript_MonTookFutureAttack:: @ 81D8E12 @@ -189,7 +189,7 @@ BattleScript_NoMovesLeft:: @ 81D8EA0 BattleScript_SelectingMoveWithNoPP:: @ 81D8EA4 .incbin "baserom.gba", 0x1D8EA4, 0x4 -gUnknown_81D8EA8:: @ 81D8EA8 +BattleScript_NoPPForMove:: @ 81D8EA8 .incbin "baserom.gba", 0x1D8EA8, 0xF BattleScript_SelectingTormentedMove:: @ 81D8EB7 @@ -207,10 +207,10 @@ BattleScript_WishComesTrue:: @ 81D8ED5 BattleScript_IngrainTurnHeal:: @ 81D8F0C .incbin "baserom.gba", 0x1D8F0C, 0x29 -gUnknown_81D8F35:: @ 81D8F35 +BattleScript_AtkDefDown:: @ 81D8F35 .incbin "baserom.gba", 0x1D8F35, 0x51 -gUnknown_81D8F86:: @ 81D8F86 +BattleScript_KnockedOff:: @ 81D8F86 .incbin "baserom.gba", 0x1D8F86, 0xE BattleScript_MoveUsedIsImprisoned:: @ 81D8F94 @@ -219,22 +219,22 @@ BattleScript_MoveUsedIsImprisoned:: @ 81D8F94 BattleScript_SelectingImprisonedMove:: @ 81D8F9F .incbin "baserom.gba", 0x1D8F9F, 0x4 -gUnknown_81D8FA3:: @ 81D8FA3 +BattleScript_GrudgeTakesPp:: @ 81D8FA3 .incbin "baserom.gba", 0x1D8FA3, 0x7 -gUnknown_81D8FAA:: @ 81D8FAA +BattleScript_MagicCoatBounce:: @ 81D8FAA .incbin "baserom.gba", 0x1D8FAA, 0x18 -gUnknown_81D8FC2:: @ 81D8FC2 +BattleScript_SnatchedMove:: @ 81D8FC2 .incbin "baserom.gba", 0x1D8FC2, 0x1B -gUnknown_81D8FDD:: @ 81D8FDD +BattleScript_EnduredMsg:: @ 81D8FDD .incbin "baserom.gba", 0x1D8FDD, 0x7 -gUnknown_81D8FE4:: @ 81D8FE4 +BattleScript_OneHitKOMsg:: @ 81D8FE4 .incbin "baserom.gba", 0x1D8FE4, 0x7 -gUnknown_81D8FEB:: @ 81D8FEB +BattleScript_SAtkDown2:: @ 81D8FEB .incbin "baserom.gba", 0x1D8FEB, 0x2A gUnknown_81D9015:: @ 81D9015 @@ -261,7 +261,7 @@ BattleScript_MoveUsedIsFrozen:: @ 81D9080 BattleScript_MoveUsedUnfroze:: @ 81D908D .incbin "baserom.gba", 0x1D908D, 0xB -gUnknown_81D9098:: @ 81D9098 +BattleScript_DefrostedViaFireMove:: @ 81D9098 .incbin "baserom.gba", 0x1D9098, 0x9 BattleScript_MoveUsedIsParalyzed:: @ 81D90A1 @@ -282,7 +282,7 @@ BattleScript_MoveUsedIsConfused:: @ 81D90D3 BattleScript_MoveUsedIsConfusedNoMore:: @ 81D9116 .incbin "baserom.gba", 0x1D9116, 0x7 -gUnknown_81D911D:: @ 81D911D +BattleScript_PrintPayDayMoneyString:: @ 81D911D .incbin "baserom.gba", 0x1D911D, 0x7 BattleScript_WrapTurnDmg:: @ 81D9124 @@ -303,7 +303,7 @@ BattleScript_NightmareTurnDmg:: @ 81D9155 BattleScript_CurseTurnDmg:: @ 81D9166 .incbin "baserom.gba", 0x1D9166, 0x11 -gUnknown_81D9177:: @ 81D9177 +BattleScript_TargetPRLZHeal:: @ 81D9177 .incbin "baserom.gba", 0x1D9177, 0x9 gUnknown_81D9180:: @ 81D9180 @@ -351,7 +351,7 @@ BattleScript_MoveEffectConfusion:: @ 81D9235 BattleScript_MoveEffectRecoil:: @ 81D9243 .incbin "baserom.gba", 0x1D9243, 0x2E -gUnknown_81D9271:: @ 81D9271 +BattleScript_ItemSteal:: @ 81D9271 .incbin "baserom.gba", 0x1D9271, 0xE BattleScript_DrizzleActivates:: @ 81D927F @@ -384,13 +384,13 @@ BattleScript_IntimidateActivates:: @ 81D9310 BattleScript_DroughtActivates:: @ 81D9379 .incbin "baserom.gba", 0x1D9379, 0x14 -gUnknown_81D938D:: @ 81D938D +BattleScript_TookAttack:: @ 81D938D .incbin "baserom.gba", 0x1D938D, 0x14 -gUnknown_81D93A1:: @ 81D93A1 +BattleScript_SturdyPreventsOHKO:: @ 81D93A1 .incbin "baserom.gba", 0x1D93A1, 0xE -gUnknown_81D93AF:: @ 81D93AF +BattleScript_DampStopsExplosion:: @ 81D93AF .incbin "baserom.gba", 0x1D93AF, 0xE BattleScript_MoveHPDrain_PPLoss:: @ 81D93BD @@ -411,31 +411,31 @@ BattleScript_FlashFireBoost_PPLoss:: @ 81D93F6 BattleScript_FlashFireBoost:: @ 81D93F7 .incbin "baserom.gba", 0x1D93F7, 0x1F -gUnknown_81D9416:: @ 81D9416 +BattleScript_AbilityNoStatLoss:: @ 81D9416 .incbin "baserom.gba", 0x1D9416, 0xA -gUnknown_81D9420:: @ 81D9420 +BattleScript_BRNPrevention:: @ 81D9420 .incbin "baserom.gba", 0x1D9420, 0xC -gUnknown_81D942C:: @ 81D942C +BattleScript_PRLZPrevention:: @ 81D942C .incbin "baserom.gba", 0x1D942C, 0xC -gUnknown_81D9438:: @ 81D9438 +BattleScript_PSNPrevention:: @ 81D9438 .incbin "baserom.gba", 0x1D9438, 0xC -gUnknown_81D9444:: @ 81D9444 +BattleScript_ObliviousPreventsAttraction:: @ 81D9444 .incbin "baserom.gba", 0x1D9444, 0xE -gUnknown_81D9452:: @ 81D9452 +BattleScript_FlinchPrevention:: @ 81D9452 .incbin "baserom.gba", 0x1D9452, 0x1C BattleScript_SoundproofProtected:: @ 81D946E .incbin "baserom.gba", 0x1D946E, 0x10 -gUnknown_81D947E:: @ 81D947E +BattleScript_AbilityNoSpecificStatLoss:: @ 81D947E .incbin "baserom.gba", 0x1D947E, 0x10 -gUnknown_81D948E:: @ 81D948E +BattleScript_StickyHoldActivates:: @ 81D948E .incbin "baserom.gba", 0x1D948E, 0xE BattleScript_ColorChangeActivates:: @ 81D949C @@ -471,7 +471,7 @@ BattleScript_IgnoresAndFallsAsleep:: @ 81D9504 BattleScript_IgnoresAndHitsItself:: @ 81D951B .incbin "baserom.gba", 0x1D951B, 0xB -gUnknown_81D9526:: @ 81D9526 +BattleScript_SubstituteFade:: @ 81D9526 .incbin "baserom.gba", 0x1D9526, 0xB BattleScript_BerryCurePrlzEnd2:: @ 81D9531 @@ -537,7 +537,7 @@ BattleScript_ItemHealHP_Ret:: @ 81D9622 BattleScript_SelectingNotAllowedMoveChoiceItem:: @ 81D963D .incbin "baserom.gba", 0x1D963D, 0x4 -gUnknown_81D9641:: @ 81D9641 +BattleScript_HangedOnMsg:: @ 81D9641 .incbin "baserom.gba", 0x1D9641, 0xE BattleScript_BerryConfuseHealEnd2:: @ 81D964F @@ -552,5 +552,5 @@ BattleScript_BerryFocusEnergyEnd2:: @ 81D9694 gUnknown_81D96A4:: @ 81D96A4 .incbin "baserom.gba", 0x1D96A4, 0x4 -gUnknown_81D96A8:: @ 81D96A8 +BattleScript_FlushMessageBox:: @ 81D96A8 .incbin "baserom.gba", 0x1D96A8, 0x4 diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index d9cd0829c..c3747cd8d 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -12,17 +12,17 @@ gUnknown_81D99FC:: @ 81D99FC gUnknown_81D9A04:: @ 81D9A04 .incbin "baserom.gba", 0x1D9A04, 0x3E -gUnknown_81D9A42:: @ 81D9A42 +BattleScript_SuccessBallThrow:: @ 81D9A42 .incbin "baserom.gba", 0x1D9A42, 0x46 gUnknown_81D9A88:: @ 81D9A88 .incbin "baserom.gba", 0x1D9A88, 0xB -gUnknown_81D9A93:: @ 81D9A93 +BattleScript_ShakeBallThrow:: @ 81D9A93 .incbin "baserom.gba", 0x1D9A93, 0x2E -gUnknown_81D9AC1:: @ 81D9AC1 +BattleScript_TrainerBallBlock:: @ 81D9AC1 .incbin "baserom.gba", 0x1D9AC1, 0x10 -gUnknown_81D9AD1:: @ 81D9AD1 +BattleScript_GhostBallDodge:: @ 81D9AD1 .incbin "baserom.gba", 0x1D9AD1, 0x123 diff --git a/data/data.s b/data/data.s index b150bfb4e..b88411e4a 100644 --- a/data/data.s +++ b/data/data.s @@ -239,7 +239,7 @@ gTypeEffectiveness:: @ 824F050 gTypeNames:: @ 824F1A0 .incbin "baserom.gba", 0x24F1A0, 0x80 -gUnknown_824F220:: @ 824F220 +gTrainerMoneyTable:: @ 824F220 .incbin "baserom.gba", 0x24F220, 0x8E8 gUnknown_824FB08:: @ 824FB08 diff --git a/data/data_83F5738.s b/data/data_83F5738.s index 20cbed093..1dd697956 100644 --- a/data/data_83F5738.s +++ b/data/data_83F5738.s @@ -369,10 +369,10 @@ gUnknown_83FDDEB:: @ 83FDDEB gUnknown_83FDF3C:: @ 83FDF3C .incbin "baserom.gba", 0x3FDF3C, 0x5D8 -gUnknown_83FE514:: @ 83FE514 +gMissStringIds:: @ 83FE514 .incbin "baserom.gba", 0x3FE514, 0x150 -gUnknown_83FE664:: @ 83FE664 +gTrappingMoves:: @ 83FE664 .incbin "baserom.gba", 0x3FE664, 0xE gUnknown_83FE672:: @ 83FE672 @@ -414,7 +414,7 @@ gText_MoveInterfaceType:: @ 83FE76A gUnknown_83FE770:: @ 83FE770 .incbin "baserom.gba", 0x3FE770, 0x21 -gUnknown_83FE791:: @ 83FE791 +gText_BattleYesNoChoice:: @ 83FE791 .incbin "baserom.gba", 0x3FE791, 0xF gText_BattleSwitchWhich:: @ 83FE7A0 -- cgit v1.2.3 From 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 27 Aug 2019 23:40:52 +0800 Subject: minor fixes and remove unnecessary NONMATCHING --- data/data.s | 17 ----------------- data/smokescreen.s | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 data/smokescreen.s (limited to 'data') diff --git a/data/data.s b/data/data.s index b88411e4a..eb755739a 100644 --- a/data/data.s +++ b/data/data.s @@ -278,23 +278,6 @@ gStatusConditionString_LoveJpn:: @ 82500C4 gUnknown_82500CC:: @ 82500CC .incbin "baserom.gba", 0x2500CC, 0x38 - .section .rodata.825098C - -gUnknown_825098C:: @ 825098C - .incbin "baserom.gba", 0x25098C, 0x8 - -gUnknown_8250994:: @ 8250994 - .incbin "baserom.gba", 0x250994, 0x60 - -gUnknown_82509F4:: @ 82509F4 - .incbin "baserom.gba", 0x2509F4, 0x18 - -gSpriteSheet_EnemyShadow:: @ 8250A0C - .incbin "baserom.gba", 0x250A0C, 0x10 - -gSpriteTemplate_EnemyShadow:: @ 8250A1C - .incbin "baserom.gba", 0x250A1C, 0x18 - .section .rodata.8260270 gUnknown_8260270:: @ 8260270 diff --git a/data/smokescreen.s b/data/smokescreen.s new file mode 100644 index 000000000..17d611d3c --- /dev/null +++ b/data/smokescreen.s @@ -0,0 +1,17 @@ + .section .rodata + .balign 4 + +gUnknown_825098C:: @ 825098C + .incbin "baserom.gba", 0x25098C, 0x8 + +gUnknown_8250994:: @ 8250994 + .incbin "baserom.gba", 0x250994, 0x60 + +gUnknown_82509F4:: @ 82509F4 + .incbin "baserom.gba", 0x2509F4, 0x18 + +gSpriteSheet_EnemyShadow:: @ 8250A0C + .incbin "baserom.gba", 0x250A0C, 0x10 + +gSpriteTemplate_EnemyShadow:: @ 8250A1C + .incbin "baserom.gba", 0x250A1C, 0x18 -- cgit v1.2.3