Various annotations

Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
This commit is contained in:
PikalaxALT
2015-07-22 15:57:02 -04:00
parent d5ddd9e54e
commit c8960dd2c8
43 changed files with 3252 additions and 3160 deletions

View File

@@ -645,7 +645,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
call Function17aae3
ld c, a
ld b, $0
ld hl, AttrMap ; AttrMap + 0 + 0 * SCREEN_WIDTH
hlcoord 0, 0, AttrMap
add hl, bc
push hl
ld a, $4
@@ -766,7 +766,7 @@ Function17abcf: ; 17abcf (5e:6bcf)
Function17ac0c: ; 17ac0c (5e:6c0c)
call Function17ac1d
call Function17ac2a
ld hl, TileMap
hlcoord 0, 0
ld b, $2
ld c, $12
call Function17ac46

View File

@@ -173,7 +173,7 @@ Function1000fa: ; 1000fa
xor a
ld [InLinkBattle], a
ld a, $4
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
callba Function11619d
ld hl, wcd29
set 6, [hl]
@@ -327,7 +327,7 @@ Function100232: ; 100232
push de
callba Function106464
call Function3f20
call DrawOnMap
call UpdateSprites
hlcoord 1, 2
pop de
call PlaceString
@@ -797,7 +797,7 @@ Function1004f4: ; 1004f4
Function100504: ; 100504
push de
call Function3f20
call DrawOnMap
call UpdateSprites
pop de
hlcoord 4, 2
call PlaceString
@@ -830,7 +830,7 @@ Jumptable_10052a: ; 10052a
Function100534: ; 100534
call Function100513
call DrawOnMap
call UpdateSprites
call Function321c
ld a, [wcd28]
inc a
@@ -1514,10 +1514,10 @@ Function100902: ; 100902
Function100970: ; 100970
ld hl, TileMap
hlcoord 0, 0
ld de, wdc00
call Function1009a5
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld de, $dd68
call Function1009a5
call Function1009d2
@@ -1527,18 +1527,18 @@ Function100970: ; 100970
Function100989: ; 100989
ld hl, wdc00
ld de, TileMap
decoord 0, 0
call Function1009a5
call Function1009ae
callba Function104061
ld hl, $dd68
ld de, AttrMap
decoord 0, 0, AttrMap
call Function1009a5
ret
; 1009a5
Function1009a5: ; 1009a5
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $3
call FarCopyWRAM
ret
@@ -1550,7 +1550,7 @@ Function1009ae: ; 1009ae
ld a, $3
ld [rSVBK], a
ld hl, $d800
ld de, AttrMap
decoord 0, 0, AttrMap
ld c, $14
ld b, $12
.asm_1009bf
@@ -1829,7 +1829,7 @@ Function100b7a: ; 100b7a
rst FarCall
callba Function24085
callba MobileTextBorder
call DrawOnMap
call UpdateSprites
call Function321c
callba Function2411a
ld hl, wcfa5
@@ -2084,7 +2084,7 @@ Function100d67: ; 100d67
xor a
ld [hBGMapMode], a
call Function1cbb
call DrawOnMap
call UpdateSprites
call Function1c89
call WaitBGMap
call Function1c66
@@ -2812,7 +2812,7 @@ Jumptable_101247: ; 101247
; 101251
Function101251: ; 101251
call DrawOnMap
call UpdateSprites
call ResetWindow
ld hl, UnknownText_0x1021f4
call Function1021e0
@@ -2829,7 +2829,7 @@ Function101265: ; 101265
; 10126c
Function10126c: ; 10126c
call DrawOnMap
call UpdateSprites
callba Script_reloadmappart
ld hl, UnknownText_0x1021f4
call Function1021e0
@@ -3018,7 +3018,7 @@ Function1013aa: ; 1013aa
call Function1d7d
call Function2bae
callba Function106464
call DrawOnMap
call UpdateSprites
call Function2b5c
ret
; 1013c0
@@ -4174,7 +4174,7 @@ Function101b70: ; 101b70
call Function101ee4
ld hl, wcd29
set 5, [hl]
call DrawOnMap
call UpdateSprites
ld a, [wcd25]
inc a
ld [wcd25], a
@@ -4356,7 +4356,7 @@ Function101cc2: ; 101cc2 ; unreferenced
Function101cc8: ; 101cc8
ld a, $1
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ld a, $1
ld [wc30d], a
ld hl, wcd29
@@ -4369,7 +4369,7 @@ Function101cc8: ; 101cc8
Function101cdf: ; 101cdf
ld a, $6
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ld a, $1
ld [wc30d], a
ld hl, wcd29
@@ -4382,7 +4382,7 @@ Function101cdf: ; 101cdf
Function101cf6: ; 101cf6
ld a, $b
ld [wc315], a
ld [wPartyMon1MenuIconAnim + 1], a
ld a, [wcd25]
inc a
ld [wcd25], a
@@ -4391,7 +4391,7 @@ Function101cf6: ; 101cf6
Function101d03: ; 101d03
ld a, $e
ld [wc315], a
ld [wPartyMon1MenuIconAnim + 1], a
ld a, [wcd25]
inc a
ld [wcd25], a
@@ -6747,11 +6747,11 @@ Function102d48: ; 102d48
Function102d9a: ; 102d9a
ld a, $7f
ld hl, SpritesEnd
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $7
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
callba Function104000
ret
@@ -7321,7 +7321,7 @@ Function103309: ; 103309
ld a, [hl]
ld [wd1ee], a
call Function1034be
call DrawOnMap
call UpdateSprites
callba Function104000
ld a, $1
ld [wd1f0], a
@@ -7566,7 +7566,7 @@ Function1034f1: ; 1034f1
ld [wd1f2], a
Function1034f7: ; 10134f7
ld hl, TileMap
hlcoord 0, 0
add hl, bc
ld a, [wd1ef]
ld bc, SCREEN_WIDTH

