diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 9e8fff1..fdaa480 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index b87c06d..133ff74 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -583,7 +583,7 @@ ROMX bank #3: ROMX bank #4: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_TITLE"] - SECTION: $4008-$4756 ($074f bytes) ["Title Functions Banked"] + SECTION: $4008-$4758 ($0751 bytes) ["Title Functions Banked"] $4008 = SwitchToTitleB $400e = SwitchToTitleB.wvr_u1 $4017 = !0 @@ -674,81 +674,81 @@ ROMX bank #4: $44a8 = MainHandleDown $44b4 = !3 $44b9 = SettingsHandleA - $44c4 = SettingsHandleB - $44c9 = SettingsHandleDown - $44d5 = !4 - $44da = SettingsHandleUp - $44e6 = !5 - $44ec = SettingsHandleLeft - $44fd = SettingsHandleLeft.jumps - $4515 = SettingsHandleLeft.buttons - $4524 = !6 - $452d = SettingsHandleLeft.rng - $453c = !7 - $4545 = SettingsHandleLeft.rot - $4554 = !8 - $455d = SettingsHandleLeft.drop - $456c = !9 - $4575 = SettingsHandleLeft.curve - $4587 = !10 - $4593 = SettingsHandleLeft.hig - $45a2 = !11 - $45ab = SettingsHandleRight - $45bc = SettingsHandleRight.jumps - $45d4 = SettingsHandleRight.buttons - $45e3 = !12 - $45eb = SettingsHandleRight.rng - $45fa = !13 - $4602 = SettingsHandleRight.rot - $4611 = !14 - $4619 = SettingsHandleRight.drop - $4628 = !15 - $4630 = SettingsHandleRight.curve - $4642 = !16 - $464d = SettingsHandleRight.hig - $465c = !17 - $4664 = DecrementLevel - $467d = IncrementLevel - $4696 = InitSpeedCurve - $46a9 = GetEnd - $46b4 = !18 - $46bc = !19 - $46c4 = !20 - $46cc = !21 - $46d4 = !22 - $46dc = !23 - $46e0 = GetStart - $46eb = !24 - $46f3 = !25 - $46fb = !26 - $4703 = !27 - $470b = !28 - $4713 = !29 - $4717 = CheckLevelRange - $4733 = CheckLevelRange.notatend - $4756 = CheckLevelRange.notatstart - SECTION: $4757-$4d3e ($05e8 bytes) ["Title Screen Static Data"] - $4757 = sEasterM0 - $475c = sEasterM1 - $4761 = sEasterC0 - $476c = sEasterC1 - $4777 = sEasterA0 - $4782 = sEasterA1 - $478d = sEasterS0 - $4792 = sEasterS1 - $4797 = sBUTTONSMode - $479f = sRNGMode - $47b3 = sROTMode - $47c3 = sDROPMode - $47d7 = sCURVEMode - $47f3 = sHIGMode - $47fb = sDisabled - $47ff = sTitleScreenMainMap - $4a9f = sTitleScreenSettingsMap - $4a9f = sTitleScreenMainMapEnd - $4d3f = sTitleScreenSettingsMapEnd - EMPTY: $4d3f-$7fff ($32c1 bytes) - TOTAL EMPTY: $32c1 bytes + $44c6 = SettingsHandleB + $44cb = SettingsHandleDown + $44d7 = !4 + $44dc = SettingsHandleUp + $44e8 = !5 + $44ee = SettingsHandleLeft + $44ff = SettingsHandleLeft.jumps + $4517 = SettingsHandleLeft.buttons + $4526 = !6 + $452f = SettingsHandleLeft.rng + $453e = !7 + $4547 = SettingsHandleLeft.rot + $4556 = !8 + $455f = SettingsHandleLeft.drop + $456e = !9 + $4577 = SettingsHandleLeft.curve + $4589 = !10 + $4595 = SettingsHandleLeft.hig + $45a4 = !11 + $45ad = SettingsHandleRight + $45be = SettingsHandleRight.jumps + $45d6 = SettingsHandleRight.buttons + $45e5 = !12 + $45ed = SettingsHandleRight.rng + $45fc = !13 + $4604 = SettingsHandleRight.rot + $4613 = !14 + $461b = SettingsHandleRight.drop + $462a = !15 + $4632 = SettingsHandleRight.curve + $4644 = !16 + $464f = SettingsHandleRight.hig + $465e = !17 + $4666 = DecrementLevel + $467f = IncrementLevel + $4698 = InitSpeedCurve + $46ab = GetEnd + $46b6 = !18 + $46be = !19 + $46c6 = !20 + $46ce = !21 + $46d6 = !22 + $46de = !23 + $46e2 = GetStart + $46ed = !24 + $46f5 = !25 + $46fd = !26 + $4705 = !27 + $470d = !28 + $4715 = !29 + $4719 = CheckLevelRange + $4735 = CheckLevelRange.notatend + $4758 = CheckLevelRange.notatstart + SECTION: $4759-$4d40 ($05e8 bytes) ["Title Screen Static Data"] + $4759 = sEasterM0 + $475e = sEasterM1 + $4763 = sEasterC0 + $476e = sEasterC1 + $4779 = sEasterA0 + $4784 = sEasterA1 + $478f = sEasterS0 + $4794 = sEasterS1 + $4799 = sBUTTONSMode + $47a1 = sRNGMode + $47b5 = sROTMode + $47c5 = sDROPMode + $47d9 = sCURVEMode + $47f5 = sHIGMode + $47fd = sDisabled + $4801 = sTitleScreenMainMap + $4aa1 = sTitleScreenSettingsMap + $4aa1 = sTitleScreenMainMapEnd + $4d41 = sTitleScreenSettingsMapEnd + EMPTY: $4d41-$7fff ($32bf bytes) + TOTAL EMPTY: $32bf bytes ROMX bank #5: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_GAMEPLAY"] @@ -2654,7 +2654,7 @@ HRAM bank #0: SUMMARY: ROM0: 13160 bytes used / 3224 free - ROMX: 61487 bytes used / 36817 free in 6 banks + ROMX: 61489 bytes used / 36815 free in 6 banks SRAM: 14 bytes used / 8178 free in 1 bank WRAM0: 3541 bytes used / 555 free HRAM: 124 bytes used / 3 free diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index ecae959..700834e 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index 1d45358..3a56fd6 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -532,52 +532,52 @@ 04:4496 MainHandleUp 04:44a8 MainHandleDown 04:44b9 SettingsHandleA -04:44c4 SettingsHandleB -04:44c9 SettingsHandleDown -04:44da SettingsHandleUp -04:44ec SettingsHandleLeft -04:44fd SettingsHandleLeft.jumps -04:4515 SettingsHandleLeft.buttons -04:452d SettingsHandleLeft.rng -04:4545 SettingsHandleLeft.rot -04:455d SettingsHandleLeft.drop -04:4575 SettingsHandleLeft.curve -04:4593 SettingsHandleLeft.hig -04:45ab SettingsHandleRight -04:45bc SettingsHandleRight.jumps -04:45d4 SettingsHandleRight.buttons -04:45eb SettingsHandleRight.rng -04:4602 SettingsHandleRight.rot -04:4619 SettingsHandleRight.drop -04:4630 SettingsHandleRight.curve -04:464d SettingsHandleRight.hig -04:4664 DecrementLevel -04:467d IncrementLevel -04:4696 InitSpeedCurve -04:46a9 GetEnd -04:46e0 GetStart -04:4717 CheckLevelRange -04:4733 CheckLevelRange.notatend -04:4756 CheckLevelRange.notatstart -04:4757 sEasterM0 -04:475c sEasterM1 -04:4761 sEasterC0 -04:476c sEasterC1 -04:4777 sEasterA0 -04:4782 sEasterA1 -04:478d sEasterS0 -04:4792 sEasterS1 -04:4797 sBUTTONSMode -04:479f sRNGMode -04:47b3 sROTMode -04:47c3 sDROPMode -04:47d7 sCURVEMode -04:47f3 sHIGMode -04:47fb sDisabled -04:47ff sTitleScreenMainMap -04:4a9f sTitleScreenSettingsMap -04:4a9f sTitleScreenMainMapEnd -04:4d3f sTitleScreenSettingsMapEnd +04:44c6 SettingsHandleB +04:44cb SettingsHandleDown +04:44dc SettingsHandleUp +04:44ee SettingsHandleLeft +04:44ff SettingsHandleLeft.jumps +04:4517 SettingsHandleLeft.buttons +04:452f SettingsHandleLeft.rng +04:4547 SettingsHandleLeft.rot +04:455f SettingsHandleLeft.drop +04:4577 SettingsHandleLeft.curve +04:4595 SettingsHandleLeft.hig +04:45ad SettingsHandleRight +04:45be SettingsHandleRight.jumps +04:45d6 SettingsHandleRight.buttons +04:45ed SettingsHandleRight.rng +04:4604 SettingsHandleRight.rot +04:461b SettingsHandleRight.drop +04:4632 SettingsHandleRight.curve +04:464f SettingsHandleRight.hig +04:4666 DecrementLevel +04:467f IncrementLevel +04:4698 InitSpeedCurve +04:46ab GetEnd +04:46e2 GetStart +04:4719 CheckLevelRange +04:4735 CheckLevelRange.notatend +04:4758 CheckLevelRange.notatstart +04:4759 sEasterM0 +04:475e sEasterM1 +04:4763 sEasterC0 +04:476e sEasterC1 +04:4779 sEasterA0 +04:4784 sEasterA1 +04:478f sEasterS0 +04:4794 sEasterS1 +04:4799 sBUTTONSMode +04:47a1 sRNGMode +04:47b5 sROTMode +04:47c5 sDROPMode +04:47d9 sCURVEMode +04:47f5 sHIGMode +04:47fd sDisabled +04:4801 sTitleScreenMainMap +04:4aa1 sTitleScreenSettingsMap +04:4aa1 sTitleScreenMainMapEnd +04:4d41 sTitleScreenSettingsMapEnd 05:4008 FieldInit 05:403e FieldClear 05:4049 ToBackupField diff --git a/src/state_title.asm b/src/state_title.asm index 56b0b30..bc7d0b6 100644 --- a/src/state_title.asm +++ b/src/state_title.asm @@ -771,7 +771,7 @@ MainHandleDown: SettingsHandleA: ld a, [wSelected] cp a, TITLE_SETTINGS_SEL_BACK - ret nz + jp nz, SettingsHandleRight ld a, TITLE_MAIN jp SwitchTitleMode