diff options
| author | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-01-06 21:52:23 -0600 |
|---|---|---|
| committer | AnonymousRandomPerson <chenghanngan.us@gmail.com> | 2022-01-06 21:52:23 -0600 |
| commit | d9b1ef43a69d9c33791719d8f510ee5be048a7d0 (patch) | |
| tree | 7741acfe1420acc2cc39b4f3934aadf85a1b05c4 | |
| parent | 2fa42b2987c9623b0bbfae37eba9569ceb69930b (diff) | |
Labeled Warp Scarf variables
| -rw-r--r-- | asm/code_8073CF0.s | 2 | ||||
| -rw-r--r-- | data/data_80F4468.s | 7 | ||||
| -rw-r--r-- | include/dungeon_entity.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/asm/code_8073CF0.s b/asm/code_8073CF0.s index bb9a59e..f9a004b 100644 --- a/asm/code_8073CF0.s +++ b/asm/code_8073CF0.s @@ -809,7 +809,7 @@ _08074320: b _080743B0 .align 2, 0 _0807434C: .4byte 0x00000169 -_08074350: .4byte gUnknown_80F5594 +_08074350: .4byte gWarpScarfActivationChances _08074354: .4byte gDungeonGlobalData _08074358: .4byte 0x0000199a _0807435C: .4byte gUnknown_80F54F4 diff --git a/data/data_80F4468.s b/data/data_80F4468.s index 09a1f17..073680b 100644 --- a/data/data_80F4468.s +++ b/data/data_80F4468.s @@ -1249,9 +1249,10 @@ gUnknown_80F54B4: @ 80F54B4 gUnknown_80F54F4: @ 80F54F4 .incbin "baserom.gba", 0xF54F4, 0xA0 - .global gUnknown_80F5594 -gUnknown_80F5594: @ 80F5594 - .incbin "baserom.gba", 0xF5594, 0x28 + .global gWarpScarfActivationChances +gWarpScarfActivationChances: @ 80F5594 +@ replacing .incbin "baserom.gba", 0xF5594, 0x28 + .2byte 0, 6, 12, 30, 50, 70, 90, 110, 130, 150, 170, 190, 210, 230, 250, 270, 290, 310, 999, 0 .global gUnknown_80F55BC gUnknown_80F55BC: @ 80F55BC diff --git a/include/dungeon_entity.h b/include/dungeon_entity.h index d5c2871..640183f 100644 --- a/include/dungeon_entity.h +++ b/include/dungeon_entity.h @@ -194,7 +194,9 @@ struct DungeonEntityData u8 unk15D; u8 unk15E; u8 unk15F; - u8 fill160[0x16C - 0x160]; + u8 fill160[0x169 - 0x160]; + u8 turnsSinceWarpScarfActivation; + u8 fill16A[0x16C - 0x16A]; /* 0x16C */ struct Position targetPosition; /* 0x170 */ struct Position posPixel; u32 unk174; |