diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 2 | ||||
| -rw-r--r-- | home/flag.asm | 4 | ||||
| -rw-r--r-- | home/game_time.asm | 2 | ||||
| -rw-r--r-- | home/init.asm | 6 | ||||
| -rw-r--r-- | home/map.asm | 16 | ||||
| -rw-r--r-- | home/menu.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 14 | ||||
| -rw-r--r-- | home/video.asm | 4 |
8 files changed, 25 insertions, 25 deletions
diff --git a/home/audio.asm b/home/audio.asm index 21e4f81f9..35f98af4d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -461,7 +461,7 @@ SpecialMapMusic:: ; 3d62 cp PLAYER_SURF_PIKA jr z, .surf - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 2, a jr nz, .contest diff --git a/home/flag.asm b/home/flag.asm index 442c811c2..5f1d783af 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -7,7 +7,7 @@ ResetMapBufferEventFlags:: ; 2e50 ResetBikeFlags:: ; 2e56 xor a - ld hl, BikeFlags + ld hl, wBikeFlags ld [hli], a ld [hl], a ret @@ -22,7 +22,7 @@ ResetFlashIfOutOfCave:: ; 2e5d ret .asm_2e69 - ld hl, StatusFlags + ld hl, wStatusFlags res 2, [hl] ret ; 2e6f diff --git a/home/game_time.asm b/home/game_time.asm index 91dd381fc..69ea0099e 100644 --- a/home/game_time.asm +++ b/home/game_time.asm @@ -38,7 +38,7 @@ UpdateGameTimer:: ; 20ad ret nz ; Is the timer paused? - ld hl, GameTimerPause + ld hl, wGameTimerPause bit 0, [hl] ret z diff --git a/home/init.asm b/home/init.asm index daac79da3..f71c247cd 100644 --- a/home/init.asm +++ b/home/init.asm @@ -141,9 +141,9 @@ Init:: ; 17d farcall InitCGBPals - ld a, HIGH(VBGMap1) + ld a, HIGH(vBGMap1) ld [hBGMapAddress + 1], a - xor a ; LOW(VBGMap1) + xor a ; LOW(vBGMap1) ld [hBGMapAddress], a farcall StartClock @@ -185,7 +185,7 @@ ClearVRAM:: ; 245 xor a ld [rVBK], a .clear - ld hl, VTiles0 + ld hl, vTiles0 ld bc, $2000 xor a call ByteFill diff --git a/home/map.asm b/home/map.asm index 83b5adf11..1e409f0fc 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1241,10 +1241,10 @@ ScrollMapUp:: ; 2748 ld h, a ld bc, $0200 add hl, bc -; cap d at HIGH(VBGMap0) +; cap d at HIGH(vBGMap0) ld a, h and %00000011 - or HIGH(VBGMap0) + or HIGH(vBGMap0) ld e, l ld d, a call UpdateBGMapRow @@ -1369,10 +1369,10 @@ UpdateBGMapColumn:: ; 27f8 ld e, a jr nc, .skip inc d -; cap d at HIGH(VBGMap0) +; cap d at HIGH(vBGMap0) ld a, d and $3 - or HIGH(VBGMap0) + or HIGH(vBGMap0) ld d, a .skip @@ -1409,7 +1409,7 @@ LoadTilesetGFX:: ; 2821 call FarDecompress ld hl, wDecompressScratch - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 tiles call CopyBytes @@ -1419,7 +1419,7 @@ LoadTilesetGFX:: ; 2821 ld [rVBK], a ld hl, wDecompressScratch + $60 tiles - ld de, VTiles2 + ld de, vTiles2 ld bc, $60 tiles call CopyBytes @@ -2305,7 +2305,7 @@ GetMapHeaderMusic:: ; 2cbd ret .radiotower - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 0, a jr z, .clearedradiotower ld de, MUSIC_ROCKET_OVERTURE @@ -2320,7 +2320,7 @@ GetMapHeaderMusic:: ; 2cbd jr .done .mahoganymart - ld a, [StatusFlags2] + ld a, [wStatusFlags2] bit 7, a jr z, .clearedmahogany ld de, MUSIC_ROCKET_HIDEOUT diff --git a/home/menu.asm b/home/menu.asm index ba1b568c1..03cec64df 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -43,7 +43,7 @@ LoadMenuTextBox:: ; 1d58 db $40 ; tile backup db 12, 0 ; start coords db 17, 19 ; end coords - dw VTiles0 + dw vTiles0 db 0 ; default option ; 1d67 diff --git a/home/text.asm b/home/text.asm index 39d9a3ed1..7cf3c2c60 100644 --- a/home/text.asm +++ b/home/text.asm @@ -200,21 +200,21 @@ NextChar:: ; 1083 jp PlaceNextChar CheckDict:: ; 1087 -dict: macro +dict: MACRO if \1 == 0 and a else cp \1 endc jp z, \2 -endm +ENDM -dict2: macro +dict2: MACRO cp \1 jr nz, ._\@ ld a, \2 ._\@: -endm +ENDM dict "<DAY>", Char15 dict "<LINE>", LineChar @@ -309,11 +309,11 @@ Char15:: ; 117b ; 1186 -print_name: macro +print_name: MACRO push de ld de, \1 jp PlaceCommandCharacter -endm +ENDM PrintMomsName: print_name MomsName ; 1186 PrintPlayerName: print_name PlayerName ; 118d @@ -400,7 +400,7 @@ PlaceGenderedPlayerName:: ; 1252 call PlaceString ld h, b ld l, c - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a ld de, String_kun jr z, PlaceCommandCharacter diff --git a/home/video.asm b/home/video.asm index 3efa32550..4a25f41e0 100644 --- a/home/video.asm +++ b/home/video.asm @@ -143,9 +143,9 @@ UpdateBGMap:: ; 164c ld h, a push hl - xor a ; LOW(VBGMap1) + xor a ; LOW(vBGMap1) ld [hBGMapAddress], a - ld a, HIGH(VBGMap1) + ld a, HIGH(vBGMap1) ld [hBGMapAddress + 1], a ld a, [hBGMapMode] |