Browse Source

fix brackets, conversion warnings in battle_load_elements.c

SBird1337 7 years ago
parent
commit
dbcbd1eb8f
3 changed files with 2 additions and 9 deletions
  1. 1
    1
      g3headers
  2. 0
    7
      patches/hooks.asm
  3. 1
    1
      src/battle_engine/battle_load_elements/battle_load_elements.c

+ 1
- 1
g3headers

1
-Subproject commit d31c1af54121a32dc22fd8101492383b844a9dbe
1
+Subproject commit bcc741a7ec06fc8a1b7c0e0b93a7f94f318a658e

+ 0
- 7
patches/hooks.asm View File

71
 //.org 0x0800f268
71
 //.org 0x0800f268
72
 //    .halfword 0xE000
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
 //flag routine
74
 //flag routine
82
 .org 0x0806E5D6
75
 .org 0x0806E5D6
83
 	ldr r0, =flag_hook|1
76
 	ldr r0, =flag_hook|1

+ 1
- 1
src/battle_engine/battle_load_elements/battle_load_elements.c View File

81
     (void)idx;
81
     (void)idx;
82
 
82
 
83
     struct BattleScreenElements element = BATTLE_ELEMENT(var_load(BATTLE_ELEMENT_VAR));
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
         return;
85
         return;
86
     lz77UnCompVram(element.gfx_grass, (void *)0x06004000);
86
     lz77UnCompVram(element.gfx_grass, (void *)0x06004000);
87
     lz77UnCompVram(element.map_grass, (void *)0x0600E000);
87
     lz77UnCompVram(element.map_grass, (void *)0x0600E000);