From ed3763b591a08fccfb4c3045d128489c215052db Mon Sep 17 00:00:00 2001 From: nmlgc Date: Mon, 27 Jan 2020 21:28:47 +0100 Subject: [PATCH] [Reverse-engineering] [th03] Shot-related enums Part of P0071, funded by KirbyComment and -Tom-. --- th03/shots.hpp | 16 ++++++++++++++++ th03/shots[bss].asm | 12 ++++++++++++ 2 files changed, 28 insertions(+) diff --git a/th03/shots.hpp b/th03/shots.hpp index 2b31047c..0ce29a78 100644 --- a/th03/shots.hpp +++ b/th03/shots.hpp @@ -7,6 +7,22 @@ #define SHOT_VRAM_W (SHOT_W / 8) #define SHOT_VRAM_H (SHOT_H / 2) +#pragma option -b- +enum shot_mode_t { + SM_NONE = 0, + SM_1_PAIR = 1, + SM_2_PAIRS = 2, + SM_4_PAIRS = 3, + SM_REIMU_HYPER = 4, // 1 shot pair + 1 amulet pair +}; + +enum shot_active_t { + SA_DISABLED = 0, + SA_ENABLED = 1, + SA_BLOCKED_FOR_THIS_FRAME = 2, +}; +#pragma option -b + struct shotpair_t { char flag; char unused_1; diff --git a/th03/shots[bss].asm b/th03/shots[bss].asm index 2b3d5851..507199f8 100644 --- a/th03/shots[bss].asm +++ b/th03/shots[bss].asm @@ -7,6 +7,18 @@ SHOT_H = 8 SHOT_VRAM_W = (SHOT_W / 8) SHOT_VRAM_H = (SHOT_H / 2) +; shot_mode_t +SM_NONE = 0 +SM_1_PAIR = 1 +SM_2_PAIRS = 2 +SM_4_PAIRS = 3 +SM_REIMU_HYPER = 4 + +; shot_active_t +SA_DISABLED = 0 +SA_ENABLED = 1 +SA_BLOCKED_FOR_THIS_FRAME = 2 + shotpair_t struc flag db ? unused_1 db ?