diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 12:21:47 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-21 12:21:47 -0400 |
| commit | 98af69691d8994b07c19ef4e86f3f903da6091ed (patch) | |
| tree | f7ad247f6acb3fe642f7579fe117fd67b3cdde24 /engine | |
| parent | 9433b5a75294a76527bfcb661ee57a43202d7185 (diff) | |
Remove some more raw addresses
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/events/battle_tower/battle_tower.asm | 2 | ||||
| -rw-r--r-- | engine/menus/save.asm | 2 | ||||
| -rw-r--r-- | engine/printer/printer.asm | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/engine/battle/core.asm b/engine/battle/core.asm index e9ef9dc26..4256b0df6 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -8050,11 +8050,11 @@ BattleIntro: ld b, SCGB_BATTLE_GRAYSCALE call GetSGBLayout ld hl, rLCDC - res rLCDC_WINDOW_TILEMAP, [hl] ; select 9800-9BFF + res rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap0/vBGMap2 call InitBattleDisplay call BattleStartMessage ld hl, rLCDC - set rLCDC_WINDOW_TILEMAP, [hl] ; select 9C00-9FFF + set rLCDC_WINDOW_TILEMAP, [hl] ; select vBGMap1/vBGMap3 xor a ldh [hBGMapMode], a call EmptyBattleTextbox diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index 41de7135e..6ffc3c8e2 100644 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -68,7 +68,7 @@ Function170114: ret Function170139: -; Convert the 4-digit decimal number at 5:aa41 into binary +; Convert the 4-digit decimal number at s5_aa41 into binary ld a, BANK(s5_aa41) call OpenSRAM ld de, s5_aa41 diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 3676c3528..3bb23f08e 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -826,7 +826,7 @@ _SaveData: call CopyBytes ; This block originally had some mobile functionality, but since we're still in - ; BANK(sCrystalData), it instead overwrites the sixteen wEventFlags starting at 1:a603 with + ; BANK(sCrystalData), it instead overwrites the sixteen wEventFlags starting at 1:s4_a60e with ; garbage from wd479. This isn't an issue, since ErasePreviousSave is followed by a regular ; save that unwrites the garbage. diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm index fb696ac4d..1cba451e7 100644 --- a/engine/printer/printer.asm +++ b/engine/printer/printer.asm @@ -506,7 +506,7 @@ Printer_RestartMapMusic: CheckPrinterStatus: ; Check for printer errors -; If [ca88] == -1, we're disconnected +; If [wPrinterHandshake] == -1, we're disconnected ld a, [wPrinterHandshake] cp -1 jr nz, .printer_connected |