diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 08:40:57 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-06-11 08:40:57 -0400 |
| commit | 314a0978f8006c927b59ae966346004789e06e0d (patch) | |
| tree | 10804c4f8f7a26723476ddc07eeb18f0fb9bffa4 | |
| parent | 2327c6b7c4c39061b9fac172b10a931e582e2519 (diff) | |
More gap closing
| -rw-r--r-- | home/map.asm | 6 | ||||
| -rw-r--r-- | home/unknown.asm | 65 | ||||
| -rw-r--r-- | shim.sym | 1 | ||||
| -rw-r--r-- | wram.asm | 8 |
4 files changed, 73 insertions, 7 deletions
diff --git a/home/map.asm b/home/map.asm index b8ddee5..4e40fe6 100644 --- a/home/map.asm +++ b/home/map.asm @@ -30,8 +30,12 @@ RunMapScript:: ; 20ff WriteIntod637:: ; 2117 push af ; TODO: figure out what variables are concerned here + ld a, [wd637] + ld [wd638], a + pop af + ld [wd637], a + ret -SECTION "ClearMapBuffer", ROM0[$2123] ClearMapBuffer:: ; 00:2123 ld hl, wMapBuffer ld bc, wMapBufferEnd - wMapBuffer diff --git a/home/unknown.asm b/home/unknown.asm index e2cc5cd..cc8b8cb 100644 --- a/home/unknown.asm +++ b/home/unknown.asm @@ -39,13 +39,67 @@ _2007:: ; 2007 call CloseSRAM ret -SECTION "Unknown functions 2", ROM0[$2075] +Function2018:: + ld hl, wd153 + res 0, [hl] + ld hl, wd14f + set 0, [hl] + ret + +Function2023:: + ld hl, wd14f + res 0, [hl] + xor a + ldh [hLCDCPointer], a + ret + +Function202c:: ; 00:202c + xor a + ldh [hBGMapMode], a + ld hl, wd14f + bit 0, [hl] + jr z, .asm_206b + + res 7, [hl] + call LoadFontExtra2 + + ld hl, wcbb2 + ld a, "─" + ld bc, SCREEN_WIDTH + call ByteFill + + ld hl, wcbd2 + ld a, " " + ld bc, SCREEN_WIDTH + call ByteFill + + call Function2075 + + ld hl, vBGMap1 + ld bc, $4 + ld de, wcbb2 + call Get2bpp + + ld a, $80 + ldh [hLCDCPointer], a + ld a, $80 + ldh [rWY], a + ldh [hWY], a + ret -_2075:: ; 2075 +.asm_206b: ; 00:206b + xor a + ldh [hLCDCPointer], a + ld a, $90 + ldh [rWY], a + ldh [hWY], a + ret + +Function2075:: ; 2075 ; Prepares a buffer for the clock display, which in the Debug ROM is displayed on the bottom of the screen. ; This function is called every frame, and loads special tiles into the $66-$7a space. ld hl, wcbd2 - ld bc, $14 + ld bc, SCREEN_WIDTH ld a, " " call ByteFill @@ -122,6 +176,11 @@ _20F1:: ; 20f1 inc de ret +Function20f8:: + call Function1848 + call Function18cc + ret + SECTION "Unknown_094c", ROM0 [$094C] Function094c:: @@ -1,5 +1,4 @@ ; ROM0 -00:202C Function202c 00:2C05 StartMenuCheck 00:2F1D Function2f1d 00:3111 Function3111 @@ -257,9 +257,11 @@ wTileRight:: db ; cb93 wScreenSave:: ; cb94 ds 6 * 5 -SECTION "CBD2", WRAM0[$CBD2] +SECTION "CBB2", WRAM0[$CBB2] +wcbb2:: ; cbb2 + ds $20 wcbd2:: ; cbd2 - ds $14 + ds $20 ; cbe6 SECTION "CBF2", WRAM0[$CBF2] @@ -623,6 +625,7 @@ wMap14Object:: map_object wMap14 wMap15Object:: map_object wMap15 wMapObjectsEnd:: ; d14f +wd14f:: ds 3 ; TODO wTimeOfDayPal:: db ; d152 @@ -706,6 +709,7 @@ wCurrMapObjectCount:: ; d5f6 SECTION "D637", WRAM0[$D637] wd637:: db ; d637 +wd638:: db ; d638 SECTION "Used sprites", WRAM0[$D643] |