diff options
70 files changed, 567 insertions, 540 deletions
diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt index 2d0514325..0b30a632a 100644 --- a/common_syms/trainer_see.txt +++ b/common_syms/trainer_see.txt @@ -1,5 +1,5 @@ -gUnknown_03006080 -gUnknown_03006084 +gWhichTrainerToFaceAfterBattle +gPostBattleMovementScript gApproachingTrainers gNoOfApproachingTrainers -gUnknown_030060AC +gTrainerApproachedPlayer diff --git a/data/io_reg.s b/data/io_reg.s index 9c5f64f58..24e0e3d2d 100644 --- a/data/io_reg.s +++ b/data/io_reg.s @@ -1,4 +1,4 @@ - .include "asm/macros.inc" + .include "asm/macros.inc" .include "constants/constants.inc" .section .rodata @@ -30,8 +30,8 @@ gOverworldBackgroundLayerFlags:: @ 82EC7C4 .2byte 0x0400 /* BLDCNT_TGT2_BG2 */ .2byte 0x0800 /* BLDCNT_TGT2_BG3 */ -gUnknown_82EC7CC:: @ 82EC7CC - .2byte 0x0001 - .2byte 0x0002 - .2byte 0x0004 - .2byte 0x0008 +gOrbEffectBackgroundLayerFlags:: @ 82EC7CC + .2byte 0x0001 /* BLDCNT_TGT1_BG0 */ + .2byte 0x0002 /* BLDCNT_TGT1_BG1 */ + .2byte 0x0004 /* BLDCNT_TGT1_BG2 */ + .2byte 0x0008 /* BLDCNT_TGT1_BG3 */ diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc index 5797ed5fb..2c3ff862a 100644 --- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc @@ -20,7 +20,7 @@ AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3 end AbandonedShip_Rooms_1F_EventScript_237ADF:: @ 8237ADF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox AbandonedShip_Rooms_1F_Text_237C2A, MSGBOX_DEFAULT register_matchcall TRAINER_THALIA_1 diff --git a/data/maps/AquaHideout_1F/map.json b/data/maps/AquaHideout_1F/map.json index 5f585f32f..25fe48a9e 100644 --- a/data/maps/AquaHideout_1F/map.json +++ b/data/maps/AquaHideout_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_1F_EventScript_233494", + "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_1F_EventScript_2334C6", + "script": "AquaHideout_1F_EventScript_HideoutEntranceGrunt2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE" }, { @@ -50,7 +50,7 @@ "movement_range_y": 5, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AquaHideout_1F_EventScript_2334F8", + "script": "AquaHideout_1F_EventScript_Grunt1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 653e0f7c7..ff8b6c16d 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -1,55 +1,56 @@ AquaHideout_1F_MapScripts:: @ 8233493 .byte 0 -AquaHideout_1F_EventScript_233494:: @ 8233494 +@ The below two entrance guards give hints about what to do to progress the story +AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494 lock faceplayer - goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC - goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2 - msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint1 + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint1 + msgbox AquaHideout_1F_Text_OurBossIsSnatchingSomething, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334B2:: @ 82334B2 - msgbox AquaHideout_1F_Text_2335E3, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_MagmaHideoutHint1:: @ 82334B2 + msgbox AquaHideout_1F_Text_WhereMightMagmaHideoutBe, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334BC:: @ 82334BC - msgbox AquaHideout_1F_Text_23367D, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_SlateportHint1:: @ 82334BC + msgbox AquaHideout_1F_Text_BossWentToJackASubmarine, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334C6:: @ 82334C6 +AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6 lock faceplayer - goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE - goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4 - msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint2 + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_MagmaHideoutHint2 + msgbox AquaHideout_1F_Text_BossIsOnRoute122, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334E4:: @ 82334E4 - msgbox AquaHideout_1F_Text_2337FA, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_MagmaHideoutHint2:: @ 82334E4 + msgbox AquaHideout_1F_Text_TeamMagmaAtMtChimney, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334EE:: @ 82334EE - msgbox AquaHideout_1F_Text_233884, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE + msgbox AquaHideout_1F_Text_BossIsInSlateportCity, MSGBOX_DEFAULT release end -AquaHideout_1F_EventScript_2334F8:: @ 82334F8 - trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_23393D, AquaHideout_1F_Text_233964, AquaHideout_1F_EventScript_233513 - msgbox AquaHideout_1F_Text_233977, MSGBOX_AUTOCLOSE +AquaHideout_1F_EventScript_Grunt1:: @ 82334F8 + trainerbattle_single TRAINER_GRUNT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated + msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_1F_EventScript_233513:: @ 8233513 - msgbox AquaHideout_1F_Text_233977, MSGBOX_DEFAULT +AquaHideout_1F_EventScript_Grunt1Defeated:: @ 8233513 + msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_DEFAULT release end -AquaHideout_1F_Text_23351D: @ 823351D +AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here! He's gone off to\n" @@ -59,7 +60,7 @@ AquaHideout_1F_Text_23351D: @ 823351D .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_2335E3: @ 82335E3 +AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3 .string "What? What?\n" .string "Are you a TEAM MAGMA grunt?\p" .string "I hear that TEAM MAGMA is trying to\n" @@ -67,7 +68,7 @@ AquaHideout_1F_Text_2335E3: @ 82335E3 .string "HIDEOUT.\p" .string "But where might their HIDEOUT be?$" -AquaHideout_1F_Text_23367D: @ 823367D +AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here!\n" @@ -77,7 +78,7 @@ AquaHideout_1F_Text_23367D: @ 823367D .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_233739: @ 8233739 +AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739 .string "What? What? What do you want with \n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here! He's on his way to\n" @@ -87,14 +88,14 @@ AquaHideout_1F_Text_233739: @ 8233739 .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_2337FA: @ 82337FA +AquaHideout_1F_Text_TeamMagmaAtMtChimney: @ 82337FA .string "What? What?\n" .string "Are you a TEAM MAGMA grunt?\p" .string "I hear that TEAM MAGMA is after\n" .string "an awesome POKéMON at MT. CHIMNEY.\p" .string "But what is that POKéMON like?$" -AquaHideout_1F_Text_233884: @ 8233884 +AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884 .string "What? What? What do you want with\n" .string "TEAM AQUA?\p" .string "Our BOSS isn't here!\n" @@ -104,15 +105,15 @@ AquaHideout_1F_Text_233884: @ 8233884 .string "Wahaha! Do you really think I'd tell\n" .string "you something that crucial?$" -AquaHideout_1F_Text_23393D: @ 823393D +AquaHideout_1F_Text_Grunt1Intro: @ 823393D .string "Ayiyiyi!\n" .string "Suspicious character spotted!$" -AquaHideout_1F_Text_233964: @ 8233964 +AquaHideout_1F_Text_Grunt1Defeat: @ 8233964 .string "Grrrrr…\n" .string "I lost it!$" -AquaHideout_1F_Text_233977: @ 8233977 +AquaHideout_1F_Text_Grunt1PostBattle: @ 8233977 .string "I took the loss for the TEAM,\n" .string "but I did my job…$" diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json index 8cdc901ec..78e37bdf9 100644 --- a/data/maps/AquaHideout_B1F/map.json +++ b/data/maps/AquaHideout_B1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233A85", + "script": "AquaHideout_B1F_EventScript_Grunt2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B1F_EventScript_233AB0", + "script": "AquaHideout_B1F_EventScript_Grunt3", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 0, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233AD5", + "script": "AquaHideout_B1F_EventScript_Grunt21", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B1F_EventScript_2339EB", + "script": "AquaHideout_B1F_EventScript_Electrode1", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1" }, { @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B1F_EventScript_233A38", + "script": "AquaHideout_B1F_EventScript_Electrode2", "flag": "FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "AquaHideout_B1F_EventScript_233AEC", + "script": "AquaHideout_B1F_EventScript_Grunt25", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 83906c509..8b1a07c54 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -1,13 +1,13 @@ AquaHideout_B1F_MapScripts:: @ 82339A7 - map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_2339B2 + map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition .byte 0 -AquaHideout_B1F_MapScript1_2339B2: @ 82339B2 - call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_2339BC +AquaHideout_B1F_OnResume: @ 82339B2 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode end -AquaHideout_B1F_EventScript_2339BC:: @ 82339BC +AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne Common_EventScript_NopReturn @@ -15,19 +15,19 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC return AquaHideout_B1F_OnTransition: @ 82339D0 - call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3 - call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1 + call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2 end -AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 +AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1 return -AquaHideout_B1F_EventScript_2339E7:: @ 82339E7 +AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7 clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 return -AquaHideout_B1F_EventScript_2339EB:: @ 82339EB +AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE @@ -40,21 +40,21 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq AquaHideout_B1F_EventScript_233A2F + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT release end -AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F +AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT goto Common_EventScript_RemoveStaticPokemon end -AquaHideout_B1F_EventScript_233A38:: @ 8233A38 +AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38 lock faceplayer setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE @@ -67,101 +67,101 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON - goto_if_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 compare VAR_RESULT, B_OUTCOME_RAN - goto_if_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED - goto_if_eq AquaHideout_B1F_EventScript_233A7C + goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT release end -AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C +AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT goto Common_EventScript_RemoveStaticPokemon end -AquaHideout_B1F_EventScript_233A85:: @ 8233A85 - trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_233B03, AquaHideout_B1F_Text_233B4A, AquaHideout_B1F_EventScript_233AA0 - msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85 + trainerbattle_single TRAINER_GRUNT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated + msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233AA0:: @ 8233AA0 - special sub_80B4808 +AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0 + special PlayerFaceTrainerAfterBattle waitmovement 0 - msgbox AquaHideout_B1F_Text_233B5E, MSGBOX_DEFAULT + msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B1F_EventScript_233AB0:: @ 8233AB0 - trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_233BC5, AquaHideout_B1F_Text_233C27, AquaHideout_B1F_EventScript_233ACB - msgbox AquaHideout_B1F_Text_233C41, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0 + trainerbattle_single TRAINER_GRUNT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated + msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233ACB:: @ 8233ACB - msgbox AquaHideout_B1F_Text_233C41, MSGBOX_DEFAULT +AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB + msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B1F_EventScript_233AD5:: @ 8233AD5 - trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_233C89, AquaHideout_B1F_Text_233CCA - msgbox AquaHideout_B1F_Text_233CDC, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt21:: @ 8233AD5 + trainerbattle_single TRAINER_GRUNT_21, AquaHideout_B1F_Text_Grunt21Intro, AquaHideout_B1F_Text_Grunt21Defeat + msgbox AquaHideout_B1F_Text_Grunt21PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_EventScript_233AEC:: @ 8233AEC - trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_233D1B, AquaHideout_B1F_Text_233D6E - msgbox AquaHideout_B1F_Text_233D84, MSGBOX_AUTOCLOSE +AquaHideout_B1F_EventScript_Grunt25:: @ 8233AEC + trainerbattle_single TRAINER_GRUNT_25, AquaHideout_B1F_Text_Grunt25Intro, AquaHideout_B1F_Text_Grunt25Defeat + msgbox AquaHideout_B1F_Text_Grunt25PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B1F_Text_233B03: @ 8233B03 +AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03 .string "If you want to know the secret about\n" .string "our HIDEOUT, you have me to beat!$" -AquaHideout_B1F_Text_233B4A: @ 8233B4A +AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A .string "I can't win at all…$" -AquaHideout_B1F_Text_233B5E: @ 8233B5E +AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E .string "Our HIDEOUT's secret?\p" .string "Well, let's just say…\n" .string "There's a submarine at the far end!\p" .string "But, by now…\n" .string "Kekekeke…$" -AquaHideout_B1F_Text_233BC5: @ 8233BC5 +AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5 .string "Fuel supply loaded A-OK!\n" .string "In-cruise snacks loaded A-OK!\p" .string "Nothing left to do but KO a pesky\n" .string "meddler!$" -AquaHideout_B1F_Text_233C27: @ 8233C27 +AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27 .string "I took a serious licking!$" -AquaHideout_B1F_Text_233C41: @ 8233C41 +AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41 .string "Humph!\n" .string "This was supposed to happen!\p" .string "My mission was to just hold you up!$" -AquaHideout_B1F_Text_233C89: @ 8233C89 +AquaHideout_B1F_Text_Grunt21Intro: @ 8233C89 .string "Yawn… Keeping watch over the\n" .string "HIDEOUT bores me. I'll take you on.$" -AquaHideout_B1F_Text_233CCA: @ 8233CCA +AquaHideout_B1F_Text_Grunt21Defeat: @ 8233CCA .string "Yawn…\n" .string "Oh, I lost…$" -AquaHideout_B1F_Text_233CDC: @ 8233CDC +AquaHideout_B1F_Text_Grunt21PostBattle: @ 8233CDC .string "If you scurry too much, other TEAM\n" .string "AQUA members might get you.$" -AquaHideout_B1F_Text_233D1B: @ 8233D1B +AquaHideout_B1F_Text_Grunt25Intro: @ 8233D1B .string "Hey!\n" .string "You there!\p" .string "Which do you think is cooler?\n" .string "TEAM AQUA's uniform or TEAM MAGMA's?$" -AquaHideout_B1F_Text_233D6E: @ 8233D6E +AquaHideout_B1F_Text_Grunt25Defeat: @ 8233D6E .string "I lost in a cool way…$" -AquaHideout_B1F_Text_233D84: @ 8233D84 +AquaHideout_B1F_Text_Grunt25PostBattle: @ 8233D84 .string "If you have a cool uniform, you look\n" .string "good even in a loss, don't you think?$" diff --git a/data/maps/AquaHideout_B2F/map.json b/data/maps/AquaHideout_B2F/map.json index b286872af..a5d58554d 100644 --- a/data/maps/AquaHideout_B2F/map.json +++ b/data/maps/AquaHideout_B2F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 0, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "AquaHideout_B2F_EventScript_233E09", + "script": "AquaHideout_B2F_EventScript_Matt", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 3, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "AquaHideout_B2F_EventScript_233E8A", + "script": "AquaHideout_B2F_EventScript_Grunt4", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B2F_EventScript_233EAF", + "script": "AquaHideout_B2F_EventScript_Grunt22", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "AquaHideout_B2F_EventScript_233EC6", + "script": "AquaHideout_B2F_EventScript_Grunt26", "flag": "FLAG_HIDE_AQUA_HIDEOUT_GRUNTS" } ], @@ -173,7 +173,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "AquaHideout_B2F_EventScript_233DE5" + "script": "AquaHideout_B2F_EventScript_MattNoticePlayer" }, { "type": "trigger", @@ -182,7 +182,7 @@ "elevation": 3, "var": "VAR_TEMP_1", "var_value": "0", - "script": "AquaHideout_B2F_EventScript_233DE5" + "script": "AquaHideout_B2F_EventScript_MattNoticePlayer" } ], "bg_events": [] diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 87830e500..84e0c6622 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,16 +3,16 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF .byte 0 AquaHideout_B2F_OnTransition: @ 8233DD5 - call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF + call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing end -AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF +AquaHideout_B2F_EventScript_PreventMattNoticing:: @ 8233DDF setvar VAR_TEMP_1, 1 return -AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 +AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5 lockall - setvar VAR_0x8008, 1 + setvar VAR_0x8008, 1 @ Matt object event id playse SE_PIN applymovement VAR_0x8008, Common_Movement_ExclamationMark waitmovement 0 @@ -22,70 +22,71 @@ AquaHideout_B2F_EventScript_233DE5:: @ 8233DE5 releaseall end -AquaHideout_B2F_EventScript_233E09:: @ 8233E09 - trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_233EDD, AquaHideout_B2F_Text_233F8D, AquaHideout_B2F_EventScript_233E25 - msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT +AquaHideout_B2F_EventScript_Matt:: @ 8233E09 + trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_MattIntro, AquaHideout_B2F_Text_MattDefeat, AquaHideout_B2F_EventScript_SubmarineEscape + msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT release end -AquaHideout_B2F_EventScript_233E25:: @ 8233E25 - setvar VAR_0x8008, 1 - setvar VAR_0x8009, 4 +AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25 + setvar VAR_0x8008, 1 @ Matt object event id + setvar VAR_0x8009, 4 @ Submarine object event id applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 delay 20 applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT + msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT closemessage applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft - applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 + applymovement VAR_0x8009, AquaHideout_B2F_Movement_SumbarineDepartLeft waitmovement 0 removeobject VAR_0x8009 delay 20 applymovement VAR_0x8008, Common_Movement_FacePlayer waitmovement 0 - msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT + msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release end -AquaHideout_B2F_Movement_233E80: @ 8233E80 +AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80 walk_left walk_left walk_left walk_left step_end -AquaHideout_B2F_Movement_233E85: @ 8233E85 +@ Unused +AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85 walk_right walk_right walk_right walk_right step_end -AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A - trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_2340B4, AquaHideout_B2F_Text_2340F0, AquaHideout_B2F_EventScript_233EA5 - msgbox AquaHideout_B2F_Text_234112, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A + trainerbattle_single TRAINER_GRUNT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated + msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_EventScript_233EA5:: @ 8233EA5 - msgbox AquaHideout_B2F_Text_234112, MSGBOX_DEFAULT +AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5 + msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_DEFAULT release end -AquaHideout_B2F_EventScript_233EAF:: @ 8233EAF - trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_23412D, AquaHideout_B2F_Text_2341CE - msgbox AquaHideout_B2F_Text_2341FE, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt22:: @ 8233EAF + trainerbattle_single TRAINER_GRUNT_22, AquaHideout_B2F_Text_Grunt22Intro, AquaHideout_B2F_Text_Grunt22Defeat + msgbox AquaHideout_B2F_Text_Grunt22PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_EventScript_233EC6:: @ 8233EC6 - trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_23426F, AquaHideout_B2F_Text_2342CC - msgbox AquaHideout_B2F_Text_2342FF, MSGBOX_AUTOCLOSE +AquaHideout_B2F_EventScript_Grunt26:: @ 8233EC6 + trainerbattle_single TRAINER_GRUNT_26, AquaHideout_B2F_Text_Grunt26Intro, AquaHideout_B2F_Text_Grunt26Defeat + msgbox AquaHideout_B2F_Text_Grunt26PostBattle, MSGBOX_AUTOCLOSE end -AquaHideout_B2F_Text_233EDD: @ 8233EDD +AquaHideout_B2F_Text_MattIntro: @ 8233EDD .string "Hehehe…\p" .string "Got here already, did you?\n" .string "We underestimated you!\p" @@ -95,16 +96,16 @@ AquaHideout_B2F_Text_233EDD: @ 8233EDD .string "I'm not stalling for time.\n" .string "I'm going to pulverize you!$" -AquaHideout_B2F_Text_233F8D: @ 8233F8D +AquaHideout_B2F_Text_MattDefeat: @ 8233F8D .string "Hehehe…\n" .string "So, I lost, too…$" -AquaHideout_B2F_Text_233FA6: @ 8233FA6 +AquaHideout_B2F_Text_OurBossGotThroughHisPreparations: @ 8233FA6 .string "Hehehe!\p" .string "While I was toying with you, our BOSS\n" .string "got through his preparations!$" -AquaHideout_B2F_Text_233FF2: @ 8233FF2 +AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2 .string "Hehehe!\p" .string "Our BOSS has already gone on his way to\n" .string "some cave under the sea!\p" @@ -114,19 +115,19 @@ AquaHideout_B2F_Text_233FF2: @ 8233FF2 .string "But will you find it then?\n" .string "Hehehe!$" -AquaHideout_B2F_Text_2340B4: @ 82340B4 +AquaHideout_B2F_Text_Grunt4Intro: @ 82340B4 .string "Wahahah, I grew weary of waiting!\n" .string "You owe me a battle, too!$" -AquaHideout_B2F_Text_2340F0: @ 82340F0 +AquaHideout_B2F_Text_Grunt4Defeat: @ 82340F0 .string "Tired of waiting…\n" .string "Lost and dazed…$" -AquaHideout_B2F_Text_234112: @ 8234112 +AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112 .string "BOSS…\n" .string "Is this good enough?$" -AquaHideout_B2F_Text_23412D: @ 823412D +AquaHideout_B2F_Text_Grunt22Intro: @ 823412D .string "Warp panels, the HIDEOUT's pride\n" .string "and joy!\p" .string "You're clueless about where you are,\n" @@ -134,25 +135,25 @@ AquaHideout_B2F_Text_23412D: @ 823412D .string "Fluster and tire out the enemy, then\n" .string "lower the boom! That's our plan!$" -AquaHideout_B2F_Text_2341CE: @ 82341CE +AquaHideout_B2F_Text_Grunt22Defeat: @ 82341CE .string "What's wrong with you?\n" .string "You're not tired at all!$" -AquaHideout_B2F_Text_2341FE: @ 82341FE +AquaHideout_B2F_Text_Grunt22PostBattle: @ 82341FE .string "That reminds me… I can't remember\n" .string "where I put the MASTER BALL.\p" .string "If I fail to guard it, our BOSS will\n" .string "chew me out…$" -AquaHideout_B2F_Text_23426F: @ 823426F +AquaHideout_B2F_Text_Grunt26Intro: @ 823426F .string "When I joined TEAM AQUA, the first\n" .string "thing I had to learn was how these\l" .string "warp panels connected.$" -AquaHideout_B2F_Text_2342CC: @ 82342CC +AquaHideout_B2F_Text_Grunt26Defeat: @ 82342CC .string "I was too occupied thinking about\n" .string "the warp panels…$" -AquaHideout_B2F_Text_2342FF: @ 82342FF +AquaHideout_B2F_Text_Grunt26PostBattle: @ 82342FF .string "I'll have to learn about how I can\n" .string "battle more effectively…$" diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index 62ef6e1a9..a3a6234d3 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -111,7 +111,7 @@ JaggedPass_EventScript_23079C:: @ 823079C end JaggedPass_EventScript_2307C8:: @ 82307C8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle msgbox JaggedPass_Text_230A2C, MSGBOX_DEFAULT register_matchcall TRAINER_DIANA_1 release @@ -132,7 +132,7 @@ JaggedPass_EventScript_2307FB:: @ 82307FB end JaggedPass_EventScript_230827:: @ 8230827 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle msgbox JaggedPass_Text_230BC6, MSGBOX_DEFAULT register_matchcall TRAINER_ETHAN_1 release diff --git a/data/maps/MagmaHideout_1F/map.json b/data/maps/MagmaHideout_1F/map.json index 350c52b4f..37bad78ff 100644 --- a/data/maps/MagmaHideout_1F/map.json +++ b/data/maps/MagmaHideout_1F/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MagmaHideout_1F_EventScript_23988C", + "script": "MagmaHideout_1F_EventScript_Grunt38", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_1F_EventScript_2398A3", + "script": "MagmaHideout_1F_EventScript_Grunt39", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc index 2fe4ad581..6b41021a9 100644 --- a/data/maps/MagmaHideout_1F/scripts.inc +++ b/data/maps/MagmaHideout_1F/scripts.inc @@ -6,33 +6,33 @@ MagmaHideout_1F_OnTransition: @ 8239886 setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end -MagmaHideout_1F_EventScript_23988C:: @ 823988C - trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_2398BA, MagmaHideout_1F_Text_239964 - msgbox MagmaHideout_1F_Text_2399B1, MSGBOX_AUTOCLOSE +MagmaHideout_1F_EventScript_Grunt38:: @ 823988C + trainerbattle_single TRAINER_GRUNT_38, MagmaHideout_1F_Text_Grunt38Intro, MagmaHideout_1F_Text_Grunt38Defeat + msgbox MagmaHideout_1F_Text_Grunt38PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_1F_EventScript_2398A3:: @ 82398A3 - trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_2399F5, MagmaHideout_1F_Text_239ABA - msgbox MagmaHideout_1F_Text_239ACD, MSGBOX_AUTOCLOSE +MagmaHideout_1F_EventScript_Grunt39:: @ 82398A3 + trainerbattle_single TRAINER_GRUNT_39, MagmaHideout_1F_Text_Grunt39Intro, MagmaHideout_1F_Text_Grunt39Defeat + msgbox MagmaHideout_1F_Text_Grunt39PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_1F_Text_2398BA: @ 82398BA +MagmaHideout_1F_Text_Grunt38Intro: @ 82398BA .string "When TEAM MAGMA has roll call, we get\n" .string "important guarding assignments in\l" .string "the order that we line up.\p" .string "That's why I'm stuck off in this corner.\n" .string "I'm always late to roll call!$" -MagmaHideout_1F_Text_239964: @ 8239964 +MagmaHideout_1F_Text_Grunt38Defeat: @ 8239964 .string "I'm always late for training sessions,\n" .string "too!\p" .string "I hate to say it, but I'm wimpy…$" -MagmaHideout_1F_Text_2399B1: @ 82399B1 +MagmaHideout_1F_Text_Grunt38PostBattle: @ 82399B1 .string "Okay, I'll try to put a little more\n" .string "effort into things from now on…$" -MagmaHideout_1F_Text_2399F5: @ 82399F5 +MagmaHideout_1F_Text_Grunt39Intro: @ 82399F5 .string "Our leader told us to dig into\n" .string "MT. CHIMNEY, so we dug and dug.\p" .string "And in the course of digging, we came\n" @@ -41,11 +41,11 @@ MagmaHideout_1F_Text_2399F5: @ 82399F5 .string "Fuhahaha!\n" .string "I'll tell you if you beat me!$" -MagmaHideout_1F_Text_239ABA: @ 8239ABA +MagmaHideout_1F_Text_Grunt39Defeat: @ 8239ABA .string "Arrgh!\n" .string "Taken down!$" -MagmaHideout_1F_Text_239ACD: @ 8239ACD +MagmaHideout_1F_Text_Grunt39PostBattle: @ 8239ACD .string "I won't tell you after all.\n" .string "You'll find out when you get there!\p" .string "It'd be better if you saved surprises\n" diff --git a/data/maps/MagmaHideout_2F_1R/map.json b/data/maps/MagmaHideout_2F_1R/map.json index d628c1b5a..6b0d9614d 100644 --- a/data/maps/MagmaHideout_2F_1R/map.json +++ b/data/maps/MagmaHideout_2F_1R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 4, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MagmaHideout_2F_1R_EventScript_239B7F", + "script": "MagmaHideout_2F_1R_EventScript_Grunt41", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 6, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_2F_1R_EventScript_239B96", + "script": "MagmaHideout_2F_1R_EventScript_Grunt42", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "MagmaHideout_2F_1R_EventScript_239B51", + "script": "MagmaHideout_2F_1R_EventScript_Grunt51", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_2F_1R_EventScript_239B68", + "script": "MagmaHideout_2F_1R_EventScript_Grunt40", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" } ], diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc index 9ea2ef6fe..b6c3154b0 100644 --- a/data/maps/MagmaHideout_2F_1R/scripts.inc +++ b/data/maps/MagmaHideout_2F_1R/scripts.inc @@ -1,27 +1,27 @@ MagmaHideout_2F_1R_MapScripts:: @ 8239B50 .byte 0 -MagmaHideout_2F_1R_EventScript_239B51:: @ 8239B51 - trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_239BAD, MagmaHideout_2F_1R_Text_239C4B - msgbox MagmaHideout_2F_1R_Text_239C74, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt51:: @ 8239B51 + trainerbattle_single TRAINER_GRUNT_51, MagmaHideout_2F_1R_Text_Grunt51Intro, MagmaHideout_2F_1R_Text_Grunt51Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt51PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B68:: @ 8239B68 - trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_239CAB, MagmaHideout_2F_1R_Text_239D09 - msgbox MagmaHideout_2F_1R_Text_239D1D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt40:: @ 8239B68 + trainerbattle_single TRAINER_GRUNT_40, MagmaHideout_2F_1R_Text_Grunt40Intro, MagmaHideout_2F_1R_Text_Grunt40Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt40PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B7F:: @ 8239B7F - trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_239D62, MagmaHideout_2F_1R_Text_239D75 - msgbox MagmaHideout_2F_1R_Text_239D7D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt41:: @ 8239B7F + trainerbattle_single TRAINER_GRUNT_41, MagmaHideout_2F_1R_Text_Grunt41Intro, MagmaHideout_2F_1R_Text_Grunt41Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt41PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_EventScript_239B96:: @ 8239B96 - trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_239DC5, MagmaHideout_2F_1R_Text_239DDA - msgbox MagmaHideout_2F_1R_Text_239DE2, MSGBOX_AUTOCLOSE +MagmaHideout_2F_1R_EventScript_Grunt42:: @ 8239B96 + trainerbattle_single TRAINER_GRUNT_42, MagmaHideout_2F_1R_Text_Grunt42Intro, MagmaHideout_2F_1R_Text_Grunt42Defeat + msgbox MagmaHideout_2F_1R_Text_Grunt42PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD +MagmaHideout_2F_1R_Text_Grunt51Intro: @ 8239BAD .string "What, what, what?\p" .string "Only TEAM MAGMA members are supposed\n" .string "to be in here!\p" @@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_239BAD: @ 8239BAD .string "You rouse my suspicion!\n" .string "Battle with me!$" -MagmaHideout_2F_1R_Text_239C4B: @ 8239C4B +MagmaHideout_2F_1R_Text_Grunt51Defeat: @ 8239C4B .string "Aiyiyi…\n" .string "My pride as a TEAM MAGMA member…$" -MagmaHideout_2F_1R_Text_239C74: @ 8239C74 +MagmaHideout_2F_1R_Text_Grunt51PostBattle: @ 8239C74 .string "If you suffer from chills, you should\n" .string "join TEAM MAGMA.$" -MagmaHideout_2F_1R_Text_239CAB: @ 8239CAB +MagmaHideout_2F_1R_Text_Grunt40Intro: @ 8239CAB .string "Hold it right there!\p" .string "You don't really expect me to keep\n" .string "my trap shut and let you waltz by me?$" -MagmaHideout_2F_1R_Text_239D09: @ 8239D09 +MagmaHideout_2F_1R_Text_Grunt40Defeat: @ 8239D09 .string "Ooh wow!\n" .string "I concede!$" -MagmaHideout_2F_1R_Text_239D1D: @ 8239D1D +MagmaHideout_2F_1R_Text_Grunt40PostBattle: @ 8239D1D .string "Maybe it would've been better if I did\n" .string "just let you go unchallenged…$" -MagmaHideout_2F_1R_Text_239D62: @ 8239D62 +MagmaHideout_2F_1R_Text_Grunt41Intro: @ 8239D62 .string "Ahah!\n" .string "An intruder!$" -MagmaHideout_2F_1R_Text_239D75: @ 8239D75 +MagmaHideout_2F_1R_Text_Grunt41Defeat: @ 8239D75 .string "Graaah!$" -MagmaHideout_2F_1R_Text_239D7D: @ 8239D7D +MagmaHideout_2F_1R_Text_Grunt41PostBattle: @ 8239D7D .string "I've already lost.\p" .string "Do I really need to keep running\n" .string "around in a circle?$" -MagmaHideout_2F_1R_Text_239DC5: @ 8239DC5 +MagmaHideout_2F_1R_Text_Grunt42Intro: @ 8239DC5 .string "Oh, oh!\n" .string "An intruder!$" -MagmaHideout_2F_1R_Text_239DDA: @ 8239DDA +MagmaHideout_2F_1R_Text_Grunt42Defeat: @ 8239DDA .string "Mutter…$" -MagmaHideout_2F_1R_Text_239DE2: @ 8239DE2 +MagmaHideout_2F_1R_Text_Grunt42PostBattle: @ 8239DE2 .string "Actually, I'm no expert at battling…$" diff --git a/data/maps/MagmaHideout_2F_2R/map.json b/data/maps/MagmaHideout_2F_2R/map.json index b52d34212..8befdc42a 100644 --- a/data/maps/MagmaHideout_2F_2R/map.json +++ b/data/maps/MagmaHideout_2F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "7", - "script": "MagmaHideout_2F_2R_EventScript_239E4D", + "script": "MagmaHideout_2F_2R_EventScript_Grunt45", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "MagmaHideout_2F_2R_EventScript_239E36", + "script": "MagmaHideout_2F_2R_EventScript_Grunt44", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_2F_2R_EventScript_239E1F", + "script": "MagmaHideout_2F_2R_EventScript_Grunt43", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "1", - "script": "MagmaHideout_2F_2R_EventScript_239E08", + "script": "MagmaHideout_2F_2R_EventScript_Grunt52", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc index 5539d26de..af63aa5de 100644 --- a/data/maps/MagmaHideout_2F_2R/scripts.inc +++ b/data/maps/MagmaHideout_2F_2R/scripts.inc @@ -1,78 +1,78 @@ MagmaHideout_2F_2R_MapScripts:: @ 8239E07 .byte 0 -MagmaHideout_2F_2R_EventScript_239E08:: @ 8239E08 - trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_239E64, MagmaHideout_2F_2R_Text_239EA5 - msgbox MagmaHideout_2F_2R_Text_239EBB, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt52:: @ 8239E08 + trainerbattle_single TRAINER_GRUNT_52, MagmaHideout_2F_2R_Text_Grunt52Intro, MagmaHideout_2F_2R_Text_Grunt52Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt52PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E1F:: @ 8239E1F - trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_239F31, MagmaHideout_2F_2R_Text_239F71 - msgbox MagmaHideout_2F_2R_Text_239FA1, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt43:: @ 8239E1F + trainerbattle_single TRAINER_GRUNT_43, MagmaHideout_2F_2R_Text_Grunt43Intro, MagmaHideout_2F_2R_Text_Grunt43Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt43PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E36:: @ 8239E36 - trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_239FDE, MagmaHideout_2F_2R_Text_23A050 - msgbox MagmaHideout_2F_2R_Text_23A07D, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt44:: @ 8239E36 + trainerbattle_single TRAINER_GRUNT_44, MagmaHideout_2F_2R_Text_Grunt44Intro, MagmaHideout_2F_2R_Text_Grunt44Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt44PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_EventScript_239E4D:: @ 8239E4D - trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_23A0E4, MagmaHideout_2F_2R_Text_23A14C - msgbox MagmaHideout_2F_2R_Text_23A16F, MSGBOX_AUTOCLOSE +MagmaHideout_2F_2R_EventScript_Grunt45:: @ 8239E4D + trainerbattle_single TRAINER_GRUNT_45, MagmaHideout_2F_2R_Text_Grunt45Intro, MagmaHideout_2F_2R_Text_Grunt45Defeat + msgbox MagmaHideout_2F_2R_Text_Grunt45PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_2F_2R_Text_239E64: @ 8239E64 +MagmaHideout_2F_2R_Text_Grunt52Intro: @ 8239E64 .string "I don't have a bone to pick with you.\n" .string "I'm just following orders!$" -MagmaHideout_2F_2R_Text_239EA5: @ 8239EA5 +MagmaHideout_2F_2R_Text_Grunt52Defeat: @ 8239EA5 .string "I may have lost, but…$" -MagmaHideout_2F_2R_Text_239EBB: @ 8239EBB +MagmaHideout_2F_2R_Text_Grunt52PostBattle: @ 8239EBB .string "We dug up something beyond belief!\n" .string "And, we got the BLUE ORB!\p" .string "All that's left is for our leader to…\n" .string "Fufufu… Fwahahaha!$" -MagmaHideout_2F_2R_Text_239F31: @ 8239F31 +MagmaHideout_2F_2R_Text_Grunt43Intro: @ 8239F31 .string "I can't stand heat. Maybe I should've\n" .string "joined TEAM AQUA instead…$" -MagmaHideout_2F_2R_Text_239F71: @ 8239F71 +MagmaHideout_2F_2R_Text_Grunt43Defeat: @ 8239F71 .string "Yeah, I really may not be right for\n" .string "TEAM MAGMA…$" -MagmaHideout_2F_2R_Text_239FA1: @ 8239FA1 +MagmaHideout_2F_2R_Text_Grunt43PostBattle: @ 8239FA1 .string "Don't you get lonely for the sea\n" .string "being in a place like this?$" -MagmaHideout_2F_2R_Text_239FDE: @ 8239FDE +MagmaHideout_2F_2R_Text_Grunt44Intro: @ 8239FDE .string "You can hear tremors here sometimes.\p" .string "Could it be the volcano rattling?\n" .string "Or is it GROU…\p" .string "Whoops!\n" .string "No, no, never mind!$" -MagmaHideout_2F_2R_Text_23A050: @ 823A050 +MagmaHideout_2F_2R_Text_Grunt44Defeat: @ 823A050 .string "You're a fiery battler.\n" .string "Just like a volcano!$" -MagmaHideout_2F_2R_Text_23A07D: @ 823A07D +MagmaHideout_2F_2R_Text_Grunt44PostBattle: @ 823A07D .string "You just happened to win this time,\n" .string "but that doesn't matter.\p" .string "TEAM MAGMA's goal is about to be\n" .string "reached!$" -MagmaHideout_2F_2R_Text_23A0E4: @ 823A0E4 +MagmaHideout_2F_2R_Text_Grunt45Intro: @ 823A0E4 .string "One of our guys was freaking out that\n" .string "he lost his MAGMA EMBLEM…\p" .string "Wait a minute!\n" .string "Was it you who found it?$" -MagmaHideout_2F_2R_Text_23A14C: @ 823A14C +MagmaHideout_2F_2R_Text_Grunt45Defeat: @ 823A14C .string "I'm having trouble believing this…$" -MagmaHideout_2F_2R_Text_23A16F: @ 823A16F +MagmaHideout_2F_2R_Text_Grunt45PostBattle: @ 823A16F .string "I'm getting this feeling that our plan\n" .string "is going to end in failure…$" diff --git a/data/maps/MagmaHideout_3F_1R/map.json b/data/maps/MagmaHideout_3F_1R/map.json index e3c1bac70..ef370ee8b 100644 --- a/data/maps/MagmaHideout_3F_1R/map.json +++ b/data/maps/MagmaHideout_3F_1R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "5", - "script": "MagmaHideout_3F_1R_EventScript_23A1B3", + "script": "MagmaHideout_3F_1R_EventScript_Grunt46", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_3F_1R_EventScript_23A1CA", + "script": "MagmaHideout_3F_1R_EventScript_Grunt53", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc index 879cd282d..a54e38c65 100644 --- a/data/maps/MagmaHideout_3F_1R/scripts.inc +++ b/data/maps/MagmaHideout_3F_1R/scripts.inc @@ -1,29 +1,29 @@ MagmaHideout_3F_1R_MapScripts:: @ 823A1B2 .byte 0 -MagmaHideout_3F_1R_EventScript_23A1B3:: @ 823A1B3 - trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_23A1E1, MagmaHideout_3F_1R_Text_23A229 - msgbox MagmaHideout_3F_1R_Text_23A246, MSGBOX_AUTOCLOSE +MagmaHideout_3F_1R_EventScript_Grunt46:: @ 823A1B3 + trainerbattle_single TRAINER_GRUNT_46, MagmaHideout_3F_1R_Text_Grunt46Intro, MagmaHideout_3F_1R_Text_Grunt46Defeat + msgbox MagmaHideout_3F_1R_Text_Grunt46PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_1R_EventScript_23A1CA:: @ 823A1CA - trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_23A293, MagmaHideout_3F_1R_Text_23A353 - msgbox MagmaHideout_3F_1R_Text_23A37C, MSGBOX_AUTOCLOSE +MagmaHideout_3F_1R_EventScript_Grunt53:: @ 823A1CA + trainerbattle_single TRAINER_GRUNT_53, MagmaHideout_3F_1R_Text_Grunt53Intro, MagmaHideout_3F_1R_Text_Grunt53Defeat + msgbox MagmaHideout_3F_1R_Text_Grunt53PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_1R_Text_23A1E1: @ 823A1E1 +MagmaHideout_3F_1R_Text_Grunt46Intro: @ 823A1E1 .string "What did I do to deserve this guard\n" .string "posting?\p" .string "My left ear is burning up!$" -MagmaHideout_3F_1R_Text_23A229: @ 823A229 +MagmaHideout_3F_1R_Text_Grunt46Defeat: @ 823A229 .string "I'm getting heat exhaustion…$" -MagmaHideout_3F_1R_Text_23A246: @ 823A246 +MagmaHideout_3F_1R_Text_Grunt46PostBattle: @ 823A246 .string "Do you think it's odd that we're wearing\n" .string "hoods in this magma-filled volcano?$" -MagmaHideout_3F_1R_Text_23A293: @ 823A293 +MagmaHideout_3F_1R_Text_Grunt53Intro: @ 823A293 .string "We joined so we can help our leader\n" .string "achieve his fantastic vision.\p" .string "I don't care if you're with TEAM AQUA\n" @@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_23A293: @ 823A293 .string "No one interferes with us and gets\n" .string "away with it!$" -MagmaHideout_3F_1R_Text_23A353: @ 823A353 +MagmaHideout_3F_1R_Text_Grunt53Defeat: @ 823A353 .string "Oh, no!\n" .string "You're not to be trusted at all!$" -MagmaHideout_3F_1R_Text_23A37C: @ 823A37C +MagmaHideout_3F_1R_Text_Grunt53PostBattle: @ 823A37C .string "Listen to me.\n" .string "TEAM MAGMA is right!\p" .string "Don't listen to TEAM AQUA.\n" diff --git a/data/maps/MagmaHideout_3F_2R/map.json b/data/maps/MagmaHideout_3F_2R/map.json index e4b267858..c6fc9906c 100644 --- a/data/maps/MagmaHideout_3F_2R/map.json +++ b/data/maps/MagmaHideout_3F_2R/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_3F_2R_EventScript_23A3D5", + "script": "MagmaHideout_3F_2R_EventScript_Grunt47", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc index 14f7001fa..968754b06 100644 --- a/data/maps/MagmaHideout_3F_2R/scripts.inc +++ b/data/maps/MagmaHideout_3F_2R/scripts.inc @@ -1,12 +1,12 @@ MagmaHideout_3F_2R_MapScripts:: @ 823A3D4 .byte 0 -MagmaHideout_3F_2R_EventScript_23A3D5:: @ 823A3D5 - trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_23A3EC, MagmaHideout_3F_2R_Text_23A4BB - msgbox MagmaHideout_3F_2R_Text_23A4EF, MSGBOX_AUTOCLOSE +MagmaHideout_3F_2R_EventScript_Grunt47:: @ 823A3D5 + trainerbattle_single TRAINER_GRUNT_47, MagmaHideout_3F_2R_Text_Grunt47Intro, MagmaHideout_3F_2R_Text_Grunt47Defeat + msgbox MagmaHideout_3F_2R_Text_Grunt47PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC +MagmaHideout_3F_2R_Text_Grunt47Intro: @ 823A3EC .string "I understand everything our leader\n" .string "says. But you know what?\p" .string "Doing stuff like digging up a super-\n" @@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_23A3EC: @ 823A3EC .string "I think we're going a little too far.\n" .string "What do you think?$" -MagmaHideout_3F_2R_Text_23A4BB: @ 823A4BB +MagmaHideout_3F_2R_Text_Grunt47Defeat: @ 823A4BB .string "Yeah, I think we are doing something\n" .string "wrong somehow.$" -MagmaHideout_3F_2R_Text_23A4EF: @ 823A4EF +MagmaHideout_3F_2R_Text_Grunt47PostBattle: @ 823A4EF .string "You know, losing to you cleared my mind.\p" .string "The next time I see our leader,\n" .string "I'm going to ask him about what we do.$" diff --git a/data/maps/MagmaHideout_4F/map.json b/data/maps/MagmaHideout_4F/map.json index 5eebc41d8..e7ea5b669 100644 --- a/data/maps/MagmaHideout_4F/map.json +++ b/data/maps/MagmaHideout_4F/map.json @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A68C", + "script": "MagmaHideout_4F_EventScript_Grunt48", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -50,7 +50,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A6A3", + "script": "MagmaHideout_4F_EventScript_Grunt49", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "MagmaHideout_4F_EventScript_23A6BA", + "script": "MagmaHideout_4F_EventScript_Grunt50", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "MagmaHideout_4F_EventScript_23A6D1", + "script": "MagmaHideout_4F_EventScript_Tabitha", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { @@ -89,7 +89,7 @@ "movement_range_y": 1, "trainer_type": "0", "trainer_sight_or_berry_tree_id": "0", - "script": "MagmaHideout_4F_EventScript_23A560", + "script": "MagmaHideout_4F_EventScript_Maxie", "flag": "FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS" }, { diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index ce2229396..1c5ea4dbb 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -1,10 +1,10 @@ MagmaHideout_4F_MapScripts:: @ 823A55F .byte 0 -MagmaHideout_4F_EventScript_23A560:: @ 823A560 +MagmaHideout_4F_EventScript_Maxie:: @ 823A560 lockall playbgm MUS_MGM0, 0 - msgbox MagmaHideout_4F_Text_23A9F4, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT closemessage delay 20 setvar VAR_RESULT, 1 @@ -17,17 +17,17 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 setvar VAR_RESULT, 1 playfanfare MUS_ME_TAMA playse SE_TAMA - special sub_80B0534 + special DoOrbEffect applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 - removeobject 7 - addobject 1 + removeobject 7 @ sleeping Groudon + addobject 1 @ awakened Groudon waitstate delay 60 - applymovement 1, MagmaHideout_4F_Movement_23A672 + applymovement 1, MagmaHideout_4F_Movement_GroudonApproach waitmovement 0 - special sub_80B058C + special FadeOutOrbEffect waitstate setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -35,7 +35,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement 1, MagmaHideout_4F_Movement_23A67D + applymovement 1, MagmaHideout_4F_Movement_GroudonExit waitmovement 0 removeobject 1 delay 4 @@ -46,19 +46,19 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 special ShakeCamera waitstate delay 30 - applymovement 6, MagmaHideout_4F_Movement_23A680 + applymovement 6, MagmaHideout_4F_Movement_MaxieLookAround waitmovement 0 - msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT closemessage applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight waitmovement 0 delay 30 applymovement 6, Common_Movement_FacePlayer waitmovement 0 - msgbox MagmaHideout_4F_Text_23AB33, MSGBOX_DEFAULT + msgbox MagmaHideout_4F_Text_MaxieOhItWasYou, MSGBOX_DEFAULT closemessage - trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_23ABB5 - msgbox MagmaHideout_4F_Text_23ABE2, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_MAXIE_1, MagmaHideout_4F_Text_MaxieDefeat + msgbox MagmaHideout_4F_Text_MaxieImGoingAfterGroudon, MSGBOX_DEFAULT closemessage clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY @@ -76,7 +76,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 releaseall end -MagmaHideout_4F_Movement_23A672: @ 823A672 +MagmaHideout_4F_Movement_GroudonApproach: @ 823A672 delay_16 delay_16 walk_slow_down @@ -89,12 +89,12 @@ MagmaHideout_4F_Movement_23A672: @ 823A672 delay_16 step_end -MagmaHideout_4F_Movement_23A67D: @ 823A67D +MagmaHideout_4F_Movement_GroudonExit: @ 823A67D slide_up slide_up step_end -MagmaHideout_4F_Movement_23A680: @ 823A680 +MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680 face_left delay_16 face_right @@ -108,64 +108,64 @@ MagmaHideout_4F_Movement_23A680: @ 823A680 delay_16 step_end -MagmaHideout_4F_EventScript_23A68C:: @ 823A68C - trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_23A6E8, MagmaHideout_4F_Text_23A775 - msgbox MagmaHideout_4F_Text_23A7B5, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt48:: @ 823A68C + trainerbattle_single TRAINER_GRUNT_48, MagmaHideout_4F_Text_Grunt48Intro, MagmaHideout_4F_Text_Grunt48Defeat + msgbox MagmaHideout_4F_Text_Grunt48PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6A3:: @ 823A6A3 - trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_23A7DA, MagmaHideout_4F_Text_23A81B - msgbox MagmaHideout_4F_Text_23A841, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt49:: @ 823A6A3 + trainerbattle_single TRAINER_GRUNT_49, MagmaHideout_4F_Text_Grunt49Intro, MagmaHideout_4F_Text_Grunt49Defeat + msgbox MagmaHideout_4F_Text_Grunt49PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6BA:: @ 823A6BA - trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_23A86D, MagmaHideout_4F_Text_23A8A7 - msgbox MagmaHideout_4F_Text_23A8C6, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Grunt50:: @ 823A6BA + trainerbattle_single TRAINER_GRUNT_50, MagmaHideout_4F_Text_Grunt50Intro, MagmaHideout_4F_Text_Grunt50Defeat + msgbox MagmaHideout_4F_Text_Grunt50PostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_EventScript_23A6D1:: @ 823A6D1 - trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_23A8E1, MagmaHideout_4F_Text_23A994 - msgbox MagmaHideout_4F_Text_23A9AC, MSGBOX_AUTOCLOSE +MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1 + trainerbattle_single TRAINER_TABITHA_3, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat + msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE end -MagmaHideout_4F_Text_23A6E8: @ 823A6E8 +MagmaHideout_4F_Text_Grunt48Intro: @ 823A6E8 .string "I want to see GROUDON, too, but they\n" .string "won't let me see even its tail…\p" .string "It's got me feeling really frustrated.\p" .string "Oh, no!\n" .string "I blabbed about GROUDON!$" -MagmaHideout_4F_Text_23A775: @ 823A775 +MagmaHideout_4F_Text_Grunt48Defeat: @ 823A775 .string "I guess it's impossible to win if one\n" .string "doesn't have a calm mind…$" -MagmaHideout_4F_Text_23A7B5: @ 823A7B5 +MagmaHideout_4F_Text_Grunt48PostBattle: @ 823A7B5 .string "I wonder if GROUDON even has a tail?$" -MagmaHideout_4F_Text_23A7DA: @ 823A7DA +MagmaHideout_4F_Text_Grunt49Intro: @ 823A7DA .string "Fuhahaha!\n" .string "Soon! Very soon!\l" .string "Our grand objective will be achieved!$" -MagmaHideout_4F_Text_23A81B: @ 823A81B +MagmaHideout_4F_Text_Grunt49Defeat: @ 823A81B .string "Grrr…\n" .string "I've come so far, but now this?$" -MagmaHideout_4F_Text_23A841: @ 823A841 +MagmaHideout_4F_Text_Grunt49PostBattle: @ 823A841 .string "MAXIE, sir!\n" .string "An intruder is headed your way!$" -MagmaHideout_4F_Text_23A86D: @ 823A86D +MagmaHideout_4F_Text_Grunt50Intro: @ 823A86D .string "You're not finished yet!\n" .string "You're not getting by me easily!$" -MagmaHideout_4F_Text_23A8A7: @ 823A8A7 +MagmaHideout_4F_Text_Grunt50Defeat: @ 823A8A7 .string "Was I that easy to knock down?$" -MagmaHideout_4F_Text_23A8C6: @ 823A8C6 +MagmaHideout_4F_Text_Grunt50PostBattle: @ 823A8C6 .string "C-come on, one more match…$" -MagmaHideout_4F_Text_23A8E1: @ 823A8E1 +MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1 .string "Hehehe!\n" .string "You made it this far, so I'll tell you!\p" .string "That's right!\n" @@ -175,15 +175,15 @@ MagmaHideout_4F_Text_23A8E1: @ 823A8E1 .string "It's going to awaken real soon!\n" .string "Hehe! Hehehe!$" -MagmaHideout_4F_Text_23A994: @ 823A994 +MagmaHideout_4F_Text_TabithaDefeat: @ 823A994 .string "Taken down again…\n" .string "Hehe…$" -MagmaHideout_4F_Text_23A9AC: @ 823A9AC +MagmaHideout_4F_Text_TabithaPostBattle: @ 823A9AC .string "…And while you wasted time with me,\n" .string "MAXIE should have awakened GROUDON…$" -MagmaHideout_4F_Text_23A9F4: @ 823A9F4 +MagmaHideout_4F_Text_MaxieAwakenGroudon: @ 823A9F4 .string "MAXIE: GROUDON…\p" .string "Nothing could awaken you from your\n" .string "sleep bathed in magma…\p" @@ -194,25 +194,25 @@ MagmaHideout_4F_Text_23A9F4: @ 823A9F4 .string "And show me…\n" .string "Show me the full extent of your power!$" -MagmaHideout_4F_Text_23AADA: @ 823AADA +MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: @ 823AADA .string "MAXIE: GROUDON!\n" .string "What's wrong?\p" .string "Wasn't the BLUE ORB the key?\p" .string "GROUDON!\n" .string "Where have you gone…$" -MagmaHideout_4F_Text_23AB33: @ 823AB33 +MagmaHideout_4F_Text_MaxieOhItWasYou: @ 823AB33 .string "MAXIE: Oh, so it was you?\p" .string "I've seen you poking around uninvited\n" .string "here and there…\p" .string "I get it now!\n" .string "You must have pulled a cheap stunt!$" -MagmaHideout_4F_Text_23ABB5: @ 823ABB5 +MagmaHideout_4F_Text_MaxieDefeat: @ 823ABB5 .string "What makes you so adept at handling\n" .string "POKéMON?$" -MagmaHideout_4F_Text_23ABE2: @ 823ABE2 +MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: @ 823ABE2 .string "MAXIE: There has to be some reason\n" .string "why GROUDON fled…\p" .string "That's what you're trying to say,\n" diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index fee636e0b..9ed8053c6 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -11,7 +11,7 @@ MeteorFalls_1F_2R_EventScript_22C4DE:: @ 822C4DE end MeteorFalls_1F_2R_EventScript_22C50A:: @ 822C50A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MeteorFalls_1F_2R_Text_22C6F6, MSGBOX_DEFAULT register_matchcall TRAINER_NICOLAS_1 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 1058761c5..e5f43565c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -1,5 +1,5 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41 - map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_MapScript1_222FC2 + map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_OnLoad map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition .byte 0 @@ -38,7 +38,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_222FBA:: @ 8222FBA setobjectxyperm 9, 14, 2 end -MossdeepCity_SpaceCenter_1F_MapScript1_222FC2: @ 8222FC2 +MossdeepCity_SpaceCenter_1F_OnLoad: @ 8222FC2 compare VAR_MOSSDEEP_CITY_STATE, 2 goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_222FCE end diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 71ee724b5..91cdb9e42 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -491,7 +491,7 @@ MtChimney_EventScript_22F14A:: @ 822F14A end MtChimney_EventScript_22F176:: @ 822F176 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtChimney_Text_2300E3, MSGBOX_DEFAULT register_matchcall TRAINER_SHELBY_1 @@ -533,7 +533,7 @@ MtChimney_EventScript_22F208:: @ 822F208 end MtChimney_EventScript_22F234:: @ 822F234 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtChimney_Text_230557, MSGBOX_DEFAULT register_matchcall TRAINER_SAWYER_1 diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index 558ab9999..3b84a581b 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -21,7 +21,7 @@ MtPyre_3F_EventScript_231781:: @ 8231781 end MtPyre_3F_EventScript_2317AD:: @ 82317AD - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtPyre_3F_Text_231A49, MSGBOX_DEFAULT register_matchcall TRAINER_GABRIELLE_1 diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index f59edd7b1..bc975e942 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -11,7 +11,7 @@ MtPyre_6F_EventScript_231D3B:: @ 8231D3B end MtPyre_6F_EventScript_231D67:: @ 8231D67 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox MtPyre_6F_Text_231E43, MSGBOX_DEFAULT register_matchcall TRAINER_VALERIE_1 diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 79179ffa6..42f0fb35a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -290,7 +290,7 @@ PetalburgWoods_EventScript_James:: @ 822E284 end PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames release diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index 3c79e8c61..b14f204e5 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -31,7 +31,7 @@ Route102_EventScript_Calvin:: @ 81EC105 end Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegisterMatchCall release diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index b54ede043..c614dae1c 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -259,7 +259,7 @@ Route103_EventScript_Miguel:: @ 81EC6E8 end Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route103_Text_MiguelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_MIGUEL_1 diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 9c31aadb5..ff420e599 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -879,7 +879,7 @@ Route104_EventScript_1ED38D:: @ 81ED38D end Route104_EventScript_1ED3CE:: @ 81ED3CE - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED3DF release @@ -922,7 +922,7 @@ Route104_EventScript_1ED43B:: @ 81ED43B end Route104_EventScript_1ED47C:: @ 81ED47C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED48D release @@ -965,7 +965,7 @@ Route104_EventScript_1ED4E9:: @ 81ED4E9 end Route104_EventScript_1ED52A:: @ 81ED52A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_1ED53B release diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 1b892642e..e1292803d 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -70,7 +70,7 @@ Route105_EventScript_Andres:: @ 81EE2D4 end Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ANDRES_1 diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index eb545cab8..f9d3fb3b9 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -25,7 +25,7 @@ Route106_EventScript_Elliot:: @ 81EE4C1 end Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ELLIOT_1 diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index 936634d8d..0642c457f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -16,7 +16,7 @@ Route107_EventScript_Tony:: @ 81EE5AC end Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_TONY_1 diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 4f049f71d..57f353bd1 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -36,7 +36,7 @@ Route108_EventScript_Cory:: @ 81EE6FD end Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT register_matchcall TRAINER_CORY_1 diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index adaab110b..5a45b6ceb 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -403,7 +403,7 @@ Route109_EventScript_Ricky:: @ 81EEA99 end Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT register_matchcall TRAINER_RICKY_1 @@ -425,7 +425,7 @@ Route109_EventScript_Lola:: @ 81EEAFB end Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT register_matchcall TRAINER_LOLA_1 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 68ae1d573..0a8b6eafc 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -184,7 +184,7 @@ Route110_EventScript_Edwin:: @ 81EF420 end Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route110_Text_EdwinRegister, MSGBOX_DEFAULT register_matchcall TRAINER_EDWIN_1 @@ -221,7 +221,7 @@ Route110_EventScript_Benjamin:: @ 81EF4C7 end Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route110_Text_BenjaminRegister, MSGBOX_DEFAULT register_matchcall TRAINER_BENJAMIN_1 @@ -248,7 +248,7 @@ Route110_EventScript_Abigail:: @ 81EF540 end Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route110_Text_AbigailRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ABIGAIL_1 @@ -270,7 +270,7 @@ Route110_EventScript_Isabel:: @ 81EF5A2 end Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route110_Text_IsabelRegister, MSGBOX_DEFAULT register_matchcall TRAINER_ISABEL_1 diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 8121265bb..b5a9ca8cc 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -476,7 +476,7 @@ Route111_EventScript_1F1260:: @ 81F1260 end Route111_EventScript_1F128C:: @ 81F128C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_298C00, MSGBOX_DEFAULT register_matchcall TRAINER_DUSTY_1 @@ -513,7 +513,7 @@ Route111_EventScript_1F1307:: @ 81F1307 end Route111_EventScript_1F1333:: @ 81F1333 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_29903D, MSGBOX_DEFAULT register_matchcall TRAINER_WILTON_1 @@ -535,7 +535,7 @@ Route111_EventScript_1F1369:: @ 81F1369 end Route111_EventScript_1F1395:: @ 81F1395 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route111_Text_29921D, MSGBOX_DEFAULT register_matchcall TRAINER_BROOKE_1 diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 0659095f6..beb572f08 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -75,7 +75,7 @@ Route112_EventScript_1F1E81:: @ 81F1E81 end Route112_EventScript_1F1EAD:: @ 81F1EAD - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route112_Text_29993C, MSGBOX_DEFAULT register_matchcall TRAINER_TRENT_1 diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 3e1b1754f..89bf97373 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -68,7 +68,7 @@ Route113_EventScript_1F21EE:: @ 81F21EE end Route113_EventScript_1F221A:: @ 81F221A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route113_Text_299F49, MSGBOX_DEFAULT register_matchcall TRAINER_MADELINE_1 @@ -90,7 +90,7 @@ Route113_EventScript_1F2250:: @ 81F2250 end Route113_EventScript_1F227C:: @ 81F227C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT register_matchcall TRAINER_LAO_1 diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 3434d6753..caf6e1496 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -116,7 +116,7 @@ Route114_EventScript_1F269C:: @ 81F269C end Route114_EventScript_1F26C8:: @ 81F26C8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT register_matchcall TRAINER_STEVE_1 @@ -138,7 +138,7 @@ Route114_EventScript_1F26FE:: @ 81F26FE end Route114_EventScript_1F272A:: @ 81F272A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT register_matchcall TRAINER_BERNIE_1 diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index 79d2caedc..8877f31bd 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -46,7 +46,7 @@ Route115_EventScript_1F298E:: @ 81F298E end Route115_EventScript_1F29BA:: @ 81F29BA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT register_matchcall TRAINER_TIMOTHY_1 @@ -73,7 +73,7 @@ Route115_EventScript_1F2A07:: @ 81F2A07 end Route115_EventScript_1F2A33:: @ 81F2A33 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B50B, MSGBOX_DEFAULT register_matchcall TRAINER_NOB_1 @@ -95,7 +95,7 @@ Route115_EventScript_1F2A69:: @ 81F2A69 end Route115_EventScript_1F2A95:: @ 81F2A95 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT register_matchcall TRAINER_CYNDY_1 diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index cef5051e0..f52c8a05f 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -272,7 +272,7 @@ Route116_EventScript_1F2EF8:: @ 81F2EF8 end Route116_EventScript_1F2F03:: @ 81F2F03 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route116_Text_29BE71, MSGBOX_DEFAULT register_matchcall TRAINER_JERRY_1 @@ -325,7 +325,7 @@ Route116_EventScript_1F2FD4:: @ 81F2FD4 end Route116_EventScript_1F2FDF:: @ 81F2FDF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route116_Text_29C096, MSGBOX_DEFAULT register_matchcall TRAINER_KAREN_1 diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 5435595ee..40d121fc7 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -47,7 +47,7 @@ Route117_EventScript_1F39D0:: @ 81F39D0 end Route117_EventScript_1F39FC:: @ 81F39FC - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C508, MSGBOX_DEFAULT register_matchcall TRAINER_ISAAC_1 @@ -69,7 +69,7 @@ Route117_EventScript_1F3A32:: @ 81F3A32 end Route117_EventScript_1F3A5E:: @ 81F3A5E - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT register_matchcall TRAINER_LYDIA_1 @@ -91,7 +91,7 @@ Route117_EventScript_1F3A94:: @ 81F3A94 end Route117_EventScript_1F3AC0:: @ 81F3AC0 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29C846, MSGBOX_DEFAULT register_matchcall TRAINER_DYLAN_1 @@ -113,7 +113,7 @@ Route117_EventScript_1F3AF6:: @ 81F3AF6 end Route117_EventScript_1F3B22:: @ 81F3B22 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route117_Text_29CA32, MSGBOX_DEFAULT register_matchcall TRAINER_MARIA_1 diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 38b231111..051cdfd9c 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -195,7 +195,7 @@ Route118_EventScript_1F3F87:: @ 81F3F87 end Route118_EventScript_1F3FB3:: @ 81F3FB3 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route118_Text_29D343, MSGBOX_DEFAULT register_matchcall TRAINER_ROSE_1 @@ -227,7 +227,7 @@ Route118_EventScript_1F4017:: @ 81F4017 end Route118_EventScript_1F4043:: @ 81F4043 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route118_Text_29D74A, MSGBOX_DEFAULT register_matchcall TRAINER_DALTON_1 diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index ec1063c6d..4658c2407 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -375,7 +375,7 @@ Route119_EventScript_1F4810:: @ 81F4810 end Route119_EventScript_1F483C:: @ 81F483C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route119_Text_29DD1C, MSGBOX_DEFAULT register_matchcall TRAINER_JACKSON_1 @@ -397,7 +397,7 @@ Route119_EventScript_1F4872:: @ 81F4872 end Route119_EventScript_1F489E:: @ 81F489E - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route119_Text_29DEF7, MSGBOX_DEFAULT register_matchcall TRAINER_CATHERINE_1 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 562416c1d..cb4ee4cc8 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -299,7 +299,7 @@ Route120_EventScript_1F57EE:: @ 81F57EE end Route120_EventScript_1F581A:: @ 81F581A - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route120_Text_29E75D, MSGBOX_DEFAULT register_matchcall TRAINER_ROBERT_1 @@ -331,7 +331,7 @@ Route120_EventScript_1F587E:: @ 81F587E end Route120_EventScript_1F58AA:: @ 81F58AA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route120_Text_29EA31, MSGBOX_DEFAULT register_matchcall TRAINER_JEFFREY_1 diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 6aa82857f..06862972c 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -80,7 +80,7 @@ Route121_EventScript_1F5E8B:: @ 81F5E8B end Route121_EventScript_1F5EB7:: @ 81F5EB7 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F25B, MSGBOX_DEFAULT register_matchcall TRAINER_WALTER_1 @@ -117,7 +117,7 @@ Route121_EventScript_1F5F3A:: @ 81F5F3A end Route121_EventScript_1F5F66:: @ 81F5F66 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F69F, MSGBOX_DEFAULT register_matchcall TRAINER_JESSICA_1 @@ -159,7 +159,7 @@ Route121_EventScript_1F5FF8:: @ 81F5FF8 end Route121_EventScript_1F6024:: @ 81F6024 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route121_Text_29F80D, MSGBOX_DEFAULT register_matchcall TRAINER_CRISTIN_1 diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index ce74cbadc..b5b3e6179 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -69,7 +69,7 @@ Route123_EventScript_1F620A:: @ 81F620A end Route123_EventScript_1F6236:: @ 81F6236 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_29FE70, MSGBOX_DEFAULT register_matchcall TRAINER_CAMERON_1 @@ -91,7 +91,7 @@ Route123_EventScript_1F626C:: @ 81F626C end Route123_EventScript_1F6298:: @ 81F6298 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_2A0027, MSGBOX_DEFAULT register_matchcall TRAINER_JACKI_1 @@ -163,7 +163,7 @@ Route123_EventScript_1F63BC:: @ 81F63BC end Route123_EventScript_1F63E8:: @ 81F63E8 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route123_Text_2A03C1, MSGBOX_DEFAULT register_matchcall TRAINER_FERNANDO_1 diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 9a11cec2c..ed6bc1ff0 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -30,7 +30,7 @@ Route124_EventScript_1F65B3:: @ 81F65B3 end Route124_EventScript_1F65DF:: @ 81F65DF - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route124_Text_2A0C14, MSGBOX_DEFAULT register_matchcall TRAINER_JENNY_1 diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index 62b66e3a6..13fe6dc8f 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -55,7 +55,7 @@ Route125_EventScript_1F6800:: @ 81F6800 end Route125_EventScript_1F682C:: @ 81F682C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route125_Text_2A17CF, MSGBOX_DEFAULT register_matchcall TRAINER_ERNEST_1 diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 7a606e020..640a5660e 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -51,7 +51,7 @@ Route126_EventScript_1F6977:: @ 81F6977 end Route126_EventScript_1F69A3:: @ 81F69A3 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route126_Text_2A1F5A, MSGBOX_DEFAULT register_matchcall TRAINER_PABLO_1 diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index fcc666ec6..33c833e32 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -70,7 +70,7 @@ Route127_EventScript_1F6AD6:: @ 81F6AD6 end Route127_EventScript_1F6B02:: @ 81F6B02 - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route127_Text_2A26EE, MSGBOX_DEFAULT register_matchcall TRAINER_KOJI_1 diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index a19c0edf9..6cd398a32 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -184,7 +184,7 @@ Route128_EventScript_1F6CBE:: @ 81F6CBE end Route128_EventScript_1F6CEA:: @ 81F6CEA - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route128_Text_2A2916, MSGBOX_DEFAULT register_matchcall TRAINER_ISAIAH_1 @@ -206,7 +206,7 @@ Route128_EventScript_1F6D20:: @ 81F6D20 end Route128_EventScript_1F6D4C:: @ 81F6D4C - special sub_80B4808 + special PlayerFaceTrainerAfterBattle waitmovement 0 msgbox Route128_Text_2A2AF9, MSGBOX_DEFAULT register_matchcall TRAINER_KATELYN_1 diff --git a/data/maps/SeafloorCavern_Room1/map.json b/data/maps/SeafloorCavern_Room1/map.json index 88db72b4a..a4849023a 100644 --- a/data/maps/SeafloorCavern_Room1/map.json +++ b/data/maps/SeafloorCavern_Room1/map.json @@ -63,7 +63,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "2", - "script": "SeafloorCavern_Room1_EventScript_2347EC", + "script": "SeafloorCavern_Room1_EventScript_Grunt5", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -76,7 +76,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room1_EventScript_234803", + "script": "SeafloorCavern_Room1_EventScript_Grunt6", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 92049e8ef..375797d7b 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -1,35 +1,35 @@ SeafloorCavern_Room1_MapScripts:: @ 82347EB .byte 0 -SeafloorCavern_Room1_EventScript_2347EC:: @ 82347EC - trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_23481A, SeafloorCavern_Room1_Text_23484A - msgbox SeafloorCavern_Room1_Text_23485D, MSGBOX_AUTOCLOSE +SeafloorCavern_Room1_EventScript_Grunt5:: @ 82347EC + trainerbattle_single TRAINER_GRUNT_5, SeafloorCavern_Room1_Text_Grunt5Intro, SeafloorCavern_Room1_Text_Grunt5Defeat + msgbox SeafloorCavern_Room1_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room1_EventScript_234803:: @ 8234803 - trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_234898, SeafloorCavern_Room1_Text_2348CD - msgbox SeafloorCavern_Room1_Text_2348E3, MSGBOX_AUTOCLOSE +SeafloorCavern_Room1_EventScript_Grunt6:: @ 8234803 + trainerbattle_single TRAINER_GRUNT_6, SeafloorCavern_Room1_Text_Grunt6Intro, SeafloorCavern_Room1_Text_Grunt6Defeat + msgbox SeafloorCavern_Room1_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room1_Text_23481A: @ 823481A +SeafloorCavern_Room1_Text_Grunt5Intro: @ 823481A .string "We don't need a kid around!\n" .string "Go on home already!$" -SeafloorCavern_Room1_Text_23484A: @ 823484A +SeafloorCavern_Room1_Text_Grunt5Defeat: @ 823484A .string "I want to go home…$" -SeafloorCavern_Room1_Text_23485D: @ 823485D +SeafloorCavern_Room1_Text_Grunt5PostBattle: @ 823485D .string "I want to get a promotion so I can\n" .string "boss around the GRUNTS…$" -SeafloorCavern_Room1_Text_234898: @ 8234898 +SeafloorCavern_Room1_Text_Grunt6Intro: @ 8234898 .string "That submarine… It's tiny inside.\n" .string "I'm sore all over!$" -SeafloorCavern_Room1_Text_2348CD: @ 82348CD +SeafloorCavern_Room1_Text_Grunt6Defeat: @ 82348CD .string "Losing makes me sore!$" -SeafloorCavern_Room1_Text_2348E3: @ 82348E3 +SeafloorCavern_Room1_Text_Grunt6PostBattle: @ 82348E3 .string "That submarine we jacked, man,\n" .string "it's brutal as a ride.\l" .string "It's way too tight in there!$" diff --git a/data/maps/SeafloorCavern_Room3/map.json b/data/maps/SeafloorCavern_Room3/map.json index 2a33c44cf..3a0d2afb7 100644 --- a/data/maps/SeafloorCavern_Room3/map.json +++ b/data/maps/SeafloorCavern_Room3/map.json @@ -115,7 +115,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "6", - "script": "SeafloorCavern_Room3_EventScript_234938", + "script": "SeafloorCavern_Room3_EventScript_Shelly", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -128,7 +128,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "4", - "script": "SeafloorCavern_Room3_EventScript_23494F", + "script": "SeafloorCavern_Room3_EventScript_Grunt27", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 40913f407..c3cbff28d 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -1,17 +1,17 @@ SeafloorCavern_Room3_MapScripts:: @ 8234937 .byte 0 -SeafloorCavern_Room3_EventScript_234938:: @ 8234938 - trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_234966, SeafloorCavern_Room3_Text_234A79 - msgbox SeafloorCavern_Room3_Text_234A8A, MSGBOX_AUTOCLOSE +SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938 + trainerbattle_single TRAINER_SHELLY_2, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat + msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room3_EventScript_23494F:: @ 823494F - trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_234B3A, SeafloorCavern_Room3_Text_234BFE - msgbox SeafloorCavern_Room3_Text_234C04, MSGBOX_AUTOCLOSE +SeafloorCavern_Room3_EventScript_Grunt27:: @ 823494F + trainerbattle_single TRAINER_GRUNT_27, SeafloorCavern_Room3_Text_Grunt27Intro, SeafloorCavern_Room3_Text_Grunt27Defeat + msgbox SeafloorCavern_Room3_Text_Grunt27PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room3_Text_234966: @ 8234966 +SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966 .string "Ahahahaha!\p" .string "How did you manage to get here without\n" .string "a submarine?\l" @@ -23,11 +23,11 @@ SeafloorCavern_Room3_Text_234966: @ 8234966 .string "I'm going to give you a little taste\n" .string "of pain! Resign yourself to it!$" -SeafloorCavern_Room3_Text_234A79: @ 8234A79 +SeafloorCavern_Room3_Text_ShellyDefeat: @ 8234A79 .string "Ahahahaha!\p" .string "Ouch!$" -SeafloorCavern_Room3_Text_234A8A: @ 8234A8A +SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A .string "Ahahahaha!\n" .string "You're so darn strong.\p" .string "It's terribly disappointing that you're\n" @@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_234A8A: @ 8234A8A .string "world our BOSS has promised as\l" .string "one of us…$" -SeafloorCavern_Room3_Text_234B3A: @ 8234B3A +SeafloorCavern_Room3_Text_Grunt27Intro: @ 8234B3A .string "For our dream to become real, we need\n" .string "the power of POKéMON.\p" .string "But meddlers like you use the power of\n" @@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_234B3A: @ 8234B3A .string "Life just doesn't work the way we\n" .string "need it to!$" -SeafloorCavern_Room3_Text_234BFE: @ 8234BFE +SeafloorCavern_Room3_Text_Grunt27Defeat: @ 8234BFE .string "Gwah!$" -SeafloorCavern_Room3_Text_234C04: @ 8234C04 +SeafloorCavern_Room3_Text_Grunt27PostBattle: @ 8234C04 .string "You know, we don't dare question\n" .string "the motives of our leader.\p" .string "But here you are, just some punk,\n" diff --git a/data/maps/SeafloorCavern_Room4/map.json b/data/maps/SeafloorCavern_Room4/map.json index 0638ab4ed..7bd919eab 100644 --- a/data/maps/SeafloorCavern_Room4/map.json +++ b/data/maps/SeafloorCavern_Room4/map.json @@ -24,7 +24,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room4_EventScript_234C9C", + "script": "SeafloorCavern_Room4_EventScript_Grunt7", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" }, { @@ -37,7 +37,7 @@ "movement_range_y": 1, "trainer_type": "1", "trainer_sight_or_berry_tree_id": "3", - "script": "SeafloorCavern_Room4_EventScript_234CB3", + "script": "SeafloorCavern_Room4_EventScript_Grunt9", "flag": "FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS" } ], diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index 132d24a32..c64748251 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -1,35 +1,35 @@ SeafloorCavern_Room4_MapScripts:: @ 8234C9B .byte 0 -SeafloorCavern_Room4_EventScript_234C9C:: @ 8234C9C - trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_234CCA, SeafloorCavern_Room4_Text_234CF3 - msgbox SeafloorCavern_Room4_Text_234CFC, MSGBOX_AUTOCLOSE +SeafloorCavern_Room4_EventScript_Grunt7:: @ 8234C9C + trainerbattle_single TRAINER_GRUNT_7, SeafloorCavern_Room4_Text_Grunt7Intro, SeafloorCavern_Room4_Text_Grunt7Defeat + msgbox SeafloorCavern_Room4_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room4_EventScript_234CB3:: @ 8234CB3 - trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_234D3A, SeafloorCavern_Room4_Text_234D68 - msgbox SeafloorCavern_Room4_Text_234D79, MSGBOX_AUTOCLOSE +SeafloorCavern_Room4_EventScript_Grunt9:: @ 8234CB3 + trainerbattle_single TRAINER_GRUNT_9, SeafloorCavern_Room4_Text_Grunt9Intro, SeafloorCavern_Room4_Text_Grunt9Defeat + msgbox SeafloorCavern_Room4_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE end -SeafloorCavern_Room4_Text_234CCA: @ 8234CCA +SeafloorCavern_Room4_Text_Grunt7Intro: @ 8234CCA .string "Who are you?\n" .string "Where did you come in from?$" -SeafloorCavern_Room4_Text_234CF3: @ 8234CF3 +SeafloorCavern_Room4_Text_Grunt7Defeat: @ 8234CF3 .string "Lost it…$" -SeafloorCavern_Room4_Text_234CFC: @ 8234CFC +SeafloorCavern_Room4_Text_Grunt7PostBattle: @ 8234CFC .string "I can't find the way out!\p" .string "I'm not afraid. Don't get me wrong!$" -SeafloorCavern_Room4_Text_234D3A: @ 8234D3A +SeafloorCavern_Room4_Text_Grunt9Intro: @ 8234D3A .string "Who are you?\n" .string "Where do you think you're going?$" -SeafloorCavern_Room4_Text_234D68: @ 8234D68 +SeafloorCavern_Room4_Text_Grunt9Defeat: @ 8234D68 .string "I failed to win!$" -SeafloorCavern_Room4_Text_234D79: @ 8234D79 +SeafloorCavern_Room4_Text_Grunt9PostBattle: @ 8234D79 .string "My partner forgot the map in that\n" .string "submarine!\p" .string "How's that for being useless?$" diff --git a/data/maps/SeafloorCavern_Room9/map.json b/data/maps/SeafloorCavern_Room9/map.json index 77dcdc169..9a2ab1d3e 100644 --- a/data/maps/SeafloorCavern_Room9/map.json +++ b/data/maps/SeafloorCavern_Room9/map.json @@ -123,7 +123,7 @@ "elevation": 3, "var": "VAR_SEAFLOOR_CAVERN_STATE", "var_value": "0", - "script": "SeafloorCavern_Room9_EventScript_234DC9" + "script": "SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre" } ], "bg_events": [] diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 026c29700..68db475cd 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -1,38 +1,38 @@ SeafloorCavern_Room9_MapScripts:: @ 8234DC8 .byte 0 -SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 +SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9 lockall - setvar VAR_0x8004, 2 - setvar VAR_0x8005, 3 - setvar VAR_0x8006, 4 - setvar VAR_0x8007, 5 + setvar VAR_0x8004, 2 @ Archie + setvar VAR_0x8005, 3 @ Maxie + setvar VAR_0x8006, 4 @ Magma grunt 1 + setvar VAR_0x8007, 5 @ Magma grunt 2 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C + applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_Delay32 waitmovement 0 playbgm MUS_AQA_0, 0 - msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieHoldItRightThere, MSGBOX_DEFAULT closemessage addobject VAR_0x8004 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieApproachPlayer waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieSoItWasYou, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieBeholdKyogre, MSGBOX_DEFAULT applymovement VAR_0x8004, Common_Movement_FacePlayer waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23512C, MSGBOX_DEFAULT - trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_2351BC - msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieYouMustDisappear, MSGBOX_DEFAULT + trainerbattle_no_intro TRAINER_ARCHIE, SeafloorCavern_Room9_Text_ArchieDefeat + msgbox SeafloorCavern_Room9_Text_ArchieWithThisRedOrb, MSGBOX_DEFAULT setweather WEATHER_NONE doweather special Script_FadeOutMapMusic waitstate - msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_RedOrbShinesByItself, MSGBOX_DEFAULT special WaitWeather waitstate setvar VAR_RESULT, 1 @@ -46,18 +46,18 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_RESULT, 0 playfanfare MUS_ME_TAMA playse SE_TAMA - special sub_80B0534 + special DoOrbEffect applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp waitmovement 0 delay 150 - removeobject 7 - addobject 1 + removeobject 7 @ sleeping Kyogre + addobject 1 @ awakened Kyogre waitstate delay 60 - applymovement 1, SeafloorCavern_Room9_Movement_235040 + applymovement 1, SeafloorCavern_Room9_Movement_KyogreApproach waitmovement 0 - special sub_80B058C + special FadeOutOrbEffect waitstate setvar VAR_0x8004, 1 @ vertical pan setvar VAR_0x8005, 1 @ horizontal pan @@ -65,7 +65,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8007, 5 @ shake delay special ShakeCamera waitstate - applymovement 1, SeafloorCavern_Room9_Movement_23504B + applymovement 1, SeafloorCavern_Room9_Movement_KyogreExit waitmovement 0 removeobject 1 delay 4 @@ -80,44 +80,44 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 setvar VAR_0x8005, 3 setvar VAR_0x8006, 4 setvar VAR_0x8007, 5 - msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo, MSGBOX_DEFAULT playse SE_PC_LOGIN applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieAMessageFromOutside, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_235035 + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieListenMessage waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23532B, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard, MSGBOX_DEFAULT closemessage playse SE_PC_OFF delay 20 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown waitmovement 0 - msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear, MSGBOX_DEFAULT closemessage addobject VAR_0x8005 addobject VAR_0x8006 addobject VAR_0x8007 - applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E + applymovement VAR_0x8007, SeafloorCavern_Room9_Movement_MagmaGruntArrive + applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_MagmaGruntArrive + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieArrive waitmovement 0 applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x8004, Common_Movement_ExclamationMark waitmovement 0 applymovement VAR_0x8004, Common_Movement_Delay48 waitmovement 0 - msgbox SeafloorCavern_Room9_Text_2355C2, MSGBOX_DEFAULT - msgbox SeafloorCavern_Room9_Text_235692, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue, MSGBOX_DEFAULT closemessage - applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_235054 - applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23503A + applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_MaxieExit + applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_ArchieExit waitmovement 0 - msgbox SeafloorCavern_Room9_Text_235723, MSGBOX_DEFAULT + msgbox SeafloorCavern_Room9_Text_MaxieComeOnPlayer, MSGBOX_DEFAULT setvar VAR_ROUTE128_STATE, 1 setvar VAR_SOOTOPOLIS_CITY_STATE, 1 clearflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN @@ -146,7 +146,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 releaseall end -SeafloorCavern_Room9_Movement_23502A: @ 823502A +SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A walk_right walk_right walk_right @@ -156,21 +156,23 @@ SeafloorCavern_Room9_Movement_23502A: @ 823502A walk_right step_end +@ Unused SeafloorCavern_Room9_Movement_235032: @ 8235032 walk_left walk_left step_end -SeafloorCavern_Room9_Movement_235035: @ 8235035 +SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035 walk_left delay_16 step_end +@ Unused SeafloorCavern_Room9_Movement_235038: @ 8235038 walk_right step_end -SeafloorCavern_Room9_Movement_23503A: @ 823503A +SeafloorCavern_Room9_Movement_ArchieExit: @ 823503A face_up lock_facing_direction walk_down @@ -178,7 +180,7 @@ SeafloorCavern_Room9_Movement_23503A: @ 823503A walk_in_place_fastest_right step_end -SeafloorCavern_Room9_Movement_235040: @ 8235040 +SeafloorCavern_Room9_Movement_KyogreApproach: @ 8235040 delay_16 delay_16 walk_slow_down @@ -191,12 +193,12 @@ SeafloorCavern_Room9_Movement_235040: @ 8235040 delay_16 step_end -SeafloorCavern_Room9_Movement_23504B: @ 823504B +SeafloorCavern_Room9_Movement_KyogreExit: @ 823504B slide_up slide_up step_end -SeafloorCavern_Room9_Movement_23504E: @ 823504E +SeafloorCavern_Room9_Movement_MaxieArrive: @ 823504E walk_fast_right walk_fast_right walk_fast_right @@ -204,49 +206,49 @@ SeafloorCavern_Room9_Movement_23504E: @ 823504E walk_fast_right step_end -SeafloorCavern_Room9_Movement_235054: @ 8235054 +SeafloorCavern_Room9_Movement_MaxieExit: @ 8235054 walk_right walk_right step_end -SeafloorCavern_Room9_Movement_235057: @ 8235057 +SeafloorCavern_Room9_Movement_MagmaGruntArrive: @ 8235057 walk_fast_right walk_fast_right walk_fast_right walk_fast_right step_end -SeafloorCavern_Room9_Movement_23505C: @ 823505C +SeafloorCavern_Room9_Movement_Delay32: @ 823505C delay_16 delay_16 step_end -SeafloorCavern_Room9_Text_23505F: @ 823505F +SeafloorCavern_Room9_Text_ArchieHoldItRightThere: @ 823505F .string "ARCHIE: Hold it right there.$" -SeafloorCavern_Room9_Text_23507C: @ 823507C +SeafloorCavern_Room9_Text_ArchieSoItWasYou: @ 823507C .string "ARCHIE: Fufufu…\n" .string "So it was you, after all.$" -SeafloorCavern_Room9_Text_2350A6: @ 82350A6 +SeafloorCavern_Room9_Text_ArchieBeholdKyogre: @ 82350A6 .string "ARCHIE: Behold!\p" .string "See how beautiful it is, the sleeping\n" .string "form of the ancient POKéMON KYOGRE!\p" .string "I have waited so long for this day to\n" .string "come…$" -SeafloorCavern_Room9_Text_23512C: @ 823512C +SeafloorCavern_Room9_Text_ArchieYouMustDisappear: @ 823512C .string "ARCHIE: It surprises me, how you've\n" .string "managed to chase me here.\p" .string "But that's all over now.\p" .string "For the realization of my dream,\n" .string "you must disappear now!$" -SeafloorCavern_Room9_Text_2351BC: @ 82351BC +SeafloorCavern_Room9_Text_ArchieDefeat: @ 82351BC .string "What?!\n" .string "I lost to a mere child like you?!$" -SeafloorCavern_Room9_Text_2351E5: @ 82351E5 +SeafloorCavern_Room9_Text_ArchieWithThisRedOrb: @ 82351E5 .string "ARCHIE: Fufufu…\p" .string "I commend you. I must recognize that\n" .string "you are truly gifted.\p" @@ -254,21 +256,21 @@ SeafloorCavern_Room9_Text_2351E5: @ 82351E5 .string "I have this in my possession!\p" .string "With this RED ORB, I can make KYOGRE…$" -SeafloorCavern_Room9_Text_235279: @ 8235279 +SeafloorCavern_Room9_Text_RedOrbShinesByItself: @ 8235279 .string "The RED ORB suddenly began shining\n" .string "by itself!$" -SeafloorCavern_Room9_Text_2352A7: @ 82352A7 +SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo: @ 82352A7 .string "ARCHIE: What?!\p" .string "I didn't do anything.\n" .string "Why did the RED ORB…\p" .string "Where did KYOGRE go?$" -SeafloorCavern_Room9_Text_2352F6: @ 82352F6 +SeafloorCavern_Room9_Text_ArchieAMessageFromOutside: @ 82352F6 .string "ARCHIE: Hm? It's a message from our\n" .string "members outside…$" -SeafloorCavern_Room9_Text_23532B: @ 823532B +SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard: @ 823532B .string "ARCHIE: Yes, what is it?\p" .string "Hm…\n" .string "It's raining heavily?\p" @@ -284,7 +286,7 @@ SeafloorCavern_Room9_Text_23532B: @ 823532B .string "Hold your position and monitor\n" .string "the situation!$" -SeafloorCavern_Room9_Text_23546F: @ 823546F +SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear: @ 823546F .string "ARCHIE: There's something wrong…\p" .string "The RED ORB is supposed to awaken\n" .string "and control KYOGRE…\p" @@ -292,7 +294,7 @@ SeafloorCavern_Room9_Text_23546F: @ 823546F .string "Why did KYOGRE disappear?\p" .string "Why?!$" -SeafloorCavern_Room9_Text_2354F0: @ 82354F0 +SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought: @ 82354F0 .string "MAXIE: What have you wrought?\p" .string "ARCHIE… You've finally awoken KYOGRE,\n" .string "haven't you?\p" @@ -301,7 +303,7 @@ SeafloorCavern_Room9_Text_2354F0: @ 82354F0 .string "The world's landmass will drown in\n" .string "the deepening sea…$" -SeafloorCavern_Room9_Text_2355C2: @ 82355C2 +SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty: @ 82355C2 .string "ARCHIE: W-what?!\n" .string "Don't get all high and mighty with me!\p" .string "Wasn't it you, TEAM MAGMA, that\n" @@ -310,13 +312,13 @@ SeafloorCavern_Room9_Text_2355C2: @ 82355C2 .string "I should be able to control KYOGRE…\p" .string "I should be able to control it…$" -SeafloorCavern_Room9_Text_235692: @ 8235692 +SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue: @ 8235692 .string "MAXIE: We don't have the time to\n" .string "argue about it here!\p" .string "Get outside and see for yourself!\p" .string "See if what you've wrought is the\n" .string "world that we desired!$" -SeafloorCavern_Room9_Text_235723: @ 8235723 +SeafloorCavern_Room9_Text_MaxieComeOnPlayer: @ 8235723 .string "MAXIE: {PLAYER}, come on, you have\n" .string "to get out of here, too!$" diff --git a/data/specials.inc b/data/specials.inc index 939284c74..5017c3dc3 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -292,8 +292,8 @@ gSpecials:: @ 81DBA64 def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord def_special ShouldDoBrailleRegirockEffectOld - def_special sub_80B0534 - def_special sub_80B058C + def_special DoOrbEffect + def_special FadeOutOrbEffect def_special WaitWeather def_special BufferEReaderTrainerName def_special GetSlotMachineId @@ -527,7 +527,7 @@ gSpecials:: @ 81DBA64 def_special GetBattlePyramidHint def_special sub_80F8B94 def_special ShowTrainerHillRecords - def_special sub_80B4808 + def_special PlayerFaceTrainerAfterBattle def_special ResetHealLocationFromDewford def_special IsLastMonThatKnowsSurf def_special CountPartyAliveNonEggMons diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index af594611e..42f077dc3 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -37,8 +37,8 @@ void AnimateFlash(u8 flashLevel); void WriteBattlePyramidViewScanlineEffectBuffer(void); void sub_80B0244(void); void sub_80B0268(void); -void sub_80B0534(void); -void sub_80B058C(void); +void DoOrbEffect(void); +void FadeOutOrbEffect(void); void sub_80B05B4(void); void WriteFlashScanlineEffectBuffer(u8 flashLevel); bool8 walkrun_is_standing_still(void); diff --git a/include/script.h b/include/script.h index cfe493479..3f92964ac 100644 --- a/include/script.h +++ b/include/script.h @@ -62,6 +62,6 @@ u8 *GetSavedRamScriptIfValid(void); void InitRamScript_NoEventObject(u8 *script, u16 scriptSize); // srccmd.h -void sub_809BE48(u16 npcId); +void SetMovingNpcId(u16 npcId); #endif // GUARD_SCRIPT_H diff --git a/include/trainer_see.h b/include/trainer_see.h index a9b92d71b..daf9d0298 100644 --- a/include/trainer_see.h +++ b/include/trainer_see.h @@ -9,11 +9,11 @@ struct ApproachingTrainer u8 taskId; }; -extern u16 gUnknown_03006080; -extern u8 gUnknown_03006084[4]; +extern u16 gWhichTrainerToFaceAfterBattle; +extern u8 gPostBattleMovementScript[4]; extern struct ApproachingTrainer gApproachingTrainers[2]; extern u8 gNoOfApproachingTrainers; -extern u8 gUnknown_030060AC; +extern bool8 gTrainerApproachedPlayer; extern u8 gApproachingTrainerId; bool8 CheckForTrainersWantingBattle(void); @@ -25,6 +25,6 @@ u8 FldEff_QuestionMarkIcon(void); u8 FldEff_HeartIcon(void); u8 GetCurrentApproachingTrainerEventObjectId(void); u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId); -void sub_80B4808(void); +void PlayerFaceTrainerAfterBattle(void); #endif // GUARD_TRAINER_SEE_H diff --git a/src/battle_setup.c b/src/battle_setup.c index f166c7375..a978cc24d 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1288,7 +1288,7 @@ void BattleSetup_StartTrainerBattle(void) sNoOfPossibleTrainerRetScripts = gNoOfApproachingTrainers; gNoOfApproachingTrainers = 0; sShouldCheckTrainerBScript = FALSE; - gUnknown_03006080 = 0; + gWhichTrainerToFaceAfterBattle = 0; gMain.savedCallback = CB2_EndTrainerBattle; if (InBattlePyramid() || InTrainerHillChallenge()) @@ -1391,7 +1391,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void) sShouldCheckTrainerBScript = FALSE; if (sTrainerBBattleScriptRetAddr != NULL) { - gUnknown_03006080 = 1; + gWhichTrainerToFaceAfterBattle = 1; return sTrainerBBattleScriptRetAddr; } } @@ -1399,7 +1399,7 @@ const u8 *BattleSetup_GetTrainerPostBattleScript(void) { if (sTrainerABattleScriptRetAddr != NULL) { - gUnknown_03006080 = 0; + gWhichTrainerToFaceAfterBattle = 0; return sTrainerABattleScriptRetAddr; } } diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index e05950be0..1edb775ba 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -34,7 +34,7 @@ #include "event_obj_lock.h" #include "fldeff.h" -extern const u16 gUnknown_82EC7CC[]; +extern const u16 gOrbEffectBackgroundLayerFlags[]; // This file's functions. static void sub_8080B9C(u8); @@ -800,7 +800,7 @@ static void SetFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 c } } -static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) +static void SetOrbFlashScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s32 right) { if (y <= 160) { @@ -816,17 +816,17 @@ static void SetFlash2ScanlineEffectWindowBoundary(u16 *dest, u32 y, s32 left, s3 } } -static void SetFlash2ScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) +static void SetOrbFlashScanlineEffectWindowBoundaries(u16 *dest, s32 centerX, s32 centerY, s32 radius) { s32 r = radius; s32 v2 = radius; s32 v3 = 0; while (r >= v3) { - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); - SetFlash2ScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); + SetOrbFlashScanlineEffectWindowBoundary(dest, centerY - v3, centerX - r, centerX + r); + SetOrbFlashScanlineEffectWindowBoundary(dest, centerY + v3, centerX - r, centerX + r); + SetOrbFlashScanlineEffectWindowBoundary(dest, centerY - r, centerX - v3, centerX + v3); + SetOrbFlashScanlineEffectWindowBoundary(dest, centerY + r, centerX - v3, centerX + v3); v2 -= (v3 * 2) - 1; v3++; if (v2 < 0) @@ -878,18 +878,18 @@ static void UpdateFlashLevelEffect(u8 taskId) } } -static void UpdateFlash2LevelEffect(u8 taskId) +static void UpdateOrbFlashEffect(u8 taskId) { s16 *data = gTasks[taskId].data; switch (data[0]) { case 0: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); data[0] = 1; break; case 1: - SetFlash2ScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); + SetOrbFlashScanlineEffectWindowBoundaries(gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer], tFlashCenterX, tFlashCenterY, tCurFlashRadius); data[0] = 0; tCurFlashRadius += tFlashRadiusDelta; if (tCurFlashRadius > tDestFlashRadius) @@ -948,7 +948,7 @@ static u8 sub_80AFFDC(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 dest static u8 sub_80B003C(s32 centerX, s32 centerY, s32 initialFlashRadius, s32 destFlashRadius, s32 clearScanlineEffect, u8 delta) { - u8 taskId = CreateTask(UpdateFlash2LevelEffect, 80); + u8 taskId = CreateTask(UpdateOrbFlashEffect, 80); s16 *data = gTasks[taskId].data; tCurFlashRadius = initialFlashRadius; @@ -1063,12 +1063,12 @@ void sub_80B0268(void) CreateTask(sub_80B01BC, 10); } -static void sub_80B028C(u8 a1) +static void LoadOrbEffectPalette(bool8 blueOrb) { int i; u16 color[1]; - if (!a1) + if (!blueOrb) color[0] = RGB_RED; else color[0] = RGB_BLUE; @@ -1079,12 +1079,12 @@ static void sub_80B028C(u8 a1) } } -static bool8 sub_80B02C8(u16 a1) +static bool8 sub_80B02C8(u16 shakeDir) { u8 lo = REG_BLDALPHA & 0xFF; u8 hi = REG_BLDALPHA >> 8; - if (a1) + if (shakeDir != 0) { if (lo) { @@ -1107,58 +1107,69 @@ static bool8 sub_80B02C8(u16 a1) return FALSE; } -static void sub_80B0318(u8 taskId) +#define tState data[0] +#define tBlueOrb data[1] +#define tCenterX data[2] +#define tCenterY data[3] +#define tShakeDelay data[4] +#define tShakeDir data[5] +#define tDispCnt data[6] +#define tBldCnt data[7] +#define tBldAlpha data[8] +#define tWinIn data[9] +#define tWinOut data[10] + +static void Task_OrbEffect(u8 taskId) { s16 *data = gTasks[taskId].data; - switch (data[0]) + switch (tState) { case 0: - data[6] = REG_DISPCNT; - data[7] = REG_BLDCNT; - data[8] = REG_BLDALPHA; - data[9] = REG_WININ; - data[10] = REG_WINOUT; + tDispCnt = REG_DISPCNT; + tBldCnt = REG_BLDCNT; + tBldAlpha = REG_BLDALPHA; + tWinIn = REG_WININ; + tWinOut = REG_WINOUT; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); - SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); + SetGpuRegBits(REG_OFFSET_BLDCNT, gOrbEffectBackgroundLayerFlags[0]); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7)); SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ); SetBgTilemapPalette(0, 0, 0, 0x1E, 0x14, 0xF); schedule_bg_copy_tilemap_to_vram(0); - SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); + SetOrbFlashScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], tCenterX, tCenterY, 1); CpuFastSet(&gScanlineEffectRegBuffers[0], &gScanlineEffectRegBuffers[1], 480); ScanlineEffect_SetParams(sFlashEffectParams); - data[0] = 1; + tState = 1; break; case 1: sub_8199DF0(0, PIXEL_FILL(1), 0, 1); - sub_80B028C(data[1]); - sub_80B003C(data[2], data[3], 1, 160, 1, 2); - data[0] = 2; + LoadOrbEffectPalette(tBlueOrb); + sub_80B003C(tCenterX, tCenterY, 1, 160, 1, 2); + tState = 2; break; case 2: - if (!FuncIsActiveTask(UpdateFlash2LevelEffect)) + if (!FuncIsActiveTask(UpdateOrbFlashEffect)) { EnableBothScriptContexts(); - data[0] = 3; + tState = 3; } break; case 3: InstallCameraPanAheadCallback(); SetCameraPanningCallback(NULL); - data[5] = 0; - data[4] = 4; - data[0] = 4; + tShakeDir = 0; + tShakeDelay = 4; + tState = 4; break; case 4: - data[4]--; - if (!data[4]) + if (--tShakeDelay == 0) { s32 panning; - data[4] = 4; - data[5] ^= 1; - if (data[5]) + tShakeDelay = 4; + tShakeDir ^= 1; + if (tShakeDir) panning = 4; else panning = -4; @@ -1167,70 +1178,81 @@ static void sub_80B0318(u8 taskId) break; case 6: InstallCameraPanAheadCallback(); - data[4] = 8; - data[0] = 7; + tShakeDelay = 8; + tState = 7; break; case 7: - data[4]--; - if (!data[4]) + if (--tShakeDelay == 0) { - data[4] = 8; - data[5] ^= 1; - if (sub_80B02C8(data[5]) == TRUE) + tShakeDelay = 8; + tShakeDir ^= 1; + if (sub_80B02C8(tShakeDir) == TRUE) { - data[0] = 5; + tState = 5; sub_8199DF0(0, PIXEL_FILL(0), 0, 1); } } break; case 5: SetGpuReg(REG_OFFSET_WIN0H, 255); - SetGpuReg(REG_OFFSET_DISPCNT, data[6]); - SetGpuReg(REG_OFFSET_BLDCNT, data[7]); - SetGpuReg(REG_OFFSET_BLDALPHA, data[8]); - SetGpuReg(REG_OFFSET_WININ, data[9]); - SetGpuReg(REG_OFFSET_WINOUT, data[10]); + SetGpuReg(REG_OFFSET_DISPCNT, tDispCnt); + SetGpuReg(REG_OFFSET_BLDCNT, tBldCnt); + SetGpuReg(REG_OFFSET_BLDALPHA, tBldAlpha); + SetGpuReg(REG_OFFSET_WININ, tWinIn); + SetGpuReg(REG_OFFSET_WINOUT, tWinOut); EnableBothScriptContexts(); DestroyTask(taskId); break; } } -void sub_80B0534(void) +void DoOrbEffect(void) { - u8 taskId = CreateTask(sub_80B0318, 80); + u8 taskId = CreateTask(Task_OrbEffect, 80); s16 *data = gTasks[taskId].data; if (gSpecialVar_Result == 0) { - data[1] = 0; - data[2] = 104; + tBlueOrb = FALSE; + tCenterX = 104; } else if (gSpecialVar_Result == 1) { - data[1] = 1; - data[2] = 136; + tBlueOrb = TRUE; + tCenterX = 136; } else if (gSpecialVar_Result == 2) { - data[1] = 0; - data[2] = 120; + tBlueOrb = FALSE; + tCenterX = 120; } else { - data[1] = 1; - data[2] = 120; + tBlueOrb = TRUE; + tCenterX = 120; } - data[3] = 80; + tCenterY = 80; } -void sub_80B058C(void) +void FadeOutOrbEffect(void) { - u8 taskId = FindTaskIdByFunc(sub_80B0318); - gTasks[taskId].data[0] = 6; + u8 taskId = FindTaskIdByFunc(Task_OrbEffect); + gTasks[taskId].tState = 6; } +#undef tState +#undef tBlueOrb +#undef tCenterX +#undef tCenterY +#undef tShakeDelay +#undef tShakeDir +#undef tDispCnt +#undef tBldCnt +#undef tBldAlpha +#undef tWinIn +#undef tWinOut + void Script_FadeOutMapMusic(void) { Overworld_FadeOutMapMusic(); diff --git a/src/scrcmd.c b/src/scrcmd.c index ef18fcaf0..610547dd8 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -2280,7 +2280,7 @@ bool8 ScrCmd_buffertrainername(struct ScriptContext *ctx) return FALSE; } -void sub_809BE48(u16 npcId) +void SetMovingNpcId(u16 npcId) { sMovingNpcId = npcId; } diff --git a/src/trainer_see.c b/src/trainer_see.c index 22b256a99..72e903728 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -14,6 +14,7 @@ #include "util.h" #include "battle_pyramid.h" #include "constants/battle_setup.h" +#include "constants/event_objects.h" #include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" @@ -47,11 +48,11 @@ static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventO static void SpriteCB_TrainerIcons(struct Sprite *sprite); // IWRAM common -u16 gUnknown_03006080; -u8 gUnknown_03006084[4]; +u16 gWhichTrainerToFaceAfterBattle; +u8 gPostBattleMovementScript[4]; struct ApproachingTrainer gApproachingTrainers[2]; u8 gNoOfApproachingTrainers; -u8 gUnknown_030060AC; +bool8 gTrainerApproachedPlayer; // EWRAM EWRAM_DATA u8 gApproachingTrainerId = 0; @@ -205,7 +206,7 @@ bool8 CheckForTrainersWantingBattle(void) ResetTrainerOpponentIds(); ConfigureAndSetUpOneTrainerBattle(gApproachingTrainers[gNoOfApproachingTrainers - 1].eventObjectId, gApproachingTrainers[gNoOfApproachingTrainers - 1].trainerScriptPtr); - gUnknown_030060AC = 1; + gTrainerApproachedPlayer = TRUE; return TRUE; } else if (gNoOfApproachingTrainers == 2) @@ -218,12 +219,12 @@ bool8 CheckForTrainersWantingBattle(void) } SetUpTwoTrainersBattle(); gApproachingTrainerId = 0; - gUnknown_030060AC = 1; + gTrainerApproachedPlayer = TRUE; return TRUE; } else { - gUnknown_030060AC = 0; + gTrainerApproachedPlayer = FALSE; return FALSE; } } @@ -764,24 +765,24 @@ u8 GetChosenApproachingTrainerEventObjectId(u8 arrayId) return gApproachingTrainers[1].eventObjectId; } -void sub_80B4808(void) +void PlayerFaceTrainerAfterBattle(void) { - struct EventObject *trainerObj; + struct EventObject *eventObj; - if (gUnknown_030060AC == 1) + if (gTrainerApproachedPlayer == TRUE) { - trainerObj = &gEventObjects[gApproachingTrainers[gUnknown_03006080].eventObjectId]; - gUnknown_03006084[0] = GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)); - gUnknown_03006084[1] = 0xFE; - ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); + eventObj = &gEventObjects[gApproachingTrainers[gWhichTrainerToFaceAfterBattle].eventObjectId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(GetOppositeDirection(eventObj->facingDirection)); + gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; + ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } else { - trainerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; - gUnknown_03006084[0] = GetFaceDirectionMovementAction(trainerObj->facingDirection); - gUnknown_03006084[1] = 0xFE; - ScriptMovement_StartObjectMovementScript(0xFF, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gUnknown_03006084); + eventObj = &gEventObjects[gPlayerAvatar.eventObjectId]; + gPostBattleMovementScript[0] = GetFaceDirectionMovementAction(eventObj->facingDirection); + gPostBattleMovementScript[1] = MOVEMENT_ACTION_STEP_END; + ScriptMovement_StartObjectMovementScript(EVENT_OBJ_ID_PLAYER, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, gPostBattleMovementScript); } - sub_809BE48(0xFF); + SetMovingNpcId(EVENT_OBJ_ID_PLAYER); } |