summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/event_scripts.s24
-rw-r--r--data/scripts/maps/AncientTomb.inc2
-rw-r--r--data/scripts/maps/CaveOfOrigin_B4F.inc2
-rw-r--r--data/scripts/maps/DesertRuins.inc2
-rw-r--r--data/scripts/maps/IslandCave.inc2
-rw-r--r--data/scripts/maps/PetalburgCity.inc2
-rw-r--r--data/scripts/maps/SkyPillar_Top.inc2
-rw-r--r--data/scripts/maps/SouthernIsland_Interior.inc2
-rw-r--r--data/specials.inc22
-rw-r--r--data/trainer_see.s41
10 files changed, 30 insertions, 71 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 80f3cd40a..2d0b1b4fe 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -931,7 +931,7 @@ SecretBase_RedCave1_EventScript_19F806:: @ 819F806
gUnknown_0819F80B:: @ 819F80B
lock
special PlayTrainerEncounterMusic
- special sub_80847C8
+ special ScrSpecial_EndTrainerApproach
waitstate
jump EventScript_19F8F2
@@ -940,7 +940,7 @@ gUnknown_0819F818:: @ 819F818
faceplayer
move LAST_TALKED, Movement_19F8F0
waitmove 0
- specialval RESULT, sub_8082564
+ specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F83F
special PlayTrainerEncounterMusic
@@ -954,7 +954,7 @@ gUnknown_0819F840:: @ 819F840
lock
faceplayer
call EventScript_19F8E5
- specialval RESULT, sub_8082564
+ specialval RESULT, ScrSpecial_HasTrainerBeenFought
compare RESULT, 0
jumpif 5, EventScript_19F877
special CheckForAlivePartyMons
@@ -965,7 +965,7 @@ gUnknown_0819F840:: @ 819F840
jump EventScript_19F8F2
EventScript_19F870:
- special sub_8082718
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -983,15 +983,15 @@ gUnknown_0819F878:: @ 819F878
gUnknown_0819F887:: @ 819F887
call EventScript_19F8E5
- specialval RESULT, sub_8082C9C
+ specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8AD
special PlayTrainerEncounterMusic
special sub_8082524
- special sub_80826D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
- special sub_80826B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1000,7 +1000,7 @@ EventScript_19F8AD:
endtrainerbattle
gUnknown_0819F8AE:: @ 819F8AE
- specialval RESULT, sub_8082C9C
+ specialval RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare RESULT, 0
jumpeq EventScript_19F8DD
special CheckForAlivePartyMons
@@ -1008,10 +1008,10 @@ gUnknown_0819F8AE:: @ 819F8AE
jumpif 5, EventScript_19F8DE
special PlayTrainerEncounterMusic
special sub_8082524
- special sub_80826D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
- special sub_80826B0
+ special ScrSpecial_StartTrainerEyeRematch
waitstate
releaseall
end
@@ -1020,7 +1020,7 @@ EventScript_19F8DD:
endtrainerbattle
EventScript_19F8DE:
- special sub_8082718
+ special ScrSpecial_ShowTrainerNonBattlingSpeech
waittext
waitbutton
release
@@ -1036,7 +1036,7 @@ Movement_19F8F0::
step_end
EventScript_19F8F2:
- special sub_80826D8
+ special ScrSpecial_ShowTrainerIntroSpeech
waittext
waitbutton
reptrainerbattle
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 7ba7540c4..bfc5b6a79 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050
setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
setflag 937
setflag 2145
- special StartBattle_Regi
+ special ScrSpecial_StartRegiBattle
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 023892d36..5517a9c7e 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
pause 40
waitpokecry
setflag 2145
- special StartBattle_GroudonKyogre
+ special ScrSpecial_StartGroudonKyogreBattle
waitstate
clearflag 2145
specialval RESULT, sub_810E300
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index df40fc126..97a22bae3 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85
setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
setflag 935
setflag 2145
- special StartBattle_Regi
+ special ScrSpecial_StartRegiBattle
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index b16f386d8..8f2ce6dc1 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D
setwildbattle SPECIES_REGICE, 40, ITEM_NONE
setflag 936
setflag 2145
- special StartBattle_Regi
+ special ScrSpecial_StartRegiBattle
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index dc5efe243..123b099fe 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
move 255, PetalburgCity_Movement_14B7CC
waitmove 0
msgbox PetalburgCity_Text_16D361, 4
- special StartBattle_WallyTutorial
+ special ScrSpecial_StartWallyTutorialBattle
waitstate
msgbox PetalburgCity_Text_16D3DE, 4
movecoords 2, PetalburgCity_Movement_1A083F, 0, 0
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc
index 23db6a8ea..d659a23c1 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/scripts/maps/SkyPillar_Top.inc
@@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316
waitpokecry
setflag 773
setflag 2145
- special StartBattle_Rayquaza
+ special ScrSpecial_StartRayquazaBattle
waitstate
clearflag 2145
release
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 3adf3545f..e5eaadab5 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
setflag 911
setflag 2145
- special StartBattle_SouthernIsland
+ special ScrSpecial_StartSouthernIslandBattle
waitstate
clearflag 2145
releaseall
diff --git a/data/specials.inc b/data/specials.inc
index ae2a4d8ef..99a4a218c 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -59,14 +59,14 @@ gSpecials::
def_special PlayerHasBerries
def_special IsEnigmaBerryValid
def_special ScrSpecial_GetTrainerBattleMode
- def_special sub_80826D8
- def_special sub_8082718
- def_special sub_8082564
- def_special sub_80847C8
+ def_special ScrSpecial_ShowTrainerIntroSpeech
+ def_special ScrSpecial_ShowTrainerNonBattlingSpeech
+ def_special ScrSpecial_HasTrainerBeenFought
+ def_special ScrSpecial_EndTrainerApproach
def_special PlayTrainerEncounterMusic
def_special sub_8082C68
- def_special sub_8082C9C
- def_special sub_80826B0
+ def_special ScrSpecial_GetTrainerEyeRematchFlag
+ def_special ScrSpecial_StartTrainerEyeRematch
def_special ShowPokemonStorageSystem
def_special CheckForAlivePartyMons
def_special TurnOffTVScreen
@@ -164,7 +164,7 @@ gSpecials::
def_special StartWallClock
def_special sub_810D6B8
def_special ScrSpecial_ChooseStarter
- def_special StartBattle_WallyTutorial
+ def_special ScrSpecial_StartWallyTutorialBattle
def_special sub_80BF9F8
def_special sub_80F9A0C
def_special sub_810CA00
@@ -318,9 +318,9 @@ gSpecials::
def_special IsPokerusInParty
def_special sub_8069D78
def_special sub_810F758
- def_special StartBattle_GroudonKyogre
- def_special StartBattle_Rayquaza
- def_special StartBattle_Regi
+ def_special ScrSpecial_StartGroudonKyogreBattle
+ def_special ScrSpecial_StartRayquazaBattle
+ def_special ScrSpecial_StartRegiBattle
def_special sub_8082524
def_special DoSealedChamberShakingEffect2
def_special sub_810F828
@@ -330,7 +330,7 @@ gSpecials::
def_special ShowContestEntryMonPic
def_special sub_80C5164
def_special sub_8134AB4
- def_special StartBattle_SouthernIsland
+ def_special ScrSpecial_StartSouthernIslandBattle
def_special SetRoute119Weather
def_special SetRoute123Weather
def_special ScriptGetMultiplayerId
diff --git a/data/trainer_see.s b/data/trainer_see.s
index 57eeae061..04a787f0c 100644
--- a/data/trainer_see.s
+++ b/data/trainer_see.s
@@ -4,47 +4,6 @@
.section .rodata
.align 2
-gSpriteImage_839B308:: @ 839B308
- .incbin "graphics/unknown_sprites/839B4E0/0.4bpp"
-
- .align 2
-gSpriteImage_839B388:: @ 839B388
- .incbin "graphics/unknown_sprites/839B4E0/1.4bpp"
-
- .align 2
-gSpriteImage_839B408:: @ 839B408
- .incbin "graphics/unknown_sprites/839B408.4bpp"
-
- .align 2
-gIsTrainerInRange:: @ 839B488
- .4byte IsTrainerInRangeSouth
- .4byte IsTrainerInRangeNorth
- .4byte IsTrainerInRangeWest
- .4byte IsTrainerInRangeEast
-
- .align 2
-gTrainerSeeFuncList:: @ 839B498
- .4byte sub_8084394
- .4byte sub_8084398
- .4byte sub_80843DC
- .4byte sub_808441C
- .4byte sub_8084478
- .4byte sub_8084534
- .4byte sub_8084578
- .4byte sub_80845AC
- .4byte sub_80845C8
- .4byte sub_80845FC
- .4byte sub_8084654
- .4byte sub_80846C8
-
- .align 2
-gTrainerSeeFuncList2:: @ 839B4C8
- .4byte sub_80845C8
- .4byte sub_80845FC
- .4byte sub_8084654
- .4byte sub_80846C8
-
- .align 2
gOamData_839B4D8:: @ 839B4D8
.2byte 0x0000
.2byte 0x4000
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 06:19:26 +0000