Skip to content

Commit

Permalink
whoops
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZoomTen
ZoomTen committed Oct 5, 2021
1 parent fd3b39f commit 89e9893
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 31 deletions.
2 changes: 1 addition & 1 deletion banks/bank_07.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -963,7 +963,7 @@ unk_007_4ed2:

unk_007_4edf:
warp_event ABSOLUTE, 8, $2d, $0a, $00
event_04 4, 3, 0, unk_00e_4651
event_04 4, 3, 0, unk_00e_4652
events_end

unk_007_4eec:
Expand Down
1 change: 0 additions & 1 deletion banks/bank_0e.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,6 @@ unk_00e_4642:

Script_00e_464e:
scr_text text_0e_5b91
unk_00e_4651:
scr_end

unk_00e_4652:
Expand Down
54 changes: 27 additions & 27 deletions banks/bank_12.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ Script_012_43a1:
scr_delay $03, $20 ; TEMP
scr_text text_12_6bc1
scr_spriteface 2, FACE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_UP
scr_text text_12_6c0b
scr_spriteface 2, FACE_DOWN
scr_text text_12_6c54
Expand Down Expand Up @@ -421,7 +421,7 @@ Script_012_43a1:
scr_spriteface 1, FACE_UP
scr_spriteface 3, FACE_UP
scr_text text_12_6e65
scr_spritewalk 3, MOVE_DOWN
scr_spritewalk 3, MOVE_UP
scr_spriteface 3, FACE_LEFT
scr_face $02 ; TEMP
scr_spriteface 1, FACE_LEFT
Expand All @@ -432,11 +432,11 @@ Script_012_43a1:
scr_face $00 ; TEMP
scr_spriteface 1, FACE_DOWN
scr_spriteface 2, FACE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_DOWN
scr_1c $02 ; TEMP
scr_spritewalk 3, MOVE_UP
scr_spritewalk 3, MOVE_DOWN
scr_text text_12_6ef7
scr_spriteface 3, FACE_RIGHT
scr_44
Expand Down Expand Up @@ -495,7 +495,7 @@ Script_012_44db:
scr_face $01 ; TEMP
scr_emote $02, $00 ; TEMP
scr_delay $03, $20 ; TEMP
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spriteface 2, FACE_RIGHT
scr_spriteface 3, FACE_LEFT
scr_text text_12_68c4
Expand All @@ -508,7 +508,7 @@ Script_012_44db:
scr_delay $03, $20 ; TEMP
scr_text text_12_691e
scr_spriteface 2, FACE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_face $02 ; TEMP
scr_text text_12_6927
scr_spriteface 3, FACE_DOWN
Expand Down Expand Up @@ -536,7 +536,7 @@ Script_012_44db:
scr_text text_12_6b93
scr_text text_12_6bb4
scr_44
scr_spritewalk 3, MOVE_UP
scr_spritewalk 3, MOVE_DOWN
scr_1c $03 ; TEMP
scr_setbit $daa3, $06 ; TEMP
scr_end
Expand Down Expand Up @@ -581,7 +581,7 @@ Script_012_45b3:
scr_delay $03, $20 ; TEMP
scr_text text_12_6394
scr_44
scr_spritewalk 4, MOVE_UP
scr_spritewalk 4, MOVE_DOWN
scr_1c $04 ; TEMP
scr_44
scr_spritewalk 3, MOVE_LEFT
Expand Down Expand Up @@ -817,7 +817,7 @@ Script_012_4781:
scr_text text_12_7aac
scr_emote $02, $03 ; TEMP
scr_delay $03, $20 ; TEMP
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_text text_12_7ad7
scr_emote $00, $03 ; TEMP
scr_delay $03, $20 ; TEMP
Expand Down Expand Up @@ -861,11 +861,11 @@ unk_012_4827:

Script_012_482b:
scr_text text_12_7cf0
scr_spritewalk 4, MOVE_UP
scr_spritewalk 4, MOVE_DOWN
scr_face $01 ; TEMP
scr_move MovementData_OneUp
scr_44
scr_spritewalk 1, MOVE_UP
scr_spritewalk 1, MOVE_DOWN
scr_spriteface 1, FACE_UP
scr_face $03 ; TEMP
scr_move MovementData_OneRight
Expand All @@ -877,11 +877,11 @@ Script_012_482b:

