diff --git a/bin/PandorasBlocks.gbc b/bin/PandorasBlocks.gbc index 858588d..f4e5757 100644 Binary files a/bin/PandorasBlocks.gbc and b/bin/PandorasBlocks.gbc differ diff --git a/bin/PandorasBlocks.map b/bin/PandorasBlocks.map index d0202bc..07131d2 100644 --- a/bin/PandorasBlocks.map +++ b/bin/PandorasBlocks.map @@ -1,5 +1,5 @@ SUMMARY: - ROM0: 14729 bytes used / 1655 free + ROM0: 14733 bytes used / 1651 free ROMX: 110971 bytes used / 36485 free in 9 banks SRAM: 2951 bytes used / 5241 free in 1 bank WRAM0: 3927 bytes used / 169 free @@ -503,49 +503,49 @@ ROM0 bank #0: $37cd = SetProgress.wvr_u8 $37db = SetProgress.wvr_u9 $37e7 = SetProgress.wvr_u10 - SECTION: $37ef-$3895 ($00a7 bytes) ["Code Entry Point"] + SECTION: $37ef-$3899 ($00ab bytes) ["Code Entry Point"] $37ef = Main - $3818 = Main.notgbc - $3827 = Main.wvr_u1 - $3857 = EventLoop - $3870 = EventLoop.eventloopjumps - $3879 = EventLoopPostHandler - $387b = EventLoopPostHandler.wvb_u2 - $388d = EventLoopPostHandler.vblankjumps - SECTION: $3896-$38cb ($0036 bytes) ["Grading Functions Unbanked"] - $3896 = GradeInit - $389f = UpdateGrade - $38a8 = DecayGradeProcess - $38b1 = DecayGradeDelay - $38ba = TGM3REGRETHandler - $38c3 = TGM3COOLHandler - SECTION: $38cc-$38f9 ($002e bytes) ["Memory Functions"] - $38cc = UnsafeMemCopy - $38d5 = SafeMemCopy - $38d5 = SafeMemCopy.wvr_u1 - $38e4 = UnsafeMemSet - $38ec = SafeMemSet.wvr_u2 - $38ec = SafeMemSet - SECTION: $38fa-$391f ($0026 bytes) ["Gameplay Function Trampolines"] - $38fa = SwitchToGameplay - $3903 = SwitchToGameplayBig - $390c = GamePlayEventLoopHandler - $3916 = GamePlayBigEventLoopHandler - SECTION: $3920-$3944 ($0025 bytes) ["Interrupt Initialization Functions"] - $3920 = EnableScreenSquish - $393a = DisableScreenSquish - SECTION: $3945-$3966 ($0022 bytes) ["OAM Functions"] - $3945 = CopyOAMHandler - $3951 = ClearOAM - SECTION: $3967-$3977 ($0011 bytes) ["Intro Effect Trampoline"] - $3967 = DoIntroEffect - SECTION: $3978-$3986 ($000f bytes) ["Banking Functions"] - $3978 = BankingInit - SECTION: $3987-$3990 ($000a bytes) ["OAM DMA Code"] - $3987 = OAMDMA - $3991 = OAMDMAEnd - EMPTY: $3991-$3fff ($066f bytes) - TOTAL EMPTY: $0677 bytes + $381c = Main.notgbc + $382b = Main.wvr_u1 + $385b = EventLoop + $3874 = EventLoop.eventloopjumps + $387d = EventLoopPostHandler + $387f = EventLoopPostHandler.wvb_u2 + $3891 = EventLoopPostHandler.vblankjumps + SECTION: $389a-$38cf ($0036 bytes) ["Grading Functions Unbanked"] + $389a = GradeInit + $38a3 = UpdateGrade + $38ac = DecayGradeProcess + $38b5 = DecayGradeDelay + $38be = TGM3REGRETHandler + $38c7 = TGM3COOLHandler + SECTION: $38d0-$38fd ($002e bytes) ["Memory Functions"] + $38d0 = UnsafeMemCopy + $38d9 = SafeMemCopy + $38d9 = SafeMemCopy.wvr_u1 + $38e8 = UnsafeMemSet + $38f0 = SafeMemSet.wvr_u2 + $38f0 = SafeMemSet + SECTION: $38fe-$3923 ($0026 bytes) ["Gameplay Function Trampolines"] + $38fe = SwitchToGameplay + $3907 = SwitchToGameplayBig + $3910 = GamePlayEventLoopHandler + $391a = GamePlayBigEventLoopHandler + SECTION: $3924-$3948 ($0025 bytes) ["Interrupt Initialization Functions"] + $3924 = EnableScreenSquish + $393e = DisableScreenSquish + SECTION: $3949-$396a ($0022 bytes) ["OAM Functions"] + $3949 = CopyOAMHandler + $3955 = ClearOAM + SECTION: $396b-$397b ($0011 bytes) ["Intro Effect Trampoline"] + $396b = DoIntroEffect + SECTION: $397c-$398a ($000f bytes) ["Banking Functions"] + $397c = BankingInit + SECTION: $398b-$3994 ($000a bytes) ["OAM DMA Code"] + $398b = OAMDMA + $3995 = OAMDMAEnd + EMPTY: $3995-$3fff ($066b bytes) + TOTAL EMPTY: $0673 bytes ROMX bank #1: SECTION: $4000-$4007 ($0008 bytes) ["Bank ID BANK_OTHER"] diff --git a/bin/PandorasBlocks.pocket b/bin/PandorasBlocks.pocket index c608194..9a8ef4b 100644 Binary files a/bin/PandorasBlocks.pocket and b/bin/PandorasBlocks.pocket differ diff --git a/bin/PandorasBlocks.sym b/bin/PandorasBlocks.sym index 5842ee1..4af3d4d 100644 --- a/bin/PandorasBlocks.sym +++ b/bin/PandorasBlocks.sym @@ -387,37 +387,37 @@ 00:37db SetProgress.wvr_u9 00:37e7 SetProgress.wvr_u10 00:37ef Main -00:3818 Main.notgbc -00:3827 Main.wvr_u1 -00:3857 EventLoop -00:3870 EventLoop.eventloopjumps -00:3879 EventLoopPostHandler -00:387b EventLoopPostHandler.wvb_u2 -00:388d EventLoopPostHandler.vblankjumps -00:3896 GradeInit -00:389f UpdateGrade -00:38a8 DecayGradeProcess -00:38b1 DecayGradeDelay -00:38ba TGM3REGRETHandler -00:38c3 TGM3COOLHandler -00:38cc UnsafeMemCopy -00:38d5 SafeMemCopy -00:38d5 SafeMemCopy.wvr_u1 -00:38e4 UnsafeMemSet -00:38ec SafeMemSet -00:38ec SafeMemSet.wvr_u2 -00:38fa SwitchToGameplay -00:3903 SwitchToGameplayBig -00:390c GamePlayEventLoopHandler -00:3916 GamePlayBigEventLoopHandler -00:3920 EnableScreenSquish -00:393a DisableScreenSquish -00:3945 CopyOAMHandler -00:3951 ClearOAM -00:3967 DoIntroEffect -00:3978 BankingInit -00:3987 OAMDMA -00:3991 OAMDMAEnd +00:381c Main.notgbc +00:382b Main.wvr_u1 +00:385b EventLoop +00:3874 EventLoop.eventloopjumps +00:387d EventLoopPostHandler +00:387f EventLoopPostHandler.wvb_u2 +00:3891 EventLoopPostHandler.vblankjumps +00:389a GradeInit +00:38a3 UpdateGrade +00:38ac DecayGradeProcess +00:38b5 DecayGradeDelay +00:38be TGM3REGRETHandler +00:38c7 TGM3COOLHandler +00:38d0 UnsafeMemCopy +00:38d9 SafeMemCopy +00:38d9 SafeMemCopy.wvr_u1 +00:38e8 UnsafeMemSet +00:38f0 SafeMemSet +00:38f0 SafeMemSet.wvr_u2 +00:38fe SwitchToGameplay +00:3907 SwitchToGameplayBig +00:3910 GamePlayEventLoopHandler +00:391a GamePlayBigEventLoopHandler +00:3924 EnableScreenSquish +00:393e DisableScreenSquish +00:3949 CopyOAMHandler +00:3955 ClearOAM +00:396b DoIntroEffect +00:397c BankingInit +00:398b OAMDMA +00:3995 OAMDMAEnd 01:4008 sDMGTSpeedCurve 01:4203 sDMGTSpeedCurveEnd 01:4205 sDMGTSpeedCurveSpecialData diff --git a/src/main.asm b/src/main.asm index c404cf2..45e2460 100644 --- a/src/main.asm +++ b/src/main.asm @@ -71,6 +71,8 @@ Main:: ld a, [wInitialA] cp a, $11 jr nz, .notgbc + ld a, P1F_GET_NONE + ldh [rP1], a ld a, KEY1F_PREPARE ldh [rKEY1], a stop