Pārlūkot izejas kodu

fix brackets, conversion warnings in battle_load_elements.c

SBird1337 7 gadus atpakaļ
vecāks
revīzija
dbcbd1eb8f

+ 1
- 1
g3headers

@@ -1 +1 @@
1
-Subproject commit d31c1af54121a32dc22fd8101492383b844a9dbe
1
+Subproject commit bcc741a7ec06fc8a1b7c0e0b93a7f94f318a658e

+ 0
- 7
patches/hooks.asm Parādīt failu

@@ -71,13 +71,6 @@ _call_via_r1 equ 0x081E3BAC
71 71
 //.org 0x0800f268
72 72
 //    .halfword 0xE000
73 73
 
74
-.org 0x0800FD5C
75
-    .word battle_bg_table
76
-
77
-.org 0x0800FD88
78
-    .word battle_bg_table
79
-//end of battle bg table
80
-
81 74
 //flag routine
82 75
 .org 0x0806E5D6
83 76
 	ldr r0, =flag_hook|1

+ 1
- 1
src/battle_engine/battle_load_elements/battle_load_elements.c Parādīt failu

@@ -81,7 +81,7 @@ void battle_load_decals(u16 idx) {
81 81
     (void)idx;
82 82
 
83 83
     struct BattleScreenElements element = BATTLE_ELEMENT(var_load(BATTLE_ELEMENT_VAR));
84
-    if (element.gfx_grass == NULL | element.map_grass == NULL)
84
+    if ((element.gfx_grass == NULL) | (element.map_grass == NULL))
85 85
         return;
86 86
     lz77UnCompVram(element.gfx_grass, (void *)0x06004000);
87 87
     lz77UnCompVram(element.map_grass, (void *)0x0600E000);