diff --git a/data/default_options.asm b/data/default_options.asm index a4b8979d6..4717dc2f0 100644 --- a/data/default_options.asm +++ b/data/default_options.asm @@ -11,7 +11,7 @@ DefaultOptions: ; 14f7c db GBPRINTER_NORMAL ; Options2: menu account on db 1 << MENU_ACCOUNT - + db $00 db $00 ; 14f84 diff --git a/data/sgb_ctrl_packets.asm b/data/sgb_ctrl_packets.asm index 7ca77fa34..a8c1e25f5 100644 --- a/data/sgb_ctrl_packets.asm +++ b/data/sgb_ctrl_packets.asm @@ -70,7 +70,7 @@ DataSndPacket2: db $e8 ; inx db $e8 ; inx db $e0 ; cpx #$8c (1) - + DataSndPacket3: sgb_data_snd $0847, $0, 11 db $c4 ; cmp #$c4 (2) @@ -80,7 +80,7 @@ DataSndPacket3: db $c9, $05 ; cmp #$05 db $d0, $10 ; bne +$10 db $a2, $28 ; ldx #$28 - + DataSndPacket4: sgb_data_snd $083c, $0, 11 db $f0, $12 ; beq +$12 diff --git a/data/trainers/genders.asm b/data/trainers/genders.asm index ab3be659b..24b8a51d1 100644 --- a/data/trainers/genders.asm +++ b/data/trainers/genders.asm @@ -1,4 +1,4 @@ -; Used by +; Used by BTTrainerClassGenders: ; 11f2f0 ; entries correspond to trainer classes diff --git a/engine/save.asm b/engine/save.asm index 8c2ac7413..4291754e9 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -873,7 +873,7 @@ _SaveData: ; 1509a ; a) ErasePreviousSave (the process of erasing the save from a previous game file) ; b) unused mobile functionality ; It is not part of a regular save. - + ld a, BANK(sCrystalData) call GetSRAMBank ld hl, wCrystalData @@ -885,7 +885,7 @@ _SaveData: ; 1509a ; BANK(sCrystalData), it instead overwrites the sixteen EventFlags starting at 1:a603 with ; garbage from wd479. This isn't an issue, since ErasePreviousSave is followed by a regular ; save that unwrites the garbage. - + ld hl, wd479 ld a, [hli] ld [$a60e + 0], a @@ -902,10 +902,10 @@ _LoadData: ; 150b9 ld de, wCrystalData ld bc, wCrystalDataEnd - wCrystalData call CopyBytes - + ; This block originally had some mobile functionality to mirror _SaveData above, but instead it ; (harmlessly) writes the aforementioned EventFlags to the unused wd479. - + ld hl, wd479 ld a, [$a60e + 0] ld [hli], a diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 2f24dcb95..6dfa5657a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -47,7 +47,7 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld b, a - + ld a, BANK(wBGPals1) ld [rSVBK], a @@ -78,7 +78,7 @@ _TimeOfDayPals:: ; 8c011 ; save wram bank ld a, [rSVBK] ld d, a - + ld a, BANK(wOBPals1) ld [rSVBK], a diff --git a/home/text.asm b/home/text.asm index 7a584cbab..6e186d873 100644 --- a/home/text.asm +++ b/home/text.asm @@ -414,7 +414,7 @@ PlaceCommandCharacter:: ; 126a jp NextChar ; 0x1273 -TMCharText:: db "TM@" +TMCharText:: db "TM@" TrainerCharText:: db "TRAINER@" PCCharText:: db "PC@" RocketCharText:: db "ROCKET@" diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 9f8084130..1b7b7084a 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -3092,7 +3092,7 @@ Function1013dd: ; 1013dd ret ; 1013e1 -Unreferenced_Function1013e1: ; 1013e1 +Unreferenced_Function1013e1: ; 1013e1 push de inc de ld b, a @@ -3129,7 +3129,7 @@ Function1013f5: ; 1013f5 ret ; 101400 -Unreferenced_Function101400: ; 101400 +Unreferenced_Function101400: ; 101400 ld a, [de] inc de cp [hl] @@ -3317,7 +3317,7 @@ Function101507: ; 101507 ret ; 10151d -Unreferenced_Function10151d: ; 10151d +Unreferenced_Function10151d: ; 10151d ld a, $34 call Function3e32 ld a, [wMobileCommsJumptableIndex] @@ -3512,7 +3512,7 @@ Function101663: ; 101663 ret ; 101674 -Unreferenced_Function101674: ; 101674 +Unreferenced_Function101674: ; 101674 ld a, $05 ld hl, w5_dc00 call Function101635 @@ -4401,7 +4401,7 @@ Function101cbc: ; 101cbc ret ; 101cc2 -Unreferenced_Function101cc2: ; 101cc2 +Unreferenced_Function101cc2: ; 101cc2 ld a, $02 ld [wcd2b], a ret @@ -4682,7 +4682,7 @@ Function101e64: ; 101e64 ret ; 101e82 -Unreferenced_Function101e82: ; 101e82 +Unreferenced_Function101e82: ; 101e82 call Function101ecc ld a, [wMobileCommsJumptableIndex] inc a @@ -4690,7 +4690,7 @@ Unreferenced_Function101e82: ; 101e82 ret ; 101e8d -Unreferenced_Function101e8d: ; 101e8d +Unreferenced_Function101e8d: ; 101e8d call Function101ed3 ld a, [wMobileCommsJumptableIndex] inc a @@ -6504,7 +6504,7 @@ Function102b4e: ; 102b4e ret ; 102b68 -Unreferenced_Function102b68: ; 102b68 +Unreferenced_Function102b68: ; 102b68 xor a ld hl, wWindowStackPointer ld bc, $10