From 321d07f02bc24b475f79f9ad3fc7c9347169ba64 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 28 Feb 2023 16:52:55 +0000 Subject: [PATCH] Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful --- pokeemerald.sym | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index fb484cb09e..88a628a16e 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -3067,7 +3067,7 @@ 08045868 g 0000004c ClearFuryCutterDestinyBondGrudge 080458b4 g 0000002c HandleAction_RunBattleScript 080458e0 g 00000364 GetMoveTarget -08045c44 l 00000078 IsMonEventLegal +08045c44 l 00000078 IsBattlerModernFatefulEncounter 08045cbc g 00000340 IsMonDisobedient 08045ffc l 00000000 .gcc2_compiled. 08045ffc l 000003b0 Cmd_attackcanceler @@ -3747,13 +3747,13 @@ 08068528 g 0000010c CreateApprenticeMon 08068634 g 000000c6 CreateMonWithEVSpreadNatureOTID 080686fc g 000001ac ConvertPokemonToBattleTowerPokemon -080688a8 g 0000004e CreateEventLegalMon +080688a8 l 0000004e CreateEventMon 080688f8 g 00000118 ShouldIgnoreDeoxysForm 08068a10 l 00000094 GetDeoxysStat 08068aa4 g 000000a4 SetDeoxysStats 08068b48 g 00000068 GetUnionRoomTrainerPic 08068bb0 g 00000068 GetUnionRoomTrainerClass -08068c18 g 00000060 CreateEventLegalEnemyMon +08068c18 g 00000060 CreateEnemyEventMon 08068c78 l 00000092 CalculateBoxMonChecksum 08068d0c g 000002f8 CalculateMonStats 08069004 g 00000050 BoxMonToMon @@ -6159,8 +6159,8 @@ 0809bbdc g 0000000c ScrCmd_freerotatingtilepuzzle 0809bbe8 g 00000014 ScrCmd_selectapproachingtrainer 0809bbfc g 00000048 ScrCmd_lockfortrainer -0809bc44 g 00000038 ScrCmd_setmoneventlegal -0809bc7c g 00000038 ScrCmd_checkmoneventlegal +0809bc44 g 00000038 ScrCmd_setmonmodernfatefulencounter +0809bc7c g 00000038 ScrCmd_checkmonmodernfatefulencounter 0809bcb4 g 00000028 ScrCmd_trywondercardscript 0809bcdc g 00000092 ScrCmd_warpspinenter 0809bd70 g 00000044 ScrCmd_setmonmetlocation