diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 000c5e2..017c7f3 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index 133ff74..7c11296 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -583,172 +583,182 @@ ROMX bank #3: ROMX bank #4: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_TITLE"] - SECTION: $4008-$4758 ($0751 bytes) ["Title Functions Banked"] - $4008 = SwitchToTitleB - $400e = SwitchToTitleB.wvr_u1 - $4017 = !0 - $403a = SwitchToTitleB.wvb_u2 - $4041 = SwitchToTitleB.wvbe_u3 - $4047 = SwitchTitleMode - $4058 = SwitchTitleMode.wvr_u4 - $4061 = !1 - $406c = SwitchTitleMode.jumps - $407b = SwitchTitleMode.switchMain - $40a8 = SwitchTitleMode.notsgb - $40c9 = SwitchTitleMode.notmgb - $40f1 = SwitchTitleMode.agb - $410b = SwitchTitleMode.done - $4113 = SwitchTitleMode.switchProfile - $411b = SwitchTitleMode.switchSettings - $412f = SwitchTitleMode.switchRecords - $4137 = SwitchTitleMode.switchCredits - $413f = TitleEventLoopHandlerB - $414d = TitleEventLoopHandlerB.jumps - $415c = TitleEventLoopHandlerB.eventLoopMain - $417f = TitleEventLoopHandlerB.d0 - $4193 = TitleEventLoopHandlerB.eventLoopProfile - $4194 = TitleEventLoopHandlerB.eventLoopSettings - $41be = TitleEventLoopHandlerB.d1 - $41d3 = TitleEventLoopHandlerB.l1 - $41e8 = TitleEventLoopHandlerB.r1 - $41fc = TitleEventLoopHandlerB.eventLoopRecords - $41fd = TitleEventLoopHandlerB.eventLoopCredits - $41fe = TitleVBlankHandlerB - $420c = TitleVBlankHandlerB.jumps - $421b = TitleVBlankHandlerB.vblankMain - $4225 = TitleVBlankHandlerB.notselected_u5 - $422a = TitleVBlankHandlerB.selected_u5 - $422d = TitleVBlankHandlerB.done_u5 - $4237 = TitleVBlankHandlerB.notselected_u6 - $423c = TitleVBlankHandlerB.selected_u6 - $423f = TitleVBlankHandlerB.done_u6 - $4249 = TitleVBlankHandlerB.notselected_u7 - $424e = TitleVBlankHandlerB.selected_u7 - $4251 = TitleVBlankHandlerB.done_u7 - $425b = TitleVBlankHandlerB.notselected_u8 - $4260 = TitleVBlankHandlerB.selected_u8 - $4263 = TitleVBlankHandlerB.done_u8 - $426d = TitleVBlankHandlerB.notselected_u9 - $4272 = TitleVBlankHandlerB.selected_u9 - $4275 = TitleVBlankHandlerB.done_u9 - $427f = TitleVBlankHandlerB.notselected_u10 - $4284 = TitleVBlankHandlerB.selected_u10 - $4287 = TitleVBlankHandlerB.done_u10 - $4311 = TitleVBlankHandlerB.disabled - $431d = TitleVBlankHandlerB.profile - $432c = TitleVBlankHandlerB.vblankProfile - $432d = TitleVBlankHandlerB.vblankSettings - $4337 = TitleVBlankHandlerB.notselected_u11 - $433c = TitleVBlankHandlerB.selected_u11 - $433f = TitleVBlankHandlerB.done_u11 - $4349 = TitleVBlankHandlerB.notselected_u12 - $434e = TitleVBlankHandlerB.selected_u12 - $4351 = TitleVBlankHandlerB.done_u12 - $435b = TitleVBlankHandlerB.notselected_u13 - $4360 = TitleVBlankHandlerB.selected_u13 - $4363 = TitleVBlankHandlerB.done_u13 - $436d = TitleVBlankHandlerB.notselected_u14 - $4372 = TitleVBlankHandlerB.selected_u14 - $4375 = TitleVBlankHandlerB.done_u14 - $437f = TitleVBlankHandlerB.notselected_u15 - $4384 = TitleVBlankHandlerB.selected_u15 - $4387 = TitleVBlankHandlerB.done_u15 - $4391 = TitleVBlankHandlerB.notselected_u16 - $4396 = TitleVBlankHandlerB.selected_u16 - $4399 = TitleVBlankHandlerB.done_u16 - $43a3 = TitleVBlankHandlerB.notselected_u17 - $43a8 = TitleVBlankHandlerB.selected_u17 - $43ab = TitleVBlankHandlerB.done_u17 - $43b5 = TitleVBlankHandlerB.notselected_u18 - $43ba = TitleVBlankHandlerB.selected_u18 - $43bd = TitleVBlankHandlerB.done_u18 - $4447 = TitleVBlankHandlerB.disabled1 - $4453 = TitleVBlankHandlerB.buttons - $446f = TitleVBlankHandlerB.vblankRecords - $4470 = TitleVBlankHandlerB.vblankCredits - $4471 = MainHandleA - $447f = MainHandleA.jumps - $4491 = MainHandleA.tosettings - $4496 = MainHandleUp - $44a2 = !2 - $44a8 = MainHandleDown - $44b4 = !3 - $44b9 = SettingsHandleA - $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 + SECTION: $4008-$47ef ($07e8 bytes) ["Title Screen Static Data"] + $4008 = sEasterM0 + $400d = sEasterM1 + $4012 = sEasterC0 + $401d = sEasterC1 + $4028 = sEasterA0 + $4033 = sEasterA1 + $403e = sEasterS0 + $4043 = sEasterS1 + $4048 = sBUTTONSMode + $4050 = sRNGMode + $4064 = sROTMode + $4074 = sDROPMode + $4088 = sCURVEMode + $40a4 = sHIGMode + $40ac = sDisabled + $40b0 = sTetryButtons + $40f0 = sTetryRNG + $4130 = sTetryROT + $4170 = sTetryDROP + $41b0 = sTetryCURVE + $41f0 = sTetryHIG + $4230 = sTetrySTART + $4270 = sTetryEXIT + $42b0 = sTitleScreenMainMap + $4550 = sTitleScreenSettingsMap + $4550 = sTitleScreenMainMapEnd + $47f0 = sTitleScreenSettingsMapEnd + SECTION: $47f0-$4f77 ($0788 bytes) ["Title Functions Banked"] + $47f0 = SwitchToTitleB + $47f6 = SwitchToTitleB.wvr_u1 + $47ff = !0 + $4822 = SwitchToTitleB.wvb_u2 + $4829 = SwitchToTitleB.wvbe_u3 + $482f = SwitchTitleMode + $4840 = SwitchTitleMode.wvr_u4 + $4849 = !1 + $4854 = SwitchTitleMode.jumps + $4863 = SwitchTitleMode.switchMain + $4890 = SwitchTitleMode.notsgb + $48b1 = SwitchTitleMode.notmgb + $48d9 = SwitchTitleMode.agb + $48f3 = SwitchTitleMode.done + $48fb = SwitchTitleMode.switchProfile + $4903 = SwitchTitleMode.switchSettings + $4917 = SwitchTitleMode.switchRecords + $491f = SwitchTitleMode.switchCredits + $4927 = TitleEventLoopHandlerB + $4935 = TitleEventLoopHandlerB.jumps + $4944 = TitleEventLoopHandlerB.eventLoopMain + $4967 = TitleEventLoopHandlerB.d0 + $497b = TitleEventLoopHandlerB.eventLoopProfile + $497c = TitleEventLoopHandlerB.eventLoopSettings + $49a6 = TitleEventLoopHandlerB.d1 + $49bb = TitleEventLoopHandlerB.l1 + $49d0 = TitleEventLoopHandlerB.r1 + $49e4 = TitleEventLoopHandlerB.eventLoopRecords + $49e5 = TitleEventLoopHandlerB.eventLoopCredits + $49e6 = TitleVBlankHandlerB + $49f4 = TitleVBlankHandlerB.jumps + $4a03 = TitleVBlankHandlerB.vblankMain + $4a0d = TitleVBlankHandlerB.notselected_u5 + $4a12 = TitleVBlankHandlerB.selected_u5 + $4a15 = TitleVBlankHandlerB.done_u5 + $4a1f = TitleVBlankHandlerB.notselected_u6 + $4a24 = TitleVBlankHandlerB.selected_u6 + $4a27 = TitleVBlankHandlerB.done_u6 + $4a31 = TitleVBlankHandlerB.notselected_u7 + $4a36 = TitleVBlankHandlerB.selected_u7 + $4a39 = TitleVBlankHandlerB.done_u7 + $4a43 = TitleVBlankHandlerB.notselected_u8 + $4a48 = TitleVBlankHandlerB.selected_u8 + $4a4b = TitleVBlankHandlerB.done_u8 + $4a55 = TitleVBlankHandlerB.notselected_u9 + $4a5a = TitleVBlankHandlerB.selected_u9 + $4a5d = TitleVBlankHandlerB.done_u9 + $4a67 = TitleVBlankHandlerB.notselected_u10 + $4a6c = TitleVBlankHandlerB.selected_u10 + $4a6f = TitleVBlankHandlerB.done_u10 + $4af9 = TitleVBlankHandlerB.disabled + $4b05 = TitleVBlankHandlerB.profile + $4b14 = TitleVBlankHandlerB.vblankProfile + $4b15 = TitleVBlankHandlerB.vblankSettings + $4b1f = TitleVBlankHandlerB.notselected_u11 + $4b24 = TitleVBlankHandlerB.selected_u11 + $4b27 = TitleVBlankHandlerB.done_u11 + $4b31 = TitleVBlankHandlerB.notselected_u12 + $4b36 = TitleVBlankHandlerB.selected_u12 + $4b39 = TitleVBlankHandlerB.done_u12 + $4b43 = TitleVBlankHandlerB.notselected_u13 + $4b48 = TitleVBlankHandlerB.selected_u13 + $4b4b = TitleVBlankHandlerB.done_u13 + $4b55 = TitleVBlankHandlerB.notselected_u14 + $4b5a = TitleVBlankHandlerB.selected_u14 + $4b5d = TitleVBlankHandlerB.done_u14 + $4b67 = TitleVBlankHandlerB.notselected_u15 + $4b6c = TitleVBlankHandlerB.selected_u15 + $4b6f = TitleVBlankHandlerB.done_u15 + $4b79 = TitleVBlankHandlerB.notselected_u16 + $4b7e = TitleVBlankHandlerB.selected_u16 + $4b81 = TitleVBlankHandlerB.done_u16 + $4b8b = TitleVBlankHandlerB.notselected_u17 + $4b90 = TitleVBlankHandlerB.selected_u17 + $4b93 = TitleVBlankHandlerB.done_u17 + $4b9d = TitleVBlankHandlerB.notselected_u18 + $4ba2 = TitleVBlankHandlerB.selected_u18 + $4ba5 = TitleVBlankHandlerB.done_u18 + $4c2f = TitleVBlankHandlerB.disabled1 + $4c3b = TitleVBlankHandlerB.buttons + $4c60 = !2 + $4c68 = TitleVBlankHandlerB.donetetry + $4c8e = TitleVBlankHandlerB.vblankRecords + $4c8f = TitleVBlankHandlerB.vblankCredits + $4c90 = MainHandleA + $4c9e = MainHandleA.jumps + $4cb0 = MainHandleA.tosettings + $4cb5 = MainHandleUp + $4cc1 = !3 + $4cc7 = MainHandleDown + $4cd3 = !4 + $4cd8 = SettingsHandleA + $4ce5 = SettingsHandleB + $4cea = SettingsHandleDown + $4cf6 = !5 + $4cfb = SettingsHandleUp + $4d07 = !6 + $4d0d = SettingsHandleLeft + $4d1e = SettingsHandleLeft.jumps + $4d36 = SettingsHandleLeft.buttons + $4d45 = !7 + $4d4e = SettingsHandleLeft.rng + $4d5d = !8 + $4d66 = SettingsHandleLeft.rot + $4d75 = !9 + $4d7e = SettingsHandleLeft.drop + $4d8d = !10 + $4d96 = SettingsHandleLeft.curve + $4da8 = !11 + $4db4 = SettingsHandleLeft.hig + $4dc3 = !12 + $4dcc = SettingsHandleRight + $4ddd = SettingsHandleRight.jumps + $4df5 = SettingsHandleRight.buttons + $4e04 = !13 + $4e0c = SettingsHandleRight.rng + $4e1b = !14 + $4e23 = SettingsHandleRight.rot + $4e32 = !15 + $4e3a = SettingsHandleRight.drop + $4e49 = !16 + $4e51 = SettingsHandleRight.curve + $4e63 = !17 + $4e6e = SettingsHandleRight.hig + $4e7d = !18 + $4e85 = DecrementLevel + $4e9e = IncrementLevel + $4eb7 = InitSpeedCurve + $4eca = GetEnd + $4ed5 = !19 + $4edd = !20 + $4ee5 = !21 + $4eed = !22 + $4ef5 = !23 + $4efd = !24 + $4f01 = GetStart + $4f0c = !25 + $4f14 = !26 + $4f1c = !27 + $4f24 = !28 + $4f2c = !29 + $4f34 = !30 + $4f38 = CheckLevelRange + $4f54 = CheckLevelRange.notatend + $4f77 = CheckLevelRange.notatstart + EMPTY: $4f78-$7fff ($3088 bytes) + TOTAL EMPTY: $3088 bytes ROMX bank #5: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_GAMEPLAY"] @@ -2654,7 +2664,7 @@ HRAM bank #0: SUMMARY: ROM0: 13160 bytes used / 3224 free - ROMX: 61489 bytes used / 36815 free in 6 banks + ROMX: 62056 bytes used / 36248 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 4208773..9d7e23b 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index 3a56fd6..9a9bc98 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -446,138 +446,147 @@ 02:6b59 sSFXLockEnd 03:4008 sMusicMenu 03:6ac1 sMusicMenuEnd -04:4008 SwitchToTitleB -04:400e SwitchToTitleB.wvr_u1 -04:403a SwitchToTitleB.wvb_u2 -04:4041 SwitchToTitleB.wvbe_u3 -04:4047 SwitchTitleMode -04:4058 SwitchTitleMode.wvr_u4 -04:406c SwitchTitleMode.jumps -04:407b SwitchTitleMode.switchMain -04:40a8 SwitchTitleMode.notsgb -04:40c9 SwitchTitleMode.notmgb -04:40f1 SwitchTitleMode.agb -04:410b SwitchTitleMode.done -04:4113 SwitchTitleMode.switchProfile -04:411b SwitchTitleMode.switchSettings -04:412f SwitchTitleMode.switchRecords -04:4137 SwitchTitleMode.switchCredits -04:413f TitleEventLoopHandlerB -04:414d TitleEventLoopHandlerB.jumps -04:415c TitleEventLoopHandlerB.eventLoopMain -04:417f TitleEventLoopHandlerB.d0 -04:4193 TitleEventLoopHandlerB.eventLoopProfile -04:4194 TitleEventLoopHandlerB.eventLoopSettings -04:41be TitleEventLoopHandlerB.d1 -04:41d3 TitleEventLoopHandlerB.l1 -04:41e8 TitleEventLoopHandlerB.r1 -04:41fc TitleEventLoopHandlerB.eventLoopRecords -04:41fd TitleEventLoopHandlerB.eventLoopCredits -04:41fe TitleVBlankHandlerB -04:420c TitleVBlankHandlerB.jumps -04:421b TitleVBlankHandlerB.vblankMain -04:4225 TitleVBlankHandlerB.notselected_u5 -04:422a TitleVBlankHandlerB.selected_u5 -04:422d TitleVBlankHandlerB.done_u5 -04:4237 TitleVBlankHandlerB.notselected_u6 -04:423c TitleVBlankHandlerB.selected_u6 -04:423f TitleVBlankHandlerB.done_u6 -04:4249 TitleVBlankHandlerB.notselected_u7 -04:424e TitleVBlankHandlerB.selected_u7 -04:4251 TitleVBlankHandlerB.done_u7 -04:425b TitleVBlankHandlerB.notselected_u8 -04:4260 TitleVBlankHandlerB.selected_u8 -04:4263 TitleVBlankHandlerB.done_u8 -04:426d TitleVBlankHandlerB.notselected_u9 -04:4272 TitleVBlankHandlerB.selected_u9 -04:4275 TitleVBlankHandlerB.done_u9 -04:427f TitleVBlankHandlerB.notselected_u10 -04:4284 TitleVBlankHandlerB.selected_u10 -04:4287 TitleVBlankHandlerB.done_u10 -04:4311 TitleVBlankHandlerB.disabled -04:431d TitleVBlankHandlerB.profile -04:432c TitleVBlankHandlerB.vblankProfile -04:432d TitleVBlankHandlerB.vblankSettings -04:4337 TitleVBlankHandlerB.notselected_u11 -04:433c TitleVBlankHandlerB.selected_u11 -04:433f TitleVBlankHandlerB.done_u11 -04:4349 TitleVBlankHandlerB.notselected_u12 -04:434e TitleVBlankHandlerB.selected_u12 -04:4351 TitleVBlankHandlerB.done_u12 -04:435b TitleVBlankHandlerB.notselected_u13 -04:4360 TitleVBlankHandlerB.selected_u13 -04:4363 TitleVBlankHandlerB.done_u13 -04:436d TitleVBlankHandlerB.notselected_u14 -04:4372 TitleVBlankHandlerB.selected_u14 -04:4375 TitleVBlankHandlerB.done_u14 -04:437f TitleVBlankHandlerB.notselected_u15 -04:4384 TitleVBlankHandlerB.selected_u15 -04:4387 TitleVBlankHandlerB.done_u15 -04:4391 TitleVBlankHandlerB.notselected_u16 -04:4396 TitleVBlankHandlerB.selected_u16 -04:4399 TitleVBlankHandlerB.done_u16 -04:43a3 TitleVBlankHandlerB.notselected_u17 -04:43a8 TitleVBlankHandlerB.selected_u17 -04:43ab TitleVBlankHandlerB.done_u17 -04:43b5 TitleVBlankHandlerB.notselected_u18 -04:43ba TitleVBlankHandlerB.selected_u18 -04:43bd TitleVBlankHandlerB.done_u18 -04:4447 TitleVBlankHandlerB.disabled1 -04:4453 TitleVBlankHandlerB.buttons -04:446f TitleVBlankHandlerB.vblankRecords -04:4470 TitleVBlankHandlerB.vblankCredits -04:4471 MainHandleA -04:447f MainHandleA.jumps -04:4491 MainHandleA.tosettings -04:4496 MainHandleUp -04:44a8 MainHandleDown -04:44b9 SettingsHandleA -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 +04:4008 sEasterM0 +04:400d sEasterM1 +04:4012 sEasterC0 +04:401d sEasterC1 +04:4028 sEasterA0 +04:4033 sEasterA1 +04:403e sEasterS0 +04:4043 sEasterS1 +04:4048 sBUTTONSMode +04:4050 sRNGMode +04:4064 sROTMode +04:4074 sDROPMode +04:4088 sCURVEMode +04:40a4 sHIGMode +04:40ac sDisabled +04:40b0 sTetryButtons +04:40f0 sTetryRNG +04:4130 sTetryROT +04:4170 sTetryDROP +04:41b0 sTetryCURVE +04:41f0 sTetryHIG +04:4230 sTetrySTART +04:4270 sTetryEXIT +04:42b0 sTitleScreenMainMap +04:4550 sTitleScreenSettingsMap +04:4550 sTitleScreenMainMapEnd +04:47f0 sTitleScreenSettingsMapEnd +04:47f0 SwitchToTitleB +04:47f6 SwitchToTitleB.wvr_u1 +04:4822 SwitchToTitleB.wvb_u2 +04:4829 SwitchToTitleB.wvbe_u3 +04:482f SwitchTitleMode +04:4840 SwitchTitleMode.wvr_u4 +04:4854 SwitchTitleMode.jumps +04:4863 SwitchTitleMode.switchMain +04:4890 SwitchTitleMode.notsgb +04:48b1 SwitchTitleMode.notmgb +04:48d9 SwitchTitleMode.agb +04:48f3 SwitchTitleMode.done +04:48fb SwitchTitleMode.switchProfile +04:4903 SwitchTitleMode.switchSettings +04:4917 SwitchTitleMode.switchRecords +04:491f SwitchTitleMode.switchCredits +04:4927 TitleEventLoopHandlerB +04:4935 TitleEventLoopHandlerB.jumps +04:4944 TitleEventLoopHandlerB.eventLoopMain +04:4967 TitleEventLoopHandlerB.d0 +04:497b TitleEventLoopHandlerB.eventLoopProfile +04:497c TitleEventLoopHandlerB.eventLoopSettings +04:49a6 TitleEventLoopHandlerB.d1 +04:49bb TitleEventLoopHandlerB.l1 +04:49d0 TitleEventLoopHandlerB.r1 +04:49e4 TitleEventLoopHandlerB.eventLoopRecords +04:49e5 TitleEventLoopHandlerB.eventLoopCredits +04:49e6 TitleVBlankHandlerB +04:49f4 TitleVBlankHandlerB.jumps +04:4a03 TitleVBlankHandlerB.vblankMain +04:4a0d TitleVBlankHandlerB.notselected_u5 +04:4a12 TitleVBlankHandlerB.selected_u5 +04:4a15 TitleVBlankHandlerB.done_u5 +04:4a1f TitleVBlankHandlerB.notselected_u6 +04:4a24 TitleVBlankHandlerB.selected_u6 +04:4a27 TitleVBlankHandlerB.done_u6 +04:4a31 TitleVBlankHandlerB.notselected_u7 +04:4a36 TitleVBlankHandlerB.selected_u7 +04:4a39 TitleVBlankHandlerB.done_u7 +04:4a43 TitleVBlankHandlerB.notselected_u8 +04:4a48 TitleVBlankHandlerB.selected_u8 +04:4a4b TitleVBlankHandlerB.done_u8 +04:4a55 TitleVBlankHandlerB.notselected_u9 +04:4a5a TitleVBlankHandlerB.selected_u9 +04:4a5d TitleVBlankHandlerB.done_u9 +04:4a67 TitleVBlankHandlerB.notselected_u10 +04:4a6c TitleVBlankHandlerB.selected_u10 +04:4a6f TitleVBlankHandlerB.done_u10 +04:4af9 TitleVBlankHandlerB.disabled +04:4b05 TitleVBlankHandlerB.profile +04:4b14 TitleVBlankHandlerB.vblankProfile +04:4b15 TitleVBlankHandlerB.vblankSettings +04:4b1f TitleVBlankHandlerB.notselected_u11 +04:4b24 TitleVBlankHandlerB.selected_u11 +04:4b27 TitleVBlankHandlerB.done_u11 +04:4b31 TitleVBlankHandlerB.notselected_u12 +04:4b36 TitleVBlankHandlerB.selected_u12 +04:4b39 TitleVBlankHandlerB.done_u12 +04:4b43 TitleVBlankHandlerB.notselected_u13 +04:4b48 TitleVBlankHandlerB.selected_u13 +04:4b4b TitleVBlankHandlerB.done_u13 +04:4b55 TitleVBlankHandlerB.notselected_u14 +04:4b5a TitleVBlankHandlerB.selected_u14 +04:4b5d TitleVBlankHandlerB.done_u14 +04:4b67 TitleVBlankHandlerB.notselected_u15 +04:4b6c TitleVBlankHandlerB.selected_u15 +04:4b6f TitleVBlankHandlerB.done_u15 +04:4b79 TitleVBlankHandlerB.notselected_u16 +04:4b7e TitleVBlankHandlerB.selected_u16 +04:4b81 TitleVBlankHandlerB.done_u16 +04:4b8b TitleVBlankHandlerB.notselected_u17 +04:4b90 TitleVBlankHandlerB.selected_u17 +04:4b93 TitleVBlankHandlerB.done_u17 +04:4b9d TitleVBlankHandlerB.notselected_u18 +04:4ba2 TitleVBlankHandlerB.selected_u18 +04:4ba5 TitleVBlankHandlerB.done_u18 +04:4c2f TitleVBlankHandlerB.disabled1 +04:4c3b TitleVBlankHandlerB.buttons +04:4c68 TitleVBlankHandlerB.donetetry +04:4c8e TitleVBlankHandlerB.vblankRecords +04:4c8f TitleVBlankHandlerB.vblankCredits +04:4c90 MainHandleA +04:4c9e MainHandleA.jumps +04:4cb0 MainHandleA.tosettings +04:4cb5 MainHandleUp +04:4cc7 MainHandleDown +04:4cd8 SettingsHandleA +04:4ce5 SettingsHandleB +04:4cea SettingsHandleDown +04:4cfb SettingsHandleUp +04:4d0d SettingsHandleLeft +04:4d1e SettingsHandleLeft.jumps +04:4d36 SettingsHandleLeft.buttons +04:4d4e SettingsHandleLeft.rng +04:4d66 SettingsHandleLeft.rot +04:4d7e SettingsHandleLeft.drop +04:4d96 SettingsHandleLeft.curve +04:4db4 SettingsHandleLeft.hig +04:4dcc SettingsHandleRight +04:4ddd SettingsHandleRight.jumps +04:4df5 SettingsHandleRight.buttons +04:4e0c SettingsHandleRight.rng +04:4e23 SettingsHandleRight.rot +04:4e3a SettingsHandleRight.drop +04:4e51 SettingsHandleRight.curve +04:4e6e SettingsHandleRight.hig +04:4e85 DecrementLevel +04:4e9e IncrementLevel +04:4eb7 InitSpeedCurve +04:4eca GetEnd +04:4f01 GetStart +04:4f38 CheckLevelRange +04:4f54 CheckLevelRange.notatend +04:4f77 CheckLevelRange.notatstart 05:4008 FieldInit 05:403e FieldClear 05:4049 ToBackupField diff --git a/src/include/globals.asm b/src/include/globals.asm index 8373b17..e2992b7 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -440,6 +440,7 @@ DEF TITLE_SETTINGS_DROP EQU $98AF DEF TITLE_SETTINGS_SCURVE EQU $98CF DEF TITLE_SETTINGS_HIG EQU $98EF DEF TITLE_SETTINGS_START EQU $990F +DEF TITLE_SETTINGS_TETRY EQU $99C0 DEF TITLE_SETTINGS_SEL_BACK EQU 7 diff --git a/src/res/title_data.inc b/src/res/title_data.inc index 9b639c1..b1be37a 100644 --- a/src/res/title_data.inc +++ b/src/res/title_data.inc @@ -75,6 +75,54 @@ sHIGMode:: sDisabled:: db "----" +sTetryButtons:: + db "THIS OPTION WILL" + db "CHANGE WHICH WAY" + db "THE BUTTONS RO- " + db "TATE THE PIECE " + +sTetryRNG:: + db "THIS OPTION WILL" + db "CHANGE THE WAY " + db "PIECES ARE RAN- " + db "DOMIZED " + +sTetryROT:: + db "THIS OPTION WILL" + db "CHANGE THE WAY " + db "PIECES ROTATE " + db " " + +sTetryDROP:: + db "THIS OPTION WILL" + db "CHANGE THE WAY " + db "THE UP AND DOWN " + db "ARROWS ACT " + +sTetryCURVE:: + db "THIS OPTION WILL" + db "SELECT A SPEED " + db "CURVE TO PLAY ON" + db " " + +sTetryHIG:: + db "THIS OPTION WILL" + db "FORCE PIECES TO " + db "DROP AT THE HI- " + db "GHEST SPEED " + +sTetrySTART:: + db "THIS OPTION WILL" + db "CHANGE WHERE YOU" + db "START IN THE SP-" + db "EED CURVE " + +sTetryEXIT:: + db "OH OKAY THEN- " + db "BYE BYE! " + db " " + db " " + sTitleScreenMainMap:: DB $70,$01,$01,$01,$72,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$FD,$FE,$FF diff --git a/src/state_title.asm b/src/state_title.asm index bc7d0b6..de0abfe 100644 --- a/src/state_title.asm +++ b/src/state_title.asm @@ -711,7 +711,32 @@ TitleVBlankHandlerB: call UnsafeMemCopy ; START level. - jp DrawSpeedSettings + call DrawSpeedSettings + + ; Tetry! + ld a, [wSelected] + ld hl, sTetryButtons + ld bc, 64 +: cp a, 0 + jr z, .donetetry + dec a + add hl, bc + jr :- +.donetetry + ld d, h + ld e, l + ld hl, TITLE_SETTINGS_TETRY + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_SETTINGS_TETRY+(1*32) + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_SETTINGS_TETRY+(2*32) + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_SETTINGS_TETRY+(3*32) + ld bc, 16 + jp SafeMemCopy .vblankRecords ret