Skip to content

Commit

Permalink
Don't pass redundant label names to table_width and list_start (#125
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@Rangi42
Rangi42 committed Dec 27, 2024
1 parent 3085ca5 commit 290b7f7
Show file tree
Hide file tree
Showing 6 changed files with 170 additions and 176 deletions.
59 changes: 29 additions & 30 deletions pokeyellow.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2426,7 +2426,6 @@ ROMX bank #2:
$5972 = Audio1_ApplyMonoStereo
$5985 = Audio1_HWChannelEnableMasks
$59a5 = Audio1_Pitches
$59a5 = Audio1_Pitches._table_width_u1
$59bd = Music_RivalAlternateStart
$59d6 = Audio1_OverwriteChannelPointer
$59db = Music_RivalAlternateTempo
Expand Down Expand Up @@ -20653,65 +20652,65 @@ ROMX bank #63:
$6238 = PikaPicAnimCommand_thunderbolt.UpdatePal
$6242 = PikaPicAnimThunderboltPals
$626b = Data_fe26b
$6286 = Data_fe26b.loop_u1
$6286 = Data_fe26b.loop_u50
$628a = PikaPicAnimScript0
$628a = PikaPicAnimScript1
$628a = PikaPicAnimScript29
$62a0 = PikaPicAnimScript29.loop_u2
$62a0 = PikaPicAnimScript29.loop_u51
$62a4 = PikaPicAnimScript2
$62ba = PikaPicAnimScript2.loop_u3
$62ba = PikaPicAnimScript2.loop_u52
$62be = PikaPicAnimScript3
$62d4 = PikaPicAnimScript3.loop_u4
$62d4 = PikaPicAnimScript3.loop_u53
$62d8 = PikaPicAnimScript4
$62ee = PikaPicAnimScript4.loop_u5
$62ee = PikaPicAnimScript4.loop_u54
$62f2 = PikaPicAnimScript5
$6308 = PikaPicAnimScript5.loop_u6
$6308 = PikaPicAnimScript5.loop_u55
$630c = PikaPicAnimScript6
$6322 = PikaPicAnimScript6.loop_u7
$6322 = PikaPicAnimScript6.loop_u56
$6326 = PikaPicAnimScript7
$633c = PikaPicAnimScript7.loop_u8
$633c = PikaPicAnimScript7.loop_u57
$6340 = PikaPicAnimScript8
$6356 = PikaPicAnimScript8.loop_u9
$6356 = PikaPicAnimScript8.loop_u58
$635a = PikaPicAnimScript9
$6370 = PikaPicAnimScript9.loop_u10
$6370 = PikaPicAnimScript9.loop_u59
$6374 = PikaPicAnimScript10
$638c = PikaPicAnimScript10.loop_u11
$638c = PikaPicAnimScript10.loop_u60
$6390 = PikaPicAnimScript11
$63a6 = PikaPicAnimScript11.loop_u12
$63a6 = PikaPicAnimScript11.loop_u61
$63aa = PikaPicAnimScript12
$63c0 = PikaPicAnimScript12.loop_u13
$63c0 = PikaPicAnimScript12.loop_u62
$63c4 = PikaPicAnimScript13
$63da = PikaPicAnimScript13.loop_u14
$63da = PikaPicAnimScript13.loop_u63
$63de = PikaPicAnimScript14
$63f4 = PikaPicAnimScript14.loop_u15
$63f4 = PikaPicAnimScript14.loop_u64
$63f8 = PikaPicAnimScript15
$640e = PikaPicAnimScript15.loop_u16
$640e = PikaPicAnimScript15.loop_u65
$6412 = PikaPicAnimScript16
$6428 = PikaPicAnimScript16.loop_u17
$6428 = PikaPicAnimScript16.loop_u66
$642c = PikaPicAnimScript17
$6442 = PikaPicAnimScript17.loop_u18
$6442 = PikaPicAnimScript17.loop_u67
$6446 = PikaPicAnimScript18
$645c = PikaPicAnimScript18.loop_u19
$645c = PikaPicAnimScript18.loop_u68
$6460 = PikaPicAnimScript19
$6476 = PikaPicAnimScript19.loop_u20
$6476 = PikaPicAnimScript19.loop_u69
$647a = PikaPicAnimScript20
$6490 = PikaPicAnimScript20.loop_u21
$6490 = PikaPicAnimScript20.loop_u70
$6494 = PikaPicAnimScript21
$64b0 = PikaPicAnimScript21.loop_u22
$64b0 = PikaPicAnimScript21.loop_u71
$64b4 = PikaPicAnimScript22
$64ca = PikaPicAnimScript22.loop_u23
$64ca = PikaPicAnimScript22.loop_u72
$64ce = PikaPicAnimScript23
$64e4 = PikaPicAnimScript23.loop_u24
$64e4 = PikaPicAnimScript23.loop_u73
$64e8 = PikaPicAnimScript24
$64fe = PikaPicAnimScript24.loop_u25
$64fe = PikaPicAnimScript24.loop_u74
$6502 = PikaPicAnimScript25
$651f = Data_fe51f
$6520 = PikaPicAnimScript26
$653a = PikaPicAnimScript26.loop_u26
$653a = PikaPicAnimScript26.loop_u75
$653e = PikaPicAnimScript27
$6554 = PikaPicAnimScript27.loop_u27
$6554 = PikaPicAnimScript27.loop_u76
$6558 = PikaPicAnimScript28
$656e = PikaPicAnimScript28.loop_u28
$656e = PikaPicAnimScript28.loop_u77
$6572 = PikaPicAnimGFXHeaders
$6576 = Pic_e4000_id
$657a = GFX_e40cc_id
Expand Down Expand Up @@ -22121,8 +22120,8 @@ WRAM0 bank #0:
$cd50 = wWhichEmotionBubble
$cd59 = wTradedEnemyMonOTID
$cd5b = wGymTrashCanIndex
$cd5b = wOAMBaseTile
$cd5b = wStandingOnWarpPadOrHole
$cd5b = wOAMBaseTile
$cd5c = wSymmetricSpriteOAMAttributes
$cd5d = wMonPartySpriteSpecies
$cd5e = wLeftGBMonSpecies
Expand Down
59 changes: 29 additions & 30 deletions pokeyellow.sym
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,6 @@
02:5972 Audio1_ApplyMonoStereo
02:5985 Audio1_HWChannelEnableMasks
02:59a5 Audio1_Pitches
02:59a5 Audio1_Pitches._table_width_u1
02:59bd Music_RivalAlternateStart
02:59d6 Audio1_OverwriteChannelPointer
02:59db Music_RivalAlternateTempo
Expand Down Expand Up @@ -20253,65 +20252,65 @@
3f:6238 PikaPicAnimCommand_thunderbolt.UpdatePal
3f:6242 PikaPicAnimThunderboltPals
3f:626b Data_fe26b
3f:6286 Data_fe26b.loop_u1
3f:6286 Data_fe26b.loop_u50
3f:628a PikaPicAnimScript0
3f:628a PikaPicAnimScript1
3f:628a PikaPicAnimScript29
3f:62a0 PikaPicAnimScript29.loop_u2
3f:62a0 PikaPicAnimScript29.loop_u51
3f:62a4 PikaPicAnimScript2
3f:62ba PikaPicAnimScript2.loop_u3
3f:62ba PikaPicAnimScript2.loop_u52
3f:62be PikaPicAnimScript3
3f:62d4 PikaPicAnimScript3.loop_u4
3f:62d4 PikaPicAnimScript3.loop_u53
3f:62d8 PikaPicAnimScript4
3f:62ee PikaPicAnimScript4.loop_u5
3f:62ee PikaPicAnimScript4.loop_u54
3f:62f2 PikaPicAnimScript5
3f:6308 PikaPicAnimScript5.loop_u6
3f:6308 PikaPicAnimScript5.loop_u55
3f:630c PikaPicAnimScript6
3f:6322 PikaPicAnimScript6.loop_u7
3f:6322 PikaPicAnimScript6.loop_u56
3f:6326 PikaPicAnimScript7
3f:633c PikaPicAnimScript7.loop_u8
3f:633c PikaPicAnimScript7.loop_u57
3f:6340 PikaPicAnimScript8
3f:6356 PikaPicAnimScript8.loop_u9
3f:6356 PikaPicAnimScript8.loop_u58
3f:635a PikaPicAnimScript9
3f:6370 PikaPicAnimScript9.loop_u10
3f:6370 PikaPicAnimScript9.loop_u59
3f:6374 PikaPicAnimScript10
3f:638c PikaPicAnimScript10.loop_u11
3f:638c PikaPicAnimScript10.loop_u60
3f:6390 PikaPicAnimScript11
3f:63a6 PikaPicAnimScript11.loop_u12
3f:63a6 PikaPicAnimScript11.loop_u61
3f:63aa PikaPicAnimScript12
3f:63c0 PikaPicAnimScript12.loop_u13
3f:63c0 PikaPicAnimScript12.loop_u62
3f:63c4 PikaPicAnimScript13
3f:63da PikaPicAnimScript13.loop_u14
3f:63da PikaPicAnimScript13.loop_u63
3f:63de PikaPicAnimScript14
3f:63f4 PikaPicAnimScript14.loop_u15
3f:63f4 PikaPicAnimScript14.loop_u64
3f:63f8 PikaPicAnimScript15
3f:640e PikaPicAnimScript15.loop_u16
3f:640e PikaPicAnimScript15.loop_u65
3f:6412 PikaPicAnimScript16
3f:6428 PikaPicAnimScript16.loop_u17
3f:6428 PikaPicAnimScript16.loop_u66
3f:642c PikaPicAnimScript17
3f:6442 PikaPicAnimScript17.loop_u18
3f:6442 PikaPicAnimScript17.loop_u67
3f:6446 PikaPicAnimScript18
3f:645c PikaPicAnimScript18.loop_u19
3f:645c PikaPicAnimScript18.loop_u68
3f:6460 PikaPicAnimScript19
3f:6476 PikaPicAnimScript19.loop_u20
3f:6476 PikaPicAnimScript19.loop_u69
3f:647a PikaPicAnimScript20
3f:6490 PikaPicAnimScript20.loop_u21
3f:6490 PikaPicAnimScript20.loop_u70
3f:6494 PikaPicAnimScript21
3f:64b0 PikaPicAnimScript21.loop_u22
3f:64b0 PikaPicAnimScript21.loop_u71
3f:64b4 PikaPicAnimScript22
3f:64ca PikaPicAnimScript22.loop_u23
3f:64ca PikaPicAnimScript22.loop_u72
3f:64ce PikaPicAnimScript23
3f:64e4 PikaPicAnimScript23.loop_u24
3f:64e4 PikaPicAnimScript23.loop_u73
3f:64e8 PikaPicAnimScript24
3f:64fe PikaPicAnimScript24.loop_u25
3f:64fe PikaPicAnimScript24.loop_u74
3f:6502 PikaPicAnimScript25
3f:651f Data_fe51f
3f:6520 PikaPicAnimScript26
3f:653a PikaPicAnimScript26.loop_u26
3f:653a PikaPicAnimScript26.loop_u75
3f:653e PikaPicAnimScript27
3f:6554 PikaPicAnimScript27.loop_u27
3f:6554 PikaPicAnimScript27.loop_u76
3f:6558 PikaPicAnimScript28
3f:656e PikaPicAnimScript28.loop_u28
3f:656e PikaPicAnimScript28.loop_u77
3f:6572 PikaPicAnimGFXHeaders
3f:6576 Pic_e4000_id
3f:657a GFX_e40cc_id
Expand Down Expand Up @@ -21686,8 +21685,8 @@
00:cd50 wWhichEmotionBubble
00:cd59 wTradedEnemyMonOTID
00:cd5b wGymTrashCanIndex
00:cd5b wOAMBaseTile
00:cd5b wStandingOnWarpPadOrHole
00:cd5b wOAMBaseTile
00:cd5c wSymmetricSpriteOAMAttributes
00:cd5d wMonPartySpriteSpecies
00:cd5e wLeftGBMonSpecies
Expand Down
57 changes: 28 additions & 29 deletions pokeyellow_debug.map
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2433,7 +2433,6 @@ ROMX bank #2:
$5972 = Audio1_ApplyMonoStereo
$5985 = Audio1_HWChannelEnableMasks
$59a5 = Audio1_Pitches
$59a5 = Audio1_Pitches._table_width_u1
$59bd = Music_RivalAlternateStart
$59d6 = Audio1_OverwriteChannelPointer
$59db = Music_RivalAlternateTempo
Expand Down Expand Up @@ -20665,65 +20664,65 @@ ROMX bank #63:
$628c = PikaPicAnimCommand_thunderbolt.UpdatePal
$6296 = PikaPicAnimThunderboltPals
$62bf = Data_fe26b
$62da = Data_fe26b.loop_u1
$62da = Data_fe26b.loop_u50
$62de = PikaPicAnimScript0
$62de = PikaPicAnimScript1
$62de = PikaPicAnimScript29
$62f4 = PikaPicAnimScript29.loop_u2
$62f4 = PikaPicAnimScript29.loop_u51
$62f8 = PikaPicAnimScript2
$630e = PikaPicAnimScript2.loop_u3
$630e = PikaPicAnimScript2.loop_u52
$6312 = PikaPicAnimScript3
$6328 = PikaPicAnimScript3.loop_u4
$6328 = PikaPicAnimScript3.loop_u53
$632c = PikaPicAnimScript4
$6342 = PikaPicAnimScript4.loop_u5
$6342 = PikaPicAnimScript4.loop_u54
$6346 = PikaPicAnimScript5
$635c = PikaPicAnimScript5.loop_u6
$635c = PikaPicAnimScript5.loop_u55
$6360 = PikaPicAnimScript6
$6376 = PikaPicAnimScript6.loop_u7
$6376 = PikaPicAnimScript6.loop_u56
$637a = PikaPicAnimScript7
$6390 = PikaPicAnimScript7.loop_u8
$6390 = PikaPicAnimScript7.loop_u57
$6394 = PikaPicAnimScript8
$63aa = PikaPicAnimScript8.loop_u9
$63aa = PikaPicAnimScript8.loop_u58
$63ae = PikaPicAnimScript9
$63c4 = PikaPicAnimScript9.loop_u10
$63c4 = PikaPicAnimScript9.loop_u59
$63c8 = PikaPicAnimScript10
$63e0 = PikaPicAnimScript10.loop_u11
$63e0 = PikaPicAnimScript10.loop_u60
$63e4 = PikaPicAnimScript11
$63fa = PikaPicAnimScript11.loop_u12
$63fa = PikaPicAnimScript11.loop_u61
$63fe = PikaPicAnimScript12
$6414 = PikaPicAnimScript12.loop_u13
$6414 = PikaPicAnimScript12.loop_u62
$6418 = PikaPicAnimScript13
$642e = PikaPicAnimScript13.loop_u14
$642e = PikaPicAnimScript13.loop_u63
$6432 = PikaPicAnimScript14
$6448 = PikaPicAnimScript14.loop_u15
$6448 = PikaPicAnimScript14.loop_u64
$644c = PikaPicAnimScript15
$6462 = PikaPicAnimScript15.loop_u16
$6462 = PikaPicAnimScript15.loop_u65
$6466 = PikaPicAnimScript16
$647c = PikaPicAnimScript16.loop_u17
$647c = PikaPicAnimScript16.loop_u66
$6480 = PikaPicAnimScript17
$6496 = PikaPicAnimScript17.loop_u18
$6496 = PikaPicAnimScript17.loop_u67
$649a = PikaPicAnimScript18
$64b0 = PikaPicAnimScript18.loop_u19
$64b0 = PikaPicAnimScript18.loop_u68
$64b4 = PikaPicAnimScript19
$64ca = PikaPicAnimScript19.loop_u20
$64ca = PikaPicAnimScript19.loop_u69
$64ce = PikaPicAnimScript20
$64e4 = PikaPicAnimScript20.loop_u21
$64e4 = PikaPicAnimScript20.loop_u70
$64e8 = PikaPicAnimScript21
$6504 = PikaPicAnimScript21.loop_u22
$6504 = PikaPicAnimScript21.loop_u71
$6508 = PikaPicAnimScript22
$651e = PikaPicAnimScript22.loop_u23
$651e = PikaPicAnimScript22.loop_u72
$6522 = PikaPicAnimScript23
$6538 = PikaPicAnimScript23.loop_u24
$6538 = PikaPicAnimScript23.loop_u73
$653c = PikaPicAnimScript24
$6552 = PikaPicAnimScript24.loop_u25
$6552 = PikaPicAnimScript24.loop_u74
$6556 = PikaPicAnimScript25
$6573 = Data_fe51f
$6574 = PikaPicAnimScript26
$658e = PikaPicAnimScript26.loop_u26
$658e = PikaPicAnimScript26.loop_u75
$6592 = PikaPicAnimScript27
$65a8 = PikaPicAnimScript27.loop_u27
$65a8 = PikaPicAnimScript27.loop_u76
$65ac = PikaPicAnimScript28
$65c2 = PikaPicAnimScript28.loop_u28
$65c2 = PikaPicAnimScript28.loop_u77
$65c6 = PikaPicAnimGFXHeaders
$65ca = Pic_e4000_id
$65ce = GFX_e40cc_id
Expand Down
Loading

0 comments on commit 290b7f7

Please sign in to comment.