@@ -324,7 +324,7 @@ ROM0 bank #0:
324324 $1082 = DummyChar
325325 $1083 = NextChar
326326 $1087 = CheckDict
327- $1122 = CheckDict.not_u1
327+ $1122 = CheckDict.not_u2
328328 $1145 = CheckDict.diacritic
329329 $114c = CheckDict.not_diacritic
330330 $115c = CheckDict.hiragana_dakuten
@@ -662,9 +662,9 @@ ROM0 bank #0:
662662 $21a5 = LoadMetatiles.row
663663 $21a9 = LoadMetatiles.col
664664 $21b2 = LoadMetatiles.ok
665- $21d8 = LoadMetatiles.next_u2
666- $21eb = LoadMetatiles.next_u3
667- $21fe = LoadMetatiles.next_u4
665+ $21d8 = LoadMetatiles.next_u4
666+ $21eb = LoadMetatiles.next_u5
667+ $21fe = LoadMetatiles.next_u6
668668 $2225 = LoadMetatiles.ok2
669669 $222a = ReturnToMapFromSubmenu
670670 $2238 = CheckWarpTile
@@ -994,16 +994,16 @@ ROM0 bank #0:
994994 $326d = _CopyTilemapAtOnce.wait2
995995 $327b = _CopyTilemapAtOnce.CopyBGMapViaStack
996996 $328c = _CopyTilemapAtOnce.loop
997- $328d = _CopyTilemapAtOnce.loop_u5
998- $3296 = _CopyTilemapAtOnce.loop_u6
999- $329f = _CopyTilemapAtOnce.loop_u7
1000- $32a8 = _CopyTilemapAtOnce.loop_u8
1001- $32b1 = _CopyTilemapAtOnce.loop_u9
1002- $32ba = _CopyTilemapAtOnce.loop_u10
1003- $32c3 = _CopyTilemapAtOnce.loop_u11
1004- $32cc = _CopyTilemapAtOnce.loop_u12
1005- $32d5 = _CopyTilemapAtOnce.loop_u13
1006- $32de = _CopyTilemapAtOnce.loop_u14
997+ $328d = _CopyTilemapAtOnce.loop_u7
998+ $3296 = _CopyTilemapAtOnce.loop_u8
999+ $329f = _CopyTilemapAtOnce.loop_u9
1000+ $32a8 = _CopyTilemapAtOnce.loop_u10
1001+ $32b1 = _CopyTilemapAtOnce.loop_u11
1002+ $32ba = _CopyTilemapAtOnce.loop_u12
1003+ $32c3 = _CopyTilemapAtOnce.loop_u13
1004+ $32cc = _CopyTilemapAtOnce.loop_u14
1005+ $32d5 = _CopyTilemapAtOnce.loop_u15
1006+ $32de = _CopyTilemapAtOnce.loop_u16
10071007 $32f9 = SetDefaultBGPAndOBP
10081008 $3309 = SetDefaultBGPAndOBP.SetDefaultBGPAndOBPForGameBoyColor
10091009 $3317 = ClearPalettes
@@ -2079,11 +2079,11 @@ ROMX bank #2:
20792079 $44d3 = QueueFollowerFirstStep.up
20802080 $44d7 = QueueFollowerFirstStep.same_xy
20812081 $44d9 = _Sine
2082- $44e5 = _Sine.negative_u1
2083- $44ef = _Sine.apply_u1
2084- $44fe = _Sine.multiply_u1
2085- $4503 = _Sine.even_u1
2086- $450b = _Sine.sinetable_u1
2082+ $44e5 = _Sine.negative_u9
2083+ $44ef = _Sine.apply_u9
2084+ $44fe = _Sine.multiply_u9
2085+ $4503 = _Sine.even_u9
2086+ $450b = _Sine.sinetable_u9
20872087 $454b = GetPredefPointer
20882088 $456b = PredefPointers
20892089 $456b = LearnMovePredef
@@ -10755,11 +10755,11 @@ ROMX bank #18:
1075510755 $5b2f = UpdateCelebiPosition.done
1075610756 $5b30 = UpdateCelebiPosition.FreezeCelebiPosition
1075710757 $5b3b = CelebiEvent_Cosine
10758- $5b48 = CelebiEvent_Cosine.negative_u2
10759- $5b52 = CelebiEvent_Cosine.apply_u2
10760- $5b61 = CelebiEvent_Cosine.multiply_u2
10761- $5b66 = CelebiEvent_Cosine.even_u2
10762- $5b6e = CelebiEvent_Cosine.sinetable_u2
10758+ $5b48 = CelebiEvent_Cosine.negative_u63
10759+ $5b52 = CelebiEvent_Cosine.apply_u63
10760+ $5b61 = CelebiEvent_Cosine.multiply_u63
10761+ $5b66 = CelebiEvent_Cosine.even_u63
10762+ $5b6e = CelebiEvent_Cosine.sinetable_u63
1076310763 $5bae = GetCelebiSpriteTile
1076410764 $5bd0 = GetCelebiSpriteTile.Frame1
1076510765 $5bd4 = GetCelebiSpriteTile.Frame2
@@ -11065,16 +11065,16 @@ ROMX bank #19:
1106511065 $4f72 = SaveMenu_CopyTilemapAtOnce.wait2
1106611066 $4f80 = SaveMenu_CopyTilemapAtOnce.CopyBGMapViaStack
1106711067 $4f91 = SaveMenu_CopyTilemapAtOnce.loop
11068- $4f92 = SaveMenu_CopyTilemapAtOnce.loop_u3
11069- $4f9b = SaveMenu_CopyTilemapAtOnce.loop_u4
11070- $4fa4 = SaveMenu_CopyTilemapAtOnce.loop_u5
11071- $4fad = SaveMenu_CopyTilemapAtOnce.loop_u6
11072- $4fb6 = SaveMenu_CopyTilemapAtOnce.loop_u7
11073- $4fbf = SaveMenu_CopyTilemapAtOnce.loop_u8
11074- $4fc8 = SaveMenu_CopyTilemapAtOnce.loop_u9
11075- $4fd1 = SaveMenu_CopyTilemapAtOnce.loop_u10
11076- $4fda = SaveMenu_CopyTilemapAtOnce.loop_u11
11077- $4fe3 = SaveMenu_CopyTilemapAtOnce.loop_u12
11068+ $4f92 = SaveMenu_CopyTilemapAtOnce.loop_u67
11069+ $4f9b = SaveMenu_CopyTilemapAtOnce.loop_u68
11070+ $4fa4 = SaveMenu_CopyTilemapAtOnce.loop_u69
11071+ $4fad = SaveMenu_CopyTilemapAtOnce.loop_u70
11072+ $4fb6 = SaveMenu_CopyTilemapAtOnce.loop_u71
11073+ $4fbf = SaveMenu_CopyTilemapAtOnce.loop_u72
11074+ $4fc8 = SaveMenu_CopyTilemapAtOnce.loop_u73
11075+ $4fd1 = SaveMenu_CopyTilemapAtOnce.loop_u74
11076+ $4fda = SaveMenu_CopyTilemapAtOnce.loop_u75
11077+ $4fe3 = SaveMenu_CopyTilemapAtOnce.loop_u76
1107811078 $4ffe = CheckSave
1107911079 $501b = CheckSave.ok
1108011080 $501e = MapScenes
@@ -11089,16 +11089,16 @@ ROMX bank #19:
1108911089 $51bd = PhoneRing_CopyTilemapAtOnce.wait2
1109011090 $51cb = PhoneRing_CopyTilemapAtOnce.CopyBGMapViaStack
1109111091 $51dc = PhoneRing_CopyTilemapAtOnce.loop
11092- $51dd = PhoneRing_CopyTilemapAtOnce.loop_u13
11093- $51e6 = PhoneRing_CopyTilemapAtOnce.loop_u14
11094- $51ef = PhoneRing_CopyTilemapAtOnce.loop_u15
11095- $51f8 = PhoneRing_CopyTilemapAtOnce.loop_u16
11096- $5201 = PhoneRing_CopyTilemapAtOnce.loop_u17
11097- $520a = PhoneRing_CopyTilemapAtOnce.loop_u18
11098- $5213 = PhoneRing_CopyTilemapAtOnce.loop_u19
11099- $521c = PhoneRing_CopyTilemapAtOnce.loop_u20
11100- $5225 = PhoneRing_CopyTilemapAtOnce.loop_u21
11101- $522e = PhoneRing_CopyTilemapAtOnce.loop_u22
11092+ $51dd = PhoneRing_CopyTilemapAtOnce.loop_u77
11093+ $51e6 = PhoneRing_CopyTilemapAtOnce.loop_u78
11094+ $51ef = PhoneRing_CopyTilemapAtOnce.loop_u79
11095+ $51f8 = PhoneRing_CopyTilemapAtOnce.loop_u80
11096+ $5201 = PhoneRing_CopyTilemapAtOnce.loop_u81
11097+ $520a = PhoneRing_CopyTilemapAtOnce.loop_u82
11098+ $5213 = PhoneRing_CopyTilemapAtOnce.loop_u83
11099+ $521c = PhoneRing_CopyTilemapAtOnce.loop_u84
11100+ $5225 = PhoneRing_CopyTilemapAtOnce.loop_u85
11101+ $522e = PhoneRing_CopyTilemapAtOnce.loop_u86
1110211102 SECTION: $5249-$5318 ($00d0 bytes) ["Shrink Pics"]
1110311103 $5249 = Shrink1Pic
1110411104 $52d9 = Shrink2Pic
@@ -17441,11 +17441,11 @@ ROMX bank #35:
1744117441 $46ef = WipeLYOverrides.wipe
1744217442 $46f2 = WipeLYOverrides.loop
1744317443 $46f7 = StartTrainerBattle_DrawSineWave
17444- $4702 = StartTrainerBattle_DrawSineWave.negative_u23
17445- $470c = StartTrainerBattle_DrawSineWave.apply_u23
17446- $471b = StartTrainerBattle_DrawSineWave.multiply_u23
17447- $4720 = StartTrainerBattle_DrawSineWave.even_u23
17448- $4728 = StartTrainerBattle_DrawSineWave.sinetable_u23
17444+ $4702 = StartTrainerBattle_DrawSineWave.negative_u100
17445+ $470c = StartTrainerBattle_DrawSineWave.apply_u100
17446+ $471b = StartTrainerBattle_DrawSineWave.multiply_u100
17447+ $4720 = StartTrainerBattle_DrawSineWave.even_u100
17448+ $4728 = StartTrainerBattle_DrawSineWave.sinetable_u100
1744917449 $4768 = StartTrainerBattle_ZoomToBlack
1745017450 $4771 = StartTrainerBattle_ZoomToBlack.loop
1745117451 $478c = StartTrainerBattle_ZoomToBlack.done
@@ -17802,11 +17802,11 @@ ROMX bank #35:
1780217802 $672a = Sprites_Cosine
1780317803 $672a = UnusedSpriteAnimGFX.DeletedGFX
1780417804 $672c = Sprites_Sine
17805- $6737 = Sprites_Sine.negative_u24
17806- $6741 = Sprites_Sine.apply_u24
17807- $6750 = Sprites_Sine.multiply_u24
17808- $6755 = Sprites_Sine.even_u24
17809- $675d = Sprites_Sine.sinetable_u24
17805+ $6737 = Sprites_Sine.negative_u106
17806+ $6741 = Sprites_Sine.apply_u106
17807+ $6750 = Sprites_Sine.multiply_u106
17808+ $6755 = Sprites_Sine.even_u106
17809+ $675d = Sprites_Sine.sinetable_u106
1781017810 $679d = AnimateEndOfExpBar
1781117811 $67a8 = AnimateEndOfExpBar.load
1781217812 $67b5 = AnimateEndOfExpBar.loop
@@ -24230,10 +24230,10 @@ ROMX bank #51:
2423024230 $672c = BattleAnim_IncAnonJumptableIndex
2423124231 $6732 = BattleAnim_Cosine
2423224232 $6734 = BattleAnim_Sine
24233- $673f = BattleAnim_Sine.negative_u25
24234- $6749 = BattleAnim_Sine.apply_u25
24235- $6758 = BattleAnim_Sine.multiply_u25
24236- $675d = BattleAnim_Sine.even_u25
24233+ $673f = BattleAnim_Sine.negative_u131
24234+ $6749 = BattleAnim_Sine.apply_u131
24235+ $6758 = BattleAnim_Sine.multiply_u131
24236+ $675d = BattleAnim_Sine.even_u131
2423724237 $6765 = BattleAnim_Sine_e
2423824238 $676b = BattleAnim_Cosine_e
2423924239 $6771 = BattleAnim_AbsSinePrecise
@@ -27405,14 +27405,14 @@ ROMX bank #56:
2740527405 $6d23 = BillsPC_RefreshTextboxes.placeholder_string
2740627406 $6d2a = BillsPC_RefreshTextboxes.Placeholder
2740727407 $6d30 = CopyBoxmonSpecies
27408- $6d57 = CopyBoxmonSpecies.loop_u26
27409- $6d79 = CopyBoxmonSpecies.done_u26
27408+ $6d57 = CopyBoxmonSpecies.loop_u143
27409+ $6d79 = CopyBoxmonSpecies.done_u143
2741027410 $6d87 = CopyBoxmonSpecies.party
27411- $6d8a = CopyBoxmonSpecies.loop_u27
27412- $6dac = CopyBoxmonSpecies.done_u27
27411+ $6d8a = CopyBoxmonSpecies.loop_u144
27412+ $6dac = CopyBoxmonSpecies.done_u144
2741327413 $6db7 = CopyBoxmonSpecies.sBox
27414- $6dbf = CopyBoxmonSpecies.loop_u28
27415- $6de1 = CopyBoxmonSpecies.done_u28
27414+ $6dbf = CopyBoxmonSpecies.loop_u145
27415+ $6de1 = CopyBoxmonSpecies.done_u145
2741627416 $6def = BillsPC_GetSelectedPokemonSpecies
2741727417 $6e01 = BillsPC_UpdateSelectionCursor
2741827418 $6e0b = BillsPC_UpdateSelectionCursor.place_cursor
@@ -54368,8 +54368,8 @@ WRAM0 bank #0:
5436854368 $c66c = wBT_OTTempMon2CaughtGender
5436954369 $c66c = wPlayerSubStatus5
5437054370 $c66c = wUnknownMonMailAuthor
54371- $c66d = wEnemySubStatus1
5437254371 $c66d = wMobileMonMailAuthorID
54372+ $c66d = wEnemySubStatus1
5437354373 $c66d = wBT_OTTempMon2Level
5437454374 $c66d = wOfferMonMail
5437554375 $c66d = wOfferMonMailMessage
@@ -56178,10 +56178,10 @@ WRAMX bank #1:
5617856178 $d1eb = wRestartClockPrevDivision
5617956179 $d1eb = wd1eb
5618056180 $d1eb = wSwitchMonTo
56181+ $d1ec = wRestartClockUpArrowYCoord
5618156182 $d1ec = wd1ec
5618256183 $d1ec = wCurMailIndex
5618356184 $d1ec = wHealMachineAnimState
56184- $d1ec = wRestartClockUpArrowYCoord
5618556185 $d1ec = wEvolutionPicOffset
5618656186 $d1ec = wHPBuffer2
5618756187 $d1ec = wCurHPAnimOldHP
0 commit comments