diff options
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/map.asm b/home/map.asm index 1e409f0fc..4d16ff7b3 100644 --- a/home/map.asm +++ b/home/map.asm @@ -384,7 +384,7 @@ CheckIndoorMap:: ; 22f4 ret ; 2300 -; XXX +; unused cp INDOOR ret z cp GATE @@ -1371,7 +1371,7 @@ UpdateBGMapColumn:: ; 27f8 inc d ; cap d at HIGH(vBGMap0) ld a, d - and $3 + and %11 or HIGH(vBGMap0) ld d, a @@ -1383,7 +1383,7 @@ UpdateBGMapColumn:: ; 27f8 ret ; 2816 -; unreferenced +Unreferenced_Function2816:: ld hl, BGMapBuffer ld bc, BGMapBufferEnd - BGMapBuffer xor a @@ -1401,7 +1401,7 @@ LoadTilesetGFX:: ; 2821 ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a ld a, e @@ -1429,6 +1429,7 @@ LoadTilesetGFX:: ; 2821 pop af ld [rSVBK], a +; These tilesets support dynamic per-mapgroup roof tiles. ld a, [wTileset] cp TILESET_JOHTO_1 jr z, .load_roof @@ -1983,7 +1984,7 @@ FadeToMenu:: ; 2b29 xor a ld [hBGMapMode], a call LoadStandardMenuDataHeader - farcall FadeOutPalettes + farcall Special_FadeOutPalettes call ClearSprites call DisableSpriteUpdates ret @@ -2009,7 +2010,7 @@ FinishExitMenu:: ; 2b5c call GetSGBLayout farcall LoadOW_BGPal7 call WaitBGMap2 - farcall FadeInPalettes + farcall Special_FadeInPalettes call EnableSpriteUpdates ret ; 2b74 @@ -2042,7 +2043,7 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ReloadTilesetAndPalettes:: ; 2bae call DisableLCD call ClearSprites - farcall RefreshSprites + farcall Special_RefreshSprites call LoadStandardFont call LoadFontsExtra ld a, [hROMBank] @@ -2075,7 +2076,6 @@ GetAnyMapHeaderPointer:: ; 0x2bed ; inputs: ; b = map group, c = map number -; XXX de = ??? ; outputs: ; hl points to the map header @@ -2106,11 +2106,11 @@ GetMapHeaderMember:: ; 0x2c04 ; Extract data from the current map's header. ; inputs: -; de = offset of desired data within the mapheader +; de = offset of desired data within the mapheader (a MAPHEADER_* constant) ; outputs: ; bc = data from the current map's header -; (e.g., de = $0003 would return a pointer to the secondary map header) +; (e.g., de = MAPHEADER_MAPHEADER2 would return a pointer to the secondary map header) ld a, [MapGroup] ld b, a @@ -2247,7 +2247,7 @@ GetMapEnvironment:: ; 2c8a ret ; 2c98 - ret ; XXX + ret ; unused ; 2c99 GetAnyMapEnvironment:: ; 2c99 |