diff options
| -rw-r--r-- | data/field_effect.s | 7 | ||||
| -rw-r--r-- | data/field_effect_scripts.s | 346 | ||||
| -rw-r--r-- | data/field_map_obj.s | 13 | ||||
| -rw-r--r-- | data/fldeff_cut.s | 5 | ||||
| -rw-r--r-- | src/battle_transition.c | 2 |
5 files changed, 366 insertions, 7 deletions
diff --git a/data/field_effect.s b/data/field_effect.s index 0ae0ba95d..1a38abf94 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -37,7 +37,12 @@ gUnknown_83CBE70:: @ 83CBE70 gUnknown_83CBE84:: @ 83CBE84 .incbin "baserom.gba", 0x3CBE84, 0x18 - .incbin "baserom.gba", 0x3CBE9C, 0xEC + +gUnknown_83CBE9C:: + .incbin "baserom.gba", 0x3CBE9C, 0x8 + +gUnknown_83CBEA4:: + .incbin "baserom.gba", 0x3CBEA4, 0xE4 gUnknown_83CBF88:: @ 83CBF88 .incbin "baserom.gba", 0x3CBF88, 0x18 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index e655f0502..5b214e053 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,4 +1,346 @@ + .include "asm/macros/field_effect_script.inc" .section script_data, "aw", %progbits - + .align 2 gUnknown_81D96AC:: @ 81D96AC - .incbin "baserom.gba", 0x1D96AC, 0x304 + .4byte gFldEffScript_81D97C4 + .4byte gFldEffScript_81D97CA + .4byte gFldEffScript_81D97D0 + .4byte gFldEffScript_81D97D6 + .4byte gFldEffScript_81D97DC + .4byte gFldEffScript_81D97E6 + .4byte gFldEffScript_81D97F0 + .4byte gFldEffScript_81D97F6 + .4byte gFldEffScript_81D9800 + .4byte gFldEffScript_81D9806 + .4byte gFldEffScript_81D980C + .4byte gFldEffScript_81D9816 + .4byte gFldEffScript_81D9817 + .4byte gFldEffScript_81D9821 + .4byte gFldEffScript_81D982B + .4byte gFldEffScript_81D9835 + .4byte gFldEffScript_81D983F + .4byte gFldEffScript_81D9849 + .4byte gFldEffScript_81D9853 + .4byte gFldEffScript_81D985D + .4byte gFldEffScript_81D9867 + .4byte gFldEffScript_81D9871 + .4byte gFldEffScript_81D987B + .4byte gFldEffScript_81D9885 + .4byte gFldEffScript_81D988B + .4byte gFldEffScript_81D9895 + .4byte gFldEffScript_81D98A4 + .4byte gFldEffScript_81D98A5 + .4byte gFldEffScript_81D98A6 + .4byte gFldEffScript_81D98AC + .4byte gFldEffScript_81D98B2 + .4byte gFldEffScript_81D98B8 + .4byte gFldEffScript_81D98BE + .4byte gFldEffScript_81D98C4 + .4byte gFldEffScript_81D98CA + .4byte gFldEffScript_81D98D4 + .4byte gFldEffScript_81D98DE + .4byte gFldEffScript_81D98E4 + .4byte gFldEffScript_81D98F0 + .4byte gFldEffScript_81D98F6 + .4byte gFldEffScript_81D98EA + .4byte gFldEffScript_81D9900 + .4byte gFldEffScript_81D990A + .4byte gFldEffScript_81D9914 + .4byte gFldEffScript_81D991A + .4byte gFldEffScript_81D9920 + .4byte gFldEffScript_81D992B + .4byte gFldEffScript_81D9931 + .4byte gFldEffScript_81D9932 + .4byte gFldEffScript_81D9933 + .4byte gFldEffScript_81D993D + .4byte gFldEffScript_81D9947 + .4byte gFldEffScript_81D994D + .4byte gFldEffScript_81D994E + .4byte gFldEffScript_81D9958 + .4byte gFldEffScript_81D9962 + .4byte gFldEffScript_81D9963 + .4byte gFldEffScript_81D9964 + .4byte gFldEffScript_81D9965 + .4byte gFldEffScript_81D996F + .4byte gFldEffScript_81D9975 + .4byte gFldEffScript_81D9976 + .4byte gFldEffScript_81D9977 + .4byte gFldEffScript_81D9986 + .4byte gFldEffScript_81D998C + .4byte gFldEffScript_81D9992 + .4byte gFldEffScript_81D9998 + .4byte gFldEffScript_81D999E + .4byte gFldEffScript_81D99A4 + .4byte gFldEffScript_81D99AA + +gFldEffScript_81D97C4:: @ 81D97C4 + callnative FldEff_ExclamationMarkIcon1 + end + +gFldEffScript_81D97CA:: @ 81D97CA + callnative sub_80979A0 + end + +gFldEffScript_81D97D0:: @ 81D97D0 + callnative sub_80979F0 + end + +gFldEffScript_81D97D6:: @ 81D97D6 + callnative oei_shadow + end + +gFldEffScript_81D97DC:: @ 81D97DC + loadfadedpal_callnative gUnknown_83A5348, oei_grass_normal + end + +gFldEffScript_81D97E6:: @ 81D97E6 + loadfadedpal_callnative gUnknown_83A5348, oei_ripples + end + +gFldEffScript_81D97F0:: @ 81D97F0 + callnative FldEff_FieldMoveShowMon + end + +gFldEffScript_81D97F6:: @ 81D97F6 + loadfadedpal_callnative gUnknown_83A5348, oei_ash + end + +gFldEffScript_81D9800:: @ 81D9800 + callnative sub_80DC3D0 + end + +gFldEffScript_81D9806:: @ 81D9806 + callnative sub_8086944 + end + +gFldEffScript_81D980C:: @ 81D980C + loadfadedpal_callnative gUnknown_83A5340, FldEff_Dust + end + +gFldEffScript_81D9816:: @ 81D9816 + end + +gFldEffScript_81D9817:: @ 81D9817 + loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpTallGrass + end + +gFldEffScript_81D9821:: @ 81D9821 + loadfadedpal_callnative gUnknown_83A5340, FldEff_SandFootprints + end + +gFldEffScript_81D982B:: @ 81D982B + loadfadedpal_callnative gUnknown_83A5340, oei_water_drop_tall + end + +gFldEffScript_81D9835:: @ 81D9835 + loadfadedpal_callnative gUnknown_83A5340, FldEff_Splash + end + +gFldEffScript_81D983F:: @ 81D983F + loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpSmallSplash + end + +gFldEffScript_81D9849:: @ 81D9849 + loadfadedpal_callnative gUnknown_83A5348, FldEff_LongGrass + end + +gFldEffScript_81D9853:: @ 81D9853 + loadfadedpal_callnative gUnknown_83A5348, FldEff_JumpLongGrass + end + +gFldEffScript_81D985D:: @ 81D985D + loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown19 + end + +gFldEffScript_81D9867:: @ 81D9867 + loadfadedpal_callnative gUnknown_83A5348, FldEff_Unknown20 + end + +gFldEffScript_81D9871:: @ 81D9871 + loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown21 + end + +gFldEffScript_81D987B:: @ 81D987B + loadfadedpal_callnative gUnknown_83A5340, FldEff_Unknown22 + end + +gFldEffScript_81D9885:: @ 81D9885 + callnative sub_80DC9DC + end + +gFldEffScript_81D988B:: @ 81D988B + loadfadedpal_callnative gUnknown_83A5340, FldEff_DeepSandFootprints + end + +gFldEffScript_81D9895:: @ 81D9895 + loadfadedpal gUnknown_83CBE9C + loadfadedpal_callnative gUnknown_83A5340, sub_8083B8C + end + +gFldEffScript_81D98A4:: @ 81D98A4 + end + +gFldEffScript_81D98A5:: @ 81D98A5 + end + +gFldEffScript_81D98A6:: @ 81D98A6 + callnative ShowTreeDisguiseFieldEffect + end + +gFldEffScript_81D98AC:: @ 81D98AC + callnative ShowMountainDisguiseFieldEffect + end + +gFldEffScript_81D98B2:: @ 81D98B2 + callnative sub_8086D38 + end + +gFldEffScript_81D98B8:: @ 81D98B8 + callnative FldEff_UseFly + end + +gFldEffScript_81D98BE:: @ 81D98BE + callnative FldEff_FlyIn + end + +gFldEffScript_81D98C4:: @ 81D98C4 + callnative sub_8082624 + end + +gFldEffScript_81D98CA:: @ 81D98CA + loadfadedpal_callnative gUnknown_83A5340, FldEff_FeetInFlowingWater + end + +gFldEffScript_81D98D4:: @ 81D98D4 + loadfadedpal_callnative gUnknown_83A5340, FldEff_BikeTireTracks + end + +gFldEffScript_81D98DE:: @ 81D98DE + callnative ShowSandDisguiseFieldEffect + end + +gFldEffScript_81D98E4:: @ 81D98E4 + callnative FldEff_UseRockSmash + end + +gFldEffScript_81D98EA:: @ 81D98EA + callnative sub_80D0860 + end + +gFldEffScript_81D98F0:: @ 81D98F0 + callnative FldEff_UseDig + end + +gFldEffScript_81D98F6:: @ 81D98F6 + loadfadedpal_callnative gUnknown_83A5340, FldEff_SandPile + end + +gFldEffScript_81D9900:: @ 81D9900 + loadfadedpal_callnative gUnknown_83A5348, sub_80DB808 + end + +gFldEffScript_81D990A:: @ 81D990A + loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50 + end + +gFldEffScript_81D9914:: @ 81D9914 + callnative oei_waterfall + end + +gFldEffScript_81D991A:: @ 81D991A + callnative FldEff_UseDive + end + +gFldEffScript_81D9920:: @ 81D9920 + loadpal sSpritePalette_SlidingPokeball + callnative FldEff_Pokeball + end + +gFldEffScript_81D992B:: @ 81D992B + callnative sub_80825B4 + end + +gFldEffScript_81D9931:: @ 81D9931 + end + +gFldEffScript_81D9932:: @ 81D9932 + end + +gFldEffScript_81D9933:: @ 81D9933 + loadfadedpal_callnative gUnknown_83A5ED8, FldEff_PopOutOfAsh + end + +gFldEffScript_81D993D:: @ 81D993D + loadfadedpal_callnative gUnknown_83A5ED8, FldEff_LavaridgeGymWarp + end + +gFldEffScript_81D9947:: @ 81D9947 + callnative FldEff_SweetScent + end + +gFldEffScript_81D994D:: @ 81D994D + end + +gFldEffScript_81D994E:: @ 81D994E + loadfadedpal_callnative gUnknown_83A5340, FldEff_Bubbles + end + +gFldEffScript_81D9958:: @ 81D9958 + loadfadedpal_callnative gUnknown_83A5FF8, FldEff_Sparkle + end + +gFldEffScript_81D9962:: @ 81D9962 + end + +gFldEffScript_81D9963:: @ 81D9963 + end + +gFldEffScript_81D9964:: @ 81D9964 + end + +gFldEffScript_81D9965:: @ 81D9965 + loadfadedpal_callnative gUnknown_83D4144, sub_8097A48 + end + +gFldEffScript_81D996F:: @ 81D996F + callnative FldEff_FieldMoveShowMonInit + end + +gFldEffScript_81D9975:: @ 81D9975 + end + +gFldEffScript_81D9976:: @ 81D9976 + end + +gFldEffScript_81D9977:: @ 81D9977 + loadfadedpal gUnknown_83CBE9C + loadfadedpal_callnative gUnknown_83CBEA4, sub_8083CE0 + end + +gFldEffScript_81D9986:: @ 81D9986 + callnative FldEff_UseTeleport + end + +gFldEffScript_81D998C:: @ 81D998C + callnative sub_80825EC + end + +gFldEffScript_81D9992:: @ 81D9992 + callnative sub_8086BA8 + end + +gFldEffScript_81D9998:: @ 81D9998 + callnative sub_808257C + end + +gFldEffScript_81D999E:: @ 81D999E + callnative sub_8087924 + end + +gFldEffScript_81D99A4:: @ 81D99A4 + callnative sub_8087AB4 + end + +gFldEffScript_81D99AA:: @ 81D99AA + callnative sub_8087E28 + end diff --git a/data/field_map_obj.s b/data/field_map_obj.s index deae90e8f..9c36b523e 100644 --- a/data/field_map_obj.s +++ b/data/field_map_obj.s @@ -5349,10 +5349,19 @@ gUnknown_83A5278:: @ 83A5278 .incbin "baserom.gba", 0x3A5278, 0xB8 gUnknown_83A5330:: @ 83A5330 - .incbin "baserom.gba", 0x3A5330, 0x18 + .incbin "baserom.gba", 0x3A5330, 0x10 + +gUnknown_83A5340:: + .incbin "baserom.gba", 0x3A5340, 0x8 gUnknown_83A5348:: @ 83A5348 - .incbin "baserom.gba", 0x3A5348, 0xCB8 + .incbin "baserom.gba", 0x3A5348, 0xB90 + +gUnknown_83A5ED8:: + .incbin "baserom.gba", 0x3A5ED8, 0x120 + +gUnknown_83A5FF8:: + .incbin "baserom.gba", 0x3A5FF8, 0x8 gUnknown_83A6000:: @ 83A6000 .incbin "baserom.gba", 0x3A6000, 0x10 diff --git a/data/fldeff_cut.s b/data/fldeff_cut.s index ee162cf40..5436b51e4 100644 --- a/data/fldeff_cut.s +++ b/data/fldeff_cut.s @@ -7,7 +7,10 @@ .align 2 gUnknown_83D4100:: @ 83D4100 - .incbin "baserom.gba", 0x3D4100, 0x4C + .incbin "baserom.gba", 0x3D4100, 0x44 + +gUnknown_83D4144:: + .incbin "baserom.gba", 0x3D4144, 0x8 gUnknown_83D414C:: @ 83D414C .incbin "baserom.gba", 0x3D414C, 0x18 diff --git a/src/battle_transition.c b/src/battle_transition.c index 1dbfe3aed..08ae9e5b2 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -543,7 +543,7 @@ static const struct SpriteTemplate sSpriteTemplateTable_Unused[] = // this palette is shared by big pokeball and sliding pokeball static const u16 sSlidingPokeballBigPokeballPalette[] = INCBIN_U16("graphics/battle_transitions/sliding_pokeball.gbapal"); -static const struct SpritePalette sSpritePalette_SlidingPokeball = +const struct SpritePalette sSpritePalette_SlidingPokeball = { .data = sSlidingPokeballBigPokeballPalette, .tag = 0x1009, |