Skip to content

Commit

Permalink
Fix nonmatching after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
AnonymousRandomPerson committed Oct 19, 2024
1 parent 1999f0b commit f2e7f20
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 42,320 deletions.
628 changes: 7 additions & 621 deletions asm/include/main_020257FC.inc

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion asm/include/overlay_31_02382FBC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@
.public ov29_0238280C
.public ov31_02382B54
.public ov31_02382DAC
.public ov31_02382F68
.public ov31_02389E22
.public ov31_02389F5C
.public ov31_0238A044
Expand All @@ -247,6 +246,7 @@
.public ov31_0238A23C
.public ov31_0238A2A0
.public ov31_0238A2A8
.public StairsSubheadingCallback
.public strcpy
.public sub_02001808
.public sub_0200B3D4
Expand Down
Loading

0 comments on commit f2e7f20

Please sign in to comment.