Skip to content

Commit

Permalink
warpDungeon macro calls
Browse files Browse the repository at this point in the history
  • Loading branch information
@LuisBoto
LuisBoto committed Jul 28, 2024
1 parent 83e7c1a commit b7b232f
Show file tree
Hide file tree
Showing 2 changed files with 60 additions and 20 deletions.
32 changes: 24 additions & 8 deletions data/cutscenes.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2672,8 +2672,12 @@ gUnknown_8137E94: @ 8137E94
.4byte gUnknown_81376C8
.byte 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_81376F8
.byte 0x00, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x54, 0x18, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x6a, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x69, 0x00, 0x00, 0x00, 0x54, 0x18, 0x02
warpDungeon 0x00
.byte 0x00
.byte 0x6a, 0x00, 0x00, 0x00, 0x3c, 0x18, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_8138014
gUnknown_8138014: @ 8138014
Expand Down Expand Up @@ -26761,7 +26765,9 @@ gUnknown_817A174: @ 817A174
.byte 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x61, 0x21, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_814656C
.byte 0x00, 0x00, 0x00, 0x00, 0x4d, 0x02, 0x00, 0x00, 0x3f, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x4f, 0x07, 0x00, 0x00, 0x43, 0x25, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x05, 0x00, 0x00, 0x43, 0x29, 0x02, 0x02
.byte 0x4f, 0x07, 0x00, 0x00, 0x43, 0x25, 0x02
warpDungeon 0x00
.byte 0x00, 0x50, 0x05, 0x00, 0x00, 0x43, 0x29, 0x02, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

.global gUnknown_817A24C
Expand Down Expand Up @@ -27498,10 +27504,16 @@ gUnknown_817B704: @ 817B704
.global gUnknown_817B86C
gUnknown_817B86C: @ 817B86C
.byte 0x46, 0x00, 0x00, 0x00, 0x24, 0x1e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x27, 0x1e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x48, 0x00, 0x00, 0x00, 0x52, 0x21, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00, 0x52, 0x3c, 0x02, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x00, 0x00, 0x00, 0x27, 0x1e, 0x00
warpDungeon 0x00
.byte 0x00
.byte 0x48, 0x00, 0x00, 0x00, 0x52, 0x21, 0x02
warpDungeon 0x00
.byte 0x00, 0x4a, 0x00, 0x00, 0x00, 0x52, 0x3c, 0x02, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, 0x29, 0x3d, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x61, 0x21, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49, 0x00, 0x00, 0x00, 0x61, 0x21, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_817B8FC
gUnknown_817B8FC: @ 817B8FC
Expand Down Expand Up @@ -41637,7 +41649,9 @@ gUnknown_819A63C: @ 819A63C
.global gUnknown_819A66C
gUnknown_819A66C: @ 819A66C
.byte 0x2b, 0x00, 0x00, 0x00, 0x1b, 0x18, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x27, 0x18, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x27, 0x18, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_819A69C
gUnknown_819A69C: @ 819A69C
Expand Down Expand Up @@ -68328,7 +68342,9 @@ gUnknown_81DF5E0: @ 81DF5E0
gUnknown_81DF628: @ 81DF628
.byte 0x0d, 0x00, 0x03, 0x04, 0x1f, 0x22, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_819C378
.byte 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x04, 0x03, 0x1b, 0x10, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x03, 0x02
.byte 0x00, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x04, 0x03, 0x1b, 0x10, 0x00
warpDungeon 0x00
.byte 0x00, 0x0f, 0x00, 0x03, 0x02
.byte 0x08, 0x2a, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.4byte gUnknown_819C748
.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x02, 0x02, 0x32, 0x21, 0x00, 0x00
Expand Down
48 changes: 36 additions & 12 deletions data/cutscenes_1.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6081,7 +6081,9 @@ setFlag 0x05

.global gUnknown_823A7DC
gUnknown_823A7DC: @ 823A7DC
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_823A7F4
gUnknown_823A7F4: @ 823A7F4
Expand Down Expand Up @@ -10456,8 +10458,12 @@ gUnknown_82450D0: @ 82450D0

.global gUnknown_8245100
gUnknown_8245100: @ 8245100
.byte 0x90, 0x00, 0x00, 0x00, 0x0a, 0x15, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x08, 0x1f, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x00, 0x00, 0x00, 0x0a, 0x15, 0x00
warpDungeon 0x00
.byte 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x08, 0x1f, 0x00
warpDungeon 0x00
.byte 0x00

.global gUnknown_8245130
gUnknown_8245130: @ 8245130
Expand Down Expand Up @@ -11929,8 +11935,12 @@ gUnknown_82485D0: @ 82485D0

.global gUnknown_8248600
gUnknown_8248600: @ 8248600
.byte 0x90, 0x00, 0x00, 0x00, 0x1c, 0x1e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x1c, 0x23, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x00, 0x00, 0x00, 0x1c, 0x1e, 0x00
warpDungeon 0x00
.byte 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x1c, 0x23, 0x00
warpDungeon 0x00
.byte 0x00

.global gUnknown_8248630
gUnknown_8248630: @ 8248630
Expand Down Expand Up @@ -12422,7 +12432,9 @@ setFlag 0x05

.global gUnknown_82494C4
gUnknown_82494C4: @ 82494C4
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_82494DC
gUnknown_82494DC: @ 82494DC
Expand Down Expand Up @@ -14460,8 +14472,12 @@ gUnknown_824E270: @ 824E270

.global gUnknown_824E2A0
gUnknown_824E2A0: @ 824E2A0
.byte 0x90, 0x00, 0x00, 0x00, 0x07, 0x1e, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x17, 0x23, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x00, 0x00, 0x00, 0x07, 0x1e, 0x02
warpDungeon 0x00
.byte 0x00, 0x91, 0x00, 0x00, 0x00
.byte 0x17, 0x23, 0x00
warpDungeon 0x00
.byte 0x00

.global gUnknown_824E2D0
gUnknown_824E2D0: @ 824E2D0
Expand Down Expand Up @@ -15115,7 +15131,9 @@ rotate 0x04, CCW, east

.global gUnknown_824F77C
gUnknown_824F77C: @ 824F77C
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_824F794
gUnknown_824F794: @ 824F794
Expand Down Expand Up @@ -17541,8 +17559,12 @@ gUnknown_82551F4: @ 82551F4

.global gUnknown_8255224
gUnknown_8255224: @ 8255224
.byte 0x90, 0x00, 0x00, 0x00, 0x0a, 0x12, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x19, 0x1e, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x90, 0x00, 0x00, 0x00, 0x0a, 0x12, 0x02
warpDungeon 0x00
.byte 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x19, 0x1e, 0x00
warpDungeon 0x00
.byte 0x00

.global gUnknown_8255254
gUnknown_8255254: @ 8255254
Expand Down Expand Up @@ -21515,7 +21537,9 @@ setFlag 0x05

.global gUnknown_825E620
gUnknown_825E620: @ 825E620
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
.byte 0x91, 0x00, 0x00, 0x00, 0x1c, 0x1c, 0x02
warpDungeon 0x00
.byte 0x00

.global gUnknown_825E638
gUnknown_825E638: @ 825E638
Expand Down

0 comments on commit b7b232f

Please sign in to comment.