diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r-- | data/event_scripts.s | 14 | ||||
| -rw-r--r-- | data/maps/TrainerHill_Entrance/scripts.inc | 24 | ||||
| -rw-r--r-- | data/maps/TrainerHill_Roof/scripts.inc | 8 | ||||
| -rw-r--r-- | data/pokenav.s | 143 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
6 files changed, 27 insertions, 170 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index be91c7c7e..8ddf56ef8 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -599,7 +599,7 @@ BattleScript_EffectBide:: ppreduce attackanimation waitanimation - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setbide goto BattleScript_MoveEnd @@ -824,7 +824,7 @@ BattleScriptFirstChargingTurn:: ppreduce attackanimation waitanimation - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER seteffectprimary copybyte cMULTISTRING_CHOOSER, sTWOTURN_STRINGID @@ -1941,7 +1941,7 @@ BattleScript_SolarbeamDecideTurn:: call BattleScriptFirstChargingTurn goto BattleScript_MoveEnd BattleScript_SolarbeamOnFirstTurn:: - orword gHitMarker, HITMARKER_x8000000 + orword gHitMarker, HITMARKER_CHARGING setmoveeffect MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER seteffectprimary ppreduce diff --git a/data/event_scripts.s b/data/event_scripts.s index 34a8484e5..d52f4f1ba 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3221,7 +3221,7 @@ EventScript_2736F8:: @ 82736F8 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 setvar VAR_0x8004, 10 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83C9 special sub_80B05B4 @@ -7429,7 +7429,7 @@ TrainerHill_4F_MapScript1_2C8336: @ 82C8336 TrainerHill_Roof_MapScript1_2C8336: @ 82C8336 setvar VAR_TEMP_2, 0 setvar VAR_0x8004, 4 - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_0x8004, 1 setvar VAR_0x8005, 5 special CallFrontierUtilFunc @@ -7462,7 +7462,7 @@ TrainerHill_Roof_MapScript2_2C8381: @ 82C8381 EventScript_TrainerHillTimer:: @ 82C8393 lockall setvar VAR_0x8004, 7 - special sp194_trainer_tower + special CallTrainerHillFunction msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT releaseall end @@ -7470,7 +7470,7 @@ EventScript_TrainerHillTimer:: @ 82C8393 TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6 setvar VAR_TEMP_2, 1 setvar VAR_0x8004, 9 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_1F_EventScript_2C83BF end @@ -7482,9 +7482,9 @@ TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF TrainerHill_1F_EventScript_2C83C9:: @ 82C83C9 setvar VAR_0x8004, 12 - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_0x8004, 5 - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_TEMP_1, 1 end @@ -7502,7 +7502,7 @@ TrainerHill_1F_Movement_2C83EE:: @ 82C83EE EventScript_2C83F0:: @ 82C83F0 trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D, BattleFrontier_BattlePyramidEmptySquare_Text_252C8D setvar VAR_0x8004, 11 - special sp194_trainer_tower + special CallTrainerHillFunction waitmessage waitbuttonpress closemessage diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc index 4d315a158..846b7f6c3 100644 --- a/data/maps/TrainerHill_Entrance/scripts.inc +++ b/data/maps/TrainerHill_Entrance/scripts.inc @@ -16,10 +16,10 @@ TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 setvar VAR_0x8004, 4 - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_TEMP_0, 0 setvar VAR_0x8004, 9 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_2680FF setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6 @@ -28,7 +28,7 @@ TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0 TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF setvar VAR_0x8004, 16 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_26811A applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F @@ -75,7 +75,7 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160 TrainerHill_Entrance_EventScript_268182:: @ 8268182 setvar VAR_TEMP_0, 1 setvar VAR_0x8004, 6 - special sp194_trainer_tower + special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Entrance_EventScript_2681B5 case 1, TrainerHill_Entrance_EventScript_2681CA @@ -115,7 +115,7 @@ TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD lock faceplayer setvar VAR_0x8004, 10 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26821F msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT @@ -134,11 +134,11 @@ TrainerHill_Entrance_EventScript_268229:: @ 8268229 goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 0 call_if_eq TrainerHill_Entrance_EventScript_26832E setvar VAR_0x8004, 8 - special sp194_trainer_tower + special CallTrainerHillFunction compare VAR_RESULT, 1 goto_if_eq TrainerHill_Entrance_EventScript_268275 msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT @@ -170,13 +170,13 @@ TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8 case 127, TrainerHill_Entrance_EventScript_268314 setvar VAR_0x8004, 17 copyvar VAR_0x8005, VAR_RESULT - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_0x40D6, 1 setvar VAR_TEMP_5, 0 special HealPlayerParty msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT setvar VAR_0x8004, 0 - special sp194_trainer_tower + special CallTrainerHillFunction releaseall end @@ -192,18 +192,18 @@ TrainerHill_Entrance_EventScript_268314:: @ 8268314 TrainerHill_Entrance_EventScript_26832E:: @ 826832E msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT setvar VAR_0x8004, 14 - special sp194_trainer_tower + special CallTrainerHillFunction setvar VAR_TEMP_5, 1 call TrainerHill_Entrance_EventScript_27134F compare VAR_RESULT, 0 goto_if_eq TrainerHill_Entrance_EventScript_26835C setvar VAR_0x8004, 14 - special sp194_trainer_tower + special CallTrainerHillFunction return TrainerHill_Entrance_EventScript_26835C:: @ 826835C setvar VAR_0x8004, 15 - special sp194_trainer_tower + special CallTrainerHillFunction goto TrainerHill_Entrance_EventScript_268314 end diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc index 19e8ef567..b959481f2 100644 --- a/data/maps/TrainerHill_Roof/scripts.inc +++ b/data/maps/TrainerHill_Roof/scripts.inc @@ -5,11 +5,11 @@ TrainerHill_Roof_MapScripts:: @ 8268FA7 TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2 setvar VAR_0x8004, 12 - special sp194_trainer_tower + special CallTrainerHillFunction lock faceplayer setvar VAR_0x8004, 1 - special sp194_trainer_tower + special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_268FEA case 1, TrainerHill_Roof_EventScript_268FF2 @@ -20,7 +20,7 @@ TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2 setvar VAR_0x8004, 2 - special sp194_trainer_tower + special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269020 case 1, TrainerHill_Roof_EventScript_269037 @@ -42,7 +42,7 @@ TrainerHill_Roof_EventScript_269037:: @ 8269037 TrainerHill_Roof_EventScript_269054:: @ 8269054 setvar VAR_0x8004, 3 - special sp194_trainer_tower + special CallTrainerHillFunction switch VAR_RESULT case 0, TrainerHill_Roof_EventScript_269082 case 1, TrainerHill_Roof_EventScript_269090 diff --git a/data/pokenav.s b/data/pokenav.s index eaa2ea269..f3a4e8b63 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -2292,146 +2292,3 @@ gUnknown_086285E4:: @ 86285E4 gUnknown_086294CC:: @ 86294CC .incbin "data/pokenav/unk_struct_4.bin" -gUnknown_0862A3B4:: @ 862A3B4 - .byte 0x03, 0x06, 0x00, 0x00, 0x0B, 0x06, 0x00, 0x00, 0x0D, 0x06, 0x00, 0x00, 0x0F, 0x01, 0x00, 0x00, 0x2B, 0x04, 0x00, 0x00, 0x2D, 0x01, 0x00, 0x00, 0x24, 0x09, 0x00, 0x00, 0x29, 0x04, 0x00, 0x00, 0x05, 0x05, 0x00, 0x00, 0x18, 0x04, 0x00, 0x00, 0x2F, 0x00, 0x00, 0x00, 0x2E, 0x09, 0x00, 0x00, 0x11, 0x0C, 0x00, 0x00, 0x10, 0x0B, 0x00, 0x00, 0x1E, 0x0D, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x17, 0x03, 0x00, 0x00, 0x0C, 0x04, 0x00, 0x00, 0x38, 0x04, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x19, 0x0B, 0x00, 0x00, 0x09, 0x07, 0x00, 0x00, 0x31, 0x07, 0x00, 0x00, 0x35, 0x07, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x2A, 0x03, 0x00, 0x00, 0x16, 0x0D, 0x00, 0x00, 0x0E, 0x03, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x2C, 0x01, 0x00, 0x00, 0x1B, 0x02, 0x00, 0x00, 0x04, 0x01, 0x00, 0x00, 0x07, 0x03, 0x00, 0x00, 0x34, 0x05, 0x00, 0x00, 0x32, 0x00, 0x00, 0x00, 0x37, 0x02, 0x00, 0x00, 0x1D, 0x04, 0x00, 0x00, 0x22, 0x09, 0x00, 0x00, 0x1F, 0x01, 0x00, 0x00, 0x25, 0x00, 0x00, 0x00, 0x0A, 0x04, 0x00, 0x00, 0x28, 0x00, 0x00, 0x00, 0x06, 0x05, 0x00, 0x00, 0x27, 0x0B, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x13, 0x00, 0x00, 0x00, 0x12, 0x02, 0x00, 0x00, 0x39, 0x08, 0x00, 0x00, 0x02, 0x0B, 0x00, 0x00, 0x20, 0x01, 0x00, 0x00, 0x21, 0x00, 0x00, 0x00 - -gUnknown_0862A48C:: @ 862A48C - .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A498:: @ 862A498 - .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 3 - -gUnknown_0862A4A4:: @ 862A4A4 - .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 3 - -gUnknown_0862A4B0:: @ 862A4B0 - .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4BC:: @ 862A4BC - .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4C8:: @ 862A4C8 - .2byte 0x125, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4D4:: @ 862A4D4 - .2byte 0x144, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4E0:: @ 862A4E0 - .2byte 0x126, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4EC:: @ 862A4EC - .2byte 0x12B, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A4F8:: @ 862A4F8 - .2byte 0x13A, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A504:: @ 862A504 - .2byte 0x44, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A510:: @ 862A510 - .2byte 0xB, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A51C:: @ 862A51C - .2byte 0x19, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A528:: @ 862A528 - .2byte 0x23, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A534:: @ 862A534 - .2byte 0x24, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A540:: @ 862A540 - .2byte 0x13F, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A54C:: @ 862A54C - .2byte 0x149, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A558:: @ 862A558 - .2byte 0x150, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A564:: @ 862A564 - .2byte 0x133, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A570:: @ 862A570 - .2byte 0x14D, 0x22, 0x14, 0x18, 0x51, 0x3 - -gUnknown_0862A57C:: @ 862A57C - .4byte gUnknown_0862A48C - .4byte gUnknown_0862A498 - .4byte gUnknown_0862A4A4 - .4byte gUnknown_0862A4B0 - .4byte gUnknown_0862A4BC - .4byte gUnknown_0862A4C8 - .4byte gUnknown_0862A4D4 - .4byte gUnknown_0862A4E0 - .4byte gUnknown_0862A4EC - .4byte gUnknown_0862A4F8 - -gUnknown_0862A5A4:: @ 862A5A4 - .4byte gUnknown_0862A504 - .4byte gUnknown_0862A510 - .4byte gUnknown_0862A51C - .4byte gUnknown_0862A528 - .4byte gUnknown_0862A534 - .4byte gUnknown_0862A540 - .4byte gUnknown_0862A54C - .4byte gUnknown_0862A558 - .4byte gUnknown_0862A564 - .4byte gUnknown_0862A570 - -gUnknown_0862A5CC:: @ 862A5CC - .4byte gUnknown_0862A57C - .4byte gUnknown_0862A5A4 - -gUnknown_0862A5D4:: @ 862A5D4 - .incbin "graphics/pokenav/862A5D4.gbapal" - -gUnknown_0862A5F4:: @ 862A5F4 - .byte 0, 2, 3, 0 - -gUnknown_0862A5F8:: @ 862A5F8 - .4byte gUnknown_08626814 - .4byte gUnknown_086276FC - .4byte gUnknown_086285E4 - .4byte gUnknown_086294CC - .4byte gUnknown_085EF8B6 - .4byte gUnknown_085EF8B9 - .4byte gUnknown_085EF8BC - .4byte gUnknown_085EF8BF - -gUnknown_0862A618:: @ 862A618 - .4byte sub_81D581C - .4byte sub_81D58D8 - .4byte sub_81D5924 - .4byte sub_81D59D0 - .4byte sub_81D5A70 - .4byte sub_81D5AB4 - .4byte sub_81D5AD0 - .4byte sub_81D5B2C - .4byte sub_81D5BBC - .4byte sub_81D5C00 - .4byte sub_81D5C5C - .4byte sub_81D62B4 - .4byte sub_81D64AC - .4byte sub_81D64DC - .4byte sub_81D64FC - .4byte sub_81D6518 - .4byte sub_81D6568 - .4byte sub_81D65A0 - -gUnknown_0862A660:: @ 862A660 - .4byte gUnknown_085EB32D - .4byte gUnknown_085EB33E - .4byte gUnknown_085EB350 - .4byte gUnknown_085EB361 - -gUnknown_0862A670:: @ 862A670 - .byte 0, 0x64 - .4byte NULL - .2byte 0, 0x103, 17, 1, 0, 0, 0, 0, 0 - -gUnknown_0862A688:: @ 862A688 - .2byte 0x3E, 0, 0x3F, 0, 0x40, 0, 0x41, 0 - -gUnknown_0862A698:: @ 862A698 - .byte 0, 1, 2, 3, 4, 5, 0, 0 diff --git a/data/specials.inc b/data/specials.inc index 5ac4930c7..a5f272dc9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -515,7 +515,7 @@ gSpecials:: @ 81DBA64 def_special sub_813B514 def_special sub_813B568 def_special sub_813B534 - def_special sp194_trainer_tower + def_special CallTrainerHillFunction def_special sub_813B7D8 def_special sub_813B80C def_special sub_81D4BEC |