View File

@@ -497,7 +497,7 @@ Function10830e: ; 10830e
call Function3b2a
ld de, SFX_BALL_POOF
call PlaySFX
ld hl, TileMap
hlcoord 0, 0
ld bc, $00f0
ld a, $7f
call ByteFill
@@ -632,7 +632,7 @@ Function10842c: ; 10842c
call Function3b2a
ld de, SFX_BALL_POOF
call PlaySFX
ld hl, TileMap
hlcoord 0, 0
ld bc, $00f0
ld a, $7f
call ByteFill
@@ -1386,8 +1386,8 @@ Function108abe: ; 108abe
; 108ac8
Function108ac8: ; 108ac8
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $7f
call ByteFill
ret

File diff suppressed because it is too large Load Diff

View File

@@ -14,8 +14,8 @@ Function17c000: ; 17c000
call Functione5f
ld hl, HaveWantMap
ld de, TileMap
ld bc, AttrMap
decoord 0, 0
bccoord 0, 0, AttrMap
ld a, SCREEN_HEIGHT
.y
@@ -746,8 +746,8 @@ Function17d48d: ; 17d48d
ld bc, $0040
call CopyBytes
ld hl, TileAttrmap_17eb8e
ld de, TileMap
ld bc, AttrMap
decoord 0, 0
bccoord 0, 0, AttrMap
ld a, $12
.asm_17d4a4
push af
@@ -862,7 +862,7 @@ Function17d48d: ; 17d48d
ld b, a
push hl
pop de
ld hl, TileMap
hlcoord 0, 0
add hl, bc
call PlaceString
push de
@@ -1310,7 +1310,7 @@ Function17d818: ; 17d818
call Function17e447
ld e, l
ld d, h
ld hl, TileMap
hlcoord 0, 0
add hl, bc
call PlaceString
ret
@@ -1335,7 +1335,7 @@ Function17d833: ; 17d833
call Function17e43d
ld c, l
ld b, h
ld hl, TileMap
hlcoord 0, 0
add hl, de
ld e, l
ld d, h
@@ -1505,7 +1505,7 @@ Function17d93a: ; 17d93a
ld h, a
ld a, [wc70b]
ld c, a
ld de, TileMap
decoord 0, 0
add hl, de
ld e, l
ld d, h
@@ -1543,7 +1543,7 @@ Function17d98b: ; 17d98b
ld de, VTiles2
callba GetTrainerPic
pop hl
ld de, TileMap
decoord 0, 0
add hl, de
ld bc, $0707
predef FillBox
@@ -2051,12 +2051,12 @@ Function17dd13: ; 17dd13
call Function17e41e
call Function17e447
push hl
ld hl, TileMap
hlcoord 0, 0
add hl, bc
push hl
pop bc
pop hl
call Function13e5
call PlaceWholeStringInBoxAtOnce
ret
; 17dd30
@@ -2073,7 +2073,7 @@ Function17dd30: ; 17dd30
push af
call Function17e41e
pop af
ld hl, TileMap
hlcoord 0, 0
add hl, de
call Function17e600
ret
@@ -3230,7 +3230,7 @@ rept 2
add hl, bc
endr
push hl
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
call AddNTimes
@@ -3308,7 +3308,7 @@ Function17e4dd: ; 17e4dd
and $1
ret z
ld a, [wcd29]
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
call AddNTimes
ld a, [wcd28]
@@ -3345,7 +3345,7 @@ Function17e51b: ; 17e51b
sub [hl]
inc a
ld [wcd4f], a
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
dec a
@@ -3395,7 +3395,7 @@ Function17e566: ; 17e566
Function17e571: ; 17e571
push af
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
call AddNTimes
@@ -3437,7 +3437,7 @@ Function17e5af: ; 17e5af
ld l, a
ld a, [wcd44]
ld h, a
ld bc, TileMap
bccoord 0, 0
add hl, bc
ld bc, $ffec
add hl, bc
@@ -3471,7 +3471,7 @@ endr
ld l, a
ld a, [wcd44]
ld h, a
ld bc, TileMap
bccoord 0, 0
add hl, bc
call PlaceString
ret
@@ -3496,7 +3496,7 @@ Function17e600: ; 17e600
Function17e613: ; 17e613
push hl
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [de]
inc de
@@ -3633,7 +3633,7 @@ endr
push af
push hl
push hl
ld bc, TileMap
bccoord 0, 0
add hl, bc
ld a, [hl]
cp $7f
@@ -3648,7 +3648,7 @@ endr
.asm_17e6c7
pop hl
ld bc, AttrMap
bccoord 0, 0, AttrMap
add hl, bc
ld [hl], a
pop hl
@@ -3672,7 +3672,7 @@ Function17e6de: ; 17e6de
ld l, a
ld a, [wc709]
ld h, a
ld de, AttrMap
decoord 0, 0, AttrMap
add hl, de
pop af
ld b, $7
@@ -4456,7 +4456,7 @@ Function17f41d: ; 17f41d
jr .asm_17f42c
.asm_17f439
ld hl, TileMap
hlcoord 0, 0
ld de, SCREEN_WIDTH
ld a, c
.asm_17f440
@@ -4769,12 +4769,12 @@ Function17f5e4: ; 17f5e4
ld a, d
ld [MusicFadeIDHi], a
ld a, " "
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $6
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
hlcoord 2, 1
ld b, $1