diff --git a/pokefirered.sym b/pokefirered.sym index f3342fb07..f26e9d158 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -10314,7 +10314,7 @@ 0810bdac g 00000198 CreatePicSprite 0810bf44 g 00000060 CreatePicSprite_HandleDeoxys 0810bfa4 g 000000ac FreeAndDestroyPicSpriteInternal -0810c050 g 00000070 sub_810C050 +0810c050 l 00000070 LoadPicSpriteInWindow 0810c0c0 g 000000ac CreateTrainerCardSprite 0810c16c g 00000060 CreateMonPicSprite 0810c1cc g 00000048 CreateMonPicSprite_HandleDeoxys @@ -10323,7 +10323,7 @@ 0810c25c g 00000048 CreateTrainerCardMonIconSprite 0810c2a4 g 00000044 CreateTrainerPicSprite 0810c2e8 g 00000012 FreeAndDestroyTrainerPicSprite -0810c2fc g 00000034 sub_810C2FC +0810c2fc g 00000034 LoadTrainerPicInWindow 0810c330 g 00000044 CreateTrainerCardTrainerPicSprite 0810c374 g 00000030 PlayerGenderToFrontTrainerPicId_Debug 0810c3a4 g 00000014 VsSeekerFreezeObjectsAfterChargeComplete @@ -26689,17 +26689,17 @@ 0823eac8 g 00007418 gTrainers 08245ee0 g 000011b4 gSpeciesNames 08247094 g 00001207 gMoveNames -0824829c l 00000002 gUnknown_824829C -082482a0 l 00000008 gOamData_82482A0 -082482a8 l 00000008 gOamData_82482A8 -082482b0 l 00000010 gUnknown_82482B0 -082482c0 l 00000020 gUnknown_82482C0 -082482e0 l 00000008 gAffineAnimTable_82482E0 +0824829c l 00000002 sUnused +082482a0 l 00000008 sVsLetter_V_OamData +082482a8 l 00000008 sVsLetter_S_OamData +082482b0 l 00000010 sVsLetterAffineAnimCmds0 +082482c0 l 00000020 sVsLetterAffineAnimCmds1 +082482e0 l 00000008 sVsLetterAffineAnimTable 082482e8 l 00000018 sVsLetter_V_SpriteTemplate 08248300 l 00000018 sVsLetter_S_SpriteTemplate 08248318 l 00000008 sVsLettersSpriteSheet 08248320 g 00000010 gBattleBgTemplates -08248330 l 000000d0 gUnknown_8248330 +08248330 l 000000d0 sStandardBattleWindowTemplates 08248400 l 0000004c sBattleTerrainPalette_Grass 0824844c l 0000055c sBattleTerrainTiles_Grass 082489a8 l 000002c0 sBattleTerrainTilemap_Grass @@ -40213,8 +40213,8 @@ 084530e4 l 00000020 sDefaultBagWindowsDeposit 08453104 l 00000070 sWindowTemplates 08453174 l 00000003 sUnused -08453178 l 0000000c gUnknown_8453178 -08453184 l 00000008 gUnknown_8453184 +08453178 l 0000000c sDummyPicData +08453184 l 00000008 sOamData_Normal 0845318c l 00000dd0 sVsSeekerData 08453f5c l 00000004 sMovementScript_Wait48 08453f60 l 00000002 sMovementScript_TrainerUnfought @@ -42577,17 +42577,17 @@ 084a30e4 l 00000000 KeySplitTable3 084a3138 l 00000000 KeySplitTable4 084a3180 l 00000000 KeySplitTable5 -084a31ec g 00000000 gProgrammableWaveData_84A31EC -084a31fc g 00000000 gProgrammableWaveData_84A31FC -084a320c g 00000000 gProgrammableWaveData_84A320C -084a321c g 00000000 gProgrammableWaveData_84A321C -084a322c g 00000000 gProgrammableWaveData_84A322C -084a323c g 00000000 gProgrammableWaveData_84A323C -084a324c g 00000000 gProgrammableWaveData_84A324C -084a325c g 00000000 gProgrammableWaveData_84A325C -084a326c g 00000000 gProgrammableWaveData_84A326C -084a327c g 00000000 gProgrammableWaveData_84A327C -084a328c g 00000000 gProgrammableWaveData_84A328C +084a31ec g 00000000 ProgrammableWaveData_1 +084a31fc g 00000000 ProgrammableWaveData_2 +084a320c g 00000000 ProgrammableWaveData_3 +084a321c g 00000000 ProgrammableWaveData_4 +084a322c g 00000000 ProgrammableWaveData_5 +084a323c g 00000000 ProgrammableWaveData_6 +084a324c g 00000000 ProgrammableWaveData_7 +084a325c g 00000000 ProgrammableWaveData_8 +084a326c g 00000000 ProgrammableWaveData_9 +084a327c g 00000000 ProgrammableWaveData_10 +084a328c g 00000000 ProgrammableWaveData_11 084a329c g 00000000 gMPlayTable 084a32cc g 00000000 gSongTable 084a3da4 l 00000000 dummy_song_header diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 689f12053..ee88ae482 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -10315,7 +10315,7 @@ 0810be24 g 00000198 CreatePicSprite 0810bfbc g 00000060 CreatePicSprite_HandleDeoxys 0810c01c g 000000ac FreeAndDestroyPicSpriteInternal -0810c0c8 g 00000070 sub_810C050 +0810c0c8 l 00000070 LoadPicSpriteInWindow 0810c138 g 000000ac CreateTrainerCardSprite 0810c1e4 g 00000060 CreateMonPicSprite 0810c244 g 00000048 CreateMonPicSprite_HandleDeoxys @@ -10324,7 +10324,7 @@ 0810c2d4 g 00000048 CreateTrainerCardMonIconSprite 0810c31c g 00000044 CreateTrainerPicSprite 0810c360 g 00000012 FreeAndDestroyTrainerPicSprite -0810c374 g 00000034 sub_810C2FC +0810c374 g 00000034 LoadTrainerPicInWindow 0810c3a8 g 00000044 CreateTrainerCardTrainerPicSprite 0810c3ec g 00000030 PlayerGenderToFrontTrainerPicId_Debug 0810c41c g 00000014 VsSeekerFreezeObjectsAfterChargeComplete @@ -26690,17 +26690,17 @@ 0823eb38 g 00007418 gTrainers 08245f50 g 000011b4 gSpeciesNames 08247104 g 00001207 gMoveNames -0824830c l 00000002 gUnknown_824829C -08248310 l 00000008 gOamData_82482A0 -08248318 l 00000008 gOamData_82482A8 -08248320 l 00000010 gUnknown_82482B0 -08248330 l 00000020 gUnknown_82482C0 -08248350 l 00000008 gAffineAnimTable_82482E0 +0824830c l 00000002 sUnused +08248310 l 00000008 sVsLetter_V_OamData +08248318 l 00000008 sVsLetter_S_OamData +08248320 l 00000010 sVsLetterAffineAnimCmds0 +08248330 l 00000020 sVsLetterAffineAnimCmds1 +08248350 l 00000008 sVsLetterAffineAnimTable 08248358 l 00000018 sVsLetter_V_SpriteTemplate 08248370 l 00000018 sVsLetter_S_SpriteTemplate 08248388 l 00000008 sVsLettersSpriteSheet 08248390 g 00000010 gBattleBgTemplates -082483a0 l 000000d0 gUnknown_8248330 +082483a0 l 000000d0 sStandardBattleWindowTemplates 08248470 l 0000004c sBattleTerrainPalette_Grass 082484bc l 0000055c sBattleTerrainTiles_Grass 08248a18 l 000002c0 sBattleTerrainTilemap_Grass @@ -40214,8 +40214,8 @@ 08453144 l 00000020 sDefaultBagWindowsDeposit 08453164 l 00000070 sWindowTemplates 084531d4 l 00000003 sUnused -084531d8 l 0000000c gUnknown_8453178 -084531e4 l 00000008 gUnknown_8453184 +084531d8 l 0000000c sDummyPicData +084531e4 l 00000008 sOamData_Normal 084531ec l 00000dd0 sVsSeekerData 08453fbc l 00000004 sMovementScript_Wait48 08453fc0 l 00000002 sMovementScript_TrainerUnfought @@ -42578,17 +42578,17 @@ 084a3144 l 00000000 KeySplitTable3 084a3198 l 00000000 KeySplitTable4 084a31e0 l 00000000 KeySplitTable5 -084a324c g 00000000 gProgrammableWaveData_84A31EC -084a325c g 00000000 gProgrammableWaveData_84A31FC -084a326c g 00000000 gProgrammableWaveData_84A320C -084a327c g 00000000 gProgrammableWaveData_84A321C -084a328c g 00000000 gProgrammableWaveData_84A322C -084a329c g 00000000 gProgrammableWaveData_84A323C -084a32ac g 00000000 gProgrammableWaveData_84A324C -084a32bc g 00000000 gProgrammableWaveData_84A325C -084a32cc g 00000000 gProgrammableWaveData_84A326C -084a32dc g 00000000 gProgrammableWaveData_84A327C -084a32ec g 00000000 gProgrammableWaveData_84A328C +084a324c g 00000000 ProgrammableWaveData_1 +084a325c g 00000000 ProgrammableWaveData_2 +084a326c g 00000000 ProgrammableWaveData_3 +084a327c g 00000000 ProgrammableWaveData_4 +084a328c g 00000000 ProgrammableWaveData_5 +084a329c g 00000000 ProgrammableWaveData_6 +084a32ac g 00000000 ProgrammableWaveData_7 +084a32bc g 00000000 ProgrammableWaveData_8 +084a32cc g 00000000 ProgrammableWaveData_9 +084a32dc g 00000000 ProgrammableWaveData_10 +084a32ec g 00000000 ProgrammableWaveData_11 084a32fc g 00000000 gMPlayTable 084a332c g 00000000 gSongTable 084a3e04 l 00000000 dummy_song_header diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 1937a3c79..91f42471c 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -10316,7 +10316,7 @@ 0810bd84 g 00000198 CreatePicSprite 0810bf1c g 00000060 CreatePicSprite_HandleDeoxys 0810bf7c g 000000ac FreeAndDestroyPicSpriteInternal -0810c028 g 00000070 sub_810C050 +0810c028 l 00000070 LoadPicSpriteInWindow 0810c098 g 000000ac CreateTrainerCardSprite 0810c144 g 00000060 CreateMonPicSprite 0810c1a4 g 00000048 CreateMonPicSprite_HandleDeoxys @@ -10325,7 +10325,7 @@ 0810c234 g 00000048 CreateTrainerCardMonIconSprite 0810c27c g 00000044 CreateTrainerPicSprite 0810c2c0 g 00000012 FreeAndDestroyTrainerPicSprite -0810c2d4 g 00000034 sub_810C2FC +0810c2d4 g 00000034 LoadTrainerPicInWindow 0810c308 g 00000044 CreateTrainerCardTrainerPicSprite 0810c34c g 00000030 PlayerGenderToFrontTrainerPicId_Debug 0810c37c g 00000014 VsSeekerFreezeObjectsAfterChargeComplete @@ -26691,17 +26691,17 @@ 0823eaa4 g 00007418 gTrainers 08245ebc g 000011b4 gSpeciesNames 08247070 g 00001207 gMoveNames -08248278 l 00000002 gUnknown_824829C -0824827c l 00000008 gOamData_82482A0 -08248284 l 00000008 gOamData_82482A8 -0824828c l 00000010 gUnknown_82482B0 -0824829c l 00000020 gUnknown_82482C0 -082482bc l 00000008 gAffineAnimTable_82482E0 +08248278 l 00000002 sUnused +0824827c l 00000008 sVsLetter_V_OamData +08248284 l 00000008 sVsLetter_S_OamData +0824828c l 00000010 sVsLetterAffineAnimCmds0 +0824829c l 00000020 sVsLetterAffineAnimCmds1 +082482bc l 00000008 sVsLetterAffineAnimTable 082482c4 l 00000018 sVsLetter_V_SpriteTemplate 082482dc l 00000018 sVsLetter_S_SpriteTemplate 082482f4 l 00000008 sVsLettersSpriteSheet 082482fc g 00000010 gBattleBgTemplates -0824830c l 000000d0 gUnknown_8248330 +0824830c l 000000d0 sStandardBattleWindowTemplates 082483dc l 0000004c sBattleTerrainPalette_Grass 08248428 l 0000055c sBattleTerrainTiles_Grass 08248984 l 000002c0 sBattleTerrainTilemap_Grass @@ -40215,8 +40215,8 @@ 08452b04 l 00000020 sDefaultBagWindowsDeposit 08452b24 l 00000070 sWindowTemplates 08452b94 l 00000003 sUnused -08452b98 l 0000000c gUnknown_8453178 -08452ba4 l 00000008 gUnknown_8453184 +08452b98 l 0000000c sDummyPicData +08452ba4 l 00000008 sOamData_Normal 08452bac l 00000dd0 sVsSeekerData 0845397c l 00000004 sMovementScript_Wait48 08453980 l 00000002 sMovementScript_TrainerUnfought @@ -42579,17 +42579,17 @@ 084a29c0 l 00000000 KeySplitTable3 084a2a14 l 00000000 KeySplitTable4 084a2a5c l 00000000 KeySplitTable5 -084a2ac8 g 00000000 gProgrammableWaveData_84A31EC -084a2ad8 g 00000000 gProgrammableWaveData_84A31FC -084a2ae8 g 00000000 gProgrammableWaveData_84A320C -084a2af8 g 00000000 gProgrammableWaveData_84A321C -084a2b08 g 00000000 gProgrammableWaveData_84A322C -084a2b18 g 00000000 gProgrammableWaveData_84A323C -084a2b28 g 00000000 gProgrammableWaveData_84A324C -084a2b38 g 00000000 gProgrammableWaveData_84A325C -084a2b48 g 00000000 gProgrammableWaveData_84A326C -084a2b58 g 00000000 gProgrammableWaveData_84A327C -084a2b68 g 00000000 gProgrammableWaveData_84A328C +084a2ac8 g 00000000 ProgrammableWaveData_1 +084a2ad8 g 00000000 ProgrammableWaveData_2 +084a2ae8 g 00000000 ProgrammableWaveData_3 +084a2af8 g 00000000 ProgrammableWaveData_4 +084a2b08 g 00000000 ProgrammableWaveData_5 +084a2b18 g 00000000 ProgrammableWaveData_6 +084a2b28 g 00000000 ProgrammableWaveData_7 +084a2b38 g 00000000 ProgrammableWaveData_8 +084a2b48 g 00000000 ProgrammableWaveData_9 +084a2b58 g 00000000 ProgrammableWaveData_10 +084a2b68 g 00000000 ProgrammableWaveData_11 084a2b78 g 00000000 gMPlayTable 084a2ba8 g 00000000 gSongTable 084a3680 l 00000000 dummy_song_header diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 51bf54592..5c19caa7d 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -10317,7 +10317,7 @@ 0810bdfc g 00000198 CreatePicSprite 0810bf94 g 00000060 CreatePicSprite_HandleDeoxys 0810bff4 g 000000ac FreeAndDestroyPicSpriteInternal -0810c0a0 g 00000070 sub_810C050 +0810c0a0 l 00000070 LoadPicSpriteInWindow 0810c110 g 000000ac CreateTrainerCardSprite 0810c1bc g 00000060 CreateMonPicSprite 0810c21c g 00000048 CreateMonPicSprite_HandleDeoxys @@ -10326,7 +10326,7 @@ 0810c2ac g 00000048 CreateTrainerCardMonIconSprite 0810c2f4 g 00000044 CreateTrainerPicSprite 0810c338 g 00000012 FreeAndDestroyTrainerPicSprite -0810c34c g 00000034 sub_810C2FC +0810c34c g 00000034 LoadTrainerPicInWindow 0810c380 g 00000044 CreateTrainerCardTrainerPicSprite 0810c3c4 g 00000030 PlayerGenderToFrontTrainerPicId_Debug 0810c3f4 g 00000014 VsSeekerFreezeObjectsAfterChargeComplete @@ -26692,17 +26692,17 @@ 0823eb14 g 00007418 gTrainers 08245f2c g 000011b4 gSpeciesNames 082470e0 g 00001207 gMoveNames -082482e8 l 00000002 gUnknown_824829C -082482ec l 00000008 gOamData_82482A0 -082482f4 l 00000008 gOamData_82482A8 -082482fc l 00000010 gUnknown_82482B0 -0824830c l 00000020 gUnknown_82482C0 -0824832c l 00000008 gAffineAnimTable_82482E0 +082482e8 l 00000002 sUnused +082482ec l 00000008 sVsLetter_V_OamData +082482f4 l 00000008 sVsLetter_S_OamData +082482fc l 00000010 sVsLetterAffineAnimCmds0 +0824830c l 00000020 sVsLetterAffineAnimCmds1 +0824832c l 00000008 sVsLetterAffineAnimTable 08248334 l 00000018 sVsLetter_V_SpriteTemplate 0824834c l 00000018 sVsLetter_S_SpriteTemplate 08248364 l 00000008 sVsLettersSpriteSheet 0824836c g 00000010 gBattleBgTemplates -0824837c l 000000d0 gUnknown_8248330 +0824837c l 000000d0 sStandardBattleWindowTemplates 0824844c l 0000004c sBattleTerrainPalette_Grass 08248498 l 0000055c sBattleTerrainTiles_Grass 082489f4 l 000002c0 sBattleTerrainTilemap_Grass @@ -40216,8 +40216,8 @@ 08452b74 l 00000020 sDefaultBagWindowsDeposit 08452b94 l 00000070 sWindowTemplates 08452c04 l 00000003 sUnused -08452c08 l 0000000c gUnknown_8453178 -08452c14 l 00000008 gUnknown_8453184 +08452c08 l 0000000c sDummyPicData +08452c14 l 00000008 sOamData_Normal 08452c1c l 00000dd0 sVsSeekerData 084539ec l 00000004 sMovementScript_Wait48 084539f0 l 00000002 sMovementScript_TrainerUnfought @@ -42580,17 +42580,17 @@ 084a2a30 l 00000000 KeySplitTable3 084a2a84 l 00000000 KeySplitTable4 084a2acc l 00000000 KeySplitTable5 -084a2b38 g 00000000 gProgrammableWaveData_84A31EC -084a2b48 g 00000000 gProgrammableWaveData_84A31FC -084a2b58 g 00000000 gProgrammableWaveData_84A320C -084a2b68 g 00000000 gProgrammableWaveData_84A321C -084a2b78 g 00000000 gProgrammableWaveData_84A322C -084a2b88 g 00000000 gProgrammableWaveData_84A323C -084a2b98 g 00000000 gProgrammableWaveData_84A324C -084a2ba8 g 00000000 gProgrammableWaveData_84A325C -084a2bb8 g 00000000 gProgrammableWaveData_84A326C -084a2bc8 g 00000000 gProgrammableWaveData_84A327C -084a2bd8 g 00000000 gProgrammableWaveData_84A328C +084a2b38 g 00000000 ProgrammableWaveData_1 +084a2b48 g 00000000 ProgrammableWaveData_2 +084a2b58 g 00000000 ProgrammableWaveData_3 +084a2b68 g 00000000 ProgrammableWaveData_4 +084a2b78 g 00000000 ProgrammableWaveData_5 +084a2b88 g 00000000 ProgrammableWaveData_6 +084a2b98 g 00000000 ProgrammableWaveData_7 +084a2ba8 g 00000000 ProgrammableWaveData_8 +084a2bb8 g 00000000 ProgrammableWaveData_9 +084a2bc8 g 00000000 ProgrammableWaveData_10 +084a2bd8 g 00000000 ProgrammableWaveData_11 084a2be8 g 00000000 gMPlayTable 084a2c18 g 00000000 gSongTable 084a36f0 l 00000000 dummy_song_header