From f901d5da7689437d0691bfd4f8066aea6f2b3b1c Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Fri, 30 Sep 2022 05:45:30 +0000 Subject: [PATCH] Merge pull request #559 from GriffinRichards/doc-diploma --- pokefirered.sym | 32 ++++++++++++++++---------------- pokefirered_rev1.sym | 32 ++++++++++++++++---------------- pokeleafgreen.sym | 32 ++++++++++++++++---------------- pokeleafgreen_rev1.sym | 32 ++++++++++++++++---------------- 4 files changed, 64 insertions(+), 64 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index f8c968f4f..850e3c310 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -417,7 +417,7 @@ 0203ab3c l 00000004 sHofGfxPtr 0203ab40 l 00000004 sCreditsMgr 0203ab44 g 00000001 gHasHallOfFameRecords -0203ab48 l 00000004 gDiploma +0203ab48 l 00000004 sDiploma 0203ab4c l 00000002 sSaveType 0203ab4e l 00000002 unused_203AB4E 0203ab50 l 00000001 sSaveFailedScreenState @@ -9521,14 +9521,14 @@ 080f48d0 l 00000060 DestroyPlayerOrRivalSprite 080f4930 l 000002cc LoadPlayerOrRivalSprite 080f4bfc l 00000000 .gcc2_compiled. -080f4bfc l 00000012 VCBC_DiplomaOam +080f4bfc l 00000012 VBlankCB_Diploma 080f4c10 g 00000040 CB2_ShowDiploma 080f4c50 l 00000016 CB2_Diploma 080f4c68 l 0000010c Task_DiplomaInit -080f4d74 l 0000006a Task_WaitForExit -080f4de0 l 00000044 Task_DiplomaReturnToOverworld -080f4e24 l 0000001a DiplomaBgInit -080f4e40 l 0000015c DiplomaVblankHandler +080f4d74 l 0000006a Task_HandleDiplomaInput +080f4de0 l 00000044 Task_DiplomaExit +080f4e24 l 0000001a DiplomaReset +080f4e40 l 0000015c DiplomaInitScreen 080f4f9c l 0000007c DiplomaLoadGfx 080f5018 l 000000dc DiplomaPrintText 080f50f4 g 0000000c SetNotInSaveFailedScreen @@ -37504,16 +37504,16 @@ 084147c0 l 00000d28 sDiplomaGfx 084154e8 l 0000046c sDiplomaTilemap 08415954 l 00000040 sDiplomaPal -08415994 l 00000009 gUnknown_8415994 -0841599d l 00000006 gUnknown_841599D -084159a3 l 00000008 gUnknown_84159A3 -084159ab l 00000008 gUnknown_84159AB -084159b3 l 0000003a gUnknown_84159B3 -084159ed l 0000000e gUnknown_84159ED -084159fb l 00000007 gUnknown_84159FB -08415a04 l 00000003 gUnknown_8415A04 -08415a08 l 00000008 gUnknown_8415A08 -08415a10 l 00000010 gUnknown_8415A10 +08415994 l 00000009 sText_Player +0841599d l 00000006 sText_Sama +084159a3 l 00000008 sText_Hoenn +084159ab l 00000008 sText_National +084159b3 l 0000003a sText_CertifiesPokedexComplete +084159ed l 0000000e sText_GameFreak +084159fb l 00000007 sText_Empty +08415a04 l 00000003 sTextColors +08415a08 l 00000008 sBgTemplates +08415a10 l 00000010 sWindowTemplates 08415a20 g 00000001 gExpandedPlaceholder_Empty 08415a21 g 00000001 gExpandedPlaceholder_Kun 08415a22 g 00000001 gExpandedPlaceholder_Chan diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index dd47a8768..c4261a6f5 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -417,7 +417,7 @@ 0203ab3c l 00000004 sHofGfxPtr 0203ab40 l 00000004 sCreditsMgr 0203ab44 g 00000001 gHasHallOfFameRecords -0203ab48 l 00000004 gDiploma +0203ab48 l 00000004 sDiploma 0203ab4c l 00000002 sSaveType 0203ab4e l 00000002 unused_203AB4E 0203ab50 l 00000001 sSaveFailedScreenState @@ -9522,14 +9522,14 @@ 080f4948 l 00000060 DestroyPlayerOrRivalSprite 080f49a8 l 000002cc LoadPlayerOrRivalSprite 080f4c74 l 00000000 .gcc2_compiled. -080f4c74 l 00000012 VCBC_DiplomaOam +080f4c74 l 00000012 VBlankCB_Diploma 080f4c88 g 00000040 CB2_ShowDiploma 080f4cc8 l 00000016 CB2_Diploma 080f4ce0 l 0000010c Task_DiplomaInit -080f4dec l 0000006a Task_WaitForExit -080f4e58 l 00000044 Task_DiplomaReturnToOverworld -080f4e9c l 0000001a DiplomaBgInit -080f4eb8 l 0000015c DiplomaVblankHandler +080f4dec l 0000006a Task_HandleDiplomaInput +080f4e58 l 00000044 Task_DiplomaExit +080f4e9c l 0000001a DiplomaReset +080f4eb8 l 0000015c DiplomaInitScreen 080f5014 l 0000007c DiplomaLoadGfx 080f5090 l 000000dc DiplomaPrintText 080f516c g 0000000c SetNotInSaveFailedScreen @@ -37505,16 +37505,16 @@ 08414830 l 00000d28 sDiplomaGfx 08415558 l 0000046c sDiplomaTilemap 084159c4 l 00000040 sDiplomaPal -08415a04 l 00000009 gUnknown_8415994 -08415a0d l 00000006 gUnknown_841599D -08415a13 l 00000008 gUnknown_84159A3 -08415a1b l 00000008 gUnknown_84159AB -08415a23 l 0000003a gUnknown_84159B3 -08415a5d l 0000000e gUnknown_84159ED -08415a6b l 00000007 gUnknown_84159FB -08415a74 l 00000003 gUnknown_8415A04 -08415a78 l 00000008 gUnknown_8415A08 -08415a80 l 00000010 gUnknown_8415A10 +08415a04 l 00000009 sText_Player +08415a0d l 00000006 sText_Sama +08415a13 l 00000008 sText_Hoenn +08415a1b l 00000008 sText_National +08415a23 l 0000003a sText_CertifiesPokedexComplete +08415a5d l 0000000e sText_GameFreak +08415a6b l 00000007 sText_Empty +08415a74 l 00000003 sTextColors +08415a78 l 00000008 sBgTemplates +08415a80 l 00000010 sWindowTemplates 08415a90 g 00000001 gExpandedPlaceholder_Empty 08415a91 g 00000001 gExpandedPlaceholder_Kun 08415a92 g 00000001 gExpandedPlaceholder_Chan diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index ebad07428..5d922d59e 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -417,7 +417,7 @@ 0203ab3c l 00000004 sHofGfxPtr 0203ab40 l 00000004 sCreditsMgr 0203ab44 g 00000001 gHasHallOfFameRecords -0203ab48 l 00000004 gDiploma +0203ab48 l 00000004 sDiploma 0203ab4c l 00000002 sSaveType 0203ab4e l 00000002 unused_203AB4E 0203ab50 l 00000001 sSaveFailedScreenState @@ -9523,14 +9523,14 @@ 080f48a8 l 00000060 DestroyPlayerOrRivalSprite 080f4908 l 000002cc LoadPlayerOrRivalSprite 080f4bd4 l 00000000 .gcc2_compiled. -080f4bd4 l 00000012 VCBC_DiplomaOam +080f4bd4 l 00000012 VBlankCB_Diploma 080f4be8 g 00000040 CB2_ShowDiploma 080f4c28 l 00000016 CB2_Diploma 080f4c40 l 0000010c Task_DiplomaInit -080f4d4c l 0000006a Task_WaitForExit -080f4db8 l 00000044 Task_DiplomaReturnToOverworld -080f4dfc l 0000001a DiplomaBgInit -080f4e18 l 0000015c DiplomaVblankHandler +080f4d4c l 0000006a Task_HandleDiplomaInput +080f4db8 l 00000044 Task_DiplomaExit +080f4dfc l 0000001a DiplomaReset +080f4e18 l 0000015c DiplomaInitScreen 080f4f74 l 0000007c DiplomaLoadGfx 080f4ff0 l 000000dc DiplomaPrintText 080f50cc g 0000000c SetNotInSaveFailedScreen @@ -37506,16 +37506,16 @@ 084145fc l 00000d28 sDiplomaGfx 08415324 l 0000046c sDiplomaTilemap 08415790 l 00000040 sDiplomaPal -084157d0 l 00000009 gUnknown_8415994 -084157d9 l 00000006 gUnknown_841599D -084157df l 00000008 gUnknown_84159A3 -084157e7 l 00000008 gUnknown_84159AB -084157ef l 0000003a gUnknown_84159B3 -08415829 l 0000000e gUnknown_84159ED -08415837 l 00000007 gUnknown_84159FB -08415840 l 00000003 gUnknown_8415A04 -08415844 l 00000008 gUnknown_8415A08 -0841584c l 00000010 gUnknown_8415A10 +084157d0 l 00000009 sText_Player +084157d9 l 00000006 sText_Sama +084157df l 00000008 sText_Hoenn +084157e7 l 00000008 sText_National +084157ef l 0000003a sText_CertifiesPokedexComplete +08415829 l 0000000e sText_GameFreak +08415837 l 00000007 sText_Empty +08415840 l 00000003 sTextColors +08415844 l 00000008 sBgTemplates +0841584c l 00000010 sWindowTemplates 0841585c g 00000001 gExpandedPlaceholder_Empty 0841585d g 00000001 gExpandedPlaceholder_Kun 0841585e g 00000001 gExpandedPlaceholder_Chan diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index fede1bb9b..f50ac3ac8 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -417,7 +417,7 @@ 0203ab3c l 00000004 sHofGfxPtr 0203ab40 l 00000004 sCreditsMgr 0203ab44 g 00000001 gHasHallOfFameRecords -0203ab48 l 00000004 gDiploma +0203ab48 l 00000004 sDiploma 0203ab4c l 00000002 sSaveType 0203ab4e l 00000002 unused_203AB4E 0203ab50 l 00000001 sSaveFailedScreenState @@ -9524,14 +9524,14 @@ 080f4920 l 00000060 DestroyPlayerOrRivalSprite 080f4980 l 000002cc LoadPlayerOrRivalSprite 080f4c4c l 00000000 .gcc2_compiled. -080f4c4c l 00000012 VCBC_DiplomaOam +080f4c4c l 00000012 VBlankCB_Diploma 080f4c60 g 00000040 CB2_ShowDiploma 080f4ca0 l 00000016 CB2_Diploma 080f4cb8 l 0000010c Task_DiplomaInit -080f4dc4 l 0000006a Task_WaitForExit -080f4e30 l 00000044 Task_DiplomaReturnToOverworld -080f4e74 l 0000001a DiplomaBgInit -080f4e90 l 0000015c DiplomaVblankHandler +080f4dc4 l 0000006a Task_HandleDiplomaInput +080f4e30 l 00000044 Task_DiplomaExit +080f4e74 l 0000001a DiplomaReset +080f4e90 l 0000015c DiplomaInitScreen 080f4fec l 0000007c DiplomaLoadGfx 080f5068 l 000000dc DiplomaPrintText 080f5144 g 0000000c SetNotInSaveFailedScreen @@ -37507,16 +37507,16 @@ 0841466c l 00000d28 sDiplomaGfx 08415394 l 0000046c sDiplomaTilemap 08415800 l 00000040 sDiplomaPal -08415840 l 00000009 gUnknown_8415994 -08415849 l 00000006 gUnknown_841599D -0841584f l 00000008 gUnknown_84159A3 -08415857 l 00000008 gUnknown_84159AB -0841585f l 0000003a gUnknown_84159B3 -08415899 l 0000000e gUnknown_84159ED -084158a7 l 00000007 gUnknown_84159FB -084158b0 l 00000003 gUnknown_8415A04 -084158b4 l 00000008 gUnknown_8415A08 -084158bc l 00000010 gUnknown_8415A10 +08415840 l 00000009 sText_Player +08415849 l 00000006 sText_Sama +0841584f l 00000008 sText_Hoenn +08415857 l 00000008 sText_National +0841585f l 0000003a sText_CertifiesPokedexComplete +08415899 l 0000000e sText_GameFreak +084158a7 l 00000007 sText_Empty +084158b0 l 00000003 sTextColors +084158b4 l 00000008 sBgTemplates +084158bc l 00000010 sWindowTemplates 084158cc g 00000001 gExpandedPlaceholder_Empty 084158cd g 00000001 gExpandedPlaceholder_Kun 084158ce g 00000001 gExpandedPlaceholder_Chan