diff --git a/bin/DMGTRIS.GBC b/bin/DMGTRIS.GBC index 7e9fee4..41164bb 100644 Binary files a/bin/DMGTRIS.GBC and b/bin/DMGTRIS.GBC differ diff --git a/bin/DMGTRIS.map b/bin/DMGTRIS.map index 60cf378..e2d703e 100644 --- a/bin/DMGTRIS.map +++ b/bin/DMGTRIS.map @@ -696,7 +696,7 @@ ROMX bank #3: ROMX bank #4: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_TITLE"] - SECTION: $4008-$591e ($1917 bytes) ["Title Functions Banked"] + SECTION: $4008-$5959 ($1952 bytes) ["Title Functions Banked"] $4008 = SwitchToTitleB $400e = SwitchToTitleB.wvr_u1 $4017 = !0 @@ -773,490 +773,499 @@ ROMX bank #4: $4472 = TitleVBlankHandlerB.notselected_u16 $4477 = TitleVBlankHandlerB.selected_u16 $447a = TitleVBlankHandlerB.done_u16 - $4499 = TitleVBlankHandlerB.vblankSettings - $44a3 = TitleVBlankHandlerB.notselected_u17 - $44a8 = TitleVBlankHandlerB.selected_u17 - $44ab = TitleVBlankHandlerB.done_u17 - $44b5 = TitleVBlankHandlerB.notselected_u18 - $44ba = TitleVBlankHandlerB.selected_u18 - $44bd = TitleVBlankHandlerB.done_u18 - $44c7 = TitleVBlankHandlerB.notselected_u19 - $44cc = TitleVBlankHandlerB.selected_u19 - $44cf = TitleVBlankHandlerB.done_u19 - $44d9 = TitleVBlankHandlerB.notselected_u20 - $44de = TitleVBlankHandlerB.selected_u20 - $44e1 = TitleVBlankHandlerB.done_u20 - $44eb = TitleVBlankHandlerB.notselected_u21 - $44f0 = TitleVBlankHandlerB.selected_u21 - $44f3 = TitleVBlankHandlerB.done_u21 - $44fd = TitleVBlankHandlerB.notselected_u22 - $4502 = TitleVBlankHandlerB.selected_u22 - $4505 = TitleVBlankHandlerB.done_u22 - $450f = TitleVBlankHandlerB.notselected_u23 - $4514 = TitleVBlankHandlerB.selected_u23 - $4517 = TitleVBlankHandlerB.done_u23 - $4521 = TitleVBlankHandlerB.notselected_u24 - $4526 = TitleVBlankHandlerB.selected_u24 - $4529 = TitleVBlankHandlerB.done_u24 - $4533 = TitleVBlankHandlerB.notselected_u25 - $4538 = TitleVBlankHandlerB.selected_u25 - $453b = TitleVBlankHandlerB.done_u25 - $45bb = TitleVBlankHandlerB.disabled1 - $45c7 = TitleVBlankHandlerB.buttons - $45de = TitleVBlankHandlerB.filter - $4600 = !2 - $4607 = TitleVBlankHandlerB.donetetry - $462d = TitleVBlankHandlerB.vblankRecords - $4662 = TitleVBlankHandlerB.vblankCredits - $4663 = MainHandleA - $4671 = MainHandleA.jumps - $4683 = MainHandleA.tosettings - $4688 = MainHandleA.tocredits - $468d = MainHandleA.toprofile - $4692 = MainHandleA.torecords - $4697 = MainHandleUp - $46a2 = !3 - $46a8 = MainHandleDown - $46b4 = !4 - $46b9 = SettingsHandleA - $46c6 = ProfileHandleB - $46c6 = SettingsHandleB - $46cb = SettingsHandleDown - $46d7 = !5 - $46dc = SettingsHandleUp - $46e7 = !6 - $46ed = SettingsHandleLeft - $46fe = SettingsHandleLeft.jumps - $4719 = SettingsHandleLeft.buttons - $4727 = !7 - $4730 = SettingsHandleLeft.rng - $473e = !8 - $4747 = SettingsHandleLeft.rot - $4755 = !9 - $475e = SettingsHandleLeft.drop - $476c = !10 - $4775 = SettingsHandleLeft.curve - $4786 = !11 - $4792 = SettingsHandleLeft.hig - $47a0 = !12 - $47a9 = SettingsHandleLeft.filter - $47b5 = !13 - $47bd = SettingsHandleRight - $47ce = SettingsHandleRight.jumps - $47e9 = SettingsHandleRight.buttons - $47f8 = !14 - $4800 = SettingsHandleRight.rng - $480f = !15 - $4817 = SettingsHandleRight.rot - $4826 = !16 - $482e = SettingsHandleRight.drop - $483d = !17 - $4845 = SettingsHandleRight.curve - $4857 = !18 - $4862 = SettingsHandleRight.hig - $4871 = !19 - $4879 = SettingsHandleRight.filter - $4886 = !20 - $488d = ProfileHandleA - $48a1 = ProfileHandleRight - $48b5 = ProfileHandleRight.jumps - $48c4 = ProfileHandleRight.idx - $48cd = ProfileHandleRight.doit - $48d0 = ProfileHandleRight.l0 - $48da = ProfileHandleRight.doit1 - $48e1 = ProfileHandleRight.l1 - $48eb = ProfileHandleRight.doit2 - $48f2 = ProfileHandleRight.l2 - $48fc = ProfileHandleRight.doit3 - $4903 = ProfileHandleLeft - $4917 = ProfileHandleLeft.jumps - $4926 = ProfileHandleLeft.idx - $4930 = ProfileHandleLeft.doit - $4933 = ProfileHandleLeft.l0 - $493d = ProfileHandleLeft.doit1 - $4944 = ProfileHandleLeft.l1 - $494e = ProfileHandleLeft.doit2 - $4955 = ProfileHandleLeft.l2 - $495f = ProfileHandleLeft.doit3 - $4966 = ProfileHandleDown - $4972 = !21 - $4977 = ProfileHandleUp - $4982 = !22 - $4988 = DecrementLevel - $499e = IncrementLevel - $49b4 = InitSpeedCurve - $49c3 = GetEnd - $49ce = !23 - $49d6 = !24 - $49de = !25 - $49e6 = !26 - $49ee = !27 - $49f6 = !28 - $49fa = GetStart - $4a05 = !29 - $4a0d = !30 - $4a15 = !31 - $4a1d = !32 - $4a25 = !33 - $4a2d = !34 - $4a31 = CheckLevelRange - $4a4a = CheckLevelRange.notatend - $4a6a = CheckLevelRange.notatstart - $4a6b = RecordsHandleLeft - $4a81 = !35 - $4a89 = RecordsHandleRight - $4aa0 = !36 - $4aa7 = RecordsHandleSelect - $4ab0 = RenderScores - $4ab0 = !37 - $4ad9 = RenderScores.score_u26 - $4ade = RenderScores.wvr_u27 - $4aeb = RenderScores.wvr_u28 - $4af8 = RenderScores.wvr_u29 - $4b05 = RenderScores.wvr_u30 - $4b12 = RenderScores.wvr_u31 - $4b1f = RenderScores.wvr_u32 - $4b2c = RenderScores.wvr_u33 - $4b39 = RenderScores.wvr_u34 - $4b43 = RenderScores.level_u26 - $4b50 = RenderScores.wvr_u35 - $4b5b = RenderScores.wvr_u36 - $4b66 = RenderScores.wvr_u37 - $4b71 = RenderScores.wvr_u38 - $4b7e = RenderScores.wvr_u39 - $4b8b = RenderScores.wvr_u40 - $4b98 = RenderScores.wvr_u41 - $4ba5 = RenderScores.wvr_u42 - $4bb7 = RenderScores.name_u26 - $4bbe = RenderScores.wvr_u43 - $4bc9 = RenderScores.wvr_u44 - $4bd4 = RenderScores.wvr_u45 - $4be6 = RenderScores.nograde_u26 - $4be9 = RenderScores.wvr_u46 - $4bf3 = RenderScores.grade_u26 - $4bf6 = RenderScores.wvr_u47 - $4bfe = RenderScores.postgrade_u26 - $4c03 = RenderScores.wvr_u48 - $4c10 = RenderScores.wvr_u49 - $4c1d = RenderScores.wvr_u50 - $4c2a = RenderScores.wvr_u51 - $4c47 = RenderScores.score_u52 - $4c4c = RenderScores.wvr_u53 - $4c59 = RenderScores.wvr_u54 - $4c66 = RenderScores.wvr_u55 - $4c73 = RenderScores.wvr_u56 - $4c80 = RenderScores.wvr_u57 - $4c8d = RenderScores.wvr_u58 - $4c9a = RenderScores.wvr_u59 - $4ca7 = RenderScores.wvr_u60 - $4cb1 = RenderScores.level_u52 - $4cbe = RenderScores.wvr_u61 - $4cc9 = RenderScores.wvr_u62 - $4cd4 = RenderScores.wvr_u63 - $4cdf = RenderScores.wvr_u64 - $4cec = RenderScores.wvr_u65 - $4cf9 = RenderScores.wvr_u66 - $4d06 = RenderScores.wvr_u67 - $4d13 = RenderScores.wvr_u68 - $4d25 = RenderScores.name_u52 - $4d2c = RenderScores.wvr_u69 - $4d37 = RenderScores.wvr_u70 - $4d42 = RenderScores.wvr_u71 - $4d54 = RenderScores.nograde_u52 - $4d57 = RenderScores.wvr_u72 - $4d61 = RenderScores.grade_u52 - $4d64 = RenderScores.wvr_u73 - $4d6c = RenderScores.postgrade_u52 - $4d71 = RenderScores.wvr_u74 - $4d7e = RenderScores.wvr_u75 - $4d8b = RenderScores.wvr_u76 - $4d98 = RenderScores.wvr_u77 - $4db5 = RenderScores.score_u78 - $4dba = RenderScores.wvr_u79 - $4dc7 = RenderScores.wvr_u80 - $4dd4 = RenderScores.wvr_u81 - $4de1 = RenderScores.wvr_u82 - $4dee = RenderScores.wvr_u83 - $4dfb = RenderScores.wvr_u84 - $4e08 = RenderScores.wvr_u85 - $4e15 = RenderScores.wvr_u86 - $4e1f = RenderScores.level_u78 - $4e2c = RenderScores.wvr_u87 - $4e37 = RenderScores.wvr_u88 - $4e42 = RenderScores.wvr_u89 - $4e4d = RenderScores.wvr_u90 - $4e5a = RenderScores.wvr_u91 - $4e67 = RenderScores.wvr_u92 - $4e74 = RenderScores.wvr_u93 - $4e81 = RenderScores.wvr_u94 - $4e93 = RenderScores.name_u78 - $4e9a = RenderScores.wvr_u95 - $4ea5 = RenderScores.wvr_u96 - $4eb0 = RenderScores.wvr_u97 - $4ec2 = RenderScores.nograde_u78 - $4ec5 = RenderScores.wvr_u98 - $4ecf = RenderScores.grade_u78 - $4ed2 = RenderScores.wvr_u99 - $4eda = RenderScores.postgrade_u78 - $4edf = RenderScores.wvr_u100 - $4eec = RenderScores.wvr_u101 - $4ef9 = RenderScores.wvr_u102 - $4f06 = RenderScores.wvr_u103 - $4f23 = RenderScores.score_u104 - $4f28 = RenderScores.wvr_u105 - $4f35 = RenderScores.wvr_u106 - $4f42 = RenderScores.wvr_u107 - $4f4f = RenderScores.wvr_u108 - $4f5c = RenderScores.wvr_u109 - $4f69 = RenderScores.wvr_u110 - $4f76 = RenderScores.wvr_u111 - $4f83 = RenderScores.wvr_u112 - $4f8d = RenderScores.level_u104 - $4f9a = RenderScores.wvr_u113 - $4fa5 = RenderScores.wvr_u114 - $4fb0 = RenderScores.wvr_u115 - $4fbb = RenderScores.wvr_u116 - $4fc8 = RenderScores.wvr_u117 - $4fd5 = RenderScores.wvr_u118 - $4fe2 = RenderScores.wvr_u119 - $4fef = RenderScores.wvr_u120 - $5001 = RenderScores.name_u104 - $5008 = RenderScores.wvr_u121 - $5013 = RenderScores.wvr_u122 - $501e = RenderScores.wvr_u123 - $5030 = RenderScores.nograde_u104 - $5033 = RenderScores.wvr_u124 - $503d = RenderScores.grade_u104 - $5040 = RenderScores.wvr_u125 - $5048 = RenderScores.postgrade_u104 - $504d = RenderScores.wvr_u126 - $505a = RenderScores.wvr_u127 - $5067 = RenderScores.wvr_u128 - $5074 = RenderScores.wvr_u129 - $5091 = RenderScores.score_u130 - $5096 = RenderScores.wvr_u131 - $50a3 = RenderScores.wvr_u132 - $50b0 = RenderScores.wvr_u133 - $50bd = RenderScores.wvr_u134 - $50ca = RenderScores.wvr_u135 - $50d7 = RenderScores.wvr_u136 - $50e4 = RenderScores.wvr_u137 - $50f1 = RenderScores.wvr_u138 - $50fb = RenderScores.level_u130 - $5108 = RenderScores.wvr_u139 - $5113 = RenderScores.wvr_u140 - $511e = RenderScores.wvr_u141 - $5129 = RenderScores.wvr_u142 - $5136 = RenderScores.wvr_u143 - $5143 = RenderScores.wvr_u144 - $5150 = RenderScores.wvr_u145 - $515d = RenderScores.wvr_u146 - $516f = RenderScores.name_u130 - $5176 = RenderScores.wvr_u147 - $5181 = RenderScores.wvr_u148 - $518c = RenderScores.wvr_u149 - $519e = RenderScores.nograde_u130 - $51a1 = RenderScores.wvr_u150 - $51ab = RenderScores.grade_u130 - $51ae = RenderScores.wvr_u151 - $51b6 = RenderScores.postgrade_u130 - $51bb = RenderScores.wvr_u152 - $51c8 = RenderScores.wvr_u153 - $51d5 = RenderScores.wvr_u154 - $51e2 = RenderScores.wvr_u155 - $51ff = RenderScores.score_u156 - $5204 = RenderScores.wvr_u157 - $5211 = RenderScores.wvr_u158 - $521e = RenderScores.wvr_u159 - $522b = RenderScores.wvr_u160 - $5238 = RenderScores.wvr_u161 - $5245 = RenderScores.wvr_u162 - $5252 = RenderScores.wvr_u163 - $525f = RenderScores.wvr_u164 - $5269 = RenderScores.level_u156 - $5276 = RenderScores.wvr_u165 - $5281 = RenderScores.wvr_u166 - $528c = RenderScores.wvr_u167 - $5297 = RenderScores.wvr_u168 - $52a4 = RenderScores.wvr_u169 - $52b1 = RenderScores.wvr_u170 - $52be = RenderScores.wvr_u171 - $52cb = RenderScores.wvr_u172 - $52dd = RenderScores.name_u156 - $52e4 = RenderScores.wvr_u173 - $52ef = RenderScores.wvr_u174 - $52fa = RenderScores.wvr_u175 - $530c = RenderScores.nograde_u156 - $530f = RenderScores.wvr_u176 - $5319 = RenderScores.grade_u156 - $531c = RenderScores.wvr_u177 - $5324 = RenderScores.postgrade_u156 - $5329 = RenderScores.wvr_u178 - $5336 = RenderScores.wvr_u179 - $5343 = RenderScores.wvr_u180 - $5350 = RenderScores.wvr_u181 - $536d = RenderScores.score_u182 - $5372 = RenderScores.wvr_u183 - $537f = RenderScores.wvr_u184 - $538c = RenderScores.wvr_u185 - $5399 = RenderScores.wvr_u186 - $53a6 = RenderScores.wvr_u187 - $53b3 = RenderScores.wvr_u188 - $53c0 = RenderScores.wvr_u189 - $53cd = RenderScores.wvr_u190 - $53d7 = RenderScores.level_u182 - $53e4 = RenderScores.wvr_u191 - $53ef = RenderScores.wvr_u192 - $53fa = RenderScores.wvr_u193 - $5405 = RenderScores.wvr_u194 - $5412 = RenderScores.wvr_u195 - $541f = RenderScores.wvr_u196 - $542c = RenderScores.wvr_u197 - $5439 = RenderScores.wvr_u198 - $544b = RenderScores.name_u182 - $5452 = RenderScores.wvr_u199 - $545d = RenderScores.wvr_u200 - $5468 = RenderScores.wvr_u201 - $547a = RenderScores.nograde_u182 - $547d = RenderScores.wvr_u202 - $5487 = RenderScores.grade_u182 - $548a = RenderScores.wvr_u203 - $5492 = RenderScores.postgrade_u182 - $5497 = RenderScores.wvr_u204 - $54a4 = RenderScores.wvr_u205 - $54b1 = RenderScores.wvr_u206 - $54be = RenderScores.wvr_u207 - $54db = RenderScores.score_u208 - $54e0 = RenderScores.wvr_u209 - $54ed = RenderScores.wvr_u210 - $54fa = RenderScores.wvr_u211 - $5507 = RenderScores.wvr_u212 - $5514 = RenderScores.wvr_u213 - $5521 = RenderScores.wvr_u214 - $552e = RenderScores.wvr_u215 - $553b = RenderScores.wvr_u216 - $5545 = RenderScores.level_u208 - $5552 = RenderScores.wvr_u217 - $555d = RenderScores.wvr_u218 - $5568 = RenderScores.wvr_u219 - $5573 = RenderScores.wvr_u220 - $5580 = RenderScores.wvr_u221 - $558d = RenderScores.wvr_u222 - $559a = RenderScores.wvr_u223 - $55a7 = RenderScores.wvr_u224 - $55b9 = RenderScores.name_u208 - $55c0 = RenderScores.wvr_u225 - $55cb = RenderScores.wvr_u226 - $55d6 = RenderScores.wvr_u227 - $55e8 = RenderScores.nograde_u208 - $55eb = RenderScores.wvr_u228 - $55f5 = RenderScores.grade_u208 - $55f8 = RenderScores.wvr_u229 - $5600 = RenderScores.postgrade_u208 - $5605 = RenderScores.wvr_u230 - $5612 = RenderScores.wvr_u231 - $561f = RenderScores.wvr_u232 - $562c = RenderScores.wvr_u233 - $5649 = RenderScores.score_u234 - $564e = RenderScores.wvr_u235 - $565b = RenderScores.wvr_u236 - $5668 = RenderScores.wvr_u237 - $5675 = RenderScores.wvr_u238 - $5682 = RenderScores.wvr_u239 - $568f = RenderScores.wvr_u240 - $569c = RenderScores.wvr_u241 - $56a9 = RenderScores.wvr_u242 - $56b3 = RenderScores.level_u234 - $56c0 = RenderScores.wvr_u243 - $56cb = RenderScores.wvr_u244 - $56d6 = RenderScores.wvr_u245 - $56e1 = RenderScores.wvr_u246 - $56ee = RenderScores.wvr_u247 - $56fb = RenderScores.wvr_u248 - $5708 = RenderScores.wvr_u249 - $5715 = RenderScores.wvr_u250 - $5727 = RenderScores.name_u234 - $572e = RenderScores.wvr_u251 - $5739 = RenderScores.wvr_u252 - $5744 = RenderScores.wvr_u253 - $5756 = RenderScores.nograde_u234 - $5759 = RenderScores.wvr_u254 - $5763 = RenderScores.grade_u234 - $5766 = RenderScores.wvr_u255 - $576e = RenderScores.postgrade_u234 - $5773 = RenderScores.wvr_u256 - $5780 = RenderScores.wvr_u257 - $578d = RenderScores.wvr_u258 - $579a = RenderScores.wvr_u259 - $57b7 = RenderScores.score_u260 - $57bc = RenderScores.wvr_u261 - $57c9 = RenderScores.wvr_u262 - $57d6 = RenderScores.wvr_u263 - $57e3 = RenderScores.wvr_u264 - $57f0 = RenderScores.wvr_u265 - $57fd = RenderScores.wvr_u266 - $580a = RenderScores.wvr_u267 - $5817 = RenderScores.wvr_u268 - $5821 = RenderScores.level_u260 - $582e = RenderScores.wvr_u269 - $5839 = RenderScores.wvr_u270 - $5844 = RenderScores.wvr_u271 - $584f = RenderScores.wvr_u272 - $585c = RenderScores.wvr_u273 - $5869 = RenderScores.wvr_u274 - $5876 = RenderScores.wvr_u275 - $5883 = RenderScores.wvr_u276 - $5895 = RenderScores.name_u260 - $589c = RenderScores.wvr_u277 - $58a7 = RenderScores.wvr_u278 - $58b2 = RenderScores.wvr_u279 - $58c4 = RenderScores.nograde_u260 - $58c7 = RenderScores.wvr_u280 - $58d1 = RenderScores.grade_u260 - $58d4 = RenderScores.wvr_u281 - $58dc = RenderScores.postgrade_u260 - $58e1 = RenderScores.wvr_u282 - $58ee = RenderScores.wvr_u283 - $58fb = RenderScores.wvr_u284 - $5908 = RenderScores.wvr_u285 - SECTION: $591f-$693a ($101c bytes) ["Title Screen Static Data"] - $591f = sEasterM0 - $5924 = sEasterM1 - $5929 = sEasterC0 - $5934 = sEasterC1 - $593f = sEasterA0 - $594a = sEasterA1 - $5955 = sEasterS0 - $595a = sEasterS1 - $595f = sBUTTONSMode - $5967 = sRNGMode - $597b = sROTMode - $598b = sDROPMode - $599f = sCURVEMode - $59bb = sHIGMode - $59c3 = sDisabled - $59c7 = sFilterMode - $59db = sTetryButtons - $5a1b = sTetryRNG - $5a5b = sTetryROT - $5a9b = sTetryDROP - $5adb = sTetryCURVE - $5b1b = sTetryHIG - $5b5b = sTetrySTART - $5b9b = sTetryFILTER - $5bdb = sTetryEXIT - $5c1b = sTitleScreenMainMap - $5ebb = sTitleScreenSettingsMap - $5ebb = sTitleScreenMainMapEnd - $615b = sTitleScreenCreditsMap - $615b = sTitleScreenSettingsMapEnd - $63fb = sTitleScreenProfileMap - $63fb = sTitleScreenCreditsMapEnd - $669b = sTitleScreenRecordsMap - $669b = sTitleScreenProfileMapEnd - $693b = sTitleScreenRecordsMapEnd - EMPTY: $693b-$7fff ($16c5 bytes) - TOTAL EMPTY: $16c5 bytes + $4484 = TitleVBlankHandlerB.notselected_u17 + $4489 = TitleVBlankHandlerB.selected_u17 + $448c = TitleVBlankHandlerB.done_u17 + $4496 = TitleVBlankHandlerB.notselected_u18 + $449b = TitleVBlankHandlerB.selected_u18 + $449e = TitleVBlankHandlerB.done_u18 + $44bc = TitleVBlankHandlerB.buttons + $44d3 = TitleVBlankHandlerB.filter + $44f2 = !2 + $44f9 = TitleVBlankHandlerB.donetetry2 + $451f = TitleVBlankHandlerB.vblankSettings + $4529 = TitleVBlankHandlerB.notselected_u19 + $452e = TitleVBlankHandlerB.selected_u19 + $4531 = TitleVBlankHandlerB.done_u19 + $453b = TitleVBlankHandlerB.notselected_u20 + $4540 = TitleVBlankHandlerB.selected_u20 + $4543 = TitleVBlankHandlerB.done_u20 + $454d = TitleVBlankHandlerB.notselected_u21 + $4552 = TitleVBlankHandlerB.selected_u21 + $4555 = TitleVBlankHandlerB.done_u21 + $455f = TitleVBlankHandlerB.notselected_u22 + $4564 = TitleVBlankHandlerB.selected_u22 + $4567 = TitleVBlankHandlerB.done_u22 + $4571 = TitleVBlankHandlerB.notselected_u23 + $4576 = TitleVBlankHandlerB.selected_u23 + $4579 = TitleVBlankHandlerB.done_u23 + $4583 = TitleVBlankHandlerB.notselected_u24 + $4588 = TitleVBlankHandlerB.selected_u24 + $458b = TitleVBlankHandlerB.done_u24 + $4595 = TitleVBlankHandlerB.notselected_u25 + $459a = TitleVBlankHandlerB.selected_u25 + $459d = TitleVBlankHandlerB.done_u25 + $461d = TitleVBlankHandlerB.disabled1 + $4629 = TitleVBlankHandlerB.start + $4635 = !3 + $463c = TitleVBlankHandlerB.donetetry1 + $4662 = TitleVBlankHandlerB.vblankRecords + $4697 = TitleVBlankHandlerB.vblankCredits + $4698 = MainHandleA + $46a6 = MainHandleA.jumps + $46b8 = MainHandleA.tosettings + $46bd = MainHandleA.tocredits + $46c2 = MainHandleA.toprofile + $46c7 = MainHandleA.torecords + $46cc = MainHandleUp + $46d7 = !4 + $46dd = MainHandleDown + $46e9 = !5 + $46ee = SettingsHandleA + $46fb = ProfileHandleB + $46fb = SettingsHandleB + $4700 = SettingsHandleDown + $470c = !6 + $4711 = SettingsHandleUp + $471c = !7 + $4722 = SettingsHandleLeft + $4733 = SettingsHandleLeft.jumps + $4748 = SettingsHandleLeft.rng + $4756 = !8 + $475f = SettingsHandleLeft.rot + $476d = !9 + $4776 = SettingsHandleLeft.drop + $4784 = !10 + $478d = SettingsHandleLeft.curve + $479e = !11 + $47aa = SettingsHandleLeft.hig + $47b8 = !12 + $47c1 = SettingsHandleRight + $47d2 = SettingsHandleRight.jumps + $47e7 = SettingsHandleRight.rng + $47f6 = !13 + $47fe = SettingsHandleRight.rot + $480d = !14 + $4815 = SettingsHandleRight.drop + $4824 = !15 + $482c = SettingsHandleRight.curve + $483e = !16 + $4849 = SettingsHandleRight.hig + $4858 = !17 + $4860 = ProfileHandleA + $4874 = ProfileHandleRight + $4888 = ProfileHandleRight.jumps + $48a0 = ProfileHandleRight.idx + $48a9 = ProfileHandleRight.doit + $48ac = ProfileHandleRight.l0 + $48b6 = ProfileHandleRight.doit1 + $48bd = ProfileHandleRight.l1 + $48c7 = ProfileHandleRight.doit2 + $48ce = ProfileHandleRight.l2 + $48d8 = ProfileHandleRight.doit3 + $48df = ProfileHandleRight.buttons + $48ee = !18 + $48f6 = ProfileHandleRight.filter + $4903 = !19 + $490a = ProfileHandleLeft + $491e = ProfileHandleLeft.jumps + $4936 = ProfileHandleLeft.idx + $4940 = ProfileHandleLeft.doit + $4943 = ProfileHandleLeft.l0 + $494d = ProfileHandleLeft.doit1 + $4954 = ProfileHandleLeft.l1 + $495e = ProfileHandleLeft.doit2 + $4965 = ProfileHandleLeft.l2 + $496f = ProfileHandleLeft.doit3 + $4976 = ProfileHandleLeft.buttons + $4984 = !20 + $498d = ProfileHandleLeft.filter + $4999 = !21 + $49a1 = ProfileHandleDown + $49ad = !22 + $49b2 = ProfileHandleUp + $49bd = !23 + $49c3 = DecrementLevel + $49d9 = IncrementLevel + $49ef = InitSpeedCurve + $49fe = GetEnd + $4a09 = !24 + $4a11 = !25 + $4a19 = !26 + $4a21 = !27 + $4a29 = !28 + $4a31 = !29 + $4a35 = GetStart + $4a40 = !30 + $4a48 = !31 + $4a50 = !32 + $4a58 = !33 + $4a60 = !34 + $4a68 = !35 + $4a6c = CheckLevelRange + $4a85 = CheckLevelRange.notatend + $4aa5 = CheckLevelRange.notatstart + $4aa6 = RecordsHandleLeft + $4abc = !36 + $4ac4 = RecordsHandleRight + $4adb = !37 + $4ae2 = RecordsHandleSelect + $4aeb = RenderScores + $4aeb = !38 + $4b14 = RenderScores.score_u26 + $4b19 = RenderScores.wvr_u27 + $4b26 = RenderScores.wvr_u28 + $4b33 = RenderScores.wvr_u29 + $4b40 = RenderScores.wvr_u30 + $4b4d = RenderScores.wvr_u31 + $4b5a = RenderScores.wvr_u32 + $4b67 = RenderScores.wvr_u33 + $4b74 = RenderScores.wvr_u34 + $4b7e = RenderScores.level_u26 + $4b8b = RenderScores.wvr_u35 + $4b96 = RenderScores.wvr_u36 + $4ba1 = RenderScores.wvr_u37 + $4bac = RenderScores.wvr_u38 + $4bb9 = RenderScores.wvr_u39 + $4bc6 = RenderScores.wvr_u40 + $4bd3 = RenderScores.wvr_u41 + $4be0 = RenderScores.wvr_u42 + $4bf2 = RenderScores.name_u26 + $4bf9 = RenderScores.wvr_u43 + $4c04 = RenderScores.wvr_u44 + $4c0f = RenderScores.wvr_u45 + $4c21 = RenderScores.nograde_u26 + $4c24 = RenderScores.wvr_u46 + $4c2e = RenderScores.grade_u26 + $4c31 = RenderScores.wvr_u47 + $4c39 = RenderScores.postgrade_u26 + $4c3e = RenderScores.wvr_u48 + $4c4b = RenderScores.wvr_u49 + $4c58 = RenderScores.wvr_u50 + $4c65 = RenderScores.wvr_u51 + $4c82 = RenderScores.score_u52 + $4c87 = RenderScores.wvr_u53 + $4c94 = RenderScores.wvr_u54 + $4ca1 = RenderScores.wvr_u55 + $4cae = RenderScores.wvr_u56 + $4cbb = RenderScores.wvr_u57 + $4cc8 = RenderScores.wvr_u58 + $4cd5 = RenderScores.wvr_u59 + $4ce2 = RenderScores.wvr_u60 + $4cec = RenderScores.level_u52 + $4cf9 = RenderScores.wvr_u61 + $4d04 = RenderScores.wvr_u62 + $4d0f = RenderScores.wvr_u63 + $4d1a = RenderScores.wvr_u64 + $4d27 = RenderScores.wvr_u65 + $4d34 = RenderScores.wvr_u66 + $4d41 = RenderScores.wvr_u67 + $4d4e = RenderScores.wvr_u68 + $4d60 = RenderScores.name_u52 + $4d67 = RenderScores.wvr_u69 + $4d72 = RenderScores.wvr_u70 + $4d7d = RenderScores.wvr_u71 + $4d8f = RenderScores.nograde_u52 + $4d92 = RenderScores.wvr_u72 + $4d9c = RenderScores.grade_u52 + $4d9f = RenderScores.wvr_u73 + $4da7 = RenderScores.postgrade_u52 + $4dac = RenderScores.wvr_u74 + $4db9 = RenderScores.wvr_u75 + $4dc6 = RenderScores.wvr_u76 + $4dd3 = RenderScores.wvr_u77 + $4df0 = RenderScores.score_u78 + $4df5 = RenderScores.wvr_u79 + $4e02 = RenderScores.wvr_u80 + $4e0f = RenderScores.wvr_u81 + $4e1c = RenderScores.wvr_u82 + $4e29 = RenderScores.wvr_u83 + $4e36 = RenderScores.wvr_u84 + $4e43 = RenderScores.wvr_u85 + $4e50 = RenderScores.wvr_u86 + $4e5a = RenderScores.level_u78 + $4e67 = RenderScores.wvr_u87 + $4e72 = RenderScores.wvr_u88 + $4e7d = RenderScores.wvr_u89 + $4e88 = RenderScores.wvr_u90 + $4e95 = RenderScores.wvr_u91 + $4ea2 = RenderScores.wvr_u92 + $4eaf = RenderScores.wvr_u93 + $4ebc = RenderScores.wvr_u94 + $4ece = RenderScores.name_u78 + $4ed5 = RenderScores.wvr_u95 + $4ee0 = RenderScores.wvr_u96 + $4eeb = RenderScores.wvr_u97 + $4efd = RenderScores.nograde_u78 + $4f00 = RenderScores.wvr_u98 + $4f0a = RenderScores.grade_u78 + $4f0d = RenderScores.wvr_u99 + $4f15 = RenderScores.postgrade_u78 + $4f1a = RenderScores.wvr_u100 + $4f27 = RenderScores.wvr_u101 + $4f34 = RenderScores.wvr_u102 + $4f41 = RenderScores.wvr_u103 + $4f5e = RenderScores.score_u104 + $4f63 = RenderScores.wvr_u105 + $4f70 = RenderScores.wvr_u106 + $4f7d = RenderScores.wvr_u107 + $4f8a = RenderScores.wvr_u108 + $4f97 = RenderScores.wvr_u109 + $4fa4 = RenderScores.wvr_u110 + $4fb1 = RenderScores.wvr_u111 + $4fbe = RenderScores.wvr_u112 + $4fc8 = RenderScores.level_u104 + $4fd5 = RenderScores.wvr_u113 + $4fe0 = RenderScores.wvr_u114 + $4feb = RenderScores.wvr_u115 + $4ff6 = RenderScores.wvr_u116 + $5003 = RenderScores.wvr_u117 + $5010 = RenderScores.wvr_u118 + $501d = RenderScores.wvr_u119 + $502a = RenderScores.wvr_u120 + $503c = RenderScores.name_u104 + $5043 = RenderScores.wvr_u121 + $504e = RenderScores.wvr_u122 + $5059 = RenderScores.wvr_u123 + $506b = RenderScores.nograde_u104 + $506e = RenderScores.wvr_u124 + $5078 = RenderScores.grade_u104 + $507b = RenderScores.wvr_u125 + $5083 = RenderScores.postgrade_u104 + $5088 = RenderScores.wvr_u126 + $5095 = RenderScores.wvr_u127 + $50a2 = RenderScores.wvr_u128 + $50af = RenderScores.wvr_u129 + $50cc = RenderScores.score_u130 + $50d1 = RenderScores.wvr_u131 + $50de = RenderScores.wvr_u132 + $50eb = RenderScores.wvr_u133 + $50f8 = RenderScores.wvr_u134 + $5105 = RenderScores.wvr_u135 + $5112 = RenderScores.wvr_u136 + $511f = RenderScores.wvr_u137 + $512c = RenderScores.wvr_u138 + $5136 = RenderScores.level_u130 + $5143 = RenderScores.wvr_u139 + $514e = RenderScores.wvr_u140 + $5159 = RenderScores.wvr_u141 + $5164 = RenderScores.wvr_u142 + $5171 = RenderScores.wvr_u143 + $517e = RenderScores.wvr_u144 + $518b = RenderScores.wvr_u145 + $5198 = RenderScores.wvr_u146 + $51aa = RenderScores.name_u130 + $51b1 = RenderScores.wvr_u147 + $51bc = RenderScores.wvr_u148 + $51c7 = RenderScores.wvr_u149 + $51d9 = RenderScores.nograde_u130 + $51dc = RenderScores.wvr_u150 + $51e6 = RenderScores.grade_u130 + $51e9 = RenderScores.wvr_u151 + $51f1 = RenderScores.postgrade_u130 + $51f6 = RenderScores.wvr_u152 + $5203 = RenderScores.wvr_u153 + $5210 = RenderScores.wvr_u154 + $521d = RenderScores.wvr_u155 + $523a = RenderScores.score_u156 + $523f = RenderScores.wvr_u157 + $524c = RenderScores.wvr_u158 + $5259 = RenderScores.wvr_u159 + $5266 = RenderScores.wvr_u160 + $5273 = RenderScores.wvr_u161 + $5280 = RenderScores.wvr_u162 + $528d = RenderScores.wvr_u163 + $529a = RenderScores.wvr_u164 + $52a4 = RenderScores.level_u156 + $52b1 = RenderScores.wvr_u165 + $52bc = RenderScores.wvr_u166 + $52c7 = RenderScores.wvr_u167 + $52d2 = RenderScores.wvr_u168 + $52df = RenderScores.wvr_u169 + $52ec = RenderScores.wvr_u170 + $52f9 = RenderScores.wvr_u171 + $5306 = RenderScores.wvr_u172 + $5318 = RenderScores.name_u156 + $531f = RenderScores.wvr_u173 + $532a = RenderScores.wvr_u174 + $5335 = RenderScores.wvr_u175 + $5347 = RenderScores.nograde_u156 + $534a = RenderScores.wvr_u176 + $5354 = RenderScores.grade_u156 + $5357 = RenderScores.wvr_u177 + $535f = RenderScores.postgrade_u156 + $5364 = RenderScores.wvr_u178 + $5371 = RenderScores.wvr_u179 + $537e = RenderScores.wvr_u180 + $538b = RenderScores.wvr_u181 + $53a8 = RenderScores.score_u182 + $53ad = RenderScores.wvr_u183 + $53ba = RenderScores.wvr_u184 + $53c7 = RenderScores.wvr_u185 + $53d4 = RenderScores.wvr_u186 + $53e1 = RenderScores.wvr_u187 + $53ee = RenderScores.wvr_u188 + $53fb = RenderScores.wvr_u189 + $5408 = RenderScores.wvr_u190 + $5412 = RenderScores.level_u182 + $541f = RenderScores.wvr_u191 + $542a = RenderScores.wvr_u192 + $5435 = RenderScores.wvr_u193 + $5440 = RenderScores.wvr_u194 + $544d = RenderScores.wvr_u195 + $545a = RenderScores.wvr_u196 + $5467 = RenderScores.wvr_u197 + $5474 = RenderScores.wvr_u198 + $5486 = RenderScores.name_u182 + $548d = RenderScores.wvr_u199 + $5498 = RenderScores.wvr_u200 + $54a3 = RenderScores.wvr_u201 + $54b5 = RenderScores.nograde_u182 + $54b8 = RenderScores.wvr_u202 + $54c2 = RenderScores.grade_u182 + $54c5 = RenderScores.wvr_u203 + $54cd = RenderScores.postgrade_u182 + $54d2 = RenderScores.wvr_u204 + $54df = RenderScores.wvr_u205 + $54ec = RenderScores.wvr_u206 + $54f9 = RenderScores.wvr_u207 + $5516 = RenderScores.score_u208 + $551b = RenderScores.wvr_u209 + $5528 = RenderScores.wvr_u210 + $5535 = RenderScores.wvr_u211 + $5542 = RenderScores.wvr_u212 + $554f = RenderScores.wvr_u213 + $555c = RenderScores.wvr_u214 + $5569 = RenderScores.wvr_u215 + $5576 = RenderScores.wvr_u216 + $5580 = RenderScores.level_u208 + $558d = RenderScores.wvr_u217 + $5598 = RenderScores.wvr_u218 + $55a3 = RenderScores.wvr_u219 + $55ae = RenderScores.wvr_u220 + $55bb = RenderScores.wvr_u221 + $55c8 = RenderScores.wvr_u222 + $55d5 = RenderScores.wvr_u223 + $55e2 = RenderScores.wvr_u224 + $55f4 = RenderScores.name_u208 + $55fb = RenderScores.wvr_u225 + $5606 = RenderScores.wvr_u226 + $5611 = RenderScores.wvr_u227 + $5623 = RenderScores.nograde_u208 + $5626 = RenderScores.wvr_u228 + $5630 = RenderScores.grade_u208 + $5633 = RenderScores.wvr_u229 + $563b = RenderScores.postgrade_u208 + $5640 = RenderScores.wvr_u230 + $564d = RenderScores.wvr_u231 + $565a = RenderScores.wvr_u232 + $5667 = RenderScores.wvr_u233 + $5684 = RenderScores.score_u234 + $5689 = RenderScores.wvr_u235 + $5696 = RenderScores.wvr_u236 + $56a3 = RenderScores.wvr_u237 + $56b0 = RenderScores.wvr_u238 + $56bd = RenderScores.wvr_u239 + $56ca = RenderScores.wvr_u240 + $56d7 = RenderScores.wvr_u241 + $56e4 = RenderScores.wvr_u242 + $56ee = RenderScores.level_u234 + $56fb = RenderScores.wvr_u243 + $5706 = RenderScores.wvr_u244 + $5711 = RenderScores.wvr_u245 + $571c = RenderScores.wvr_u246 + $5729 = RenderScores.wvr_u247 + $5736 = RenderScores.wvr_u248 + $5743 = RenderScores.wvr_u249 + $5750 = RenderScores.wvr_u250 + $5762 = RenderScores.name_u234 + $5769 = RenderScores.wvr_u251 + $5774 = RenderScores.wvr_u252 + $577f = RenderScores.wvr_u253 + $5791 = RenderScores.nograde_u234 + $5794 = RenderScores.wvr_u254 + $579e = RenderScores.grade_u234 + $57a1 = RenderScores.wvr_u255 + $57a9 = RenderScores.postgrade_u234 + $57ae = RenderScores.wvr_u256 + $57bb = RenderScores.wvr_u257 + $57c8 = RenderScores.wvr_u258 + $57d5 = RenderScores.wvr_u259 + $57f2 = RenderScores.score_u260 + $57f7 = RenderScores.wvr_u261 + $5804 = RenderScores.wvr_u262 + $5811 = RenderScores.wvr_u263 + $581e = RenderScores.wvr_u264 + $582b = RenderScores.wvr_u265 + $5838 = RenderScores.wvr_u266 + $5845 = RenderScores.wvr_u267 + $5852 = RenderScores.wvr_u268 + $585c = RenderScores.level_u260 + $5869 = RenderScores.wvr_u269 + $5874 = RenderScores.wvr_u270 + $587f = RenderScores.wvr_u271 + $588a = RenderScores.wvr_u272 + $5897 = RenderScores.wvr_u273 + $58a4 = RenderScores.wvr_u274 + $58b1 = RenderScores.wvr_u275 + $58be = RenderScores.wvr_u276 + $58d0 = RenderScores.name_u260 + $58d7 = RenderScores.wvr_u277 + $58e2 = RenderScores.wvr_u278 + $58ed = RenderScores.wvr_u279 + $58ff = RenderScores.nograde_u260 + $5902 = RenderScores.wvr_u280 + $590c = RenderScores.grade_u260 + $590f = RenderScores.wvr_u281 + $5917 = RenderScores.postgrade_u260 + $591c = RenderScores.wvr_u282 + $5929 = RenderScores.wvr_u283 + $5936 = RenderScores.wvr_u284 + $5943 = RenderScores.wvr_u285 + SECTION: $595a-$6af5 ($119c bytes) ["Title Screen Static Data"] + $595a = sEasterM0 + $595f = sEasterM1 + $5964 = sEasterC0 + $596f = sEasterC1 + $597a = sEasterA0 + $5985 = sEasterA1 + $5990 = sEasterS0 + $5995 = sEasterS1 + $599a = sBUTTONSMode + $59a2 = sRNGMode + $59b6 = sROTMode + $59c6 = sDROPMode + $59da = sCURVEMode + $59f6 = sHIGMode + $59fe = sDisabled + $5a02 = sFilterMode + $5a16 = sTetryRNG + $5a56 = sTetryROT + $5a96 = sTetryDROP + $5ad6 = sTetryCURVE + $5b16 = sTetryHIG + $5b56 = sTetrySTART + $5b96 = sTetryEXITSettings + $5bd6 = sTetryProfileNumber + $5c16 = sTetryProfileInitial1 + $5c56 = sTetryProfileInitial2 + $5c96 = sTetryProfileInitial3 + $5cd6 = sTetryButtons + $5d16 = sTetryFILTER + $5d56 = sTetryReset + $5d96 = sTetryEXITProfile + $5dd6 = sTitleScreenMainMap + $6076 = sTitleScreenSettingsMap + $6076 = sTitleScreenMainMapEnd + $6316 = sTitleScreenCreditsMap + $6316 = sTitleScreenSettingsMapEnd + $65b6 = sTitleScreenProfileMap + $65b6 = sTitleScreenCreditsMapEnd + $6856 = sTitleScreenRecordsMap + $6856 = sTitleScreenProfileMapEnd + $6af6 = sTitleScreenRecordsMapEnd + EMPTY: $6af6-$7fff ($150a bytes) + TOTAL EMPTY: $150a bytes ROMX bank #5: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_GAMEPLAY"] @@ -3302,7 +3311,7 @@ HRAM bank #0: SUMMARY: ROM0: 15429 bytes used / 955 free - ROMX: 68511 bytes used / 29793 free in 6 banks + ROMX: 68954 bytes used / 29350 free in 6 banks SRAM: 2951 bytes used / 5241 free in 1 bank WRAM0: 3910 bytes used / 186 free HRAM: 127 bytes used / 0 free diff --git a/bin/DMGTRIS.pocket b/bin/DMGTRIS.pocket index 51f68b7..04e15ba 100644 Binary files a/bin/DMGTRIS.pocket and b/bin/DMGTRIS.pocket differ diff --git a/bin/DMGTRIS.sym b/bin/DMGTRIS.sym index 69aa124..aff068b 100644 --- a/bin/DMGTRIS.sym +++ b/bin/DMGTRIS.sym @@ -630,451 +630,459 @@ 04:4472 TitleVBlankHandlerB.notselected_u16 04:4477 TitleVBlankHandlerB.selected_u16 04:447a TitleVBlankHandlerB.done_u16 -04:4499 TitleVBlankHandlerB.vblankSettings -04:44a3 TitleVBlankHandlerB.notselected_u17 -04:44a8 TitleVBlankHandlerB.selected_u17 -04:44ab TitleVBlankHandlerB.done_u17 -04:44b5 TitleVBlankHandlerB.notselected_u18 -04:44ba TitleVBlankHandlerB.selected_u18 -04:44bd TitleVBlankHandlerB.done_u18 -04:44c7 TitleVBlankHandlerB.notselected_u19 -04:44cc TitleVBlankHandlerB.selected_u19 -04:44cf TitleVBlankHandlerB.done_u19 -04:44d9 TitleVBlankHandlerB.notselected_u20 -04:44de TitleVBlankHandlerB.selected_u20 -04:44e1 TitleVBlankHandlerB.done_u20 -04:44eb TitleVBlankHandlerB.notselected_u21 -04:44f0 TitleVBlankHandlerB.selected_u21 -04:44f3 TitleVBlankHandlerB.done_u21 -04:44fd TitleVBlankHandlerB.notselected_u22 -04:4502 TitleVBlankHandlerB.selected_u22 -04:4505 TitleVBlankHandlerB.done_u22 -04:450f TitleVBlankHandlerB.notselected_u23 -04:4514 TitleVBlankHandlerB.selected_u23 -04:4517 TitleVBlankHandlerB.done_u23 -04:4521 TitleVBlankHandlerB.notselected_u24 -04:4526 TitleVBlankHandlerB.selected_u24 -04:4529 TitleVBlankHandlerB.done_u24 -04:4533 TitleVBlankHandlerB.notselected_u25 -04:4538 TitleVBlankHandlerB.selected_u25 -04:453b TitleVBlankHandlerB.done_u25 -04:45bb TitleVBlankHandlerB.disabled1 -04:45c7 TitleVBlankHandlerB.buttons -04:45de TitleVBlankHandlerB.filter -04:4607 TitleVBlankHandlerB.donetetry -04:462d TitleVBlankHandlerB.vblankRecords -04:4662 TitleVBlankHandlerB.vblankCredits -04:4663 MainHandleA -04:4671 MainHandleA.jumps -04:4683 MainHandleA.tosettings -04:4688 MainHandleA.tocredits -04:468d MainHandleA.toprofile -04:4692 MainHandleA.torecords -04:4697 MainHandleUp -04:46a8 MainHandleDown -04:46b9 SettingsHandleA -04:46c6 ProfileHandleB -04:46c6 SettingsHandleB -04:46cb SettingsHandleDown -04:46dc SettingsHandleUp -04:46ed SettingsHandleLeft -04:46fe SettingsHandleLeft.jumps -04:4719 SettingsHandleLeft.buttons -04:4730 SettingsHandleLeft.rng -04:4747 SettingsHandleLeft.rot -04:475e SettingsHandleLeft.drop -04:4775 SettingsHandleLeft.curve -04:4792 SettingsHandleLeft.hig -04:47a9 SettingsHandleLeft.filter -04:47bd SettingsHandleRight -04:47ce SettingsHandleRight.jumps -04:47e9 SettingsHandleRight.buttons -04:4800 SettingsHandleRight.rng -04:4817 SettingsHandleRight.rot -04:482e SettingsHandleRight.drop -04:4845 SettingsHandleRight.curve -04:4862 SettingsHandleRight.hig -04:4879 SettingsHandleRight.filter -04:488d ProfileHandleA -04:48a1 ProfileHandleRight -04:48b5 ProfileHandleRight.jumps -04:48c4 ProfileHandleRight.idx -04:48cd ProfileHandleRight.doit -04:48d0 ProfileHandleRight.l0 -04:48da ProfileHandleRight.doit1 -04:48e1 ProfileHandleRight.l1 -04:48eb ProfileHandleRight.doit2 -04:48f2 ProfileHandleRight.l2 -04:48fc ProfileHandleRight.doit3 -04:4903 ProfileHandleLeft -04:4917 ProfileHandleLeft.jumps -04:4926 ProfileHandleLeft.idx -04:4930 ProfileHandleLeft.doit -04:4933 ProfileHandleLeft.l0 -04:493d ProfileHandleLeft.doit1 -04:4944 ProfileHandleLeft.l1 -04:494e ProfileHandleLeft.doit2 -04:4955 ProfileHandleLeft.l2 -04:495f ProfileHandleLeft.doit3 -04:4966 ProfileHandleDown -04:4977 ProfileHandleUp -04:4988 DecrementLevel -04:499e IncrementLevel -04:49b4 InitSpeedCurve -04:49c3 GetEnd -04:49fa GetStart -04:4a31 CheckLevelRange -04:4a4a CheckLevelRange.notatend -04:4a6a CheckLevelRange.notatstart -04:4a6b RecordsHandleLeft -04:4a89 RecordsHandleRight -04:4aa7 RecordsHandleSelect -04:4ab0 RenderScores -04:4ad9 RenderScores.score_u26 -04:4ade RenderScores.wvr_u27 -04:4aeb RenderScores.wvr_u28 -04:4af8 RenderScores.wvr_u29 -04:4b05 RenderScores.wvr_u30 -04:4b12 RenderScores.wvr_u31 -04:4b1f RenderScores.wvr_u32 -04:4b2c RenderScores.wvr_u33 -04:4b39 RenderScores.wvr_u34 -04:4b43 RenderScores.level_u26 -04:4b50 RenderScores.wvr_u35 -04:4b5b RenderScores.wvr_u36 -04:4b66 RenderScores.wvr_u37 -04:4b71 RenderScores.wvr_u38 -04:4b7e RenderScores.wvr_u39 -04:4b8b RenderScores.wvr_u40 -04:4b98 RenderScores.wvr_u41 -04:4ba5 RenderScores.wvr_u42 -04:4bb7 RenderScores.name_u26 -04:4bbe RenderScores.wvr_u43 -04:4bc9 RenderScores.wvr_u44 -04:4bd4 RenderScores.wvr_u45 -04:4be6 RenderScores.nograde_u26 -04:4be9 RenderScores.wvr_u46 -04:4bf3 RenderScores.grade_u26 -04:4bf6 RenderScores.wvr_u47 -04:4bfe RenderScores.postgrade_u26 -04:4c03 RenderScores.wvr_u48 -04:4c10 RenderScores.wvr_u49 -04:4c1d RenderScores.wvr_u50 -04:4c2a RenderScores.wvr_u51 -04:4c47 RenderScores.score_u52 -04:4c4c RenderScores.wvr_u53 -04:4c59 RenderScores.wvr_u54 -04:4c66 RenderScores.wvr_u55 -04:4c73 RenderScores.wvr_u56 -04:4c80 RenderScores.wvr_u57 -04:4c8d RenderScores.wvr_u58 -04:4c9a RenderScores.wvr_u59 -04:4ca7 RenderScores.wvr_u60 -04:4cb1 RenderScores.level_u52 -04:4cbe RenderScores.wvr_u61 -04:4cc9 RenderScores.wvr_u62 -04:4cd4 RenderScores.wvr_u63 -04:4cdf RenderScores.wvr_u64 -04:4cec RenderScores.wvr_u65 -04:4cf9 RenderScores.wvr_u66 -04:4d06 RenderScores.wvr_u67 -04:4d13 RenderScores.wvr_u68 -04:4d25 RenderScores.name_u52 -04:4d2c RenderScores.wvr_u69 -04:4d37 RenderScores.wvr_u70 -04:4d42 RenderScores.wvr_u71 -04:4d54 RenderScores.nograde_u52 -04:4d57 RenderScores.wvr_u72 -04:4d61 RenderScores.grade_u52 -04:4d64 RenderScores.wvr_u73 -04:4d6c RenderScores.postgrade_u52 -04:4d71 RenderScores.wvr_u74 -04:4d7e RenderScores.wvr_u75 -04:4d8b RenderScores.wvr_u76 -04:4d98 RenderScores.wvr_u77 -04:4db5 RenderScores.score_u78 -04:4dba RenderScores.wvr_u79 -04:4dc7 RenderScores.wvr_u80 -04:4dd4 RenderScores.wvr_u81 -04:4de1 RenderScores.wvr_u82 -04:4dee RenderScores.wvr_u83 -04:4dfb RenderScores.wvr_u84 -04:4e08 RenderScores.wvr_u85 -04:4e15 RenderScores.wvr_u86 -04:4e1f RenderScores.level_u78 -04:4e2c RenderScores.wvr_u87 -04:4e37 RenderScores.wvr_u88 -04:4e42 RenderScores.wvr_u89 -04:4e4d RenderScores.wvr_u90 -04:4e5a RenderScores.wvr_u91 -04:4e67 RenderScores.wvr_u92 -04:4e74 RenderScores.wvr_u93 -04:4e81 RenderScores.wvr_u94 -04:4e93 RenderScores.name_u78 -04:4e9a RenderScores.wvr_u95 -04:4ea5 RenderScores.wvr_u96 -04:4eb0 RenderScores.wvr_u97 -04:4ec2 RenderScores.nograde_u78 -04:4ec5 RenderScores.wvr_u98 -04:4ecf RenderScores.grade_u78 -04:4ed2 RenderScores.wvr_u99 -04:4eda RenderScores.postgrade_u78 -04:4edf RenderScores.wvr_u100 -04:4eec RenderScores.wvr_u101 -04:4ef9 RenderScores.wvr_u102 -04:4f06 RenderScores.wvr_u103 -04:4f23 RenderScores.score_u104 -04:4f28 RenderScores.wvr_u105 -04:4f35 RenderScores.wvr_u106 -04:4f42 RenderScores.wvr_u107 -04:4f4f RenderScores.wvr_u108 -04:4f5c RenderScores.wvr_u109 -04:4f69 RenderScores.wvr_u110 -04:4f76 RenderScores.wvr_u111 -04:4f83 RenderScores.wvr_u112 -04:4f8d RenderScores.level_u104 -04:4f9a RenderScores.wvr_u113 -04:4fa5 RenderScores.wvr_u114 -04:4fb0 RenderScores.wvr_u115 -04:4fbb RenderScores.wvr_u116 -04:4fc8 RenderScores.wvr_u117 -04:4fd5 RenderScores.wvr_u118 -04:4fe2 RenderScores.wvr_u119 -04:4fef RenderScores.wvr_u120 -04:5001 RenderScores.name_u104 -04:5008 RenderScores.wvr_u121 -04:5013 RenderScores.wvr_u122 -04:501e RenderScores.wvr_u123 -04:5030 RenderScores.nograde_u104 -04:5033 RenderScores.wvr_u124 -04:503d RenderScores.grade_u104 -04:5040 RenderScores.wvr_u125 -04:5048 RenderScores.postgrade_u104 -04:504d RenderScores.wvr_u126 -04:505a RenderScores.wvr_u127 -04:5067 RenderScores.wvr_u128 -04:5074 RenderScores.wvr_u129 -04:5091 RenderScores.score_u130 -04:5096 RenderScores.wvr_u131 -04:50a3 RenderScores.wvr_u132 -04:50b0 RenderScores.wvr_u133 -04:50bd RenderScores.wvr_u134 -04:50ca RenderScores.wvr_u135 -04:50d7 RenderScores.wvr_u136 -04:50e4 RenderScores.wvr_u137 -04:50f1 RenderScores.wvr_u138 -04:50fb RenderScores.level_u130 -04:5108 RenderScores.wvr_u139 -04:5113 RenderScores.wvr_u140 -04:511e RenderScores.wvr_u141 -04:5129 RenderScores.wvr_u142 -04:5136 RenderScores.wvr_u143 -04:5143 RenderScores.wvr_u144 -04:5150 RenderScores.wvr_u145 -04:515d RenderScores.wvr_u146 -04:516f RenderScores.name_u130 -04:5176 RenderScores.wvr_u147 -04:5181 RenderScores.wvr_u148 -04:518c RenderScores.wvr_u149 -04:519e RenderScores.nograde_u130 -04:51a1 RenderScores.wvr_u150 -04:51ab RenderScores.grade_u130 -04:51ae RenderScores.wvr_u151 -04:51b6 RenderScores.postgrade_u130 -04:51bb RenderScores.wvr_u152 -04:51c8 RenderScores.wvr_u153 -04:51d5 RenderScores.wvr_u154 -04:51e2 RenderScores.wvr_u155 -04:51ff RenderScores.score_u156 -04:5204 RenderScores.wvr_u157 -04:5211 RenderScores.wvr_u158 -04:521e RenderScores.wvr_u159 -04:522b RenderScores.wvr_u160 -04:5238 RenderScores.wvr_u161 -04:5245 RenderScores.wvr_u162 -04:5252 RenderScores.wvr_u163 -04:525f RenderScores.wvr_u164 -04:5269 RenderScores.level_u156 -04:5276 RenderScores.wvr_u165 -04:5281 RenderScores.wvr_u166 -04:528c RenderScores.wvr_u167 -04:5297 RenderScores.wvr_u168 -04:52a4 RenderScores.wvr_u169 -04:52b1 RenderScores.wvr_u170 -04:52be RenderScores.wvr_u171 -04:52cb RenderScores.wvr_u172 -04:52dd RenderScores.name_u156 -04:52e4 RenderScores.wvr_u173 -04:52ef RenderScores.wvr_u174 -04:52fa RenderScores.wvr_u175 -04:530c RenderScores.nograde_u156 -04:530f RenderScores.wvr_u176 -04:5319 RenderScores.grade_u156 -04:531c RenderScores.wvr_u177 -04:5324 RenderScores.postgrade_u156 -04:5329 RenderScores.wvr_u178 -04:5336 RenderScores.wvr_u179 -04:5343 RenderScores.wvr_u180 -04:5350 RenderScores.wvr_u181 -04:536d RenderScores.score_u182 -04:5372 RenderScores.wvr_u183 -04:537f RenderScores.wvr_u184 -04:538c RenderScores.wvr_u185 -04:5399 RenderScores.wvr_u186 -04:53a6 RenderScores.wvr_u187 -04:53b3 RenderScores.wvr_u188 -04:53c0 RenderScores.wvr_u189 -04:53cd RenderScores.wvr_u190 -04:53d7 RenderScores.level_u182 -04:53e4 RenderScores.wvr_u191 -04:53ef RenderScores.wvr_u192 -04:53fa RenderScores.wvr_u193 -04:5405 RenderScores.wvr_u194 -04:5412 RenderScores.wvr_u195 -04:541f RenderScores.wvr_u196 -04:542c RenderScores.wvr_u197 -04:5439 RenderScores.wvr_u198 -04:544b RenderScores.name_u182 -04:5452 RenderScores.wvr_u199 -04:545d RenderScores.wvr_u200 -04:5468 RenderScores.wvr_u201 -04:547a RenderScores.nograde_u182 -04:547d RenderScores.wvr_u202 -04:5487 RenderScores.grade_u182 -04:548a RenderScores.wvr_u203 -04:5492 RenderScores.postgrade_u182 -04:5497 RenderScores.wvr_u204 -04:54a4 RenderScores.wvr_u205 -04:54b1 RenderScores.wvr_u206 -04:54be RenderScores.wvr_u207 -04:54db RenderScores.score_u208 -04:54e0 RenderScores.wvr_u209 -04:54ed RenderScores.wvr_u210 -04:54fa RenderScores.wvr_u211 -04:5507 RenderScores.wvr_u212 -04:5514 RenderScores.wvr_u213 -04:5521 RenderScores.wvr_u214 -04:552e RenderScores.wvr_u215 -04:553b RenderScores.wvr_u216 -04:5545 RenderScores.level_u208 -04:5552 RenderScores.wvr_u217 -04:555d RenderScores.wvr_u218 -04:5568 RenderScores.wvr_u219 -04:5573 RenderScores.wvr_u220 -04:5580 RenderScores.wvr_u221 -04:558d RenderScores.wvr_u222 -04:559a RenderScores.wvr_u223 -04:55a7 RenderScores.wvr_u224 -04:55b9 RenderScores.name_u208 -04:55c0 RenderScores.wvr_u225 -04:55cb RenderScores.wvr_u226 -04:55d6 RenderScores.wvr_u227 -04:55e8 RenderScores.nograde_u208 -04:55eb RenderScores.wvr_u228 -04:55f5 RenderScores.grade_u208 -04:55f8 RenderScores.wvr_u229 -04:5600 RenderScores.postgrade_u208 -04:5605 RenderScores.wvr_u230 -04:5612 RenderScores.wvr_u231 -04:561f RenderScores.wvr_u232 -04:562c RenderScores.wvr_u233 -04:5649 RenderScores.score_u234 -04:564e RenderScores.wvr_u235 -04:565b RenderScores.wvr_u236 -04:5668 RenderScores.wvr_u237 -04:5675 RenderScores.wvr_u238 -04:5682 RenderScores.wvr_u239 -04:568f RenderScores.wvr_u240 -04:569c RenderScores.wvr_u241 -04:56a9 RenderScores.wvr_u242 -04:56b3 RenderScores.level_u234 -04:56c0 RenderScores.wvr_u243 -04:56cb RenderScores.wvr_u244 -04:56d6 RenderScores.wvr_u245 -04:56e1 RenderScores.wvr_u246 -04:56ee RenderScores.wvr_u247 -04:56fb RenderScores.wvr_u248 -04:5708 RenderScores.wvr_u249 -04:5715 RenderScores.wvr_u250 -04:5727 RenderScores.name_u234 -04:572e RenderScores.wvr_u251 -04:5739 RenderScores.wvr_u252 -04:5744 RenderScores.wvr_u253 -04:5756 RenderScores.nograde_u234 -04:5759 RenderScores.wvr_u254 -04:5763 RenderScores.grade_u234 -04:5766 RenderScores.wvr_u255 -04:576e RenderScores.postgrade_u234 -04:5773 RenderScores.wvr_u256 -04:5780 RenderScores.wvr_u257 -04:578d RenderScores.wvr_u258 -04:579a RenderScores.wvr_u259 -04:57b7 RenderScores.score_u260 -04:57bc RenderScores.wvr_u261 -04:57c9 RenderScores.wvr_u262 -04:57d6 RenderScores.wvr_u263 -04:57e3 RenderScores.wvr_u264 -04:57f0 RenderScores.wvr_u265 -04:57fd RenderScores.wvr_u266 -04:580a RenderScores.wvr_u267 -04:5817 RenderScores.wvr_u268 -04:5821 RenderScores.level_u260 -04:582e RenderScores.wvr_u269 -04:5839 RenderScores.wvr_u270 -04:5844 RenderScores.wvr_u271 -04:584f RenderScores.wvr_u272 -04:585c RenderScores.wvr_u273 -04:5869 RenderScores.wvr_u274 -04:5876 RenderScores.wvr_u275 -04:5883 RenderScores.wvr_u276 -04:5895 RenderScores.name_u260 -04:589c RenderScores.wvr_u277 -04:58a7 RenderScores.wvr_u278 -04:58b2 RenderScores.wvr_u279 -04:58c4 RenderScores.nograde_u260 -04:58c7 RenderScores.wvr_u280 -04:58d1 RenderScores.grade_u260 -04:58d4 RenderScores.wvr_u281 -04:58dc RenderScores.postgrade_u260 -04:58e1 RenderScores.wvr_u282 -04:58ee RenderScores.wvr_u283 -04:58fb RenderScores.wvr_u284 -04:5908 RenderScores.wvr_u285 -04:591f sEasterM0 -04:5924 sEasterM1 -04:5929 sEasterC0 -04:5934 sEasterC1 -04:593f sEasterA0 -04:594a sEasterA1 -04:5955 sEasterS0 -04:595a sEasterS1 -04:595f sBUTTONSMode -04:5967 sRNGMode -04:597b sROTMode -04:598b sDROPMode -04:599f sCURVEMode -04:59bb sHIGMode -04:59c3 sDisabled -04:59c7 sFilterMode -04:59db sTetryButtons -04:5a1b sTetryRNG -04:5a5b sTetryROT -04:5a9b sTetryDROP -04:5adb sTetryCURVE -04:5b1b sTetryHIG -04:5b5b sTetrySTART -04:5b9b sTetryFILTER -04:5bdb sTetryEXIT -04:5c1b sTitleScreenMainMap -04:5ebb sTitleScreenSettingsMap -04:5ebb sTitleScreenMainMapEnd -04:615b sTitleScreenCreditsMap -04:615b sTitleScreenSettingsMapEnd -04:63fb sTitleScreenProfileMap -04:63fb sTitleScreenCreditsMapEnd -04:669b sTitleScreenRecordsMap -04:669b sTitleScreenProfileMapEnd -04:693b sTitleScreenRecordsMapEnd +04:4484 TitleVBlankHandlerB.notselected_u17 +04:4489 TitleVBlankHandlerB.selected_u17 +04:448c TitleVBlankHandlerB.done_u17 +04:4496 TitleVBlankHandlerB.notselected_u18 +04:449b TitleVBlankHandlerB.selected_u18 +04:449e TitleVBlankHandlerB.done_u18 +04:44bc TitleVBlankHandlerB.buttons +04:44d3 TitleVBlankHandlerB.filter +04:44f9 TitleVBlankHandlerB.donetetry2 +04:451f TitleVBlankHandlerB.vblankSettings +04:4529 TitleVBlankHandlerB.notselected_u19 +04:452e TitleVBlankHandlerB.selected_u19 +04:4531 TitleVBlankHandlerB.done_u19 +04:453b TitleVBlankHandlerB.notselected_u20 +04:4540 TitleVBlankHandlerB.selected_u20 +04:4543 TitleVBlankHandlerB.done_u20 +04:454d TitleVBlankHandlerB.notselected_u21 +04:4552 TitleVBlankHandlerB.selected_u21 +04:4555 TitleVBlankHandlerB.done_u21 +04:455f TitleVBlankHandlerB.notselected_u22 +04:4564 TitleVBlankHandlerB.selected_u22 +04:4567 TitleVBlankHandlerB.done_u22 +04:4571 TitleVBlankHandlerB.notselected_u23 +04:4576 TitleVBlankHandlerB.selected_u23 +04:4579 TitleVBlankHandlerB.done_u23 +04:4583 TitleVBlankHandlerB.notselected_u24 +04:4588 TitleVBlankHandlerB.selected_u24 +04:458b TitleVBlankHandlerB.done_u24 +04:4595 TitleVBlankHandlerB.notselected_u25 +04:459a TitleVBlankHandlerB.selected_u25 +04:459d TitleVBlankHandlerB.done_u25 +04:461d TitleVBlankHandlerB.disabled1 +04:4629 TitleVBlankHandlerB.start +04:463c TitleVBlankHandlerB.donetetry1 +04:4662 TitleVBlankHandlerB.vblankRecords +04:4697 TitleVBlankHandlerB.vblankCredits +04:4698 MainHandleA +04:46a6 MainHandleA.jumps +04:46b8 MainHandleA.tosettings +04:46bd MainHandleA.tocredits +04:46c2 MainHandleA.toprofile +04:46c7 MainHandleA.torecords +04:46cc MainHandleUp +04:46dd MainHandleDown +04:46ee SettingsHandleA +04:46fb ProfileHandleB +04:46fb SettingsHandleB +04:4700 SettingsHandleDown +04:4711 SettingsHandleUp +04:4722 SettingsHandleLeft +04:4733 SettingsHandleLeft.jumps +04:4748 SettingsHandleLeft.rng +04:475f SettingsHandleLeft.rot +04:4776 SettingsHandleLeft.drop +04:478d SettingsHandleLeft.curve +04:47aa SettingsHandleLeft.hig +04:47c1 SettingsHandleRight +04:47d2 SettingsHandleRight.jumps +04:47e7 SettingsHandleRight.rng +04:47fe SettingsHandleRight.rot +04:4815 SettingsHandleRight.drop +04:482c SettingsHandleRight.curve +04:4849 SettingsHandleRight.hig +04:4860 ProfileHandleA +04:4874 ProfileHandleRight +04:4888 ProfileHandleRight.jumps +04:48a0 ProfileHandleRight.idx +04:48a9 ProfileHandleRight.doit +04:48ac ProfileHandleRight.l0 +04:48b6 ProfileHandleRight.doit1 +04:48bd ProfileHandleRight.l1 +04:48c7 ProfileHandleRight.doit2 +04:48ce ProfileHandleRight.l2 +04:48d8 ProfileHandleRight.doit3 +04:48df ProfileHandleRight.buttons +04:48f6 ProfileHandleRight.filter +04:490a ProfileHandleLeft +04:491e ProfileHandleLeft.jumps +04:4936 ProfileHandleLeft.idx +04:4940 ProfileHandleLeft.doit +04:4943 ProfileHandleLeft.l0 +04:494d ProfileHandleLeft.doit1 +04:4954 ProfileHandleLeft.l1 +04:495e ProfileHandleLeft.doit2 +04:4965 ProfileHandleLeft.l2 +04:496f ProfileHandleLeft.doit3 +04:4976 ProfileHandleLeft.buttons +04:498d ProfileHandleLeft.filter +04:49a1 ProfileHandleDown +04:49b2 ProfileHandleUp +04:49c3 DecrementLevel +04:49d9 IncrementLevel +04:49ef InitSpeedCurve +04:49fe GetEnd +04:4a35 GetStart +04:4a6c CheckLevelRange +04:4a85 CheckLevelRange.notatend +04:4aa5 CheckLevelRange.notatstart +04:4aa6 RecordsHandleLeft +04:4ac4 RecordsHandleRight +04:4ae2 RecordsHandleSelect +04:4aeb RenderScores +04:4b14 RenderScores.score_u26 +04:4b19 RenderScores.wvr_u27 +04:4b26 RenderScores.wvr_u28 +04:4b33 RenderScores.wvr_u29 +04:4b40 RenderScores.wvr_u30 +04:4b4d RenderScores.wvr_u31 +04:4b5a RenderScores.wvr_u32 +04:4b67 RenderScores.wvr_u33 +04:4b74 RenderScores.wvr_u34 +04:4b7e RenderScores.level_u26 +04:4b8b RenderScores.wvr_u35 +04:4b96 RenderScores.wvr_u36 +04:4ba1 RenderScores.wvr_u37 +04:4bac RenderScores.wvr_u38 +04:4bb9 RenderScores.wvr_u39 +04:4bc6 RenderScores.wvr_u40 +04:4bd3 RenderScores.wvr_u41 +04:4be0 RenderScores.wvr_u42 +04:4bf2 RenderScores.name_u26 +04:4bf9 RenderScores.wvr_u43 +04:4c04 RenderScores.wvr_u44 +04:4c0f RenderScores.wvr_u45 +04:4c21 RenderScores.nograde_u26 +04:4c24 RenderScores.wvr_u46 +04:4c2e RenderScores.grade_u26 +04:4c31 RenderScores.wvr_u47 +04:4c39 RenderScores.postgrade_u26 +04:4c3e RenderScores.wvr_u48 +04:4c4b RenderScores.wvr_u49 +04:4c58 RenderScores.wvr_u50 +04:4c65 RenderScores.wvr_u51 +04:4c82 RenderScores.score_u52 +04:4c87 RenderScores.wvr_u53 +04:4c94 RenderScores.wvr_u54 +04:4ca1 RenderScores.wvr_u55 +04:4cae RenderScores.wvr_u56 +04:4cbb RenderScores.wvr_u57 +04:4cc8 RenderScores.wvr_u58 +04:4cd5 RenderScores.wvr_u59 +04:4ce2 RenderScores.wvr_u60 +04:4cec RenderScores.level_u52 +04:4cf9 RenderScores.wvr_u61 +04:4d04 RenderScores.wvr_u62 +04:4d0f RenderScores.wvr_u63 +04:4d1a RenderScores.wvr_u64 +04:4d27 RenderScores.wvr_u65 +04:4d34 RenderScores.wvr_u66 +04:4d41 RenderScores.wvr_u67 +04:4d4e RenderScores.wvr_u68 +04:4d60 RenderScores.name_u52 +04:4d67 RenderScores.wvr_u69 +04:4d72 RenderScores.wvr_u70 +04:4d7d RenderScores.wvr_u71 +04:4d8f RenderScores.nograde_u52 +04:4d92 RenderScores.wvr_u72 +04:4d9c RenderScores.grade_u52 +04:4d9f RenderScores.wvr_u73 +04:4da7 RenderScores.postgrade_u52 +04:4dac RenderScores.wvr_u74 +04:4db9 RenderScores.wvr_u75 +04:4dc6 RenderScores.wvr_u76 +04:4dd3 RenderScores.wvr_u77 +04:4df0 RenderScores.score_u78 +04:4df5 RenderScores.wvr_u79 +04:4e02 RenderScores.wvr_u80 +04:4e0f RenderScores.wvr_u81 +04:4e1c RenderScores.wvr_u82 +04:4e29 RenderScores.wvr_u83 +04:4e36 RenderScores.wvr_u84 +04:4e43 RenderScores.wvr_u85 +04:4e50 RenderScores.wvr_u86 +04:4e5a RenderScores.level_u78 +04:4e67 RenderScores.wvr_u87 +04:4e72 RenderScores.wvr_u88 +04:4e7d RenderScores.wvr_u89 +04:4e88 RenderScores.wvr_u90 +04:4e95 RenderScores.wvr_u91 +04:4ea2 RenderScores.wvr_u92 +04:4eaf RenderScores.wvr_u93 +04:4ebc RenderScores.wvr_u94 +04:4ece RenderScores.name_u78 +04:4ed5 RenderScores.wvr_u95 +04:4ee0 RenderScores.wvr_u96 +04:4eeb RenderScores.wvr_u97 +04:4efd RenderScores.nograde_u78 +04:4f00 RenderScores.wvr_u98 +04:4f0a RenderScores.grade_u78 +04:4f0d RenderScores.wvr_u99 +04:4f15 RenderScores.postgrade_u78 +04:4f1a RenderScores.wvr_u100 +04:4f27 RenderScores.wvr_u101 +04:4f34 RenderScores.wvr_u102 +04:4f41 RenderScores.wvr_u103 +04:4f5e RenderScores.score_u104 +04:4f63 RenderScores.wvr_u105 +04:4f70 RenderScores.wvr_u106 +04:4f7d RenderScores.wvr_u107 +04:4f8a RenderScores.wvr_u108 +04:4f97 RenderScores.wvr_u109 +04:4fa4 RenderScores.wvr_u110 +04:4fb1 RenderScores.wvr_u111 +04:4fbe RenderScores.wvr_u112 +04:4fc8 RenderScores.level_u104 +04:4fd5 RenderScores.wvr_u113 +04:4fe0 RenderScores.wvr_u114 +04:4feb RenderScores.wvr_u115 +04:4ff6 RenderScores.wvr_u116 +04:5003 RenderScores.wvr_u117 +04:5010 RenderScores.wvr_u118 +04:501d RenderScores.wvr_u119 +04:502a RenderScores.wvr_u120 +04:503c RenderScores.name_u104 +04:5043 RenderScores.wvr_u121 +04:504e RenderScores.wvr_u122 +04:5059 RenderScores.wvr_u123 +04:506b RenderScores.nograde_u104 +04:506e RenderScores.wvr_u124 +04:5078 RenderScores.grade_u104 +04:507b RenderScores.wvr_u125 +04:5083 RenderScores.postgrade_u104 +04:5088 RenderScores.wvr_u126 +04:5095 RenderScores.wvr_u127 +04:50a2 RenderScores.wvr_u128 +04:50af RenderScores.wvr_u129 +04:50cc RenderScores.score_u130 +04:50d1 RenderScores.wvr_u131 +04:50de RenderScores.wvr_u132 +04:50eb RenderScores.wvr_u133 +04:50f8 RenderScores.wvr_u134 +04:5105 RenderScores.wvr_u135 +04:5112 RenderScores.wvr_u136 +04:511f RenderScores.wvr_u137 +04:512c RenderScores.wvr_u138 +04:5136 RenderScores.level_u130 +04:5143 RenderScores.wvr_u139 +04:514e RenderScores.wvr_u140 +04:5159 RenderScores.wvr_u141 +04:5164 RenderScores.wvr_u142 +04:5171 RenderScores.wvr_u143 +04:517e RenderScores.wvr_u144 +04:518b RenderScores.wvr_u145 +04:5198 RenderScores.wvr_u146 +04:51aa RenderScores.name_u130 +04:51b1 RenderScores.wvr_u147 +04:51bc RenderScores.wvr_u148 +04:51c7 RenderScores.wvr_u149 +04:51d9 RenderScores.nograde_u130 +04:51dc RenderScores.wvr_u150 +04:51e6 RenderScores.grade_u130 +04:51e9 RenderScores.wvr_u151 +04:51f1 RenderScores.postgrade_u130 +04:51f6 RenderScores.wvr_u152 +04:5203 RenderScores.wvr_u153 +04:5210 RenderScores.wvr_u154 +04:521d RenderScores.wvr_u155 +04:523a RenderScores.score_u156 +04:523f RenderScores.wvr_u157 +04:524c RenderScores.wvr_u158 +04:5259 RenderScores.wvr_u159 +04:5266 RenderScores.wvr_u160 +04:5273 RenderScores.wvr_u161 +04:5280 RenderScores.wvr_u162 +04:528d RenderScores.wvr_u163 +04:529a RenderScores.wvr_u164 +04:52a4 RenderScores.level_u156 +04:52b1 RenderScores.wvr_u165 +04:52bc RenderScores.wvr_u166 +04:52c7 RenderScores.wvr_u167 +04:52d2 RenderScores.wvr_u168 +04:52df RenderScores.wvr_u169 +04:52ec RenderScores.wvr_u170 +04:52f9 RenderScores.wvr_u171 +04:5306 RenderScores.wvr_u172 +04:5318 RenderScores.name_u156 +04:531f RenderScores.wvr_u173 +04:532a RenderScores.wvr_u174 +04:5335 RenderScores.wvr_u175 +04:5347 RenderScores.nograde_u156 +04:534a RenderScores.wvr_u176 +04:5354 RenderScores.grade_u156 +04:5357 RenderScores.wvr_u177 +04:535f RenderScores.postgrade_u156 +04:5364 RenderScores.wvr_u178 +04:5371 RenderScores.wvr_u179 +04:537e RenderScores.wvr_u180 +04:538b RenderScores.wvr_u181 +04:53a8 RenderScores.score_u182 +04:53ad RenderScores.wvr_u183 +04:53ba RenderScores.wvr_u184 +04:53c7 RenderScores.wvr_u185 +04:53d4 RenderScores.wvr_u186 +04:53e1 RenderScores.wvr_u187 +04:53ee RenderScores.wvr_u188 +04:53fb RenderScores.wvr_u189 +04:5408 RenderScores.wvr_u190 +04:5412 RenderScores.level_u182 +04:541f RenderScores.wvr_u191 +04:542a RenderScores.wvr_u192 +04:5435 RenderScores.wvr_u193 +04:5440 RenderScores.wvr_u194 +04:544d RenderScores.wvr_u195 +04:545a RenderScores.wvr_u196 +04:5467 RenderScores.wvr_u197 +04:5474 RenderScores.wvr_u198 +04:5486 RenderScores.name_u182 +04:548d RenderScores.wvr_u199 +04:5498 RenderScores.wvr_u200 +04:54a3 RenderScores.wvr_u201 +04:54b5 RenderScores.nograde_u182 +04:54b8 RenderScores.wvr_u202 +04:54c2 RenderScores.grade_u182 +04:54c5 RenderScores.wvr_u203 +04:54cd RenderScores.postgrade_u182 +04:54d2 RenderScores.wvr_u204 +04:54df RenderScores.wvr_u205 +04:54ec RenderScores.wvr_u206 +04:54f9 RenderScores.wvr_u207 +04:5516 RenderScores.score_u208 +04:551b RenderScores.wvr_u209 +04:5528 RenderScores.wvr_u210 +04:5535 RenderScores.wvr_u211 +04:5542 RenderScores.wvr_u212 +04:554f RenderScores.wvr_u213 +04:555c RenderScores.wvr_u214 +04:5569 RenderScores.wvr_u215 +04:5576 RenderScores.wvr_u216 +04:5580 RenderScores.level_u208 +04:558d RenderScores.wvr_u217 +04:5598 RenderScores.wvr_u218 +04:55a3 RenderScores.wvr_u219 +04:55ae RenderScores.wvr_u220 +04:55bb RenderScores.wvr_u221 +04:55c8 RenderScores.wvr_u222 +04:55d5 RenderScores.wvr_u223 +04:55e2 RenderScores.wvr_u224 +04:55f4 RenderScores.name_u208 +04:55fb RenderScores.wvr_u225 +04:5606 RenderScores.wvr_u226 +04:5611 RenderScores.wvr_u227 +04:5623 RenderScores.nograde_u208 +04:5626 RenderScores.wvr_u228 +04:5630 RenderScores.grade_u208 +04:5633 RenderScores.wvr_u229 +04:563b RenderScores.postgrade_u208 +04:5640 RenderScores.wvr_u230 +04:564d RenderScores.wvr_u231 +04:565a RenderScores.wvr_u232 +04:5667 RenderScores.wvr_u233 +04:5684 RenderScores.score_u234 +04:5689 RenderScores.wvr_u235 +04:5696 RenderScores.wvr_u236 +04:56a3 RenderScores.wvr_u237 +04:56b0 RenderScores.wvr_u238 +04:56bd RenderScores.wvr_u239 +04:56ca RenderScores.wvr_u240 +04:56d7 RenderScores.wvr_u241 +04:56e4 RenderScores.wvr_u242 +04:56ee RenderScores.level_u234 +04:56fb RenderScores.wvr_u243 +04:5706 RenderScores.wvr_u244 +04:5711 RenderScores.wvr_u245 +04:571c RenderScores.wvr_u246 +04:5729 RenderScores.wvr_u247 +04:5736 RenderScores.wvr_u248 +04:5743 RenderScores.wvr_u249 +04:5750 RenderScores.wvr_u250 +04:5762 RenderScores.name_u234 +04:5769 RenderScores.wvr_u251 +04:5774 RenderScores.wvr_u252 +04:577f RenderScores.wvr_u253 +04:5791 RenderScores.nograde_u234 +04:5794 RenderScores.wvr_u254 +04:579e RenderScores.grade_u234 +04:57a1 RenderScores.wvr_u255 +04:57a9 RenderScores.postgrade_u234 +04:57ae RenderScores.wvr_u256 +04:57bb RenderScores.wvr_u257 +04:57c8 RenderScores.wvr_u258 +04:57d5 RenderScores.wvr_u259 +04:57f2 RenderScores.score_u260 +04:57f7 RenderScores.wvr_u261 +04:5804 RenderScores.wvr_u262 +04:5811 RenderScores.wvr_u263 +04:581e RenderScores.wvr_u264 +04:582b RenderScores.wvr_u265 +04:5838 RenderScores.wvr_u266 +04:5845 RenderScores.wvr_u267 +04:5852 RenderScores.wvr_u268 +04:585c RenderScores.level_u260 +04:5869 RenderScores.wvr_u269 +04:5874 RenderScores.wvr_u270 +04:587f RenderScores.wvr_u271 +04:588a RenderScores.wvr_u272 +04:5897 RenderScores.wvr_u273 +04:58a4 RenderScores.wvr_u274 +04:58b1 RenderScores.wvr_u275 +04:58be RenderScores.wvr_u276 +04:58d0 RenderScores.name_u260 +04:58d7 RenderScores.wvr_u277 +04:58e2 RenderScores.wvr_u278 +04:58ed RenderScores.wvr_u279 +04:58ff RenderScores.nograde_u260 +04:5902 RenderScores.wvr_u280 +04:590c RenderScores.grade_u260 +04:590f RenderScores.wvr_u281 +04:5917 RenderScores.postgrade_u260 +04:591c RenderScores.wvr_u282 +04:5929 RenderScores.wvr_u283 +04:5936 RenderScores.wvr_u284 +04:5943 RenderScores.wvr_u285 +04:595a sEasterM0 +04:595f sEasterM1 +04:5964 sEasterC0 +04:596f sEasterC1 +04:597a sEasterA0 +04:5985 sEasterA1 +04:5990 sEasterS0 +04:5995 sEasterS1 +04:599a sBUTTONSMode +04:59a2 sRNGMode +04:59b6 sROTMode +04:59c6 sDROPMode +04:59da sCURVEMode +04:59f6 sHIGMode +04:59fe sDisabled +04:5a02 sFilterMode +04:5a16 sTetryRNG +04:5a56 sTetryROT +04:5a96 sTetryDROP +04:5ad6 sTetryCURVE +04:5b16 sTetryHIG +04:5b56 sTetrySTART +04:5b96 sTetryEXITSettings +04:5bd6 sTetryProfileNumber +04:5c16 sTetryProfileInitial1 +04:5c56 sTetryProfileInitial2 +04:5c96 sTetryProfileInitial3 +04:5cd6 sTetryButtons +04:5d16 sTetryFILTER +04:5d56 sTetryReset +04:5d96 sTetryEXITProfile +04:5dd6 sTitleScreenMainMap +04:6076 sTitleScreenSettingsMap +04:6076 sTitleScreenMainMapEnd +04:6316 sTitleScreenCreditsMap +04:6316 sTitleScreenSettingsMapEnd +04:65b6 sTitleScreenProfileMap +04:65b6 sTitleScreenCreditsMapEnd +04:6856 sTitleScreenRecordsMap +04:6856 sTitleScreenProfileMapEnd +04:6af6 sTitleScreenRecordsMapEnd 05:4008 FieldInit 05:403e FieldClear 05:4049 ToBackupField diff --git a/src/include/globals.asm b/src/include/globals.asm index 4c70809..3bf3026 100644 --- a/src/include/globals.asm +++ b/src/include/globals.asm @@ -439,26 +439,29 @@ DEF TITLE_MAIN_SEL_RECORDS EQU 4 DEF TITLE_MAIN_SEL_CREDITS EQU 5 DEF TITLE_SETTINGS_OPTION_BASE EQU $9840 -DEF TITLE_SETTINGS_OPTIONS EQU 9 -DEF TITLE_SETTINGS_BUTTONS EQU $984F -DEF TITLE_SETTINGS_RNG EQU $986F -DEF TITLE_SETTINGS_ROT EQU $988F -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_FILTER EQU $992F +DEF TITLE_SETTINGS_OPTIONS EQU 7 +DEF TITLE_SETTINGS_RNG EQU $984F +DEF TITLE_SETTINGS_ROT EQU $986F +DEF TITLE_SETTINGS_DROP EQU $988F +DEF TITLE_SETTINGS_SCURVE EQU $98AF +DEF TITLE_SETTINGS_HIG EQU $98CF +DEF TITLE_SETTINGS_START EQU $98EF DEF TITLE_SETTINGS_TETRY EQU $99C0 -DEF TITLE_SETTINGS_SEL_BACK EQU 8 +DEF TITLE_SETTINGS_SEL_BACK EQU 6 -DEF TITLE_PROFILE_OPTION_BASE EQU $9842 -DEF TITLE_PROFILE_OPTIONS EQU 6 +DEF TITLE_PROFILE_OPTION_BASE EQU $9840 +DEF TITLE_PROFILE_OPTIONS EQU 8 DEF TITLE_PROFILE_INDEX EQU $984F DEF TITLE_PROFILE_NAME_0 EQU $986F DEF TITLE_PROFILE_NAME_1 EQU $988F DEF TITLE_PROFILE_NAME_2 EQU $98AF -DEF TITLE_PROFILE_SEL_RESET EQU 4 -DEF TITLE_PROFILE_SEL_BACK EQU 5 +DEF TITLE_PROFILE_BUTTONS EQU $98CF +DEF TITLE_PROFILE_FILTER EQU $98EF +DEF TITLE_PROFILE_RESET EQU $990F +DEF TITLE_PROFILE_BACK EQU $992F +DEF TITLE_PROFILE_TETRY EQU $99C0 +DEF TITLE_PROFILE_SEL_RESET EQU 6 +DEF TITLE_PROFILE_SEL_BACK EQU 7 DEF TITLE_RECORDS_MODE EQU $9848 DEF TITLE_RECORDS_SCORE_BASE EQU $98A2 diff --git a/src/res/other_data.inc b/src/res/other_data.inc index 4db9b3e..f155002 100644 --- a/src/res/other_data.inc +++ b/src/res/other_data.inc @@ -1065,6 +1065,15 @@ sTitleTiles:: DB $03,$03,$0F,$0F,$3F,$3F,$FF,$FF DB $3F,$3F,$0F,$0F,$03,$03,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$CC,$CC,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $19,$19,$3F,$3F,$66,$66,$66,$66 + DB $FF,$FF,$FF,$FF,$79,$79,$30,$30 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $80,$80,$C0,$C0,$60,$60,$60,$60 + DB $F0,$F0,$F0,$F0,$E0,$E0,$C0,$C0 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 @@ -1075,45 +1084,36 @@ sTitleTiles:: DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $80,$80,$80,$80,$00,$00,$00,$00 + DB $80,$80,$80,$80,$00,$00,$00,$00 + DB $80,$80,$80,$80,$03,$03,$0F,$0C + DB $9F,$9F,$90,$9F,$10,$1F,$10,$1F + DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $1E,$1E,$FE,$FE,$E0,$E0,$00,$00 + DB $1C,$1C,$3E,$22,$FF,$E3,$FF,$22 + DB $E7,$FB,$26,$FB,$3E,$E3,$1C,$FF + DB $90,$9F,$90,$9F,$10,$1F,$10,$1F + DB $9F,$9F,$80,$80,$00,$00,$00,$00 + DB $80,$80,$80,$80,$00,$00,$00,$00 + DB $80,$80,$80,$80,$00,$00,$00,$00 + DB $00,$FF,$00,$FF,$07,$FF,$07,$FC + DB $F7,$FC,$13,$1E,$11,$1F,$10,$1F + DB $10,$1F,$10,$1F,$10,$1F,$1F,$1F DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $1E,$1E,$1F,$1F,$01,$01,$00,$00 + DB $0E,$0E,$1F,$11,$FF,$F1,$FF,$11 + DB $F3,$FD,$13,$FD,$1F,$F1,$0E,$FF DB $00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$C0,$C0,$C0,$C0,$00,$00 + DB $00,$00,$00,$00,$FF,$FF,$FF,$0D + DB $FF,$F1,$1F,$F1,$1F,$F1,$1F,$F1 + DB $00,$FF,$00,$FF,$E0,$FF,$E0,$3F + DB $FF,$3F,$DF,$71,$9F,$F1,$1F,$F1 + DB $1F,$F1,$1F,$F3,$1C,$FC,$F0,$F0 DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$03,$03,$03,$03,$00,$00 - DB $00,$00,$00,$00,$0F,$0F,$3F,$30 - DB $7F,$7F,$40,$7F,$40,$7F,$40,$7F - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $78,$78,$F8,$F8,$80,$80,$00,$00 - DB $70,$70,$F8,$88,$FF,$8F,$FF,$88 - DB $9F,$EF,$98,$EF,$F8,$8F,$70,$FF - DB $40,$7F,$40,$7F,$40,$7F,$40,$7F - DB $7F,$7F,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$FF,$00,$FF,$1F,$FF,$1F,$F0 - DB $DF,$F0,$4F,$79,$46,$7F,$40,$7F - DB $40,$7F,$40,$7F,$40,$7F,$7F,$7F - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $78,$78,$7F,$7F,$07,$07,$00,$00 - DB $38,$38,$7C,$44,$FF,$C7,$FF,$44 - DB $CF,$F7,$4C,$F7,$7C,$C7,$38,$FF - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$FC,$FC,$FC,$34 - DB $FC,$C4,$7C,$C4,$7C,$C4,$7C,$C4 - DB $00,$FF,$00,$FF,$80,$FF,$80,$FF - DB $FF,$FF,$7C,$C4,$7C,$C4,$7C,$C4 - DB $7C,$C4,$7C,$CC,$70,$F0,$C0,$C0 - DB $00,$00,$00,$00,$00,$00,$00,$00 - DB $7C,$C4,$7C,$C4,$7C,$CC,$70,$F0 - DB $C0,$C0,$00,$00,$00,$00,$00,$00 + DB $1F,$F1,$1F,$F1,$1F,$F3,$1C,$FC + DB $F0,$F0,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00 DB $00,$75,$00,$47,$00,$55,$00,$55 diff --git a/src/res/sources/complete_title.gbr b/src/res/sources/complete_title.gbr index 910f1be..28638ba 100644 Binary files a/src/res/sources/complete_title.gbr and b/src/res/sources/complete_title.gbr differ diff --git a/src/res/sources/map_title_main.gbm b/src/res/sources/map_title_main.gbm index 288184d..e27f33f 100644 Binary files a/src/res/sources/map_title_main.gbm and b/src/res/sources/map_title_main.gbm differ diff --git a/src/res/sources/map_title_main_credits.gbm b/src/res/sources/map_title_main_credits.gbm index 3150997..371e292 100644 Binary files a/src/res/sources/map_title_main_credits.gbm and b/src/res/sources/map_title_main_credits.gbm differ diff --git a/src/res/sources/map_title_main_profile.gbm b/src/res/sources/map_title_main_profile.gbm index 82eb740..4a60078 100644 Binary files a/src/res/sources/map_title_main_profile.gbm and b/src/res/sources/map_title_main_profile.gbm differ diff --git a/src/res/sources/map_title_main_settings.gbm b/src/res/sources/map_title_main_settings.gbm index 507f379..d8e28aa 100644 Binary files a/src/res/sources/map_title_main_settings.gbm and b/src/res/sources/map_title_main_settings.gbm differ diff --git a/src/res/sources/tiles_title.gbr b/src/res/sources/tiles_title.gbr index fc52298..0fa9f07 100644 Binary files a/src/res/sources/tiles_title.gbr and b/src/res/sources/tiles_title.gbr differ diff --git a/src/res/title_data.inc b/src/res/title_data.inc index 9a9a202..26a2b13 100644 --- a/src/res/title_data.inc +++ b/src/res/title_data.inc @@ -82,12 +82,6 @@ sFilterMode:: db "UDLR" db "NONE" -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 " @@ -124,16 +118,58 @@ sTetrySTART:: db "START IN THE SP-" db "EED CURVE " +sTetryEXITSettings:: + db "OH OKAY THEN- " + db "BYE BYE! " + db " " + db " " + +sTetryProfileNumber:: + db "SELECT THE PRO- " + db "FILE YOU WOULD " + db "LIKE TO EDIT! " + db " " + +sTetryProfileInitial1:: + db "THIS IS THE " + db "FIRST INITIAL IN" + db "YOUR NAME! " + db " " + +sTetryProfileInitial2:: + db "THIS IS THE " + db "SECOND INITIAL " + db "IN YOUR NAME! " + db " " + +sTetryProfileInitial3:: + db "THIS IS THE " + db "THIRD INITIAL IN" + db "YOUR NAME! " + db " " + +sTetryButtons:: + db "THIS OPTION WILL" + db "CHANGE WHICH WAY" + db "THE BUTTONS RO- " + db "TATE THE PIECE " + sTetryFILTER:: db "THIS OPTION WILL" db "DETERMINE WHICH " db "D-PAD BUTTONS " db "HAVE PRIORITY " -sTetryEXIT:: - db "OH OKAY THEN- " - db "BYE BYE! " - db " " +sTetryReset:: + db "THIS OPTION WILL" + db "RESET THIS PRO- " + db "FILE TO THE " + db "DEFAULT! " + +sTetryEXITProfile:: + db "ARE YOU LEAVING " + db "ALREADY? I'LL " + db "MISS YOU! " db " " sTitleScreenMainMap:: @@ -163,17 +199,17 @@ sTitleScreenMainMap:: DB $1F,$0C,$1D,$1F,$01,$0D,$14,$12,$01,$01 DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$5D - DB $01,$1B,$1D,$1A,$11,$14,$17,$10,$6F,$01 + DB $01,$1B,$1D,$1A,$11,$14,$17,$10,$01,$01 DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 DB $01,$5D,$01,$1E,$10,$1F,$1F,$14,$19,$12 - DB $1E,$6F,$01,$01,$01,$01,$01,$01,$00,$00 + DB $1E,$01,$01,$01,$01,$01,$01,$01,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $01,$01,$01,$5D,$01,$1D,$10,$0E,$1A,$1D - DB $0F,$1E,$6F,$01,$01,$01,$01,$01,$01,$01 + DB $0F,$1E,$01,$01,$01,$01,$01,$01,$01,$01 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$01,$01,$01,$5D,$01,$0E,$1D,$10 - DB $0F,$14,$1F,$1E,$6F,$01,$01,$01,$01,$01 + DB $0F,$14,$1F,$1E,$01,$01,$01,$01,$01,$01 DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 @@ -214,33 +250,33 @@ sTitleScreenSettingsMap:: DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$5D,$01,$0D,$20,$1F,$1F - DB $1A,$19,$1E,$01,$01,$01,$01,$01,$28,$01 + DB $00,$00,$00,$00,$5D,$01,$1D,$19,$12,$01 + DB $18,$1A,$0F,$10,$01,$01,$01,$01,$28,$01 DB $01,$01,$01,$29,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$5D,$01,$1D,$19 - DB $12,$01,$18,$1A,$0F,$10,$01,$01,$01,$01 + DB $00,$00,$00,$00,$00,$00,$5D,$01,$1D,$1A + DB $1F,$01,$18,$1A,$0F,$10,$01,$01,$01,$01 DB $28,$01,$01,$01,$01,$29,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$5D,$01 - DB $1D,$1A,$1F,$01,$18,$1A,$0F,$10,$01,$01 + DB $0F,$1D,$1A,$1B,$01,$18,$1A,$0F,$10,$01 DB $01,$01,$28,$01,$01,$01,$01,$29,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $5D,$01,$0F,$1D,$1A,$1B,$01,$18,$1A,$0F - DB $10,$01,$01,$01,$28,$01,$01,$01,$01,$29 + DB $5D,$01,$1E,$1B,$10,$10,$0F,$01,$0E,$20 + DB $1D,$21,$10,$01,$28,$01,$01,$01,$01,$29 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$5D,$01,$1E,$1B,$10,$10,$0F,$01 - DB $0E,$20,$1D,$21,$10,$01,$28,$01,$01,$01 + DB $00,$00,$5D,$01,$0C,$17,$22,$0C,$24,$1E + DB $01,$04,$02,$12,$01,$01,$28,$01,$01,$01 DB $01,$29,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$5D,$01,$0C,$17,$22,$0C - DB $24,$1E,$01,$04,$02,$12,$01,$01,$28,$01 + DB $00,$00,$00,$00,$5D,$01,$1E,$1F,$0C,$1D + DB $1F,$01,$17,$10,$21,$10,$17,$01,$28,$01 DB $01,$01,$01,$29,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$5D,$01,$1E,$1F - DB $0C,$1D,$1F,$01,$17,$10,$21,$10,$17,$01 - DB $28,$01,$01,$01,$01,$29,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$5D,$01 - DB $0F,$2A,$1B,$0C,$0F,$01,$11,$14,$17,$1F - DB $10,$1D,$28,$01,$01,$01,$01,$29,$00,$00 + DB $00,$00,$00,$00,$00,$00,$5D,$01,$0D,$0C + DB $0E,$16,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $5D,$01,$0D,$0C,$0E,$16,$6F,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 @@ -285,49 +321,49 @@ sTitleScreenCreditsMap:: DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$0E,$1A,$0F,$10,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$00,$00,$22,$1D,$14,$1F,$1F,$10 + DB $19,$01,$0D,$24,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$2A,$01,$1B,$0C DB $19,$0F,$1A,$1D,$0C,$01,$19,$1A,$21,$0C DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$2A,$01 - DB $0E,$1D,$10,$10,$1B,$10,$1D,$0E,$1D,$0C - DB $11,$1F,$24,$1F,$01,$01,$01,$01,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$18,$20,$1E,$14,$0E,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$2A,$01,$1B,$0C,$19,$0F - DB $1A,$1D,$0C,$01,$19,$1A,$21,$0C,$01,$01 - DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$1E,$11 - DB $23,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $2A,$01,$1B,$0C,$19,$0F,$1A,$1D,$0C,$01 - DB $19,$1A,$21,$0C,$01,$01,$01,$01,$01,$01 + DB $22,$14,$1F,$13,$01,$13,$10,$17,$1B,$01 + DB $11,$1D,$1A,$18,$01,$01,$01,$01,$01,$01 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$2A,$01,$1F,$10,$1B,$1B,$17,$10 - DB $1E,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$2A,$01,$0E,$1D,$10,$10,$1B,$10 + DB $1D,$0E,$1D,$0C,$11,$1F,$24,$1F,$01,$01 DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$00,$00,$2A,$01,$1F,$10,$1B,$1B + DB $17,$10,$1E,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$12,$11,$23,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$00,$00,$00,$00,$2A,$01,$0C,$19 + DB $1F,$1A,$19,$10,$1D,$12,$1A,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$2A,$01 - DB $1B,$0C,$19,$0F,$1A,$1D,$0C,$01,$19,$1A - DB $21,$0C,$01,$01,$80,$82,$88,$8A,$00,$00 + DB $17,$14,$19,$0F,$1F,$1A,$0D,$14,$0C,$1E + DB $01,$01,$01,$01,$01,$01,$01,$01,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $2A,$01,$25,$0C,$1B,$13,$1A,$0F,$09,$09 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$2A,$01,$0D,$0D,$0D,$0D,$0D,$1D + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$2A,$01,$0C,$23,$08,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$2A,$01,$0D,$10 + DB $22,$0C,$1D,$10,$01,$01,$01,$01,$01,$01 + DB $01,$01,$76,$76,$76,$76,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$2A,$01 + DB $1F,$0C,$1B,$01,$78,$7A,$01,$01,$01,$01 + DB $01,$01,$01,$01,$80,$82,$88,$8A,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $2A,$01,$12,$0D,$0F,$10,$21,$01,$78,$7A DB $01,$01,$01,$01,$01,$01,$81,$83,$89,$8B DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 @@ -356,46 +392,30 @@ sTitleScreenProfileMap:: DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$01,$01,$5D,$01,$19,$20 - DB $18,$0D,$10,$1D,$01,$01,$01,$01,$28,$01 + DB $00,$00,$00,$00,$5D,$01,$19,$20,$18,$0D + DB $10,$1D,$01,$01,$01,$01,$01,$01,$28,$01 DB $29,$01,$01,$01,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$01,$01,$5D,$01 - DB $14,$19,$14,$1F,$14,$0C,$17,$01,$03,$01 + DB $00,$00,$00,$00,$00,$00,$5D,$01,$14,$19 + DB $14,$1F,$14,$0C,$17,$01,$03,$01,$01,$01 DB $28,$01,$29,$01,$01,$01,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 + DB $00,$00,$00,$00,$00,$00,$00,$00,$5D,$01 + DB $14,$19,$14,$1F,$14,$0C,$17,$01,$04,$01 + DB $01,$01,$28,$01,$29,$01,$01,$01,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $5D,$01,$14,$19,$14,$1F,$14,$0C,$17,$01 - DB $04,$01,$28,$01,$29,$01,$01,$01,$00,$00 + DB $05,$01,$01,$01,$28,$01,$29,$01,$01,$01 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $01,$01,$5D,$01,$14,$19,$14,$1F,$14,$0C - DB $17,$01,$05,$01,$28,$01,$29,$01,$01,$01 - DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$01,$01,$5D,$01,$1D,$10,$1E,$10 - DB $1F,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$01,$01,$5D,$01,$0D,$0C - DB $0E,$16,$6F,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$00,$00,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$00,$00,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 - DB $01,$01,$01,$01,$01,$01,$00,$00,$00,$00 - DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 - DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $00,$00,$5D,$01,$0D,$20,$1F,$1F,$1A,$19 + DB $1E,$01,$01,$01,$01,$01,$28,$01,$01,$01 + DB $01,$29,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$5D,$01,$0F,$2A,$1B,$0C + DB $0F,$01,$11,$14,$17,$1F,$10,$1D,$28,$01 + DB $01,$01,$01,$29,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$5D,$01,$1D,$10 + DB $1E,$10,$1F,$01,$1B,$1D,$1A,$11,$14,$17 + DB $10,$01,$01,$01,$01,$01,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$5D,$01 + DB $0D,$0C,$0E,$16,$01,$01,$01,$01,$01,$01 DB $01,$01,$01,$01,$01,$01,$01,$01,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 @@ -407,6 +427,22 @@ sTitleScreenProfileMap:: DB $00,$00,$00,$00,$0C,$2A,$0E,$1A,$19,$11 DB $01,$0D,$2A,$0D,$0C,$0E,$16,$01,$6D,$2A DB $19,$0C,$21,$14,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$5E,$5E,$5E,$5E + DB $5E,$5E,$5E,$5E,$5E,$5E,$5E,$5E,$5E,$5E + DB $5E,$5E,$5E,$5E,$5E,$5E,$00,$00,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$80,$82,$88,$8A,$00,$00 + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$81,$83,$89,$8B + DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$01,$01,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$84,$86 + DB $8C,$8E,$00,$00,$00,$00,$00,$00,$00,$00 + DB $00,$00,$00,$00,$01,$01,$01,$01,$01,$01 + DB $01,$01,$01,$01,$01,$01,$01,$01,$01,$01 + DB $85,$87,$8D,$8F,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 DB $00,$00,$00,$00,$00,$00,$00,$00,$00,$00 diff --git a/src/state_title.asm b/src/state_title.asm index 5868a9c..8aa82d5 100644 --- a/src/state_title.asm +++ b/src/state_title.asm @@ -760,7 +760,59 @@ TitleVBlankHandlerB: ld a, [wProfileName+2] ld hl, TITLE_PROFILE_NAME_2 ld [hl], a - ret + +.buttons + ld b, 0 + ld a, [wSwapABState] + add a, a + add a, a + ld c, a + ld hl, sBUTTONSMode + add hl, bc + ld d, h + ld e, l + ld hl, TITLE_PROFILE_BUTTONS + ld bc, 4 + call UnsafeMemCopy + +.filter + ld b, 0 + ldh a, [hFilterMode] + add a, a + add a, a + ld c, a + ld hl, sFilterMode + add hl, bc + ld d, h + ld e, l + ld hl, TITLE_PROFILE_FILTER + ld bc, 4 + call UnsafeMemCopy + + ; Tetry! + ld a, [wSelected] + ld hl, sTetryProfileNumber + ld bc, 64 +: or a, a + jr z, .donetetry2 + dec a + add hl, bc + jr :- +.donetetry2 + ld d, h + ld e, l + ld hl, TITLE_PROFILE_TETRY + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_PROFILE_TETRY+(1*32) + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_PROFILE_TETRY+(2*32) + ld bc, 16 + call SafeMemCopy + ld hl, TITLE_PROFILE_TETRY+(3*32) + ld bc, 16 + jp SafeMemCopy .vblankSettings @@ -857,54 +909,27 @@ TitleVBlankHandlerB: ld hl, TITLE_SETTINGS_HIG ld bc, 4 call UnsafeMemCopy - jr .buttons + jr .start .disabled1 ld de, sDisabled ld hl, TITLE_SETTINGS_HIG ld bc, 4 call UnsafeMemCopy -.buttons - ld b, 0 - ld a, [wSwapABState] - add a, a - add a, a - ld c, a - ld hl, sBUTTONSMode - add hl, bc - ld d, h - ld e, l - ld hl, TITLE_SETTINGS_BUTTONS - ld bc, 4 - call UnsafeMemCopy - -.filter - ld b, 0 - ldh a, [hFilterMode] - add a, a - add a, a - ld c, a - ld hl, sFilterMode - add hl, bc - ld d, h - ld e, l - ld hl, TITLE_SETTINGS_FILTER - ld bc, 4 - call UnsafeMemCopy - ; START level. +.start call DrawSpeedSettings ; Tetry! ld a, [wSelected] - ld hl, sTetryButtons + ld hl, sTetryRNG ld bc, 64 : or a, a - jr z, .donetetry + jr z, .donetetry1 dec a add hl, bc jr :- -.donetetry +.donetetry1 ld d, h ld e, l ld hl, TITLE_SETTINGS_TETRY @@ -1080,29 +1105,14 @@ SettingsHandleLeft: jp hl .jumps - jp .buttons jp .rng jp .rot jp .drop jp .curve jp .hig jp DecrementLevel - jp .filter no_jump -.buttons - ld a, [wSwapABState] - or a, a - jr z, :+ - dec a - ld [wSwapABState], a - ld [rSwapABState], a - ret -: ld a, BUTTON_MODE_COUNT-1 - ld [wSwapABState], a - ld [rSwapABState], a - ret - .rng ld a, [wRNGModeState] or a, a @@ -1170,20 +1180,6 @@ SettingsHandleLeft: ld [rAlways20GState], a ret -.filter - ldh a, [hFilterMode] - or a, a - jr z, :+ - dec a - ldh [hFilterMode], a - ld [rFilterMode], a - ret -: ld a, FILTER_MODE_COUNT-1 - ldh [hFilterMode], a - ld [rFilterMode], a - ret - - SettingsHandleRight: ld a, [wSelected] @@ -1200,29 +1196,14 @@ SettingsHandleRight: jp hl .jumps - jp .buttons jp .rng jp .rot jp .drop jp .curve jp .hig jp IncrementLevel - jp .filter no_jump -.buttons - ld a, [wSwapABState] - cp a, BUTTON_MODE_COUNT-1 - jr z, :+ - inc a - ld [wSwapABState], a - ld [rSwapABState], a - ret -: xor a, a - ld [wSwapABState], a - ld [rSwapABState], a - ret - .rng ld a, [wRNGModeState] cp a, RNG_MODE_COUNT-1 @@ -1290,19 +1271,6 @@ SettingsHandleRight: ld [rAlways20GState], a ret -.filter - ldh a, [hFilterMode] - cp a, FILTER_MODE_COUNT-1 - jr z, :+ - inc a - ldh [hFilterMode], a - ld [rFilterMode], a - ret -: xor a, a - ldh [hFilterMode], a - ld [rFilterMode], a - ret - ProfileHandleA: ld a, [wSelected] @@ -1337,6 +1305,9 @@ ProfileHandleRight: jp .l0 jp .l1 jp .l2 + jp .buttons + jp .filter + no_jump no_jump .idx @@ -1381,6 +1352,32 @@ ProfileHandleRight: ld [rProfileName+2], a ret +.buttons + ld a, [wSwapABState] + cp a, BUTTON_MODE_COUNT-1 + jr z, :+ + inc a + ld [wSwapABState], a + ld [rSwapABState], a + ret +: xor a, a + ld [wSwapABState], a + ld [rSwapABState], a + ret + +.filter + ldh a, [hFilterMode] + cp a, FILTER_MODE_COUNT-1 + jr z, :+ + inc a + ldh [hFilterMode], a + ld [rFilterMode], a + ret +: xor a, a + ldh [hFilterMode], a + ld [rFilterMode], a + ret + ProfileHandleLeft: ld a, [wSelected] @@ -1403,6 +1400,9 @@ ProfileHandleLeft: jp .l0 jp .l1 jp .l2 + jp .buttons + jp .filter + no_jump no_jump .idx @@ -1447,6 +1447,32 @@ ProfileHandleLeft: ld [rProfileName+2], a ret +.buttons + ld a, [wSwapABState] + or a, a + jr z, :+ + dec a + ld [wSwapABState], a + ld [rSwapABState], a + ret +: ld a, BUTTON_MODE_COUNT-1 + ld [wSwapABState], a + ld [rSwapABState], a + ret + +.filter + ldh a, [hFilterMode] + or a, a + jr z, :+ + dec a + ldh [hFilterMode], a + ld [rFilterMode], a + ret +: ld a, FILTER_MODE_COUNT-1 + ldh [hFilterMode], a + ld [rFilterMode], a + ret + ProfileHandleDown: ld a, [wSelected]