diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rwxr-xr-x | engine/battle/animations.asm | 332 | ||||
| -rwxr-xr-x | engine/overworld/player_animations.asm | 2 | ||||
| -rw-r--r-- | home/text.asm | 4 |
5 files changed, 170 insertions, 171 deletions
@@ -12,7 +12,6 @@ *.gb # rgbds extras -*.map *.sym # converted image data @@ -57,7 +57,7 @@ Select the following packages: * python * python-setuptools -The latest version of **rgbds** is [**0.2.0**](https://github.com/bentley/rgbds/releases/download/v0.2.0/rgbds-0.2.0-win32.zip). To install, put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. +The latest version of **rgbds** is [**0.2.2**](https://github.com/bentley/rgbds/releases/download/v0.2.2/rgbds-0.2.2-win32.zip). To install, put `rgbasm.exe`, `rgblink.exe` and `rgbfix.exe` in `C:\cygwin\usr\local\bin`. Then set up the repository. In the **Cygwin terminal**: diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 9c15a98d..d84edeb8 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2318,172 +2318,172 @@ IsCryMove: ; 798ad (1e:58ad) ret MoveSoundTable: ; 798bc (1e:58bc) - db $a0,$00,$80 - db $a2,$10,$80 - db $b3,$00,$80 - db $a1,$01,$80 - db $a3,$00,$40 - db $e9,$00,$ff - db $a3,$10,$60 - db $a3,$20,$80 - db $a3,$00,$a0 - db $a6,$00,$80 - db $a5,$20,$40 - db $a5,$00,$80 - db $a4,$00,$a0 - db $a7,$10,$c0 - db $a7,$00,$a0 - db $a8,$00,$c0 - db $a8,$10,$a0 - db $a9,$00,$e0 - db $a7,$20,$c0 - db $aa,$00,$80 - db $b9,$00,$80 - db $ab,$01,$80 - db $b7,$00,$80 - db $ad,$f0,$40 - db $b0,$00,$80 - db $ad,$00,$80 - db $b8,$10,$80 - db $b1,$01,$a0 - db $ae,$00,$80 - db $b4,$00,$60 - db $b4,$01,$40 - db $b6,$00,$a0 - db $b0,$10,$a0 - db $b7,$00,$c0 - db $aa,$10,$60 - db $b0,$00,$a0 - db $b9,$11,$c0 - db $b0,$20,$c0 - db $b8,$00,$80 - db $b1,$00,$80 - db $b1,$20,$c0 - db $af,$00,$80 - db $db,$ff,$40 - db $b4,$00,$80 - db $a1,$00,$c0 - db $a1,$00,$40 - db $e4,$00,$80 - db $bf,$40,$60 - db $bf,$00,$80 - db $bf,$ff,$40 - db $c7,$80,$c0 - db $af,$10,$a0 - db $af,$21,$e0 - db $c5,$00,$80 - db $bb,$20,$60 - db $c7,$00,$80 - db $cc,$00,$80 - db $c2,$40,$80 - db $c5,$f0,$e0 - db $cf,$00,$80 - db $c7,$f0,$60 - db $c2,$00,$80 - db $e6,$00,$80 - db $9d,$01,$a0 - db $a9,$f0,$20 - db $ba,$01,$c0 - db $ba,$00,$80 - db $b0,$00,$e0 - db $be,$01,$60 - db $be,$20,$40 - db $bb,$00,$80 - db $bb,$40,$c0 - db $b1,$03,$60 - db $bd,$11,$e0 - db $a8,$20,$e0 - db $d2,$00,$80 - db $b2,$00,$80 - db $b2,$11,$a0 - db $b2,$01,$c0 - db $a9,$14,$c0 - db $b1,$02,$a0 - db $c5,$f0,$80 - db $c5,$20,$c0 - db $d5,$00,$20 - db $d5,$20,$80 - db $d2,$12,$60 - db $be,$00,$80 - db $aa,$01,$e0 - db $c5,$0f,$e0 - db $c5,$11,$20 - db $a6,$10,$40 - db $a5,$10,$c0 - db $aa,$00,$20 - db $d8,$00,$80 - db $e4,$11,$18 - db $9f,$20,$c0 - db $9e,$20,$c0 - db $bd,$00,$10 - db $be,$f0,$20 - db $df,$f0,$c0 - db $a7,$f0,$e0 - db $9f,$f0,$40 - db $db,$00,$80 - db $df,$80,$40 - db $df,$00,$80 - db $aa,$11,$20 - db $aa,$22,$10 - db $b1,$f1,$ff - db $a9,$f1,$ff - db $aa,$33,$30 - db $dd,$40,$c0 - db $a4,$20,$20 - db $a4,$f0,$10 - db $a5,$f8,$10 - db $a7,$f0,$10 - db $bd,$00,$80 - db $ae,$00,$c0 - db $dd,$c0,$ff - db $9f,$f2,$20 - db $e1,$00,$80 - db $e1,$00,$40 - db $9f,$00,$40 - db $a7,$10,$ff - db $c7,$20,$20 - db $dd,$00,$80 - db $c5,$1f,$20 - db $bd,$2f,$80 - db $a5,$1f,$ff - db $ca,$1f,$60 - db $be,$1e,$20 - db $be,$1f,$18 - db $aa,$0f,$80 - db $9f,$f8,$10 - db $9e,$18,$20 - db $dd,$08,$40 - db $ad,$01,$e0 - db $a7,$09,$ff - db $e4,$42,$01 - db $b2,$00,$ff - db $dd,$08,$e0 - db $bb,$00,$80 - db $9f,$88,$10 - db $bd,$48,$ff - db $9e,$ff,$ff - db $bb,$ff,$10 - db $9e,$ff,$04 - db $b2,$01,$ff - db $a9,$f8,$ff - db $a2,$f0,$f0 - db $a5,$08,$10 - db $a3,$f0,$ff - db $b0,$f0,$ff - db $e1,$10,$ff - db $a4,$f0,$20 - db $ca,$f0,$60 - db $b8,$12,$10 - db $e6,$f0,$20 - db $b4,$12,$ff - db $db,$80,$04 - db $df,$f0,$10 - db $c5,$f8,$ff - db $be,$f0,$ff - db $a7,$01,$ff - db $cc,$d8,$04 - db $a1,$00,$80 - db $a1,$00,$80 + db (SFX_08_4a - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4c - SFX_Headers_08) / 3,$10,$80 + db (SFX_08_5d - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4b - SFX_Headers_08) / 3,$01,$80 + db (SFX_08_4d - SFX_Headers_08) / 3,$00,$40 + db (SFX_08_77 - SFX_Headers_08) / 3,$00,$ff + db (SFX_08_4d - SFX_Headers_08) / 3,$10,$60 + db (SFX_08_4d - SFX_Headers_08) / 3,$20,$80 + db (SFX_08_4d - SFX_Headers_08) / 3,$00,$a0 + db (SFX_08_50 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4f - SFX_Headers_08) / 3,$20,$40 + db (SFX_08_4f - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4e - SFX_Headers_08) / 3,$00,$a0 + db (SFX_08_51 - SFX_Headers_08) / 3,$10,$c0 + db (SFX_08_51 - SFX_Headers_08) / 3,$00,$a0 + db (SFX_08_52 - SFX_Headers_08) / 3,$00,$c0 + db (SFX_08_52 - SFX_Headers_08) / 3,$10,$a0 + db (SFX_08_53 - SFX_Headers_08) / 3,$00,$e0 + db (SFX_08_51 - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_54 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_62 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_55 - SFX_Headers_08) / 3,$01,$80 + db (SFX_08_60 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_57 - SFX_Headers_08) / 3,$f0,$40 + db (SFX_08_5a - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_57 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_61 - SFX_Headers_08) / 3,$10,$80 + db (SFX_08_5b - SFX_Headers_08) / 3,$01,$a0 + db (SFX_08_58 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5e - SFX_Headers_08) / 3,$00,$60 + db (SFX_08_5e - SFX_Headers_08) / 3,$01,$40 + db (SFX_08_5f - SFX_Headers_08) / 3,$00,$a0 + db (SFX_08_5a - SFX_Headers_08) / 3,$10,$a0 + db (SFX_08_60 - SFX_Headers_08) / 3,$00,$c0 + db (SFX_08_54 - SFX_Headers_08) / 3,$10,$60 + db (SFX_08_5a - SFX_Headers_08) / 3,$00,$a0 + db (SFX_08_62 - SFX_Headers_08) / 3,$11,$c0 + db (SFX_08_5a - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_61 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5b - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5b - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_59 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_71 - SFX_Headers_08) / 3,$ff,$40 + db (SFX_08_5e - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4b - SFX_Headers_08) / 3,$00,$c0 + db (SFX_08_4b - SFX_Headers_08) / 3,$00,$40 + db (SFX_08_75 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_67 - SFX_Headers_08) / 3,$40,$60 + db (SFX_08_67 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_67 - SFX_Headers_08) / 3,$ff,$40 + db (SFX_08_6a - SFX_Headers_08) / 3,$80,$c0 + db (SFX_08_59 - SFX_Headers_08) / 3,$10,$a0 + db (SFX_08_59 - SFX_Headers_08) / 3,$21,$e0 + db (SFX_08_69 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_64 - SFX_Headers_08) / 3,$20,$60 + db (SFX_08_6a - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_6c - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_68 - SFX_Headers_08) / 3,$40,$80 + db (SFX_08_69 - SFX_Headers_08) / 3,$f0,$e0 + db (SFX_08_6d - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_6a - SFX_Headers_08) / 3,$f0,$60 + db (SFX_08_68 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_76 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_47 - SFX_Headers_08) / 3,$01,$a0 + db (SFX_08_53 - SFX_Headers_08) / 3,$f0,$20 + db (SFX_08_63 - SFX_Headers_08) / 3,$01,$c0 + db (SFX_08_63 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5a - SFX_Headers_08) / 3,$00,$e0 + db (SFX_08_66 - SFX_Headers_08) / 3,$01,$60 + db (SFX_08_66 - SFX_Headers_08) / 3,$20,$40 + db (SFX_08_64 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_64 - SFX_Headers_08) / 3,$40,$c0 + db (SFX_08_5b - SFX_Headers_08) / 3,$03,$60 + db (SFX_08_65 - SFX_Headers_08) / 3,$11,$e0 + db (SFX_08_52 - SFX_Headers_08) / 3,$20,$e0 + db (SFX_08_6e - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5c - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_5c - SFX_Headers_08) / 3,$11,$a0 + db (SFX_08_5c - SFX_Headers_08) / 3,$01,$c0 + db (SFX_08_53 - SFX_Headers_08) / 3,$14,$c0 + db (SFX_08_5b - SFX_Headers_08) / 3,$02,$a0 + db (SFX_08_69 - SFX_Headers_08) / 3,$f0,$80 + db (SFX_08_69 - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_6f - SFX_Headers_08) / 3,$00,$20 + db (SFX_08_6f - SFX_Headers_08) / 3,$20,$80 + db (SFX_08_6e - SFX_Headers_08) / 3,$12,$60 + db (SFX_08_66 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_54 - SFX_Headers_08) / 3,$01,$e0 + db (SFX_08_69 - SFX_Headers_08) / 3,$0f,$e0 + db (SFX_08_69 - SFX_Headers_08) / 3,$11,$20 + db (SFX_08_50 - SFX_Headers_08) / 3,$10,$40 + db (SFX_08_4f - SFX_Headers_08) / 3,$10,$c0 + db (SFX_08_54 - SFX_Headers_08) / 3,$00,$20 + db (SFX_08_70 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_75 - SFX_Headers_08) / 3,$11,$18 + db (SFX_08_49 - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_48 - SFX_Headers_08) / 3,$20,$c0 + db (SFX_08_65 - SFX_Headers_08) / 3,$00,$10 + db (SFX_08_66 - SFX_Headers_08) / 3,$f0,$20 + db (SFX_08_73 - SFX_Headers_08) / 3,$f0,$c0 + db (SFX_08_51 - SFX_Headers_08) / 3,$f0,$e0 + db (SFX_08_49 - SFX_Headers_08) / 3,$f0,$40 + db (SFX_08_71 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_73 - SFX_Headers_08) / 3,$80,$40 + db (SFX_08_73 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_54 - SFX_Headers_08) / 3,$11,$20 + db (SFX_08_54 - SFX_Headers_08) / 3,$22,$10 + db (SFX_08_5b - SFX_Headers_08) / 3,$f1,$ff + db (SFX_08_53 - SFX_Headers_08) / 3,$f1,$ff + db (SFX_08_54 - SFX_Headers_08) / 3,$33,$30 + db (SFX_08_72 - SFX_Headers_08) / 3,$40,$c0 + db (SFX_08_4e - SFX_Headers_08) / 3,$20,$20 + db (SFX_08_4e - SFX_Headers_08) / 3,$f0,$10 + db (SFX_08_4f - SFX_Headers_08) / 3,$f8,$10 + db (SFX_08_51 - SFX_Headers_08) / 3,$f0,$10 + db (SFX_08_65 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_58 - SFX_Headers_08) / 3,$00,$c0 + db (SFX_08_72 - SFX_Headers_08) / 3,$c0,$ff + db (SFX_08_49 - SFX_Headers_08) / 3,$f2,$20 + db (SFX_08_74 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_74 - SFX_Headers_08) / 3,$00,$40 + db (SFX_08_49 - SFX_Headers_08) / 3,$00,$40 + db (SFX_08_51 - SFX_Headers_08) / 3,$10,$ff + db (SFX_08_6a - SFX_Headers_08) / 3,$20,$20 + db (SFX_08_72 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_69 - SFX_Headers_08) / 3,$1f,$20 + db (SFX_08_65 - SFX_Headers_08) / 3,$2f,$80 + db (SFX_08_4f - SFX_Headers_08) / 3,$1f,$ff + db (SFX_08_6b - SFX_Headers_08) / 3,$1f,$60 + db (SFX_08_66 - SFX_Headers_08) / 3,$1e,$20 + db (SFX_08_66 - SFX_Headers_08) / 3,$1f,$18 + db (SFX_08_54 - SFX_Headers_08) / 3,$0f,$80 + db (SFX_08_49 - SFX_Headers_08) / 3,$f8,$10 + db (SFX_08_48 - SFX_Headers_08) / 3,$18,$20 + db (SFX_08_72 - SFX_Headers_08) / 3,$08,$40 + db (SFX_08_57 - SFX_Headers_08) / 3,$01,$e0 + db (SFX_08_51 - SFX_Headers_08) / 3,$09,$ff + db (SFX_08_75 - SFX_Headers_08) / 3,$42,$01 + db (SFX_08_5c - SFX_Headers_08) / 3,$00,$ff + db (SFX_08_72 - SFX_Headers_08) / 3,$08,$e0 + db (SFX_08_64 - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_49 - SFX_Headers_08) / 3,$88,$10 + db (SFX_08_65 - SFX_Headers_08) / 3,$48,$ff + db (SFX_08_48 - SFX_Headers_08) / 3,$ff,$ff + db (SFX_08_64 - SFX_Headers_08) / 3,$ff,$10 + db (SFX_08_48 - SFX_Headers_08) / 3,$ff,$04 + db (SFX_08_5c - SFX_Headers_08) / 3,$01,$ff + db (SFX_08_53 - SFX_Headers_08) / 3,$f8,$ff + db (SFX_08_4c - SFX_Headers_08) / 3,$f0,$f0 + db (SFX_08_4f - SFX_Headers_08) / 3,$08,$10 + db (SFX_08_4d - SFX_Headers_08) / 3,$f0,$ff + db (SFX_08_5a - SFX_Headers_08) / 3,$f0,$ff + db (SFX_08_74 - SFX_Headers_08) / 3,$10,$ff + db (SFX_08_4e - SFX_Headers_08) / 3,$f0,$20 + db (SFX_08_6b - SFX_Headers_08) / 3,$f0,$60 + db (SFX_08_61 - SFX_Headers_08) / 3,$12,$10 + db (SFX_08_76 - SFX_Headers_08) / 3,$f0,$20 + db (SFX_08_5e - SFX_Headers_08) / 3,$12,$ff + db (SFX_08_71 - SFX_Headers_08) / 3,$80,$04 + db (SFX_08_73 - SFX_Headers_08) / 3,$f0,$10 + db (SFX_08_69 - SFX_Headers_08) / 3,$f8,$ff + db (SFX_08_66 - SFX_Headers_08) / 3,$f0,$ff + db (SFX_08_51 - SFX_Headers_08) / 3,$01,$ff + db (SFX_08_6c - SFX_Headers_08) / 3,$d8,$04 + db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 + db (SFX_08_4b - SFX_Headers_08) / 3,$00,$80 Func_79aae: ; 79aae (1e:5aae) ld a, [H_WHOSETURN] ; $fff3 diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 473b0d5a..be3d79e4 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba) ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta xor a ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue - ld [hl], $a1 ; wPlayerSpinInPlaceAnimSoundID + ld [hl], (SFX_02_4d - SFX_Headers_02) / 3 ; wPlayerSpinInPlaceAnimSoundID ld hl, wcd48 call PlayerSpinInPlace jr .spinWhileMovingUp diff --git a/home/text.asm b/home/text.asm index abcac9fd..aed89c33 100644 --- a/home/text.asm +++ b/home/text.asm @@ -627,12 +627,12 @@ TextCommand0B:: ; 1c31 (0:1c31) ; format: text command ID, sound ID or cry ID TextCommandSounds:: ; 1c64 (0:1c64) db $0B,(SFX_02_3a - SFX_Headers_02) / 3 - db $12,(SFX_02_46 - SFX_Headers_02) / 3 + db $12,(SFX_08_46 - SFX_Headers_08) / 3 db $0E,(SFX_02_41 - SFX_Headers_02) / 3 db $0F,(SFX_02_3a - SFX_Headers_02) / 3 db $10,(SFX_02_3b - SFX_Headers_02) / 3 db $11,(SFX_02_42 - SFX_Headers_02) / 3 - db $13,(SFX_02_44 - SFX_Headers_02) / 3 + db $13,(SFX_08_45 - SFX_Headers_08) / 3 db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? |