diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transition.asm | 2 | ||||
| -rw-r--r-- | engine/battle_anims/functions.asm | 2 | ||||
| -rw-r--r-- | engine/events/print_unown.asm | 4 | ||||
| -rw-r--r-- | engine/games/card_flip.asm | 8 | ||||
| -rw-r--r-- | engine/gfx/load_push_oam.asm | 2 | ||||
| -rw-r--r-- | engine/link/mystery_gift.asm | 20 | ||||
| -rw-r--r-- | engine/menus/naming_screen.asm | 6 | ||||
| -rw-r--r-- | engine/menus/savemenu_copytilemapatonce.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/init_map.asm | 4 | ||||
| -rw-r--r-- | engine/phone/phonering_copytilemapatonce.asm | 2 | ||||
| -rw-r--r-- | engine/printer/print_party.asm | 2 | ||||
| -rw-r--r-- | engine/rtc/timeset.asm | 4 |
13 files changed, 31 insertions, 31 deletions
diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index 654bc6da8..4df5aa808 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -6,7 +6,7 @@ BATTLETRANSITION_NO_CAVE_STRONGER EQU $18 BATTLETRANSITION_FINISH EQU $20 BATTLETRANSITION_END EQU $80 -BATTLETRANSITION_SQUARE EQUS "\"8\"" ; $fe +BATTLETRANSITION_SQUARE EQU "8" ; $fe DoBattleTransition: call .InitGFX diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm index 6706bd364..fc1ef4766 100644 --- a/engine/battle_anims/functions.asm +++ b/engine/battle_anims/functions.asm @@ -2514,7 +2514,7 @@ BattleAnimFunction_25: ld hl, BATTLEANIMSTRUCT_10 add hl, bc ld e, [hl] - ld hl, $ffa0 + lb hl, -1, $a0 add hl, de ld e, l ld d, h diff --git a/engine/events/print_unown.asm b/engine/events/print_unown.asm index ffb098745..9319ecb3e 100644 --- a/engine/events/print_unown.asm +++ b/engine/events/print_unown.asm @@ -1,5 +1,5 @@ -UNOWNSTAMP_BOLD_A EQUS "\"♂\"" ; $ef -UNOWNSTAMP_BOLD_B EQUS "\"♀\"" ; $f5 +UNOWNSTAMP_BOLD_A EQU "♂" ; $ef +UNOWNSTAMP_BOLD_B EQU "♀" ; $f5 _UnownPrinter: ld a, [wUnownDex] diff --git a/engine/games/card_flip.asm b/engine/games/card_flip.asm index 827d51af9..a87be3dae 100644 --- a/engine/games/card_flip.asm +++ b/engine/games/card_flip.asm @@ -1,5 +1,5 @@ -CARDFLIP_LIGHT_OFF EQUS "\"♂\"" ; $ef -CARDFLIP_LIGHT_ON EQUS "\"♀\"" ; $f5 +CARDFLIP_LIGHT_OFF EQU "♂" ; $ef +CARDFLIP_LIGHT_ON EQU "♀" ; $f5 CARDFLIP_DECK_SIZE EQU 4 * 6 @@ -46,9 +46,9 @@ _CardFlip: call CardFlip_InitAttrPals call EnableLCD call WaitBGMap2 - ld a, $e4 + ld a, %11100100 call DmgToCgbBGPals - ld de, $e4e4 + lb de, %11100100, %11100100 call DmgToCgbObjPals call DelayFrame xor a diff --git a/engine/gfx/load_push_oam.asm b/engine/gfx/load_push_oam.asm index 8fa69d0de..2e43c1ffe 100644 --- a/engine/gfx/load_push_oam.asm +++ b/engine/gfx/load_push_oam.asm @@ -4,7 +4,7 @@ WriteOAMDMACodeToHRAM:: ld hl, .PushOAM .loop ld a, [hli] - ld [$ff00+c], a + ldh [c], a inc c dec b jr nz, .loop diff --git a/engine/link/mystery_gift.asm b/engine/link/mystery_gift.asm index a1228565d..840853a87 100644 --- a/engine/link/mystery_gift.asm +++ b/engine/link/mystery_gift.asm @@ -256,7 +256,7 @@ Function104a95: jr c, .ly_loop ld c, LOW(rRP) ld a, $c0 - ld [$ff00+c], a + ldh [c], a ld b, 240 ; This might have been intended as a 4-second timeout buffer. ; However, it is reset with each frame. .loop3 @@ -267,14 +267,14 @@ Function104a95: ld c, LOW(rRP) ; Delay frame .ly_loop2 - ld a, [$ff00+c] + ldh a, [c] and b ld b, a ldh a, [rLY] cp LY_VBLANK jr nc, .ly_loop2 .ly_loop3 - ld a, [$ff00+c] + ldh a, [c] and b ld b, a ldh a, [rLY] @@ -657,7 +657,7 @@ Function104da9: xor a ldh [rIF], a halt - ld a, [$ff00+c] + ldh a, [c] bit 1, a jr z, Function104da9 or a @@ -669,7 +669,7 @@ Function104db7: xor a ldh [rIF], a halt - ld a, [$ff00+c] + ldh a, [c] bit 1, a jr nz, Function104db7 or a @@ -677,7 +677,7 @@ Function104db7: Function104dc5: ld a, $c1 - ld [$ff00+c], a + ldh [c], a .wait dec d ret z @@ -688,7 +688,7 @@ Function104dc5: Function104dd1: ld a, $c0 - ld [$ff00+c], a + ldh [c], a .wait dec d ret z @@ -716,7 +716,7 @@ Function104ddd: .next bit 0, a jr nz, Function104e3a - ld a, [$ff00+c] + ldh a, [c] and b jr nz, .loop @@ -997,14 +997,14 @@ Function104faf: .asm_104fdb inc d jr z, .asm_104fe5 - ld a, [$ff00+c] + ldh a, [c] bit 1, a jr z, .asm_104fdb ld d, $0 .asm_104fe5 inc d jr z, .asm_104fed - ld a, [$ff00+c] + ldh a, [c] bit 1, a jr nz, .asm_104fe5 .asm_104fed diff --git a/engine/menus/naming_screen.asm b/engine/menus/naming_screen.asm index 87e28263f..05c702cd0 100644 --- a/engine/menus/naming_screen.asm +++ b/engine/menus/naming_screen.asm @@ -1,8 +1,8 @@ NAMINGSCREEN_CURSOR EQU $7e -NAMINGSCREEN_BORDER EQUS "\"■\"" ; $60 -NAMINGSCREEN_MIDDLELINE EQUS "\"→\"" ; $eb -NAMINGSCREEN_UNDERLINE EQUS "\"<DOT>\"" ; $f2 +NAMINGSCREEN_BORDER EQU "■" ; $60 +NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb +NAMINGSCREEN_UNDERLINE EQU "<DOT>" ; $f2 _NamingScreen: call DisableSpriteUpdates diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index cfe922015..58c269afd 100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm @@ -53,7 +53,7 @@ SaveMenu_CopyTilemapAtOnce: rept SCREEN_WIDTH / 2 pop de .loop\@ - ld a, [$ff00+c] + ldh a, [c] and b jr nz, .loop\@ ld [hl], e diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 2ecbe2060..21eb1fec9 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -1,5 +1,5 @@ -TRADEANIM_RIGHT_ARROW EQUS "\"▶\"" ; $ed -TRADEANIM_LEFT_ARROW EQUS "\"▼\"" ; $ee +TRADEANIM_RIGHT_ARROW EQU "▶" ; $ed +TRADEANIM_LEFT_ARROW EQU "▼" ; $ee ; TradeAnim_TubeAnimJumptable.Jumptable indexes const_def diff --git a/engine/overworld/init_map.asm b/engine/overworld/init_map.asm index 5008270a2..fece592d0 100644 --- a/engine/overworld/init_map.asm +++ b/engine/overworld/init_map.asm @@ -90,9 +90,9 @@ HDMATransfer_FillBGMap0WithBlack: ldh [rHDMA1], a ld a, LOW(wDecompressScratch) ldh [rHDMA2], a - ld a, HIGH(vBGMap0 % $8000) + ld a, HIGH(vBGMap0 - VRAM_Begin) ldh [rHDMA3], a - ld a, LOW(vBGMap0 % $8000) + ld a, LOW(vBGMap0 - VRAM_Begin) ldh [rHDMA4], a ld a, $3f ldh [hDMATransfer], a diff --git a/engine/phone/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm index 269e39465..dea305af1 100644 --- a/engine/phone/phonering_copytilemapatonce.asm +++ b/engine/phone/phonering_copytilemapatonce.asm @@ -56,7 +56,7 @@ PhoneRing_CopyTilemapAtOnce: rept SCREEN_WIDTH / 2 pop de .loop\@ - ld a, [$ff00+c] + ldh a, [c] and b jr nz, .loop\@ ld [hl], e diff --git a/engine/printer/print_party.asm b/engine/printer/print_party.asm index 04c70c1ce..caeb1eecd 100644 --- a/engine/printer/print_party.asm +++ b/engine/printer/print_party.asm @@ -1,4 +1,4 @@ -PRINTPARTY_HP EQUS "\"◀\"" ; $71 +PRINTPARTY_HP EQU "◀" ; $71 PrintPage1: hlcoord 0, 0 diff --git a/engine/rtc/timeset.asm b/engine/rtc/timeset.asm index 3275d313a..3898249c7 100644 --- a/engine/rtc/timeset.asm +++ b/engine/rtc/timeset.asm @@ -1,5 +1,5 @@ -TIMESET_UP_ARROW EQUS "\"♂\"" ; $ef -TIMESET_DOWN_ARROW EQUS "\"♀\"" ; $f5 +TIMESET_UP_ARROW EQU "♂" ; $ef +TIMESET_DOWN_ARROW EQU "♀" ; $f5 InitClock: ; Ask the player to set the time. |