diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 6 | ||||
| -rw-r--r-- | home/flag.asm | 12 | ||||
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/joypad.asm | 6 | ||||
| -rw-r--r-- | home/map.asm | 4 | ||||
| -rw-r--r-- | home/map_objects.asm | 4 | ||||
| -rw-r--r-- | home/movement.asm | 6 | ||||
| -rw-r--r-- | home/text.asm | 58 |
8 files changed, 49 insertions, 51 deletions
diff --git a/home/audio.asm b/home/audio.asm index 5e6eafe9a..98e1fc40c 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -295,7 +295,7 @@ IsSFXPlaying:: ; 3c74 ; 3c97 MaxVolume:: ; 3c97 - ld a, $77 ; max + ld a, MAX_VOLUME ld [Volume], a ret ; 3c9d @@ -348,9 +348,9 @@ FadeToMapMusic:: ; 3cbc ld a, 8 ld [MusicFade], a ld a, e - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, d - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld a, e ld [wMapMusic], a diff --git a/home/flag.asm b/home/flag.asm index 099f4bf00..d2b70731a 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -38,9 +38,9 @@ FlagAction:: ; 0x2e76 ; inputs: ; b: function -; 0 clear bit -; 1 set bit -; 2 check bit +; 0 RESET_FLAG clear bit +; 1 SET_FLAG set bit +; 2 CHECK_FLAG check bit ; de: bit number ; hl: index within bit table @@ -75,9 +75,9 @@ FlagAction:: ; 0x2e76 ; check b's value: 0, 1, 2 ld a, b - cp 1 - jr c, .clearbit ; 0 - jr z, .setbit ; 1 + cp SET_FLAG + jr c, .clearbit ; RESET_FLAG + jr z, .setbit ; SET_FLAG ; check bit ld a, [hl] diff --git a/home/init.asm b/home/init.asm index b983ce826..087a26f12 100644 --- a/home/init.asm +++ b/home/init.asm @@ -69,8 +69,8 @@ Init:: ; 17d ld [rLCDC], a ; Clear WRAM bank 0 - ld hl, wc000 - ld bc, wd000 - wc000 + ld hl, wRAM0Start + ld bc, wRAM1Start - wRAM0Start .ByteFill: ld [hl], 0 inc hl diff --git a/home/joypad.asm b/home/joypad.asm index 0cb2f6206..0f5060c63 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -130,7 +130,7 @@ GetJoypad:: ; 984 ; The player input can be automated using an input stream. ; See more below. ld a, [InputType] - cp a, AUTO_INPUT + cp AUTO_INPUT jr z, .auto ; To get deltas, take this and last frame's input. @@ -197,14 +197,14 @@ GetJoypad:: ; 984 .updateauto ; An input of $ff will end the stream. ld a, [hli] - cp a, -1 + cp -1 jr z, .stopauto ld b, a ; A duration of $ff will end the stream indefinitely. ld a, [hli] ld [AutoInputLength], a - cp a, -1 + cp -1 jr nz, .next ; The current input is overwritten. diff --git a/home/map.asm b/home/map.asm index 967d13af5..b66faa9ae 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1415,7 +1415,7 @@ LoadTileset:: ; 2821 ld a, $1 ld [rVBK], a - ld hl, w6_d600 + ld hl, wDecompressScratch + $60 tiles ld de, VTiles2 ld bc, $60 tiles call CopyBytes @@ -2284,8 +2284,6 @@ GetWorldMapLocation:: ; 0x2caf ; 0x2cbd GetMapHeaderMusic:: ; 2cbd -RADIO_TOWER_MUSIC EQU 7 - push hl push bc ld de, 6 ; music diff --git a/home/map_objects.asm b/home/map_objects.asm index 4c896c7d7..dfcb411c5 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -485,7 +485,7 @@ GetSpriteMovementFunction:: ; 1a2f ld e, a ld d, 0 rept SPRITEMOVEDATA_FIELDS - add hl,de + add hl, de endr ld a, [hl] ret @@ -498,7 +498,7 @@ GetInitialFacing:: ; 1a47 ld d, 0 ld hl, SpriteMovementData + 1 ; init facing rept SPRITEMOVEDATA_FIELDS - add hl,de + add hl, de endr ld a, BANK(SpriteMovementData) call GetFarByte diff --git a/home/movement.asm b/home/movement.asm index c4b5b578d..781a368a9 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -3,11 +3,11 @@ InitMovementBuffer:: ; 1b1e xor a ld [wMovementBufferCount], a ld a, $0 ; useless - ld [wd004], a + ld [wUnusedMovementBufferBank], a ld a, MovementBuffer % $100 - ld [wd005], a + ld [wUnusedMovementBufferPointer], a ld a, MovementBuffer / $100 - ld [wd006], a + ld [wUnusedMovementBufferPointer + 1], a ret ; 1b35 diff --git a/home/text.asm b/home/text.asm index f7730319a..4e20ab17e 100644 --- a/home/text.asm +++ b/home/text.asm @@ -230,41 +230,41 @@ dict2: macro ._\@: endm - dict "<DAY>", Char15 - dict "<LINE>", LineChar - dict "<NEXT>", NextLineChar - dict TX_FAR, TextFar - dict $00, NullChar - dict $4c, Char4C - dict $4b, Char4B - dict "<PARA>", Paragraph - dict "<MOM>", PrintMomsName + dict "<DAY>", Char15 + dict "<LINE>", LineChar + dict "<NEXT>", NextLineChar + dict TX_FAR, TextFar + dict $00, NullChar + dict $4c, Char4C + dict $4b, Char4B + dict "<PARA>", Paragraph + dict "<MOM>", PrintMomsName dict "<PLAYER>", PrintPlayerName - dict "<RIVAL>", PrintRivalName - dict $35, Char35 - dict $36, Char36 - dict $37, Char37 - dict "<RED>", PrintRedsName - dict "<GREEN>", PrintGreensName - dict "#", PlacePOKe - dict "<PC>", PCChar + dict "<RIVAL>", PrintRivalName + dict $35, Char35 + dict $36, Char36 + dict $37, Char37 + dict "<RED>", PrintRedsName + dict "<GREEN>", PrintGreensName + dict "#", PlacePOKe + dict "<PC>", PCChar dict "<ROCKET>", RocketChar - dict "<TM>", TMChar - dict "<TRNER>", TrainerChar - dict $23, PlaceKougeki - dict "<LNBRK>", Char22 - dict "<CONT>", ContText + dict "<TM>", TMChar + dict "<TRNER>", TrainerChar + dict $23, PlaceKougeki + dict "<LNBRK>", Char22 + dict "<CONT>", ContText dict "<......>", SixDotsChar - dict "<DONE>", DoneText + dict "<DONE>", DoneText dict "<PROMPT>", PromptText - dict "<PKMN>", PlacePKMN - dict "<POKE>", PlacePOKE - dict $25, NextChar - dict2 $1f, " " + dict "<PKMN>", PlacePKMN + dict "<POKE>", PlacePOKE + dict $25, NextChar + dict2 $1f, " " dict "<DEXEND>", PlaceDexEnd dict "<TARGET>", PlaceMoveTargetsName - dict "<USER>", PlaceMoveUsersName - dict "<ENEMY>", PlaceEnemysName + dict "<USER>", PlaceMoveUsersName + dict "<ENEMY>", PlaceEnemysName dict "<PLAY_G>", PlaceGenderedPlayerName cp "ﾟ" |