diff options
Diffstat (limited to 'data')
18 files changed, 68 insertions, 119 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index d8f681686..edf49eda5 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1601,12 +1601,12 @@ BattleScript_EffectPerishSong:: waitanimation printstring STRINGID_FAINTINTHREE waitmessage 0x40 - setbyte sBANK, 0x0 + setbyte sBATTLER, 0x0 BattleScript_PerishSongLoop:: jumpifability BS_SCRIPTING, ABILITY_SOUNDPROOF, BattleScript_PerishSongNotAffected BattleScript_PerishSongLoopIncrement:: - addbyte sBANK, 0x1 - jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop + addbyte sBATTLER, 0x1 + jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_PerishSongLoop goto BattleScript_MoveEnd BattleScript_PerishSongNotAffected:: @@ -2493,7 +2493,7 @@ BattleScript_EffectYawn:: waitmessage 0x40 goto BattleScript_MoveEnd BattleScript_PrintBankAbilityMadeIneffective:: - copybyte sBANK, sBANK_WITH_ABILITY + copybyte sBATTLER, sBATTLER_WITH_ABILITY BattleScript_PrintAbilityMadeIneffective:: pause 0x20 printstring STRINGID_PKMNSXMADEITINEFFECTIVE @@ -3523,7 +3523,7 @@ BattleScript_RapidSpinAway:: BattleScript_WrapFree:: printstring STRINGID_PKMNGOTFREE waitmessage 0x40 - copybyte gBattlerTarget, sBANK + copybyte gBattlerTarget, sBATTLER return BattleScript_LeechSeedFree:: @@ -4030,11 +4030,11 @@ BattleScript_ShedSkinActivates:: end3 BattleScript_WeatherFormChanges:: - setbyte sBANK, 0x0 + setbyte sBATTLER, 0x0 BattleScript_WeatherFormChangesLoop:: trycastformdatachange - addbyte sBANK, 0x1 - jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop + addbyte sBATTLER, 0x1 + jumpifbytenotequal sBATTLER, gBattlersCount, BattleScript_WeatherFormChangesLoop return BattleScript_CastformChange:: diff --git a/data/battle_tower.s b/data/battle_tower.s index 2cc0aa639..9f7e1ade4 100644 --- a/data/battle_tower.s +++ b/data/battle_tower.s @@ -21,19 +21,19 @@ @ 85D97BC .include "data/battle_frontier/battle_frontier_mons.inc" -gUnknown_085DCEDC:: @ 85DCEDC +gTowerMaleFacilityClasses:: @ 85DCEDC .byte 0x0e, 0x11, 0x03, 0x15, 0x17, 0x07, 0x0a, 0x19, 0x1a, 0x1b, 0x1d, 0x1e, 0x20, 0x26, 0x29, 0x09, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x34, 0x04, 0x35, 0x3a, 0x05, 0x42, 0x44, 0x43, 0x00 -gUnknown_085DCEFA:: @ 85DCEFA +gTowerFemaleFacilityClasses:: @ 85DCEFA .byte 0x0d, 0x10, 0x12, 0x0c, 0x13, 0x14, 0x1f, 0x27, 0x2a, 0x16, 0x2f, 0x31, 0x33, 0x36, 0x37, 0x38, 0x1c, 0x02, 0x45, 0x47 -gUnknown_085DCF0E:: @ 85DCF0E +gTowerMaleTrainerGfxIds:: @ 85DCF0E .byte 0x37, 0x36, 0x21, 0x0f, 0x27, 0x33, 0x2c, 0x42, 0x42, 0x1f, 0x27, 0x25, 0x30, 0x26, 0x19, 0x15, 0x23, 0x32, 0x38, 0x33, 0x33, 0x21, 0x42, 0x05, 0x31, 0x27, 0x41, 0x1f, 0x24, 0x37 -gUnknown_085DCF2C:: @ 85DCF2C +gTowerFemaleTrainerGfxIds:: @ 85DCF2C .byte 0x14, 0x35, 0x22, 0x28, 0x14, 0x2d, 0x2f, 0x0e, 0x12, 0x16, 0x39, 0x34, 0x34, 0x0e, 0x22, 0x34, 0x20, 0x14, 0x20, 0x2f -gUnknown_085DCF40:: @ 85DCF40 +sRubyFacilityClassToEmerald:: @ 85DCF40 .byte 0x00, 0x0b, 0x01, 0x01, 0x02, 0x06, 0x03, 0x0d, 0x04, 0x0e, 0x05, 0x0f, 0x06, 0x10, 0x07, 0x11, 0x08, 0x03, 0x09, 0x12, 0x0a, 0x0c, 0x0b, 0x13, 0x0c, 0x14, 0x0d, 0x15, 0x0e, 0x17, 0x0f, 0x07 .byte 0x10, 0x0a, 0x11, 0x19, 0x12, 0x1a, 0x13, 0x1b, 0x14, 0x1d, 0x15, 0x1e, 0x16, 0x1f, 0x17, 0x20, 0x18, 0x21, 0x19, 0x22, 0x1a, 0x23, 0x1b, 0x24, 0x1c, 0x25, 0x1d, 0x26, 0x1e, 0x27, 0x1f, 0x28 .byte 0x20, 0x29, 0x21, 0x2a, 0x22, 0x09, 0x23, 0x16, 0x24, 0x2b, 0x25, 0x2c, 0x26, 0x2d, 0x27, 0x2e, 0x28, 0x2f, 0x29, 0x30, 0x2a, 0x31, 0x2b, 0x32, 0x2c, 0x33, 0x2d, 0x34, 0x2e, 0x04, 0x2f, 0x35 @@ -640,7 +640,7 @@ gUnknown_085DD690:: @ 85DD690 .4byte gUnknown_085DD0F0 .4byte gUnknown_085DD104 -gUnknown_085DD6D0:: @ 85DD6D0 +sStevenMons:: @ 85DD6D0 .byte 0x8f, 0x01, 0x1f, 0x2a, 0x02 gUnknown_085DD6D5:: @ 85DD6D5 @@ -677,57 +677,3 @@ gUnknown_085DD6DC:: @ 85DD6DC @ 85DF69C .include "data/battle_frontier/fallarbor_battle_tent_mons.inc" - - .align 2 -gUnknown_085DF96C:: @ 85DF96C - .4byte sub_8161F94 - .4byte sub_8162054 - .4byte sub_81620F4 - .4byte sub_81623F0 - .4byte sub_81621C0 - .4byte sub_816502C - .4byte sub_8164040 - .4byte sub_8163914 - .4byte nullsub_61 - .4byte nullsub_116 - .4byte sub_81642A0 - .4byte sub_8164828 - .4byte sub_8164B74 - .4byte sub_8164DCC - .4byte sub_8164DE4 - .4byte sub_8164E04 - - .align 2 -gUnknown_085DF9AC:: @ 85DF9AC - .4byte 0x00000001, 0x00000002, 0x00004000, 0x00008000, 0x00010000, 0x00020000, 0x00040000, 0x00080000 - - .align 2 -gUnknown_085DF9CC:: @ 85DF9CC - .4byte 0xfffffffe, 0xfffffffd, 0xffffbfff, 0xffff7fff, 0xfffeffff, 0xfffdffff, 0xfffbffff, 0xfff7ffff - -gUnknown_085DF9EC:: @ 85DF9EC - .byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x08, 0x09, 0x0a, 0x0b, 0x0c - -gUnknown_085DF9F6:: @ 85DF9F6 - .byte 0x03, 0x04, 0x02, 0x02 - - .align 1 -gUnknown_085DF9FA:: @ 85DF9FA - .2byte 0x0000, 0x0063, 0x0050, 0x0077, 0x0064, 0x008b, 0x0078, 0x009f, 0x008c, 0x00b3, 0x00a0, 0x00c7, 0x00b4, 0x00db, 0x00c8, 0x012b - - .align 1 -gUnknown_085DFA1A:: @ 85DFA1A - .2byte 0x0064, 0x0077, 0x0078, 0x008b, 0x008c, 0x009f, 0x00a0, 0x00b3, 0x00b4, 0x00c7, 0x00c8, 0x00db, 0x00dc, 0x00ef, 0x00c8, 0x012b - .2byte 0x00b3, 0x008d, 0x00c8, 0x00b7 - -gUnknown_085DFA42:: @ 85DFA42 - .byte 0x03, 0x04, 0x02, 0x02 - - .align 1 -gUnknown_085DFA46:: @ 85DFA46 - .2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01 - - .align 1 -gUnknown_085DFA52:: @ 85DFA52 - .2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04, 0x0000 - diff --git a/data/event_scripts.s b/data/event_scripts.s index 46ba34db5..4534ccf13 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -7,6 +7,7 @@ #include "constants/vars.h" #include "constants/heal_locations.h" #include "constants/trainers.h" +#include "constants/battle_frontier.h" .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" @@ -5126,9 +5127,9 @@ SecretBase_RedCave1_EventScript_27627C:: @ 827627C SecretBase_RedCave1_EventScript_276286:: @ 8276286 special sub_80EA2E4 - setvar VAR_0x8004, 1 + setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 call_if 1, SecretBase_RedCave1_EventScript_2762BD diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc index 076eeab6e..888ca9878 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc @@ -89,7 +89,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25752E:: @ 825752E waitmovement 0 setvar VAR_0x8004, 5 special sub_8195960 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattleArenaBattleRoom_EventScript_257B6C switch VAR_RESULT @@ -431,9 +431,9 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 5 + setvar VAR_0x8004, SPECIAL_BATTLE_ARENA setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 18 special sub_81A1780 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index 3d5704dba..0a4052f23 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -81,7 +81,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD82:: @ 824BD82 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage setvar VAR_0x8004, 5 special CallBattleDomeFunction @@ -529,10 +529,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C440:: @ 824C440 setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 3 + setvar VAR_0x8004, SPECIAL_BATTLE_DOME setvar VAR_0x8005, 0 setvar VAR_TEMP_9, 1 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_TEMP_9, 0 setvar VAR_0x8004, 17 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc index 2968e2c0f..ef26ad3a7 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc @@ -82,7 +82,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8004, 5 special sub_8195960 lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage setvar VAR_0x8004, 2 @@ -90,9 +90,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AEA7:: @ 825AEA7 setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_25AF0F @@ -226,9 +226,9 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B0E0:: @ 825B0E0 setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc index 372b5da76..e97297a16 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc @@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F8BF:: @ 824F8BF waitmovement 0 setvar VAR_0x8004, 5 special sub_8195960 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattlePalaceBattleRoom_EventScript_24FDF7 switch VAR_RESULT @@ -338,9 +338,9 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7:: @ 824FDF7 setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 4 + setvar VAR_0x8004, SPECIAL_BATTLE_PALACE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 18 special sub_81A1780 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc index 509806531..d1dc7d13e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc @@ -30,13 +30,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage releaseall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D226 @@ -66,13 +66,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231 setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage releaseall - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D285 @@ -282,7 +282,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 0 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage delay 16 applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD @@ -290,11 +290,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E setvar VAR_0x8004, 21 setvar VAR_0x8005, 1 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 closemessage - setvar VAR_0x8004, 9 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_DOUBLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D5DC @@ -433,9 +433,9 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B closemessage applymovement 255, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC waitmovement 0 - setvar VAR_0x8004, 7 + setvar VAR_0x8004, SPECIAL_BATTLE_PIKE_SINGLE setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return @@ -590,7 +590,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B faceplayer setvar VAR_0x8004, 14 special sub_81A703C - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage release diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc index 886b3fe01..5169a6971 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc @@ -228,9 +228,9 @@ BattleFrontier_BattlePyramidTop_EventScript_2553B3:: @ 82553B3 BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED closemessage - setvar VAR_0x8004, 10 + setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate return diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index d687f83dd..69a78215d 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -45,7 +45,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241BC3:: @ 8241BC3 setvar VAR_0x8004, 7 setvar VAR_0x8005, 0 special sub_8161F74 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call BattleFrontier_BattleTowerBattleRoom_EventScript_24210E switch VAR_RESULT @@ -362,9 +362,9 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_24210E:: @ 824210E setvar VAR_0x8006, 0 special sub_81A1780 special HealPlayerParty - setvar VAR_0x8004, 0 + setvar VAR_0x8004, SPECIAL_BATTLE_TOWER setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE compare VAR_0x8004, 3 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc index 2db7e5cdf..9c4cd6bc9 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc @@ -78,14 +78,14 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248FB4:: @ 8248FB4 delay 15 applymovement 1, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage setvar VAR_0x8004, 7 setvar VAR_0x8005, 1 special sub_8161F74 applymovement 4, BattleFrontier_BattleTowerBattleRoom2_Movement_249545 waitmovement 0 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage goto BattleFrontier_BattleTowerBattleRoom2_EventScript_249069 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc index e373ff5ad..6103a1aaa 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc @@ -54,7 +54,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20090F:: @ 820090F msgbox FallarborTown_BattleTentBattleRoom_Text_257C93, 4 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call FallarborTown_BattleTentBattleRoom_EventScript_257B6C switch VAR_RESULT diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index b09babbdd..e89406f31 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -264,9 +264,9 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032 setvar VAR_0x8004, 2 setvar VAR_0x8005, 4 special sub_81A1780 - setvar VAR_0x8004, 8 + setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate setvar VAR_0x8004, 6 special sub_81A1780 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc index 150cc425b..7321f7662 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc @@ -51,13 +51,13 @@ SlateportCity_BattleTentBattleRoom_EventScript_2099BE:: @ 82099BE setvar VAR_0x8004, 4 special sub_81B99B4 lockall - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage closemessage special HealPlayerParty - setvar VAR_0x8004, 6 + setvar VAR_0x8004, SPECIAL_BATTLE_FACTORY setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate switch VAR_RESULT case 1, SlateportCity_BattleTentBattleRoom_EventScript_209A39 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc index b29ef99a5..eb21ead54 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F .byte 0 SootopolisCity_MysteryEventsHouse_B1F_MapScript1_227E5A: @ 8227E5A - special sub_8162794 + special SetEReaderTrainerGfxId end SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E @@ -15,12 +15,12 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68 lockall applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3 waitmovement 0 - special sub_8165360 - msgbox 0x2021fc4, 4 + special CopyEReaderTrainerGreeting + msgbox gStringVar4, 4 closemessage - setvar VAR_0x8004, 2 + setvar VAR_0x8004, SPECIAL_BATTLE_EREADER setvar VAR_0x8005, 0 - special sub_8163AC4 + special DoSpecialTrainerBattle waitstate compare VAR_RESULT, 3 call_if 1, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc index b7f687cdf..7d30cf2c0 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc @@ -48,7 +48,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20236F:: @ 820236F waitmovement 0 setvar VAR_0x8004, 4 special sub_81B99B4 - msgbox 0x2021fc4, 4 + msgbox gStringVar4, 4 waitmessage call VerdanturfTown_BattleTentBattleRoom_EventScript_24FDF7 switch VAR_RESULT diff --git a/data/specials.inc b/data/specials.inc index cec36932a..08e12e5e0 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -246,8 +246,8 @@ gSpecials:: @ 81DBA64 def_special sub_8161F74 def_special CallBattleDomeFunction def_special sub_8195960 - def_special sub_8165360 - def_special sub_8163AC4 + def_special CopyEReaderTrainerGreeting + def_special DoSpecialTrainerBattle def_special sub_81A5238 def_special sub_81A5E74 def_special sub_81A703C @@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64 def_special sp13F_fall_to_last_warp def_special sub_80F8D28 def_special sub_80F8EB8 - def_special sub_8162794 + def_special SetEReaderTrainerGfxId def_special BattleSetup_StartLatiBattle def_special SetRoute119Weather def_special SetRoute123Weather diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s index 8497f59ad..c257961d3 100644 --- a/data/use_pokeblock.s +++ b/data/use_pokeblock.s @@ -2,6 +2,8 @@ .include "constants/constants.inc" .section .rodata + +.align 4 gUnknown_085DFA60:: @ 85DFA60 .incbin "graphics/interface/85DFA60.bin" |