From d16663c17d5dceed37a9c0ddba0edca4ffd667c4 Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 5 May 2024 16:08:18 +0000 Subject: [PATCH] Delete a couple EOL whitespace. --- pokeyellow.map | 38 +++++++++++++++++++------------------- pokeyellow.sym | 40 ++++++++++++++++++++-------------------- pokeyellow_debug.map | 38 +++++++++++++++++++------------------- pokeyellow_debug.sym | 40 ++++++++++++++++++++-------------------- pokeyellow_vc.map | 38 +++++++++++++++++++------------------- pokeyellow_vc.sym | 42 +++++++++++++++++++++--------------------- 6 files changed, 118 insertions(+), 118 deletions(-) diff --git a/pokeyellow.map b/pokeyellow.map index c51b9fbb..f07a97f9 100644 --- a/pokeyellow.map +++ b/pokeyellow.map @@ -1,3 +1,10 @@ +SUMMARY: + ROM0: 16363 bytes used / 21 free + ROMX: 855001 bytes used / 177191 free in 63 banks + SRAM: 25122 bytes used / 7646 free in 4 banks + WRAM0: 8192 bytes used / 0 free + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1291,7 +1298,7 @@ ROMX bank #1: $4a92 = WriteDMACodeToHRAM $4a99 = WriteDMACodeToHRAM.copy $4aa0 = DMARoutine - $4aaa = DMARoutineEnd + $4aaa = DMARoutine.End $4aaa = _IsTilePassable $4ab0 = _IsTilePassable.loop $4aba = _IsTilePassable.tileNotPassable @@ -3148,22 +3155,22 @@ ROMX bank #3: $5ea7 = CardKeyTable1 $5ed0 = CardKeyTable2 $5ef9 = CardKeyTable3 - $5f02 = ItemUsePokedoll + $5f02 = ItemUsePokeDoll $5f11 = ItemUseGuardSpec $5f38 = ItemUseSuperRepel $5f3d = ItemUseMaxRepel $5f42 = ItemUseDireHit $5f69 = ItemUseXStat $5f78 = ItemUseXStat.inBattle - $5fbd = ItemUsePokeflute - $5fe8 = ItemUsePokeflute.notRoute12 - $6007 = ItemUsePokeflute.notRoute16 - $602e = ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp - $6034 = ItemUsePokeflute.inBattle - $604c = ItemUsePokeflute.skipWakingUpEnemyParty - $6063 = ItemUsePokeflute.asm_e063 - $6088 = ItemUsePokeflute.musicWaitLoop - $608e = ItemUsePokeflute.skipMusic + $5fbd = ItemUsePokeFlute + $5fe8 = ItemUsePokeFlute.notRoute12 + $6007 = ItemUsePokeFlute.notRoute16 + $602e = ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp + $6034 = ItemUsePokeFlute.inBattle + $604c = ItemUsePokeFlute.skipWakingUpEnemyParty + $6063 = ItemUsePokeFlute.asm_e063 + $6088 = ItemUsePokeFlute.musicWaitLoop + $608e = ItemUsePokeFlute.skipMusic $6094 = WakeUpEntireParty $6099 = WakeUpEntireParty.loop $60a4 = WakeUpEntireParty.notAsleep @@ -13718,7 +13725,7 @@ ROMX bank #30: $6450 = JumpKickAnim $6454 = RollingKickAnim $645a = SandAttackAnim - $645e = HeadButtAnim + $645e = HeadbuttAnim $6462 = HornAttackAnim $6469 = FuryAttackAnim $6470 = HornDrillAnim @@ -23795,10 +23802,3 @@ HRAM bank #0: $fffc = hPikachuSpriteVRAMOffset $fffe = hGBC TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16363 bytes used / 21 free - ROMX: 855001 bytes used / 177191 free in 63 banks - SRAM: 25122 bytes used / 7646 free in 4 banks - WRAM0: 8192 bytes used / 0 free - HRAM: 127 bytes used / 0 free diff --git a/pokeyellow.sym b/pokeyellow.sym index cdc7cd74..bc66c578 100644 --- a/pokeyellow.sym +++ b/pokeyellow.sym @@ -561,8 +561,8 @@ 00:21c8 CheckForNoBikingMusicMap 00:21e1 CheckForNoBikingMusicMap.found 00:21e3 UpdateMusic6Times -00:21e5 UpdateMusicCTimes.loop 00:21e5 UpdateMusicCTimes +00:21e5 UpdateMusicCTimes.loop 00:21f5 CompareMapMusicBankWithCurrentBank 00:2204 CompareMapMusicBankWithCurrentBank.differentBanks 00:220c CompareMapMusicBankWithCurrentBank.next @@ -1268,7 +1268,7 @@ 01:4a92 WriteDMACodeToHRAM 01:4a99 WriteDMACodeToHRAM.copy 01:4aa0 DMARoutine -01:4aaa DMARoutineEnd +01:4aaa DMARoutine.End 01:4aaa _IsTilePassable 01:4ab0 _IsTilePassable.loop 01:4aba _IsTilePassable.tileNotPassable @@ -2401,8 +2401,8 @@ 02:5a46 Audio1_WavePointers.wave2 02:5a56 Audio1_WavePointers.wave3 02:5a66 Audio1_WavePointers.wave4 -02:5a76 Music_PkmnHealed_Ch1 02:5a76 Audio1_WavePointers.wave5 +02:5a76 Music_PkmnHealed_Ch1 02:5a97 Music_PkmnHealed_Ch2 02:5aa5 Music_PkmnHealed_Ch3 02:5ab1 Music_Routes1_Ch1 @@ -3111,22 +3111,22 @@ 03:5ea7 CardKeyTable1 03:5ed0 CardKeyTable2 03:5ef9 CardKeyTable3 -03:5f02 ItemUsePokedoll +03:5f02 ItemUsePokeDoll 03:5f11 ItemUseGuardSpec 03:5f38 ItemUseSuperRepel 03:5f3d ItemUseMaxRepel 03:5f42 ItemUseDireHit 03:5f69 ItemUseXStat 03:5f78 ItemUseXStat.inBattle -03:5fbd ItemUsePokeflute -03:5fe8 ItemUsePokeflute.notRoute12 -03:6007 ItemUsePokeflute.notRoute16 -03:602e ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp -03:6034 ItemUsePokeflute.inBattle -03:604c ItemUsePokeflute.skipWakingUpEnemyParty -03:6063 ItemUsePokeflute.asm_e063 -03:6088 ItemUsePokeflute.musicWaitLoop -03:608e ItemUsePokeflute.skipMusic +03:5fbd ItemUsePokeFlute +03:5fe8 ItemUsePokeFlute.notRoute12 +03:6007 ItemUsePokeFlute.notRoute16 +03:602e ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp +03:6034 ItemUsePokeFlute.inBattle +03:604c ItemUsePokeFlute.skipWakingUpEnemyParty +03:6063 ItemUsePokeFlute.asm_e063 +03:6088 ItemUsePokeFlute.musicWaitLoop +03:608e ItemUsePokeFlute.skipMusic 03:6094 WakeUpEntireParty 03:6099 WakeUpEntireParty.loop 03:60a4 WakeUpEntireParty.notAsleep @@ -8075,8 +8075,8 @@ 11:5995 RocketHideoutElevatorScript 11:59a8 RocketHideoutElavatorFloors 11:59ad RocketHideoutElevatorWarpMaps -11:59b3 RocketHideoutElevatorShakeScript 11:59b3 RocketHideoutElevatorWarpMaps.End +11:59b3 RocketHideoutElevatorShakeScript 11:59bf RocketHideoutElevator_TextPointers 11:59c1 RocketHideoutElevatorText 11:59d6 RocketHideoutElevatorText.no_key @@ -8091,8 +8091,8 @@ 11:5a45 SilphCoElevatorCopyWarpMapsScript 11:5a58 SilphCoElevatorFloors 11:5a65 SilphCoElevatorWarpMaps -11:5a7b SilphCoElevatorShakeScript 11:5a7b SilphCoElevatorWarpMaps.End +11:5a7b SilphCoElevatorShakeScript 11:5a87 SilphCoElevator_TextPointers 11:5a89 SilphCoElevatorElevatorText 11:5a98 SilphCoElevator_Object @@ -8368,8 +8368,8 @@ 12:453c CeladonMartElevatorCopyWarpMapsScript 12:454e CeladonMartElevatorFloors 12:4555 CeladonMartElevatorWarpMaps -12:455f CeladonMartElevatorShakeScript 12:455f CeladonMartElevatorWarpMaps.End +12:455f CeladonMartElevatorShakeScript 12:4567 CeladonMartElevator_TextPointers 12:4569 CeladonMartElevatorText 12:4578 CeladonMartElevator_Object @@ -13504,7 +13504,7 @@ 1e:6450 JumpKickAnim 1e:6454 RollingKickAnim 1e:645a SandAttackAnim -1e:645e HeadButtAnim +1e:645e HeadbuttAnim 1e:6462 HornAttackAnim 1e:6469 FuryAttackAnim 1e:6470 HornDrillAnim @@ -18286,8 +18286,8 @@ 3c:5dd7 PewterJigglypuff.spinMovementLoop 3c:5e19 PewterJigglypuff.Text 3c:5e1e PewterJigglypuff.FacingDirections -3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e22 PewterJigglypuff.FacingDirectionsEnd +3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e2b PokemonTower2FPikachuMovement 3c:5e30 CeladonMart3FPrintClerkText 3c:5e4f CeladonMart3FPrintClerkText.bag_full @@ -19437,8 +19437,8 @@ 3e:5ec4 YellowIntro_Copy8BitSineWave 3e:5ec9 YellowIntro_Copy8BitSineWave.loop 3e:5ed8 YellowIntro_Copy8BitSineWave.SineWave -3e:5ef8 Request7TileTransferFromC810ToC710 3e:5ef8 YellowIntro_Copy8BitSineWave.SineWaveEnd +3e:5ef8 Request7TileTransferFromC810ToC710 3e:5f0d InitYellowIntroGFXAndMusic 3e:5f75 LoadYellowIntroObjectAnimationDataPointers 3e:5f9e YellowIntro_BlankTileMap @@ -19615,8 +19615,8 @@ 3f:49a0 asm_fc969.TurnCounterclockwise 3f:49a5 asm_fc969.loop_ 3f:49ac asm_fc969.Facings -3f:49b4 NormalPikachuFollow 3f:49b4 asm_fc969.Facings_End +3f:49b4 NormalPikachuFollow 3f:49c3 asm_fc9c3 3f:49df FastPikachuFollow 3f:49ee asm_fc9ee diff --git a/pokeyellow_debug.map b/pokeyellow_debug.map index 904c8290..27ae0f4a 100644 --- a/pokeyellow_debug.map +++ b/pokeyellow_debug.map @@ -1,3 +1,10 @@ +SUMMARY: + ROM0: 16378 bytes used / 6 free + ROMX: 838816 bytes used / 193376 free in 63 banks + SRAM: 25122 bytes used / 7646 free in 4 banks + WRAM0: 8192 bytes used / 0 free + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1292,7 +1299,7 @@ ROMX bank #1: $4a9e = WriteDMACodeToHRAM $4aa5 = WriteDMACodeToHRAM.copy $4aac = DMARoutine - $4ab6 = DMARoutineEnd + $4ab6 = DMARoutine.End $4ab6 = _IsTilePassable $4abc = _IsTilePassable.loop $4ac6 = _IsTilePassable.tileNotPassable @@ -3155,22 +3162,22 @@ ROMX bank #3: $5ea7 = CardKeyTable1 $5ed0 = CardKeyTable2 $5ef9 = CardKeyTable3 - $5f02 = ItemUsePokedoll + $5f02 = ItemUsePokeDoll $5f11 = ItemUseGuardSpec $5f38 = ItemUseSuperRepel $5f3d = ItemUseMaxRepel $5f42 = ItemUseDireHit $5f69 = ItemUseXStat $5f78 = ItemUseXStat.inBattle - $5fbd = ItemUsePokeflute - $5fe8 = ItemUsePokeflute.notRoute12 - $6007 = ItemUsePokeflute.notRoute16 - $602e = ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp - $6034 = ItemUsePokeflute.inBattle - $604c = ItemUsePokeflute.skipWakingUpEnemyParty - $6063 = ItemUsePokeflute.asm_e063 - $6088 = ItemUsePokeflute.musicWaitLoop - $608e = ItemUsePokeflute.skipMusic + $5fbd = ItemUsePokeFlute + $5fe8 = ItemUsePokeFlute.notRoute12 + $6007 = ItemUsePokeFlute.notRoute16 + $602e = ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp + $6034 = ItemUsePokeFlute.inBattle + $604c = ItemUsePokeFlute.skipWakingUpEnemyParty + $6063 = ItemUsePokeFlute.asm_e063 + $6088 = ItemUsePokeFlute.musicWaitLoop + $608e = ItemUsePokeFlute.skipMusic $6094 = WakeUpEntireParty $6099 = WakeUpEntireParty.loop $60a4 = WakeUpEntireParty.notAsleep @@ -13726,7 +13733,7 @@ ROMX bank #30: $6450 = JumpKickAnim $6454 = RollingKickAnim $645a = SandAttackAnim - $645e = HeadButtAnim + $645e = HeadbuttAnim $6462 = HornAttackAnim $6469 = FuryAttackAnim $6470 = HornDrillAnim @@ -23944,10 +23951,3 @@ HRAM bank #0: $fffc = hPikachuSpriteVRAMOffset $fffe = hGBC TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16378 bytes used / 6 free - ROMX: 838816 bytes used / 193376 free in 63 banks - SRAM: 25122 bytes used / 7646 free in 4 banks - WRAM0: 8192 bytes used / 0 free - HRAM: 127 bytes used / 0 free diff --git a/pokeyellow_debug.sym b/pokeyellow_debug.sym index 9f7a69de..4e562070 100644 --- a/pokeyellow_debug.sym +++ b/pokeyellow_debug.sym @@ -561,8 +561,8 @@ 00:21c8 CheckForNoBikingMusicMap 00:21e1 CheckForNoBikingMusicMap.found 00:21e3 UpdateMusic6Times -00:21e5 UpdateMusicCTimes.loop 00:21e5 UpdateMusicCTimes +00:21e5 UpdateMusicCTimes.loop 00:21f5 CompareMapMusicBankWithCurrentBank 00:2204 CompareMapMusicBankWithCurrentBank.differentBanks 00:220c CompareMapMusicBankWithCurrentBank.next @@ -1269,7 +1269,7 @@ 01:4a9e WriteDMACodeToHRAM 01:4aa5 WriteDMACodeToHRAM.copy 01:4aac DMARoutine -01:4ab6 DMARoutineEnd +01:4ab6 DMARoutine.End 01:4ab6 _IsTilePassable 01:4abc _IsTilePassable.loop 01:4ac6 _IsTilePassable.tileNotPassable @@ -2408,8 +2408,8 @@ 02:5a46 Audio1_WavePointers.wave2 02:5a56 Audio1_WavePointers.wave3 02:5a66 Audio1_WavePointers.wave4 -02:5a76 Music_PkmnHealed_Ch1 02:5a76 Audio1_WavePointers.wave5 +02:5a76 Music_PkmnHealed_Ch1 02:5a97 Music_PkmnHealed_Ch2 02:5aa5 Music_PkmnHealed_Ch3 02:5ab1 Music_Routes1_Ch1 @@ -3118,22 +3118,22 @@ 03:5ea7 CardKeyTable1 03:5ed0 CardKeyTable2 03:5ef9 CardKeyTable3 -03:5f02 ItemUsePokedoll +03:5f02 ItemUsePokeDoll 03:5f11 ItemUseGuardSpec 03:5f38 ItemUseSuperRepel 03:5f3d ItemUseMaxRepel 03:5f42 ItemUseDireHit 03:5f69 ItemUseXStat 03:5f78 ItemUseXStat.inBattle -03:5fbd ItemUsePokeflute -03:5fe8 ItemUsePokeflute.notRoute12 -03:6007 ItemUsePokeflute.notRoute16 -03:602e ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp -03:6034 ItemUsePokeflute.inBattle -03:604c ItemUsePokeflute.skipWakingUpEnemyParty -03:6063 ItemUsePokeflute.asm_e063 -03:6088 ItemUsePokeflute.musicWaitLoop -03:608e ItemUsePokeflute.skipMusic +03:5fbd ItemUsePokeFlute +03:5fe8 ItemUsePokeFlute.notRoute12 +03:6007 ItemUsePokeFlute.notRoute16 +03:602e ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp +03:6034 ItemUsePokeFlute.inBattle +03:604c ItemUsePokeFlute.skipWakingUpEnemyParty +03:6063 ItemUsePokeFlute.asm_e063 +03:6088 ItemUsePokeFlute.musicWaitLoop +03:608e ItemUsePokeFlute.skipMusic 03:6094 WakeUpEntireParty 03:6099 WakeUpEntireParty.loop 03:60a4 WakeUpEntireParty.notAsleep @@ -8083,8 +8083,8 @@ 11:5999 RocketHideoutElevatorScript 11:59ac RocketHideoutElavatorFloors 11:59b1 RocketHideoutElevatorWarpMaps -11:59b7 RocketHideoutElevatorShakeScript 11:59b7 RocketHideoutElevatorWarpMaps.End +11:59b7 RocketHideoutElevatorShakeScript 11:59c3 RocketHideoutElevator_TextPointers 11:59c5 RocketHideoutElevatorText 11:59da RocketHideoutElevatorText.no_key @@ -8099,8 +8099,8 @@ 11:5a49 SilphCoElevatorCopyWarpMapsScript 11:5a5c SilphCoElevatorFloors 11:5a69 SilphCoElevatorWarpMaps -11:5a7f SilphCoElevatorShakeScript 11:5a7f SilphCoElevatorWarpMaps.End +11:5a7f SilphCoElevatorShakeScript 11:5a8b SilphCoElevator_TextPointers 11:5a8d SilphCoElevatorElevatorText 11:5a9c SilphCoElevator_Object @@ -8376,8 +8376,8 @@ 12:453c CeladonMartElevatorCopyWarpMapsScript 12:454e CeladonMartElevatorFloors 12:4555 CeladonMartElevatorWarpMaps -12:455f CeladonMartElevatorShakeScript 12:455f CeladonMartElevatorWarpMaps.End +12:455f CeladonMartElevatorShakeScript 12:4567 CeladonMartElevator_TextPointers 12:4569 CeladonMartElevatorText 12:4578 CeladonMartElevator_Object @@ -13512,7 +13512,7 @@ 1e:6450 JumpKickAnim 1e:6454 RollingKickAnim 1e:645a SandAttackAnim -1e:645e HeadButtAnim +1e:645e HeadbuttAnim 1e:6462 HornAttackAnim 1e:6469 FuryAttackAnim 1e:6470 HornDrillAnim @@ -18294,8 +18294,8 @@ 3c:5dd7 PewterJigglypuff.spinMovementLoop 3c:5e19 PewterJigglypuff.Text 3c:5e1e PewterJigglypuff.FacingDirections -3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e22 PewterJigglypuff.FacingDirectionsEnd +3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e2b PokemonTower2FPikachuMovement 3c:5e30 CeladonMart3FPrintClerkText 3c:5e4f CeladonMart3FPrintClerkText.bag_full @@ -19445,8 +19445,8 @@ 3e:5ec4 YellowIntro_Copy8BitSineWave 3e:5ec9 YellowIntro_Copy8BitSineWave.loop 3e:5ed8 YellowIntro_Copy8BitSineWave.SineWave -3e:5ef8 Request7TileTransferFromC810ToC710 3e:5ef8 YellowIntro_Copy8BitSineWave.SineWaveEnd +3e:5ef8 Request7TileTransferFromC810ToC710 3e:5f0d InitYellowIntroGFXAndMusic 3e:5f75 LoadYellowIntroObjectAnimationDataPointers 3e:5f9e YellowIntro_BlankTileMap @@ -19623,8 +19623,8 @@ 3f:49a0 asm_fc969.TurnCounterclockwise 3f:49a5 asm_fc969.loop_ 3f:49ac asm_fc969.Facings -3f:49b4 NormalPikachuFollow 3f:49b4 asm_fc969.Facings_End +3f:49b4 NormalPikachuFollow 3f:49c3 asm_fc9c3 3f:49df FastPikachuFollow 3f:49ee asm_fc9ee diff --git a/pokeyellow_vc.map b/pokeyellow_vc.map index 638172bf..76a06704 100644 --- a/pokeyellow_vc.map +++ b/pokeyellow_vc.map @@ -1,3 +1,10 @@ +SUMMARY: + ROM0: 16363 bytes used / 21 free + ROMX: 855001 bytes used / 177191 free in 63 banks + SRAM: 25122 bytes used / 7646 free in 4 banks + WRAM0: 8192 bytes used / 0 free + HRAM: 127 bytes used / 0 free + ROM0 bank #0: SECTION: $0000 (0 bytes) ["NULL"] $0000 = NULL @@ -1298,7 +1305,7 @@ ROMX bank #1: $4a92 = WriteDMACodeToHRAM $4a99 = WriteDMACodeToHRAM.copy $4aa0 = DMARoutine - $4aaa = DMARoutineEnd + $4aaa = DMARoutine.End $4aaa = _IsTilePassable $4ab0 = _IsTilePassable.loop $4aba = _IsTilePassable.tileNotPassable @@ -3162,22 +3169,22 @@ ROMX bank #3: $5ea7 = CardKeyTable1 $5ed0 = CardKeyTable2 $5ef9 = CardKeyTable3 - $5f02 = ItemUsePokedoll + $5f02 = ItemUsePokeDoll $5f11 = ItemUseGuardSpec $5f38 = ItemUseSuperRepel $5f3d = ItemUseMaxRepel $5f42 = ItemUseDireHit $5f69 = ItemUseXStat $5f78 = ItemUseXStat.inBattle - $5fbd = ItemUsePokeflute - $5fe8 = ItemUsePokeflute.notRoute12 - $6007 = ItemUsePokeflute.notRoute16 - $602e = ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp - $6034 = ItemUsePokeflute.inBattle - $604c = ItemUsePokeflute.skipWakingUpEnemyParty - $6063 = ItemUsePokeflute.asm_e063 - $6088 = ItemUsePokeflute.musicWaitLoop - $608e = ItemUsePokeflute.skipMusic + $5fbd = ItemUsePokeFlute + $5fe8 = ItemUsePokeFlute.notRoute12 + $6007 = ItemUsePokeFlute.notRoute16 + $602e = ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp + $6034 = ItemUsePokeFlute.inBattle + $604c = ItemUsePokeFlute.skipWakingUpEnemyParty + $6063 = ItemUsePokeFlute.asm_e063 + $6088 = ItemUsePokeFlute.musicWaitLoop + $608e = ItemUsePokeFlute.skipMusic $6094 = WakeUpEntireParty $6099 = WakeUpEntireParty.loop $60a4 = WakeUpEntireParty.notAsleep @@ -13768,7 +13775,7 @@ ROMX bank #30: $6450 = JumpKickAnim $6454 = RollingKickAnim $645a = SandAttackAnim - $645e = HeadButtAnim + $645e = HeadbuttAnim $6462 = HornAttackAnim $6469 = FuryAttackAnim $6470 = HornDrillAnim @@ -23861,10 +23868,3 @@ HRAM bank #0: $fffc = hPikachuSpriteVRAMOffset $fffe = hGBC TOTAL EMPTY: $0000 bytes - -SUMMARY: - ROM0: 16363 bytes used / 21 free - ROMX: 855001 bytes used / 177191 free in 63 banks - SRAM: 25122 bytes used / 7646 free in 4 banks - WRAM0: 8192 bytes used / 0 free - HRAM: 127 bytes used / 0 free diff --git a/pokeyellow_vc.sym b/pokeyellow_vc.sym index 8e4a0b8b..64b01c5c 100644 --- a/pokeyellow_vc.sym +++ b/pokeyellow_vc.sym @@ -568,8 +568,8 @@ 00:21c8 CheckForNoBikingMusicMap 00:21e1 CheckForNoBikingMusicMap.found 00:21e3 UpdateMusic6Times -00:21e5 UpdateMusicCTimes.loop 00:21e5 UpdateMusicCTimes +00:21e5 UpdateMusicCTimes.loop 00:21f5 CompareMapMusicBankWithCurrentBank 00:2204 CompareMapMusicBankWithCurrentBank.differentBanks 00:220c CompareMapMusicBankWithCurrentBank.next @@ -1275,7 +1275,7 @@ 01:4a92 WriteDMACodeToHRAM 01:4a99 WriteDMACodeToHRAM.copy 01:4aa0 DMARoutine -01:4aaa DMARoutineEnd +01:4aaa DMARoutine.End 01:4aaa _IsTilePassable 01:4ab0 _IsTilePassable.loop 01:4aba _IsTilePassable.tileNotPassable @@ -2415,8 +2415,8 @@ 02:5a46 Audio1_WavePointers.wave2 02:5a56 Audio1_WavePointers.wave3 02:5a66 Audio1_WavePointers.wave4 -02:5a76 Music_PkmnHealed_Ch1 02:5a76 Audio1_WavePointers.wave5 +02:5a76 Music_PkmnHealed_Ch1 02:5a97 Music_PkmnHealed_Ch2 02:5aa5 Music_PkmnHealed_Ch3 02:5ab1 Music_Routes1_Ch1 @@ -3125,22 +3125,22 @@ 03:5ea7 CardKeyTable1 03:5ed0 CardKeyTable2 03:5ef9 CardKeyTable3 -03:5f02 ItemUsePokedoll +03:5f02 ItemUsePokeDoll 03:5f11 ItemUseGuardSpec 03:5f38 ItemUseSuperRepel 03:5f3d ItemUseMaxRepel 03:5f42 ItemUseDireHit 03:5f69 ItemUseXStat 03:5f78 ItemUseXStat.inBattle -03:5fbd ItemUsePokeflute -03:5fe8 ItemUsePokeflute.notRoute12 -03:6007 ItemUsePokeflute.notRoute16 -03:602e ItemUsePokeflute.noSnorlaxOrPikachuToWakeUp -03:6034 ItemUsePokeflute.inBattle -03:604c ItemUsePokeflute.skipWakingUpEnemyParty -03:6063 ItemUsePokeflute.asm_e063 -03:6088 ItemUsePokeflute.musicWaitLoop -03:608e ItemUsePokeflute.skipMusic +03:5fbd ItemUsePokeFlute +03:5fe8 ItemUsePokeFlute.notRoute12 +03:6007 ItemUsePokeFlute.notRoute16 +03:602e ItemUsePokeFlute.noSnorlaxOrPikachuToWakeUp +03:6034 ItemUsePokeFlute.inBattle +03:604c ItemUsePokeFlute.skipWakingUpEnemyParty +03:6063 ItemUsePokeFlute.asm_e063 +03:6088 ItemUsePokeFlute.musicWaitLoop +03:608e ItemUsePokeFlute.skipMusic 03:6094 WakeUpEntireParty 03:6099 WakeUpEntireParty.loop 03:60a4 WakeUpEntireParty.notAsleep @@ -8102,8 +8102,8 @@ 11:5995 RocketHideoutElevatorScript 11:59a8 RocketHideoutElavatorFloors 11:59ad RocketHideoutElevatorWarpMaps -11:59b3 RocketHideoutElevatorShakeScript 11:59b3 RocketHideoutElevatorWarpMaps.End +11:59b3 RocketHideoutElevatorShakeScript 11:59bf RocketHideoutElevator_TextPointers 11:59c1 RocketHideoutElevatorText 11:59d6 RocketHideoutElevatorText.no_key @@ -8118,8 +8118,8 @@ 11:5a45 SilphCoElevatorCopyWarpMapsScript 11:5a58 SilphCoElevatorFloors 11:5a65 SilphCoElevatorWarpMaps -11:5a7b SilphCoElevatorShakeScript 11:5a7b SilphCoElevatorWarpMaps.End +11:5a7b SilphCoElevatorShakeScript 11:5a87 SilphCoElevator_TextPointers 11:5a89 SilphCoElevatorElevatorText 11:5a98 SilphCoElevator_Object @@ -8395,8 +8395,8 @@ 12:453c CeladonMartElevatorCopyWarpMapsScript 12:454e CeladonMartElevatorFloors 12:4555 CeladonMartElevatorWarpMaps -12:455f CeladonMartElevatorShakeScript 12:455f CeladonMartElevatorWarpMaps.End +12:455f CeladonMartElevatorShakeScript 12:4567 CeladonMartElevator_TextPointers 12:4569 CeladonMartElevatorText 12:4578 CeladonMartElevator_Object @@ -13554,7 +13554,7 @@ 1e:6450 JumpKickAnim 1e:6454 RollingKickAnim 1e:645a SandAttackAnim -1e:645e HeadButtAnim +1e:645e HeadbuttAnim 1e:6462 HornAttackAnim 1e:6469 FuryAttackAnim 1e:6470 HornDrillAnim @@ -17090,8 +17090,8 @@ 2c:788d _CableClubNPCWelcomeText 2c:78a9 _CableClubNPCPleaseApplyHereHaveToSaveText 2d:4000 _CableClubNPCPleaseWaitText -2d:400f _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message 2d:400f _CableClubNPCLinkClosedBecauseOfInactivityText +2d:400f _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message 2d:403f _CableClubNPCLinkClosedBecauseOfInactivityText.VC_Change_link_closed_inactivity_message_End 2d:406b _CableClubNPCPleaseComeAgainText 2d:407f _CableClubNPCMakingPreparationsText @@ -18341,8 +18341,8 @@ 3c:5dd7 PewterJigglypuff.spinMovementLoop 3c:5e19 PewterJigglypuff.Text 3c:5e1e PewterJigglypuff.FacingDirections -3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e22 PewterJigglypuff.FacingDirectionsEnd +3c:5e22 PokemonTower2FPikachuMovementScript 3c:5e2b PokemonTower2FPikachuMovement 3c:5e30 CeladonMart3FPrintClerkText 3c:5e4f CeladonMart3FPrintClerkText.bag_full @@ -19503,8 +19503,8 @@ 3e:5ec4 YellowIntro_Copy8BitSineWave 3e:5ec9 YellowIntro_Copy8BitSineWave.loop 3e:5ed8 YellowIntro_Copy8BitSineWave.SineWave -3e:5ef8 Request7TileTransferFromC810ToC710 3e:5ef8 YellowIntro_Copy8BitSineWave.SineWaveEnd +3e:5ef8 Request7TileTransferFromC810ToC710 3e:5f0d InitYellowIntroGFXAndMusic 3e:5f75 LoadYellowIntroObjectAnimationDataPointers 3e:5f9e YellowIntro_BlankTileMap @@ -19681,8 +19681,8 @@ 3f:49a0 asm_fc969.TurnCounterclockwise 3f:49a5 asm_fc969.loop_ 3f:49ac asm_fc969.Facings -3f:49b4 NormalPikachuFollow 3f:49b4 asm_fc969.Facings_End +3f:49b4 NormalPikachuFollow 3f:49c3 asm_fc9c3 3f:49df FastPikachuFollow 3f:49ee asm_fc9ee