From df337fc417b8de58ab0b2bfc4dd8fa488f9fd3b8 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 16 Feb 2019 12:17:55 -0500 Subject: [PATCH] Update to rgbds 0.3.8 --- FAQ.md | 2 +- INSTALL.md | 2 +- engine/battle/battle_transition.asm | 2 +- engine/events/print_unown.asm | 4 ++-- engine/games/card_flip.asm | 4 ++-- engine/gfx/load_push_oam.asm | 2 +- engine/link/mystery_gift.asm | 20 ++++++++++---------- engine/menus/naming_screen.asm | 6 +++--- engine/menus/savemenu_copytilemapatonce.asm | 2 +- engine/movie/trade_animation.asm | 4 ++-- engine/phone/phonering_copytilemapatonce.asm | 2 +- engine/printer/print_party.asm | 2 +- engine/rtc/timeset.asm | 4 ++-- home/lcd.asm | 4 ++-- home/palettes.asm | 4 ++-- home/tilemap.asm | 2 +- lib/mobile/main.asm | 12 ++++++------ 17 files changed, 39 insertions(+), 39 deletions(-) diff --git a/FAQ.md b/FAQ.md index 948f373d6..a9f168442 100644 --- a/FAQ.md +++ b/FAQ.md @@ -32,7 +32,7 @@ You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Sel ### "ERROR: `UNION` already defined" -Download [**rgbds 0.3.7**][rgbds]. Older versions will not work. +Download [**rgbds 0.3.8**][rgbds]. Older versions will not work. ### "Segmentation fault" from `rgbgfx` diff --git a/INSTALL.md b/INSTALL.md index e5e07a49b..0286f9ee5 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -38,7 +38,7 @@ Click once on the text that says "**Skip**" next to each package to select the m Then download [**rgbds**](https://github.com/rednex/rgbds/releases/): the latest **win64.zip** or **win32.zip** release. Extract it and put all the `exe` and `dll` files individually in **C:\cygwin64\usr\local\bin**. -**Note: If you already have an older rgbds, you will need to update to 0.3.7.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.7 does not work, try downloading 0.3.7. +**Note: If you already have an older rgbds, you will need to update to 0.3.8.** Ignore this if you have never installed rgbds before. If a version newer than 0.3.8 does not work, try downloading 0.3.8. Now open the **Cygwin terminal** and enter the following commands. 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/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..ac0532391 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 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 "\"\"" ; $f2 +NAMINGSCREEN_BORDER EQU "■" ; $60 +NAMINGSCREEN_MIDDLELINE EQU "→" ; $eb +NAMINGSCREEN_UNDERLINE EQU "" ; $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/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. diff --git a/home/lcd.asm b/home/lcd.asm index 68edf9b0f..e50672f95 100644 --- a/home/lcd.asm +++ b/home/lcd.asm @@ -6,7 +6,7 @@ Unreferenced_Function547:: ret nz ld c, a ld a, [wLYOverrides] - ld [$ff00+c], a + ldh [c], a ret LCD:: @@ -25,7 +25,7 @@ LCD:: ldh a, [hLCDCPointer] ld c, a ld a, b - ld [$ff00+c], a + ldh [c], a pop bc .done diff --git a/home/palettes.asm b/home/palettes.asm index d5c645d78..6391c7c27 100644 --- a/home/palettes.asm +++ b/home/palettes.asm @@ -33,7 +33,7 @@ ForceUpdateCGBPals:: .bgp rept (1 palettes) * 2 ld a, [hli] - ld [$ff00+c], a + ldh [c], a endr dec b @@ -49,7 +49,7 @@ endr .obp rept (1 palettes) * 2 ld a, [hli] - ld [$ff00+c], a + ldh [c], a endr dec b diff --git a/home/tilemap.asm b/home/tilemap.asm index b8dfb7697..98362ec1f 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -119,7 +119,7 @@ rept SCREEN_WIDTH / 2 pop de ; if in v/hblank, wait until not in v/hblank .loop\@ - ld a, [$ff00+c] + ldh a, [c] and b jr nz, .loop\@ ; load BGMap0 diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 493754cb2..2bf5eef23 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -215,9 +215,9 @@ Function1100dc: ld [$c815], a ld c, $7 ld a, $2 - ld [$ff00+c], a + ldh [c], a ld a, $6 - ld [$ff00+c], a + ldh [c], a ret Function110115: @@ -604,9 +604,9 @@ Function11032c: Function110393: ld c, LOW(rIE) - ld a, [$ff00+c] + ldh a, [c] or $c - ld [$ff00+c], a + ldh [c], a ret Function11039a: @@ -3416,9 +3416,9 @@ Function111686: xor a ldh [rTAC], a ld c, $ff - ld a, [$ff00+c] + ldh a, [c] and $f3 - ld [$ff00+c], a + ldh [c], a ld a, [$cb48] ld [$c86a], a ld a, [$cb47]