Skip to content

Commit

Permalink
Make buildable again
Browse files Browse the repository at this point in the history
  • Loading branch information
vulcandth committed Nov 18, 2023
1 parent a9e2d51 commit 26eb31f
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 116 deletions.
2 changes: 1 addition & 1 deletion engine/debug/field/vram_viewer.inc
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ FieldDebug_DoVRAMViewer:
ld bc, $180 tiles
call ByteFill
call LoadFont
callab Function3e39f
callab Call_LoadBattleGraphics
xor a
ldh [hMapAnims], a
call EnableLCD
Expand Down
2 changes: 1 addition & 1 deletion engine/dumps/bank0d.asm
Original file line number Diff line number Diff line change
Expand Up @@ -2061,7 +2061,7 @@ asm_34b2c:
ret z

asm_34b51:
ld hl, wd163
ld hl, wBadges
bit 7, [hl]
ld a, $65
jr nz, asm_34b6e
Expand Down
8 changes: 4 additions & 4 deletions engine/dumps/bank0f.asm
Original file line number Diff line number Diff line change
Expand Up @@ -4673,7 +4673,7 @@ sub_3e360:
ld a, [wLinkMode]
cp 3
ret z
ld a, [wd163]
ld a, [wBadges]
ld b, a
ld hl, wca16
ld c, 4
Expand Down Expand Up @@ -5761,7 +5761,7 @@ asm_3eec1:
ret

sub_3eec8:
ld a, [wPlayerStandingTile]
ld a, [wPlayerTile]
ld hl, Data3eed5
ld de, 1
call FindItemInTable
Expand Down Expand Up @@ -6386,7 +6386,7 @@ BattleIntroSlidingPics:

.Subfunction1:
push bc
ld hl, wVirtualOAMSprite00XCoord
ld hl, wShadowOAMSprite00XCoord
ld c, $12
ld de, 4
.loop2
Expand Down Expand Up @@ -6436,7 +6436,7 @@ InitBackPic:
ret

LoadTrainerBackpicAsOAM:
ld hl, wVirtualOAMSprite00
ld hl, wShadowOAMSprite00
xor a
ldh [hTextBoxCursorBlinkInterval], a
ld b, 6
Expand Down
110 changes: 0 additions & 110 deletions shim.sym
Original file line number Diff line number Diff line change
Expand Up @@ -120,115 +120,6 @@
38:4E5F Cursor_AnimateCursor
38:4EA8 Cursor_InterpretJoypad

; SFX shims
3C:43BE Sfx_01
3C:43C1 Sfx_02
3C:43C4 Sfx_03
3C:43C7 Sfx_04
3C:43CA Sfx_05
3C:43CA Sfx_06
3C:43CD Sfx_07
3C:43D0 Sfx_08
3C:43D3 Sfx_09
3C:43D6 Sfx_0a
3C:43D9 Sfx_0b
3C:43DC Sfx_0c
3C:43DF Sfx_0d
3C:43E2 Sfx_0e
3C:43E5 Sfx_0f
3C:43E8 Sfx_10
3C:43EB Sfx_11
3C:43EE Sfx_12
3C:43F1 Sfx_13
3C:43F4 Sfx_14
3C:43F7 Sfx_15
3C:43FD Sfx_16
3C:4400 Sfx_17
3C:4403 Sfx_18
3C:4409 Sfx_19
3C:440C Sfx_1a
3C:440F Sfx_1b
3C:4412 Sfx_1c
3C:4418 Sfx_1d
3C:441E Sfx_1e
3C:4424 Sfx_1f
3C:4427 Sfx_20
3C:442A Sfx_21
3C:4430 Sfx_22
3C:4433 Sfx_23
3C:4436 Sfx_24
3C:443C Sfx_25
3C:4442 Sfx_26
3C:4448 Sfx_27
3C:444B Sfx_28
3C:4451 Sfx_29
3C:4454 Sfx_2a
3C:4457 Sfx_2b
3C:445A Sfx_2c
3C:445D Sfx_2d
3C:4460 Sfx_2e
3C:4463 Sfx_2f
3C:4466 Sfx_30
3C:4469 Sfx_31
3C:446F Sfx_32
3C:4472 Sfx_33
3C:4475 Sfx_34
3C:4478 Sfx_35
3C:447B Sfx_36
3C:447E Sfx_37
3C:4481 Sfx_38
3C:4484 Sfx_39
3C:4487 Sfx_3a
3C:448A Sfx_3b
3C:448D Sfx_3c
3C:4490 Sfx_3d
3C:4493 Sfx_3e
3C:4496 Sfx_3f
3C:4499 Sfx_40
3C:449C Sfx_41
3C:449F Sfx_42
3C:44A2 Sfx_43
3C:44A5 Sfx_44
3C:44A8 Sfx_45
3C:44AB Sfx_46
3C:44AE Sfx_47
3C:44B1 Sfx_48
3C:44B4 Sfx_49
3C:44B7 Sfx_4a
3C:44BD Sfx_4b
3C:44C0 Sfx_4c
3C:44C3 Sfx_4d
3C:44C6 Sfx_4e
3C:44C9 Sfx_4f
3C:44CC Sfx_50
3C:44D2 Sfx_51
3C:44D5 Sfx_52
3C:44D8 Sfx_53
3C:44E1 Sfx_54
3C:44EA Sfx_55
3C:44F0 Sfx_56
3C:44F9 Sfx_57
3C:44FF Sfx_58
3C:4508 Sfx_59
3C:4511 Sfx_5a
3C:451A Sfx_5b
3C:4523 Sfx_5c
3C:452C Sfx_5d
3C:4532 Sfx_5e
3C:4538 Sfx_5f
3C:453E Sfx_60
3C:4547 Sfx_61
3C:454D Sfx_62
3C:4556 Sfx_63
3C:4559 Sfx_64
3C:4562 Sfx_65
3C:456B Sfx_66
3C:4574 Sfx_67
3C:457D Sfx_68
3C:4586 Sfx_69
3C:458F Sfx_6a
3C:4598 Sfx_6b
3C:45A1 Sfx_6c

; Cry header shims
3C:57C5 CryHeader_f17c5
Expand Down Expand Up @@ -273,7 +164,6 @@
3E:40D6 Functionf80d6

3F:40E9 InGameDebugMenu
3F:4C24 Functionfcc24
3F:4E3E Functionfce3e
3F:5B66 Functionfdb66
3F:64CE MonsterTest
Expand Down

0 comments on commit 26eb31f

Please sign in to comment.