summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/battle_interface.s164
-rw-r--r--data/event_scripts.s26
-rw-r--r--data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc2
-rw-r--r--data/maps/PalletTown_ProfessorOaksLab/scripts.inc2
-rw-r--r--data/maps/PokemonTower_5F/scripts.inc2
-rw-r--r--data/maps/SevenIsland_House_Room1/scripts.inc2
-rw-r--r--data/maps/SevenIsland_House_Room2/scripts.inc2
-rw-r--r--data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc2
-rw-r--r--data/pokemon_summary_screen.s2
-rw-r--r--data/specials.inc6
10 files changed, 23 insertions, 187 deletions
diff --git a/data/battle_interface.s b/data/battle_interface.s
deleted file mode 100644
index f8cf4a4b9..000000000
--- a/data/battle_interface.s
+++ /dev/null
@@ -1,164 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/trainer_classes.h"
-#include "constants/songs.h"
-#include "constants/flags.h"
-#include "constants/region_map.h"
-#include "constants/maps.h"
-#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
- .include "asm/macros.inc"
- .include "constants/constants.inc"
-
- .section .rodata
- .align 2, 0
-
-gUnknown_8260270:: @ 8260270
- .4byte 0xc0004000, 0x00000400
-
-gUnknown_8260278:: @ 8260278
- spr_template 55039, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55040, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_82602A8:: @ 82602A8
- spr_template 55041, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
- spr_template 55042, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_82602D8:: @ 82602D8
- spr_template 55051, 55039, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_82602F0::
- .4byte 0x40004000, 0x00000400
-
-gUnknown_82602F8:: @ 82602F8
- spr_template 55044, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
- spr_template 55045, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
- spr_template 55046, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
- spr_template 55047, 55044, gUnknown_82602F0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80480B8
-
-gUnknown_8260358::
- subsprite 240, 0, 1, 0x0000, 64x32
- subsprite 48, 0, 1, 0x0020, 32x32
- subsprite 240, 32, 1, 0x0030, 32x8
- subsprite 16, 32, 1, 0x0034, 32x8
- subsprite 48, 32, 1, 0x0038, 32x8
-
-gUnknown_826036C::
- subsprite 240, 0, 1, 0x0040, 64x32
- subsprite 48, 0, 1, 0x0060, 32x32
- subsprite 240, 32, 1, 0x0070, 32x8
- subsprite 16, 32, 1, 0x0074, 32x8
- subsprite 48, 32, 1, 0x0078, 32x8
-
-gUnknown_8260380::
- subsprite 240, 0, 1, 0x0000, 64x32
- subsprite 48, 0, 1, 0x0020, 32x32
-
-gUnknown_8260388::
- subsprite 240, 0, 1, 0x0000, 64x32
- subsprite 48, 0, 1, 0x0020, 32x32
-
-gUnknown_8260390::
- subsprite 240, 0, 1, 0x0000, 32x8
- subsprite 16, 0, 1, 0x0004, 32x8
-
-gUnknown_8260398::
- subsprite 240, 0, 1, 0x0000, 32x8
- subsprite 16, 0, 1, 0x0004, 32x8
- subsprite 224, 0, 1, 0x0008, 8x8
-
-gUnknown_82603A4::
- .4byte 5, gUnknown_8260358
- .4byte 2, gUnknown_8260380
- .4byte 5, gUnknown_826036C
- .4byte 2, gUnknown_8260388
-
-gUnknown_82603C4:: @ 82603C4
- .4byte 2, gUnknown_8260390
- .4byte 3, gUnknown_8260398
-
-gUnknown_82603D4::
- subsprite 160, 0, 1, 0x0000, 32x8
- subsprite 192, 0, 1, 0x0004, 32x8
- subsprite 224, 0, 1, 0x0008, 32x8
- subsprite 0, 0, 1, 0x000c, 32x8
-
-gUnknown_82603E4::
- subsprite 160, 0, 1, 0x0000, 32x8
- subsprite 192, 0, 1, 0x0004, 32x8
- subsprite 224, 0, 1, 0x0008, 32x8
- subsprite 0, 0, 1, 0x0008, 32x8
- subsprite 32, 0, 1, 0x0008, 32x8
- subsprite 64, 0, 1, 0x000c, 32x8
-
-gUnknown_82603FC:: @ 82603FC
- .4byte 4, gUnknown_82603D4
-
-gUnknown_8260404:: @ 8260404
- .4byte 6, gUnknown_82603E4
-
-gUnknown_26040C::
- .incbin "graphics/battle_interface/unk_826404C.4bpp"
-
-gUnknown_826046C:: @ 826046C
- obj_tiles gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052
- obj_tiles gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55053
-
-gUnknown_826047C:: @ 826047C
- obj_pal gBattleInterface_BallStatusBarPal, 55056
- obj_pal gBattleInterface_BallStatusBarPal, 55057
-
-gUnknown_826048C:: @ 826048C
- obj_pal gBattleInterface_BallDisplayPal, 55058
- obj_pal gBattleInterface_BallDisplayPal, 55059
-
-gUnknown_826049C:: @ 826049C
- obj_tiles gUnknown_8D12404, 0x0080, 55060
- obj_tiles gUnknown_8D12404, 0x0080, 55061
-
-gUnknown_82604AC::
- .4byte 0xc0004000, 0x00000400
-
-gUnknown_82604B4::
- .4byte 0x00000000, 0x00000400
-
-gUnknown_82604BC:: @ 82604BC
- spr_template 55052, 55056, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBar
- spr_template 55053, 55057, gUnknown_8260270, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBar
-
-gUnknown_82604EC:: @ 82604EC
- spr_template 55060, 55058, gUnknown_82604B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBallsOnBattleStart
- spr_template 55061, 55059, gUnknown_82604B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_StatusSummaryBallsOnBattleStart
-
-gUnknown_826051C:: @ 826051C
- .string "{LV_2}$", 16
-
-gUnknown_826052C:: @ 826052C
- .string "{COLOR 01}{HIGHLIGHT 02}", 20
-
-gUnknown_8260540:: @ 8260540
- .string "/$"
-
-gUnknown_8260542:: @ 8260542
- .string "{COLOR 01}{HIGHLIGHT 00}", 20
-
-gUnknown_8260556:: @ 8260556
- .string "{HIGHLIGHT 02}$"
-
-gUnknown_826055A:: @ 826055A
- .2byte RGB(24, 12, 24)
- .2byte RGB(23, 23, 3)
- .2byte RGB(20, 20, 17)
- .2byte RGB(17, 22, 28)
- .2byte RGB(28, 14, 10)
-
-gUnknown_8260564:: @ 8260564
- .byte 0, 0, 0, 8, 2, 0
- .2byte 0x0000
- @ {
- @ .bg = 0,
- @ .tilemapLeft = 0,
- @ .tilemapTop = 0,
- @ .width = 8,
- @ .height = 2,
- @ .paletteNum = 0,
- @ .baseBlock = 0x0000
- @ }
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 21fdffe43..13bba19f8 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -871,7 +871,7 @@ EventScript_TryDoDoubleTrainerBattle:: @ 81A4EE9
specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
compare_var_to_value VAR_RESULT, 0
goto_if ne, EventScript_1A4F20
- special CheckForAlivePartyMons
+ special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if ne, EventScript_1A4F19
special PlayTrainerEncounterMusic
@@ -923,7 +923,7 @@ EventScript_TryDoDoubleRematchBattle:: @ 81A4F73
specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1A4FB0
- special CheckForAlivePartyMons
+ special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if ne, EventScript_1A4FB1
special PlayTrainerEncounterMusic
@@ -1617,7 +1617,7 @@ EventScript_1A65CE:: @ 81A65CE
waitfieldeffect 25
applymovement VAR_LAST_TALKED, Movement_1A75ED
waitmovement 0
- special sp000_heal_pokemon
+ special HealPlayerParty
return
EventScript_1A65EC:: @ 81A65EC
@@ -2161,7 +2161,7 @@ EventScript_FadeOut_Heal_FadeIn:: @ 81A6C26
fadescreen 1
playfanfare MUS_ME_ASA
waitfanfare
- special sp000_heal_pokemon
+ special HealPlayerParty
fadescreen 0
return
@@ -8644,7 +8644,7 @@ EventScript_1BB519:: @ 81BB519
end
EventScript_1BB51A:: @ 81BB51A
- special CheckForAlivePartyMons
+ special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if ne, EventScript_1BB533
setvar VAR_0x8004, 2
@@ -8693,7 +8693,7 @@ EventScript_1BB54C:: @ 81BB54C
end
EventScript_1BB5B3:: @ 81BB5B3
- special sp000_heal_pokemon
+ special HealPlayerParty
special SavePlayerParty
special LoadPlayerBag
copyvar VAR_0x406F, VAR_0x8004
@@ -9019,7 +9019,7 @@ UnknownMap_00_00_EventScript_1BB8CF:: @ 81BB8CF
gUnknown_81BB8DB:: @ 81BB8DB
UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
fadescreen 1
- special sub_80A0334
+ special ChooseHalfPartyForBattle
waitstate
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
@@ -9032,7 +9032,7 @@ UnknownMap_00_03_EventScript_1BB8DB:: @ 81BB8DB
gUnknown_81BB8F8:: @ 81BB8F8
UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
fadescreen 1
- special sub_80A0334
+ special ChooseHalfPartyForBattle
waitstate
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
@@ -9045,7 +9045,7 @@ UnknownMap_00_03_EventScript_1BB8F8:: @ 81BB8F8
gUnknown_81BB915:: @ 81BB915
UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
fadescreen 1
- special sub_80A0334
+ special ChooseHalfPartyForBattle
waitstate
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
@@ -9058,7 +9058,7 @@ UnknownMap_00_03_EventScript_1BB915:: @ 81BB915
gUnknown_81BB932:: @ 81BB932
UnknownMap_00_03_EventScript_1BB932:: @ 81BB932
fadescreen 1
- special sub_80A0334
+ special ChooseHalfPartyForBattle
waitstate
compare_var_to_value VAR_RESULT, 0
goto_if eq, EventScript_1BB94F
@@ -9217,7 +9217,7 @@ EventScript_1BBA94:: @ 81BBA94
goto_if eq, EventScript_1BB82F
msgbox gUnknown_81BD86A
closemessage
- special sp000_heal_pokemon
+ special HealPlayerParty
setvar VAR_0x8004, 6
copyvar VAR_0x406F, VAR_0x8004
special HelpSystem_Disable
@@ -9368,7 +9368,7 @@ EventScript_1BBCF4:: @ 81BBCF4
end
EventScript_1BBCF5:: @ 81BBCF5
- special CheckForAlivePartyMons
+ special HasEnoughMonsForDoubleBattle
compare_var_to_value VAR_RESULT, 0
goto_if ne, EventScript_1BBD0E
setvar VAR_0x8004, 1
@@ -14241,7 +14241,7 @@ EventScript_1C52D7:
end
EventScript_1C52E0:: @ 81C52E0
- special sp000_heal_pokemon
+ special HealPlayerParty
setvar VAR_0x8004, 11
special sub_815D9E8
warp MAP_SEVEN_ISLAND_TRAINER_TOWER_LOBBY, 255, 9, 7
diff --git a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
index 71c8cf0ee..a713b044f 100644
--- a/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
+++ b/data/maps/OneIsland_KindleRoad_EmberSpa/scripts.inc
@@ -45,7 +45,7 @@ EventScript_1653C5:: @ 81653C5
OneIsland_KindleRoad_EmberSpa_EventScript_1653CF:: @ 81653CF
lockall
fadescreen 3
- special sp000_heal_pokemon
+ special HealPlayerParty
fadescreen 2
msgbox gUnknown_817D450
setvar VAR_0x4001, 1
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
index 850182c08..38d85f0d1 100644
--- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc
@@ -488,7 +488,7 @@ Movement_1694BE:: @ 81694BE
step_end
EventScript_1694C2:: @ 81694C2
- special sp000_heal_pokemon
+ special HealPlayerParty
msgbox gUnknown_818DE38
closemessage
playbgm MUS_RIVAL2, 0
diff --git a/data/maps/PokemonTower_5F/scripts.inc b/data/maps/PokemonTower_5F/scripts.inc
index 85517e241..dee5b5bbd 100644
--- a/data/maps/PokemonTower_5F/scripts.inc
+++ b/data/maps/PokemonTower_5F/scripts.inc
@@ -8,7 +8,7 @@ PokemonTower_5F_EventScript_163433:: @ 8163433
PokemonTower_5F_EventScript_16343C:: @ 816343C
lockall
fadescreen 3
- special sp000_heal_pokemon
+ special HealPlayerParty
fadescreen 2
msgbox gUnknown_817A1FA
setvar VAR_0x4001, 1
diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc
index fd83fa051..f136b8de2 100644
--- a/data/maps/SevenIsland_House_Room1/scripts.inc
+++ b/data/maps/SevenIsland_House_Room1/scripts.inc
@@ -128,7 +128,7 @@ EventScript_170A11:: @ 8170A11
EventScript_170A1E:: @ 8170A1E
msgbox gUnknown_81A06AB
fadescreen 1
- special sub_80A0334
+ special ChooseHalfPartyForBattle
waitstate
return
diff --git a/data/maps/SevenIsland_House_Room2/scripts.inc b/data/maps/SevenIsland_House_Room2/scripts.inc
index f2928f916..0ca956c55 100644
--- a/data/maps/SevenIsland_House_Room2/scripts.inc
+++ b/data/maps/SevenIsland_House_Room2/scripts.inc
@@ -29,7 +29,7 @@ EventScript_170A97:: @ 8170A97
compare_var_to_value VAR_RESULT, 2
call_if eq, EventScript_170B17
closemessage
- special sp000_heal_pokemon
+ special HealPlayerParty
applymovement 255, Movement_170B28
waitmovement 0
special LoadPlayerParty
diff --git a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
index 142f33ee3..b0074f4b3 100644
--- a/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+++ b/data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
@@ -196,7 +196,7 @@ EventScript_164A53:: @ 8164A53
EventScript_164AA0:: @ 8164AA0
copyvar VAR_0x8005, VAR_RESULT
setvar VAR_MAP_SCENE_TRAINER_TOWER, 1
- special sp000_heal_pokemon
+ special HealPlayerParty
msgbox gUnknown_817C8BF
setvar VAR_0x8004, 6
special sub_815D9E8
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
index ff732f5ae..3400c9ae0 100644
--- a/data/pokemon_summary_screen.s
+++ b/data/pokemon_summary_screen.s
@@ -266,7 +266,7 @@ gUnknown_8463E57:: @ 8463E57
.string "QUIRKY$"
.align 2
-gNatureNames:: @ 8463E60 dataptr
+gNatureNamePointers:: @ 8463E60 dataptr
.4byte gUnknown_8463DBC
.4byte gUnknown_8463DC2
.4byte gUnknown_8463DC9
diff --git a/data/specials.inc b/data/specials.inc
index 922d9677e..8678a14a4 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -8,7 +8,7 @@
.set __special__, 0
.align 2
gSpecials:: @ 815FD60
- def_special sp000_heal_pokemon
+ def_special HealPlayerParty
def_special SetCableClubWarp
def_special DoCableClubWarp
def_special sub_807E704
@@ -49,7 +49,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special SavePlayerParty
def_special LoadPlayerParty
- def_special sub_80A0334
+ def_special ChooseHalfPartyForBattle
def_special sp02A_crash_sound
def_special nullsub_75
def_special nullsub_75
@@ -69,7 +69,7 @@ gSpecials:: @ 815FD60
def_special ScrSpecial_GetTrainerEyeRematchFlag
def_special ScrSpecial_StartTrainerEyeRematch
def_special ShowPokemonStorageSystem
- def_special CheckForAlivePartyMons
+ def_special HasEnoughMonsForDoubleBattle
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 15:39:54 +0000