소스 검색

deoxys aura

SBird1337 7 년 전
부모
커밋
24421f3ca1

+ 1
- 1
nbproject/private/configurations.xml 파일 보기

@@ -6830,7 +6830,7 @@
6830 6830
           </df>
6831 6831
         </df>
6832 6832
         <df name="music">
6833
-          <in>encounter_lookup.c</in>
6833
+          <in>battle_music_lookup.c</in>
6834 6834
           <in>main_mixer.S</in>
6835 6835
           <in>music_override.c</in>
6836 6836
         </df>

+ 21
- 2
src/battle_engine/battle_m_flee_hook.S 파일 보기

@@ -1,3 +1,6 @@
1
+#include <battle_script.h>
2
+#include <config.h>
3
+
1 4
 .text
2 5
 .align 2
3 6
 .thumb
@@ -37,7 +40,13 @@ ldrb r0, [r1]
37 40
 cmp r0, #3
38 41
 bne no_flee
39 42
 
40
-ldr r0, =0x081D8924 @some move script change later
43
+ldr r0, =FLAG_DEOXYS_AURA
44
+bl call_flag_get
45
+cmp r0, #0
46
+bne intercept_aura
47
+b no_flee
48
+intercept_aura:
49
+ldr r0, =bsc_deoxys_aura @some move script change later
41 50
 bl call_battle_call_move_something
42 51
 ldr r1, =battle_preparation_phase
43 52
 ldrb r0, [r4]
@@ -51,4 +60,14 @@ bx r0
51 60
 .align 2
52 61
 call_battle_call_move_something:
53 62
 ldr r1, =battle_call_bc_move_exec
54
-bx r1
63
+bx r1
64
+
65
+call_flag_get:
66
+ldr r1, =flag_check
67
+bx r1
68
+
69
+bsc_deoxys_aura:
70
+
71
+setword STRING_LOADER str_deoxys_aura
72
+printstring 0x184
73
+end2

+ 2
- 0
src/battle_engine/custom_structs_malloc.c 파일 보기

@@ -31,6 +31,7 @@
31 31
 /* === INCLUDE === */
32 32
 
33 33
 #include <battle_custom_structs.h>
34
+#include <config.h>
34 35
 #include <game_engine.h>
35 36
 #include <memory.h>
36 37
 #include <moves.h>
@@ -65,6 +66,7 @@ void free_battle_structs()
65 66
 {
66 67
     free(custom_battle_elements.ptr);
67 68
     custom_battle_elements.ptr=0;
69
+    flag_clear(FLAG_DEOXYS_AURA);
68 70
 }
69 71
 
70 72
 //hijack switch in command, clean up battle structs and carry over baton pass

+ 1
- 0
src/include/config.h 파일 보기

@@ -57,6 +57,7 @@
57 57
 /*Flag to deactivate transparent textboxes*/
58 58
 #define FLAG_ACTIVATE		0x900
59 59
 #define FLAG_WALK_SCRIPT	0x901
60
+#define FLAG_DEOXYS_AURA        0x902
60 61
 
61 62
 /*Effect IDs controlling various in-battle item effects etc.*/
62 63
 #define ITEM_EFFECT_SMOOTH_ROCK	0x48

+ 2
- 2
src/music/battle_music_lookup.c 파일 보기

@@ -73,11 +73,11 @@ void mhk_trainer_battle_play_defeat(void) {
73 73
             break;
74 74
     }
75 75
 
76
-    song_play_for_text(song);
76
+    //song_play_for_text(song);
77 77
 }
78 78
 
79 79
 void mhk_wild_poke_def_music(void) {
80
-    song_play_for_text(SEQ_BGM_VIC_POKE);
80
+    //song_play_for_text(SEQ_BGM_VIC_POKE);
81 81
 }
82 82
 
83 83
 u16 mhk_species_to_song(u16 species) {

+ 5
- 4
string/de/hazards.txt 파일 보기

@@ -3,7 +3,8 @@ str_got_poison=\hFD\h13 wurde vergiftet!
3 3
 str_got_bad_poison=\hFD\h13 wurde schwer vergiftet!
4 4
 str_sticky_web=\hFD\h13 wurde in einem Klebenetz\ngefangen!
5 5
 str_toxic_resolve=Giftspitzen wurden von \hFD\h13\nabsorbiert!
6
-str_spikes_lain=STACHELN AUSGELEGT TEXT (ENGLISCH)
7
-str_toxic_lain=GIFTSPITZEN AUSGELEGT TEXT (ENGLISCH)
8
-str_rocks_lain=TARNSTEINE AUSGELEGT TEXT (ENGLISCH)
9
-str_sticky_lain=KLEBENETZ AUSGELEGT TEXT (ENGLISCH)
6
+str_spikes_lain=STACHELN AUSGELEGT TEXT (DEUTSCH)
7
+str_toxic_lain=GIFTSPITZEN AUSGELEGT TEXT (DEUTSCH)
8
+str_rocks_lain=TARNSTEINE AUSGELEGT TEXT (DEUTSCH)
9
+str_sticky_lain=KLEBENETZ AUSGELEGT TEXT (DEUTSCH)
10
+str_deoxys_aura=Die Aura von Deoxys verhindert\neine Flucht!\hFB