From 02fc33021f3cef9e97d11b3a2061b2caec64256d Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Thu, 27 Aug 2026 22:34:08 +0000 Subject: [PATCH] Fix `tools/make_patch.c` to be endian-independent --- pokeyellow.map | 17 ++++------------- pokeyellow.sym | 13 ++----------- pokeyellow_debug.map | 17 ++++------------- pokeyellow_debug.sym | 13 ++----------- pokeyellow_vc.map | 17 ++++------------- pokeyellow_vc.sym | 13 ++----------- 6 files changed, 18 insertions(+), 72 deletions(-) diff --git a/pokeyellow.map b/pokeyellow.map index 9016eb07..7890103d 100644 --- a/pokeyellow.map +++ b/pokeyellow.map @@ -139,7 +139,6 @@ ROM0 bank #0: $0869 = LoadTileBlockMap.rowLoop $086d = LoadTileBlockMap.rowInnerLoop $087b = LoadTileBlockMap.noCarry - $087e = LoadTileBlockMap.northConnection $08a5 = LoadTileBlockMap.southConnection $08cc = LoadTileBlockMap.westConnection $08f2 = LoadTileBlockMap.eastConnection @@ -158,7 +157,6 @@ ROM0 bank #0: $097c = IsSpriteOrSignInFrontOfPlayer.counterTilesLoop $0983 = IsSpriteInFrontOfPlayer $0985 = IsSpriteInFrontOfPlayer2 - $098b = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp $0996 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown $09a1 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight $09ac = IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -194,7 +192,6 @@ ROM0 bank #0: $0b20 = LoadCurrentMapView.rowInnerLoop $0b3e = LoadCurrentMapView.noCarry $0b46 = LoadCurrentMapView.noCarry2 - $0b4f = LoadCurrentMapView.adjustForYCoordWithinTileBlock $0b59 = LoadCurrentMapView.adjustForXCoordWithinTileBlock $0b63 = LoadCurrentMapView.copyToVisibleAreaBuffer $0b68 = LoadCurrentMapView.rowLoop2 @@ -310,7 +307,6 @@ ROM0 bank #0: $128f = HandlePartyMenuInput.asm_128f $129d = HandlePartyMenuInput.noPokemonChosen $12a2 = HandlePartyMenuInput.swappingPokemon - $12a6 = HandlePartyMenuInput.cancelSwap $12bb = HandlePartyMenuInput.handleSwap $12cc = PartyMenuText_12cc $12d1 = DrawPartyMenu @@ -371,11 +367,9 @@ ROM0 bank #0: $15ef = FarCopyDataDouble.expandloop $15fe = CopyVideoData $1617 = CopyVideoData.loop - $161c = CopyVideoData.done $1629 = CopyVideoData.keepgoing $1636 = CopyVideoDataDouble $164f = CopyVideoDataDouble.loop - $1654 = CopyVideoDataDouble.done $1661 = CopyVideoDataDouble.keepgoing $166e = FillMemory $1677 = FillMemory.eightbitcopyamount @@ -1713,7 +1707,6 @@ ROMX bank #1: $69b2 = DisplayPokemartDialogue_.loop $69ed = DisplayPokemartDialogue_.sellMenu $6a0e = DisplayPokemartDialogue_.sellMenuLoop - $6a36 = DisplayPokemartDialogue_.confirmItemSale $6a82 = DisplayPokemartDialogue_.skipSettingFlag1 $6a8e = DisplayPokemartDialogue_.unsellableItem $6a97 = DisplayPokemartDialogue_.bagEmpty @@ -5990,7 +5983,6 @@ ROMX bank #13: $74a1 = TitleScroll_In $74a9 = TitleScroll_Out $74b2 = TitleScroll - $74c4 = TitleScroll.ok $74c4 = _TitleScroll $74d3 = _TitleScroll.loop $74ec = _TitleScroll.ScrollBetween @@ -11943,7 +11935,7 @@ ROMX bank #24: $6519 = SilphCo11FSilphPresidentText.NoRoomText $651e = SilphCo11FBeautyText $6523 = SilphCo11FGiovanniText - $6528 = SilphCo10FGiovanniILostAgainText + $6528 = SilphCo11FGiovanniILostAgainText $652d = SilphCo11FGiovanniYouRuinedOurPlansText $6532 = SilphCo11FRocketText $653c = SilphCo11FRocketBattleText @@ -13295,7 +13287,6 @@ ROMX bank #30: $40a2 = DrawFrameBlock.storeFlags1 $40ab = DrawFrameBlock.flipHorizontalTranslateDown $40c8 = DrawFrameBlock.asm_780c8 - $40d4 = DrawFrameBlock.enableHorizontalFlip $40d8 = DrawFrameBlock.disableHorizontalFlip $40da = DrawFrameBlock.storeFlags2 $40e1 = DrawFrameBlock.nextTile @@ -15321,7 +15312,7 @@ ROMX bank #39: $4178 = _SilphCo11FSilphPresidentNoRoomText $4194 = _SilphCo11FBeautyText $41da = _SilphCo11FGiovanniText - $427f = _SilphCo10FGiovanniILostAgainText + $427f = _SilphCo11FGiovanniILostAgainText $4297 = _SilphCo11FGiovanniYouRuinedOurPlansText $433c = _SilphCo11FRocket2BattleText $436c = _SilphCo11FRocket2EndBattleText @@ -22280,8 +22271,8 @@ WRAM0 bank #0: $cd73 = wPPUpCountAndMaxPP $cd78 = wNormalMaxPPList $cd7a = wEvoDataBufferEnd - $cd81 = wTileMapBackup2 $cd81 = wSerialOtherGameboyRandomNumberListBlock + $cd81 = wTileMapBackup2 $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP @@ -22482,8 +22473,8 @@ WRAM0 bank #0: $d06f = wEnemyConfusedCounter $d070 = wEnemyToxicCounter $d071 = wEnemyDisabledMove - $d073 = wPlayerNumHits $d073 = wUnknownSerialCounter2 + $d073 = wPlayerNumHits $d073 = wPlayerBideAccumulatedDamage $d077 = wEscapedFromBattle $d077 = wBattleStatusDataEnd diff --git a/pokeyellow.sym b/pokeyellow.sym index 64dd6a03..e7e7b19c 100644 --- a/pokeyellow.sym +++ b/pokeyellow.sym @@ -114,7 +114,6 @@ 00:0869 LoadTileBlockMap.rowLoop 00:086d LoadTileBlockMap.rowInnerLoop 00:087b LoadTileBlockMap.noCarry -00:087e LoadTileBlockMap.northConnection 00:08a5 LoadTileBlockMap.southConnection 00:08cc LoadTileBlockMap.westConnection 00:08f2 LoadTileBlockMap.eastConnection @@ -133,7 +132,6 @@ 00:097c IsSpriteOrSignInFrontOfPlayer.counterTilesLoop 00:0983 IsSpriteInFrontOfPlayer 00:0985 IsSpriteInFrontOfPlayer2 -00:098b IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp 00:0996 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown 00:09a1 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight 00:09ac IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -169,7 +167,6 @@ 00:0b20 LoadCurrentMapView.rowInnerLoop 00:0b3e LoadCurrentMapView.noCarry 00:0b46 LoadCurrentMapView.noCarry2 -00:0b4f LoadCurrentMapView.adjustForYCoordWithinTileBlock 00:0b59 LoadCurrentMapView.adjustForXCoordWithinTileBlock 00:0b63 LoadCurrentMapView.copyToVisibleAreaBuffer 00:0b68 LoadCurrentMapView.rowLoop2 @@ -285,7 +282,6 @@ 00:128f HandlePartyMenuInput.asm_128f 00:129d HandlePartyMenuInput.noPokemonChosen 00:12a2 HandlePartyMenuInput.swappingPokemon -00:12a6 HandlePartyMenuInput.cancelSwap 00:12bb HandlePartyMenuInput.handleSwap 00:12cc PartyMenuText_12cc 00:12d1 DrawPartyMenu @@ -346,11 +342,9 @@ 00:15ef FarCopyDataDouble.expandloop 00:15fe CopyVideoData 00:1617 CopyVideoData.loop -00:161c CopyVideoData.done 00:1629 CopyVideoData.keepgoing 00:1636 CopyVideoDataDouble 00:164f CopyVideoDataDouble.loop -00:1654 CopyVideoDataDouble.done 00:1661 CopyVideoDataDouble.keepgoing 00:166e FillMemory 00:1677 FillMemory.eightbitcopyamount @@ -1683,7 +1677,6 @@ 01:69b2 DisplayPokemartDialogue_.loop 01:69ed DisplayPokemartDialogue_.sellMenu 01:6a0e DisplayPokemartDialogue_.sellMenuLoop -01:6a36 DisplayPokemartDialogue_.confirmItemSale 01:6a82 DisplayPokemartDialogue_.skipSettingFlag1 01:6a8e DisplayPokemartDialogue_.unsellableItem 01:6a97 DisplayPokemartDialogue_.bagEmpty @@ -5878,7 +5871,6 @@ 0d:74a9 TitleScroll_Out 0d:74b2 TitleScroll 0d:74c4 _TitleScroll -0d:74c4 TitleScroll.ok 0d:74d3 _TitleScroll.loop 0d:74ec _TitleScroll.ScrollBetween 0d:74ec _TitleScroll.wait @@ -11757,7 +11749,7 @@ 18:6519 SilphCo11FSilphPresidentText.NoRoomText 18:651e SilphCo11FBeautyText 18:6523 SilphCo11FGiovanniText -18:6528 SilphCo10FGiovanniILostAgainText +18:6528 SilphCo11FGiovanniILostAgainText 18:652d SilphCo11FGiovanniYouRuinedOurPlansText 18:6532 SilphCo11FRocketText 18:653c SilphCo11FRocketBattleText @@ -13074,7 +13066,6 @@ 1e:40a2 DrawFrameBlock.storeFlags1 1e:40ab DrawFrameBlock.flipHorizontalTranslateDown 1e:40c8 DrawFrameBlock.asm_780c8 -1e:40d4 DrawFrameBlock.enableHorizontalFlip 1e:40d8 DrawFrameBlock.disableHorizontalFlip 1e:40da DrawFrameBlock.storeFlags2 1e:40e1 DrawFrameBlock.nextTile @@ -15047,7 +15038,7 @@ 27:4178 _SilphCo11FSilphPresidentNoRoomText 27:4194 _SilphCo11FBeautyText 27:41da _SilphCo11FGiovanniText -27:427f _SilphCo10FGiovanniILostAgainText +27:427f _SilphCo11FGiovanniILostAgainText 27:4297 _SilphCo11FGiovanniYouRuinedOurPlansText 27:433c _SilphCo11FRocket2BattleText 27:436c _SilphCo11FRocket2EndBattleText diff --git a/pokeyellow_debug.map b/pokeyellow_debug.map index e9af2746..aa923fe3 100644 --- a/pokeyellow_debug.map +++ b/pokeyellow_debug.map @@ -139,7 +139,6 @@ ROM0 bank #0: $0869 = LoadTileBlockMap.rowLoop $086d = LoadTileBlockMap.rowInnerLoop $087b = LoadTileBlockMap.noCarry - $087e = LoadTileBlockMap.northConnection $08a5 = LoadTileBlockMap.southConnection $08cc = LoadTileBlockMap.westConnection $08f2 = LoadTileBlockMap.eastConnection @@ -158,7 +157,6 @@ ROM0 bank #0: $097c = IsSpriteOrSignInFrontOfPlayer.counterTilesLoop $0983 = IsSpriteInFrontOfPlayer $0985 = IsSpriteInFrontOfPlayer2 - $098b = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp $0996 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown $09a1 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight $09ac = IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -194,7 +192,6 @@ ROM0 bank #0: $0b20 = LoadCurrentMapView.rowInnerLoop $0b3e = LoadCurrentMapView.noCarry $0b46 = LoadCurrentMapView.noCarry2 - $0b4f = LoadCurrentMapView.adjustForYCoordWithinTileBlock $0b59 = LoadCurrentMapView.adjustForXCoordWithinTileBlock $0b63 = LoadCurrentMapView.copyToVisibleAreaBuffer $0b68 = LoadCurrentMapView.rowLoop2 @@ -310,7 +307,6 @@ ROM0 bank #0: $128f = HandlePartyMenuInput.asm_128f $129d = HandlePartyMenuInput.noPokemonChosen $12a2 = HandlePartyMenuInput.swappingPokemon - $12a6 = HandlePartyMenuInput.cancelSwap $12bb = HandlePartyMenuInput.handleSwap $12cc = PartyMenuText_12cc $12d1 = DrawPartyMenu @@ -371,11 +367,9 @@ ROM0 bank #0: $15ef = FarCopyDataDouble.expandloop $15fe = CopyVideoData $1617 = CopyVideoData.loop - $161c = CopyVideoData.done $1629 = CopyVideoData.keepgoing $1636 = CopyVideoDataDouble $164f = CopyVideoDataDouble.loop - $1654 = CopyVideoDataDouble.done $1661 = CopyVideoDataDouble.keepgoing $166e = FillMemory $1677 = FillMemory.eightbitcopyamount @@ -1720,7 +1714,6 @@ ROMX bank #1: $6a8d = DisplayPokemartDialogue_.loop $6ac8 = DisplayPokemartDialogue_.sellMenu $6ae9 = DisplayPokemartDialogue_.sellMenuLoop - $6b11 = DisplayPokemartDialogue_.confirmItemSale $6b5d = DisplayPokemartDialogue_.skipSettingFlag1 $6b69 = DisplayPokemartDialogue_.unsellableItem $6b72 = DisplayPokemartDialogue_.bagEmpty @@ -5998,7 +5991,6 @@ ROMX bank #13: $74a1 = TitleScroll_In $74a9 = TitleScroll_Out $74b2 = TitleScroll - $74c4 = TitleScroll.ok $74c4 = _TitleScroll $74d3 = _TitleScroll.loop $74ec = _TitleScroll.ScrollBetween @@ -11951,7 +11943,7 @@ ROMX bank #24: $6525 = SilphCo11FSilphPresidentText.NoRoomText $652a = SilphCo11FBeautyText $652f = SilphCo11FGiovanniText - $6534 = SilphCo10FGiovanniILostAgainText + $6534 = SilphCo11FGiovanniILostAgainText $6539 = SilphCo11FGiovanniYouRuinedOurPlansText $653e = SilphCo11FRocketText $6548 = SilphCo11FRocketBattleText @@ -13303,7 +13295,6 @@ ROMX bank #30: $40a2 = DrawFrameBlock.storeFlags1 $40ab = DrawFrameBlock.flipHorizontalTranslateDown $40c8 = DrawFrameBlock.asm_780c8 - $40d4 = DrawFrameBlock.enableHorizontalFlip $40d8 = DrawFrameBlock.disableHorizontalFlip $40da = DrawFrameBlock.storeFlags2 $40e1 = DrawFrameBlock.nextTile @@ -15330,7 +15321,7 @@ ROMX bank #39: $4178 = _SilphCo11FSilphPresidentNoRoomText $4194 = _SilphCo11FBeautyText $41da = _SilphCo11FGiovanniText - $427f = _SilphCo10FGiovanniILostAgainText + $427f = _SilphCo11FGiovanniILostAgainText $4297 = _SilphCo11FGiovanniYouRuinedOurPlansText $433c = _SilphCo11FRocket2BattleText $436c = _SilphCo11FRocket2EndBattleText @@ -22428,8 +22419,8 @@ WRAM0 bank #0: $cd73 = wPPUpCountAndMaxPP $cd78 = wNormalMaxPPList $cd7a = wEvoDataBufferEnd - $cd81 = wTileMapBackup2 $cd81 = wSerialOtherGameboyRandomNumberListBlock + $cd81 = wTileMapBackup2 $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP @@ -22630,8 +22621,8 @@ WRAM0 bank #0: $d06f = wEnemyConfusedCounter $d070 = wEnemyToxicCounter $d071 = wEnemyDisabledMove - $d073 = wPlayerNumHits $d073 = wUnknownSerialCounter2 + $d073 = wPlayerNumHits $d073 = wPlayerBideAccumulatedDamage $d077 = wEscapedFromBattle $d077 = wBattleStatusDataEnd diff --git a/pokeyellow_debug.sym b/pokeyellow_debug.sym index 5cf1f65a..594021af 100644 --- a/pokeyellow_debug.sym +++ b/pokeyellow_debug.sym @@ -114,7 +114,6 @@ 00:0869 LoadTileBlockMap.rowLoop 00:086d LoadTileBlockMap.rowInnerLoop 00:087b LoadTileBlockMap.noCarry -00:087e LoadTileBlockMap.northConnection 00:08a5 LoadTileBlockMap.southConnection 00:08cc LoadTileBlockMap.westConnection 00:08f2 LoadTileBlockMap.eastConnection @@ -133,7 +132,6 @@ 00:097c IsSpriteOrSignInFrontOfPlayer.counterTilesLoop 00:0983 IsSpriteInFrontOfPlayer 00:0985 IsSpriteInFrontOfPlayer2 -00:098b IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp 00:0996 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown 00:09a1 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight 00:09ac IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -169,7 +167,6 @@ 00:0b20 LoadCurrentMapView.rowInnerLoop 00:0b3e LoadCurrentMapView.noCarry 00:0b46 LoadCurrentMapView.noCarry2 -00:0b4f LoadCurrentMapView.adjustForYCoordWithinTileBlock 00:0b59 LoadCurrentMapView.adjustForXCoordWithinTileBlock 00:0b63 LoadCurrentMapView.copyToVisibleAreaBuffer 00:0b68 LoadCurrentMapView.rowLoop2 @@ -285,7 +282,6 @@ 00:128f HandlePartyMenuInput.asm_128f 00:129d HandlePartyMenuInput.noPokemonChosen 00:12a2 HandlePartyMenuInput.swappingPokemon -00:12a6 HandlePartyMenuInput.cancelSwap 00:12bb HandlePartyMenuInput.handleSwap 00:12cc PartyMenuText_12cc 00:12d1 DrawPartyMenu @@ -346,11 +342,9 @@ 00:15ef FarCopyDataDouble.expandloop 00:15fe CopyVideoData 00:1617 CopyVideoData.loop -00:161c CopyVideoData.done 00:1629 CopyVideoData.keepgoing 00:1636 CopyVideoDataDouble 00:164f CopyVideoDataDouble.loop -00:1654 CopyVideoDataDouble.done 00:1661 CopyVideoDataDouble.keepgoing 00:166e FillMemory 00:1677 FillMemory.eightbitcopyamount @@ -1690,7 +1684,6 @@ 01:6a8d DisplayPokemartDialogue_.loop 01:6ac8 DisplayPokemartDialogue_.sellMenu 01:6ae9 DisplayPokemartDialogue_.sellMenuLoop -01:6b11 DisplayPokemartDialogue_.confirmItemSale 01:6b5d DisplayPokemartDialogue_.skipSettingFlag1 01:6b69 DisplayPokemartDialogue_.unsellableItem 01:6b72 DisplayPokemartDialogue_.bagEmpty @@ -5886,7 +5879,6 @@ 0d:74a9 TitleScroll_Out 0d:74b2 TitleScroll 0d:74c4 _TitleScroll -0d:74c4 TitleScroll.ok 0d:74d3 _TitleScroll.loop 0d:74ec _TitleScroll.ScrollBetween 0d:74ec _TitleScroll.wait @@ -11765,7 +11757,7 @@ 18:6525 SilphCo11FSilphPresidentText.NoRoomText 18:652a SilphCo11FBeautyText 18:652f SilphCo11FGiovanniText -18:6534 SilphCo10FGiovanniILostAgainText +18:6534 SilphCo11FGiovanniILostAgainText 18:6539 SilphCo11FGiovanniYouRuinedOurPlansText 18:653e SilphCo11FRocketText 18:6548 SilphCo11FRocketBattleText @@ -13082,7 +13074,6 @@ 1e:40a2 DrawFrameBlock.storeFlags1 1e:40ab DrawFrameBlock.flipHorizontalTranslateDown 1e:40c8 DrawFrameBlock.asm_780c8 -1e:40d4 DrawFrameBlock.enableHorizontalFlip 1e:40d8 DrawFrameBlock.disableHorizontalFlip 1e:40da DrawFrameBlock.storeFlags2 1e:40e1 DrawFrameBlock.nextTile @@ -15055,7 +15046,7 @@ 27:4178 _SilphCo11FSilphPresidentNoRoomText 27:4194 _SilphCo11FBeautyText 27:41da _SilphCo11FGiovanniText -27:427f _SilphCo10FGiovanniILostAgainText +27:427f _SilphCo11FGiovanniILostAgainText 27:4297 _SilphCo11FGiovanniYouRuinedOurPlansText 27:433c _SilphCo11FRocket2BattleText 27:436c _SilphCo11FRocket2EndBattleText diff --git a/pokeyellow_vc.map b/pokeyellow_vc.map index 8ec7e28f..7b50032d 100644 --- a/pokeyellow_vc.map +++ b/pokeyellow_vc.map @@ -140,7 +140,6 @@ ROM0 bank #0: $0869 = LoadTileBlockMap.rowLoop $086d = LoadTileBlockMap.rowInnerLoop $087b = LoadTileBlockMap.noCarry - $087e = LoadTileBlockMap.northConnection $08a5 = LoadTileBlockMap.southConnection $08cc = LoadTileBlockMap.westConnection $08f2 = LoadTileBlockMap.eastConnection @@ -159,7 +158,6 @@ ROM0 bank #0: $097c = IsSpriteOrSignInFrontOfPlayer.counterTilesLoop $0983 = IsSpriteInFrontOfPlayer $0985 = IsSpriteInFrontOfPlayer2 - $098b = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp $0996 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown $09a1 = IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight $09ac = IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -195,7 +193,6 @@ ROM0 bank #0: $0b20 = LoadCurrentMapView.rowInnerLoop $0b3e = LoadCurrentMapView.noCarry $0b46 = LoadCurrentMapView.noCarry2 - $0b4f = LoadCurrentMapView.adjustForYCoordWithinTileBlock $0b59 = LoadCurrentMapView.adjustForXCoordWithinTileBlock $0b63 = LoadCurrentMapView.copyToVisibleAreaBuffer $0b68 = LoadCurrentMapView.rowLoop2 @@ -311,7 +308,6 @@ ROM0 bank #0: $128f = HandlePartyMenuInput.asm_128f $129d = HandlePartyMenuInput.noPokemonChosen $12a2 = HandlePartyMenuInput.swappingPokemon - $12a6 = HandlePartyMenuInput.cancelSwap $12bb = HandlePartyMenuInput.handleSwap $12cc = PartyMenuText_12cc $12d1 = DrawPartyMenu @@ -372,11 +368,9 @@ ROM0 bank #0: $15ef = FarCopyDataDouble.expandloop $15fe = CopyVideoData $1617 = CopyVideoData.loop - $161c = CopyVideoData.done $1629 = CopyVideoData.keepgoing $1636 = CopyVideoDataDouble $164f = CopyVideoDataDouble.loop - $1654 = CopyVideoDataDouble.done $1661 = CopyVideoDataDouble.keepgoing $166e = FillMemory $1677 = FillMemory.eightbitcopyamount @@ -1723,7 +1717,6 @@ ROMX bank #1: $69b2 = DisplayPokemartDialogue_.loop $69ed = DisplayPokemartDialogue_.sellMenu $6a0e = DisplayPokemartDialogue_.sellMenuLoop - $6a36 = DisplayPokemartDialogue_.confirmItemSale $6a82 = DisplayPokemartDialogue_.skipSettingFlag1 $6a8e = DisplayPokemartDialogue_.unsellableItem $6a97 = DisplayPokemartDialogue_.bagEmpty @@ -6004,7 +5997,6 @@ ROMX bank #13: $74a1 = TitleScroll_In $74a9 = TitleScroll_Out $74b2 = TitleScroll - $74c4 = TitleScroll.ok $74c4 = _TitleScroll $74d3 = _TitleScroll.loop $74ec = _TitleScroll.ScrollBetween @@ -11970,7 +11962,7 @@ ROMX bank #24: $6519 = SilphCo11FSilphPresidentText.NoRoomText $651e = SilphCo11FBeautyText $6523 = SilphCo11FGiovanniText - $6528 = SilphCo10FGiovanniILostAgainText + $6528 = SilphCo11FGiovanniILostAgainText $652d = SilphCo11FGiovanniYouRuinedOurPlansText $6532 = SilphCo11FRocketText $653c = SilphCo11FRocketBattleText @@ -13324,7 +13316,6 @@ ROMX bank #30: $40a2 = DrawFrameBlock.storeFlags1 $40ab = DrawFrameBlock.flipHorizontalTranslateDown $40c8 = DrawFrameBlock.asm_780c8 - $40d4 = DrawFrameBlock.enableHorizontalFlip $40d8 = DrawFrameBlock.disableHorizontalFlip $40da = DrawFrameBlock.storeFlags2 $40e1 = DrawFrameBlock.nextTile @@ -15371,7 +15362,7 @@ ROMX bank #39: $4178 = _SilphCo11FSilphPresidentNoRoomText $4194 = _SilphCo11FBeautyText $41da = _SilphCo11FGiovanniText - $427f = _SilphCo10FGiovanniILostAgainText + $427f = _SilphCo11FGiovanniILostAgainText $4297 = _SilphCo11FGiovanniYouRuinedOurPlansText $433c = _SilphCo11FRocket2BattleText $436c = _SilphCo11FRocket2EndBattleText @@ -22346,8 +22337,8 @@ WRAM0 bank #0: $cd73 = wPPUpCountAndMaxPP $cd78 = wNormalMaxPPList $cd7a = wEvoDataBufferEnd - $cd81 = wTileMapBackup2 $cd81 = wSerialOtherGameboyRandomNumberListBlock + $cd81 = wTileMapBackup2 $cee9 = wLearningMovesFromDayCare $cee9 = wTownMapCoords $cee9 = wHPBarMaxHP @@ -22548,8 +22539,8 @@ WRAM0 bank #0: $d06f = wEnemyConfusedCounter $d070 = wEnemyToxicCounter $d071 = wEnemyDisabledMove - $d073 = wPlayerNumHits $d073 = wUnknownSerialCounter2 + $d073 = wPlayerNumHits $d073 = wPlayerBideAccumulatedDamage $d077 = wEscapedFromBattle $d077 = wBattleStatusDataEnd diff --git a/pokeyellow_vc.sym b/pokeyellow_vc.sym index 1d54909d..03b32b0b 100644 --- a/pokeyellow_vc.sym +++ b/pokeyellow_vc.sym @@ -115,7 +115,6 @@ 00:0869 LoadTileBlockMap.rowLoop 00:086d LoadTileBlockMap.rowInnerLoop 00:087b LoadTileBlockMap.noCarry -00:087e LoadTileBlockMap.northConnection 00:08a5 LoadTileBlockMap.southConnection 00:08cc LoadTileBlockMap.westConnection 00:08f2 LoadTileBlockMap.eastConnection @@ -134,7 +133,6 @@ 00:097c IsSpriteOrSignInFrontOfPlayer.counterTilesLoop 00:0983 IsSpriteInFrontOfPlayer 00:0985 IsSpriteInFrontOfPlayer2 -00:098b IsSpriteInFrontOfPlayer2.checkIfPlayerFacingUp 00:0996 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingDown 00:09a1 IsSpriteInFrontOfPlayer2.checkIfPlayerFacingRight 00:09ac IsSpriteInFrontOfPlayer2.playerFacingLeft @@ -170,7 +168,6 @@ 00:0b20 LoadCurrentMapView.rowInnerLoop 00:0b3e LoadCurrentMapView.noCarry 00:0b46 LoadCurrentMapView.noCarry2 -00:0b4f LoadCurrentMapView.adjustForYCoordWithinTileBlock 00:0b59 LoadCurrentMapView.adjustForXCoordWithinTileBlock 00:0b63 LoadCurrentMapView.copyToVisibleAreaBuffer 00:0b68 LoadCurrentMapView.rowLoop2 @@ -286,7 +283,6 @@ 00:128f HandlePartyMenuInput.asm_128f 00:129d HandlePartyMenuInput.noPokemonChosen 00:12a2 HandlePartyMenuInput.swappingPokemon -00:12a6 HandlePartyMenuInput.cancelSwap 00:12bb HandlePartyMenuInput.handleSwap 00:12cc PartyMenuText_12cc 00:12d1 DrawPartyMenu @@ -347,11 +343,9 @@ 00:15ef FarCopyDataDouble.expandloop 00:15fe CopyVideoData 00:1617 CopyVideoData.loop -00:161c CopyVideoData.done 00:1629 CopyVideoData.keepgoing 00:1636 CopyVideoDataDouble 00:164f CopyVideoDataDouble.loop -00:1654 CopyVideoDataDouble.done 00:1661 CopyVideoDataDouble.keepgoing 00:166e FillMemory 00:1677 FillMemory.eightbitcopyamount @@ -1693,7 +1687,6 @@ 01:69b2 DisplayPokemartDialogue_.loop 01:69ed DisplayPokemartDialogue_.sellMenu 01:6a0e DisplayPokemartDialogue_.sellMenuLoop -01:6a36 DisplayPokemartDialogue_.confirmItemSale 01:6a82 DisplayPokemartDialogue_.skipSettingFlag1 01:6a8e DisplayPokemartDialogue_.unsellableItem 01:6a97 DisplayPokemartDialogue_.bagEmpty @@ -5892,7 +5885,6 @@ 0d:74a9 TitleScroll_Out 0d:74b2 TitleScroll 0d:74c4 _TitleScroll -0d:74c4 TitleScroll.ok 0d:74d3 _TitleScroll.loop 0d:74ec _TitleScroll.ScrollBetween 0d:74ec _TitleScroll.wait @@ -11784,7 +11776,7 @@ 18:6519 SilphCo11FSilphPresidentText.NoRoomText 18:651e SilphCo11FBeautyText 18:6523 SilphCo11FGiovanniText -18:6528 SilphCo10FGiovanniILostAgainText +18:6528 SilphCo11FGiovanniILostAgainText 18:652d SilphCo11FGiovanniYouRuinedOurPlansText 18:6532 SilphCo11FRocketText 18:653c SilphCo11FRocketBattleText @@ -13103,7 +13095,6 @@ 1e:40a2 DrawFrameBlock.storeFlags1 1e:40ab DrawFrameBlock.flipHorizontalTranslateDown 1e:40c8 DrawFrameBlock.asm_780c8 -1e:40d4 DrawFrameBlock.enableHorizontalFlip 1e:40d8 DrawFrameBlock.disableHorizontalFlip 1e:40da DrawFrameBlock.storeFlags2 1e:40e1 DrawFrameBlock.nextTile @@ -15097,7 +15088,7 @@ 27:4178 _SilphCo11FSilphPresidentNoRoomText 27:4194 _SilphCo11FBeautyText 27:41da _SilphCo11FGiovanniText -27:427f _SilphCo10FGiovanniILostAgainText +27:427f _SilphCo11FGiovanniILostAgainText 27:4297 _SilphCo11FGiovanniYouRuinedOurPlansText 27:433c _SilphCo11FRocket2BattleText 27:436c _SilphCo11FRocket2EndBattleText