Script_012_4850::
scr_text text_12_7cf0
scr_spritewalk 4, MOVE_UP
scr_spritewalk 4, MOVE_DOWN
scr_face $01 ; TEMP
scr_move MovementData_OneUp
scr_44
scr_spritewalk 1, MOVE_UP
scr_spritewalk 1, MOVE_DOWN
scr_spriteface 1, FACE_UP

Script_012_4862:
Expand All @@ -894,8 +894,8 @@ Script_012_4862:
scr_emote $02, $00 ; TEMP
scr_delay $03, $20 ; TEMP
scr_text text_12_7d79
scr_spritewalk 3, MOVE_UP
scr_spritewalk 3, MOVE_UP
scr_spritewalk 3, MOVE_DOWN
scr_spritewalk 3, MOVE_DOWN
scr_spriteface 3, FACE_RIGHT
scr_spriteface 4, FACE_LEFT
scr_text text_12_7d90
Expand All @@ -907,9 +907,9 @@ Script_012_4862:
scr_text text_12_7df5
scr_text text_12_7e02
scr_text text_12_7e1a
scr_spritewalk 4, MOVE_UP
scr_spritewalk 4, MOVE_DOWN
scr_44
scr_spritewalk 4, MOVE_UP
scr_spritewalk 4, MOVE_DOWN
scr_1c $04 ; TEMP
scr_62 $02, $01 ; TEMP
scr_1f $0c ; TEMP
Expand Down Expand Up @@ -1272,7 +1272,7 @@ unk_012_4b94:
scr_text text_12_6fcc
scr_spriteface 4, FACE_DOWN
scr_spriteface 2, FACE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spriteface 2, FACE_RIGHT
scr_spritewalk 2, MOVE_RIGHT
scr_spriteface 2, FACE_DOWN
Expand All @@ -1294,19 +1294,19 @@ unk_012_4b94:
scr_emote $02, $00 ; TEMP
scr_delay $03, $20 ; TEMP
scr_spriteface 2, FACE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spriteface 2, FACE_RIGHT
scr_spriteface 4, FACE_LEFT
scr_text text_12_70ec
scr_spriteface 2, FACE_DOWN
scr_spriteface 4, FACE_DOWN
scr_text text_12_7122
scr_text text_12_7159
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_DOWN
scr_text text_12_7169
scr_text text_12_71f8
scr_spriteface 2, FACE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spriteface 2, FACE_RIGHT
scr_spriteface 4, FACE_LEFT
scr_text text_12_7203
Expand Down Expand Up @@ -1364,8 +1364,8 @@ Script_012_4c95::
scr_text text_12_755b
scr_text text_12_756e
scr_spriteface 2, FACE_UP
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_DOWN
scr_spritewalk 2, MOVE_UP
scr_spritewalk 2, MOVE_UP
scr_1c $02 ; TEMP
scr_move MovementData_OneUp
scr_text text_12_7576
Expand Down Expand Up @@ -1420,7 +1420,7 @@ unk_012_4d38:
scr_face $02 ; TEMP
scr_move MovementData_OneLeft
scr_44
scr_spritewalk 1, MOVE_DOWN
scr_spritewalk 1, MOVE_UP
scr_spriteface 1, FACE_LEFT
scr_emote $00, $03 ; TEMP
scr_delay $03, $20 ; TEMP
Expand Down
2 changes: 2 additions & 0 deletions macros/scripts/script.asm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,8 @@ scr_4e: MACRO
dw \2
ENDM

const_def $52

const script_52 ; $52
scr_52: MACRO
db script_52
Expand Down
4 changes: 2 additions & 2 deletions utils/dump_scripts.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
if arg2 == 0:
print("\tscr_spritewalk %2d, MOVE_DELAY" % arg1)
elif arg2 == 1:
print("\tscr_spritewalk %2d, MOVE_UP" % arg1)
elif arg2 == 2:
print("\tscr_spritewalk %2d, MOVE_DOWN" % arg1)
elif arg2 == 2:
print("\tscr_spritewalk %2d, MOVE_UP" % arg1)
elif arg2 == 3:
print("\tscr_spritewalk %2d, MOVE_LEFT" % arg1)
elif arg2 == 4:
Expand Down

0 comments on commit 89e9893

Please sign in to comment.