alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Bonk Trees will revert color after collection

Browse Source
This commit is contained in:
codemann8
2022-07-26 18:13:20 -05:00
parent 1be10e5e12
commit b25c477958
1 changed files with 656 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

426
bonktreemaps.asm
View File

@@ -60,6 +60,7 @@ dw return, return, return, return, return, return, return, return
map00: ; Map00/Map01/Map08/Map09
{
LDA.l OverworldEventDataWRAM+$00 : BIT.w #$0010 : BNE +
LDA #$0364 : STA $31D0
LDA #$0365 : STA $31D2
LDA #$0366 : STA $31D4
@@ -76,12 +77,15 @@ LDA #$0375 : STA $3350
LDA #$0376 : STA $3352
LDA #$0377 : STA $3354
LDA #$0378 : STA $3356
RTS
+ RTS
}
map0a: ; Map10
{
LDA.l OverworldEventDataWRAM+$0a : BIT.w #$0010 : BNE +
; north tree
PHA
LDA #$0364 : STA $2118
LDA #$0365 : STA $211A
LDA #$0366 : STA $211C
@@ -98,7 +102,9 @@ LDA #$0375 : STA $2298
LDA #$0376 : STA $229A
LDA #$0377 : STA $229C
LDA #$0378 : STA $229E
PLA
+ BIT.w #$0008 : BNE +
; south tree
LDA #$0364 : STA $2C30
LDA #$0365 : STA $2C32
@@ -116,12 +122,15 @@ LDA #$0375 : STA $2DB0
LDA #$0376 : STA $2DB2
LDA #$0377 : STA $2DB4
LDA #$0378 : STA $2DB6
RTS
+ RTS
}
map10: ; Map16
{
LDA.l OverworldEventDataWRAM+$10 : BIT.w #$0010 : BNE +
; west tree
PHA
LDA #$0364 : STA $250C
LDA #$0365 : STA $250E
LDA #$0366 : STA $2510
@@ -138,7 +147,9 @@ LDA #$0375 : STA $268C
LDA #$0376 : STA $268E
LDA #$0377 : STA $2690
LDA #$0378 : STA $2692
PLA
+ BIT.w #$0008 : BNE +
; east tree
LDA #$0364 : STA $26AC
LDA #$0365 : STA $26AE
@@ -156,11 +167,13 @@ LDA #$0375 : STA $282C
LDA #$0376 : STA $282E
LDA #$0377 : STA $2830
LDA #$0378 : STA $2832
RTS
+ RTS
}
map12: ; Map18
{
LDA.l OverworldEventDataWRAM+$12 : BIT.w #$0010 : BNE +
LDA #$0364 : STA $2426
LDA #$0365 : STA $2428
LDA #$064F : STA $242A
@@ -177,12 +190,15 @@ LDA #$0375 : STA $25A6
LDA #$0376 : STA $25A8
LDA #$0377 : STA $25AA
LDA #$0378 : STA $25AC
RTS
+ RTS
}
map13: ; Map19
{
LDA.l OverworldEventDataWRAM+$13 : BIT.w #$0010 : BNE +
; ledge tree
PHA
LDA #$0364 : STA $250C
LDA #$0365 : STA $250E
LDA #$0366 : STA $2510
@@ -199,6 +215,27 @@ LDA #$0375 : STA $268C
LDA #$0376 : STA $268E
LDA #$0377 : STA $2690
LDA #$0378 : STA $2692
PLA
+ BIT.w #$0008 : BEQ + ; BEQ because tree is already colored
; east tree
LDA #$00AE : STA $23AE
LDA #$00AF : STA $23B0
LDA #$007E : STA $23B2
LDA #$007F : STA $23B4
LDA #$00B0 : STA $242E
LDA #$0014 : STA $2430
LDA #$0015 : STA $2432
LDA #$00A8 : STA $2434
LDA #$0089 : STA $24AE
LDA #$001C : STA $24B0
LDA #$001D : STA $24B2
LDA #$0076 : STA $24B4
LDA #$00F1 : STA $252E
LDA #$004E : STA $2530
LDA #$004F : STA $2532
LDA #$00D9 : STA $2534
+
; west tree
LDA #$00AE : STA $23A2
@@ -218,28 +255,33 @@ LDA #$004E : STA $2524
LDA #$004F : STA $2526
LDA #$00D9 : STA $2528
; TODO: east tree
; LDA #$00AE : STA $23AE
; LDA #$00AF : STA $23B0
; LDA #$007E : STA $23B2
; LDA #$007F : STA $23B4
; LDA #$00B0 : STA $242E
; LDA #$0014 : STA $2430
; LDA #$0015 : STA $2432
; LDA #$00A8 : STA $2434
; LDA #$0089 : STA $24AE
; LDA #$001C : STA $24B0
; LDA #$001D : STA $24B2
; LDA #$0076 : STA $24B4
; LDA #$00F1 : STA $252E
; LDA #$004E : STA $2530
; LDA #$004F : STA $2532
; LDA #$00D9 : STA $2534
RTS
}
map15: ; Map21
{
LDA.l OverworldEventDataWRAM+$15 : BIT.w #$0010 : BNE +
; southwest tree
PHA
LDA #$0364 : STA $2C06
LDA #$0365 : STA $2C08
LDA #$0366 : STA $2C0A
LDA #$0367 : STA $2C0C
LDA #$0368 : STA $2C86
LDA #$0369 : STA $2C88
LDA #$036A : STA $2C8A
LDA #$036B : STA $2C8C
LDA #$036E : STA $2D06
LDA #$036F : STA $2D08
LDA #$0370 : STA $2D0A
LDA #$0371 : STA $2D0C
LDA #$0375 : STA $2D86
LDA #$0376 : STA $2D88
LDA #$0377 : STA $2D8A
LDA #$0378 : STA $2D8C
PLA
+ BIT.w #$0008 : BNE +
; east bank tree
LDA #$0364 : STA $26B4
LDA #$0365 : STA $26B6
@@ -258,24 +300,7 @@ LDA #$0376 : STA $2836
LDA #$0377 : STA $2838
LDA #$0378 : STA $283A
; southwest tree
LDA #$0364 : STA $2C06
LDA #$0365 : STA $2C08
LDA #$0366 : STA $2C0A
LDA #$0367 : STA $2C0C
LDA #$0368 : STA $2C86
LDA #$0369 : STA $2C88
LDA #$036A : STA $2C8A
LDA #$036B : STA $2C8C
LDA #$036E : STA $2D06
LDA #$036F : STA $2D08
LDA #$0370 : STA $2D0A
LDA #$0371 : STA $2D0C
LDA #$0375 : STA $2D86
LDA #$0376 : STA $2D88
LDA #$0377 : STA $2D8A
LDA #$0378 : STA $2D8C
RTS
+ RTS
}
map16: ; Map22
@@ -301,7 +326,9 @@ RTS
map18: ; Map24/Map25/Map32/Map33
{
LDA.l OverworldEventDataWRAM+$18 : BIT.w #$0010 : BNE +
; northwest tree
PHA
LDA #$0364 : STA $242C
LDA #$0365 : STA $242E
LDA #$0366 : STA $2430
@@ -318,7 +345,9 @@ LDA #$0375 : STA $25AC
LDA #$0376 : STA $25AE
LDA #$0377 : STA $25B0
LDA #$0378 : STA $25B2
PLA
+ BIT.w #$0008 : BNE +
; southeast tree
LDA #$0364 : STA $38EA
LDA #$0365 : STA $38EC
@@ -336,11 +365,34 @@ LDA #$0375 : STA $3A6A
LDA #$0376 : STA $3A6C
LDA #$0377 : STA $3A6E
LDA #$0378 : STA $3A70
RTS
+ RTS
}
map1a: ; Map26
{
LDA.l OverworldEventDataWRAM+$1a : BIT.w #$0010 : BNE +
; southwest tree
PHA
LDA #$0364 : STA $2B10
LDA #$0365 : STA $2B12
LDA #$0366 : STA $2B14
LDA #$0367 : STA $2B16
LDA #$0368 : STA $2B90
LDA #$0369 : STA $2B92
LDA #$036A : STA $2B94
LDA #$036B : STA $2B96
LDA #$036E : STA $2C10
LDA #$036F : STA $2C12
LDA #$0370 : STA $2C14
LDA #$0371 : STA $2C16
LDA #$0375 : STA $2C90
LDA #$0376 : STA $2C92
LDA #$0377 : STA $2C94
LDA #$0378 : STA $2C96
PLA
+ BIT.w #$0008 : BNE +
; central tree
LDA #$0364 : STA $2798
LDA #$0365 : STA $279A
@@ -359,28 +411,12 @@ LDA #$0376 : STA $291A
LDA #$0377 : STA $291C
LDA #$0378 : STA $291E
; southwest tree
LDA #$0364 : STA $2B10
LDA #$0365 : STA $2B12
LDA #$0366 : STA $2B14
LDA #$0367 : STA $2B16
LDA #$0368 : STA $2B90
LDA #$0369 : STA $2B92
LDA #$036A : STA $2B94
LDA #$036B : STA $2B96
LDA #$036E : STA $2C10
LDA #$036F : STA $2C12
LDA #$0370 : STA $2C14
LDA #$0371 : STA $2C16
LDA #$0375 : STA $2C90
LDA #$0376 : STA $2C92
LDA #$0377 : STA $2C94
LDA #$0378 : STA $2C96
RTS
+ RTS
}
map1b: ; Map27/Map28/Map35/Map36
{
LDA.l OverworldEventDataWRAM+$1b : BIT.w #$0010 : BNE +
LDA #$0364 : STA $29AA
LDA #$0365 : STA $29AC
LDA #$0366 : STA $29AE
@@ -397,11 +433,13 @@ LDA #$0375 : STA $2B2A
LDA #$0376 : STA $2B2C
LDA #$0377 : STA $2B2E
LDA #$0378 : STA $2B30
RTS
+ RTS
}
map1d: ; Map29
{
LDA.l OverworldEventDataWRAM+$1d : BIT.w #$0010 : BNE +
LDA #$0364 : STA $2212
LDA #$0365 : STA $2214
LDA #$0366 : STA $2216
@@ -418,7 +456,8 @@ LDA #$0375 : STA $2392
LDA #$0376 : STA $2394
LDA #$0377 : STA $2396
LDA #$0378 : STA $2398
RTS
+ RTS
}
map1e: ; Map30/Map31/Map38/Map39
@@ -485,28 +524,53 @@ LDA #$00D9 : STA $3B58
LDA #$00DE : STA $3BCE
LDA #$00F1 : STA $3B4C
; TODO: bonk tree
; LDA #$00AE : STA $3AC2
; LDA #$00AF : STA $3AC4
; LDA #$007E : STA $3AC6
; LDA #$007F : STA $3AC8
; LDA #$00B0 : STA $3B42
; LDA #$0014 : STA $3B44
; LDA #$0015 : STA $3B46
; LDA #$00A8 : STA $3B48
; LDA #$0089 : STA $3BC2
; LDA #$001C : STA $3BC4
; LDA #$001D : STA $3BC6
; LDA #$0076 : STA $3BC8
; LDA #$00F1 : STA $3C42
; LDA #$004E : STA $3C44
; LDA #$004F : STA $3C46
; LDA #$00D9 : STA $3C48
RTS
LDA.l OverworldEventDataWRAM+$1e : BIT.w #$0010 : BEQ + ; BEQ because tree is already colored
; bonk tree
LDA #$00AE : STA $3AC2
LDA #$00AF : STA $3AC4
LDA #$007E : STA $3AC6
LDA #$007F : STA $3AC8
LDA #$00B0 : STA $3B42
LDA #$0014 : STA $3B44
LDA #$0015 : STA $3B46
LDA #$00A8 : STA $3B48
LDA #$0089 : STA $3BC2
LDA #$001C : STA $3BC4
LDA #$001D : STA $3BC6
LDA #$0076 : STA $3BC8
LDA #$00F1 : STA $3C42
LDA #$004E : STA $3C44
LDA #$004F : STA $3C46
LDA #$00D9 : STA $3C48
+ RTS
}
map2a: ; Map42
{
LDA.l OverworldEventDataWRAM+$2a : BIT.w #$0010 : BNE +
; south tree
PHA
LDA #$0364 : STA $2B1C
LDA #$0365 : STA $2B1E
LDA #$0366 : STA $2B20
LDA #$0367 : STA $2B22
LDA #$0368 : STA $2B9C
LDA #$0369 : STA $2B9E
LDA #$036A : STA $2BA0
LDA #$036B : STA $2BA2
LDA #$036E : STA $2C1C
LDA #$036F : STA $2C1E
LDA #$0370 : STA $2C20
LDA #$0371 : STA $2C22
LDA #$0375 : STA $2C9C
LDA #$0376 : STA $2C9E
LDA #$0377 : STA $2CA0
LDA #$0378 : STA $2CA2
PLA
+ BIT.w #$0008 : BNE +
; southeast tree
LDA #$0364 : STA $2928
LDA #$0365 : STA $292A
@@ -525,28 +589,12 @@ LDA #$0376 : STA $2AAA
LDA #$0377 : STA $2AAC
LDA #$0378 : STA $2AAE
; south tree
LDA #$0364 : STA $2B1C
LDA #$0365 : STA $2B1E
LDA #$0366 : STA $2B20
LDA #$0367 : STA $2B22
LDA #$0368 : STA $2B9C
LDA #$0369 : STA $2B9E
LDA #$036A : STA $2BA0
LDA #$036B : STA $2BA2
LDA #$036E : STA $2C1C
LDA #$036F : STA $2C1E
LDA #$0370 : STA $2C20
LDA #$0371 : STA $2C22
LDA #$0375 : STA $2C9C
LDA #$0376 : STA $2C9E
LDA #$0377 : STA $2CA0
LDA #$0378 : STA $2CA2
RTS
+ RTS
}
map2b: ; Map43
{
LDA.l OverworldEventDataWRAM+$2b : BIT.w #$0010 : BNE +
LDA #$0364 : STA $25AA
LDA #$0365 : STA $25AC
LDA #$0366 : STA $25AE
@@ -563,12 +611,15 @@ LDA #$0375 : STA $272A
LDA #$0376 : STA $272C
LDA #$0377 : STA $272E
LDA #$0378 : STA $2730
RTS
+ RTS
}
map2e: ; Map46
{
LDA.l OverworldEventDataWRAM+$2e : BIT.w #$0010 : BNE +
; tree 2
PHA
LDA #$0364 : STA $2396
LDA #$0365 : STA $2398
LDA #$0366 : STA $239A
@@ -585,7 +636,9 @@ LDA #$0375 : STA $2516
LDA #$0376 : STA $2518
LDA #$0377 : STA $251A
LDA #$0378 : STA $251C
PLA
+ BIT.w #$0008 : BNE +
; tree 4
LDA #$0364 : STA $24A6
LDA #$0365 : STA $24A8
@@ -603,11 +656,34 @@ LDA #$0375 : STA $2626
LDA #$0376 : STA $2628
LDA #$0377 : STA $262A
LDA #$0378 : STA $262C
RTS
+ RTS
}
map32: ; Map50
{
LDA.l OverworldEventDataWRAM+$32 : BIT.w #$0010 : BNE +
; southeast tree
PHA
LDA #$0364 : STA $2830
LDA #$0365 : STA $2832
LDA #$0366 : STA $2834
LDA #$0367 : STA $2836
LDA #$0368 : STA $28B0
LDA #$0369 : STA $28B2
LDA #$036A : STA $28B4
LDA #$036B : STA $28B6
LDA #$036E : STA $2930
LDA #$036F : STA $2932
LDA #$0370 : STA $2934
LDA #$0371 : STA $2936
LDA #$0375 : STA $29B0
LDA #$0376 : STA $29B2
LDA #$0377 : STA $29B4
LDA #$0378 : STA $29B6
PLA
+ BIT.w #$0008 : BNE +
; northeast tree
LDA #$0364 : STA $23B2
LDA #$0365 : STA $23B4
@@ -626,28 +702,12 @@ LDA #$0376 : STA $2534
LDA #$0377 : STA $2536
LDA #$0378 : STA $2538
; southeast tree
LDA #$0364 : STA $2830
LDA #$0365 : STA $2832
LDA #$0366 : STA $2834
LDA #$0367 : STA $2836
LDA #$0368 : STA $28B0
LDA #$0369 : STA $28B2
LDA #$036A : STA $28B4
LDA #$036B : STA $28B6
LDA #$036E : STA $2930
LDA #$036F : STA $2932
LDA #$0370 : STA $2934
LDA #$0371 : STA $2936
LDA #$0375 : STA $29B0
LDA #$0376 : STA $29B2
LDA #$0377 : STA $29B4
LDA #$0378 : STA $29B6
RTS
+ RTS
}
map42: ; Map02
{
LDA.l OverworldEventDataWRAM+$42 : BIT.w #$0010 : BNE +
LDA #$0364 : STA $2A0A
LDA #$0365 : STA $2A0C
LDA #$0366 : STA $2A0E
@@ -664,7 +724,8 @@ LDA #$0375 : STA $2B8A
LDA #$0376 : STA $2B8C
LDA #$0377 : STA $2B8E
LDA #$0378 : STA $2B90
RTS
+ RTS
}
map53: ; Map19
@@ -690,6 +751,28 @@ RTS
map55: ; Map21
{
LDA.l OverworldEventDataWRAM+$55 : BIT.w #$0010 : BNE +
; west bank tree
PHA
LDA #$0364 : STA $2C12
LDA #$0365 : STA $2C14
LDA #$0366 : STA $2C16
LDA #$0367 : STA $2C18
LDA #$0368 : STA $2C92
LDA #$0369 : STA $2C94
LDA #$036A : STA $2C96
LDA #$036B : STA $2C98
LDA #$036E : STA $2D12
LDA #$036F : STA $2D14
LDA #$0370 : STA $2D16
LDA #$0371 : STA $2D18
LDA #$0375 : STA $2D92
LDA #$0376 : STA $2D94
LDA #$0377 : STA $2D96
LDA #$0378 : STA $2D98
PLA
+ BIT.w #$0008 : BNE +
; east bank tree
LDA #$0364 : STA $26B4
LDA #$0365 : STA $26B6
@@ -708,28 +791,12 @@ LDA #$0376 : STA $2836
LDA #$0377 : STA $2838
LDA #$0378 : STA $283A
; west bank tree
LDA #$0364 : STA $2C12
LDA #$0365 : STA $2C14
LDA #$0366 : STA $2C16
LDA #$0367 : STA $2C18
LDA #$0368 : STA $2C92
LDA #$0369 : STA $2C94
LDA #$036A : STA $2C96
LDA #$036B : STA $2C98
LDA #$036E : STA $2D12
LDA #$036F : STA $2D14
LDA #$0370 : STA $2D16
LDA #$0371 : STA $2D18
LDA #$0375 : STA $2D92
LDA #$0376 : STA $2D94
LDA #$0377 : STA $2D96
LDA #$0378 : STA $2D98
RTS
+ RTS
}
map56: ; Map22
{
LDA.l OverworldEventDataWRAM+$56 : BIT.w #$0010 : BNE +
LDA #$0640 : STA $2604
LDA #$0641 : STA $2606
LDA #$0642 : STA $2608
@@ -748,7 +815,8 @@ LDA #$064E : STA $270C
LDA #$0662 : STA $2786
LDA #$0663 : STA $2788
LDA #$0653 : STA $278A
RTS
+ RTS
}
map58: ; Map24/Map25/Map32/Map33
@@ -792,24 +860,26 @@ LDA #$004E : STA $35CE
LDA #$004F : STA $35D0
LDA #$00D9 : STA $35D2
; TODO: west tree
; LDA #$00AE : STA $342C
; LDA #$00AF : STA $342E
; LDA #$007E : STA $3430
; LDA #$007F : STA $3432
; LDA #$00B0 : STA $34AC
; LDA #$0014 : STA $34AE
; LDA #$0015 : STA $34B0
; LDA #$00A8 : STA $34B2
; LDA #$0089 : STA $352C
; LDA #$001C : STA $352E
; LDA #$001D : STA $3530
; LDA #$0076 : STA $3532
; LDA #$00F1 : STA $35AC
; LDA #$004E : STA $35AE
; LDA #$004F : STA $35B0
; LDA #$00D9 : STA $35B2
RTS
LDA.l OverworldEventDataWRAM+$5b : BIT.w #$0010 : BEQ + ; BEQ because tree is already colored
; west tree
LDA #$00AE : STA $342C
LDA #$00AF : STA $342E
LDA #$007E : STA $3430
LDA #$007F : STA $3432
LDA #$00B0 : STA $34AC
LDA #$0014 : STA $34AE
LDA #$0015 : STA $34B0
LDA #$00A8 : STA $34B2
LDA #$0089 : STA $352C
LDA #$001C : STA $352E
LDA #$001D : STA $3530
LDA #$0076 : STA $3532
LDA #$00F1 : STA $35AC
LDA #$004E : STA $35AE
LDA #$004F : STA $35B0
LDA #$00D9 : STA $35B2
+ RTS
}
map5e: ; Map30/Map31/Map38/Map39
@@ -862,29 +932,33 @@ LDA #$00D9 : STA $386C : STA $3B58 : STA $3C48
LDA #$00DE : STA $3BCE
LDA #$00F1 : STA $3866 : STA $3B4C : STA $3C42
; TODO: bonk tree
; LDA #$00AE : STA $375E
; LDA #$00AF : STA $3760
; LDA #$007E : STA $3762
; LDA #$007F : STA $3764
; LDA #$00B0 : STA $37DE
; LDA #$0014 : STA $37E0
; LDA #$0015 : STA $37E2
; LDA #$00A8 : STA $37E4
; LDA #$0089 : STA $385E
; LDA #$001C : STA $3860
; LDA #$001D : STA $3862
; LDA #$0076 : STA $3864
; LDA #$00F1 : STA $38DE
; LDA #$004E : STA $38E0
; LDA #$004F : STA $38E2
; LDA #$00D9 : STA $38E4
RTS
LDA.l OverworldEventDataWRAM+$5e : BIT.w #$0010 : BEQ + ; BEQ because tree is already colored
; bonk tree
LDA #$00AE : STA $375E
LDA #$00AF : STA $3760
LDA #$007E : STA $3762
LDA #$007F : STA $3764
LDA #$00B0 : STA $37DE
LDA #$0014 : STA $37E0
LDA #$0015 : STA $37E2
LDA #$00A8 : STA $37E4
LDA #$0089 : STA $385E
LDA #$001C : STA $3860
LDA #$001D : STA $3862
LDA #$0076 : STA $3864
LDA #$00F1 : STA $38DE
LDA #$004E : STA $38E0
LDA #$004F : STA $38E2
LDA #$00D9 : STA $38E4
+ RTS
}
map6e: ; Map46
{
LDA.l OverworldEventDataWRAM+$6e : BIT.w #$0010 : BNE +
; tree 2
PHA
LDA #$0364 : STA $2396
LDA #$0365 : STA $2398
LDA #$0366 : STA $239A
@@ -901,8 +975,11 @@ LDA #$0375 : STA $2516
LDA #$0376 : STA $2518
LDA #$0377 : STA $251A
LDA #$0378 : STA $251C
PLA
+ BIT.w #$0008 : BNE +
; tree 3
PHA
LDA #$0364 : STA $241E
LDA #$0365 : STA $2420
LDA #$0366 : STA $2422
@@ -919,7 +996,9 @@ LDA #$0375 : STA $259E
LDA #$0376 : STA $25A0
LDA #$0377 : STA $25A2
LDA #$0378 : STA $25A4
PLA
+ BIT.w #$0004 : BNE +
; tree 4
LDA #$0364 : STA $24A6
LDA #$0365 : STA $24A8
@@ -937,5 +1016,6 @@ LDA #$0375 : STA $2626
LDA #$0376 : STA $2628
LDA #$0377 : STA $262A
LDA #$0378 : STA $262C
RTS
+ RTS
}