diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-04-05 14:32:43 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2021-04-05 14:32:43 +0100 |
| commit | 023013f253088327c5ccb3df37d9ce3f5eaeb59b (patch) | |
| tree | b9d19c01afa83fb7a7472c99d806f10928b6ee28 | |
| parent | ea0172a3fa3dc9ac1216037490ecb0aca39e68b9 (diff) | |
Fix names, finish bank c
| -rw-r--r-- | compressed_data_71359.bin (renamed from src/data/sgb_data/sgb_border_debug_2.bin) | bin | 76 -> 78 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_debug_1.bin (renamed from src/data/sgb_data/sgb_border_debug_1.bin) | bin | 1981 -> 1981 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_debug_2.bin | bin | 0 -> 78 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_debug_3.bin (renamed from src/data/sgb_data/sgb_border_debug_3.bin) | bin | 102 -> 102 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_debug_4.bin (renamed from src/data/sgb_data/sgb_border_debug_4.bin) | bin | 520 -> 520 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_intro_1.bin (renamed from src/data/sgb_data/sgb_border_intro_1.bin) | bin | 2833 -> 2833 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_intro_2.bin (renamed from src/data/sgb_data/sgb_border_intro_2.bin) | bin | 943 -> 945 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_intro_3.bin (renamed from src/data/sgb_data/sgb_border_intro_3.bin) | bin | 82 -> 82 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_intro_4.bin (renamed from src/data/sgb_data/sgb_border_intro_4.bin) | bin | 765 -> 765 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_medals_1.bin (renamed from src/data/sgb_data/sgb_border_medals_1.bin) | bin | 3435 -> 3435 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_medals_2.bin (renamed from src/data/sgb_data/sgb_border_medals_2.bin) | bin | 246 -> 248 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_medals_3.bin (renamed from src/data/sgb_data/sgb_border_medals_3.bin) | bin | 73 -> 73 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_medals_4.bin (renamed from src/data/sgb_data/sgb_border_medals_4.bin) | bin | 72 -> 72 bytes | |||
| -rw-r--r-- | src/data/sgb_data/border_medals_5.bin (renamed from src/data/sgb_data/sgb_border_medals_5.bin) | bin | 440 -> 440 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_1.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_10.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_11.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_12.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_13.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_14.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_15.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_16.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_17.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_18.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_19.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_2.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_20.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_21.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_22.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_23.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_24.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_25.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_26.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_27.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_28.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_29.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_3.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_30.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_31.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_32.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_33.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_34.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_35.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_36.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_37.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_38.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_39.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_4.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_40.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_41.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_42.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_5.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_6.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_7.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_8.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/data/sgb_data/unused_pals_9.bin | bin | 0 -> 35 bytes | |||
| -rw-r--r-- | src/engine/bank04.asm | 10 | ||||
| -rw-r--r-- | src/engine/bank1c.asm | 317 | ||||
| -rw-r--r-- | tools/compressed_data_extractor.py | 6 |
59 files changed, 297 insertions, 36 deletions
diff --git a/src/data/sgb_data/sgb_border_debug_2.bin b/compressed_data_71359.bin Binary files differindex 7e8bdca..84b2283 100644 --- a/src/data/sgb_data/sgb_border_debug_2.bin +++ b/compressed_data_71359.bin diff --git a/src/data/sgb_data/sgb_border_debug_1.bin b/src/data/sgb_data/border_debug_1.bin Binary files differindex 00c7b8a..00c7b8a 100644 --- a/src/data/sgb_data/sgb_border_debug_1.bin +++ b/src/data/sgb_data/border_debug_1.bin diff --git a/src/data/sgb_data/border_debug_2.bin b/src/data/sgb_data/border_debug_2.bin Binary files differnew file mode 100644 index 0000000..84b2283 --- /dev/null +++ b/src/data/sgb_data/border_debug_2.bin diff --git a/src/data/sgb_data/sgb_border_debug_3.bin b/src/data/sgb_data/border_debug_3.bin Binary files differindex b611b7d..b611b7d 100644 --- a/src/data/sgb_data/sgb_border_debug_3.bin +++ b/src/data/sgb_data/border_debug_3.bin diff --git a/src/data/sgb_data/sgb_border_debug_4.bin b/src/data/sgb_data/border_debug_4.bin Binary files differindex 8b86378..8b86378 100644 --- a/src/data/sgb_data/sgb_border_debug_4.bin +++ b/src/data/sgb_data/border_debug_4.bin diff --git a/src/data/sgb_data/sgb_border_intro_1.bin b/src/data/sgb_data/border_intro_1.bin Binary files differindex ff39636..ff39636 100644 --- a/src/data/sgb_data/sgb_border_intro_1.bin +++ b/src/data/sgb_data/border_intro_1.bin diff --git a/src/data/sgb_data/sgb_border_intro_2.bin b/src/data/sgb_data/border_intro_2.bin Binary files differindex 5d17da6..2d8170b 100644 --- a/src/data/sgb_data/sgb_border_intro_2.bin +++ b/src/data/sgb_data/border_intro_2.bin diff --git a/src/data/sgb_data/sgb_border_intro_3.bin b/src/data/sgb_data/border_intro_3.bin Binary files differindex 02477ff..02477ff 100644 --- a/src/data/sgb_data/sgb_border_intro_3.bin +++ b/src/data/sgb_data/border_intro_3.bin diff --git a/src/data/sgb_data/sgb_border_intro_4.bin b/src/data/sgb_data/border_intro_4.bin Binary files differindex 4fd870f..4fd870f 100644 --- a/src/data/sgb_data/sgb_border_intro_4.bin +++ b/src/data/sgb_data/border_intro_4.bin diff --git a/src/data/sgb_data/sgb_border_medals_1.bin b/src/data/sgb_data/border_medals_1.bin Binary files differindex 4dcc13c..4dcc13c 100644 --- a/src/data/sgb_data/sgb_border_medals_1.bin +++ b/src/data/sgb_data/border_medals_1.bin diff --git a/src/data/sgb_data/sgb_border_medals_2.bin b/src/data/sgb_data/border_medals_2.bin Binary files differindex f7baaca..ac6b64e 100644 --- a/src/data/sgb_data/sgb_border_medals_2.bin +++ b/src/data/sgb_data/border_medals_2.bin diff --git a/src/data/sgb_data/sgb_border_medals_3.bin b/src/data/sgb_data/border_medals_3.bin Binary files differindex 9cbc840..9cbc840 100644 --- a/src/data/sgb_data/sgb_border_medals_3.bin +++ b/src/data/sgb_data/border_medals_3.bin diff --git a/src/data/sgb_data/sgb_border_medals_4.bin b/src/data/sgb_data/border_medals_4.bin Binary files differindex 09f1acd..09f1acd 100644 --- a/src/data/sgb_data/sgb_border_medals_4.bin +++ b/src/data/sgb_data/border_medals_4.bin diff --git a/src/data/sgb_data/sgb_border_medals_5.bin b/src/data/sgb_data/border_medals_5.bin Binary files differindex 2d9b6a4..2d9b6a4 100644 --- a/src/data/sgb_data/sgb_border_medals_5.bin +++ b/src/data/sgb_data/border_medals_5.bin diff --git a/src/data/sgb_data/unused_pals_1.bin b/src/data/sgb_data/unused_pals_1.bin Binary files differnew file mode 100644 index 0000000..d29caa9 --- /dev/null +++ b/src/data/sgb_data/unused_pals_1.bin diff --git a/src/data/sgb_data/unused_pals_10.bin b/src/data/sgb_data/unused_pals_10.bin Binary files differnew file mode 100644 index 0000000..bfaa01d --- /dev/null +++ b/src/data/sgb_data/unused_pals_10.bin diff --git a/src/data/sgb_data/unused_pals_11.bin b/src/data/sgb_data/unused_pals_11.bin Binary files differnew file mode 100644 index 0000000..619ff8d --- /dev/null +++ b/src/data/sgb_data/unused_pals_11.bin diff --git a/src/data/sgb_data/unused_pals_12.bin b/src/data/sgb_data/unused_pals_12.bin Binary files differnew file mode 100644 index 0000000..c4e235e --- /dev/null +++ b/src/data/sgb_data/unused_pals_12.bin diff --git a/src/data/sgb_data/unused_pals_13.bin b/src/data/sgb_data/unused_pals_13.bin Binary files differnew file mode 100644 index 0000000..3e4b042 --- /dev/null +++ b/src/data/sgb_data/unused_pals_13.bin diff --git a/src/data/sgb_data/unused_pals_14.bin b/src/data/sgb_data/unused_pals_14.bin Binary files differnew file mode 100644 index 0000000..90179cf --- /dev/null +++ b/src/data/sgb_data/unused_pals_14.bin diff --git a/src/data/sgb_data/unused_pals_15.bin b/src/data/sgb_data/unused_pals_15.bin Binary files differnew file mode 100644 index 0000000..de5b71f --- /dev/null +++ b/src/data/sgb_data/unused_pals_15.bin diff --git a/src/data/sgb_data/unused_pals_16.bin b/src/data/sgb_data/unused_pals_16.bin Binary files differnew file mode 100644 index 0000000..71ae2c2 --- /dev/null +++ b/src/data/sgb_data/unused_pals_16.bin diff --git a/src/data/sgb_data/unused_pals_17.bin b/src/data/sgb_data/unused_pals_17.bin Binary files differnew file mode 100644 index 0000000..5d7d4d3 --- /dev/null +++ b/src/data/sgb_data/unused_pals_17.bin diff --git a/src/data/sgb_data/unused_pals_18.bin b/src/data/sgb_data/unused_pals_18.bin Binary files differnew file mode 100644 index 0000000..fdfc713 --- /dev/null +++ b/src/data/sgb_data/unused_pals_18.bin diff --git a/src/data/sgb_data/unused_pals_19.bin b/src/data/sgb_data/unused_pals_19.bin Binary files differnew file mode 100644 index 0000000..fdfc713 --- /dev/null +++ b/src/data/sgb_data/unused_pals_19.bin diff --git a/src/data/sgb_data/unused_pals_2.bin b/src/data/sgb_data/unused_pals_2.bin Binary files differnew file mode 100644 index 0000000..fdfc713 --- /dev/null +++ b/src/data/sgb_data/unused_pals_2.bin diff --git a/src/data/sgb_data/unused_pals_20.bin b/src/data/sgb_data/unused_pals_20.bin Binary files differnew file mode 100644 index 0000000..fdfc713 --- /dev/null +++ b/src/data/sgb_data/unused_pals_20.bin diff --git a/src/data/sgb_data/unused_pals_21.bin b/src/data/sgb_data/unused_pals_21.bin Binary files differnew file mode 100644 index 0000000..dcfc362 --- /dev/null +++ b/src/data/sgb_data/unused_pals_21.bin diff --git a/src/data/sgb_data/unused_pals_22.bin b/src/data/sgb_data/unused_pals_22.bin Binary files differnew file mode 100644 index 0000000..dcfc362 --- /dev/null +++ b/src/data/sgb_data/unused_pals_22.bin diff --git a/src/data/sgb_data/unused_pals_23.bin b/src/data/sgb_data/unused_pals_23.bin Binary files differnew file mode 100644 index 0000000..dcfc362 --- /dev/null +++ b/src/data/sgb_data/unused_pals_23.bin diff --git a/src/data/sgb_data/unused_pals_24.bin b/src/data/sgb_data/unused_pals_24.bin Binary files differnew file mode 100644 index 0000000..e99a8e2 --- /dev/null +++ b/src/data/sgb_data/unused_pals_24.bin diff --git a/src/data/sgb_data/unused_pals_25.bin b/src/data/sgb_data/unused_pals_25.bin Binary files differnew file mode 100644 index 0000000..2a71e58 --- /dev/null +++ b/src/data/sgb_data/unused_pals_25.bin diff --git a/src/data/sgb_data/unused_pals_26.bin b/src/data/sgb_data/unused_pals_26.bin Binary files differnew file mode 100644 index 0000000..2a71e58 --- /dev/null +++ b/src/data/sgb_data/unused_pals_26.bin diff --git a/src/data/sgb_data/unused_pals_27.bin b/src/data/sgb_data/unused_pals_27.bin Binary files differnew file mode 100644 index 0000000..db55ea8 --- /dev/null +++ b/src/data/sgb_data/unused_pals_27.bin diff --git a/src/data/sgb_data/unused_pals_28.bin b/src/data/sgb_data/unused_pals_28.bin Binary files differnew file mode 100644 index 0000000..db55ea8 --- /dev/null +++ b/src/data/sgb_data/unused_pals_28.bin diff --git a/src/data/sgb_data/unused_pals_29.bin b/src/data/sgb_data/unused_pals_29.bin Binary files differnew file mode 100644 index 0000000..db55ea8 --- /dev/null +++ b/src/data/sgb_data/unused_pals_29.bin diff --git a/src/data/sgb_data/unused_pals_3.bin b/src/data/sgb_data/unused_pals_3.bin Binary files differnew file mode 100644 index 0000000..9b6adfc --- /dev/null +++ b/src/data/sgb_data/unused_pals_3.bin diff --git a/src/data/sgb_data/unused_pals_30.bin b/src/data/sgb_data/unused_pals_30.bin Binary files differnew file mode 100644 index 0000000..9c865d7 --- /dev/null +++ b/src/data/sgb_data/unused_pals_30.bin diff --git a/src/data/sgb_data/unused_pals_31.bin b/src/data/sgb_data/unused_pals_31.bin Binary files differnew file mode 100644 index 0000000..9c865d7 --- /dev/null +++ b/src/data/sgb_data/unused_pals_31.bin diff --git a/src/data/sgb_data/unused_pals_32.bin b/src/data/sgb_data/unused_pals_32.bin Binary files differnew file mode 100644 index 0000000..3e4b042 --- /dev/null +++ b/src/data/sgb_data/unused_pals_32.bin diff --git a/src/data/sgb_data/unused_pals_33.bin b/src/data/sgb_data/unused_pals_33.bin Binary files differnew file mode 100644 index 0000000..3e4b042 --- /dev/null +++ b/src/data/sgb_data/unused_pals_33.bin diff --git a/src/data/sgb_data/unused_pals_34.bin b/src/data/sgb_data/unused_pals_34.bin Binary files differnew file mode 100644 index 0000000..e3fe228 --- /dev/null +++ b/src/data/sgb_data/unused_pals_34.bin diff --git a/src/data/sgb_data/unused_pals_35.bin b/src/data/sgb_data/unused_pals_35.bin Binary files differnew file mode 100644 index 0000000..e3fe228 --- /dev/null +++ b/src/data/sgb_data/unused_pals_35.bin diff --git a/src/data/sgb_data/unused_pals_36.bin b/src/data/sgb_data/unused_pals_36.bin Binary files differnew file mode 100644 index 0000000..e3fe228 --- /dev/null +++ b/src/data/sgb_data/unused_pals_36.bin diff --git a/src/data/sgb_data/unused_pals_37.bin b/src/data/sgb_data/unused_pals_37.bin Binary files differnew file mode 100644 index 0000000..d510328 --- /dev/null +++ b/src/data/sgb_data/unused_pals_37.bin diff --git a/src/data/sgb_data/unused_pals_38.bin b/src/data/sgb_data/unused_pals_38.bin Binary files differnew file mode 100644 index 0000000..d510328 --- /dev/null +++ b/src/data/sgb_data/unused_pals_38.bin diff --git a/src/data/sgb_data/unused_pals_39.bin b/src/data/sgb_data/unused_pals_39.bin Binary files differnew file mode 100644 index 0000000..2a71e58 --- /dev/null +++ b/src/data/sgb_data/unused_pals_39.bin diff --git a/src/data/sgb_data/unused_pals_4.bin b/src/data/sgb_data/unused_pals_4.bin Binary files differnew file mode 100644 index 0000000..9b80afe --- /dev/null +++ b/src/data/sgb_data/unused_pals_4.bin diff --git a/src/data/sgb_data/unused_pals_40.bin b/src/data/sgb_data/unused_pals_40.bin Binary files differnew file mode 100644 index 0000000..2a6a293 --- /dev/null +++ b/src/data/sgb_data/unused_pals_40.bin diff --git a/src/data/sgb_data/unused_pals_41.bin b/src/data/sgb_data/unused_pals_41.bin Binary files differnew file mode 100644 index 0000000..3e4b042 --- /dev/null +++ b/src/data/sgb_data/unused_pals_41.bin diff --git a/src/data/sgb_data/unused_pals_42.bin b/src/data/sgb_data/unused_pals_42.bin Binary files differnew file mode 100644 index 0000000..1660c61 --- /dev/null +++ b/src/data/sgb_data/unused_pals_42.bin diff --git a/src/data/sgb_data/unused_pals_5.bin b/src/data/sgb_data/unused_pals_5.bin Binary files differnew file mode 100644 index 0000000..455845b --- /dev/null +++ b/src/data/sgb_data/unused_pals_5.bin diff --git a/src/data/sgb_data/unused_pals_6.bin b/src/data/sgb_data/unused_pals_6.bin Binary files differnew file mode 100644 index 0000000..e3fe228 --- /dev/null +++ b/src/data/sgb_data/unused_pals_6.bin diff --git a/src/data/sgb_data/unused_pals_7.bin b/src/data/sgb_data/unused_pals_7.bin Binary files differnew file mode 100644 index 0000000..e0147e6 --- /dev/null +++ b/src/data/sgb_data/unused_pals_7.bin diff --git a/src/data/sgb_data/unused_pals_8.bin b/src/data/sgb_data/unused_pals_8.bin Binary files differnew file mode 100644 index 0000000..838d652 --- /dev/null +++ b/src/data/sgb_data/unused_pals_8.bin diff --git a/src/data/sgb_data/unused_pals_9.bin b/src/data/sgb_data/unused_pals_9.bin Binary files differnew file mode 100644 index 0000000..fa5bc6f --- /dev/null +++ b/src/data/sgb_data/unused_pals_9.bin diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index f1d31c1..38b1271 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -63,7 +63,7 @@ Medal_1029e: ; 1029e (4:429e) call PauseSong ld a, MUSIC_STOP call PlaySong - farcall Func_70000 + farcall SetMainSGBBorder call DisableLCD call Func_10000 ld a, $fa @@ -2810,7 +2810,7 @@ _GameLoop: ; 126d1 (4:66d1) call ZeroObjectPositions ld hl, wVBlankOAMCopyToggle inc [hl] - farcall Func_70018 + farcall SetIntroSGBBorder ld a, $ff ld [wd627], a .main_menu_loop @@ -2846,7 +2846,7 @@ MainMenu_NewGame: ; 12704 (4:6704) call DisableSRAM ld a, MUSIC_STOP call PlaySong - farcall Func_70000 + farcall SetMainSGBBorder ld a, MUSIC_OVERWORLD ld [wDefaultSong], a call PlayDefaultSong @@ -2863,7 +2863,7 @@ MainMenu_ContinueFromDiary: ; 12741 (4:6741) call Func_11320 jr nc, MainMenu_NewGame farcall Func_c1ed - farcall Func_70000 + farcall SetMainSGBBorder call EnableSRAM xor a ld [sba44], a @@ -2890,7 +2890,7 @@ MainMenu_ContinueDuel: ; 1277e (4:677e) call PlaySong farcall Func_c9cb farcall $04, Func_3a40 - farcall Func_70000 + farcall SetMainSGBBorder ld a, GAME_EVENT_CONTINUE_DUEL ld [wGameEvent], a farcall $03, ExecuteGameEvent diff --git a/src/engine/bank1c.asm b/src/engine/bank1c.asm index 62d4a77..1c68fb5 100644 --- a/src/engine/bank1c.asm +++ b/src/engine/bank1c.asm @@ -1,4 +1,4 @@ -Func_70000: ; 70000 (1c:4000) +SetMainSGBBorder: ; 70000 (1c:4000) ld a, [wConsole] cp CONSOLE_SGB ret nz ; exit if not SGB @@ -10,15 +10,15 @@ Func_70000: ; 70000 (1c:4000) ld b, $2 .asm_70013 ld a, b - call Func_70044 + call SetSGBBorder ret -Func_70018: ; 70018 (1c:4018) +SetIntroSGBBorder: ; 70018 (1c:4018) ld a, [wConsole] cp CONSOLE_SGB ret nz ; exit if not SGB ld a, $0 - call Func_70044 + call SetSGBBorder ret AtrcEnPacket_Disable: ; 70024 (1c:4024) @@ -32,7 +32,12 @@ IconEnPacket: ; 70034 (1c:4034) db $01 ds $0e -Func_70044: ; 70044 (1c:4044) +; sets SGB border corresponding with value in register a +; $0 = intro +; $1 = medals (gold) +; $2 = medals (blue) +; $3 = debug +SetSGBBorder: ; 70044 (1c:4044) push hl push bc add a ; *2 @@ -43,7 +48,7 @@ Func_70044: ; 70044 (1c:4044) ld b, $0 ld hl, .SGBBorders add hl, bc - call Func_70082 + call DecompressAndSendSGBBorder pop bc pop hl ret @@ -56,9 +61,20 @@ Func_70044: ; 70044 (1c:4044) dw SGBBorderDebugGfxPointers, SGBData_BorderDebug3, SGBData_BorderDebug4 ; 0x7006f - INCROM $7006f, $70082 +; forces SGB border intro +; unreferenced? +Func_7006f: ; 7006f (1c:406f) + ld a, [wConsole] + cp CONSOLE_SGB + ret nz ; exit if not SGB + ld de, SGBData_BorderIntro3 + ld hl, SGBData_BorderIntro4 + call SetMainSGBBorderPalsAndMap + call Func_701c0 + ret +; 0x70082 -Func_70082: ; 70082 (1c:4082) +DecompressAndSendSGBBorder: ; 70082 (1c:4082) ld a, [wConsole] cp CONSOLE_SGB ret nz ; exit if not SGB @@ -79,7 +95,7 @@ Func_70082: ; 70082 (1c:4082) ld a, [hli] ld h, [hl] ld l, a - call Func_700fe + call SetMainSGBBorderPalsAndMap call Func_701c0 pop bc pop hl @@ -136,7 +152,9 @@ ChrTrnPacket_BGTiles2: ; 700ee (1c:40ee) db 1 ds $0e -Func_700fe: ; 700fe (1c:40fe) +; de = pals +; hl = map +SetMainSGBBorderPalsAndMap: ; 700fe (1c:40fe) push hl push bc push de @@ -556,7 +574,84 @@ DecompressSGBPalette: ; 70403 (1c:4403) ret ; 0x7041d - INCROM $7041d, $70498 +; sends an SGB packet related with palettes +; unreferenced? +Func_7041d: ; 7041d (1c:441d) + ld a, [wConsole] + cp CONSOLE_SGB + ret nz ; exit if not SGB + + push hl + push bc + push de + push bc + push hl + push hl + ld hl, SGBData_UnusedPals1 + call DecompressSGBPalette + ld hl, wLoadedPalData + ld de, wTempSGBPacket + $1 + ld bc, $8 + call CopyDataHLtoDE + + pop hl + call DecompressSGBPalette + ld hl, wLoadedPalData + 2 + ld de, wTempSGBPacket + $9 + ld bc, $6 + call CopyDataHLtoDE + + xor a + ld [wTempSGBPacket + $f], a + ld hl, wTempSGBPacket + ld a, $09 + ld [hl], a + call Func_704c7 + call SendSGB + + pop hl + ld c, $0f + ld a, l + cp LOW(SGBData_UnusedPals1) + jr nz, .asm_7046a + ld a, h + cp HIGH(SGBData_UnusedPals1) + jr nz, .asm_7046a + ld c, $0a + +.asm_7046a + ld a, c + ld [wTempSGBPacket + $3], a + pop bc + ld hl, wTempSGBPacket + push hl + ld a, $21 + ld [hli], a + ld a, $01 + ld [hli], a + ld a, $01 + ld [hli], a + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ld a, $05 + add b + ld [hli], a + ld a, $05 + add c + ld [hli], a + xor a + ld [wTempSGBPacket + $e], a + ld [wTempSGBPacket + $f], a + pop hl + call SendSGB + pop de + pop bc + pop hl + ret +; 0x70498 ; send an ATTR_BLK SGB packet ; input: @@ -620,15 +715,15 @@ Func_704c7: ; 704c7 (1c:44c7) SGBData_BorderDebug4: ; 704d3 (1c:44d3) dw $800 ; length - INCBIN "data/sgb_data/sgb_border_debug_4.bin" + INCBIN "data/sgb_data/border_debug_4.bin" SGBData_BorderIntro4: ; 706dd (1c:46dd) dw $800 ; length - INCBIN "data/sgb_data/sgb_border_intro_4.bin" + INCBIN "data/sgb_data/border_intro_4.bin" SGBData_BorderMedals5: ; 709dc (1c:49dc) dw $800 ; length - INCBIN "data/sgb_data/sgb_border_medals_5.bin" + INCBIN "data/sgb_data/border_medals_5.bin" SGBBorderDebugGfxPointers: ; 70b96 (1c:4b96) dw SGBData_BorderDebug1 @@ -636,13 +731,11 @@ SGBBorderDebugGfxPointers: ; 70b96 (1c:4b96) SGBData_BorderDebug1: ; 70b9a (1c:45b9a) dw $1000 ; length - INCBIN "data/sgb_data/sgb_border_debug_1.bin" + INCBIN "data/sgb_data/border_debug_1.bin" SGBData_BorderDebug2: ; 71359 (1c:5359) dw $a0 ; length - INCBIN "data/sgb_data/sgb_border_debug_2.bin" - - INCROM $713a7, $713a9 + INCBIN "data/sgb_data/border_debug_2.bin" SGBBorderIntroGfxPointers: ; 713a9 (1c:53a9) dw SGBData_BorderIntro1 @@ -650,13 +743,11 @@ SGBBorderIntroGfxPointers: ; 713a9 (1c:53a9) SGBData_BorderIntro1: ; 713ad (1c:53ad) dw $1000 ; length - INCBIN "data/sgb_data/sgb_border_intro_1.bin" + INCBIN "data/sgb_data/border_intro_1.bin" SGBData_BorderIntro2: ; 71ec0 (1c:5ec0) dw $4e0 ; length - INCBIN "data/sgb_data/sgb_border_intro_2.bin" - - INCROM $72271, $72273 + INCBIN "data/sgb_data/border_intro_2.bin" SGBBorderMedalsGfxPointers: ; 72273 (1c:6273) dw SGBData_BorderMedals1 @@ -664,29 +755,27 @@ SGBBorderMedalsGfxPointers: ; 72273 (1c:6273) SGBData_BorderMedals1: ; 72277 (1c:5277) dw $1000 ; length - INCBIN "data/sgb_data/sgb_border_medals_1.bin" + INCBIN "data/sgb_data/border_medals_1.bin" SGBData_BorderMedals2: ; 72fe4 (1c:5fe4) dw $100 ; length - INCBIN "data/sgb_data/sgb_border_medals_2.bin" - - INCROM $730dc, $730de + INCBIN "data/sgb_data/border_medals_2.bin" SGBData_BorderDebug3: ; 730de (1c:70de) dw $60 ; length - INCBIN "data/sgb_data/sgb_border_debug_3.bin" + INCBIN "data/sgb_data/border_debug_3.bin" SGBData_BorderIntro3: ; 73146 (1c:7146) dw $60 ; length - INCBIN "data/sgb_data/sgb_border_intro_3.bin" + INCBIN "data/sgb_data/border_intro_3.bin" SGBData_BorderMedals3: ; 7319a (1c:719a) dw $60 ; length - INCBIN "data/sgb_data/sgb_border_medals_3.bin" + INCBIN "data/sgb_data/border_medals_3.bin" SGBData_BorderMedals4: ; 731e5 (1c:71e5) dw $60 ; length - INCBIN "data/sgb_data/sgb_border_medals_4.bin" + INCBIN "data/sgb_data/border_medals_4.bin" SGBData_MapPals1: ; 7322f (1c:722f) dw $20 ; length @@ -756,7 +845,173 @@ SGBData_LaboratoryBooster: ; 73471 (1c:7471) dw $20 ; length INCBIN "data/sgb_data/laboratory_booster_pals.bin" - INCROM $73496, $73aa8 +SGBData_UnusedPals1: ; 73496 (1c:7496) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_1.bin" + +SGBData_UnusedPals2: ; 734bb (1c:74bb) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_2.bin" + +SGBData_UnusedPals_3: ; 734e0 (1c:74e0) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_3.bin" + +SGBData_UnusedPals_4: ; 73505 (1c:7505) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_4.bin" + +SGBData_UnusedPals_5: ; 7352a (1c:752a) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_5.bin" + +SGBData_UnusedPals_6: ; 7354f (1c:754f) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_6.bin" + +SGBData_UnusedPals_7: ; 73574 (1c:7574) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_7.bin" + +SGBData_UnusedPals_8: ; 73599 (1c:7599) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_8.bin" + +SGBData_UnusedPals_9: ; 735be (1c:75be) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_9.bin" + +SGBData_UnusedPals10: ; 735e3 (1c:75e3) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_10.bin" + +SGBData_UnusedPals11: ; 73608 (1c:7608) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_11.bin" + +SGBData_UnusedPals12: ; 7362d (1c:762d) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_12.bin" + +SGBData_UnusedPals13: ; 73652 (1c:7652) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_13.bin" + +SGBData_UnusedPals14: ; 73677 (1c:7677) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_14.bin" + +SGBData_UnusedPals15: ; 7369c (1c:769c) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_15.bin" + +SGBData_UnusedPals16: ; 736c1 (1c:76c1) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_16.bin" + +SGBData_UnusedPals17: ; 736e6 (1c:76e6) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_17.bin" + +SGBData_UnusedPals18: ; 7370b (1c:770b) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_18.bin" + +SGBData_UnusedPals19: ; 73730 (1c:7730) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_19.bin" + +SGBData_UnusedPals20: ; 73755 (1c:7755) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_20.bin" + +SGBData_UnusedPals21: ; 7377a (1c:777a) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_21.bin" + +SGBData_UnusedPals22: ; 7379f (1c:779f) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_22.bin" + +SGBData_UnusedPals23: ; 737c4 (1c:77c4) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_23.bin" + +SGBData_UnusedPals24: ; 737e9 (1c:77e9) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_24.bin" + +SGBData_UnusedPals25: ; 7380e (1c:780e) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_25.bin" + +SGBData_UnusedPals26: ; 73833 (1c:7833) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_26.bin" + +SGBData_UnusedPals27: ; 73858 (1c:7858) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_27.bin" + +SGBData_UnusedPals28: ; 7387d (1c:787d) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_28.bin" + +SGBData_UnusedPals29: ; 738a2 (1c:78a2) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_29.bin" + +SGBData_UnusedPals30: ; 738c7 (1c:78c7) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_30.bin" + +SGBData_UnusedPals31: ; 738ec (1c:78ec) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_31.bin" + +SGBData_UnusedPals32: ; 73911 (1c:7911) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_32.bin" + +SGBData_UnusedPals33: ; 73936 (1c:7936) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_33.bin" + +SGBData_UnusedPals34: ; 7395b (1c:795b) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_34.bin" + +SGBData_UnusedPals35: ; 73980 (1c:7980) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_35.bin" + +SGBData_UnusedPals36: ; 739a5 (1c:79a5) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_36.bin" + +SGBData_UnusedPals37: ; 739ca (1c:79ca) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_37.bin" + +SGBData_UnusedPals38: ; 739ef (1c:79ef) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_38.bin" + +SGBData_UnusedPals39: ; 73a14 (1c:7a14) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_39.bin" + +SGBData_UnusedPals40: ; 73a39 (1c:7a39) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_40.bin" + +SGBData_UnusedPals41: ; 73a5e (1c:7a5e) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_41.bin" + +SGBData_UnusedPals42: ; 73a83 (1c:7a83) + dw $20 ; length + INCBIN "data/sgb_data/unused_pals_42.bin" SGBData_GameBoyLink: ; 73aa8 (1c:7aa8) dw $40 ; length diff --git a/tools/compressed_data_extractor.py b/tools/compressed_data_extractor.py index 71b2d31..422e887 100644 --- a/tools/compressed_data_extractor.py +++ b/tools/compressed_data_extractor.py @@ -41,6 +41,7 @@ def getCompressedData(offset): cmdByte = getByte(pos)
pos += 1
data.append(cmdByte)
+ print('{:0x}'.format(cmdByte))
for bit in range(8):
if (cmdByte & (1 << (7 - bit)) != 0):
@@ -69,6 +70,11 @@ def getCompressedData(offset): # the decompression might finish while still
# reading command bits, so break early when this happens
if (size == 0):
+ if not repeatToggle:
+ # extra bytes to match source
+ data.append(getByte(pos))
+ data.append(getByte(pos + 1))
+
break
return bytes(data)
|