Skip to content

Commit

Permalink
fix asm syntax errors (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
notwa committed Nov 28, 2018
1 parent e762bbd commit ea19f3e
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion asm/beta.asm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
[starting_exit]: 0x8014533C
[default_save]: 0x801C6898

[link_object_ptr]: 0x803FFFF4 // actually just an offset of link_actor?
[link_object_ptr]: 0x803FFFF4 ; actually just an offset of link_actor?

[scene_record_size]: 0x14

Expand Down
2 changes: 1 addition & 1 deletion asm/bombtornado.asm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

[at_bomb]: 0x0009

[rotate_amount]: 0x3E567750 // pi/15
[rotate_amount]: 0x3E567750 ; pi/15

// F12 = input (single), F0 = output (single), F4 = output (double)
[sinf]: 0x80088350
Expand Down
2 changes: 1 addition & 1 deletion asm/print.asm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
[SetTextXY]: 0x800FB41C
[SetTextString]: 0x800FBCB4
[TxtPrinter]: 0x800FBB60
[InitTxtStruct]: 0x800FBB8C // unused here; we set it up inline
[InitTxtStruct]: 0x800FBB8C ; unused here; we set it up inline
[DoTxtStruct]: 0x800FBC1C
[UpdateTxtStruct]: 0x800FBC64
push 4, 1, ra
Expand Down
2 changes: 1 addition & 1 deletion asm/spawn O EUDB MQ.asm
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
[SetTextXY]: 0x800FB41C
[SetTextString]: 0x800FBCB4
[TxtPrinter]: 0x800FBB60
[InitTxtStruct]: 0x800FBB8C // unused here; we set it up inline
[InitTxtStruct]: 0x800FBB8C ; unused here; we set it up inline
[DoTxtStruct]: 0x800FBC1C
[UpdateTxtStruct]: 0x800FBC64

Expand Down
4 changes: 2 additions & 2 deletions asm/spawn mm.asm
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
[SetTextXY]: 0x80085A2C
[SetTextString]: 0x800860D8
[TxtPrinter]: 0x80085FE4
[InitTxtStruct]: 0x80086010 // unused here; we set it up inline
[InitTxtStruct]: 0x80086010 ; unused here; we set it up inline
[DoTxtStruct]: 0x8008606C
[UpdateTxtStruct]: 0x800860A0

.include "spawn.asm"

[whatever]: 0x807D0000 // stupid hack since i can't store/restore PC (not yet!)
[whatever]: 0x807D0000 ; stupid hack since i can't store/restore PC (not yet!)
.org @whatever
push 5, ra
lhu t0, 0(a1)
Expand Down
2 changes: 1 addition & 1 deletion asm/spawn oot.asm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
[SetTextXY]: 0x800CBEC8
[SetTextString]: 0x800CC588
[TxtPrinter]: 0x800CC480
[InitTxtStruct]: 0x800CC4AC // unused here; we set it up inline
[InitTxtStruct]: 0x800CC4AC ; unused here; we set it up inline
[DoTxtStruct]: 0x800CC508
[UpdateTxtStruct]: 0x800CC550

Expand Down

0 comments on commit ea19f3e

Please sign in to comment.