diff options
| -rwxr-xr-x | engine/gfx/cgb_layouts.asm (renamed from predef/cgb.asm) | 0 | ||||
| -rwxr-xr-x | engine/gfx/color.asm | 4 | ||||
| -rwxr-xr-x | engine/gfx/sgb_layouts.asm (renamed from predef/sgb.asm) | 0 | ||||
| -rw-r--r-- | engine/menus/intro_menu.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/init_map.asm | 4 | ||||
| -rw-r--r-- | home/vblank.asm | 4 | ||||
| -rw-r--r-- | home/video.asm | 6 | ||||
| -rwxr-xr-x | hram.asm | 24 |
8 files changed, 21 insertions, 25 deletions
diff --git a/predef/cgb.asm b/engine/gfx/cgb_layouts.asm index cbc8d203..cbc8d203 100755 --- a/predef/cgb.asm +++ b/engine/gfx/cgb_layouts.asm diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index b388675f..10507851 100755 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -1,5 +1,5 @@ PALPACKET_LENGTH EQU $10 -INCLUDE "predef/sgb.asm" +INCLUDE "engine/gfx/sgb_layouts.asm" SHINY_ATK_BIT EQU 5 SHINY_DEF_VAL EQU 10 @@ -378,7 +378,7 @@ LoadMailPalettes: .MailPals: INCLUDE "gfx/mail/mail.pal" -INCLUDE "predef/cgb.asm" +INCLUDE "engine/gfx/cgb_layouts.asm" Function9a94: ; 9a94 (2:5a94) ld hl, Palettes_9aaa diff --git a/predef/sgb.asm b/engine/gfx/sgb_layouts.asm index e94ad9fc..e94ad9fc 100755 --- a/predef/sgb.asm +++ b/engine/gfx/sgb_layouts.asm diff --git a/engine/menus/intro_menu.asm b/engine/menus/intro_menu.asm index 0b5862ac..e31900d5 100644 --- a/engine/menus/intro_menu.asm +++ b/engine/menus/intro_menu.asm @@ -277,13 +277,13 @@ Function5c41: ; 5c41 (1:5c41) call ByteFill ldh a, [rLY] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a call DelayFrame ldh a, [hRandomSub] ld [wPlayerID], a ldh a, [rLY] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a call DelayFrame ldh a, [hRandomAdd] ld [wPlayerID + 1], a diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 39873677..37a5207c 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -60,10 +60,10 @@ Function656b: ; 656b (1:656b) ld a, $1 ldh [hOAMUpdate], a ld a, $3 - ldh [hVBlankCounter + 1], a + ldh [hFF9E], a .asm_65bc call DelayFrame - ldh a, [hVBlankCounter + 1] + ldh a, [hFF9E] and a jr nz, .asm_65bc pop af diff --git a/home/vblank.asm b/home/vblank.asm index c32adcf6..3c8e4aac 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -136,7 +136,7 @@ VBlank0:: rst Bankswitch ldh a, [hSeconds] - ldh [hSecondsBackup], a + ldh [hUnusedBackup], a ret @@ -387,7 +387,7 @@ VBlank3:: xor a ldh [rIF], a - ; enable ints + ; enable ints ld a, %11111 ldh [rIE], a ret diff --git a/home/video.asm b/home/video.asm index 519cd6e1..c0c8b47c 100644 --- a/home/video.asm +++ b/home/video.asm @@ -399,7 +399,7 @@ AnimateTileset:: Function1642:: nop - ldh a, [hVBlankCounter + 1] + ldh a, [hFF9E] and a ret z @@ -409,7 +409,7 @@ Function1642:: jr z, .two ld a, 2 - ldh [hVBlankCounter + 1], a + ldh [hFF9E], a ld hl, hBGMapAddress ld a, [hli] ld h, [hl] @@ -437,7 +437,7 @@ endr ld de, $320 .go - ldh [hVBlankCounter + 1], a + ldh [hFF9E], a ld hl, hBGMapAddress ld a, [hli] ld h, [hl] @@ -1,10 +1,8 @@ SECTION "HRAM", HRAM -hTransferVirtualOAM:: ds 12 ; ff80 +hTransferVirtualOAM:: ds 10 ; ff80 -hROMBankBackup:: db ; ff8c -hBuffer:: db ; ff8d -hSRAMBank:: db ; ff8e + ds 5 hRTCDayHi:: db ; ff8f hRTCDayLo:: db ; ff90 @@ -23,13 +21,15 @@ hSeconds:: db ; ff9a ds 1 hVBlankCounter:: db ; ff9d - ds 1 + +hFF9E:: db ; ff9e hROMBank:: db ; ff9f -hVBlank :: db ; ffa0 +hVBlank:: db ; ffa0 hMapEntryMethod:: db ; ffa1 hMenuReturn:: db ; ffa2 - ds 1 + +hFFA3:: db ; ffa3 hJoypadReleased:: db ; ffa4 hJoypadPressed:: db ; ffa5 @@ -110,7 +110,8 @@ hLCDCPointer:: db ; ffc8 hLYOverrideStart:: db ; ffc9 hLYOverrideEnd:: db ; ffca -hMobileReceive:: db ; ffcb + ds 1 + hSerialReceivedNewData:: db ; ffcc hSerialConnectionStatus:: db ; ffcd hSerialIgnoringInitialData:: db ; ffce @@ -144,7 +145,7 @@ hRandom:: hRandomAdd:: db ; ffe3 hRandomSub:: db ; ffe4 -hSecondsBackup:: db ; ffe5 +hUnusedBackup:: db ; ffe5 hBattleTurn:: ; ffe6 ; Which trainer's turn is it? 0: player, 1: opponent trainer @@ -153,8 +154,3 @@ hBattleTurn:: ; ffe6 hCGBPalUpdate:: db ; ffe7 hCGB:: db ; ffe8 hSGB:: db ; ffe9 - -hDMATransfer:: db ; ffea -hMobile:: db ; ffeb -hSystemBooted:: db ; ffec -hClockResetTrigger:: db ; ffed |