From 8237e29a164211eb2ec4cd161eb4183cc1947fee Mon Sep 17 00:00:00 2001 From: Cheng Hann Gan Date: Thu, 9 Sep 2021 19:22:48 -0400 Subject: Defined more in-dungeon structs and enums (#53) * Defined DungeonEntity * Rename EntityType enums * Revert EntityType rename * Defined more in-dungeon structs and enums * Added more dungeon global structs/enums * Prefixed dungeonGlobalData with g * Fixed compile errors * Removed some CRLFs * Fixed compile after merge * Revert Makefile * Rename DungeonEntityData.entityType Co-authored-by: Seth Barberee * Renamed symbols per PR comments Co-authored-by: Cheng Hann Gan Co-authored-by: Seth Barberee --- asm/code_80869E4.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'asm/code_80869E4.s') diff --git a/asm/code_80869E4.s b/asm/code_80869E4.s index 6528560..0d39418 100644 --- a/asm/code_80869E4.s +++ b/asm/code_80869E4.s @@ -53,4 +53,4 @@ _08086A30: bx r0 thumb_func_end sub_80869E4 - .align 2,0 + .align 2,0 -- cgit v1.2.3