Skip to content

Commit

Permalink
Check code style of asm subdirectories
Browse files Browse the repository at this point in the history
  • Loading branch information
fenhl committed Jan 9, 2024
1 parent 52f30fc commit f3c3544
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ASM/src/drop_overrides/obj_mure3.asm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ obj_mure3_drop_params_hack:
or a0, s2, r0 ; Store the actor pointer into a0 instead of PlayState
jr ra
or a3, s0, r0 ; Store the loop index into a3

; S0 should still have our loop index and it should be 6 when we call here
obj_mure3_redrupee_hack:
lh a3, 0x18(s2) ; get our new flag out of the z rotation
Expand Down
8 changes: 4 additions & 4 deletions ASM/src/hacks/ovl_bg_spot18_basket.asm
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
or s7, r0, r0 ; Use s7 as the loop variable instead of s0
bg_spot18_basket_bombs_loopstart:

.org 0x80ac7df4
.org 0x80ac7df4
; Replaces:
; addiu s0, s0, 0x01
; bnel s0, s1, bg_spot18_basket_bombs_loopstart
; or a0, s4, r0
addiu s7, s7, 0x01 ; using s7 as loop variable so need to hack here to increment s7 instead of s0
bnel s7, s1, bg_spot18_basket_bombs_loopstart ; using s7 as loop variable so use it in the loop branch
or a0, s0, r0 ; need to copy s0 back into a0
; Replace call to Item_DropCollectible.

; Replace call to Item_DropCollectible.
.org 0x80ac7dd4
; Replaces:
; jal Item_DropCollectible
Expand Down Expand Up @@ -73,4 +73,4 @@ bg_spot18_basket_rupees_loopstart:
.org 0x80ac7f54 ; Blue rupee drop
; Replaces:
; jal Item_DropCollectible
jal BgSpot18Basket_Heartpiecerupee_DropHook
jal BgSpot18Basket_Heartpiecerupee_DropHook
4 changes: 4 additions & 0 deletions CI.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def check_file_format(path: pathlib.Path, *, allow_trailing_spaces: bool = False
for path in (repo_dir / 'ASM' / 'src').iterdir():
if path.suffix == '.asm':
check_file_format(path)
for subdir in ('drop_overrides', 'hacks'):
for path in (repo_dir / 'ASM' / 'src' / subdir).iterdir():
if path.suffix == '.asm':
check_file_format(path)
for subdir in ('Glitched World', 'Hints', 'World'):
for path in (repo_dir / 'data' / subdir).iterdir():
if path.suffix == '.json':
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
__version__ = '8.0.11'

# This is a supplemental version number for branches based off of main dev.
supplementary_version = 2
supplementary_version = 3

# Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
# This will be 0x00 for main releases and 0x01 for main dev.
Expand Down

0 comments on commit f3c3544

Please sign in to comment.