summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s10
-rw-r--r--data/field_effect_misc.s244
-rw-r--r--data/field_effect_scripts.s20
-rw-r--r--data/maps/BattleFrontier_OutsideEast/scripts.inc2
-rw-r--r--data/party_menu.s2
-rw-r--r--data/scripts/berry_tree.inc2
-rw-r--r--data/specials.inc6
7 files changed, 21 insertions, 265 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index c38b69d8b..557515c70 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -537,7 +537,7 @@ EventScript_23B5F0:: @ 823B5F0
goto_eq EventScript_23B5A1
msgbox Text_2767D1, MSGBOX_SIGN
special sub_80E9C2C
- special sub_80FA57C
+ special DoSecretBasePCTurnOffEffect
releaseall
end
@@ -547,13 +547,13 @@ EventScript_23B62F:: @ 823B62F
goto_eq EventScript_23B5A1
msgbox Text_2767E9, MSGBOX_SIGN
special sub_80E9C2C
- special sub_80FA57C
+ special DoSecretBasePCTurnOffEffect
releaseall
end
EventScript_23B652:: @ 823B652
msgbox Text_27676F, MSGBOX_SIGN
- special sub_80FA57C
+ special DoSecretBasePCTurnOffEffect
closemessage
releaseall
end
@@ -564,7 +564,7 @@ EventScript_23B660:: @ 823B660
end
EventScript_23B66E:: @ 823B66E
- special sub_80FA57C
+ special DoSecretBasePCTurnOffEffect
closemessage
releaseall
end
@@ -592,7 +592,7 @@ EventScript_SecretBaseSandOrnament:: @ 823B684
end
EventScript_SecretBaseShieldOrToyTV:: @ 823B68C
- special sub_80FAC78
+ special GetShieldToyTVDecorationInfo
compare VAR_RESULT, 0
goto_eq EventScript_23B6BC
compare VAR_RESULT, 1
diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s
deleted file mode 100644
index f1b28d906..000000000
--- a/data/field_effect_misc.s
+++ /dev/null
@@ -1,244 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
-
- .align 2
-gSpriteImage_858D978:: @ 858D978
- .incbin "graphics/unknown/858E588/0.4bpp"
-
- .align 2
-gSpriteImage_858D9F8:: @ 858D9F8
- .incbin "graphics/unknown/858E588/1.4bpp"
-
- .align 2
-gSpriteImage_858DA78:: @ 858DA78
- .incbin "graphics/unknown/858E588/2.4bpp"
-
- .align 2
-gSpriteImage_858DAF8:: @ 858DAF8
- .incbin "graphics/unknown/858E588/3.4bpp"
-
- .align 2
-gSpriteImage_858DB78:: @ 858DB78
- .incbin "graphics/unknown/858E588/4.4bpp"
-
- .space 32
-
- .align 2
-gFieldEffectObjectPalette7:: @ 858DC18
- .incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal"
-
- .align 2
-gSpriteImage_858DC38:: @ 858DC38
- .incbin "graphics/unknown/858E5D8/0.4bpp"
-
- .align 2
-gSpriteImage_858DCB8:: @ 858DCB8
- .incbin "graphics/unknown/858E5D8/1.4bpp"
-
- .align 2
-gSpriteImage_858DD38:: @ 858DD38
- .incbin "graphics/unknown/858E5D8/2.4bpp"
-
- .align 2
-gSpriteImage_858DDB8:: @ 858DDB8
- .incbin "graphics/unknown/858E5D8/3.4bpp"
-
- .align 2
-gSpriteImage_858DE38:: @ 858DE38
- .incbin "graphics/unknown/858E5D8/4.4bpp"
-
- .align 2
-gSpriteImage_858DEB8:: @ 858DEB8
- .incbin "graphics/unknown/858E5B0/0.4bpp"
-
- .align 2
-gSpriteImage_858DF38:: @ 858DF38
- .incbin "graphics/unknown/858E5B0/1.4bpp"
-
- .align 2
-gSpriteImage_858DFB8:: @ 858DFB8
- .incbin "graphics/unknown/858E5B0/2.4bpp"
-
- .align 2
-gSpriteImage_858E038:: @ 858E038
- .incbin "graphics/unknown/858E5B0/3.4bpp"
-
- .align 2
-gSpriteImage_858E0B8:: @ 858E0B8
- .incbin "graphics/unknown/858E5B0/4.4bpp"
-
- .align 2
-gSpriteImage_858E138:: @ 858E138
- .incbin "graphics/unknown/858E5B0/5.4bpp"
-
- .align 2
-gFieldEffectObjectPalette8:: @ 858E1B8
- .incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal"
-
- .align 2
-gSpriteImage_858E1D8:: @ 858E1D8
- .incbin "graphics/unknown/858E674/0.4bpp"
-
- .align 2
-gSpriteImage_858E2D8:: @ 858E2D8
- .incbin "graphics/unknown/858E674/1.4bpp"
-
- .align 2
-gSpriteImage_858E3D8:: @ 858E3D8
- .incbin "graphics/unknown/858E674/2.4bpp"
-
- .align 2
-gOamData_858E4D8:: @ 858E4D8
- .2byte 0x0000, 0x4000, 0x0800, 0x0000
-
- .align 2
-gSpriteAnim_858E4E0:: @ 858E4E0
- .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_858E4F8:: @ 858E4F8
- .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_858E510:: @ 858E510
- .2byte 0x0004, 0x0008, 0x0003, 0x0008, 0x0002, 0x0008, 0x0001, 0x0008, 0x0000, 0x0008, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_858E528:: @ 858E528
- .2byte 0x0000, 0x0048, 0x0001, 0x0048, 0x0002, 0x0048, 0x0003, 0x0048, 0x0004, 0x0048, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_858E540:: @ 858E540
- .2byte 0x0004, 0x0048, 0x0003, 0x0048, 0x0002, 0x0048, 0x0001, 0x0048, 0x0000, 0x0048, 0xffff, 0x0000
-
- .align 2
-gSpriteAnim_858E558:: @ 858E558
- .2byte 0x0000, 0x0008, 0x0001, 0x0008, 0x0002, 0x0008, 0x0003, 0x0008, 0x0004, 0x0008, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_858E570:: @ 858E570
- .4byte gSpriteAnim_858E4E0
-
- .align 2
-gSpriteAnimTable_858E574:: @ 858E574
- .4byte gSpriteAnim_858E4F8
- .4byte gSpriteAnim_858E510
- .4byte gSpriteAnim_858E528
- .4byte gSpriteAnim_858E540
-
- .align 2
-gSpriteAnimTable_858E584:: @ 858E584
- .4byte gSpriteAnim_858E558
-
- .align 2
-gUnknown_858E588:: @ 858E588
- obj_frame_tiles gSpriteImage_858D978, 0x0080
- obj_frame_tiles gSpriteImage_858D9F8, 0x0080
- obj_frame_tiles gSpriteImage_858DA78, 0x0080
- obj_frame_tiles gSpriteImage_858DAF8, 0x0080
- obj_frame_tiles gSpriteImage_858DB78, 0x0080
-
- .align 2
-gUnknown_858E5B0:: @ 858E5B0
- obj_frame_tiles gSpriteImage_858DEB8, 0x0080
- obj_frame_tiles gSpriteImage_858DF38, 0x0080
- obj_frame_tiles gSpriteImage_858DFB8, 0x0080
- obj_frame_tiles gSpriteImage_858E038, 0x0080
- obj_frame_tiles gSpriteImage_858E0B8, 0x0080
-
- .align 2
-gUnknown_858E5D8:: @ 858E5D8
- obj_frame_tiles gSpriteImage_858DC38, 0x0080
- obj_frame_tiles gSpriteImage_858DCB8, 0x0080
- obj_frame_tiles gSpriteImage_858DD38, 0x0080
- obj_frame_tiles gSpriteImage_858DDB8, 0x0080
- obj_frame_tiles gSpriteImage_858DE38, 0x0080
-
- .align 2
-gUnknown_0858E600:: @ 858E600
- spr_template 0xffff, 0x1003, gOamData_858E4D8, gSpriteAnimTable_858E570, gUnknown_858E588, gDummySpriteAffineAnimTable, sub_80FA18C
-
- .align 2
-gUnknown_0858E618:: @ 858E618
- spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E574, gUnknown_858E5B0, gDummySpriteAffineAnimTable, sub_80FA2D8
-
- .align 2
-gUnknown_0858E630:: @ 858E630
- spr_template 0xffff, 0x1008, gOamData_858E4D8, gSpriteAnimTable_858E584, gUnknown_858E5D8, gDummySpriteAffineAnimTable, sub_80FA3FC
-
- .align 2
-gFieldEffectObjectPaletteInfo7:: @ 858E648
- obj_pal gFieldEffectObjectPalette7, 0x1003
-
- .align 2
-gFieldEffectObjectPaletteInfo8:: @ 858E650
- obj_pal gFieldEffectObjectPalette8, 0x1008
-
- .align 2
-gOamData_858E658:: @ 858E658
- .2byte 0x8000, 0x8000, 0x0800, 0x0000
-
- .align 2
-gSpriteAnim_858E660:: @ 858E660
- .2byte 0x0000, 0x0006, 0x0001, 0x0006, 0x0002, 0x0006, 0xffff, 0x0000
-
- .align 2
-gSpriteAnimTable_858E670:: @ 858E670
- .4byte gSpriteAnim_858E660
-
- .align 2
-gUnknown_0858E674:: @ 858E674
- obj_frame_tiles gSpriteImage_858E1D8, 0x0100
- obj_frame_tiles gSpriteImage_858E2D8, 0x0100
- obj_frame_tiles gSpriteImage_858E3D8, 0x0100
-
- .align 2
-gUnknown_0858E68C:: @ 858E68C
- spr_template 0xffff, 0x100e, gOamData_858E658, gSpriteAnimTable_858E670, gUnknown_0858E674, gDummySpriteAffineAnimTable, door_restore_tilemap
-
- .align 2
-@ This uses one of the secret base palettes, so there is no
-@ "field_effect_object_palette_09.pal" file.
-gFieldEffectObjectPaletteInfo9:: @ 858E6A4
- obj_pal gTilesetPalettes_SecretBase + 5 * 0x20, 0x100E
-
- .align 2
-gSpriteImage_858E6AC:: @ 858E6AC
- .incbin "graphics/unknown/858E84C/0.4bpp"
-
- .align 2
-gSpriteImage_858E72C:: @ 858E72C
- .incbin "graphics/unknown/858E84C/1.4bpp"
-
- .align 2
-gSpriteImage_858E7AC:: @ 858E7AC
- .incbin "graphics/unknown/858E84C/2.4bpp"
-
- .align 2
-gUnknown_0858E82C:: @ 858E82C
- .incbin "graphics/unknown/unknown_58E82C.gbapal"
-
- .align 2
-gUnknown_0858E84C:: @ 858E84C
- obj_frame_tiles gSpriteImage_858E6AC, 0x0080
- obj_frame_tiles gSpriteImage_858E72C, 0x0080
- obj_frame_tiles gSpriteImage_858E7AC, 0x0080
-
- .align 2
-gUnknown_0858E864:: @ 858E864
- obj_pal gUnknown_0858E82C, 0x1000
-
- .align 2
-gSpriteAnim_858E86C:: @ 858E86C
- .2byte 0x0000, 0x001e, 0x0001, 0x001e, 0x0002, 0x001e, 0xfffe, 0x0000
-
- .align 2
-gSpriteAnimTable_858E87C:: @ 858E87C
- .4byte gSpriteAnim_858E86C
-
- .align 2
-gUnknown_0858E880:: @ 858E880
- spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index eab655877..81de41aaa 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -118,7 +118,7 @@ gFieldEffectScript_GroundImpactDust:: @ 82DBB28
field_eff_end
gFieldEffectScript_Unknown11:: @ 82DBB32
- field_eff_callnative oei_sweet_scent
+ field_eff_callnative FldEff_UseSecretPowerCave
field_eff_end
gFieldEffectScript_BikeHopTallGrass:: @ 82DBB38
@@ -179,11 +179,11 @@ gFieldEffectScript_Unknown25:: @ 82DBBB6
field_eff_end
gFieldEffectScript_Unknown26:: @ 82DBBC5
- field_eff_callnative sub_80FA208
+ field_eff_callnative FldEff_UseSecretPowerTree
field_eff_end
gFieldEffectScript_Unknown27:: @ 82DBBCB
- field_eff_callnative sub_80FA36C
+ field_eff_callnative FldEff_UseSecretPowerShrub
field_eff_end
gFieldEffectScript_TreeDisguise:: @ 82DBBD1
@@ -264,11 +264,11 @@ gFieldEffectScript_HeartIcon:: @ 82DBC56
field_eff_end
gFieldEffectScript_Unknown47:: @ 82DBC60
- field_eff_callnative sub_80FA6FC
+ field_eff_callnative FldEff_NopA6FC
field_eff_end
gFieldEffectScript_Unknown48:: @ 82DBC66
- field_eff_callnative sub_80FA700
+ field_eff_callnative FldEff_NopA700
field_eff_end
gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
@@ -284,7 +284,7 @@ gFieldEffectScript_Unknown51:: @ 82DBC80
field_eff_end
gFieldEffectScript_Unknown52:: @ 82DBC86
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, sub_80FAA7C
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo9, FldEff_SandPillar
field_eff_end
gFieldEffectScript_Bubbles:: @ 82DBC90
@@ -296,15 +296,15 @@ gFieldEffectScript_Unknown54:: @ 82DBC9A
field_eff_end
gFieldEffectScript_Unknown55:: @ 82DBCA4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, sub_80FA13C
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo7, FldEff_SecretPowerCave
field_eff_end
gFieldEffectScript_Unknown56:: @ 82DBCAE
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA248
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerTree
field_eff_end
gFieldEffectScript_Unknown57:: @ 82DBCB8
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, sub_80FA3AC
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo8, FldEff_SecretPowerShrub
field_eff_end
gFieldEffectScript_Unknown58:: @ 82DBCC2
@@ -320,7 +320,7 @@ gFieldEffectScript_Unknown60:: @ 82DBCD2
field_eff_end
gFieldEffectScript_Unknown61:: @ 82DBCD8
- field_eff_callnative sub_80FA458
+ field_eff_callnative FldEff_SecretBasePCTurnOn
field_eff_end
gFieldEffectScript_Unknown62:: @ 82DBCDE
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index fe034442e..bc154052d 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -117,7 +117,7 @@ BattleFrontier_OutsideEast_EventScript_242CEA:: @ 8242CEA
BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
lock
faceplayer
- special sub_80FAFF8
+ special DoWateringBerryTreeAnim
waitstate
waitse
playse 269
diff --git a/data/party_menu.s b/data/party_menu.s
index 011a73106..fd1bd7948 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -441,7 +441,7 @@ gUnknown_08615D9C:: @ 8615D9C
.4byte hm_prepare_waterfall, 0x0000000d
.4byte SetUpFieldMove_Teleport, 0x0000000d
.4byte SetUpFieldMove_Dig, 0x0000000d
- .4byte sub_80FA004, 0x0000000d
+ .4byte SetUpFieldMove_SecretPower, 0x0000000d
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SoftBoiled, 0x00000010
.4byte SetUpFieldMove_SweetScent, 0x0000000d
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index f4208afd0..238541ee6 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -174,7 +174,7 @@ Route102_EventScript_2744C4:: @ 82744C4
message Route102_Text_274710
waitmessage
special EventObjectInteractionWaterBerryTree
- special sub_80FAFF8
+ special DoWateringBerryTreeAnim
waitstate
message Route102_Text_274723
waitmessage
diff --git a/data/specials.inc b/data/specials.inc
index 495a5a980..3ae1a14f8 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -34,7 +34,7 @@ gSpecials:: @ 81DBA64
def_special sub_8129708
def_special sub_80E91F8
def_special sub_80EA30C
- def_special sub_80FA57C
+ def_special DoSecretBasePCTurnOffEffect
def_special sub_80E6BE8
def_special sub_80B2DA4
def_special sub_80B2E4C
@@ -105,7 +105,7 @@ gSpecials:: @ 81DBA64
def_special GiveMonArtistRibbon
def_special sub_80B3000
def_special SaveGame
- def_special sub_80FAFF8
+ def_special DoWateringBerryTreeAnim
def_special easy_chat_input_maybe
def_special sub_811EECC
def_special ScrSpecial_GetCurrentMauvilleMan
@@ -317,7 +317,7 @@ gSpecials:: @ 81DBA64
def_special ScriptCheckFreePokemonStorageSpace
def_special DoSealedChamberShakingEffect1
def_special sub_8139B60
- def_special sub_80FAC78
+ def_special GetShieldToyTVDecorationInfo
def_special IsPokerusInParty
def_special SetSootopolisGymCrackedIceMetatiles
def_special sub_8139560
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-22 04:51:27 +0000